diff --git a/src/tec/letsgoing/ardublock/simulator/arduino/Arduino.java b/src/tec/letsgoing/ardublock/simulator/arduino/Arduino.java index d16a28bfe1ed28565a08951df243758e1c783929..042542bddd177f4cdb83200ce629b5dca5dac240 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 e7a9045c36143aa6cd35adddb13781613b86282d..e7c9d26f6e03a50089020e3d840a6ca2fcc621e9 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 7f20a382330875f66f6a6a813fd5b69bfc92b6ad..3b326a12a4d9cac5d8c63ae21df3f764dc24faa5 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 2fa8d080eb0a378cfd2c0ef01e8b6fcc050edfae..08a6506ad9593393b3d3681d4cb31341d3b37d77 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; + + } /**