From 079907696210606fbac9e1173e7f70002d3c646d Mon Sep 17 00:00:00 2001
From: Lucas Stratmann <lucas.stratmann@student.reutlingen-university.de>
Date: Wed, 7 Oct 2020 17:39:05 +0200
Subject: [PATCH] Import Cleanup, forced LookandFeel, changed Potilabels
---
.../ardublock/simulator/Simulator.java | 15 ++++
.../ardublock/simulator/arduino/Arduino.java | 44 ++++++---
.../ardublock/simulator/simcode/SimCode.java | 26 +++---
.../simcode/comm/CodeConnectString.java | 1 -
.../simcode/comm/CodeSerialPrint.java | 1 -
.../simulator/simcode/control/CodeDelay.java | 1 -
.../simulator/simcode/control/CodeElse.java | 5 +-
.../simulator/simcode/control/CodeElseIf.java | 5 +-
.../simulator/simcode/control/CodeFor.java | 5 +-
.../simcode/control/CodeForCount.java | 5 +-
.../simulator/simcode/control/CodeIf.java | 5 +-
.../simulator/simcode/control/CodeWhile.java | 5 +-
.../simcode/control/CodeWhileMillis.java | 5 +-
.../simcode/datatypes/SimTypeBool.java | 1 -
.../simcode/datatypes/SimTypeIf.java | 1 -
.../simcode/datatypes/SimTypeInt.java | 1 -
.../simcode/datatypes/SimTypeString.java | 1 -
.../simcode/functions/SimCodeFunction.java | 8 +-
.../simulator/simcode/io/CodeAnalogRead.java | 1 -
.../simulator/simcode/io/CodeAnalogWrite.java | 1 -
.../simulator/simcode/io/CodeDigitalRead.java | 1 -
.../simcode/io/CodeDigitalWrite.java | 1 -
.../simulator/simcode/logic/CodeAND.java | 1 -
.../simcode/logic/CodeBoolEqual.java | 1 -
.../simcode/logic/CodeBoolUnequal.java | 1 -
.../simcode/logic/CodeIntBigger.java | 1 -
.../simcode/logic/CodeIntBiggerEqual.java | 1 -
.../simulator/simcode/logic/CodeIntEqual.java | 1 -
.../simcode/logic/CodeIntSmaller.java | 1 -
.../simcode/logic/CodeIntSmallerEqual.java | 1 -
.../simcode/logic/CodeIntUnequal.java | 1 -
.../simulator/simcode/logic/CodeNOT.java | 1 -
.../simulator/simcode/logic/CodeOR.java | 1 -
.../simcode/logic/CodeStringEqual.java | 1 -
.../simcode/logic/CodeStringUnequal.java | 1 -
.../simulator/simcode/math/CodeAbs.java | 1 -
.../simulator/simcode/math/CodeAdd.java | 1 -
.../simulator/simcode/math/CodeDivison.java | 1 -
.../simulator/simcode/math/CodeLimit.java | 1 -
.../simulator/simcode/math/CodeMap.java | 1 -
.../simulator/simcode/math/CodeMap10to8.java | 1 -
.../simulator/simcode/math/CodeMax.java | 1 -
.../simulator/simcode/math/CodeMin.java | 1 -
.../simulator/simcode/math/CodeMinus.java | 1 -
.../simulator/simcode/math/CodeModulo.java | 1 -
.../simulator/simcode/math/CodeProduct.java | 1 -
.../simulator/simcode/math/CodeRandMax.java | 1 -
.../simcode/math/CodeRandMinMax.java | 1 -
.../simcode/vars/CodeBoolCreate.java | 1 -
.../simulator/simcode/vars/CodeBoolGet.java | 1 -
.../simulator/simcode/vars/CodeBoolSet.java | 1 -
.../simulator/simcode/vars/CodeIntCreate.java | 1 -
.../simulator/simcode/vars/CodeIntGet.java | 1 -
.../simulator/simcode/vars/CodeIntSet.java | 1 -
.../simulator/simcode/vars/CodeMillis.java | 1 -
.../ardublock/simulator/view/GUI.java | 89 ++++++++++++-------
.../simulator/view/modules/ArduinoUno.java | 15 ++--
.../simulator/view/modules/Modul.java | 2 +-
.../simulator/view/modules/Poti.java | 8 +-
.../ardublock/simulator/view/modules/RGB.java | 11 +--
60 files changed, 154 insertions(+), 143 deletions(-)
diff --git a/src/tec/letsgoing/ardublock/simulator/Simulator.java b/src/tec/letsgoing/ardublock/simulator/Simulator.java
index 24104a3..b8c2da0 100644
--- a/src/tec/letsgoing/ardublock/simulator/Simulator.java
+++ b/src/tec/letsgoing/ardublock/simulator/Simulator.java
@@ -8,6 +8,9 @@ import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.Vector;
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
+
import tec.letsgoing.ardublock.simulator.arduino.Arduino;
import tec.letsgoing.ardublock.simulator.simcode.SimCode;
import tec.letsgoing.ardublock.simulator.simcode.comm.CodeSerialPrint;
@@ -48,6 +51,18 @@ public class Simulator implements Runnable, ActionListener {
* direkt aufgerufen werden.
*/
private Simulator() {
+ try {
+ UIManager.setLookAndFeel(UIManager.getCrossPlatformLookAndFeelClassName());
+
+ } catch (ClassNotFoundException e) {
+ e.printStackTrace();
+ } catch (InstantiationException e) {
+ e.printStackTrace();
+ } catch (IllegalAccessException e) {
+ e.printStackTrace();
+ } catch (UnsupportedLookAndFeelException e) {
+ e.printStackTrace();
+ }
createSubClasses();
}
diff --git a/src/tec/letsgoing/ardublock/simulator/arduino/Arduino.java b/src/tec/letsgoing/ardublock/simulator/arduino/Arduino.java
index aeeb062..0d89a7c 100644
--- a/src/tec/letsgoing/ardublock/simulator/arduino/Arduino.java
+++ b/src/tec/letsgoing/ardublock/simulator/arduino/Arduino.java
@@ -26,6 +26,7 @@ public class Arduino {
/**
* Konstruktor der Klasse Arduino.
+ *
* @param _gui Die GUI Instanz mit welcher die Hardware verknüpft wird.
*/
public Arduino(GUI _gui) {
@@ -37,7 +38,8 @@ public class Arduino {
/**
* Erzeugt eine globale Variable.
- * @param _name Name der Variable
+ *
+ * @param _name Name der Variable
* @param _value Wert der Variable
*/
public void createVariable(String _name, SimCode _value) {
@@ -48,9 +50,11 @@ public class Arduino {
/**
* Setzt eine globale Variable
- * @param _name Name der Variable
+ *
+ * @param _name Name der Variable
* @param _value Wert der Variable
- * @return true, wenn die Variable gesetzt wurde - false, wenn die Variable nicht vorhanden ist.
+ * @return true, wenn die Variable gesetzt wurde - false, wenn die Variable
+ * nicht vorhanden ist.
*/
public boolean setVariable(String _name, SimCode _value) {
for (Variable var : vars) {
@@ -64,8 +68,9 @@ public class Arduino {
}
/**
- * Liest den Wert einer globalen Variable.
- * Sollte diese nicht existieren, so wird die Ausführung des Programms beendet.
+ * Liest den Wert einer globalen Variable. Sollte diese nicht existieren, so
+ * wird die Ausführung des Programms beendet.
+ *
* @param _name Name der Variable
* @return SimCode die Variable
*/
@@ -83,9 +88,11 @@ public class Arduino {
/**
* Die digitalWrite Funktion vom Arduino
- * @param _pin
- * @param _value boolean
- * @return true, wenn Pin korrekt - false, wenn es sich um einen falschen Pin handelt.
+ *
+ * @param _pin
+ * @param _value boolean
+ * @return true, wenn Pin korrekt - false, wenn es sich um einen falschen Pin
+ * handelt.
*
*/
public boolean digitalWrite(int _pin, boolean _value) {
@@ -102,6 +109,7 @@ public class Arduino {
/**
* Funktion um den digitalen Wert eines Pins zu lesen.
+ *
* @param _pin Nummer des Pins
* @return boolean des Pin-Wertes
*/
@@ -117,8 +125,9 @@ public class Arduino {
}
/**
- * Funktion für die analoge PWM Ausgabe.
- * @param _pin Anzusteuernder Pin
+ * Funktion für die analoge PWM Ausgabe.
+ *
+ * @param _pin Anzusteuernder Pin
* @param _value PWM-Wert
* @return true, für PWM Pin - false für nicht PWM-Pin
*/
@@ -136,6 +145,7 @@ public class Arduino {
/**
* Funktion um den analogen Wert eines Pins zu lesen
+ *
* @param _pin Zahl ohne das Vorangestellte A
* @return Wert des Pins
*/
@@ -148,6 +158,7 @@ public class Arduino {
/**
* Funktion um ein speziellen Pin als Objekt zu erhalten
+ *
* @param number Absolute Nummer des Pins
* @return Pin-Objekt
*/
@@ -157,6 +168,7 @@ public class Arduino {
/**
* Reset-Funktion welche alle Variabeln löscht und Pins zurücksetzt.
+ *
* @return true
*/
public boolean reset() {
@@ -177,6 +189,7 @@ public class Arduino {
/**
* Sendet einen Aufruf an die GUI für eine neue SerialPrint Zeile.
+ *
* @param content String welcher ausgegeben werden soll.
*/
public void serialPrint(String content) {
@@ -187,6 +200,7 @@ public class Arduino {
/**
* Füge eine Funktion zum Funktionsspeicher hinzu
+ *
* @param function SimCodeFunction Objekt, welches hinzugefügt werden soll.
*/
public void addFunction(SimCodeFunction function) {
@@ -202,7 +216,8 @@ public class Arduino {
}
/**
- * Berechnung der vergangenen Millisekunden seit Programmstart
+ * Berechnung der vergangenen Millisekunden seit Programmstart
+ *
* @return Millisekunden seit Programmstart.
*/
public int getMillis() {
@@ -211,6 +226,7 @@ public class Arduino {
/**
* Rufe eine Funktion aus dem Funktionsspeicher des Arduino ab.
+ *
* @param name Name der gesuchten Funktion
* @return SimCodeFunction-Objekt dieser Funktion
*/
@@ -226,6 +242,7 @@ public class Arduino {
/**
* Setze das Stop-Flag auf einen boolean-Wert.
+ *
* @param value true für Ausführungsstop
*/
public void setStop(boolean value) {
@@ -234,6 +251,7 @@ public class Arduino {
/**
* Lese das Stop-Flag
+ *
* @return Wert des Stop-Flag
*/
public boolean getStop() {
@@ -241,7 +259,9 @@ public class Arduino {
}
/**
- * Funktion um die Ausführung intern zu beenden und eine Fehlermeldung im SerialLog anzuzeigen.
+ * Funktion um die Ausführung intern zu beenden und eine Fehlermeldung im
+ * SerialLog anzuzeigen.
+ *
* @param error Fehlerbeschreibung für das SerialLog.
*/
public void errorAbort(String error) {
diff --git a/src/tec/letsgoing/ardublock/simulator/simcode/SimCode.java b/src/tec/letsgoing/ardublock/simulator/simcode/SimCode.java
index 5c90307..f73ae9d 100644
--- a/src/tec/letsgoing/ardublock/simulator/simcode/SimCode.java
+++ b/src/tec/letsgoing/ardublock/simulator/simcode/SimCode.java
@@ -7,7 +7,6 @@ import java.util.Vector;
import tec.letsgoing.ardublock.simulator.arduino.Arduino;
import tec.letsgoing.ardublock.simulator.arduino.Variable;
-import tec.letsgoing.ardublock.simulator.simcode.functions.SimCodeFunction;
/**
*
@@ -23,18 +22,23 @@ public abstract class SimCode {
protected Vector<Variable> vars = new Vector<Variable>();
protected boolean isMain = false;
protected Arduino arduino;
- protected SimCode prevStack=null;
+ protected SimCode prevStack = null;
/**
- * Hauptaufruf, welcher während der Simulation ausgeführt wird. Dieser enthält die komplette Logik des Blocks.
- * @param _arduino Die Instanz des Arduinos, damit Zugriffe auf die Hardware möglich sind.
- * @param functionHead Aktueller Funktionskopf um lokale Variablen zu ermöglichen.
- * @return Ein SimCode Objekt sollte eines als "Ergebnis" entstehen. Ansonsten null
+ * Hauptaufruf, welcher während der Simulation ausgeführt wird. Dieser enthält
+ * die komplette Logik des Blocks.
+ *
+ * @param _arduino Die Instanz des Arduinos, damit Zugriffe auf die Hardware
+ * möglich sind.
+ * @param functionHead Aktueller Funktionskopf um lokale Variablen zu
+ * ermöglichen.
+ * @return Ein SimCode Objekt sollte eines als "Ergebnis" entstehen. Ansonsten
+ * null
*/
public abstract SimCode run(Arduino _arduino, SimCode functionHead);
public abstract String toString();
-
+
public void createVariable(String _name, SimCode _value) {
if (!isMain) {
vars.add(new Variable(_name));
@@ -51,9 +55,9 @@ public abstract class SimCode {
return true;
}
}
- if (prevStack!=null) {
- if(prevStack.setVariable(_name, _value))
- return true;
+ if (prevStack != null) {
+ if (prevStack.setVariable(_name, _value))
+ return true;
}
if (arduino.setVariable(_name, _value))
return true;
@@ -68,7 +72,7 @@ public abstract class SimCode {
return var.getValue();
}
}
- if (prevStack!=null) {
+ if (prevStack != null) {
return prevStack.readVariable(_name);
}
return arduino.readVariable(_name);
diff --git a/src/tec/letsgoing/ardublock/simulator/simcode/comm/CodeConnectString.java b/src/tec/letsgoing/ardublock/simulator/simcode/comm/CodeConnectString.java
index 454d740..b511c88 100644
--- a/src/tec/letsgoing/ardublock/simulator/simcode/comm/CodeConnectString.java
+++ b/src/tec/letsgoing/ardublock/simulator/simcode/comm/CodeConnectString.java
@@ -6,7 +6,6 @@ package tec.letsgoing.ardublock.simulator.simcode.comm;
import tec.letsgoing.ardublock.simulator.arduino.Arduino;
import tec.letsgoing.ardublock.simulator.simcode.SimCode;
import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeString;
-import tec.letsgoing.ardublock.simulator.simcode.functions.SimCodeFunction;
/**
* Verbinde zwei beliebige Blöcke miteinander zu einem String.
diff --git a/src/tec/letsgoing/ardublock/simulator/simcode/comm/CodeSerialPrint.java b/src/tec/letsgoing/ardublock/simulator/simcode/comm/CodeSerialPrint.java
index 234dc85..5547e7a 100644
--- a/src/tec/letsgoing/ardublock/simulator/simcode/comm/CodeSerialPrint.java
+++ b/src/tec/letsgoing/ardublock/simulator/simcode/comm/CodeSerialPrint.java
@@ -7,7 +7,6 @@ import tec.letsgoing.ardublock.simulator.arduino.Arduino;
import tec.letsgoing.ardublock.simulator.simcode.SimCode;
import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeBool;
import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeString;
-import tec.letsgoing.ardublock.simulator.simcode.functions.SimCodeFunction;
/**
* Sende Nachricht via Serial
diff --git a/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeDelay.java b/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeDelay.java
index 4da7881..09eabc5 100644
--- a/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeDelay.java
+++ b/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeDelay.java
@@ -6,7 +6,6 @@ package tec.letsgoing.ardublock.simulator.simcode.control;
import tec.letsgoing.ardublock.simulator.arduino.Arduino;
import tec.letsgoing.ardublock.simulator.simcode.SimCode;
import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeInt;
-import tec.letsgoing.ardublock.simulator.simcode.functions.SimCodeFunction;
/**
* Warte Millisekunden.
diff --git a/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeElse.java b/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeElse.java
index c8779be..a7055de 100644
--- a/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeElse.java
+++ b/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeElse.java
@@ -9,7 +9,6 @@ import tec.letsgoing.ardublock.simulator.arduino.Arduino;
import tec.letsgoing.ardublock.simulator.arduino.Variable;
import tec.letsgoing.ardublock.simulator.simcode.SimCode;
import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeIf;
-import tec.letsgoing.ardublock.simulator.simcode.functions.SimCodeFunction;
/**
* Führe Befehle aus, falls "falls"-Block FALSCH (und evtl. "sonst falls"-Block)
@@ -27,8 +26,8 @@ public class CodeElse extends SimTypeIf {
@Override
public SimCode run(Arduino _arduino, SimCode functionHead) {
- super.prevStack=functionHead;
- super.arduino=_arduino;
+ super.prevStack = functionHead;
+ super.arduino = _arduino;
super.vars = new Vector<Variable>();
for (SimCode block : codeBlocks) {
diff --git a/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeElseIf.java b/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeElseIf.java
index 929f80c..86a6823 100644
--- a/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeElseIf.java
+++ b/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeElseIf.java
@@ -10,7 +10,6 @@ import tec.letsgoing.ardublock.simulator.arduino.Variable;
import tec.letsgoing.ardublock.simulator.simcode.SimCode;
import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeBool;
import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeIf;
-import tec.letsgoing.ardublock.simulator.simcode.functions.SimCodeFunction;
/**
* Führe die Befehle aus wenn falls-Block FALSCH ist und Bedingung WAHR ist.
@@ -33,8 +32,8 @@ public class CodeElseIf extends SimTypeIf {
public SimTypeBool run(Arduino _arduino, SimCode functionHead) {
if (condition.run(_arduino, functionHead).getValue()) {
// Condition met.
- super.prevStack=functionHead;
- super.arduino=_arduino;
+ super.prevStack = functionHead;
+ super.arduino = _arduino;
super.vars = new Vector<Variable>();
for (SimCode block : codeBlocks) {
block.run(_arduino, this);
diff --git a/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeFor.java b/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeFor.java
index 808612d..7b868e0 100644
--- a/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeFor.java
+++ b/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeFor.java
@@ -9,7 +9,6 @@ import tec.letsgoing.ardublock.simulator.arduino.Arduino;
import tec.letsgoing.ardublock.simulator.arduino.Variable;
import tec.letsgoing.ardublock.simulator.simcode.SimCode;
import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeInt;
-import tec.letsgoing.ardublock.simulator.simcode.functions.SimCodeFunction;
/**
*
@@ -29,8 +28,8 @@ public class CodeFor extends SimCode {
@Override
public SimCode run(Arduino _arduino, SimCode functionHead) {
- super.prevStack=functionHead;
- super.arduino=_arduino;
+ super.prevStack = functionHead;
+ super.arduino = _arduino;
super.vars = new Vector<Variable>();
for (int i = 0; i < count.run(_arduino, functionHead).getValue(); i++) {
for (SimCode code : codeBlocks) {
diff --git a/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeForCount.java b/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeForCount.java
index 24b4faf..abeeb7e 100644
--- a/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeForCount.java
+++ b/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeForCount.java
@@ -10,7 +10,6 @@ import tec.letsgoing.ardublock.simulator.arduino.Variable;
import tec.letsgoing.ardublock.simulator.simcode.SimCode;
import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeInt;
import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeString;
-import tec.letsgoing.ardublock.simulator.simcode.functions.SimCodeFunction;
/**
* Wiederhole die Befehle x-mal. Die Wiederholungen werden in der Variable
@@ -32,8 +31,8 @@ public class CodeForCount extends SimCode {
@Override
public SimCode run(Arduino _arduino, SimCode functionHead) {
- super.prevStack=functionHead;
- super.arduino=_arduino;
+ super.prevStack = functionHead;
+ super.arduino = _arduino;
super.vars = new Vector<Variable>();
this.createVariable(varname.toString(), new SimTypeInt(0));
for (int i = 0; i < count.run(_arduino, functionHead).getValue(); i++) {
diff --git a/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeIf.java b/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeIf.java
index a1e56c1..b640938 100644
--- a/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeIf.java
+++ b/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeIf.java
@@ -10,7 +10,6 @@ import tec.letsgoing.ardublock.simulator.arduino.Variable;
import tec.letsgoing.ardublock.simulator.simcode.SimCode;
import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeBool;
import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeIf;
-import tec.letsgoing.ardublock.simulator.simcode.functions.SimCodeFunction;
/**
* Führe Befehle aus, wenn die Bedingung WAHR ist.
@@ -35,8 +34,8 @@ public class CodeIf extends SimTypeIf {
*/
public SimCode run(Arduino _arduino, SimCode functionHead) {
if (condition.run(_arduino, functionHead).getValue()) {
- super.prevStack=functionHead;
- super.arduino=_arduino;
+ super.prevStack = functionHead;
+ super.arduino = _arduino;
super.vars = new Vector<Variable>();
for (SimCode block : codeBlocks) {
block.run(_arduino, this);
diff --git a/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeWhile.java b/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeWhile.java
index 901a0f3..0570388 100644
--- a/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeWhile.java
+++ b/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeWhile.java
@@ -9,7 +9,6 @@ import tec.letsgoing.ardublock.simulator.arduino.Arduino;
import tec.letsgoing.ardublock.simulator.arduino.Variable;
import tec.letsgoing.ardublock.simulator.simcode.SimCode;
import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeBool;
-import tec.letsgoing.ardublock.simulator.simcode.functions.SimCodeFunction;
/**
* Führe Befehle aus, solange die Bedingung WAHR ist.
@@ -29,8 +28,8 @@ public class CodeWhile extends SimCode {
@Override
public SimCode run(Arduino _arduino, SimCode functionHead) {
while (!_arduino.getStop() && condition.run(_arduino, functionHead).getValue()) {
- super.prevStack=functionHead;
- super.arduino=_arduino;
+ super.prevStack = functionHead;
+ super.arduino = _arduino;
super.vars = new Vector<Variable>();
for (SimCode code : codeBlocks) {
code.run(_arduino, this);
diff --git a/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeWhileMillis.java b/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeWhileMillis.java
index 47dd3a5..968d0d0 100644
--- a/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeWhileMillis.java
+++ b/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeWhileMillis.java
@@ -10,7 +10,6 @@ import tec.letsgoing.ardublock.simulator.arduino.Variable;
import tec.letsgoing.ardublock.simulator.simcode.SimCode;
import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeInt;
import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeString;
-import tec.letsgoing.ardublock.simulator.simcode.functions.SimCodeFunction;
/**
* Befehle ausserhalb von mache werden nur alle x-Millisekunden ausgeführt\nDie
@@ -32,8 +31,8 @@ public class CodeWhileMillis extends SimCode {
@Override
public SimCode run(Arduino _arduino, SimCode functionHead) {
- super.prevStack=functionHead;
- super.arduino=_arduino;
+ super.prevStack = functionHead;
+ super.arduino = _arduino;
super.vars = new Vector<Variable>();
this.setVariable(varname.toString(), new SimTypeInt(_arduino.getMillis()));
int startTime = _arduino.getMillis();
diff --git a/src/tec/letsgoing/ardublock/simulator/simcode/datatypes/SimTypeBool.java b/src/tec/letsgoing/ardublock/simulator/simcode/datatypes/SimTypeBool.java
index 2e86f96..890be2a 100644
--- a/src/tec/letsgoing/ardublock/simulator/simcode/datatypes/SimTypeBool.java
+++ b/src/tec/letsgoing/ardublock/simulator/simcode/datatypes/SimTypeBool.java
@@ -5,7 +5,6 @@ package tec.letsgoing.ardublock.simulator.simcode.datatypes;
import tec.letsgoing.ardublock.simulator.arduino.Arduino;
import tec.letsgoing.ardublock.simulator.simcode.SimCode;
-import tec.letsgoing.ardublock.simulator.simcode.functions.SimCodeFunction;
/**
* Klasse für einen BooldatenTyp
diff --git a/src/tec/letsgoing/ardublock/simulator/simcode/datatypes/SimTypeIf.java b/src/tec/letsgoing/ardublock/simulator/simcode/datatypes/SimTypeIf.java
index 0efd6b4..1583470 100644
--- a/src/tec/letsgoing/ardublock/simulator/simcode/datatypes/SimTypeIf.java
+++ b/src/tec/letsgoing/ardublock/simulator/simcode/datatypes/SimTypeIf.java
@@ -5,7 +5,6 @@ package tec.letsgoing.ardublock.simulator.simcode.datatypes;
import tec.letsgoing.ardublock.simulator.arduino.Arduino;
import tec.letsgoing.ardublock.simulator.simcode.SimCode;
-import tec.letsgoing.ardublock.simulator.simcode.functions.SimCodeFunction;
/**
* Unterklasse für die If-Codeblöcke
diff --git a/src/tec/letsgoing/ardublock/simulator/simcode/datatypes/SimTypeInt.java b/src/tec/letsgoing/ardublock/simulator/simcode/datatypes/SimTypeInt.java
index d6e4554..691cc9f 100644
--- a/src/tec/letsgoing/ardublock/simulator/simcode/datatypes/SimTypeInt.java
+++ b/src/tec/letsgoing/ardublock/simulator/simcode/datatypes/SimTypeInt.java
@@ -5,7 +5,6 @@ package tec.letsgoing.ardublock.simulator.simcode.datatypes;
import tec.letsgoing.ardublock.simulator.arduino.Arduino;
import tec.letsgoing.ardublock.simulator.simcode.SimCode;
-import tec.letsgoing.ardublock.simulator.simcode.functions.SimCodeFunction;
/**
* Klasse für einen Int-Datentyp
diff --git a/src/tec/letsgoing/ardublock/simulator/simcode/datatypes/SimTypeString.java b/src/tec/letsgoing/ardublock/simulator/simcode/datatypes/SimTypeString.java
index cb79ed0..b78de39 100644
--- a/src/tec/letsgoing/ardublock/simulator/simcode/datatypes/SimTypeString.java
+++ b/src/tec/letsgoing/ardublock/simulator/simcode/datatypes/SimTypeString.java
@@ -5,7 +5,6 @@ package tec.letsgoing.ardublock.simulator.simcode.datatypes;
import tec.letsgoing.ardublock.simulator.arduino.Arduino;
import tec.letsgoing.ardublock.simulator.simcode.SimCode;
-import tec.letsgoing.ardublock.simulator.simcode.functions.SimCodeFunction;
/**
* Klasse für einen Zeichenketten Datentyp
diff --git a/src/tec/letsgoing/ardublock/simulator/simcode/functions/SimCodeFunction.java b/src/tec/letsgoing/ardublock/simulator/simcode/functions/SimCodeFunction.java
index c859444..937f363 100644
--- a/src/tec/letsgoing/ardublock/simulator/simcode/functions/SimCodeFunction.java
+++ b/src/tec/letsgoing/ardublock/simulator/simcode/functions/SimCodeFunction.java
@@ -19,8 +19,6 @@ public class SimCodeFunction extends SimCode {
private String name;
private Vector<SimCode> codeBlocks = new Vector<SimCode>();
-
-
public SimCodeFunction(String _name, Vector<SimCode> vec) {
name = _name;
codeBlocks = vec;
@@ -30,9 +28,9 @@ public class SimCodeFunction extends SimCode {
if (functionHead == null) {
super.isMain = true;
} else {
- super.prevStack=functionHead;
+ super.prevStack = functionHead;
}
-
+
super.arduino = _arduino;
super.vars = new Vector<Variable>();
for (SimCode code : codeBlocks) {
@@ -45,8 +43,6 @@ public class SimCodeFunction extends SimCode {
return name;
}
-
-
@Override
public String toString() {
return null;
diff --git a/src/tec/letsgoing/ardublock/simulator/simcode/io/CodeAnalogRead.java b/src/tec/letsgoing/ardublock/simulator/simcode/io/CodeAnalogRead.java
index 13aa62a..983eec4 100644
--- a/src/tec/letsgoing/ardublock/simulator/simcode/io/CodeAnalogRead.java
+++ b/src/tec/letsgoing/ardublock/simulator/simcode/io/CodeAnalogRead.java
@@ -6,7 +6,6 @@ package tec.letsgoing.ardublock.simulator.simcode.io;
import tec.letsgoing.ardublock.simulator.arduino.Arduino;
import tec.letsgoing.ardublock.simulator.simcode.SimCode;
import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeInt;
-import tec.letsgoing.ardublock.simulator.simcode.functions.SimCodeFunction;
/**
* Liest den analogen Wert vom Pin [0V=0;5V=1023]
diff --git a/src/tec/letsgoing/ardublock/simulator/simcode/io/CodeAnalogWrite.java b/src/tec/letsgoing/ardublock/simulator/simcode/io/CodeAnalogWrite.java
index 7ded6d0..6814e10 100644
--- a/src/tec/letsgoing/ardublock/simulator/simcode/io/CodeAnalogWrite.java
+++ b/src/tec/letsgoing/ardublock/simulator/simcode/io/CodeAnalogWrite.java
@@ -6,7 +6,6 @@ package tec.letsgoing.ardublock.simulator.simcode.io;
import tec.letsgoing.ardublock.simulator.arduino.Arduino;
import tec.letsgoing.ardublock.simulator.simcode.SimCode;
import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeInt;
-import tec.letsgoing.ardublock.simulator.simcode.functions.SimCodeFunction;
/**
* PWM-Ausgang Wert[0-255] zuweisen
diff --git a/src/tec/letsgoing/ardublock/simulator/simcode/io/CodeDigitalRead.java b/src/tec/letsgoing/ardublock/simulator/simcode/io/CodeDigitalRead.java
index 2da3999..6b7d32e 100644
--- a/src/tec/letsgoing/ardublock/simulator/simcode/io/CodeDigitalRead.java
+++ b/src/tec/letsgoing/ardublock/simulator/simcode/io/CodeDigitalRead.java
@@ -7,7 +7,6 @@ import tec.letsgoing.ardublock.simulator.arduino.Arduino;
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.functions.SimCodeFunction;
/**
* Liest den digitalen Wert des Pins ein [HIGH/LOW]
diff --git a/src/tec/letsgoing/ardublock/simulator/simcode/io/CodeDigitalWrite.java b/src/tec/letsgoing/ardublock/simulator/simcode/io/CodeDigitalWrite.java
index af4acbf..3bd1ad8 100644
--- a/src/tec/letsgoing/ardublock/simulator/simcode/io/CodeDigitalWrite.java
+++ b/src/tec/letsgoing/ardublock/simulator/simcode/io/CodeDigitalWrite.java
@@ -7,7 +7,6 @@ import tec.letsgoing.ardublock.simulator.arduino.Arduino;
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.functions.SimCodeFunction;
/**
* Ausgang eines digitalen Ausgangs festlegen (HIGH/LOW)
diff --git a/src/tec/letsgoing/ardublock/simulator/simcode/logic/CodeAND.java b/src/tec/letsgoing/ardublock/simulator/simcode/logic/CodeAND.java
index 540221a..8365410 100644
--- a/src/tec/letsgoing/ardublock/simulator/simcode/logic/CodeAND.java
+++ b/src/tec/letsgoing/ardublock/simulator/simcode/logic/CodeAND.java
@@ -6,7 +6,6 @@ package tec.letsgoing.ardublock.simulator.simcode.logic;
import tec.letsgoing.ardublock.simulator.arduino.Arduino;
import tec.letsgoing.ardublock.simulator.simcode.SimCode;
import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeBool;
-import tec.letsgoing.ardublock.simulator.simcode.functions.SimCodeFunction;
/**
* WAHR wenn beide Bedingungen erfüllt sind.
diff --git a/src/tec/letsgoing/ardublock/simulator/simcode/logic/CodeBoolEqual.java b/src/tec/letsgoing/ardublock/simulator/simcode/logic/CodeBoolEqual.java
index c2fcfb5..8d00414 100644
--- a/src/tec/letsgoing/ardublock/simulator/simcode/logic/CodeBoolEqual.java
+++ b/src/tec/letsgoing/ardublock/simulator/simcode/logic/CodeBoolEqual.java
@@ -6,7 +6,6 @@ package tec.letsgoing.ardublock.simulator.simcode.logic;
import tec.letsgoing.ardublock.simulator.arduino.Arduino;
import tec.letsgoing.ardublock.simulator.simcode.SimCode;
import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeBool;
-import tec.letsgoing.ardublock.simulator.simcode.functions.SimCodeFunction;
/**
* WAHR wenn die beiden Bool-Werte identisch sind.
diff --git a/src/tec/letsgoing/ardublock/simulator/simcode/logic/CodeBoolUnequal.java b/src/tec/letsgoing/ardublock/simulator/simcode/logic/CodeBoolUnequal.java
index f962ace..703ab78 100644
--- a/src/tec/letsgoing/ardublock/simulator/simcode/logic/CodeBoolUnequal.java
+++ b/src/tec/letsgoing/ardublock/simulator/simcode/logic/CodeBoolUnequal.java
@@ -6,7 +6,6 @@ package tec.letsgoing.ardublock.simulator.simcode.logic;
import tec.letsgoing.ardublock.simulator.arduino.Arduino;
import tec.letsgoing.ardublock.simulator.simcode.SimCode;
import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeBool;
-import tec.letsgoing.ardublock.simulator.simcode.functions.SimCodeFunction;
/**
* WAHR wenn die beiden Bool-Werte ungleich sind
diff --git a/src/tec/letsgoing/ardublock/simulator/simcode/logic/CodeIntBigger.java b/src/tec/letsgoing/ardublock/simulator/simcode/logic/CodeIntBigger.java
index 03d880f..a36c474 100644
--- a/src/tec/letsgoing/ardublock/simulator/simcode/logic/CodeIntBigger.java
+++ b/src/tec/letsgoing/ardublock/simulator/simcode/logic/CodeIntBigger.java
@@ -7,7 +7,6 @@ import tec.letsgoing.ardublock.simulator.arduino.Arduino;
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.functions.SimCodeFunction;
/**
* WAHR wenn der Erste Wert größer als der Zweite ist
diff --git a/src/tec/letsgoing/ardublock/simulator/simcode/logic/CodeIntBiggerEqual.java b/src/tec/letsgoing/ardublock/simulator/simcode/logic/CodeIntBiggerEqual.java
index 31e6aab..917f3d5 100644
--- a/src/tec/letsgoing/ardublock/simulator/simcode/logic/CodeIntBiggerEqual.java
+++ b/src/tec/letsgoing/ardublock/simulator/simcode/logic/CodeIntBiggerEqual.java
@@ -7,7 +7,6 @@ import tec.letsgoing.ardublock.simulator.arduino.Arduino;
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.functions.SimCodeFunction;
/**
* WAHR wenn der Erste Wert größer oder gleich wie der Zweite ist
diff --git a/src/tec/letsgoing/ardublock/simulator/simcode/logic/CodeIntEqual.java b/src/tec/letsgoing/ardublock/simulator/simcode/logic/CodeIntEqual.java
index b5618de..ea41bc1 100644
--- a/src/tec/letsgoing/ardublock/simulator/simcode/logic/CodeIntEqual.java
+++ b/src/tec/letsgoing/ardublock/simulator/simcode/logic/CodeIntEqual.java
@@ -7,7 +7,6 @@ import tec.letsgoing.ardublock.simulator.arduino.Arduino;
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.functions.SimCodeFunction;
/**
* WAHR wenn beide Int Werte gleich sind.
diff --git a/src/tec/letsgoing/ardublock/simulator/simcode/logic/CodeIntSmaller.java b/src/tec/letsgoing/ardublock/simulator/simcode/logic/CodeIntSmaller.java
index d3c833d..3cb331a 100644
--- a/src/tec/letsgoing/ardublock/simulator/simcode/logic/CodeIntSmaller.java
+++ b/src/tec/letsgoing/ardublock/simulator/simcode/logic/CodeIntSmaller.java
@@ -7,7 +7,6 @@ import tec.letsgoing.ardublock.simulator.arduino.Arduino;
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.functions.SimCodeFunction;
/**
* WAHR wenn der Erste Wert kleiner als der Zweite ist
diff --git a/src/tec/letsgoing/ardublock/simulator/simcode/logic/CodeIntSmallerEqual.java b/src/tec/letsgoing/ardublock/simulator/simcode/logic/CodeIntSmallerEqual.java
index 5247e7a..a2c5782 100644
--- a/src/tec/letsgoing/ardublock/simulator/simcode/logic/CodeIntSmallerEqual.java
+++ b/src/tec/letsgoing/ardublock/simulator/simcode/logic/CodeIntSmallerEqual.java
@@ -7,7 +7,6 @@ import tec.letsgoing.ardublock.simulator.arduino.Arduino;
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.functions.SimCodeFunction;
/**
* WAHR wenn der erste Wert kleiner oder gleich dem Zweiten ist.
diff --git a/src/tec/letsgoing/ardublock/simulator/simcode/logic/CodeIntUnequal.java b/src/tec/letsgoing/ardublock/simulator/simcode/logic/CodeIntUnequal.java
index 18a0c4d..0be5e2a 100644
--- a/src/tec/letsgoing/ardublock/simulator/simcode/logic/CodeIntUnequal.java
+++ b/src/tec/letsgoing/ardublock/simulator/simcode/logic/CodeIntUnequal.java
@@ -7,7 +7,6 @@ import tec.letsgoing.ardublock.simulator.arduino.Arduino;
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.functions.SimCodeFunction;
/**
* WAHR wenn die beiden Int-Werte ungleich sind.
diff --git a/src/tec/letsgoing/ardublock/simulator/simcode/logic/CodeNOT.java b/src/tec/letsgoing/ardublock/simulator/simcode/logic/CodeNOT.java
index d76be9d..9b2a233 100644
--- a/src/tec/letsgoing/ardublock/simulator/simcode/logic/CodeNOT.java
+++ b/src/tec/letsgoing/ardublock/simulator/simcode/logic/CodeNOT.java
@@ -6,7 +6,6 @@ package tec.letsgoing.ardublock.simulator.simcode.logic;
import tec.letsgoing.ardublock.simulator.arduino.Arduino;
import tec.letsgoing.ardublock.simulator.simcode.SimCode;
import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeBool;
-import tec.letsgoing.ardublock.simulator.simcode.functions.SimCodeFunction;
/**
* WAHR wenn der Wert FALSCH ist.
diff --git a/src/tec/letsgoing/ardublock/simulator/simcode/logic/CodeOR.java b/src/tec/letsgoing/ardublock/simulator/simcode/logic/CodeOR.java
index e5eb077..4653d28 100644
--- a/src/tec/letsgoing/ardublock/simulator/simcode/logic/CodeOR.java
+++ b/src/tec/letsgoing/ardublock/simulator/simcode/logic/CodeOR.java
@@ -6,7 +6,6 @@ package tec.letsgoing.ardublock.simulator.simcode.logic;
import tec.letsgoing.ardublock.simulator.arduino.Arduino;
import tec.letsgoing.ardublock.simulator.simcode.SimCode;
import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeBool;
-import tec.letsgoing.ardublock.simulator.simcode.functions.SimCodeFunction;
/**
* WAHR wenn einer der beiden Werte WAHR ist
diff --git a/src/tec/letsgoing/ardublock/simulator/simcode/logic/CodeStringEqual.java b/src/tec/letsgoing/ardublock/simulator/simcode/logic/CodeStringEqual.java
index 79fd105..b4bf1e7 100644
--- a/src/tec/letsgoing/ardublock/simulator/simcode/logic/CodeStringEqual.java
+++ b/src/tec/letsgoing/ardublock/simulator/simcode/logic/CodeStringEqual.java
@@ -7,7 +7,6 @@ import tec.letsgoing.ardublock.simulator.arduino.Arduino;
import tec.letsgoing.ardublock.simulator.simcode.SimCode;
import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeBool;
import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeString;
-import tec.letsgoing.ardublock.simulator.simcode.functions.SimCodeFunction;
/**
* WAHR wenn beide Zeichenketten den identischen Inhalt besitzen
diff --git a/src/tec/letsgoing/ardublock/simulator/simcode/logic/CodeStringUnequal.java b/src/tec/letsgoing/ardublock/simulator/simcode/logic/CodeStringUnequal.java
index 9b8b331..d013c49 100644
--- a/src/tec/letsgoing/ardublock/simulator/simcode/logic/CodeStringUnequal.java
+++ b/src/tec/letsgoing/ardublock/simulator/simcode/logic/CodeStringUnequal.java
@@ -7,7 +7,6 @@ import tec.letsgoing.ardublock.simulator.arduino.Arduino;
import tec.letsgoing.ardublock.simulator.simcode.SimCode;
import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeBool;
import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeString;
-import tec.letsgoing.ardublock.simulator.simcode.functions.SimCodeFunction;
/**
* WAHR wenn beide Zeichenketten nicht identisch sind.
diff --git a/src/tec/letsgoing/ardublock/simulator/simcode/math/CodeAbs.java b/src/tec/letsgoing/ardublock/simulator/simcode/math/CodeAbs.java
index 3825236..ab19e14 100644
--- a/src/tec/letsgoing/ardublock/simulator/simcode/math/CodeAbs.java
+++ b/src/tec/letsgoing/ardublock/simulator/simcode/math/CodeAbs.java
@@ -6,7 +6,6 @@ package tec.letsgoing.ardublock.simulator.simcode.math;
import tec.letsgoing.ardublock.simulator.arduino.Arduino;
import tec.letsgoing.ardublock.simulator.simcode.SimCode;
import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeInt;
-import tec.letsgoing.ardublock.simulator.simcode.functions.SimCodeFunction;
/**
* Der Betrag einer Zahl
diff --git a/src/tec/letsgoing/ardublock/simulator/simcode/math/CodeAdd.java b/src/tec/letsgoing/ardublock/simulator/simcode/math/CodeAdd.java
index c3496b0..ff002e2 100644
--- a/src/tec/letsgoing/ardublock/simulator/simcode/math/CodeAdd.java
+++ b/src/tec/letsgoing/ardublock/simulator/simcode/math/CodeAdd.java
@@ -6,7 +6,6 @@ package tec.letsgoing.ardublock.simulator.simcode.math;
import tec.letsgoing.ardublock.simulator.arduino.Arduino;
import tec.letsgoing.ardublock.simulator.simcode.SimCode;
import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeInt;
-import tec.letsgoing.ardublock.simulator.simcode.functions.SimCodeFunction;
/**
* Die Addition zweier Zahlen
diff --git a/src/tec/letsgoing/ardublock/simulator/simcode/math/CodeDivison.java b/src/tec/letsgoing/ardublock/simulator/simcode/math/CodeDivison.java
index 56d8ae0..2dfe427 100644
--- a/src/tec/letsgoing/ardublock/simulator/simcode/math/CodeDivison.java
+++ b/src/tec/letsgoing/ardublock/simulator/simcode/math/CodeDivison.java
@@ -6,7 +6,6 @@ package tec.letsgoing.ardublock.simulator.simcode.math;
import tec.letsgoing.ardublock.simulator.arduino.Arduino;
import tec.letsgoing.ardublock.simulator.simcode.SimCode;
import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeInt;
-import tec.letsgoing.ardublock.simulator.simcode.functions.SimCodeFunction;
/**
* Die Division zweier Zahlen
diff --git a/src/tec/letsgoing/ardublock/simulator/simcode/math/CodeLimit.java b/src/tec/letsgoing/ardublock/simulator/simcode/math/CodeLimit.java
index 89b7cf2..8a64989 100644
--- a/src/tec/letsgoing/ardublock/simulator/simcode/math/CodeLimit.java
+++ b/src/tec/letsgoing/ardublock/simulator/simcode/math/CodeLimit.java
@@ -6,7 +6,6 @@ package tec.letsgoing.ardublock.simulator.simcode.math;
import tec.letsgoing.ardublock.simulator.arduino.Arduino;
import tec.letsgoing.ardublock.simulator.simcode.SimCode;
import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeInt;
-import tec.letsgoing.ardublock.simulator.simcode.functions.SimCodeFunction;
/**
* Limitiere einen analogen Wert
diff --git a/src/tec/letsgoing/ardublock/simulator/simcode/math/CodeMap.java b/src/tec/letsgoing/ardublock/simulator/simcode/math/CodeMap.java
index 7ba4cc4..7370d49 100644
--- a/src/tec/letsgoing/ardublock/simulator/simcode/math/CodeMap.java
+++ b/src/tec/letsgoing/ardublock/simulator/simcode/math/CodeMap.java
@@ -6,7 +6,6 @@ package tec.letsgoing.ardublock.simulator.simcode.math;
import tec.letsgoing.ardublock.simulator.arduino.Arduino;
import tec.letsgoing.ardublock.simulator.simcode.SimCode;
import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeInt;
-import tec.letsgoing.ardublock.simulator.simcode.functions.SimCodeFunction;
/**
* Ordne einen Wert aus dem Bereich "von" auf den Bereich "zu"
diff --git a/src/tec/letsgoing/ardublock/simulator/simcode/math/CodeMap10to8.java b/src/tec/letsgoing/ardublock/simulator/simcode/math/CodeMap10to8.java
index 8268abd..977e1a2 100644
--- a/src/tec/letsgoing/ardublock/simulator/simcode/math/CodeMap10to8.java
+++ b/src/tec/letsgoing/ardublock/simulator/simcode/math/CodeMap10to8.java
@@ -6,7 +6,6 @@ package tec.letsgoing.ardublock.simulator.simcode.math;
import tec.letsgoing.ardublock.simulator.arduino.Arduino;
import tec.letsgoing.ardublock.simulator.simcode.SimCode;
import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeInt;
-import tec.letsgoing.ardublock.simulator.simcode.functions.SimCodeFunction;
/**
* Ordne Werte aus dem Bereich [0,1023] auf den Bereich von [0,255] zu. (10 Bit
diff --git a/src/tec/letsgoing/ardublock/simulator/simcode/math/CodeMax.java b/src/tec/letsgoing/ardublock/simulator/simcode/math/CodeMax.java
index 65a161f..05d3877 100644
--- a/src/tec/letsgoing/ardublock/simulator/simcode/math/CodeMax.java
+++ b/src/tec/letsgoing/ardublock/simulator/simcode/math/CodeMax.java
@@ -6,7 +6,6 @@ package tec.letsgoing.ardublock.simulator.simcode.math;
import tec.letsgoing.ardublock.simulator.arduino.Arduino;
import tec.letsgoing.ardublock.simulator.simcode.SimCode;
import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeInt;
-import tec.letsgoing.ardublock.simulator.simcode.functions.SimCodeFunction;
/**
* Die Größere Zahl der beiden Eingaben
diff --git a/src/tec/letsgoing/ardublock/simulator/simcode/math/CodeMin.java b/src/tec/letsgoing/ardublock/simulator/simcode/math/CodeMin.java
index 163cfc8..8ed4c25 100644
--- a/src/tec/letsgoing/ardublock/simulator/simcode/math/CodeMin.java
+++ b/src/tec/letsgoing/ardublock/simulator/simcode/math/CodeMin.java
@@ -6,7 +6,6 @@ package tec.letsgoing.ardublock.simulator.simcode.math;
import tec.letsgoing.ardublock.simulator.arduino.Arduino;
import tec.letsgoing.ardublock.simulator.simcode.SimCode;
import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeInt;
-import tec.letsgoing.ardublock.simulator.simcode.functions.SimCodeFunction;
/**
* Die kleinere Zahl der beiden Eingaben
diff --git a/src/tec/letsgoing/ardublock/simulator/simcode/math/CodeMinus.java b/src/tec/letsgoing/ardublock/simulator/simcode/math/CodeMinus.java
index 71cc36b..e3a5748 100644
--- a/src/tec/letsgoing/ardublock/simulator/simcode/math/CodeMinus.java
+++ b/src/tec/letsgoing/ardublock/simulator/simcode/math/CodeMinus.java
@@ -6,7 +6,6 @@ package tec.letsgoing.ardublock.simulator.simcode.math;
import tec.letsgoing.ardublock.simulator.arduino.Arduino;
import tec.letsgoing.ardublock.simulator.simcode.SimCode;
import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeInt;
-import tec.letsgoing.ardublock.simulator.simcode.functions.SimCodeFunction;
/**
* Die Differenz der beiden Zahlen
diff --git a/src/tec/letsgoing/ardublock/simulator/simcode/math/CodeModulo.java b/src/tec/letsgoing/ardublock/simulator/simcode/math/CodeModulo.java
index 34606a8..87077ed 100644
--- a/src/tec/letsgoing/ardublock/simulator/simcode/math/CodeModulo.java
+++ b/src/tec/letsgoing/ardublock/simulator/simcode/math/CodeModulo.java
@@ -6,7 +6,6 @@ package tec.letsgoing.ardublock.simulator.simcode.math;
import tec.letsgoing.ardublock.simulator.arduino.Arduino;
import tec.letsgoing.ardublock.simulator.simcode.SimCode;
import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeInt;
-import tec.letsgoing.ardublock.simulator.simcode.functions.SimCodeFunction;
/**
* Die Modulooperation von zwei Zahlen
diff --git a/src/tec/letsgoing/ardublock/simulator/simcode/math/CodeProduct.java b/src/tec/letsgoing/ardublock/simulator/simcode/math/CodeProduct.java
index bca6e91..a7b2242 100644
--- a/src/tec/letsgoing/ardublock/simulator/simcode/math/CodeProduct.java
+++ b/src/tec/letsgoing/ardublock/simulator/simcode/math/CodeProduct.java
@@ -6,7 +6,6 @@ package tec.letsgoing.ardublock.simulator.simcode.math;
import tec.letsgoing.ardublock.simulator.arduino.Arduino;
import tec.letsgoing.ardublock.simulator.simcode.SimCode;
import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeInt;
-import tec.letsgoing.ardublock.simulator.simcode.functions.SimCodeFunction;
/**
* Das Produkt aus 2 Zahlen
diff --git a/src/tec/letsgoing/ardublock/simulator/simcode/math/CodeRandMax.java b/src/tec/letsgoing/ardublock/simulator/simcode/math/CodeRandMax.java
index 3ad1a33..89a83b5 100644
--- a/src/tec/letsgoing/ardublock/simulator/simcode/math/CodeRandMax.java
+++ b/src/tec/letsgoing/ardublock/simulator/simcode/math/CodeRandMax.java
@@ -6,7 +6,6 @@ package tec.letsgoing.ardublock.simulator.simcode.math;
import tec.letsgoing.ardublock.simulator.arduino.Arduino;
import tec.letsgoing.ardublock.simulator.simcode.SimCode;
import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeInt;
-import tec.letsgoing.ardublock.simulator.simcode.functions.SimCodeFunction;
/**
* Erzeuge eine Zufallszahl zwischen 0 und max-1
diff --git a/src/tec/letsgoing/ardublock/simulator/simcode/math/CodeRandMinMax.java b/src/tec/letsgoing/ardublock/simulator/simcode/math/CodeRandMinMax.java
index dd491da..7f6c54a 100644
--- a/src/tec/letsgoing/ardublock/simulator/simcode/math/CodeRandMinMax.java
+++ b/src/tec/letsgoing/ardublock/simulator/simcode/math/CodeRandMinMax.java
@@ -6,7 +6,6 @@ package tec.letsgoing.ardublock.simulator.simcode.math;
import tec.letsgoing.ardublock.simulator.arduino.Arduino;
import tec.letsgoing.ardublock.simulator.simcode.SimCode;
import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeInt;
-import tec.letsgoing.ardublock.simulator.simcode.functions.SimCodeFunction;
/**
* Erzeuge eine Zufallszahl zwische min und max
diff --git a/src/tec/letsgoing/ardublock/simulator/simcode/vars/CodeBoolCreate.java b/src/tec/letsgoing/ardublock/simulator/simcode/vars/CodeBoolCreate.java
index add4107..1180ad5 100644
--- a/src/tec/letsgoing/ardublock/simulator/simcode/vars/CodeBoolCreate.java
+++ b/src/tec/letsgoing/ardublock/simulator/simcode/vars/CodeBoolCreate.java
@@ -7,7 +7,6 @@ import tec.letsgoing.ardublock.simulator.arduino.Arduino;
import tec.letsgoing.ardublock.simulator.simcode.SimCode;
import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeBool;
import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeString;
-import tec.letsgoing.ardublock.simulator.simcode.functions.SimCodeFunction;
/**
* Erzeuge eine boolsche Variable
diff --git a/src/tec/letsgoing/ardublock/simulator/simcode/vars/CodeBoolGet.java b/src/tec/letsgoing/ardublock/simulator/simcode/vars/CodeBoolGet.java
index 9f6decd..c72de0c 100644
--- a/src/tec/letsgoing/ardublock/simulator/simcode/vars/CodeBoolGet.java
+++ b/src/tec/letsgoing/ardublock/simulator/simcode/vars/CodeBoolGet.java
@@ -7,7 +7,6 @@ import tec.letsgoing.ardublock.simulator.arduino.Arduino;
import tec.letsgoing.ardublock.simulator.simcode.SimCode;
import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeBool;
import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeString;
-import tec.letsgoing.ardublock.simulator.simcode.functions.SimCodeFunction;
/**
* Lese eine boolsche Varibale
diff --git a/src/tec/letsgoing/ardublock/simulator/simcode/vars/CodeBoolSet.java b/src/tec/letsgoing/ardublock/simulator/simcode/vars/CodeBoolSet.java
index c104567..c29e332 100644
--- a/src/tec/letsgoing/ardublock/simulator/simcode/vars/CodeBoolSet.java
+++ b/src/tec/letsgoing/ardublock/simulator/simcode/vars/CodeBoolSet.java
@@ -7,7 +7,6 @@ import tec.letsgoing.ardublock.simulator.arduino.Arduino;
import tec.letsgoing.ardublock.simulator.simcode.SimCode;
import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeBool;
import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeString;
-import tec.letsgoing.ardublock.simulator.simcode.functions.SimCodeFunction;
/**
* Setze eine boolsche Variable
diff --git a/src/tec/letsgoing/ardublock/simulator/simcode/vars/CodeIntCreate.java b/src/tec/letsgoing/ardublock/simulator/simcode/vars/CodeIntCreate.java
index 39fd8ca..e9da217 100644
--- a/src/tec/letsgoing/ardublock/simulator/simcode/vars/CodeIntCreate.java
+++ b/src/tec/letsgoing/ardublock/simulator/simcode/vars/CodeIntCreate.java
@@ -7,7 +7,6 @@ import tec.letsgoing.ardublock.simulator.arduino.Arduino;
import tec.letsgoing.ardublock.simulator.simcode.SimCode;
import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeInt;
import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeString;
-import tec.letsgoing.ardublock.simulator.simcode.functions.SimCodeFunction;
/**
* Erzeuge eine analoge/Integer Variable
diff --git a/src/tec/letsgoing/ardublock/simulator/simcode/vars/CodeIntGet.java b/src/tec/letsgoing/ardublock/simulator/simcode/vars/CodeIntGet.java
index 8399951..24d1c77 100644
--- a/src/tec/letsgoing/ardublock/simulator/simcode/vars/CodeIntGet.java
+++ b/src/tec/letsgoing/ardublock/simulator/simcode/vars/CodeIntGet.java
@@ -7,7 +7,6 @@ import tec.letsgoing.ardublock.simulator.arduino.Arduino;
import tec.letsgoing.ardublock.simulator.simcode.SimCode;
import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeInt;
import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeString;
-import tec.letsgoing.ardublock.simulator.simcode.functions.SimCodeFunction;
/**
* Lese eine analoge/Integer Variable
diff --git a/src/tec/letsgoing/ardublock/simulator/simcode/vars/CodeIntSet.java b/src/tec/letsgoing/ardublock/simulator/simcode/vars/CodeIntSet.java
index ab6ffc0..0fd9675 100644
--- a/src/tec/letsgoing/ardublock/simulator/simcode/vars/CodeIntSet.java
+++ b/src/tec/letsgoing/ardublock/simulator/simcode/vars/CodeIntSet.java
@@ -7,7 +7,6 @@ import tec.letsgoing.ardublock.simulator.arduino.Arduino;
import tec.letsgoing.ardublock.simulator.simcode.SimCode;
import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeInt;
import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeString;
-import tec.letsgoing.ardublock.simulator.simcode.functions.SimCodeFunction;
/**
* Setze eine analoge/Integer Variable
diff --git a/src/tec/letsgoing/ardublock/simulator/simcode/vars/CodeMillis.java b/src/tec/letsgoing/ardublock/simulator/simcode/vars/CodeMillis.java
index 04e93a4..0be20c8 100644
--- a/src/tec/letsgoing/ardublock/simulator/simcode/vars/CodeMillis.java
+++ b/src/tec/letsgoing/ardublock/simulator/simcode/vars/CodeMillis.java
@@ -6,7 +6,6 @@ package tec.letsgoing.ardublock.simulator.simcode.vars;
import tec.letsgoing.ardublock.simulator.arduino.Arduino;
import tec.letsgoing.ardublock.simulator.simcode.SimCode;
import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeInt;
-import tec.letsgoing.ardublock.simulator.simcode.functions.SimCodeFunction;
/**
* Gibt die Zeit seit Programmstart in Millisekunden an
diff --git a/src/tec/letsgoing/ardublock/simulator/view/GUI.java b/src/tec/letsgoing/ardublock/simulator/view/GUI.java
index 0e752ea..511d647 100644
--- a/src/tec/letsgoing/ardublock/simulator/view/GUI.java
+++ b/src/tec/letsgoing/ardublock/simulator/view/GUI.java
@@ -45,44 +45,53 @@ import tec.letsgoing.ardublock.simulator.view.modules.RGB;
*/
public class GUI extends JFrame implements Runnable, ActionListener {
private static final long serialVersionUID = 1L;
- private static final int MAXIMUM_MESSAGES = 100; //Anzahl der Seriellen Nachrichten
+ private static final int MAXIMUM_MESSAGES = 100; // Anzahl der Seriellen Nachrichten
private Vector<String> serialprint = new Vector<String>();
private Modul[] modules = new Modul[4];
private volatile boolean stopFlag = false;
private JTextArea serialLog = new JTextArea();
-
+
/**
* Konstruktor der Klasse GUI
+ *
* @param simu Instanz des Simulators
*/
public GUI(Simulator simu) {
super("ArdubBlock Simulator");
-
- //Konstruktor der Module
- modules[0] = new RGB(new ImageIcon(getToolkit().getImage(GUI.class.getResource("/tec/letsgoing/ardublock/simulator/img/PM31_RGB_LED.png"))));
- modules[1] = new Button(new ImageIcon(getToolkit().getImage(GUI.class.getResource("/tec/letsgoing/ardublock/simulator/img/PM26_Taster.png"))),
- new ImageIcon(getToolkit().getImage(GUI.class.getResource("/tec/letsgoing/ardublock/simulator/img/Taster_Off.png"))),
- new ImageIcon(getToolkit().getImage(GUI.class.getResource("/tec/letsgoing/ardublock/simulator/img/Taster_On.png"))));
- modules[2] = new Poti(
- new ImageIcon(getToolkit().getImage(GUI.class.getResource("/tec/letsgoing/ardublock/simulator/img/PM24_Potentiometer.png"))));
- modules[3] = new ArduinoUno(new ImageIcon(getToolkit().getImage(GUI.class.getResource("/tec/letsgoing/ardublock/simulator/img/ArduinoUno.png"))),
+
+ // Konstruktor der Module
+ modules[0] = new RGB(new ImageIcon(getToolkit()
+ .getImage(GUI.class.getResource("/tec/letsgoing/ardublock/simulator/img/PM31_RGB_LED.png"))));
+ modules[1] = new Button(
+ new ImageIcon(getToolkit()
+ .getImage(GUI.class.getResource("/tec/letsgoing/ardublock/simulator/img/PM26_Taster.png"))),
+ new ImageIcon(getToolkit()
+ .getImage(GUI.class.getResource("/tec/letsgoing/ardublock/simulator/img/Taster_Off.png"))),
+ new ImageIcon(getToolkit()
+ .getImage(GUI.class.getResource("/tec/letsgoing/ardublock/simulator/img/Taster_On.png"))));
+ modules[2] = new Poti(new ImageIcon(getToolkit()
+ .getImage(GUI.class.getResource("/tec/letsgoing/ardublock/simulator/img/PM24_Potentiometer.png"))));
+ modules[3] = new ArduinoUno(
+ new ImageIcon(getToolkit()
+ .getImage(GUI.class.getResource("/tec/letsgoing/ardublock/simulator/img/ArduinoUno.png"))),
simu);
- //this.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); //Vermutlich nicht gewünscht.
+ // this.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); //Vermutlich nicht
+ // gewünscht.
this.setResizable(false);
Container mainPane = this.getContentPane();
- //Panel welches alle Module sowie die Verdrahtung enthält.
+ // Panel welches alle Module sowie die Verdrahtung enthält.
JPanel modulPanel = new JPanel(new BorderLayout()) {
private static final long serialVersionUID = 1L;
@Override
public void paint(Graphics g) {
super.paint(g);
- drawConnections(g); //Zeichne Verdrahtung
+ drawConnections(g); // Zeichne Verdrahtung
}
};
- //Füge Module hinzu
+ // Füge Module hinzu
modulPanel.add(modules[0].getPane(), BorderLayout.WEST);
modulPanel.add(modules[1].getPane(), BorderLayout.CENTER);
modulPanel.add(modules[2].getPane(), BorderLayout.EAST);
@@ -99,6 +108,7 @@ public class GUI extends JFrame implements Runnable, ActionListener {
/**
* Erzeugt das Controlpanel mit den Steuerungsknöpfen
+ *
* @param simu Instanz des Simulators
* @return JPanel mit allen Knöpfen
*/
@@ -111,10 +121,14 @@ public class GUI extends JFrame implements Runnable, ActionListener {
JButton reloadButton = new JButton();
JButton measButton = new JButton();
- goButton.setIcon(new ImageIcon(getToolkit().getImage(GUI.class.getResource("/tec/letsgoing/ardublock/simulator/img/Play.png"))));
- stopButton.setIcon(new ImageIcon(getToolkit().getImage(GUI.class.getResource("/tec/letsgoing/ardublock/simulator/img/Stop.png"))));
- reloadButton.setIcon(new ImageIcon(getToolkit().getImage(GUI.class.getResource("/tec/letsgoing/ardublock/simulator/img/Reload.png"))));
- measButton.setIcon(new ImageIcon(getToolkit().getImage(GUI.class.getResource("/tec/letsgoing/ardublock/simulator/img/Measure.png"))));
+ goButton.setIcon(new ImageIcon(
+ getToolkit().getImage(GUI.class.getResource("/tec/letsgoing/ardublock/simulator/img/Play.png"))));
+ stopButton.setIcon(new ImageIcon(
+ getToolkit().getImage(GUI.class.getResource("/tec/letsgoing/ardublock/simulator/img/Stop.png"))));
+ reloadButton.setIcon(new ImageIcon(
+ getToolkit().getImage(GUI.class.getResource("/tec/letsgoing/ardublock/simulator/img/Reload.png"))));
+ measButton.setIcon(new ImageIcon(
+ getToolkit().getImage(GUI.class.getResource("/tec/letsgoing/ardublock/simulator/img/Measure.png"))));
goButton.addActionListener(simu);
stopButton.addActionListener(simu);
@@ -136,12 +150,13 @@ public class GUI extends JFrame implements Runnable, ActionListener {
/**
* Erzeuge den Bereich mit dem SerialLog
+ *
* @return JPanel des SerialLogs
*/
private JPanel createSerialLog() {
JPanel panel = new JPanel(new BorderLayout());
JScrollPane scrollPane = new JScrollPane(serialLog);
- serialLog.setRows(8); //Anzahl der Angezeigten Reihen
+ serialLog.setRows(8); // Anzahl der Angezeigten Reihen
serialLog.setAutoscrolls(true);
serialLog.setForeground(Color.black);
serialLog.setBackground(Color.white);
@@ -166,20 +181,22 @@ public class GUI extends JFrame implements Runnable, ActionListener {
/**
* Zeichne alle Verdrahtungen, welcher über die Modulgrenzen hinausgehen.<br>
- * Diese Funktion ist sehr "Hardgecoded" eine Änderung an den Pin Zuordnungen wird hier Probleme verursachen.
+ * Diese Funktion ist sehr "Hardgecoded" eine Änderung an den Pin Zuordnungen
+ * wird hier Probleme verursachen.
+ *
* @param g Graphics Instanz des Panels
*/
private void drawConnections(Graphics g) {
- //Zeichne die Stromversorgung
+ // Zeichne die Stromversorgung
for (int i = -1; i < 2; i++) {
g.setColor(Color.BLACK);
g.fillRect(i * 294 + 261, 183, 60, 5);
g.setColor(Color.RED);
g.fillRect(i * 294 + 261, 211, 60, 5);
}
-
- //Zeichne die Signalleitungen
- int[] assignment = { 11, 10, 9, 4, 3,2 , 14 };
+
+ // Zeichne die Signalleitungen
+ int[] assignment = { 11, 10, 9, 4, 3, 2, 14 };
g.setColor(Color.ORANGE);
Vector<Point> pinArduino = modules[3].getPinPos();
Point posArduino = modules[3].getPosition();
@@ -192,14 +209,17 @@ public class GUI extends JFrame implements Runnable, ActionListener {
g2.setStroke(roundLine);
if (counter > 5) { // Fall für die analoge Signalleitung
g2.drawLine(p.x + modules[i].getPosition().x, p.y + modules[i].getPosition().y,
- p.x + modules[i].getPosition().x, pinArduino.get(assignment[counter]).y + posArduino.y-40);
- g2.drawLine(p.x + modules[i].getPosition().x, pinArduino.get(assignment[counter]).y + posArduino.y-40,
+ p.x + modules[i].getPosition().x,
+ pinArduino.get(assignment[counter]).y + posArduino.y - 40);
+ g2.drawLine(p.x + modules[i].getPosition().x,
+ pinArduino.get(assignment[counter]).y + posArduino.y - 40,
pinArduino.get(assignment[counter]).x + posArduino.x,
- pinArduino.get(assignment[counter]).y + posArduino.y-40);
- g2.drawLine(pinArduino.get(assignment[counter]).x + posArduino.x, pinArduino.get(assignment[counter]).y + posArduino.y-40,
+ pinArduino.get(assignment[counter]).y + posArduino.y - 40);
+ g2.drawLine(pinArduino.get(assignment[counter]).x + posArduino.x,
+ pinArduino.get(assignment[counter]).y + posArduino.y - 40,
pinArduino.get(assignment[counter]).x + posArduino.x,
pinArduino.get(assignment[counter]).y + posArduino.y);
- } else { //Alle anderen Signalleitungen
+ } else { // Alle anderen Signalleitungen
g2.drawLine(p.x + modules[i].getPosition().x, p.y + modules[i].getPosition().y,
p.x + modules[i].getPosition().x, p.y + modules[i].getPosition().y + 90 - (counter) * 10);
g2.drawLine(p.x + modules[i].getPosition().x,
@@ -217,12 +237,12 @@ public class GUI extends JFrame implements Runnable, ActionListener {
}
/**
- *Funktion welche die GUI aktualisiert und auf 144Hz ausgelegt ist.
+ * Funktion welche die GUI aktualisiert und auf 144Hz ausgelegt ist.
*/
public void run() {
while (!stopFlag) {
try {
- Thread.sleep(7); //144Hz
+ Thread.sleep(7); // 144Hz
} catch (InterruptedException e) {
// e.printStackTrace();
@@ -232,7 +252,9 @@ public class GUI extends JFrame implements Runnable, ActionListener {
}
/**
- * Fügt eine neue Nachricht der SerialLog hinzu und löscht eventuell alte Nachrichten.
+ * Fügt eine neue Nachricht der SerialLog hinzu und löscht eventuell alte
+ * Nachrichten.
+ *
* @param content Auszugebener String
* @return true
*/
@@ -251,6 +273,7 @@ public class GUI extends JFrame implements Runnable, ActionListener {
/**
* Verbindet alle Modulen mit ihren Pin Objekten auf dem Arduino.
+ *
* @param arduino Instanz der Arduinoklasse
* @return true
*/
diff --git a/src/tec/letsgoing/ardublock/simulator/view/modules/ArduinoUno.java b/src/tec/letsgoing/ardublock/simulator/view/modules/ArduinoUno.java
index ea379ed..65b3873 100644
--- a/src/tec/letsgoing/ardublock/simulator/view/modules/ArduinoUno.java
+++ b/src/tec/letsgoing/ardublock/simulator/view/modules/ArduinoUno.java
@@ -31,10 +31,10 @@ public class ArduinoUno extends Modul {
private int led13 = 0;
public ArduinoUno(ImageIcon _icon, Simulator simu) {
- //Offset für den Arduino um diesen mehr mittig zu platzieren.
+ // Offset für den Arduino um diesen mehr mittig zu platzieren.
int locx = 50;
int locy = 50;
-
+
layerpane.setPreferredSize(new Dimension(587 + locx, 418 + locy));
JLabel chiplabel = new JLabel();
ImageIcon chipIcon = _icon;
@@ -44,9 +44,10 @@ public class ArduinoUno extends Modul {
chiplabel.setLocation(locx, locy);
layerpane.add(chiplabel, 0);
- //Label für die PowerLED
+ // Label für die PowerLED
JLabel labelPower = new JLabel() {
private static final long serialVersionUID = 1L;
+
@Override
public void paintComponent(Graphics g) {
Graphics2D ga = (Graphics2D) g;
@@ -63,9 +64,10 @@ public class ArduinoUno extends Modul {
labelPower.setSize(20, 20);
layerpane.add(labelPower, 0);
- //Label für die Pin 13 LED
+ // Label für die Pin 13 LED
JLabel label13 = new JLabel() {
private static final long serialVersionUID = 1L;
+
@Override
public void paintComponent(Graphics g) {
Graphics2D ga = (Graphics2D) g;
@@ -79,7 +81,7 @@ public class ArduinoUno extends Modul {
label13.setSize(20, 20);
layerpane.add(label13, 0);
- //unsichtbarer Resetbutton
+ // unsichtbarer Resetbutton
JButton button = new JButton();
button.setSize(70, 70);
button.setActionCommand("reset");
@@ -129,7 +131,8 @@ public class ArduinoUno extends Modul {
for (int i = 0; i < 6; i++) {
pins.add(new Point(i * 20 + locx + 447, locy + 397));
}
- // Dieser Code malt kleine Rechtecke an die PinPositionen um sie besser zu überprüfen.
+ // Dieser Code malt kleine Rechtecke an die PinPositionen um sie besser zu
+ // überprüfen.
/*
* JLabel label; for (Point pin:pins) { label= new JLabel() {
*
diff --git a/src/tec/letsgoing/ardublock/simulator/view/modules/Modul.java b/src/tec/letsgoing/ardublock/simulator/view/modules/Modul.java
index 646d4e5..a290af8 100644
--- a/src/tec/letsgoing/ardublock/simulator/view/modules/Modul.java
+++ b/src/tec/letsgoing/ardublock/simulator/view/modules/Modul.java
@@ -43,7 +43,7 @@ public abstract class Modul implements Observer {
}
/**
- *Funktion welche aufgerufen wird, sobald sich ein Pin ändert.
+ * Funktion welche aufgerufen wird, sobald sich ein Pin ändert.
*/
public void update(Observable Observable, Object arg1) {
if (Observable instanceof Pin) {
diff --git a/src/tec/letsgoing/ardublock/simulator/view/modules/Poti.java b/src/tec/letsgoing/ardublock/simulator/view/modules/Poti.java
index c52a0f5..7f20a38 100644
--- a/src/tec/letsgoing/ardublock/simulator/view/modules/Poti.java
+++ b/src/tec/letsgoing/ardublock/simulator/view/modules/Poti.java
@@ -42,11 +42,11 @@ public class Poti extends Modul implements ChangeListener, MouseWheelListener {
slider.setMinorTickSpacing(64);
slider.setPaintTicks(true);
- //Erzeuge eine individuelle Slider Beschriftung
+ // Erzeuge eine individuelle Slider Beschriftung
Hashtable<Integer, JLabel> labelTable = new Hashtable<Integer, JLabel>();
- labelTable.put(new Integer(10), new JLabel("0 V"));
- labelTable.put(new Integer(512), new JLabel("2.5 V"));
- labelTable.put(new Integer(1023), new JLabel("5 V"));
+ labelTable.put(new Integer(10), new JLabel("0%"));
+ labelTable.put(new Integer(512), new JLabel("50%"));
+ labelTable.put(new Integer(1023), new JLabel("100%"));
slider.setLabelTable(labelTable);
slider.setPaintLabels(true);
diff --git a/src/tec/letsgoing/ardublock/simulator/view/modules/RGB.java b/src/tec/letsgoing/ardublock/simulator/view/modules/RGB.java
index f4efe99..63a59ac 100644
--- a/src/tec/letsgoing/ardublock/simulator/view/modules/RGB.java
+++ b/src/tec/letsgoing/ardublock/simulator/view/modules/RGB.java
@@ -28,7 +28,7 @@ public class RGB extends Modul {
private int blueValue = 0;
public RGB(ImageIcon _icon) {
- //Erstellen der JLayerPane für das Modul
+ // Erstellen der JLayerPane für das Modul
layerpane.setPreferredSize(new Dimension(294, 294));
JLabel chiplabel = new JLabel();
ImageIcon chipIcon = _icon;
@@ -36,7 +36,7 @@ public class RGB extends Modul {
chiplabel.setSize(294, 294);
layerpane.add(chiplabel, 1);
- //Erzeuge ein JLabel welches das Leuchten der LED darstellt.
+ // Erzeuge ein JLabel welches das Leuchten der LED darstellt.
JLabel ledlabel = new JLabel() {
private static final long serialVersionUID = 1L;
@@ -49,8 +49,8 @@ public class RGB extends Modul {
}
};
-
- //Setze Position des Labels
+
+ // Setze Position des Labels
ledlabel.setLocation(107, 37);
ledlabel.setSize(200, 200);
layerpane.add(ledlabel, 0);
@@ -91,7 +91,8 @@ public class RGB extends Modul {
}
/**
- * Funktion, welche die Positionen der Modulpins berechnet (in Pixeln für das Zeichnen der Verdrahtung)
+ * Funktion, welche die Positionen der Modulpins berechnet (in Pixeln für das
+ * Zeichnen der Verdrahtung)
*/
private void calculatePinPos() {
Vector<Point> pins = new Vector<Point>();
--
GitLab