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-24 09:16:11 -04:00
parent de6388b254
commit c6d47c1a8a
10 changed files with 47 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 Sat Oct 23 23:59:56 EDT 2021
// was generated automatically by rusEFI tool from engine_types.h // by enum2string.jar tool on Sun Oct 24 09:12:05 EDT 2021
// see also gen_config_and_enums.bat
@ -122,8 +122,6 @@ case UNUSED23:
}
const char *getEngine_type_e(engine_type_e value){
switch(value) {
case BMW_M73_F:
return "BMW_M73_F";
case BMW_M73_M:
return "BMW_M73_M";
case BMW_M73_MRE:
@ -160,6 +158,16 @@ case FORD_ESCORT_GT:
return "FORD_ESCORT_GT";
case FORD_INLINE_6_1995:
return "FORD_INLINE_6_1995";
case FRANKENSO_BMW_M73_F:
return "FRANKENSO_BMW_M73_F";
case FRANKENSO_MAZDA_MIATA_2003:
return "FRANKENSO_MAZDA_MIATA_2003";
case FRANKENSO_MAZDA_MIATA_NA8:
return "FRANKENSO_MAZDA_MIATA_NA8";
case FRANKENSO_MIATA_NA6_MAP:
return "FRANKENSO_MIATA_NA6_MAP";
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:
@ -226,24 +234,16 @@ case LADA_KALINA:
return "LADA_KALINA";
case MAZDA_626:
return "MAZDA_626";
case MAZDA_MIATA_2003:
return "MAZDA_MIATA_2003";
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:
return "MIATA_1990";
case MIATA_1996:
return "MIATA_1996";
case MIATA_NA6_MAP:
return "MIATA_NA6_MAP";
case MIATA_NA6_VAF:
return "MIATA_NA6_VAF";
case MIATA_PROTEUS_TCU:
return "MIATA_PROTEUS_TCU";
case MICRO_RUS_EFI:

10
firmware/controllers/algo/engine_configuration.cpp
View File

@ -888,8 +888,6 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e
setSubaruEJ18_MRE(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
case MRE_BOARD_OLD_TEST:
mreBoardOldTest(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
case MRE_BOARD_NEW_TEST:
mreBoardNewTest(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
@ -1025,18 +1023,16 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e
setDodgeNeonNGCEngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
case LADA_KALINA:
setLadaKalina(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
case FORD_ASPIRE_1996:
setFordAspireEngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
case NISSAN_PRIMERA:
setNissanPrimeraEngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
case MIATA_NA6_MAP:
case FRANKENSO_MIATA_NA6_MAP:
setMiataNA6_MAP_Frankenso(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
case MIATA_NA6_VAF:
case FRANKENSO_MIATA_NA6_VAF:
setMiataNA6_VAF_Frankenso(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
case ETB_BENCH_ENGINE:
@ -1045,7 +1041,7 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e
case TLE8888_BENCH_ENGINE:
setTle8888TestConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
case MAZDA_MIATA_NA8:
case FRANKENSO_MAZDA_MIATA_NA8:
setMazdaMiataNA8Configuration(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
case HONDA_ACCORD_CD_TWO_WIRES:

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

@ -49,7 +49,7 @@ typedef enum {
// Frankenstein board
MIATA_1990 = 19,
// Frankenso board
MIATA_NA6_MAP = ET_FRANKENSO_MIATA_NA6,
FRANKENSO_MIATA_NA6_MAP = 41,
MRE_MIATA_94_MAP = ET_MRE_MIATA_94_MAP,
MIATA_1996 = 21,
@ -107,7 +107,7 @@ UNUSED25 = 25,
LADA_KALINA = 39,
BMW_M73_F = ET_BMW_M73_F,
FRANKENSO_BMW_M73_F = ET_BMW_M73_F,
PROTEUS_QC_TEST_BOARD = ET_PROTEUS_QC_TEST_BOARD,
@ -122,7 +122,7 @@ UNUSED25 = 25,
/**
* proper NB2 setup, 2003 red test mule car
*/
MAZDA_MIATA_2003 = ET_FRANKENSO_MIATA_NB2,
FRANKENSO_MAZDA_MIATA_2003 = ET_FRANKENSO_MIATA_NB2,
UNUSED_48 = 48,
@ -144,10 +144,9 @@ UNUSED25 = 25,
MAZDA_MIATA_2003_BOARD_TEST = 55,
MAZDA_MIATA_NA8 = 56,
FRANKENSO_MAZDA_MIATA_NA8 = 56,
// see also MIATA_NA6_MAP = 41
MIATA_NA6_VAF = ET_FRANKENSO_MIATA_NA6_VAF,
FRANKENSO_MIATA_NA6_VAF = ET_FRANKENSO_MIATA_NA6_VAF,
ETB_BENCH_ENGINE = 58,

2
java_console/autotest/src/main/java/com/rusefi/f4discovery/CommonFunctionalTest.java
View File

@ -176,7 +176,7 @@ public class CommonFunctionalTest extends RusefiTestBase {
@Test
public void testMazdaMiata2003() {
ecu.setEngineType(engine_type_e.MAZDA_MIATA_2003);
ecu.setEngineType(engine_type_e.FRANKENSO_MAZDA_MIATA_2003);
ecu.sendCommand("get cranking_dwell"); // just test coverage
// sendCommand("get nosuchgettersdfsdfsdfsdf"); // just test coverage
}

2
java_console/autotest/src/main/java/com/rusefi/f4discovery/HighRevTest.java
View File

@ -21,7 +21,7 @@ public class HighRevTest extends RusefiTestBase {
@Test
public void testV12() {
ecu.setEngineType(engine_type_e.BMW_M73_F);
ecu.setEngineType(engine_type_e.FRANKENSO_BMW_M73_F);
ecu.changeRpm(700);
// first let's get to expected RPM
EcuTestHelper.assertRpmDoesNotJump(6000, 5, 40, FAIL, ecu.commandQueue);

2
java_console/autotest/src/main/java/com/rusefi/f4discovery/PwmHardwareTest.java
View File

@ -57,7 +57,7 @@ public class PwmHardwareTest extends RusefiTestBase {
@Test
public void testIdlePin() {
ecu.setEngineType(ET_FRANKENSO_MIATA_NA6);
ecu.setEngineType(engine_type_e.FRANKENSO_MIATA_NA6_MAP);
ecu.changeRpm(1000);
ecu.sendCommand(CMD_TRIGGER_SIMULATOR_PIN + " 0 none");

3
java_console/autotest/src/main/java/com/rusefi/f4discovery/VssHardwareLoopTest.java
View File

@ -6,6 +6,7 @@ import com.rusefi.Timeouts;
import com.rusefi.config.generated.Fields;
import com.rusefi.core.Sensor;
import com.rusefi.core.SensorCentral;
import com.rusefi.enums.engine_type_e;
import com.rusefi.functional_tests.EcuTestHelper;
import org.junit.Test;
@ -27,7 +28,7 @@ public class VssHardwareLoopTest extends RusefiTestBase {
@Test
public void test() {
ecu.setEngineType(ET_FRANKENSO_MIATA_NA6);
ecu.setEngineType(engine_type_e.FRANKENSO_MIATA_NA6_MAP);
ecu.sendCommand(getEnableCommand(Fields.CMD_EXTERNAL_STIMULATION));
ecu.changeRpm(1400);

5
java_console/autotest/src/main/java/com/rusefi/functional_tests/EcuTestHelper.java
View File

@ -117,10 +117,7 @@ public class EcuTestHelper {
}
public void setEngineType(engine_type_e engine_type_e) {
setEngineType(engine_type_e.ordinal());
}
public void setEngineType(int type) {
int type = engine_type_e.ordinal();
log.info("AUTOTEST setEngineType " + type);
currentEngineType = type;
// sendCommand(CMD_PINS);

10
java_console/io/src/main/java/com/rusefi/enums/engine_type_e.java
View File

@ -44,14 +44,14 @@ public enum engine_type_e {
MRE_SUBARU_EJ18,
TOYOTA_JZS147,
LADA_KALINA,
BMW_M73_F,
MIATA_NA6_MAP,
FRANKENSO_BMW_M73_F,
FRANKENSO_MIATA_NA6_MAP,
PROTEUS_QC_TEST_BOARD,
HONDA_600,
TOYOTA_2JZ_GTE_VVTi,
TEST_ENGINE_VVT,
DODGE_NEON_2003_CRANK,
MAZDA_MIATA_2003,
FRANKENSO_MAZDA_MIATA_2003,
UNUSED_48,
FRANKENSO_QA_ENGINE,
UNUSED_50,
@ -60,8 +60,8 @@ public enum engine_type_e {
TEST_ISSUE_366_RISE,
MAZDA_MIATA_2003_NA_RAIL,
MAZDA_MIATA_2003_BOARD_TEST,
MAZDA_MIATA_NA8,
MIATA_NA6_VAF,
FRANKENSO_MAZDA_MIATA_NA8,
FRANKENSO_MIATA_NA6_VAF,
ETB_BENCH_ENGINE,
TLE8888_BENCH_ENGINE,
MICRO_RUS_EFI,

35
java_console/ui/src/main/java/com/rusefi/PresetsPane.java
View File

@ -19,22 +19,21 @@ public class PresetsPane {
public PresetsPane(UIContext uiContext) {
this.uiContext = uiContext;
content.add(new SetEngineTypeCommandControl(uiContext,"Frankenso Miata NA6 Stage 0", "/engines/miata_na.png", engine_type_e.MIATA_NA6_VAF.ordinal()).getContent());
content.add(new SetEngineTypeCommandControl(uiContext, "Frankenso Miata NA6 Stage 1", "/engines/miata_na.png", Fields.ET_FRANKENSO_MIATA_NA6).getContent());
content.add(new SetEngineTypeCommandControl(uiContext, "Frankenso Miata NB2", "/engines/miata_nb.png", engine_type_e.MAZDA_MIATA_2003.ordinal()).getContent());
content.add(new SetEngineTypeCommandControl(uiContext, "MRE Miata NA6 MAP", "engines/miata_na.png", engine_type_e.MRE_MIATA_NA6_MAP.ordinal()).getContent());
content.add(new SetEngineTypeCommandControl(uiContext, "MRE Miata NA6 VAF", "engines/miata_na.png", engine_type_e.MRE_MIATA_NA6_VAF.ordinal()).getContent());
content.add(new SetEngineTypeCommandControl(uiContext, "MRE Miata 94 MAP", "engines/miata_na.png", engine_type_e.MRE_MIATA_94_MAP.ordinal()).getContent());
content.add(new SetEngineTypeCommandControl(uiContext, "MRE Miata NB2 MAP", "engines/miata_nb.png", engine_type_e.MRE_MIATA_NB2_MAP.ordinal()).getContent());
content.add(new SetEngineTypeCommandControl(uiContext, "MRE Miata NB2 MAF", "engines/miata_nb.png", engine_type_e.MRE_MIATA_NB2_MAF.ordinal()).getContent());
content.add(new SetEngineTypeCommandControl(uiContext, "Proteus NB2 MAP", "engines/miata_nb.png", engine_type_e.PROTEUS_MIATA_NB2.ordinal()).getContent());
content.add(new SetEngineTypeCommandControl(uiContext, "Hellen72 NB2 MAP", "engines/miata_nb.png", engine_type_e.HELLEN_NB2.ordinal()).getContent());
content.add(new SetEngineTypeCommandControl(uiContext, "MRE Miata Defaults", "", engine_type_e.MICRO_RUS_EFI.ordinal()).getContent());
content.add(new SetEngineTypeCommandControl(uiContext, "Frankenso V12", "/engines/v12", engine_type_e.BMW_M73_PROTEUS.ordinal()).getContent());
content.add(new SetEngineTypeCommandControl(uiContext, "ETB bench", "", engine_type_e.ETB_BENCH_ENGINE.ordinal()).getContent());
content.add(new SetEngineTypeCommandControl(uiContext, "Minimal", "", engine_type_e.MINIMAL_PINS.ordinal()).getContent());
content.add(new SetEngineTypeCommandControl(uiContext, "MRE old test", "", Fields.ET_MRE_OLD_TEST_BOARD).getContent());
content.add(new SetEngineTypeCommandControl(uiContext, "MRE new test", "", Fields.ET_MRE_NEW_TEST_BOARD).getContent());
content.add(new SetEngineTypeCommandControl(uiContext,"Frankenso Miata NA6 Stage 0", "/engines/miata_na.png", engine_type_e.FRANKENSO_MIATA_NA6_VAF).getContent());
content.add(new SetEngineTypeCommandControl(uiContext, "Frankenso Miata NA6 Stage 1", "/engines/miata_na.png", engine_type_e.FRANKENSO_MIATA_NA6_MAP).getContent());
content.add(new SetEngineTypeCommandControl(uiContext, "Frankenso Miata NB2", "/engines/miata_nb.png", engine_type_e.FRANKENSO_MAZDA_MIATA_2003).getContent());
content.add(new SetEngineTypeCommandControl(uiContext, "MRE Miata NA6 MAP", "engines/miata_na.png", engine_type_e.MRE_MIATA_NA6_MAP).getContent());
content.add(new SetEngineTypeCommandControl(uiContext, "MRE Miata NA6 VAF", "engines/miata_na.png", engine_type_e.MRE_MIATA_NA6_VAF).getContent());
content.add(new SetEngineTypeCommandControl(uiContext, "MRE Miata 94 MAP", "engines/miata_na.png", engine_type_e.MRE_MIATA_94_MAP).getContent());
content.add(new SetEngineTypeCommandControl(uiContext, "MRE Miata NB2 MAP", "engines/miata_nb.png", engine_type_e.MRE_MIATA_NB2_MAP).getContent());
content.add(new SetEngineTypeCommandControl(uiContext, "MRE Miata NB2 MAF", "engines/miata_nb.png", engine_type_e.MRE_MIATA_NB2_MAF).getContent());
content.add(new SetEngineTypeCommandControl(uiContext, "Proteus NB2 MAP", "engines/miata_nb.png", engine_type_e.PROTEUS_MIATA_NB2).getContent());
content.add(new SetEngineTypeCommandControl(uiContext, "Hellen72 NB2 MAP", "engines/miata_nb.png", engine_type_e.HELLEN_NB2).getContent());
content.add(new SetEngineTypeCommandControl(uiContext, "MRE Miata Defaults", "", engine_type_e.MICRO_RUS_EFI).getContent());
content.add(new SetEngineTypeCommandControl(uiContext, "Frankenso V12", "/engines/v12", engine_type_e.BMW_M73_PROTEUS).getContent());
content.add(new SetEngineTypeCommandControl(uiContext, "ETB bench", "", engine_type_e.ETB_BENCH_ENGINE).getContent());
content.add(new SetEngineTypeCommandControl(uiContext, "Minimal", "", engine_type_e.MINIMAL_PINS).getContent());
content.add(new SetEngineTypeCommandControl(uiContext, "MRE QC test board", "", engine_type_e.MRE_BOARD_NEW_TEST).getContent());
}
public JPanel getContent() {
@ -44,8 +43,8 @@ public class PresetsPane {
private class SetEngineTypeCommandControl extends FixedCommandControl {
private final String labelTest;
public SetEngineTypeCommandControl(UIContext uiContext, String labelTest, String imageFileName, int engineType) {
super(uiContext, labelTest, imageFileName, CommandControl.SET, "set " + Fields.CMD_ENGINE_TYPE + " " + engineType);
public SetEngineTypeCommandControl(UIContext uiContext, String labelTest, String imageFileName, engine_type_e engineType) {
super(uiContext, labelTest, imageFileName, CommandControl.SET, "set " + Fields.CMD_ENGINE_TYPE + " " + engineType.ordinal());
this.labelTest = labelTest;
}