From 3535618382bf58c13127050db204929e85d2ab0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anian=20B=C3=BChler?=
<anian.buehler@reutlingen-university.de>
Date: Fri, 14 Jan 2022 11:31:38 +0100
Subject: [PATCH] added PID Block (to be tested)
---
.../ardublock/translator/block/operators/PidBlock.java | 10 ++++++++--
src/main/resources/com/ardublock/block/ardublock.xml | 4 +++-
src/main/resources/com/ardublock/defaultProgram.abp | 2 +-
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ardublock/translator/block/operators/PidBlock.java b/src/main/java/com/ardublock/translator/block/operators/PidBlock.java
index 34089fa..f36f98c 100644
--- a/src/main/java/com/ardublock/translator/block/operators/PidBlock.java
+++ b/src/main/java/com/ardublock/translator/block/operators/PidBlock.java
@@ -26,8 +26,14 @@ public class PidBlock extends TranslatorBlock
TranslatorBlock tb_kp = this.getRequiredTranslatorBlockAtSocket(3);
TranslatorBlock tb_ki = this.getTranslatorBlockAtSocket(4);
TranslatorBlock tb_kd = this.getTranslatorBlockAtSocket(5);
- TranslatorBlock tb_limitL = this.getTranslatorBlockAtSocket(6);
- TranslatorBlock tb_limitH = this.getTranslatorBlockAtSocket(7);
+ TranslatorBlock tb_limitL = null;
+ TranslatorBlock tb_limitH = null;
+
+ try {
+ tb_limitL = this.getTranslatorBlockAtSocket(6);
+ tb_limitH = this.getTranslatorBlockAtSocket(7);
+
+ } catch (Exception e) {}
boolean integrative = tb_ki != null;
boolean derivative = tb_kd != null;
diff --git a/src/main/resources/com/ardublock/block/ardublock.xml b/src/main/resources/com/ardublock/block/ardublock.xml
index 339c3d5..96e48a6 100644
--- a/src/main/resources/com/ardublock/block/ardublock.xml
+++ b/src/main/resources/com/ardublock/block/ardublock.xml
@@ -1566,8 +1566,10 @@
<BlockConnector connector-type="number" connector-kind="socket" label="bc.kd">
</BlockConnector>
<BlockConnector connector-type="number" connector-kind="socket" label="bc.limitL">
+ <DefaultArg genus-name="number" label="0" />
</BlockConnector>
<BlockConnector connector-type="number" connector-kind="socket" label="bc.limitH">
+ <DefaultArg genus-name="number" label="255" />
</BlockConnector>
</BlockConnectors>
</BlockGenus>
@@ -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" label="bc.prog_date">
- <DefaultArg genus-name="string" label="01.01.2021" />
+ <DefaultArg genus-name="string" label="01.01.2022" />
</BlockConnector>
<BlockConnector connector-type="number" connector-kind="socket" label="bc.prog_version">
<DefaultArg genus-name="number" label="0.1" />
diff --git a/src/main/resources/com/ardublock/defaultProgram.abp b/src/main/resources/com/ardublock/defaultProgram.abp
index b9b1947..8ab1015 100644
--- a/src/main/resources/com/ardublock/defaultProgram.abp
+++ b/src/main/resources/com/ardublock/defaultProgram.abp
@@ -29,7 +29,7 @@
</Plug>
</Block>
<Block genus-name="string" id="86">
- <Label>01.01.2021</Label>
+ <Label>01.01.2022</Label>
<Location>
<X>208</X>
<Y>143</Y>
--
GitLab