From 2f1a5d1aafb55d41f2a91140a240aef20a4ded30 Mon Sep 17 00:00:00 2001
From: Lucas Stratmann <lucas.stratmann@student.reutlingen-university.de>
Date: Thu, 15 Oct 2020 16:52:04 +0200
Subject: [PATCH] Bugfixes
---
src/tec/letsgoing/ardublock/simulator/arduino/Arduino.java | 2 +-
.../ardublock/simulator/simcode/control/CodeElseIf.java | 4 +++-
.../ardublock/simulator/simcode/io/CodeDigitalWrite.java | 3 +--
src/tec/letsgoing/ardublock/simulator/view/GUI.java | 2 +-
4 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/tec/letsgoing/ardublock/simulator/arduino/Arduino.java b/src/tec/letsgoing/ardublock/simulator/arduino/Arduino.java
index 0d89a7c..d16a28b 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 86a6823..8f21702 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 3bd1ad8..b15638b 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 511d647..332232d 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()
--
GitLab