From d3ccb5240d5545229f46f28b6dbf3cff4f05819b Mon Sep 17 00:00:00 2001
From: Lucas Stratmann <lucas.stratmann@student.reutlingen-university.de>
Date: Thu, 17 Sep 2020 14:27:57 +0200
Subject: [PATCH] Bugfixes
---
src/tec/letsgoing/ardublock/simulator/arduino/Arduino.java | 2 +-
.../ardublock/simulator/simcode/control/CodeForCount.java | 2 +-
.../letsgoing/ardublock/simulator/simcode/vars/CodeBoolGet.java | 1 +
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/tec/letsgoing/ardublock/simulator/arduino/Arduino.java b/src/tec/letsgoing/ardublock/simulator/arduino/Arduino.java
index 23d4564..0a268c1 100644
--- a/src/tec/letsgoing/ardublock/simulator/arduino/Arduino.java
+++ b/src/tec/letsgoing/ardublock/simulator/arduino/Arduino.java
@@ -142,7 +142,7 @@ public class Arduino {
public SimCodeFunction getFunction(String name) {
for (SimCodeFunction function : functions) {
- if (function.getName() == name) {
+ if (function.getName().equals(name)) {
return function;
}
diff --git a/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeForCount.java b/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeForCount.java
index 86854d3..de74e4f 100644
--- a/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeForCount.java
+++ b/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeForCount.java
@@ -28,7 +28,7 @@ public class CodeForCount extends SimCode {
varname = _varname;
codeblocks = _blocks;
}
-
+ //TODO For/While Mit Vars ausrüsten
@Override
public SimCode run(Arduino _arduino, SimCodeFunction functionHead) {
// TODO delete Var after completion
diff --git a/src/tec/letsgoing/ardublock/simulator/simcode/vars/CodeBoolGet.java b/src/tec/letsgoing/ardublock/simulator/simcode/vars/CodeBoolGet.java
index 82918ba..bf09c98 100644
--- a/src/tec/letsgoing/ardublock/simulator/simcode/vars/CodeBoolGet.java
+++ b/src/tec/letsgoing/ardublock/simulator/simcode/vars/CodeBoolGet.java
@@ -24,6 +24,7 @@ public class CodeBoolGet extends SimCode {
@Override
public SimTypeBool run(Arduino _arduino, SimCodeFunction functionHead) {
+ //FIXME Für alle Get und Set müssen die oberligenenden "Stackschichten" berücksichtigt werden.
return (SimTypeBool) functionHead.readVariable(var.run(_arduino, functionHead).toString());
}
--
GitLab