Skip to content
Snippets Groups Projects
Commit 35356183 authored by Anian Bühler's avatar Anian Bühler
Browse files

added PID Block (to be tested)

parent 52bf6d10
Branches
No related tags found
1 merge request!1dev_prefereences to master
...@@ -26,8 +26,14 @@ public class PidBlock extends TranslatorBlock ...@@ -26,8 +26,14 @@ public class PidBlock extends TranslatorBlock
TranslatorBlock tb_kp = this.getRequiredTranslatorBlockAtSocket(3); TranslatorBlock tb_kp = this.getRequiredTranslatorBlockAtSocket(3);
TranslatorBlock tb_ki = this.getTranslatorBlockAtSocket(4); TranslatorBlock tb_ki = this.getTranslatorBlockAtSocket(4);
TranslatorBlock tb_kd = this.getTranslatorBlockAtSocket(5); TranslatorBlock tb_kd = this.getTranslatorBlockAtSocket(5);
TranslatorBlock tb_limitL = this.getTranslatorBlockAtSocket(6); TranslatorBlock tb_limitL = null;
TranslatorBlock tb_limitH = this.getTranslatorBlockAtSocket(7); TranslatorBlock tb_limitH = null;
try {
tb_limitL = this.getTranslatorBlockAtSocket(6);
tb_limitH = this.getTranslatorBlockAtSocket(7);
} catch (Exception e) {}
boolean integrative = tb_ki != null; boolean integrative = tb_ki != null;
boolean derivative = tb_kd != null; boolean derivative = tb_kd != null;
... ...
......
...@@ -1566,8 +1566,10 @@ ...@@ -1566,8 +1566,10 @@
<BlockConnector connector-type="number" connector-kind="socket" label="bc.kd"> <BlockConnector connector-type="number" connector-kind="socket" label="bc.kd">
</BlockConnector> </BlockConnector>
<BlockConnector connector-type="number" connector-kind="socket" label="bc.limitL"> <BlockConnector connector-type="number" connector-kind="socket" label="bc.limitL">
<DefaultArg genus-name="number" label="0" />
</BlockConnector> </BlockConnector>
<BlockConnector connector-type="number" connector-kind="socket" label="bc.limitH"> <BlockConnector connector-type="number" connector-kind="socket" label="bc.limitH">
<DefaultArg genus-name="number" label="255" />
</BlockConnector> </BlockConnector>
</BlockConnectors> </BlockConnectors>
</BlockGenus> </BlockGenus>
...@@ -2796,7 +2798,7 @@ ...@@ -2796,7 +2798,7 @@
<BlockConnector connector-type="string" connector-kind="socket" /> <BlockConnector connector-type="string" connector-kind="socket" />
<BlockConnector connector-type="string" connector-kind="socket" /> <BlockConnector connector-type="string" connector-kind="socket" />
<BlockConnector connector-type="string" connector-kind="socket" label="bc.prog_date"> <BlockConnector connector-type="string" connector-kind="socket" label="bc.prog_date">
<DefaultArg genus-name="string" label="01.01.2021" /> <DefaultArg genus-name="string" label="01.01.2022" />
</BlockConnector> </BlockConnector>
<BlockConnector connector-type="number" connector-kind="socket" label="bc.prog_version"> <BlockConnector connector-type="number" connector-kind="socket" label="bc.prog_version">
<DefaultArg genus-name="number" label="0.1" /> <DefaultArg genus-name="number" label="0.1" />
... ...
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
</Plug> </Plug>
</Block> </Block>
<Block genus-name="string" id="86"> <Block genus-name="string" id="86">
<Label>01.01.2021</Label> <Label>01.01.2022</Label>
<Location> <Location>
<X>208</X> <X>208</X>
<Y>143</Y> <Y>143</Y>
... ...
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment