From ec1dc98fc9f128a24e633847b5092c5c50fd040e Mon Sep 17 00:00:00 2001 From: rusEfi Date: Mon, 6 Apr 2015 19:05:01 -0500 Subject: [PATCH] auto-sync --- .../src/com/rusefi/waves/WaveChart.java | 29 ++++++++++--------- .../ui/src/com/rusefi/ui/engine/NameUtil.java | 2 ++ 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/java_console/models/src/com/rusefi/waves/WaveChart.java b/java_console/models/src/com/rusefi/waves/WaveChart.java index a5ea0132b0..a7340d0f01 100644 --- a/java_console/models/src/com/rusefi/waves/WaveChart.java +++ b/java_console/models/src/com/rusefi/waves/WaveChart.java @@ -13,21 +13,22 @@ import java.util.Map; * (c) Andrey Belomutskiy */ public class WaveChart { - public static final String INJECTOR_1 = "inj1"; - public static final String INJECTOR_2 = "inj2"; - public static final String INJECTOR_3 = "inj3"; - public static final String INJECTOR_4 = "inj4"; - public static final String INJECTOR_5 = "inj5"; - public static final String INJECTOR_6 = "inj6"; - public static final String INJECTOR_7 = "inj7"; - public static final String INJECTOR_8 = "inj8"; - public static final String SPARK_1 = "spa1"; - public static final String SPARK_2 = "spa2"; - public static final String SPARK_3 = "spa3"; - public static final String SPARK_4 = "spa4"; + // todo: merge with NameUtil + public static final String INJECTOR_1 = "i1"; + public static final String INJECTOR_2 = "i2"; + public static final String INJECTOR_3 = "i3"; + public static final String INJECTOR_4 = "i4"; + public static final String INJECTOR_5 = "i5"; + public static final String INJECTOR_6 = "i6"; + public static final String INJECTOR_7 = "i7"; + public static final String INJECTOR_8 = "i8"; + public static final String SPARK_1 = "c1"; + public static final String SPARK_2 = "c2"; + public static final String SPARK_3 = "c3"; + public static final String SPARK_4 = "c4"; - public static final String TRIGGER_1 = "c1"; - public static final String TRIGGER_2 = "c2"; + public static final String TRIGGER_1 = "t1"; + public static final String TRIGGER_2 = "t2"; public final Map map; diff --git a/java_console/ui/src/com/rusefi/ui/engine/NameUtil.java b/java_console/ui/src/com/rusefi/ui/engine/NameUtil.java index 85bb3b66d1..4b8e6010fc 100644 --- a/java_console/ui/src/com/rusefi/ui/engine/NameUtil.java +++ b/java_console/ui/src/com/rusefi/ui/engine/NameUtil.java @@ -6,6 +6,8 @@ import java.util.Comparator; import java.util.Map; import java.util.TreeMap; + +// todo: merge with WaveChart public class NameUtil { /** * See also 'CRANK1' in rusEfi firmware code