Skip to content
Snippets Groups Projects
Commit 14a7aabf authored by Lucas Stratmann's avatar Lucas Stratmann
Browse files

Blinktest successful

parent 787a9438
No related branches found
No related tags found
No related merge requests found
...@@ -30,7 +30,6 @@ public class DelayBlock extends TranslatorBlock ...@@ -30,7 +30,6 @@ public class DelayBlock extends TranslatorBlock
@Override @Override
public SimCode toSim() throws BlockException, SocketNullException { public SimCode toSim() throws BlockException, SocketNullException {
System.out.println("New Delayblock");
CodeDelay delay = new CodeDelay((SimTypeInt)this.getRequiredTranslatorBlockAtSocket(0).toSim()); CodeDelay delay = new CodeDelay((SimTypeInt)this.getRequiredTranslatorBlockAtSocket(0).toSim());
return delay; return delay;
} }
......
...@@ -4,6 +4,7 @@ import com.ardublock.translator.Translator; ...@@ -4,6 +4,7 @@ import com.ardublock.translator.Translator;
import com.ardublock.translator.block.ConstBlock; import com.ardublock.translator.block.ConstBlock;
import tec.letsgoing.ardublock.simulator.simcode.SimCode; import tec.letsgoing.ardublock.simulator.simcode.SimCode;
import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeBool;
public class DigitalHighBlock extends ConstBlock public class DigitalHighBlock extends ConstBlock
{ {
...@@ -15,6 +16,6 @@ public class DigitalHighBlock extends ConstBlock ...@@ -15,6 +16,6 @@ public class DigitalHighBlock extends ConstBlock
} }
public SimCode toSim() { public SimCode toSim() {
return null;//FIXME @Lucas Continue Work here! return new SimTypeBool(true);
} }
} }
...@@ -3,6 +3,9 @@ package com.ardublock.translator.block.numbers; ...@@ -3,6 +3,9 @@ package com.ardublock.translator.block.numbers;
import com.ardublock.translator.Translator; import com.ardublock.translator.Translator;
import com.ardublock.translator.block.ConstBlock; import com.ardublock.translator.block.ConstBlock;
import tec.letsgoing.ardublock.simulator.simcode.SimCode;
import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeBool;
public class DigitalLowBlock extends ConstBlock public class DigitalLowBlock extends ConstBlock
{ {
...@@ -11,4 +14,8 @@ public class DigitalLowBlock extends ConstBlock ...@@ -11,4 +14,8 @@ public class DigitalLowBlock extends ConstBlock
super(blockId, translator, codePrefix, codeSuffix, label); super(blockId, translator, codePrefix, codeSuffix, label);
this.setCode("LOW"); this.setCode("LOW");
} }
public SimCode toSim() {
return new SimTypeBool(false);
}
} }
\ No newline at end of file
...@@ -2,12 +2,14 @@ package com.ardublock.translator.block.output; ...@@ -2,12 +2,14 @@ package com.ardublock.translator.block.output;
import com.ardublock.translator.Translator; import com.ardublock.translator.Translator;
import com.ardublock.translator.block.TranslatorBlock; import com.ardublock.translator.block.TranslatorBlock;
import com.ardublock.translator.block.exception.BlockException;
import com.ardublock.translator.block.exception.SocketNullException; import com.ardublock.translator.block.exception.SocketNullException;
import com.ardublock.translator.block.exception.SubroutineNotDeclaredException; import com.ardublock.translator.block.exception.SubroutineNotDeclaredException;
import com.ardublock.translator.block.numbers.NumberBlock; import com.ardublock.translator.block.numbers.NumberBlock;
import com.ardublock.translator.block.numbers.VariableNumberBlock; import com.ardublock.translator.block.numbers.VariableNumberBlock;
import tec.letsgoing.ardublock.simulator.simcode.SimCode; import tec.letsgoing.ardublock.simulator.simcode.SimCode;
import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeBool;
import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeInt; import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeInt;
import tec.letsgoing.ardublock.simulator.simcode.io.CodeDigitalWrite; import tec.letsgoing.ardublock.simulator.simcode.io.CodeDigitalWrite;
...@@ -41,9 +43,12 @@ public class DigitalOutputBlock extends TranslatorBlock ...@@ -41,9 +43,12 @@ public class DigitalOutputBlock extends TranslatorBlock
return ret; return ret;
} }
public SimCode toSim() { public SimCode toSim() throws BlockException, SocketNullException {
//SimTypeInt(Integer.parseInt(label)); TranslatorBlock translatorBlock = this.getRequiredTranslatorBlockAtSocket(0);
return null;//new CodeDigitalWrite(); SimTypeInt pin=new SimTypeInt(translatorBlock.toSim());
translatorBlock = this.getRequiredTranslatorBlockAtSocket(1);
SimTypeBool lvl=new SimTypeBool(translatorBlock.toSim());
return new CodeDigitalWrite(pin,lvl);//new CodeDigitalWrite();
} }
} }
...@@ -25,6 +25,9 @@ import edu.mit.blocks.workspace.Workspace; ...@@ -25,6 +25,9 @@ import edu.mit.blocks.workspace.Workspace;
import tec.letsgoing.ardublock.simulator.Simulator; import tec.letsgoing.ardublock.simulator.Simulator;
import tec.letsgoing.ardublock.simulator.simcode.SimCode; import tec.letsgoing.ardublock.simulator.simcode.SimCode;
import tec.letsgoing.ardublock.simulator.simcode.control.CodeWhile;
import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeBool;
import tec.letsgoing.ardublock.simulator.simcode.functions.CodeExecuteFunction;
import tec.letsgoing.ardublock.simulator.simcode.functions.SimCodeFunction; import tec.letsgoing.ardublock.simulator.simcode.functions.SimCodeFunction;
public class SimulateCodeButtonListener implements ActionListener public class SimulateCodeButtonListener implements ActionListener
...@@ -306,7 +309,22 @@ public class SimulateCodeButtonListener implements ActionListener ...@@ -306,7 +309,22 @@ public class SimulateCodeButtonListener implements ActionListener
System.out.println(codeOut); System.out.println(codeOut);
} }
context.didGenerate(codeOut, false); context.didGenerate(codeOut, false);
SimTypeBool boolTrue = new SimTypeBool(true);
Vector<SimCode> mainVec = new Vector<SimCode>();
//mainVec.add(new CodeExecuteFunction("setup"));
Vector<SimCode> loopVec = new Vector<SimCode>();
loopVec.add(new CodeExecuteFunction("loop"));
mainVec.add(new CodeWhile(boolTrue, loopVec));
SimCodeFunction main = new SimCodeFunction("main", mainVec);
//sim.addFunctionsCode(setupCode);
System.out.println("Add new Functions");
sim.resetFunctions();
sim.addFunctionsCode(loop); sim.addFunctionsCode(loop);
sim.addFunctionsCode(main);
//TODO ! start simulator here //TODO ! start simulator here
//sim.run(); //sim.run();
//sim.startSimu(); //sim.startSimu();
......
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