From 0c5f31f5e53ea294ef9550a6683ddac903636cf2 Mon Sep 17 00:00:00 2001 From: rusefi Date: Wed, 21 Nov 2018 20:49:40 -0500 Subject: [PATCH] enum2string cleanup --- .../controllers/algo/auto_generated_enums.cpp | 95 +++++++++++------- .../controllers/algo/auto_generated_enums.h | 9 +- java_tools/enum2string.jar | Bin 6217 -> 5284 bytes .../src/com/rusefi/EnumToString.java | 38 +++---- .../enum_to_string/src/com/rusefi/State.java | 9 -- 5 files changed, 80 insertions(+), 71 deletions(-) delete mode 100644 java_tools/enum_to_string/src/com/rusefi/State.java diff --git a/firmware/controllers/algo/auto_generated_enums.cpp b/firmware/controllers/algo/auto_generated_enums.cpp index 51864177ff..13d0032f32 100644 --- a/firmware/controllers/algo/auto_generated_enums.cpp +++ b/firmware/controllers/algo/auto_generated_enums.cpp @@ -1,6 +1,6 @@ // auto-generated from.\controllers/algo/rusefi_enums.h // by enum2string.jar tool -// on Fri Jan 26 11:27:27 EST 2018 +// on Wed Nov 21 20:48:18 EST 2018 // see also gen_config_and_enums.bat @@ -75,6 +75,8 @@ case MAZDA_MIATA_2003_BOARD_TEST: return "MAZDA_MIATA_2003_BOARD_TEST"; case MAZDA_MIATA_2003_NA_RAIL: return "MAZDA_MIATA_2003_NA_RAIL"; +case MAZDA_MIATA_NA8: + return "MAZDA_MIATA_NA8"; case MAZDA_MIATA_NB1: return "MAZDA_MIATA_NB1"; case MIATA_1990: @@ -87,8 +89,6 @@ case MIATA_1996: return "MIATA_1996"; case MIATA_NA_1_6: return "MIATA_NA_1_6"; -case MAZDA_MIATA_NA8: - return "MAZDA_MIATA_NA8"; case MINI_COOPER_R50: return "MINI_COOPER_R50"; case MITSU_4G93: @@ -130,26 +130,7 @@ case ZIL_130: } return NULL; } - -const char *getHip_state_e(hip_state_e value) { -switch (value) { -case NOT_READY: - return "NOT_READY"; -case READY_TO_INTEGRATE: - return "READY_TO_INTEGRATE"; -case IS_INTEGRATING: - return "IS_INTEGRATING"; -case WAITING_FOR_ADC_TO_SKIP: - return "WAITING_FOR_ADC_TO_SKIP"; -case WAITING_FOR_RESULT_ADC: - return "WAITING_FOR_RESULT_ADC"; -case IS_SENDING_SPI_COMMAND: - return "IS_SENDING_SPI_COMMAND"; -} -return NULL; -} - -const char *getTrigger_type_e(trigger_type_e value) { +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"; @@ -175,12 +156,12 @@ case TT_DODGE_RAM: return "TT_DODGE_RAM"; case TT_DODGE_STRATUS: return "TT_DODGE_STRATUS"; +case TT_FIAT_IAW_P8: + return "TT_FIAT_IAW_P8"; case TT_FORD_ASPIRE: return "TT_FORD_ASPIRE"; case TT_GM_7X: return "TT_GM_7X"; -case TT_FIAT_IAW_P8: - return "TT_FIAT_IAW_P8"; case TT_GM_LS_24: return "TT_GM_LS_24"; case TT_HONDA_1_24: @@ -200,7 +181,7 @@ case TT_HONDA_CBR_600_CUSTOM: case TT_JEEP_18_2_2_2: return "TT_JEEP_18_2_2_2"; case TT_JEEP_4_CYL: - return "TT_JEEP_4_CYL"; + return "TT_JEEP_4_CYL"; case TT_MAZDA_DOHC_1_4: return "TT_MAZDA_DOHC_1_4"; case TT_MAZDA_MIATA_NA: @@ -734,16 +715,16 @@ case GPIO_UNASSIGNED: } const char *getDebug_mode_e(debug_mode_e value){ switch(value) { -case DBG_CJ125: - return "DBG_CJ125"; -case DBG_CAN: - return "DBG_CAN"; -case DBG_MAP: - return "DBG_MAP"; -case DBG_METRICS: - return "DBG_METRICS"; -case DBG_ELECTRONIC_THROTTLE_EXTRA: - return "DBG_ELECTRONIC_THROTTLE_EXTRA"; +case DBG_30: + return "DBG_30"; +case DBG_31: + return "DBG_31"; +case DBG_32: + return "DBG_32"; +case DBG_33: + return "DBG_33"; +case DBG_34: + return "DBG_34"; case DBG_ADC: return "DBG_ADC"; case DBG_ALTERNATOR_PID: @@ -754,8 +735,14 @@ case DBG_AUX_VALVES: return "DBG_AUX_VALVES"; case DBG_BENCH_TEST: return "DBG_BENCH_TEST"; +case DBG_CAN: + return "DBG_CAN"; +case DBG_CJ125: + return "DBG_CJ125"; case DBG_CRANKING_DETAILS: return "DBG_CRANKING_DETAILS"; +case DBG_ELECTRONIC_THROTTLE_EXTRA: + return "DBG_ELECTRONIC_THROTTLE_EXTRA"; case DBG_ELECTRONIC_THROTTLE_PID: return "DBG_ELECTRONIC_THROTTLE_PID"; case DBG_EL_ACCEL: @@ -776,6 +763,10 @@ case DBG_INSTANT_RPM: return "DBG_INSTANT_RPM"; case DBG_KNOCK: return "DBG_KNOCK"; +case DBG_MAP: + return "DBG_MAP"; +case DBG_METRICS: + return "DBG_METRICS"; case DBG_SD_CARD: return "DBG_SD_CARD"; case DBG_SR5_PROTOCOL: @@ -796,9 +787,7 @@ case DBG_WARMUP_ENRICH: return "DBG_WARMUP_ENRICH"; case Force_4_bytes_size_debug_mode_e: return "Force_4_bytes_size_debug_mode_e"; -default: - return "NA"; -} + } return NULL; } const char *getAir_pressure_sensor_type_e(air_pressure_sensor_type_e value){ @@ -927,3 +916,31 @@ case Internal_ForceMyEnumIntSize_can_nbc: } return NULL; } +const char *getHip_state_e(hip_state_e value){ +switch(value) { +case IS_INTEGRATING: + return "IS_INTEGRATING"; +case IS_SENDING_SPI_COMMAND: + return "IS_SENDING_SPI_COMMAND"; +case NOT_READY: + return "NOT_READY"; +case READY_TO_INTEGRATE: + return "READY_TO_INTEGRATE"; +case WAITING_FOR_ADC_TO_SKIP: + return "WAITING_FOR_ADC_TO_SKIP"; +case WAITING_FOR_RESULT_ADC: + return "WAITING_FOR_RESULT_ADC"; + } + return NULL; +} +const char *getTChargeMode_e(tChargeMode_e value){ +switch(value) { +case Force_4bytes_size_tChargeMode_e: + return "Force_4bytes_size_tChargeMode_e"; +case TCHARGE_MODE_AIR_INTERP: + return "TCHARGE_MODE_AIR_INTERP"; +case TCHARGE_MODE_RPM_TPS: + return "TCHARGE_MODE_RPM_TPS"; + } + return NULL; +} diff --git a/firmware/controllers/algo/auto_generated_enums.h b/firmware/controllers/algo/auto_generated_enums.h index f7c76cf3f8..17c99bec40 100644 --- a/firmware/controllers/algo/auto_generated_enums.h +++ b/firmware/controllers/algo/auto_generated_enums.h @@ -1,15 +1,14 @@ -#ifndef _A_H_HEADER_ -#define _A_H_HEADER_ // auto-generated from.\controllers/algo/rusefi_enums.h // by enum2string.jar tool -// on Fri Jan 26 11:27:27 EST 2018 +// on Wed Nov 21 20:48:18 EST 2018 // see also gen_config_and_enums.bat +#ifndef _A_H_HEADER_ +#define _A_H_HEADER_ #include "rusefi_enums.h" const char *getEngine_type_e(engine_type_e value); -const char *getHip_state_e(hip_state_e value); const char *getTrigger_type_e(trigger_type_e value); const char *getAdc_channel_mode_e(adc_channel_mode_e value); const char *getTrigger_value_e(trigger_value_e value); @@ -42,4 +41,6 @@ const char *getMaf_sensor_type_e(maf_sensor_type_e value); const char *getTiming_mode_e(timing_mode_e value); const char *getChamber_style_e(chamber_style_e value); const char *getCan_nbc_e(can_nbc_e value); +const char *getHip_state_e(hip_state_e value); +const char *getTChargeMode_e(tChargeMode_e value); #endif /*_A_H_HEADER_ */ diff --git a/java_tools/enum2string.jar b/java_tools/enum2string.jar index c48eb7c210ccf0c0f22ed7284fb00a964cbbb19f..3fd5a3dede32e1e922444587864a7fda75e04a2c 100644 GIT binary patch literal 5284 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 G2>2ghtOqgx diff --git a/java_tools/enum_to_string/src/com/rusefi/EnumToString.java b/java_tools/enum_to_string/src/com/rusefi/EnumToString.java index 9091e58389..d2ea69c12d 100644 --- a/java_tools/enum_to_string/src/com/rusefi/EnumToString.java +++ b/java_tools/enum_to_string/src/com/rusefi/EnumToString.java @@ -12,10 +12,10 @@ import java.util.TreeSet; */ @SuppressWarnings("StringConcatenationInsideStringBufferAppend") public class EnumToString { - private final static Set currentValues = new TreeSet(); + private final static Set currentValues = new TreeSet<>(); - private final static StringBuilder result = new StringBuilder(); - private final static StringBuilder header = new StringBuilder(); + private final static StringBuilder cppFileContent = new StringBuilder(); + private final static StringBuilder headerFileContent = new StringBuilder(); public static void main(String[] args) throws IOException { if (args.length != 2) { @@ -25,24 +25,23 @@ public class EnumToString { String inputPath = args[0]; String outputPath = args[1]; - header.append("#ifndef _A_H_HEADER_\r\n"); - header.append("#define _A_H_HEADER_\r\n"); + headerFileContent.append("#ifndef _A_H_HEADER_\r\n"); + headerFileContent.append("#define _A_H_HEADER_\r\n"); -// process(path + File.separator + "controllers/algo/io_pins.h"); process(inputPath + File.separator + "controllers/algo/rusefi_enums.h"); - header.append("#endif /*_A_H_HEADER_ */\r\n"); + headerFileContent.append("#endif /*_A_H_HEADER_ */\r\n"); - writeResult(outputPath + File.separator + "auto_generated_enums"); + writeCppAndHeaderFiles(outputPath + File.separator + "auto_generated_enums"); } - private static void writeResult(String outFileName) throws IOException { + private static void writeCppAndHeaderFiles(String outFileName) throws IOException { BufferedWriter bw = new BufferedWriter(new FileWriter(outFileName + ".cpp")); - bw.write(result.toString()); + bw.write(cppFileContent.toString()); bw.close(); bw = new BufferedWriter(new FileWriter(outFileName + ".h")); - bw.write(header.toString()); + bw.write(headerFileContent.toString()); bw.close(); } @@ -56,8 +55,9 @@ public class EnumToString { "\r\n" + "\r\n" + "\r\n"; - result.append(header); - EnumToString.header.append(header); + + cppFileContent.append(header); + EnumToString.headerFileContent.insert(0, header); boolean isInsideEnum = false; @@ -65,9 +65,9 @@ public class EnumToString { System.out.println("Reading from " + inFileName); String simpleFileName = f.getName(); - result.append("#include \"global.h\"\r\n"); - result.append("#include \"" + simpleFileName + "\"\r\n"); - EnumToString.header.append("#include \"" + simpleFileName + "\"\r\n"); + cppFileContent.append("#include \"global.h\"\r\n"); + cppFileContent.append("#include \"" + simpleFileName + "\"\r\n"); + EnumToString.headerFileContent.append("#include \"" + simpleFileName + "\"\r\n"); reader = new BufferedReader(new FileReader(inFileName)); String line; @@ -82,12 +82,12 @@ public class EnumToString { isInsideEnum = false; line = line.substring(1, line.length() - 1); System.out.println("Ending enum " + line); - result.append(makeCode(line)); - EnumToString.header.append(getMethodSignature(line) + ";\r\n"); + cppFileContent.append(makeCode(line)); + EnumToString.headerFileContent.append(getMethodSignature(line) + ";\r\n"); } else { line = line.replaceAll("//.+", ""); if (isInsideEnum) { - if (line.matches("[a-zA-Z_$][a-zA-Z\\d_$]*[\\=a-zA-Z\\d_*]*,?")) { + if (line.matches("[a-zA-Z_$][a-zA-Z\\d_$]*[=a-zA-Z\\d_*]*,?")) { line = line.replace(",", ""); int index = line.indexOf('='); if (index != -1) diff --git a/java_tools/enum_to_string/src/com/rusefi/State.java b/java_tools/enum_to_string/src/com/rusefi/State.java deleted file mode 100644 index fad6c0eb99..0000000000 --- a/java_tools/enum_to_string/src/com/rusefi/State.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.rusefi; - -/** - * (c) Andrey Belomutskiy - * 10/6/14 - */ -public enum State { - ENUM -}