From db26d8753484611325f34ce7552bd65f57c9b16a Mon Sep 17 00:00:00 2001 From: buehlera <buehlera@tec-nb-buehlera> Date: Thu, 10 Dec 2020 11:48:54 +0100 Subject: [PATCH] added check for pinMode(INPUT/INPUT_PULLUP) on digitalRead-Block --- .../translator/block/input/DigitalInputBlock.java | 8 ++++---- .../translator/block/input/DigitalInputPullBlock.java | 5 +---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/ardublock/translator/block/input/DigitalInputBlock.java b/src/main/java/com/ardublock/translator/block/input/DigitalInputBlock.java index dd4c8b8..e1844dd 100644 --- a/src/main/java/com/ardublock/translator/block/input/DigitalInputBlock.java +++ b/src/main/java/com/ardublock/translator/block/input/DigitalInputBlock.java @@ -28,10 +28,11 @@ public class DigitalInputBlock extends TranslatorBlock if(translatorBlock instanceof NumberBlock || translatorBlock instanceof VariableNumberBlock){ //translator.addInputPin(number.trim()); - translator.addSetupCommand("pinMode("+number.trim()+", INPUT);"); + if(!translator.containsSetupCommand("pinMode("+number.trim()+", INPUT_PULLUP);")) { + translator.addSetupCommand("pinMode("+number.trim()+", INPUT);"); + } } - - + String ret = "digitalRead("; ret = ret + number; ret = ret + ")"; @@ -41,5 +42,4 @@ public class DigitalInputBlock extends TranslatorBlock TranslatorBlock translatorBlock = this.getRequiredTranslatorBlockAtSocket(0); return new CodeDigitalRead(new SimTypeInt(translatorBlock.toSim())); } - } diff --git a/src/main/java/com/ardublock/translator/block/input/DigitalInputPullBlock.java b/src/main/java/com/ardublock/translator/block/input/DigitalInputPullBlock.java index 2b630b3..054ddae 100644 --- a/src/main/java/com/ardublock/translator/block/input/DigitalInputPullBlock.java +++ b/src/main/java/com/ardublock/translator/block/input/DigitalInputPullBlock.java @@ -25,10 +25,7 @@ public class DigitalInputPullBlock extends TranslatorBlock translator.addSetupCommand("pinMode("+number.trim()+", INPUT_PULLUP);"); } - String ret = "digitalRead("; - ret = ret + translatorBlock.toCode().replaceAll("\\s*_.new\\b\\s*", ""); - ret = ret + ");\n"; - return codePrefix + ret + codeSuffix; + return ""; } } -- GitLab