Skip to content
Snippets Groups Projects
Commit db26d875 authored by buehlera's avatar buehlera
Browse files

added check for pinMode(INPUT/INPUT_PULLUP) on digitalRead-Block

parent 99874885
No related branches found
No related tags found
No related merge requests found
...@@ -28,10 +28,11 @@ public class DigitalInputBlock extends TranslatorBlock ...@@ -28,10 +28,11 @@ public class DigitalInputBlock extends TranslatorBlock
if(translatorBlock instanceof NumberBlock || translatorBlock instanceof VariableNumberBlock){ if(translatorBlock instanceof NumberBlock || translatorBlock instanceof VariableNumberBlock){
//translator.addInputPin(number.trim()); //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("; String ret = "digitalRead(";
ret = ret + number; ret = ret + number;
ret = ret + ")"; ret = ret + ")";
...@@ -41,5 +42,4 @@ public class DigitalInputBlock extends TranslatorBlock ...@@ -41,5 +42,4 @@ public class DigitalInputBlock extends TranslatorBlock
TranslatorBlock translatorBlock = this.getRequiredTranslatorBlockAtSocket(0); TranslatorBlock translatorBlock = this.getRequiredTranslatorBlockAtSocket(0);
return new CodeDigitalRead(new SimTypeInt(translatorBlock.toSim())); return new CodeDigitalRead(new SimTypeInt(translatorBlock.toSim()));
} }
} }
...@@ -25,10 +25,7 @@ public class DigitalInputPullBlock extends TranslatorBlock ...@@ -25,10 +25,7 @@ public class DigitalInputPullBlock extends TranslatorBlock
translator.addSetupCommand("pinMode("+number.trim()+", INPUT_PULLUP);"); translator.addSetupCommand("pinMode("+number.trim()+", INPUT_PULLUP);");
} }
String ret = "digitalRead("; return "";
ret = ret + translatorBlock.toCode().replaceAll("\\s*_.new\\b\\s*", "");
ret = ret + ");\n";
return codePrefix + ret + codeSuffix;
} }
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment