From b206337de91cdceb4f352ff0e0df4eaa2b1ab0e1 Mon Sep 17 00:00:00 2001
From: rusEfi <russianefi@gmail.com>
Date: Wed, 10 Sep 2014 07:05:45 -0500
Subject: [PATCH] auto-sync

---
 .../models/src/com/irnems/core/Sensor.java    | 30 ++++++++++++++-----
 java_console/ui/src/com/irnems/Launcher.java  |  2 +-
 .../ui/src/com/rusefi/EcuStimulator.java      |  6 +---
 .../com/rusefi/ui/widgets/SensorGauge.java    |  2 +-
 4 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/java_console/models/src/com/irnems/core/Sensor.java b/java_console/models/src/com/irnems/core/Sensor.java
index f91a4a051a..f0193dbd2c 100644
--- a/java_console/models/src/com/irnems/core/Sensor.java
+++ b/java_console/models/src/com/irnems/core/Sensor.java
@@ -11,7 +11,7 @@ public enum Sensor {
     MAP("MAP"),
     MAP_RAW("MAP_RAW"),
     BARO("Baro"),
-    TIMING("Timing"),
+    TIMING("Timing", "deg", -180, 180),
 
     /**
      * Please note that these enum names are used to make 'set_mock_XXX_voltage' commands
@@ -43,10 +43,10 @@ public enum Sensor {
     TOTAL_DWELL1("Input tdwl #2", "ms", 0, 30, BackgroundColor.BEIGE),
     TOTAL_DWELL2("Input tdwl #3", "ms", 0, 30, BackgroundColor.BEIGE),
     TOTAL_DWELL3("Input tdwl #4", "ms", 0, 30, BackgroundColor.BEIGE),
-    ADVANCE0("Input Adv #1", "dg", -40, 40, BackgroundColor.BROWN),
-    ADVANCE1("Input Adv #2", "dg", -40, 40, BackgroundColor.BROWN),
-    ADVANCE2("Input Adv #3", "dg", -40, 40, BackgroundColor.BROWN),
-    ADVANCE3("Input Adv #4", "dg", -40, 40, BackgroundColor.BROWN),
+    ADVANCE0("Input Adv #1", "deg", -180, 180, BackgroundColor.BROWN),
+    ADVANCE1("Input Adv #2", "deg", -180, 180, BackgroundColor.BROWN),
+    ADVANCE2("Input Adv #3", "deg", -180, 180, BackgroundColor.BROWN),
+    ADVANCE3("Input Adv #4", "deg", -180, 180, BackgroundColor.BROWN),
     PERIOD0("Period", "dg", 0, 400),
     DUTY0("Duty0", "%", 0, 100, BackgroundColor.RED),
     DUTY1("Duty1", "%", 0, 100, BackgroundColor.RED),
@@ -71,8 +71,7 @@ public enum Sensor {
     INJECTOR_2_DWELL("inj #2"),
 
 
-    INJ_1_2_DELTA("inj 1-2 delta"),
-    ;
+    INJ_1_2_DELTA("inj 1-2 delta"),;
 
     private final String name;
     private final String units;
@@ -100,6 +99,10 @@ public enum Sensor {
         this.color = color;
     }
 
+    public static double processAdvance(double advance) {
+        return advance > 360 ? advance - 720 : advance;
+    }
+
     public String getName() {
         return name;
     }
@@ -119,4 +122,17 @@ public enum Sensor {
     public BackgroundColor getColor() {
         return color;
     }
+
+    public double translateValue(double value) {
+        switch (this) {
+            case ADVANCE0:
+            case ADVANCE1:
+            case ADVANCE2:
+            case ADVANCE3:
+            case TIMING:
+                return processAdvance(value);
+            default:
+                return value;
+        }
+    }
 }
diff --git a/java_console/ui/src/com/irnems/Launcher.java b/java_console/ui/src/com/irnems/Launcher.java
index e965054dd4..670f18ec53 100644
--- a/java_console/ui/src/com/irnems/Launcher.java
+++ b/java_console/ui/src/com/irnems/Launcher.java
@@ -19,7 +19,7 @@ import javax.swing.*;
  * @see WavePanel
  */
 public class Launcher extends FrameHelper {
-    public static final int CONSOLE_VERSION = 20140908;
+    public static final int CONSOLE_VERSION = 20140910;
     public static final boolean SHOW_STIMULATOR = true;
     private final String port;
 
diff --git a/java_console/ui/src/com/rusefi/EcuStimulator.java b/java_console/ui/src/com/rusefi/EcuStimulator.java
index 235eb62678..59b1ca61b3 100644
--- a/java_console/ui/src/com/rusefi/EcuStimulator.java
+++ b/java_console/ui/src/com/rusefi/EcuStimulator.java
@@ -294,7 +294,7 @@ public class EcuStimulator {
                     return;
                 double dwell = getValue(dwellSensor);
                 double advance = getValue(advanceSensor);
-                advance = processAdvance(advance);
+                advance = Sensor.processAdvance(advance);
                 result.dwells.add(dwell);
                 result.advances.add(advance);
                 latch.countDown();
@@ -310,10 +310,6 @@ public class EcuStimulator {
         return result;
     }
 
-    private double processAdvance(double advance) {
-        return advance > 360 ? advance - 720 : advance;
-    }
-
     private class MultipleMeasurements {
         private List<Double> dwells = new ArrayList<>(MEASURES);
         private List<Double> advances = new ArrayList<>(MEASURES);
diff --git a/java_console/ui/src/com/rusefi/ui/widgets/SensorGauge.java b/java_console/ui/src/com/rusefi/ui/widgets/SensorGauge.java
index a7b60490dc..3bbc9b9346 100644
--- a/java_console/ui/src/com/rusefi/ui/widgets/SensorGauge.java
+++ b/java_console/ui/src/com/rusefi/ui/widgets/SensorGauge.java
@@ -51,7 +51,7 @@ public class SensorGauge {
 
         SensorCentral.getInstance().addListener(sensor, new SensorCentral.SensorListener() {
             public void onSensorUpdate(double value) {
-                gauge.setValue(value);
+                gauge.setValue(sensor.translateValue(value));
             }
         });
         gauge.setLcdDecimals(2);