diff --git a/src/tec/letsgoing/ardublock/simulator/arduino/Arduino.java b/src/tec/letsgoing/ardublock/simulator/arduino/Arduino.java index 0d89a7c0c6aeefd212af992b7803cf09f4833e36..d16a28bfe1ed28565a08951df243758e1c783929 100644 --- a/src/tec/letsgoing/ardublock/simulator/arduino/Arduino.java +++ b/src/tec/letsgoing/ardublock/simulator/arduino/Arduino.java @@ -135,7 +135,7 @@ public class Arduino { int[] array = { 3, 5, 6, 9, 10, 11 }; for (int i = 0; i < 6; i++) { if (_pin == array[i]) { - pins[_pin].setValue(_value); + pins[_pin].setValue((int) (_value * 4.012)); return true; } } diff --git a/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeElseIf.java b/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeElseIf.java index 86a6823940e87c6536900cfcd9febc1154e8971a..8f21702fb0551f9520c0b5fbd347a123e9be3b23 100644 --- a/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeElseIf.java +++ b/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeElseIf.java @@ -41,7 +41,9 @@ public class CodeElseIf extends SimTypeIf { return null; } else { // Condition not met and different else can execute - follow.run(_arduino, functionHead); + if (follow != null) { + follow.run(_arduino, functionHead); + } return null; } } diff --git a/src/tec/letsgoing/ardublock/simulator/simcode/io/CodeDigitalWrite.java b/src/tec/letsgoing/ardublock/simulator/simcode/io/CodeDigitalWrite.java index 3bd1ad8ccc68858877f06e29174cc6fdad764bb5..b15638b0912b37762c1f23ef2fe56a4a2e8c6ceb 100644 --- a/src/tec/letsgoing/ardublock/simulator/simcode/io/CodeDigitalWrite.java +++ b/src/tec/letsgoing/ardublock/simulator/simcode/io/CodeDigitalWrite.java @@ -24,8 +24,7 @@ public class CodeDigitalWrite extends SimCode { } public SimCode run(Arduino _arduino, SimCode functionHead) { - _arduino.digitalWrite((int) pin.run(_arduino, functionHead).getValue(), - value.run(_arduino, functionHead).getValue()); + _arduino.digitalWrite(pin.run(_arduino, functionHead).getValue(), value.run(_arduino, functionHead).getValue()); return null; } diff --git a/src/tec/letsgoing/ardublock/simulator/view/GUI.java b/src/tec/letsgoing/ardublock/simulator/view/GUI.java index 511d647165b09324e3330269f47c4662cb182c84..332232de1ce3bc43f5883aeac3241ea65e1a4fba 100644 --- a/src/tec/letsgoing/ardublock/simulator/view/GUI.java +++ b/src/tec/letsgoing/ardublock/simulator/view/GUI.java @@ -57,7 +57,7 @@ public class GUI extends JFrame implements Runnable, ActionListener { * @param simu Instanz des Simulators */ public GUI(Simulator simu) { - super("ArdubBlock Simulator"); + super("ArduBlock Simulator"); // Konstruktor der Module modules[0] = new RGB(new ImageIcon(getToolkit()