diff --git a/firmware/controllers/algo/auto_generated_enginetypes.cpp b/firmware/controllers/algo/auto_generated_enginetypes.cpp index b7d12364b1..e3a345c36a 100644 --- a/firmware/controllers/algo/auto_generated_enginetypes.cpp +++ b/firmware/controllers/algo/auto_generated_enginetypes.cpp @@ -1,6 +1,6 @@ #include "global.h" #include "engine_types.h" -// was generated automatically by rusEFI tool from engine_types.h // by enum2string.jar tool on Sun Jan 02 02:03:17 EST 2022 +// was generated automatically by rusEFI tool from engine_types.h // by enum2string.jar tool on Wed Jan 05 00:18:40 EST 2022 // see also gen_config_and_enums.bat @@ -144,8 +144,6 @@ case DBG_VVT_3_PID: return "DBG_VVT_3_PID"; case DBG_VVT_4_PID: return "DBG_VVT_4_PID"; -case Force_4_bytes_size_debug_mode_e: - return "Force_4_bytes_size_debug_mode_e"; case UNUSED23: return "UNUSED23"; } @@ -197,8 +195,6 @@ case FRANKENSO_MIATA_NA6_VAF: return "FRANKENSO_MIATA_NA6_VAF"; case FRANKENSO_QA_ENGINE: return "FRANKENSO_QA_ENGINE"; -case Force_4_bytes_size_engine_type: - return "Force_4_bytes_size_engine_type"; case GY6_139QMB: return "GY6_139QMB"; case HELLEN72_ETB: @@ -382,8 +378,6 @@ case VW_B6: } const char *getTrigger_type_e(trigger_type_e value){ switch(value) { -case Force_4_bytes_size_trigger_type: - return "Force_4_bytes_size_trigger_type"; case TT_1_16: return "TT_1_16"; case TT_2JZ_1_12: diff --git a/firmware/controllers/algo/engine_types.h b/firmware/controllers/algo/engine_types.h index 2c3922b333..bd2de0b4a1 100644 --- a/firmware/controllers/algo/engine_types.h +++ b/firmware/controllers/algo/engine_types.h @@ -243,7 +243,6 @@ typedef enum { TEST_109 = 109, TEST_110 = 110, - Force_4_bytes_size_engine_type = ENUM_32_BITS, } engine_type_e; /** @@ -317,7 +316,6 @@ typedef enum { DBG_VVT_3_PID = 50, DBG_VVT_4_PID = 51, - Force_4_bytes_size_debug_mode_e = ENUM_32_BITS, } debug_mode_e; /** @@ -528,8 +526,6 @@ typedef enum { // TT_UNUSED = 70, // this is used if we want to iterate over all trigger types - // todo: convert to ENUM_16_BITS? I can see 257 triggers but not 65K triggers - Force_4_bytes_size_trigger_type = ENUM_32_BITS, } trigger_type_e; // TriggerProcessor.java has this "trigger_type_e" name hard-coded! diff --git a/firmware/gen_enum_to_string.sh b/firmware/gen_enum_to_string.sh index 5c8de777f3..ef530450f6 100755 --- a/firmware/gen_enum_to_string.sh +++ b/firmware/gen_enum_to_string.sh @@ -10,7 +10,7 @@ java -DSystemOut.name=logs/gen_java_enum -cp ../java_tools/enum2string.jar com.r java -DSystemOut.name=logs/gen_java_enum -cp ../java_tools/enum2string.jar com.rusefi.ToJavaEnum -enumInputFile controllers/sensors/sensor_type.h -outputPath ../java_console/io/src/main/java/com/rusefi/enums [ $? -eq 0 ] || { echo "ERROR generating sensors"; exit 1; } -java -DSystemOut.name=logs/gen_java_enum -cp ../java_tools/enum2string.jar com.rusefi.ToJavaEnum -enumInputFile controllers/algo/engine_types.h -outputPath ../java_console/io/src/main/java/com/rusefi/enums -definition integration/rusefi_config.txt +java -DSystemOut.name=logs/gen_java_enum -cp ../java_tools/enum2string.jar com.rusefi.ToJavaEnum -enumInputFile controllers/algo/engine_types.h -outputPath ../java_console/io/src/main/java/com/rusefi/enums [ $? -eq 0 ] || { echo "ERROR generating types"; exit 1; } diff --git a/java_console/io/src/main/java/com/rusefi/enums/debug_mode_e.java b/java_console/io/src/main/java/com/rusefi/enums/debug_mode_e.java index 94411244b8..563652645c 100644 --- a/java_console/io/src/main/java/com/rusefi/enums/debug_mode_e.java +++ b/java_console/io/src/main/java/com/rusefi/enums/debug_mode_e.java @@ -56,5 +56,4 @@ public enum debug_mode_e { DBG_VVT_2_PID, DBG_VVT_3_PID, DBG_VVT_4_PID, - Force_4_bytes_size_debug_mode_e, } diff --git a/java_console/io/src/main/java/com/rusefi/enums/engine_type_e.java b/java_console/io/src/main/java/com/rusefi/enums/engine_type_e.java index 4afe989ef2..810ebf6e72 100644 --- a/java_console/io/src/main/java/com/rusefi/enums/engine_type_e.java +++ b/java_console/io/src/main/java/com/rusefi/enums/engine_type_e.java @@ -115,5 +115,4 @@ public enum engine_type_e { TEST_108, TEST_109, TEST_110, - Force_4_bytes_size_engine_type, } diff --git a/java_console/io/src/main/java/com/rusefi/enums/trigger_type_e.java b/java_console/io/src/main/java/com/rusefi/enums/trigger_type_e.java index 710bfaa1e7..2dfd1fc96f 100644 --- a/java_console/io/src/main/java/com/rusefi/enums/trigger_type_e.java +++ b/java_console/io/src/main/java/com/rusefi/enums/trigger_type_e.java @@ -75,5 +75,4 @@ public enum trigger_type_e { TT_NISSAN_MR18_CRANK, TT_TOOTHED_WHEEL_32_2, TT_UNUSED, - Force_4_bytes_size_trigger_type, }