From 23a317114265ad62d8cf2a601c3aa2f20c78d9e0 Mon Sep 17 00:00:00 2001
From: buehlera <buehlera@tec-nb-buehlera>
Date: Fri, 23 Oct 2020 15:24:42 +0200
Subject: [PATCH] Pin-Class angepasst: Limit auf 1023 durch %1024 ersetzt
---
src/tec/letsgoing/ardublock/simulator/arduino/Arduino.java | 3 ++-
src/tec/letsgoing/ardublock/simulator/arduino/Pin.java | 4 +++-
.../letsgoing/ardublock/simulator/view/modules/Poti.java | 2 --
src/tec/letsgoing/ardublock/simulator/view/modules/RGB.java | 6 ++++--
4 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/tec/letsgoing/ardublock/simulator/arduino/Arduino.java b/src/tec/letsgoing/ardublock/simulator/arduino/Arduino.java
index d16a28b..042542b 100644
--- a/src/tec/letsgoing/ardublock/simulator/arduino/Arduino.java
+++ b/src/tec/letsgoing/ardublock/simulator/arduino/Arduino.java
@@ -135,7 +135,8 @@ 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((int) (_value * 4.012));
+ pins[_pin].setValue((int) (_value * (1024.0/256.0)));
+ //System.out.println(_value + " multi " + (int)(_value * (1024.0/256.0)));
return true;
}
}
diff --git a/src/tec/letsgoing/ardublock/simulator/arduino/Pin.java b/src/tec/letsgoing/ardublock/simulator/arduino/Pin.java
index e7a9045..e7c9d26 100644
--- a/src/tec/letsgoing/ardublock/simulator/arduino/Pin.java
+++ b/src/tec/letsgoing/ardublock/simulator/arduino/Pin.java
@@ -29,7 +29,9 @@ public class Pin extends Observable {
public void setValue(int _value) {
if (_value > 1023)
- _value = 1023;
+ //TODO: check by Lucas
+ //_value = 1023;
+ _value = _value%1024;
if (_value < 0)
_value = 0;
value = _value;
diff --git a/src/tec/letsgoing/ardublock/simulator/view/modules/Poti.java b/src/tec/letsgoing/ardublock/simulator/view/modules/Poti.java
index 7f20a38..3b326a1 100644
--- a/src/tec/letsgoing/ardublock/simulator/view/modules/Poti.java
+++ b/src/tec/letsgoing/ardublock/simulator/view/modules/Poti.java
@@ -85,7 +85,6 @@ public class Poti extends Modul implements ChangeListener, MouseWheelListener {
@Override
public void stateChanged(ChangeEvent arg0) {
pins.get(0).setValue(slider.getValue());
-
}
/**
@@ -99,7 +98,6 @@ public class Poti extends Modul implements ChangeListener, MouseWheelListener {
} else {
slider.setValue(slider.getValue() - 10);
}
-
}
private void calculatePinPos() {
diff --git a/src/tec/letsgoing/ardublock/simulator/view/modules/RGB.java b/src/tec/letsgoing/ardublock/simulator/view/modules/RGB.java
index 2fa8d08..08a6506 100644
--- a/src/tec/letsgoing/ardublock/simulator/view/modules/RGB.java
+++ b/src/tec/letsgoing/ardublock/simulator/view/modules/RGB.java
@@ -51,7 +51,7 @@ public class RGB extends Modul {
if(greenValue>0)tgreenValue=map(greenValue);
if(blueValue>0)tblueValue=map(blueValue);
}
- System.out.println(tredValue+" "+ tgreenValue+" "+ tblueValue+" "+ transparancy);
+ //System.out.println(tredValue+" "+ tgreenValue+" "+ tblueValue+" "+ transparancy);
ga.setPaint(new Color(tredValue, tgreenValue, tblueValue, transparancy));
ga.fillOval(0, 0, 73, 73);
}
@@ -71,11 +71,13 @@ public class RGB extends Modul {
*/
public void updateModul(Pin pin) {
if (pin == pins.get(0))
- redValue = pin.getValue() / 4;
+ redValue = pin.getValue() / 4;
if (pin == pins.get(1))
blueValue = pin.getValue() / 4;
if (pin == pins.get(2))
greenValue = pin.getValue() / 4;
+
+
}
/**
--
GitLab