From 9cf62643dc7fbe9d787bfd2a899e08e5f91e3c0c Mon Sep 17 00:00:00 2001 From: rusefillc Date: Sat, 23 Oct 2021 20:24:21 -0400 Subject: [PATCH] generate java enum from C enum? generate both C and java from yaml? #2102 --- firmware/controllers/algo/rusefi_enums.h | 2 +- firmware/integration/rusefi_config.txt | 2 -- firmware/tunerstudio/rusefi.input | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/firmware/controllers/algo/rusefi_enums.h b/firmware/controllers/algo/rusefi_enums.h index a480129a71..5f14cf35ff 100644 --- a/firmware/controllers/algo/rusefi_enums.h +++ b/firmware/controllers/algo/rusefi_enums.h @@ -668,7 +668,7 @@ typedef enum { * in this mode we use as many coils as we have cylinders */ IM_INDIVIDUAL_COILS = 1, - IM_WASTED_SPARK = IM_IM_WASTED_SPARK, + IM_WASTED_SPARK = 2, /** * some v12 engines line BMW M70 and M73 run two distributors, one for each bank of cylinders diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index ba4645fd38..1dcdff9904 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -472,8 +472,6 @@ end_struct #define ETB_ETB_None 0 ! todo https://github.com/rusefi/rusefi/issues/2102 -#define IM_IM_WASTED_SPARK 2 - #define IM_IM_BATCH 2 #define IM_IM_SINGLE_POINT 3 diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 5431260acf..b1e15fff1f 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -1863,7 +1863,7 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@\x00\x31\x00\x00" dialog = ignitionBasic, "" field = "Enabled", isIgnitionEnabled field = "Mode", ignitionMode, {isIgnitionEnabled == 1} - field = "Individually wired Wasted Spark", twoWireBatchIgnition, {isIgnitionEnabled == 1 && ignitionMode == @@IM_IM_WASTED_SPARK@@ } + field = "Individually wired Wasted Spark", twoWireBatchIgnition, {isIgnitionEnabled == 1 && ignitionMode == @@ignition_mode_e_IM_WASTED_SPARK@@ } field = "Override ignition table load axis", ignOverrideMode, {isIgnitionEnabled} field = "#Use fixed timing while validating with a timing gun" field = "Timing Mode", timingMode, {isIgnitionEnabled == 1}