From 178f6fe9e8095841ff1e9a837e0807395dc7698a Mon Sep 17 00:00:00 2001 From: rusefillc Date: Sun, 31 Oct 2021 12:09:11 -0400 Subject: [PATCH] Whatever we call it, no matter how we do it - we need live data / remote view into rusEFI actual state #3353 fail faster! --- firmware/controllers/algo/live_data_ids.h | 6 +++--- .../src/main/java/com/rusefi/enums/live_data_e.java | 2 -- .../main/java/com/rusefi/ldmp/StateDictionary.java | 12 +++++++++--- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/firmware/controllers/algo/live_data_ids.h b/firmware/controllers/algo/live_data_ids.h index 879cf513f9..95e1f91ab9 100644 --- a/firmware/controllers/algo/live_data_ids.h +++ b/firmware/controllers/algo/live_data_ids.h @@ -15,10 +15,10 @@ LDS_TPS_TPS_ENRICHMENT, LDS_TRIGGER_CENTRAL, LDS_ETB_PID, LDS_IDLE_PID, -LDS_ALTERNATOR_PID, -LDS_CJ125_PID, +//LDS_ALTERNATOR_PID, +//LDS_CJ125_PID, LDS_TRIGGER_STATE, LDS_AC_CONTROL, LDS_IDLE, LDS_TPS_ACCEL -} live_data_e; \ No newline at end of file +} live_data_e; diff --git a/java_console/io/src/main/java/com/rusefi/enums/live_data_e.java b/java_console/io/src/main/java/com/rusefi/enums/live_data_e.java index a799315196..8fc3229cca 100644 --- a/java_console/io/src/main/java/com/rusefi/enums/live_data_e.java +++ b/java_console/io/src/main/java/com/rusefi/enums/live_data_e.java @@ -11,8 +11,6 @@ public enum live_data_e { LDS_TRIGGER_CENTRAL, LDS_ETB_PID, LDS_IDLE_PID, - LDS_ALTERNATOR_PID, - LDS_CJ125_PID, LDS_TRIGGER_STATE, LDS_AC_CONTROL, LDS_IDLE, diff --git a/java_console/io/src/main/java/com/rusefi/ldmp/StateDictionary.java b/java_console/io/src/main/java/com/rusefi/ldmp/StateDictionary.java index 45f8b65daa..b4949c1e10 100644 --- a/java_console/io/src/main/java/com/rusefi/ldmp/StateDictionary.java +++ b/java_console/io/src/main/java/com/rusefi/ldmp/StateDictionary.java @@ -5,8 +5,7 @@ import com.rusefi.config.generated.*; import com.rusefi.enums.live_data_e; import org.jetbrains.annotations.NotNull; -import java.util.HashMap; -import java.util.Map; +import java.util.*; public enum StateDictionary { INSTANCE; @@ -21,10 +20,17 @@ public enum StateDictionary { register(live_data_e.LDS_TRIGGER_CENTRAL, TriggerCentral.VALUES); register(live_data_e.LDS_ETB_PID, PidState.VALUES); // 7 register(live_data_e.LDS_IDLE_PID, PidState.VALUES); - // LDS_ALTERNATOR_PID + //register(live_data_e.LDS_ALTERNATOR_PID, // LDS_CJ125_PID + register(live_data_e.LDS_IDLE, IdleState.VALUES); register(live_data_e.LDS_TRIGGER_STATE, TriggerState.VALUES); // 11 register(live_data_e.LDS_AC_CONTROL, AcControl.VALUES); // 12 + register(live_data_e.LDS_TPS_ACCEL, TpsAccelState.VALUES); + if (map.size() != live_data_e.values().length) { + Set missing = new HashSet(Arrays.asList(live_data_e.values())); + missing.removeAll(map.keySet()); + throw new IllegalStateException("Some live_data_e does not have values: " + missing); + } } private void register(live_data_e ldsIndex, Field[] values) {