rusefi
/
rusefi-1
mirror of https://github.com/rusefi/rusefi-1.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

generate java enum from C enum? generate both C and java from yaml? #2102

This commit is contained in:
rusefillc 2021-10-23 23:40:14 -04:00
parent 73b52ed185
commit 29faddf338
8 changed files with 269 additions and 200 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
firmware/controllers/algo/auto_generated_commonenum.cpp
View File

@ -1,6 +1,6 @@
#include "global.h"
#include "rusefi_enums.h"
// was generated automatically by rusEFI tool from rusefi_enums.h // by enum2string.jar tool on Sun Oct 24 01:58:48 UTC 2021
// was generated automatically by rusEFI tool from rusefi_enums.h // by enum2string.jar tool on Sat Oct 23 23:39:23 EDT 2021
// see also gen_config_and_enums.bat
@ -210,113 +210,6 @@ case Force_4_bytes_size_cranking_ignition_mode:
}
return NULL;
}
const char *getDebug_mode_e(debug_mode_e value){
switch(value) {
case DBG_34:
return "DBG_34";
case DBG_ALTERNATOR_PID:
return "DBG_ALTERNATOR_PID";
case DBG_ANALOG_INPUTS:
return "DBG_ANALOG_INPUTS";
case DBG_ANALOG_INPUTS2:
return "DBG_ANALOG_INPUTS2";
case DBG_AUX_VALVES:
return "DBG_AUX_VALVES";
case DBG_BENCH_TEST:
return "DBG_BENCH_TEST";
case DBG_BOOST:
return "DBG_BOOST";
case DBG_CAN:
return "DBG_CAN";
case DBG_CJ125:
return "DBG_CJ125";
case DBG_COMPOSITE_LOG:
return "DBG_COMPOSITE_LOG";
case DBG_CRANKING_DETAILS:
return "DBG_CRANKING_DETAILS";
case DBG_DWELL_METRIC:
return "DBG_DWELL_METRIC";
case DBG_DYNO_VIEW:
return "DBG_DYNO_VIEW";
case DBG_ELECTRONIC_THROTTLE_EXTRA:
return "DBG_ELECTRONIC_THROTTLE_EXTRA";
case DBG_ELECTRONIC_THROTTLE_PID:
return "DBG_ELECTRONIC_THROTTLE_PID";
case DBG_EL_ACCEL:
return "DBG_EL_ACCEL";
case DBG_ETB_AUTOTUNE:
return "DBG_ETB_AUTOTUNE";
case DBG_ETB_LOGIC:
return "DBG_ETB_LOGIC";
case DBG_EXECUTOR:
return "DBG_EXECUTOR";
case DBG_FUEL_PID_CORRECTION:
return "DBG_FUEL_PID_CORRECTION";
case DBG_GPPWM:
return "DBG_GPPWM";
case DBG_IDLE_CONTROL:
return "DBG_IDLE_CONTROL";
case DBG_IGNITION_TIMING:
return "DBG_IGNITION_TIMING";
case DBG_INJECTOR_COMPENSATION:
return "DBG_INJECTOR_COMPENSATION";
case DBG_INSTANT_RPM:
return "DBG_INSTANT_RPM";
case DBG_ION:
return "DBG_ION";
case DBG_KNOCK:
return "DBG_KNOCK";
case DBG_LAUNCH:
return "DBG_LAUNCH";
case DBG_LOGIC_ANALYZER:
return "DBG_LOGIC_ANALYZER";
case DBG_LUA:
return "DBG_LUA";
case DBG_MAP:
return "DBG_MAP";
case DBG_METRICS:
return "DBG_METRICS";
case DBG_RUSEFI_WIDEBAND:
return "DBG_RUSEFI_WIDEBAND";
case DBG_SD_CARD:
return "DBG_SD_CARD";
case DBG_SR5_PROTOCOL:
return "DBG_SR5_PROTOCOL";
case DBG_START_STOP:
return "DBG_START_STOP";
case DBG_STATUS:
return "DBG_STATUS";
case DBG_TCU:
return "DBG_TCU";
case DBG_TLE8888:
return "DBG_TLE8888";
case DBG_TPS_ACCEL:
return "DBG_TPS_ACCEL";
case DBG_TRIGGER_COUNTERS:
return "DBG_TRIGGER_COUNTERS";
case DBG_UNUSED_42:
return "DBG_UNUSED_42";
case DBG_VVT:
return "DBG_VVT";
case DBG_VVT_1_PID:
return "DBG_VVT_1_PID";
case DBG_VVT_2_PID:
return "DBG_VVT_2_PID";
case DBG_VVT_3_PID:
return "DBG_VVT_3_PID";
case DBG_VVT_4_PID:
return "DBG_VVT_4_PID";
case DBG_WALL_WETTING:
return "DBG_WALL_WETTING";
case Force_4_bytes_size_debug_mode_e:
return "Force_4_bytes_size_debug_mode_e";
case MODE_52:
return "MODE_52";
case MODE_53:
return "MODE_53";
}
return NULL;
}
const char *getDisplay_mode_e(display_mode_e value){
switch(value) {
case DM_HD44780:

3
firmware/controllers/algo/auto_generated_commonenum.h
View File

@ -1,4 +1,4 @@
// was generated automatically by rusEFI tool from rusefi_enums.h // by enum2string.jar tool on Sun Oct 24 01:58:48 UTC 2021
// was generated automatically by rusEFI tool from rusefi_enums.h // by enum2string.jar tool on Sat Oct 23 23:39:23 EDT 2021
// see also gen_config_and_enums.bat
@ -18,7 +18,6 @@ const char *getCan_nbc_e(can_nbc_e value);
const char *getCan_vss_nbc_e(can_vss_nbc_e value);
const char *getChamber_style_e(chamber_style_e value);
const char *getCranking_ignition_mode_e(cranking_ignition_mode_e value);
const char *getDebug_mode_e(debug_mode_e value);
const char *getDisplay_mode_e(display_mode_e value);
const char *getEgo_sensor_e(ego_sensor_e value);
const char *getEngine_load_mode_e(engine_load_mode_e value);

117
firmware/controllers/algo/auto_generated_enginetypes.cpp
View File

@ -1,10 +1,125 @@
#include "global.h"
#include "engine_types.h"
// was generated automatically by rusEFI tool from engine_types.h // by enum2string.jar tool on Sun Oct 24 03:17:49 UTC 2021
// was generated automatically by rusEFI tool from engine_types.h // by enum2string.jar tool on Sat Oct 23 23:39:23 EDT 2021
// see also gen_config_and_enums.bat
const char *getDebug_mode_e(debug_mode_e value){
switch(value) {
case DBG_34:
return "DBG_34";
case DBG_ALTERNATOR_PID:
return "DBG_ALTERNATOR_PID";
case DBG_ANALOG_INPUTS:
return "DBG_ANALOG_INPUTS";
case DBG_ANALOG_INPUTS2:
return "DBG_ANALOG_INPUTS2";
case DBG_AUX_VALVES:
return "DBG_AUX_VALVES";
case DBG_BENCH_TEST:
return "DBG_BENCH_TEST";
case DBG_BOOST:
return "DBG_BOOST";
case DBG_CAN:
return "DBG_CAN";
case DBG_CJ125:
return "DBG_CJ125";
case DBG_COMPOSITE_LOG:
return "DBG_COMPOSITE_LOG";
case DBG_CRANKING_DETAILS:
return "DBG_CRANKING_DETAILS";
case DBG_DWELL_METRIC:
return "DBG_DWELL_METRIC";
case DBG_DYNO_VIEW:
return "DBG_DYNO_VIEW";
case DBG_ELECTRONIC_THROTTLE_EXTRA:
return "DBG_ELECTRONIC_THROTTLE_EXTRA";
case DBG_ELECTRONIC_THROTTLE_PID:
return "DBG_ELECTRONIC_THROTTLE_PID";
case DBG_EL_ACCEL:
return "DBG_EL_ACCEL";
case DBG_ETB_AUTOTUNE:
return "DBG_ETB_AUTOTUNE";
case DBG_ETB_LOGIC:
return "DBG_ETB_LOGIC";
case DBG_EXECUTOR:
return "DBG_EXECUTOR";
case DBG_FUEL_PID_CORRECTION:
return "DBG_FUEL_PID_CORRECTION";
case DBG_GPPWM:
return "DBG_GPPWM";
case DBG_IDLE_CONTROL:
return "DBG_IDLE_CONTROL";
case DBG_IGNITION_TIMING:
return "DBG_IGNITION_TIMING";
case DBG_INJECTOR_COMPENSATION:
return "DBG_INJECTOR_COMPENSATION";
case DBG_INSTANT_RPM:
return "DBG_INSTANT_RPM";
case DBG_ION:
return "DBG_ION";
case DBG_KNOCK:
return "DBG_KNOCK";
case DBG_LAUNCH:
return "DBG_LAUNCH";
case DBG_LOGIC_ANALYZER:
return "DBG_LOGIC_ANALYZER";
case DBG_LUA:
return "DBG_LUA";
case DBG_MAP:
return "DBG_MAP";
case DBG_METRICS:
return "DBG_METRICS";
case DBG_RUSEFI_WIDEBAND:
return "DBG_RUSEFI_WIDEBAND";
case DBG_SD_CARD:
return "DBG_SD_CARD";
case DBG_SR5_PROTOCOL:
return "DBG_SR5_PROTOCOL";
case DBG_START_STOP:
return "DBG_START_STOP";
case DBG_STATUS:
return "DBG_STATUS";
case DBG_TCU:
return "DBG_TCU";
case DBG_TLE8888:
return "DBG_TLE8888";
case DBG_TPS_ACCEL:
return "DBG_TPS_ACCEL";
case DBG_TRIGGER_COUNTERS:
return "DBG_TRIGGER_COUNTERS";
case DBG_UNUSED_42:
return "DBG_UNUSED_42";
case DBG_VVT:
return "DBG_VVT";
case DBG_VVT_1_PID:
return "DBG_VVT_1_PID";
case DBG_VVT_2_PID:
return "DBG_VVT_2_PID";
case DBG_VVT_3_PID:
return "DBG_VVT_3_PID";
case DBG_VVT_4_PID:
return "DBG_VVT_4_PID";
case DBG_WALL_WETTING:
return "DBG_WALL_WETTING";
case Force_4_bytes_size_debug_mode_e:
return "Force_4_bytes_size_debug_mode_e";
case MODE_52:
return "MODE_52";
case MODE_53:
return "MODE_53";
case UNUSED12:
return "UNUSED12";
case UNUSED23:
return "UNUSED23";
case UNUSED41:
return "UNUSED41";
case UNUSED_6:
return "UNUSED_6";
}
return NULL;
}
const char *getEngine_type_e(engine_type_e value){
switch(value) {
case BMW_M73_F:

3
firmware/controllers/algo/auto_generated_enginetypes.h
View File

@ -1,8 +1,9 @@
// was generated automatically by rusEFI tool from engine_types.h // by enum2string.jar tool on Sat Oct 23 22:03:36 EDT 2021
// was generated automatically by rusEFI tool from engine_types.h // by enum2string.jar tool on Sat Oct 23 23:39:23 EDT 2021
// see also gen_config_and_enums.bat
#include "engine_types.h"
#pragma once
const char *getDebug_mode_e(debug_mode_e value);
const char *getEngine_type_e(engine_type_e value);

92
firmware/controllers/algo/engine_types.h
View File

@ -19,15 +19,15 @@ typedef enum {
* 1995 Dodge Neon
* http://rusefi.com/forum/viewtopic.php?t=360
*/
DODGE_NEON_1995 = ET_DODGE_NEON_1995,
DODGE_NEON_1995 = 2,
/**
* 1996 1.3 Ford Aspire
* http://rusefi.com/forum/viewtopic.php?t=375
*/
FORD_ASPIRE_1996 = ET_FORD_ASPIRE,
FORD_ASPIRE_1996 = 3,
UNUSED5 = 4,
NISSAN_PRIMERA = ET_NISSAN_PRIMERA,
NISSAN_PRIMERA = 5,
UNUSED_6 = 6,
FORD_INLINE_6_1995 = 7,
/**
@ -91,13 +91,13 @@ UNUSED25 = 25,
MRE_BOARD_NEW_TEST = 31,
VW_ABA = ET_VW_ABA,
VW_ABA = 32,
HELLEN72_ETB = 33,
HELLEN_NA6 = ET_HELLEN_NA6,
CAMARO_4 = ET_CAMARO,
CAMARO_4 = 35,
HELLEN_128_MERCEDES_4_CYL = ET_HELLEN_128_MERCEDES_4_CYL,
@ -241,3 +241,85 @@ UNUSED25 = 25,
Force_4_bytes_size_engine_type = ENUM_32_BITS,
} engine_type_e;
/**
* https://rusefi.com//wiki/index.php?title=Manual:Debug_fields
*/
typedef enum {
DBG_ALTERNATOR_PID = 0,
DBG_TPS_ACCEL = 1,
DBG_GPPWM = 2,
DBG_IDLE_CONTROL = 3,
DBG_EL_ACCEL = 4,
DBG_TRIGGER_COUNTERS = 5,
UNUSED_6 = 6,
DBG_VVT_1_PID = 7,
/**
* VVT position debugging - not VVT valve control. See AUX pid #1 debug for valve position.
*/
DBG_VVT = 8,
DBG_CRANKING_DETAILS = 9,
DBG_IGNITION_TIMING = 10,
DBG_FUEL_PID_CORRECTION = 11,
UNUSED12 = 12,
DBG_SD_CARD = 13,
DBG_SR5_PROTOCOL = 14,
DBG_KNOCK = 15,
DBG_WALL_WETTING = 16,
/**
* See also DBG_ELECTRONIC_THROTTLE_EXTRA
*/
DBG_ELECTRONIC_THROTTLE_PID = 17,
DBG_EXECUTOR = 18,
/**
* See tunerstudio.cpp
*/
DBG_BENCH_TEST = 19,
DBG_AUX_VALVES = 20,
/**
* ADC
* See also DBG_ANALOG_INPUTS2
*/
DBG_ANALOG_INPUTS = 21,
DBG_INSTANT_RPM = 22,
UNUSED23 = 23,
DBG_STATUS = 24,
DBG_CJ125 = 25,
DBG_CAN = 26,
DBG_MAP = 27,
DBG_METRICS = 28,
DBG_ELECTRONIC_THROTTLE_EXTRA = 29,
DBG_ION = 30,
DBG_TLE8888 = 31,
/**
* See also DBG_ANALOG_INPUTS
*/
DBG_ANALOG_INPUTS2 = 32,
DBG_DWELL_METRIC = 33,
DBG_34 = 34,
DBG_ETB_LOGIC = 35,
DBG_BOOST = 36,
DBG_START_STOP = 37,
DBG_LAUNCH = 38,
DBG_ETB_AUTOTUNE = 39,
DBG_COMPOSITE_LOG = 40,
UNUSED41 = 41,
DBG_UNUSED_42 = 42,
DBG_INJECTOR_COMPENSATION = 43,
DBG_DYNO_VIEW = 44,
// todo: because of getEnumOptionsForTunerStudio 'getEnumOptionsForTunerStudio' would not work here
// todo: https://github.com/rusefi/rusefi/issues/2102
DBG_LOGIC_ANALYZER = 45,
DBG_RUSEFI_WIDEBAND = 46,
DBG_TCU = 47,
DBG_LUA = 48,
DBG_VVT_2_PID = 49,
DBG_VVT_3_PID = 50,
DBG_VVT_4_PID = 51,
MODE_52 = 52,
MODE_53 = 53,
Force_4_bytes_size_debug_mode_e = ENUM_32_BITS,
} debug_mode_e;

78
firmware/controllers/algo/rusefi_enums.h
View File

@ -574,84 +574,6 @@ typedef enum {
typedef brain_pin_e output_pin_e;
/**
* https://rusefi.com//wiki/index.php?title=Manual:Debug_fields
*/
typedef enum {
DBG_ALTERNATOR_PID = 0,
DBG_TPS_ACCEL = 1,
DBG_GPPWM = 2,
DBG_IDLE_CONTROL = 3,
DBG_EL_ACCEL = 4,
DBG_TRIGGER_COUNTERS = 5,
DBG_VVT_1_PID = 7,
/**
* VVT position debugging - not VVT valve control. See AUX pid #1 debug for valve position.
*/
DBG_VVT = 8,
DBG_CRANKING_DETAILS = 9,
DBG_IGNITION_TIMING = 10,
DBG_FUEL_PID_CORRECTION = 11,
DBG_SD_CARD = 13,
DBG_SR5_PROTOCOL = 14,
DBG_KNOCK = 15,
DBG_WALL_WETTING = 16,
/**
* See also DBG_ELECTRONIC_THROTTLE_EXTRA
*/
DBG_ELECTRONIC_THROTTLE_PID = 17,
DBG_EXECUTOR = 18,
/**
* See tunerstudio.cpp
*/
DBG_BENCH_TEST = 19,
DBG_AUX_VALVES = 20,
/**
* ADC
* See also DBG_ANALOG_INPUTS2
*/
DBG_ANALOG_INPUTS = 21,
DBG_INSTANT_RPM = 22,
DBG_STATUS = 24,
DBG_CJ125 = 25,
DBG_CAN = 26,
DBG_MAP = 27,
DBG_METRICS = 28,
DBG_ELECTRONIC_THROTTLE_EXTRA = 29,
DBG_ION = 30,
DBG_TLE8888 = 31,
/**
* See also DBG_ANALOG_INPUTS
*/
DBG_ANALOG_INPUTS2 = 32,
DBG_DWELL_METRIC = 33,
DBG_34 = 34,
DBG_ETB_LOGIC = 35,
DBG_BOOST = 36,
DBG_START_STOP = 37,
DBG_LAUNCH = 38,
DBG_ETB_AUTOTUNE = 39,
DBG_COMPOSITE_LOG = 40,
DBG_UNUSED_42 = 42,
DBG_INJECTOR_COMPENSATION = 43,
DBG_DYNO_VIEW = 44,
// todo: because of getEnumOptionsForTunerStudio 'getEnumOptionsForTunerStudio' would not work here
// todo: https://github.com/rusefi/rusefi/issues/2102
DBG_LOGIC_ANALYZER = 45,
DBG_RUSEFI_WIDEBAND = 46,
DBG_TCU = 47,
DBG_LUA = 48,
DBG_VVT_2_PID = 49,
DBG_VVT_3_PID = 50,
DBG_VVT_4_PID = 51,
MODE_52 = 52,
MODE_53 = 53,
Force_4_bytes_size_debug_mode_e = ENUM_32_BITS,
} debug_mode_e;
typedef enum {
MT_CUSTOM = 0,
MT_DENSO183 = 1,

5
firmware/integration/rusefi_config.txt
View File

@ -476,9 +476,6 @@ end_struct
#define ET_DEFAULT_FRANKENSO 0
#define ET_MIATA_TCU_PROTEUS 1
#define ET_DODGE_NEON_1995 2
#define ET_FORD_ASPIRE 3
#define ET_NISSAN_PRIMERA 5
#define ET_FORD_INLINE_6 7
#define ET_MRE_MIATA_NB2_MAP 11
#define ET_MRE_MIATA_NA6_VAF 12
@ -490,9 +487,7 @@ end_struct
#define ET_MRE_OLD_TEST_BOARD 30
#define ET_MRE_NEW_TEST_BOARD 31
#define ET_VW_ABA 32
#define ET_HELLEN_NA6 34
#define ET_CAMARO 35
#define ET_HELLEN_128_MERCEDES_4_CYL 36
#define ET_MRE_SUBARU_EJ18 37

62
java_console/io/src/main/java/com/rusefi/enums/debug_mode_e.java Normal file
View File

@ -0,0 +1,62 @@
package com.rusefi.enums;
//auto-generated by ToJavaEnum.java
public enum debug_mode_e {
DBG_ALTERNATOR_PID,
DBG_TPS_ACCEL,
DBG_GPPWM,
DBG_IDLE_CONTROL,
DBG_EL_ACCEL,
DBG_TRIGGER_COUNTERS,
UNUSED_6,
DBG_VVT_1_PID,
DBG_VVT,
DBG_CRANKING_DETAILS,
DBG_IGNITION_TIMING,
DBG_FUEL_PID_CORRECTION,
UNUSED12,
DBG_SD_CARD,
DBG_SR5_PROTOCOL,
DBG_KNOCK,
DBG_WALL_WETTING,
DBG_ELECTRONIC_THROTTLE_PID,
DBG_EXECUTOR,
DBG_BENCH_TEST,
DBG_AUX_VALVES,
DBG_ANALOG_INPUTS,
DBG_INSTANT_RPM,
UNUSED23,
DBG_STATUS,
DBG_CJ125,
DBG_CAN,
DBG_MAP,
DBG_METRICS,
DBG_ELECTRONIC_THROTTLE_EXTRA,
DBG_ION,
DBG_TLE8888,
DBG_ANALOG_INPUTS2,
DBG_DWELL_METRIC,
DBG_34,
DBG_ETB_LOGIC,
DBG_BOOST,
DBG_START_STOP,
DBG_LAUNCH,
DBG_ETB_AUTOTUNE,
DBG_COMPOSITE_LOG,
UNUSED41,
DBG_UNUSED_42,
DBG_INJECTOR_COMPENSATION,
DBG_DYNO_VIEW,
DBG_LOGIC_ANALYZER,
DBG_RUSEFI_WIDEBAND,
DBG_TCU,
DBG_LUA,
DBG_VVT_2_PID,
DBG_VVT_3_PID,
DBG_VVT_4_PID,
MODE_52,
MODE_53,
Force_4_bytes_size_debug_mode_e,
}