From 2b4d2ab24e9dcbd7f7da7f4cf190bc5c3bb481b4 Mon Sep 17 00:00:00 2001
From: Lucas Stratmann <lucas.stratmann@student.reutlingen-university.de>
Date: Fri, 11 Sep 2020 11:19:38 +0200
Subject: [PATCH] Made Arduino "reupload" safe
---
src/tec/letsgoing/ardublock/simulator/Simulator.java | 2 ++
src/tec/letsgoing/ardublock/simulator/arduino/Arduino.java | 4 ++++
2 files changed, 6 insertions(+)
diff --git a/src/tec/letsgoing/ardublock/simulator/Simulator.java b/src/tec/letsgoing/ardublock/simulator/Simulator.java
index 9185bb9..6d6cfd4 100644
--- a/src/tec/letsgoing/ardublock/simulator/Simulator.java
+++ b/src/tec/letsgoing/ardublock/simulator/Simulator.java
@@ -28,6 +28,7 @@ import tec.letsgoing.ardublock.simulator.view.GUI;
/**
* Diese Klasse verwaltet alle Elemente des Simulators. Sie ist geschrieben als Singelton.
+ * Daher wird die Instanz über getInstance geholt und der Konstruktor ist private.
*
*
* Pinmapping:
@@ -162,6 +163,7 @@ public class Simulator implements Runnable, ActionListener {
*/
public boolean resetFunctions() {
functionsCode.clear();
+ arduino.resetFunctions();
arduino.reset();
return true;
}
diff --git a/src/tec/letsgoing/ardublock/simulator/arduino/Arduino.java b/src/tec/letsgoing/ardublock/simulator/arduino/Arduino.java
index 9956dd5..40c96ac 100644
--- a/src/tec/letsgoing/ardublock/simulator/arduino/Arduino.java
+++ b/src/tec/letsgoing/ardublock/simulator/arduino/Arduino.java
@@ -115,6 +115,10 @@ public class Arduino {
}
return true;
}
+
+ public void resetFunctions() {
+ functions.clear();
+ }
public void serialPrint(String content) {
gui.serialPrint(content);
--
GitLab