From bf7ae2c76e07b6d85a3944b151f5695665a31911 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Sun, 24 Oct 2021 13:10:38 -0400 Subject: [PATCH] generate java enum from C enum? generate both C and java from yaml? #2102 --- firmware/controllers/algo/auto_generated_enginetypes.cpp | 2 +- firmware/controllers/algo/engine_configuration.cpp | 2 +- firmware/controllers/algo/engine_types.h | 2 +- unit_tests/tests/test_start_stop.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/firmware/controllers/algo/auto_generated_enginetypes.cpp b/firmware/controllers/algo/auto_generated_enginetypes.cpp index 441c9a7c77..4f0b2dba1a 100644 --- a/firmware/controllers/algo/auto_generated_enginetypes.cpp +++ b/firmware/controllers/algo/auto_generated_enginetypes.cpp @@ -128,7 +128,7 @@ case BMW_M73_MRE: return "BMW_M73_MRE"; case BMW_M73_MRE_SLAVE: return "BMW_M73_MRE_SLAVE"; -case BMW_M73_PROTEUS: +case PROTEUS_BMW_M73: return "BMW_M73_PROTEUS"; case CAMARO_4: return "CAMARO_4"; diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index ed9655d6af..fecee50491 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -920,7 +920,7 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e case PROTEUS_QC_TEST_BOARD: proteusBoardTest(PASS_CONFIG_PARAMETER_SIGNATURE); break; - case BMW_M73_PROTEUS: + case PROTEUS_BMW_M73: setEngineBMW_M73_Proteus(PASS_CONFIG_PARAMETER_SIGNATURE); break; case MIATA_PROTEUS_TCU: diff --git a/firmware/controllers/algo/engine_types.h b/firmware/controllers/algo/engine_types.h index 592746d005..670ced2a7b 100644 --- a/firmware/controllers/algo/engine_types.h +++ b/firmware/controllers/algo/engine_types.h @@ -162,7 +162,7 @@ UNUSED25 = 25, VW_B6 = ET_VW_B6, - BMW_M73_PROTEUS = 63, + PROTEUS_BMW_M73 = 63, DODGE_RAM = 64, CITROEN_TU3JP = ET_CITROEN_TU3JP, diff --git a/unit_tests/tests/test_start_stop.cpp b/unit_tests/tests/test_start_stop.cpp index 19fe790a4e..d60e14bdef 100644 --- a/unit_tests/tests/test_start_stop.cpp +++ b/unit_tests/tests/test_start_stop.cpp @@ -9,7 +9,7 @@ TEST(start, startStop) { std::unordered_map sensorVals = {{ SensorType::AcceleratorPedal, 0 }}; - WITH_ENGINE_TEST_HELPER_SENS(BMW_M73_PROTEUS, sensorVals); + WITH_ENGINE_TEST_HELPER_SENS(PROTEUS_BMW_M73, sensorVals); eth.moveTimeForwardAndInvokeEventsSec(1); // '0' time has special meaning for implementation so let's move forward // this is a pull-up, so 'true' on start-up