diff --git a/firmware/config/engines/GY6_139QMB.cpp b/firmware/config/engines/GY6_139QMB.cpp index a525cff149..286598c0a0 100644 --- a/firmware/config/engines/GY6_139QMB.cpp +++ b/firmware/config/engines/GY6_139QMB.cpp @@ -34,7 +34,7 @@ void setGy6139qmbDefaultEngineConfiguration() { /** * We treat the trigger as 8-1 toothed wheel */ - engineConfiguration->trigger.type = TT_TOOTHED_WHEEL; + engineConfiguration->trigger.type = trigger_type_e::TT_TOOTHED_WHEEL; engineConfiguration->trigger.customTotalToothCount = 8; engineConfiguration->trigger.customSkippedToothCount = 1; diff --git a/firmware/config/engines/bmw_m73.cpp b/firmware/config/engines/bmw_m73.cpp index 0eb6078d39..33bc38f431 100644 --- a/firmware/config/engines/bmw_m73.cpp +++ b/firmware/config/engines/bmw_m73.cpp @@ -102,7 +102,7 @@ void m73engine() { engineConfiguration->globalTriggerAngleOffset = 90; setCrankOperationMode(); // todo: that's not right, should be 60/2 without VW - engineConfiguration->trigger.type = TT_60_2_VW; + engineConfiguration->trigger.type = trigger_type_e::TT_60_2_VW; // this large engine seems to crank at around only 150 RPM? And happily idle at 400RPM? engineConfiguration->cranking.rpm = 350; diff --git a/firmware/config/engines/bmw_m73_mre.cpp b/firmware/config/engines/bmw_m73_mre.cpp index bbf6b47166..c07f5d8bad 100644 --- a/firmware/config/engines/bmw_m73_mre.cpp +++ b/firmware/config/engines/bmw_m73_mre.cpp @@ -102,7 +102,7 @@ void setEngineBMW_M73_microRusEfi() { // do I have VR wires flipped? - engineConfiguration->trigger.type = TT_60_2_VW; + engineConfiguration->trigger.type = trigger_type_e::TT_60_2_VW; //set tps_min 891 engineConfiguration->tpsMin = 891; diff --git a/firmware/config/engines/chevrolet_camaro_4.cpp b/firmware/config/engines/chevrolet_camaro_4.cpp index 08970f4de5..893cafb461 100644 --- a/firmware/config/engines/chevrolet_camaro_4.cpp +++ b/firmware/config/engines/chevrolet_camaro_4.cpp @@ -33,7 +33,7 @@ void setCamaro4() { engineConfiguration->ignitionMode = IM_WASTED_SPARK; setCrankOperationMode(); - engineConfiguration->trigger.type = TT_GM_24x; + engineConfiguration->trigger.type = trigger_type_e::TT_GM_24x; engineConfiguration->map.sensor.hwChannel = EFI_ADC_0; // PA0 diff --git a/firmware/config/engines/citroenBerlingoTU3JP.cpp b/firmware/config/engines/citroenBerlingoTU3JP.cpp index 05d78457a1..930282f29e 100644 --- a/firmware/config/engines/citroenBerlingoTU3JP.cpp +++ b/firmware/config/engines/citroenBerlingoTU3JP.cpp @@ -19,7 +19,7 @@ void setCitroenBerlingoTU3JPConfiguration() { * Base engine setting */ setCrankOperationMode(); - engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_60_2; + engineConfiguration->trigger.type = trigger_type_e::TT_TOOTHED_WHEEL_60_2; engineConfiguration->globalTriggerAngleOffset = 114; engineConfiguration->cylindersCount = 4; engineConfiguration->displacement = 1.360; diff --git a/firmware/config/engines/custom_engine.cpp b/firmware/config/engines/custom_engine.cpp index 43a0c9e6ed..31fb3467d2 100644 --- a/firmware/config/engines/custom_engine.cpp +++ b/firmware/config/engines/custom_engine.cpp @@ -67,7 +67,7 @@ void setDiscoveryPdm() { // todo: should this be part of more default configurations? void setFrankensoConfiguration() { - engineConfiguration->trigger.type = TT_ONE_PLUS_ONE; + engineConfiguration->trigger.type = trigger_type_e::TT_ONE_PLUS_ONE; commonFrankensoAnalogInputs(); @@ -229,7 +229,7 @@ void setEtbTestConfiguration() { engineConfiguration->rpmHardLimit = 30000; setCrankOperationMode(); - engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_60_2; + engineConfiguration->trigger.type = trigger_type_e::TT_TOOTHED_WHEEL_60_2; engineConfiguration->ignitionPins[0] = Gpio::Unassigned; @@ -786,7 +786,7 @@ void setRotary() { engineConfiguration->cylindersCount = 2; engineConfiguration->firingOrder = FO_1_2; - engineConfiguration->trigger.type = TT_36_2_2_2; + engineConfiguration->trigger.type = trigger_type_e::TT_36_2_2_2; // todo: fix UI to make this possible via TS setTwoStrokeOperationMode(); diff --git a/firmware/config/engines/dodge_neon.cpp b/firmware/config/engines/dodge_neon.cpp index 720c38e67a..ce29899846 100644 --- a/firmware/config/engines/dodge_neon.cpp +++ b/firmware/config/engines/dodge_neon.cpp @@ -19,7 +19,7 @@ #include "custom_engine.h" void setDodgeNeon1995EngineConfiguration() { - engineConfiguration->trigger.type = TT_DODGE_NEON_1995; + engineConfiguration->trigger.type = trigger_type_e::TT_DODGE_NEON_1995; engineConfiguration->fuelAlgorithm = LM_ALPHA_N; @@ -103,7 +103,7 @@ void setDodgeNeon1995EngineConfiguration() { } void setDodgeNeonNGCEngineConfiguration() { - engineConfiguration->trigger.type = TT_DODGE_NEON_2003_CAM; + engineConfiguration->trigger.type = trigger_type_e::TT_DODGE_NEON_2003_CAM; // set global_trigger_offset_angle 38 engineConfiguration->globalTriggerAngleOffset = 38; diff --git a/firmware/config/engines/dodge_ram.cpp b/firmware/config/engines/dodge_ram.cpp index 0305f17a01..47ec6fc951 100644 --- a/firmware/config/engines/dodge_ram.cpp +++ b/firmware/config/engines/dodge_ram.cpp @@ -15,7 +15,7 @@ void setDodgeRam1996() { setFrankensoConfiguration(); - engineConfiguration->trigger.type = TT_DODGE_RAM; + engineConfiguration->trigger.type = trigger_type_e::TT_DODGE_RAM; engineConfiguration->injector.flow = 243.6; // 23.2lb/h engineConfiguration->map.sensor.type = MT_DODGE_NEON_2003; diff --git a/firmware/config/engines/ford_1995_inline_6.cpp b/firmware/config/engines/ford_1995_inline_6.cpp index fa63ee8b34..ef04626ec9 100644 --- a/firmware/config/engines/ford_1995_inline_6.cpp +++ b/firmware/config/engines/ford_1995_inline_6.cpp @@ -39,7 +39,7 @@ void setFordInline6() { * We treat the trigger as 6/0 toothed wheel */ engineConfiguration->skippedWheelOnCam = true; - engineConfiguration->trigger.type = TT_TOOTHED_WHEEL; + engineConfiguration->trigger.type = trigger_type_e::TT_TOOTHED_WHEEL; engineConfiguration->trigger.customTotalToothCount = 6; engineConfiguration->trigger.customSkippedToothCount = 0; diff --git a/firmware/config/engines/ford_aspire.cpp b/firmware/config/engines/ford_aspire.cpp index 0072d8362e..ccfe67e620 100644 --- a/firmware/config/engines/ford_aspire.cpp +++ b/firmware/config/engines/ford_aspire.cpp @@ -73,7 +73,7 @@ void setFordAspireEngineConfiguration() { setSingleCoilDwell(); engineConfiguration->ignitionMode = IM_ONE_COIL; - engineConfiguration->trigger.type = TT_FORD_ASPIRE; + engineConfiguration->trigger.type = trigger_type_e::TT_FORD_ASPIRE; engineConfiguration->triggerInputDebugPins[0] = Gpio::C15; diff --git a/firmware/config/engines/ford_festiva.cpp b/firmware/config/engines/ford_festiva.cpp index b6417c1c97..94892a24d4 100644 --- a/firmware/config/engines/ford_festiva.cpp +++ b/firmware/config/engines/ford_festiva.cpp @@ -66,7 +66,7 @@ static const uint8_t racingFestivaVeTable[16][16] = { void setFordEscortGt() { common079721_2351(); - engineConfiguration->trigger.type = TT_MAZDA_DOHC_1_4; + engineConfiguration->trigger.type = trigger_type_e::TT_MAZDA_DOHC_1_4; setDensoTODO(config); diff --git a/firmware/config/engines/honda_600.cpp b/firmware/config/engines/honda_600.cpp index 0a825ba3b4..8c060ddce7 100644 --- a/firmware/config/engines/honda_600.cpp +++ b/firmware/config/engines/honda_600.cpp @@ -24,7 +24,7 @@ static void setDefaultCustomMaps() { void setHonda600() { - engineConfiguration->trigger.type = TT_HONDA_CBR_600; + engineConfiguration->trigger.type = trigger_type_e::TT_HONDA_CBR_600; engineConfiguration->fuelAlgorithm = LM_ALPHA_N; // upside down wiring diff --git a/firmware/config/engines/honda_k_dbc.cpp b/firmware/config/engines/honda_k_dbc.cpp index d191f7c789..16fdff4817 100644 --- a/firmware/config/engines/honda_k_dbc.cpp +++ b/firmware/config/engines/honda_k_dbc.cpp @@ -16,7 +16,7 @@ void setHondaK() { engineConfiguration->displacement = 2.4; engineConfiguration->firingOrder = FO_1_3_4_2; engineConfiguration->engineSyncCam = SC_Exhaust_First; - engineConfiguration->trigger.type = TT_HONDA_K_CRANK_12_1; + engineConfiguration->trigger.type = trigger_type_e::TT_HONDA_K_CRANK_12_1; engineConfiguration->globalTriggerAngleOffset = 675; engineConfiguration->vvtMode[0] = VVT_HONDA_K_INTAKE; @@ -54,12 +54,12 @@ void setHondaK() { */ void setProteusHondaElement2003() { setHondaK(); -// engineConfiguration->trigger.type = TT_TOOTHED_WHEEL; +// engineConfiguration->trigger.type = trigger_type_e::TT_TOOTHED_WHEEL; // engineConfiguration->trigger.customTotalToothCount = 12; // engineConfiguration->trigger.customSkippedToothCount = 0; -// engineConfiguration->trigger.type = TT_HONDA_K_CAM_4_1; // cam as primary, ignoring crank +// engineConfiguration->trigger.type = trigger_type_e::TT_HONDA_K_CAM_4_1; // cam as primary, ignoring crank // engineConfiguration->globalTriggerAngleOffset = 570; diff --git a/firmware/config/engines/mazda_miata.cpp b/firmware/config/engines/mazda_miata.cpp index 9f1376f210..f8665e558d 100644 --- a/firmware/config/engines/mazda_miata.cpp +++ b/firmware/config/engines/mazda_miata.cpp @@ -73,7 +73,7 @@ static const uint8_t miataNA8_maf_advance_table[16][16] = { {/*0 engineLoad=1.2 #endif static void commonMiataNa() { - engineConfiguration->trigger.type = TT_MAZDA_MIATA_NA; + engineConfiguration->trigger.type = trigger_type_e::TT_MAZDA_MIATA_NA; engineConfiguration->engineChartSize = 100; engineConfiguration->triggerInputPins[0] = Gpio::C6; // 2G YEL/BLU diff --git a/firmware/config/engines/mazda_miata_1_6.cpp b/firmware/config/engines/mazda_miata_1_6.cpp index 3217a86d4c..1dab3b5c37 100644 --- a/firmware/config/engines/mazda_miata_1_6.cpp +++ b/firmware/config/engines/mazda_miata_1_6.cpp @@ -92,7 +92,7 @@ void miataNAcommonEngineSettings() { engineConfiguration->ignitionMode = IM_WASTED_SPARK; // Trigger - engineConfiguration->trigger.type = TT_MAZDA_MIATA_NA; + engineConfiguration->trigger.type = trigger_type_e::TT_MAZDA_MIATA_NA; // Cranking engineConfiguration->cranking.rpm = 400; diff --git a/firmware/config/engines/mazda_miata_vvt.cpp b/firmware/config/engines/mazda_miata_vvt.cpp index 13c8043de7..ffa407c5f8 100644 --- a/firmware/config/engines/mazda_miata_vvt.cpp +++ b/firmware/config/engines/mazda_miata_vvt.cpp @@ -22,7 +22,7 @@ * http://rusefi.com/forum/viewtopic.php?f=3&t=1095 * * - * See also TT_MAZDA_MIATA_VVT_TEST for trigger simulation + * See also trigger_type_e::TT_MAZDA_MIATA_VVT_TEST for trigger simulation * * Based on http://rusefi.com/wiki/index.php?title=Manual:Hardware_Frankenso_board#Default_Pinout * @@ -251,7 +251,7 @@ static void setCommonMazdaNB() { engineConfiguration->ignitionMode = IM_WASTED_SPARK; // Trigger - engineConfiguration->trigger.type = TT_MIATA_VVT; + engineConfiguration->trigger.type = trigger_type_e::TT_MIATA_VVT; engineConfiguration->vvtMode[0] = VVT_MIATA_NB; engineConfiguration->vvtOffsets[0] = 98; @@ -644,7 +644,7 @@ void setMiataNB2_Proteus_TCU() { strcpy(engineConfiguration->engineMake, ENGINE_MAKE_MAZDA); strcpy(engineConfiguration->vehicleName, "TCU test"); - engineConfiguration->trigger.type = TT_TOOTHED_WHEEL; + engineConfiguration->trigger.type = trigger_type_e::TT_TOOTHED_WHEEL; engineConfiguration->trigger.customTotalToothCount = 10; engineConfiguration->trigger.customSkippedToothCount = 0; @@ -778,7 +778,7 @@ void setMiataNB2_Hellen72() { void setMiataNB2_Hellen72_36() { setMiataNB2_Hellen72(); - engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_36_1; + engineConfiguration->trigger.type = trigger_type_e::TT_TOOTHED_WHEEL_36_1; engineConfiguration->globalTriggerAngleOffset = 76; } diff --git a/firmware/config/engines/mitsubishi.cpp b/firmware/config/engines/mitsubishi.cpp index a008e188a3..7e47922e32 100644 --- a/firmware/config/engines/mitsubishi.cpp +++ b/firmware/config/engines/mitsubishi.cpp @@ -15,7 +15,7 @@ void setMitsubishiConfiguration() { - engineConfiguration->trigger.type = TT_MITSUBISHI_4G93; // same trigger as 4G63? + engineConfiguration->trigger.type = trigger_type_e::TT_MITSUBISHI_4G93; // same trigger as 4G63? engineConfiguration->cylindersCount = 4; engineConfiguration->displacement = 1.800; diff --git a/firmware/config/engines/nissan_primera.cpp b/firmware/config/engines/nissan_primera.cpp index 70d6171683..13b7d4cf77 100644 --- a/firmware/config/engines/nissan_primera.cpp +++ b/firmware/config/engines/nissan_primera.cpp @@ -13,7 +13,7 @@ #include "nissan_primera.h" void setNissanPrimeraEngineConfiguration() { - engineConfiguration->trigger.type = TT_NISSAN_SR20VE; + engineConfiguration->trigger.type = trigger_type_e::TT_NISSAN_SR20VE; engineConfiguration->auxValves[0] = Gpio::E14; engineConfiguration->auxValves[1] = Gpio::E12; diff --git a/firmware/config/engines/nissan_vq.cpp b/firmware/config/engines/nissan_vq.cpp index 8df032ce4f..0e5c399047 100644 --- a/firmware/config/engines/nissan_vq.cpp +++ b/firmware/config/engines/nissan_vq.cpp @@ -13,7 +13,7 @@ #define NISSAN_VQ_VVT_OFFSET 157 void setHellen121nissanQR() { - engineConfiguration->trigger.type = TT_NISSAN_QR25; + engineConfiguration->trigger.type = trigger_type_e::TT_NISSAN_QR25; engineConfiguration->cylindersCount = 4; engineConfiguration->firingOrder = FO_1_3_4_2; @@ -34,7 +34,7 @@ void setHellen121nissanQR() { void setHellen121nissanVQ() { #include "nissan_vq.lua" - engineConfiguration->trigger.type = TT_NISSAN_VQ35; + engineConfiguration->trigger.type = trigger_type_e::TT_NISSAN_VQ35; setNissanMAF0031(config); diff --git a/firmware/config/engines/sachs.cpp b/firmware/config/engines/sachs.cpp index 27bbe5b215..e26ae432be 100644 --- a/firmware/config/engines/sachs.cpp +++ b/firmware/config/engines/sachs.cpp @@ -26,7 +26,7 @@ void setSachs() { /** * 50/2 trigger */ - engineConfiguration->trigger.type = TT_TOOTHED_WHEEL; + engineConfiguration->trigger.type = trigger_type_e::TT_TOOTHED_WHEEL; engineConfiguration->trigger.customTotalToothCount = 50; engineConfiguration->trigger.customSkippedToothCount = 2; diff --git a/firmware/config/engines/subaru.cpp b/firmware/config/engines/subaru.cpp index ec1223df98..a2c35e9d43 100644 --- a/firmware/config/engines/subaru.cpp +++ b/firmware/config/engines/subaru.cpp @@ -15,7 +15,7 @@ #include "defaults.h" void setSubaru2003Wrx() { - engineConfiguration->trigger.type = TT_TOOTHED_WHEEL; + engineConfiguration->trigger.type = trigger_type_e::TT_TOOTHED_WHEEL; engineConfiguration->trigger.customTotalToothCount = 5; engineConfiguration->trigger.customSkippedToothCount = 1; @@ -35,7 +35,7 @@ void setSubaru2003Wrx() { * set engine_type 37 */ void setSubaruEJ18_MRE() { - engineConfiguration->trigger.type = TT_SUBARU_7_WITHOUT_6; + engineConfiguration->trigger.type = trigger_type_e::TT_SUBARU_7_WITHOUT_6; // engineConfiguration->isDoubleSolenoidIdle = true; @@ -65,7 +65,7 @@ void setSubaruEJ18_MRE() { void setSubaruEG33Defaults() { setCamOperationMode(); - engineConfiguration->trigger.type = TT_SUBARU_SVX; + engineConfiguration->trigger.type = trigger_type_e::TT_SUBARU_SVX; engineConfiguration->cylindersCount = 6; setLeftRightBanksNeedBetterName(); diff --git a/firmware/config/engines/test_engine.cpp b/firmware/config/engines/test_engine.cpp index bb6f4815c6..d8d2b561fc 100644 --- a/firmware/config/engines/test_engine.cpp +++ b/firmware/config/engines/test_engine.cpp @@ -16,10 +16,10 @@ // TEST_ENGINE void setTestCamEngineConfiguration() { - engineConfiguration->trigger.type = TT_ONE_PLUS_ONE; + engineConfiguration->trigger.type = trigger_type_e::TT_ONE_PLUS_ONE; setCamOperationMode(); -// engineConfiguration->trigger.type = TT_TOOTHED_WHEEL; +// engineConfiguration->trigger.type = trigger_type_e::TT_TOOTHED_WHEEL; // trigger_config_s *triggerConfig = &engineConfiguration->trigger; // triggerConfig->customTotalToothCount = 60; // triggerConfig->customSkippedToothCount = 0; @@ -50,7 +50,7 @@ void setTestCamEngineConfiguration() { void setTestCrankEngineConfiguration() { setTestCamEngineConfiguration(); - engineConfiguration->trigger.type = TT_ONE; + engineConfiguration->trigger.type = trigger_type_e::TT_ONE; setCrankOperationMode(); // this is related to 'setDefaultBaseEngine' having 'skippedWheelOnCam = true' which is a weird fact by itself @@ -76,7 +76,7 @@ void setTestDcWastegateConfiguration() { void setTestVVTEngineConfiguration() { setCrankOperationMode(); - engineConfiguration->trigger.type = TT_TOOTHED_WHEEL; + engineConfiguration->trigger.type = trigger_type_e::TT_TOOTHED_WHEEL; engineConfiguration->trigger.customTotalToothCount = 3; engineConfiguration->trigger.customSkippedToothCount = 1; @@ -99,7 +99,7 @@ void setTestEngineIssue366both() { engineConfiguration->trigger.customTotalToothCount = 2; engineConfiguration->trigger.customSkippedToothCount = 1; - engineConfiguration->trigger.type = TT_TOOTHED_WHEEL; + engineConfiguration->trigger.type = trigger_type_e::TT_TOOTHED_WHEEL; } void setTestEngineIssue366rise() { @@ -110,7 +110,7 @@ void setTestEngineIssue366rise() { #ifdef HARDWARE_CI void setProteusAnalogPwmTest() { // lowest cpu trigger possible - engineConfiguration->trigger.type = TT_ONE; + engineConfiguration->trigger.type = trigger_type_e::TT_ONE; // Disable trigger stim engineConfiguration->triggerSimulatorPins[0] = Gpio::Unassigned; diff --git a/firmware/config/engines/toyota_jzs147.cpp b/firmware/config/engines/toyota_jzs147.cpp index 5dede3b74d..f2df7cb6fd 100644 --- a/firmware/config/engines/toyota_jzs147.cpp +++ b/firmware/config/engines/toyota_jzs147.cpp @@ -73,7 +73,7 @@ void setToyota_2jz_vics() { common2jz(); setCrankOperationMode(); - engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_36_2; + engineConfiguration->trigger.type = trigger_type_e::TT_TOOTHED_WHEEL_36_2; engineConfiguration->triggerInputPins[0] = Gpio::A5; // crank sensor engineConfiguration->triggerInputPins[1] = Gpio::Unassigned; // cam sensor will he handled by custom vtti code diff --git a/firmware/config/engines/vw.cpp b/firmware/config/engines/vw.cpp index d5dc88ff09..8499db5abd 100644 --- a/firmware/config/engines/vw.cpp +++ b/firmware/config/engines/vw.cpp @@ -26,7 +26,7 @@ void setVwAba() { setCrankOperationMode(); - engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_60_2; + engineConfiguration->trigger.type = trigger_type_e::TT_TOOTHED_WHEEL_60_2; engineConfiguration->mafAdcChannel = EFI_ADC_1; diff --git a/firmware/config/engines/vw_b6.cpp b/firmware/config/engines/vw_b6.cpp index d7a59aaf18..c83474bfec 100644 --- a/firmware/config/engines/vw_b6.cpp +++ b/firmware/config/engines/vw_b6.cpp @@ -16,7 +16,7 @@ static void commonPassatB6() { setCrankOperationMode(); - engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_60_2; + engineConfiguration->trigger.type = trigger_type_e::TT_TOOTHED_WHEEL_60_2; engineConfiguration->vvtMode[0] = VVT_BOSCH_QUICK_START; engineConfiguration->map.sensor.type = MT_BOSCH_2_5; diff --git a/firmware/controllers/algo/defaults/default_base_engine.cpp b/firmware/controllers/algo/defaults/default_base_engine.cpp index dc4c46705c..2b15a37400 100644 --- a/firmware/controllers/algo/defaults/default_base_engine.cpp +++ b/firmware/controllers/algo/defaults/default_base_engine.cpp @@ -53,7 +53,7 @@ void setDefaultBaseEngine() { engineConfiguration->ALSMaxTPS = 5; // Trigger - engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_60_2; + engineConfiguration->trigger.type = trigger_type_e::TT_TOOTHED_WHEEL_60_2; engineConfiguration->globalTriggerAngleOffset = 0; diff --git a/firmware/controllers/algo/engine.cpp b/firmware/controllers/algo/engine.cpp index 4e0ecb66dc..44ced8b48d 100644 --- a/firmware/controllers/algo/engine.cpp +++ b/firmware/controllers/algo/engine.cpp @@ -66,42 +66,42 @@ void Engine::resetEngineSnifferIfInTestMode() { trigger_type_e getVvtTriggerType(vvt_mode_e vvtMode) { switch (vvtMode) { case VVT_INACTIVE: - return TT_ONE; + return trigger_type_e::TT_ONE; case VVT_2JZ: - return TT_VVT_JZ; + return trigger_type_e::TT_VVT_JZ; case VVT_MIATA_NB: - return TT_VVT_MIATA_NB; + return trigger_type_e::TT_VVT_MIATA_NB; case VVT_BOSCH_QUICK_START: - return TT_VVT_BOSCH_QUICK_START; + return trigger_type_e::TT_VVT_BOSCH_QUICK_START; case VVT_HONDA_K_EXHAUST: - return TT_HONDA_K_CAM_4_1; + return trigger_type_e::TT_HONDA_K_CAM_4_1; case VVT_HONDA_K_INTAKE: case VVT_FIRST_HALF: case VVT_SECOND_HALF: case VVT_MAP_V_TWIN: - return TT_ONE; + return trigger_type_e::TT_ONE; case VVT_FORD_ST170: - return TT_FORD_ST170; + return trigger_type_e::TT_FORD_ST170; case VVT_BARRA_3_PLUS_1: - return TT_VVT_BARRA_3_PLUS_1; + return trigger_type_e::TT_VVT_BARRA_3_PLUS_1; case VVT_MAZDA_SKYACTIV: - return TT_VVT_MAZDA_SKYACTIV; + return trigger_type_e::TT_VVT_MAZDA_SKYACTIV; case VVT_NISSAN_VQ: - return TT_VVT_NISSAN_VQ35; + return trigger_type_e::TT_VVT_NISSAN_VQ35; case VVT_TOYOTA_4_1: - return TT_VVT_TOYOTA_4_1; + return trigger_type_e::TT_VVT_TOYOTA_4_1; case VVT_MITSUBISHI_3A92: - return TT_VVT_MITSUBISHI_3A92; + return trigger_type_e::TT_VVT_MITSUBISHI_3A92; case VVT_MITSUBISHI_6G75: case VVT_NISSAN_MR: - return TT_NISSAN_MR18_CAM_VVT; + return trigger_type_e::TT_NISSAN_MR18_CAM_VVT; case VVT_MITSUBISHI_4G9x: - return TT_MITSU_4G9x_CAM; + return trigger_type_e::TT_MITSU_4G9x_CAM; case VVT_MITSUBISHI_4G63: - return TT_MITSU_4G63_CAM; + return trigger_type_e::TT_MITSU_4G63_CAM; default: firmwareError(ObdCode::OBD_PCM_Processor_Fault, "getVvtTriggerType for %s", getVvt_mode_e(vvtMode)); - return TT_ONE; // we have to return something for the sake of -Werror=return-type + return trigger_type_e::TT_ONE; // we have to return something for the sake of -Werror=return-type } } diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index 5464694ec1..e575dc0155 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -650,7 +650,7 @@ void loadConfiguration() { #if EFI_INTERNAL_FLASH if (SHOULD_IGNORE_FLASH() || IGNORE_FLASH_CONFIGURATION) { - engineConfiguration->engineType = DEFAULT_ENGINE_TYPE; + engineConfiguration->engineType = engine_type_e::DEFAULT_ENGINE_TYPE; resetConfigurationExt(engineConfiguration->engineType); writeToFlashNow(); } else { @@ -660,7 +660,7 @@ void loadConfiguration() { } #else // not EFI_INTERNAL_FLASH // This board doesn't load configuration, initialize the default - engineConfiguration->engineType = DEFAULT_ENGINE_TYPE; + engineConfiguration->engineType = engine_type_e::DEFAULT_ENGINE_TYPE; resetConfigurationExt(engineConfiguration->engineType); #endif /* EFI_INTERNAL_FLASH */ @@ -694,268 +694,268 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e * And override them with engine-specific defaults */ switch (engineType) { - case MINIMAL_PINS: + case engine_type_e::MINIMAL_PINS: // all basic settings are already set in prepareVoidConfiguration(), no need to set anything here // nothing to do - we do it all in setBoardDefaultConfiguration break; #if EFI_UNIT_TEST - case TEST_ISSUE_366_BOTH: + case engine_type_e::TEST_ISSUE_366_BOTH: setTestEngineIssue366both(); break; - case TEST_ISSUE_366_RISE: + case engine_type_e::TEST_ISSUE_366_RISE: setTestEngineIssue366rise(); break; #endif // EFI_UNIT_TEST #if HW_MICRO_RUSEFI - case MRE_VW_B6: + case engine_type_e::MRE_VW_B6: setMreVwPassatB6(); break; - case MRE_M111: + case engine_type_e::MRE_M111: setM111EngineConfiguration(); break; - case MRE_SUBARU_EJ18: + case engine_type_e::MRE_SUBARU_EJ18: setSubaruEJ18_MRE(); break; - case MRE_BOARD_NEW_TEST: + case engine_type_e::MRE_BOARD_NEW_TEST: mreBoardNewTest(); break; - case BMW_M73_MRE: - case BMW_M73_MRE_SLAVE: + case engine_type_e::BMW_M73_MRE: + case engine_type_e::BMW_M73_MRE_SLAVE: setEngineBMW_M73_microRusEfi(); break; - case MRE_MIATA_94_MAP: + case engine_type_e::MRE_MIATA_94_MAP: setMiata94_MAP_MRE(); break; - case MRE_MIATA_NA6_MAP: + case engine_type_e::MRE_MIATA_NA6_MAP: setMiataNA6_MAP_MRE(); break; - case MRE_BODY_CONTROL: + case engine_type_e::MRE_BODY_CONTROL: mreBCM(); break; #endif // HW_MICRO_RUSEFI #if HW_PROTEUS - case WASTEGATE_PROTEUS_TEST: + case engine_type_e::WASTEGATE_PROTEUS_TEST: proteusDcWastegateTest(); break; - case PROTEUS_GM_LS_4: + case engine_type_e::PROTEUS_GM_LS_4: setProteusGmLs4(); break; - case PROTEUS_VW_B6: + case engine_type_e::PROTEUS_VW_B6: setProteusVwPassatB6(); break; - case PROTEUS_QC_TEST_BOARD: + case engine_type_e::PROTEUS_QC_TEST_BOARD: proteusBoardTest(); break; - case PROTEUS_LUA_DEMO: + case engine_type_e::PROTEUS_LUA_DEMO: proteusLuaDemo(); break; - case PROTEUS_HARLEY: + case engine_type_e::PROTEUS_HARLEY: proteusHarley(); break; - case PROTEUS_BMW_M73: + case engine_type_e::PROTEUS_BMW_M73: setEngineBMW_M73_Proteus(); break; - case MIATA_PROTEUS_TCU: + case engine_type_e::MIATA_PROTEUS_TCU: setMiataNB2_Proteus_TCU(); break; - case PROTEUS_HONDA_K: + case engine_type_e::PROTEUS_HONDA_K: setProteusHondaElement2003(); break; - case PROTEUS_HONDA_OBD2A: + case engine_type_e::PROTEUS_HONDA_OBD2A: setProteusHondaOBD2A(); break; - case PROTEUS_E65_6H_MAN_IN_THE_MIDDLE: + case engine_type_e::PROTEUS_E65_6H_MAN_IN_THE_MIDDLE: setEngineProteusGearboxManInTheMiddle(); break; - case PROTEUS_MIATA_NA6: + case engine_type_e::PROTEUS_MIATA_NA6: setMiataNa6_Proteus(); break; - case PROTEUS_MIATA_NB2: + case engine_type_e::PROTEUS_MIATA_NB2: setMiataNB2_Proteus(); break; #ifdef HARDWARE_CI - case PROTEUS_ANALOG_PWM_TEST: + case engine_type_e::PROTEUS_ANALOG_PWM_TEST: setProteusAnalogPwmTest(); break; #endif // HARDWARE_CI #endif // HW_PROTEUS #if HW_HELLEN - case HELLEN_128_MERCEDES_4_CYL: + case engine_type_e::HELLEN_128_MERCEDES_4_CYL: setHellenMercedes128_4_cyl(); break; - case HELLEN_128_MERCEDES_6_CYL: + case engine_type_e::HELLEN_128_MERCEDES_6_CYL: setHellenMercedes128_6_cyl(); break; - case HELLEN_128_MERCEDES_8_CYL: + case engine_type_e::HELLEN_128_MERCEDES_8_CYL: setHellenMercedes128_8_cyl(); break; - case HELLEN_NB2: + case engine_type_e::HELLEN_NB2: setMiataNB2_Hellen72(); break; - case HELLEN_NB2_36: + case engine_type_e::HELLEN_NB2_36: setMiataNB2_Hellen72_36(); break; - case HELLEN_NA8_96: + case engine_type_e::HELLEN_NA8_96: setHellenMiata96(); break; - case HELLEN_NB1: + case engine_type_e::HELLEN_NB1: setHellenNB1(); break; - case HELLEN_121_NISSAN_4_CYL: + case engine_type_e::HELLEN_121_NISSAN_4_CYL: setHellen121nissanQR(); break; - case HELLEN_121_NISSAN_6_CYL: + case engine_type_e::HELLEN_121_NISSAN_6_CYL: setHellen121nissanVQ(); break; - case HELLEN_121_VAG_5_CYL: + case engine_type_e::HELLEN_121_VAG_5_CYL: setHellen121Vag_5_cyl(); break; - case HELLEN_121_VAG_V6_CYL: + case engine_type_e::HELLEN_121_VAG_V6_CYL: setHellen121Vag_v6_cyl(); break; - case HELLEN_121_VAG_VR6_CYL: + case engine_type_e::HELLEN_121_VAG_VR6_CYL: setHellen121Vag_vr6_cyl(); break; - case HELLEN_121_VAG_8_CYL: + case engine_type_e::HELLEN_121_VAG_8_CYL: setHellen121Vag_8_cyl(); break; - case HELLEN_121_VAG_4_CYL: - case HELLEN_55_BMW: - case HELLEN_88_BMW: - case HELLEN_134_BMW: - case HELLEN_154_VAG: + case engine_type_e::HELLEN_121_VAG_4_CYL: + case engine_type_e::HELLEN_55_BMW: + case engine_type_e::HELLEN_88_BMW: + case engine_type_e::HELLEN_134_BMW: + case engine_type_e::HELLEN_154_VAG: break; - case HELLEN_154_HYUNDAI_COUPE_BK1: + case engine_type_e::HELLEN_154_HYUNDAI_COUPE_BK1: setGenesisCoupeBK1(); break; - case HELLEN_154_HYUNDAI_COUPE_BK2: + case engine_type_e::HELLEN_154_HYUNDAI_COUPE_BK2: setGenesisCoupeBK2(); break; - case HELLEN_NA6: + case engine_type_e::HELLEN_NA6: setHellenNA6(); break; - case HELLEN_NA94: + case engine_type_e::HELLEN_NA94: setHellenNA94(); break; #endif // HW_HELLEN #if HW_FRANKENSO - case DEFAULT_FRANKENSO: + case engine_type_e::DEFAULT_FRANKENSO: setFrankensoConfiguration(); break; - case DISCOVERY_PDM: - case TEST_ENGINE: + case engine_type_e::DISCOVERY_PDM: + case engine_type_e::TEST_ENGINE: setTestCamEngineConfiguration(); break; - case TEST_CRANK_ENGINE: + case engine_type_e::TEST_CRANK_ENGINE: setTestCrankEngineConfiguration(); break; - case FRANKENSO_QA_ENGINE: + case engine_type_e::FRANKENSO_QA_ENGINE: setFrankensoBoardTestConfiguration(); break; - case FRANKENSO_BMW_M73_F: + case engine_type_e::FRANKENSO_BMW_M73_F: setBMW_M73_TwoCoilUnitTest(); break; - case BMW_M73_M: + case engine_type_e::BMW_M73_M: setEngineBMW_M73_Manhattan(); break; - case DODGE_NEON_1995: + case engine_type_e::DODGE_NEON_1995: setDodgeNeon1995EngineConfiguration(); break; - case DODGE_NEON_2003_CRANK: + case engine_type_e::DODGE_NEON_2003_CRANK: setDodgeNeonNGCEngineConfiguration(); break; - case FORD_ASPIRE_1996: + case engine_type_e::FORD_ASPIRE_1996: setFordAspireEngineConfiguration(); break; - case NISSAN_PRIMERA: + case engine_type_e::NISSAN_PRIMERA: setNissanPrimeraEngineConfiguration(); break; - case FRANKENSO_MIATA_NA6_MAP: + case engine_type_e::FRANKENSO_MIATA_NA6_MAP: setMiataNA6_MAP_Frankenso(); break; - case ETB_BENCH_ENGINE: + case engine_type_e::ETB_BENCH_ENGINE: setEtbTestConfiguration(); break; - case L9779_BENCH_ENGINE: + case engine_type_e::L9779_BENCH_ENGINE: setL9779TestConfiguration(); break; - case EEPROM_BENCH_ENGINE: + case engine_type_e::EEPROM_BENCH_ENGINE: #if EFI_PROD_CODE setEepromTestConfiguration(); #endif break; - case TLE8888_BENCH_ENGINE: + case engine_type_e::TLE8888_BENCH_ENGINE: setTle8888TestConfiguration(); break; - case FRANKENSO_MAZDA_MIATA_NA8: + case engine_type_e::FRANKENSO_MAZDA_MIATA_NA8: setFrankensoMazdaMiataNA8Configuration(); break; - case MITSU_4G93: + case engine_type_e::MITSU_4G93: setMitsubishiConfiguration(); break; - case FORD_INLINE_6_1995: + case engine_type_e::FORD_INLINE_6_1995: setFordInline6(); break; - case GY6_139QMB: + case engine_type_e::GY6_139QMB: setGy6139qmbDefaultEngineConfiguration(); break; - case HONDA_600: + case engine_type_e::HONDA_600: setHonda600(); break; - case FORD_ESCORT_GT: + case engine_type_e::FORD_ESCORT_GT: setFordEscortGt(); break; - case MIATA_1996: + case engine_type_e::MIATA_1996: setFrankensteinMiata1996(); break; - case CITROEN_TU3JP: + case engine_type_e::CITROEN_TU3JP: setCitroenBerlingoTU3JPConfiguration(); break; - case SUBARU_2003_WRX: + case engine_type_e::SUBARU_2003_WRX: setSubaru2003Wrx(); break; - case DODGE_RAM: + case engine_type_e::DODGE_RAM: setDodgeRam1996(); break; - case VW_ABA: + case engine_type_e::VW_ABA: setVwAba(); break; - case FRANKENSO_MAZDA_MIATA_2003: + case engine_type_e::FRANKENSO_MAZDA_MIATA_2003: setMazdaMiata2003EngineConfiguration(); break; - case MAZDA_MIATA_2003_NA_RAIL: + case engine_type_e::MAZDA_MIATA_2003_NA_RAIL: setMazdaMiata2003EngineConfigurationNaFuelRail(); break; - case MAZDA_MIATA_2003_BOARD_TEST: + case engine_type_e::MAZDA_MIATA_2003_BOARD_TEST: setMazdaMiata2003EngineConfigurationBoardTest(); break; - case TEST_ENGINE_VVT: + case engine_type_e::TEST_ENGINE_VVT: setTestVVTEngineConfiguration(); break; - case TEST_DC_WASTEGATE_DISCOVERY: + case engine_type_e::TEST_DC_WASTEGATE_DISCOVERY: setTestDcWastegateConfiguration(); break; - case SACHS: + case engine_type_e::SACHS: setSachs(); break; - case CAMARO_4: + case engine_type_e::CAMARO_4: setCamaro4(); break; - case TOYOTA_2JZ_GTE_VVTi: + case engine_type_e::TOYOTA_2JZ_GTE_VVTi: setToyota_2jz_vics(); break; - case TEST_33816: + case engine_type_e::TEST_33816: setTest33816EngineConfiguration(); break; - case TEST_100: - case TEST_101: - case TEST_102: - case TEST_ROTARY: + case engine_type_e::TEST_100: + case engine_type_e::TEST_101: + case engine_type_e::TEST_102: + case engine_type_e::TEST_ROTARY: setRotary(); break; #endif // HW_FRANKENSO #ifdef HW_SUBARU_EG33 - case SUBARUEG33_DEFAULTS: + case engine_type_e::SUBARUEG33_DEFAULTS: setSubaruEG33Defaults(); break; #endif //HW_SUBARU_EG33 diff --git a/firmware/controllers/algo/engine_types.h b/firmware/controllers/algo/engine_types.h index 3fa2566b1f..31f8664297 100644 --- a/firmware/controllers/algo/engine_types.h +++ b/firmware/controllers/algo/engine_types.h @@ -16,7 +16,7 @@ /** * http://rusefi.com/wiki/index.php?title=Manual:Engine_Type */ -typedef enum __attribute__ ((__packed__)) { +enum class engine_type_e : uint32_t { DEFAULT_FRANKENSO = 0, MIATA_PROTEUS_TCU = 1, @@ -219,11 +219,7 @@ typedef enum __attribute__ ((__packed__)) { TEST_100 = 100, TEST_101 = 101, TEST_102 = 102, - - // java code generator handles this value in a special way - // also looks like 2 enums are either 1 byte or 4 bytes - Force_4_bytes_size_engine_type = 70000, -} engine_type_e; +}; /** * https://rusefi.com//wiki/index.php?title=Manual:Debug_fields @@ -298,8 +294,7 @@ typedef enum __attribute__ ((__packed__)) { /** * @see http://rusefi.com/wiki/index.php?title=Manual:Software:Trigger */ -typedef enum { - +enum class trigger_type_e : uint32_t { TT_TOOTHED_WHEEL = 0, TT_FORD_ASPIRE = 1, TT_DODGE_NEON_1995 = 2, @@ -509,12 +504,7 @@ typedef enum { // Another point: once you add a new trigger, run get_trigger_images.bat which would run fome_test.exe from unit_tests // TT_UNUSED = 75, // this is used if we want to iterate over all trigger types - - // java code generator handles this value in a special way - // also looks like 2 enums are either 1 byte or 4 bytes - Force_4_bytes_size_trigger_type = 70000, -} trigger_type_e; // TriggerProcessor.java has this "trigger_type_e" name hard-coded! - +}; typedef enum { TS_DEBUG_MODE = 0, diff --git a/firmware/controllers/bench_test.cpp b/firmware/controllers/bench_test.cpp index e29de64e00..c5401a3745 100644 --- a/firmware/controllers/bench_test.cpp +++ b/firmware/controllers/bench_test.cpp @@ -492,7 +492,7 @@ void executeTSCommand(uint16_t subsystem, uint16_t index) { case TS_SET_DEFAULT_ENGINE: fatalErrorForPresetApply(); - setEngineType(DEFAULT_ENGINE_TYPE); + setEngineType(engine_type_e::DEFAULT_ENGINE_TYPE); break; case 0x79: diff --git a/firmware/controllers/engine_cycle/rpm_calculator.cpp b/firmware/controllers/engine_cycle/rpm_calculator.cpp index 17e457c511..4cf1d5dca7 100644 --- a/firmware/controllers/engine_cycle/rpm_calculator.cpp +++ b/firmware/controllers/engine_cycle/rpm_calculator.cpp @@ -70,12 +70,12 @@ operation_mode_e lookupOperationMode() { // this is related to 'knownOperationMode' flag static bool doesTriggerImplyOperationMode(trigger_type_e type) { switch (type) { - case TT_TOOTHED_WHEEL: - case TT_ONE: - case TT_3_1_CAM: - case TT_36_2_2_2: // TODO: should this one be in this list? - case TT_TOOTHED_WHEEL_60_2: - case TT_TOOTHED_WHEEL_36_1: + case trigger_type_e::TT_TOOTHED_WHEEL: + case trigger_type_e::TT_ONE: + case trigger_type_e::TT_3_1_CAM: + case trigger_type_e::TT_36_2_2_2: // TODO: should this one be in this list? + case trigger_type_e::TT_TOOTHED_WHEEL_60_2: + case trigger_type_e::TT_TOOTHED_WHEEL_36_1: // These modes could be either cam or crank speed return false; default: diff --git a/firmware/controllers/flash_main.cpp b/firmware/controllers/flash_main.cpp index 4599310166..167e7dcaeb 100644 --- a/firmware/controllers/flash_main.cpp +++ b/firmware/controllers/flash_main.cpp @@ -302,7 +302,7 @@ void readFromFlash() { efiPrintf("Need to reset flash to default due to CRC mismatch"); [[fallthrough]]; case FlashState::BlankChip: - resetConfigurationExt(DEFAULT_ENGINE_TYPE); + resetConfigurationExt(engine_type_e::DEFAULT_ENGINE_TYPE); break; case FlashState::IncompatibleVersion: // Preserve engine type from old config diff --git a/firmware/controllers/settings.cpp b/firmware/controllers/settings.cpp index 10a5e1baa9..ccd64ad661 100644 --- a/firmware/controllers/settings.cpp +++ b/firmware/controllers/settings.cpp @@ -698,19 +698,24 @@ void setDateTime(const char * const isoDateTime) { #endif // ! EFI_UNIT_TEST void setEngineType(int value) { + setEngineType((engine_type_e)value); +} + +void setEngineType(engine_type_e value) { { #if EFI_PROD_CODE chibios_rt::CriticalSectionLocker csl; #endif // EFI_PROD_CODE - engineConfiguration->engineType = (engine_type_e)value; - resetConfigurationExt((engine_type_e)value); + engineConfiguration->engineType = value; + resetConfigurationExt(value); engine->resetEngineSnifferIfInTestMode(); #if EFI_INTERNAL_FLASH writeToFlashNow(); #endif // EFI_INTERNAL_FLASH } + incrementGlobalConfigurationVersion(); #if ! EFI_UNIT_TEST #endif // ! EFI_UNIT_TEST diff --git a/firmware/controllers/settings.h b/firmware/controllers/settings.h index 77eb4737ce..a07729a830 100644 --- a/firmware/controllers/settings.h +++ b/firmware/controllers/settings.h @@ -15,6 +15,7 @@ void printConfiguration(const engine_configuration_s *engineConfiguration); void scheduleStopEngine(void); void setEngineType(int value); +void setEngineType(engine_type_e value); void readPin(const char *pinName); void printDateTime(); diff --git a/firmware/controllers/trigger/decoders/trigger_chrysler.cpp b/firmware/controllers/trigger/decoders/trigger_chrysler.cpp index 08e0b0f9ab..e44b044e42 100644 --- a/firmware/controllers/trigger/decoders/trigger_chrysler.cpp +++ b/firmware/controllers/trigger/decoders/trigger_chrysler.cpp @@ -503,7 +503,7 @@ static void add4cylblock(int off, TriggerWaveform *s) { s->addEvent720(174 + off + 2, false, TriggerWheel::T_SECONDARY); } -// TT_JEEP_4_CYL +// trigger_type_e::TT_JEEP_4_CYL void initJeep_XJ_4cyl_2500(TriggerWaveform *s) { s->initialize(FOUR_STROKE_CAM_SENSOR, SyncEdge::RiseOnly); s->isSynchronizationNeeded = false; diff --git a/firmware/controllers/trigger/decoders/trigger_gm.cpp b/firmware/controllers/trigger/decoders/trigger_gm.cpp index 5fefac7540..2dabd86693 100644 --- a/firmware/controllers/trigger/decoders/trigger_gm.cpp +++ b/firmware/controllers/trigger/decoders/trigger_gm.cpp @@ -101,7 +101,7 @@ static int gm_tooth_pair(float startAngle, bool isShortLong, TriggerWaveform* s, } /** - * TT_GM_24x and TT_GM_24x_2 + * trigger_type_e::TT_GM_24x and trigger_type_e::TT_GM_24x_2 * https://www.mediafire.com/?40mfgeoe4ctti * http://www.ls1gto.com/forums/archive/index.php/t-190549.htm * http://www.ls2.com/forums/showthread.php/834483-LS-Timing-Reluctor-Wheels-Explained @@ -153,7 +153,7 @@ static void initGmLS24(TriggerWaveform *s, float shortToothWidth) { } } -// TT_GM_24x +// trigger_type_e::TT_GM_24x void initGmLS24_5deg(TriggerWaveform *s) { initGmLS24(s, 5); @@ -165,7 +165,7 @@ void initGmLS24_5deg(TriggerWaveform *s) { s->tdcPosition = 50; } -// TT_GM_24x_2 +// trigger_type_e::TT_GM_24x_2 void initGmLS24_3deg(TriggerWaveform *s) { initGmLS24(s, 3); diff --git a/firmware/controllers/trigger/decoders/trigger_honda.cpp b/firmware/controllers/trigger/decoders/trigger_honda.cpp index 37f825083c..78386cacac 100644 --- a/firmware/controllers/trigger/decoders/trigger_honda.cpp +++ b/firmware/controllers/trigger/decoders/trigger_honda.cpp @@ -75,7 +75,7 @@ static void kseriesTooth(TriggerWaveform* s, float end) { s->addEvent360(end , false, TriggerWheel::T_PRIMARY); } -// TT_HONDA_K_CRANK_12_1 +// trigger_type_e::TT_HONDA_K_CRANK_12_1 void configureHondaK_12_1(TriggerWaveform *s) { s->initialize(FOUR_STROKE_CRANK_SENSOR, SyncEdge::RiseOnly); diff --git a/firmware/controllers/trigger/decoders/trigger_mazda.cpp b/firmware/controllers/trigger/decoders/trigger_mazda.cpp index 86113efd79..74b2072630 100644 --- a/firmware/controllers/trigger/decoders/trigger_mazda.cpp +++ b/firmware/controllers/trigger/decoders/trigger_mazda.cpp @@ -56,7 +56,7 @@ void initializeMazdaMiataNaShape(TriggerWaveform *s) { s->useOnlyPrimaryForSync = true; } -// TT_MIATA_VVT +// trigger_type_e::TT_MIATA_VVT void initializeMazdaMiataNb2Crank(TriggerWaveform *s) { /** * Note how we use 0..180 range while defining FOUR_STROKE_SYMMETRICAL_CRANK_SENSOR trigger diff --git a/firmware/controllers/trigger/decoders/trigger_misc.cpp b/firmware/controllers/trigger/decoders/trigger_misc.cpp index 4c3012302b..10e42e40d1 100644 --- a/firmware/controllers/trigger/decoders/trigger_misc.cpp +++ b/firmware/controllers/trigger/decoders/trigger_misc.cpp @@ -10,7 +10,7 @@ #include "trigger_misc.h" #include "trigger_universal.h" -// TT_FIAT_IAW_P8 +// trigger_type_e::TT_FIAT_IAW_P8 void configureFiatIAQ_P8(TriggerWaveform * s) { s->initialize(FOUR_STROKE_CAM_SENSOR, SyncEdge::Rise); @@ -25,7 +25,7 @@ void configureFiatIAQ_P8(TriggerWaveform * s) { s->setTriggerSynchronizationGap(3); } -// TT_TRI_TACH +// trigger_type_e::TT_TRI_TACH void configureTriTach(TriggerWaveform * s) { s->initialize(FOUR_STROKE_CRANK_SENSOR, SyncEdge::RiseOnly); diff --git a/firmware/controllers/trigger/decoders/trigger_mitsubishi.cpp b/firmware/controllers/trigger/decoders/trigger_mitsubishi.cpp index 7786868320..22d3d4e860 100644 --- a/firmware/controllers/trigger/decoders/trigger_mitsubishi.cpp +++ b/firmware/controllers/trigger/decoders/trigger_mitsubishi.cpp @@ -64,7 +64,7 @@ static void addMitsu93(TriggerWaveform *s, bool addSecondary) { } /** - * TT_MITSUBISHI_4G93 = 11 + * trigger_type_e::TT_MITSUBISHI_4G93 = 11 */ void initializeMitsubishi4G93(TriggerWaveform *s) { s->initialize(FOUR_STROKE_CAM_SENSOR, SyncEdge::Fall); diff --git a/firmware/controllers/trigger/decoders/trigger_renix.cpp b/firmware/controllers/trigger/decoders/trigger_renix.cpp index 09815f00c3..4ec86ff1be 100644 --- a/firmware/controllers/trigger/decoders/trigger_renix.cpp +++ b/firmware/controllers/trigger/decoders/trigger_renix.cpp @@ -30,13 +30,13 @@ static void commonRenix(TriggerWaveform *s) { s->addEventAngle(s->getCycleDuration(), false); } -// TT_RENIX_44_2_2 +// trigger_type_e::TT_RENIX_44_2_2 void initializeRenix44_2_2(TriggerWaveform *s) { s->initialize(FOUR_STROKE_SYMMETRICAL_CRANK_SENSOR, SyncEdge::RiseOnly); commonRenix(s); } -// TT_RENIX_66_2_2_2 +// trigger_type_e::TT_RENIX_66_2_2_2 void initializeRenix66_2_2(TriggerWaveform *s) { s->initialize(FOUR_STROKE_THREE_TIMES_CRANK_SENSOR, SyncEdge::RiseOnly); commonRenix(s); diff --git a/firmware/controllers/trigger/decoders/trigger_structure.cpp b/firmware/controllers/trigger/decoders/trigger_structure.cpp index 6dcfa1191b..e3afbba16e 100644 --- a/firmware/controllers/trigger/decoders/trigger_structure.cpp +++ b/firmware/controllers/trigger/decoders/trigger_structure.cpp @@ -401,165 +401,165 @@ void TriggerWaveform::initializeTriggerWaveform(operation_mode_e triggerOperatio shapeDefinitionError = false; switch (triggerConfig.TriggerType.type) { - case TT_TOOTHED_WHEEL: + case trigger_type_e::TT_TOOTHED_WHEEL: initializeSkippedToothTrigger(this, triggerConfig.TriggerType.customTotalToothCount, triggerConfig.TriggerType.customSkippedToothCount, triggerOperationMode, SyncEdge::RiseOnly); break; - case TT_MAZDA_MIATA_NA: + case trigger_type_e::TT_MAZDA_MIATA_NA: initializeMazdaMiataNaShape(this); break; - case TT_MITSUBISHI_MESS: + case trigger_type_e::TT_MITSUBISHI_MESS: initializeMitsubishi4gMess(this); break; - case TT_MAZDA_MIATA_VVT_TEST: + case trigger_type_e::TT_MAZDA_MIATA_VVT_TEST: initializeMazdaMiataVVtTestShape(this); break; - case TT_SUZUKI_G13B: + case trigger_type_e::TT_SUZUKI_G13B: initializeSuzukiG13B(this); break; - case TT_FORD_TFI_PIP: + case trigger_type_e::TT_FORD_TFI_PIP: configureFordPip(this); break; - case TT_FORD_ST170: + case trigger_type_e::TT_FORD_ST170: configureFordST170(this); break; - case TT_VVT_MIATA_NB: + case trigger_type_e::TT_VVT_MIATA_NB: initializeMazdaMiataVVtCamShape(this); break; - case TT_RENIX_66_2_2_2: + case trigger_type_e::TT_RENIX_66_2_2_2: initializeRenix66_2_2(this); break; - case TT_RENIX_44_2_2: + case trigger_type_e::TT_RENIX_44_2_2: initializeRenix44_2_2(this); break; - case TT_MIATA_VVT: + case trigger_type_e::TT_MIATA_VVT: initializeMazdaMiataNb2Crank(this); break; - case TT_DODGE_NEON_1995: - case TT_DODGE_NEON_1995_ONLY_CRANK: + case trigger_type_e::TT_DODGE_NEON_1995: + case trigger_type_e::TT_DODGE_NEON_1995_ONLY_CRANK: configureNeon1995TriggerWaveformOnlyCrank(this); break; - case TT_DODGE_STRATUS: + case trigger_type_e::TT_DODGE_STRATUS: configureDodgeStratusTriggerWaveform(this); break; - case TT_DODGE_NEON_2003_CAM: + case trigger_type_e::TT_DODGE_NEON_2003_CAM: configureNeon2003TriggerWaveformCam(this); break; - case TT_DODGE_NEON_2003_CRANK: + case trigger_type_e::TT_DODGE_NEON_2003_CRANK: configureNeon2003TriggerWaveformCam(this); // configureNeon2003TriggerWaveformCrank(triggerShape); break; - case TT_FORD_ASPIRE: + case trigger_type_e::TT_FORD_ASPIRE: configureFordAspireTriggerWaveform(this); break; - case TT_VVT_NISSAN_VQ35: + case trigger_type_e::TT_VVT_NISSAN_VQ35: initializeNissanVQvvt(this); break; - case TT_VVT_MITSUBISHI_3A92: + case trigger_type_e::TT_VVT_MITSUBISHI_3A92: initializeVvt3A92(this); break; - case TT_VVT_TOYOTA_4_1: + case trigger_type_e::TT_VVT_TOYOTA_4_1: initializeSkippedToothTrigger(this, 4, 1, triggerOperationMode, SyncEdge::RiseOnly); setTriggerSynchronizationGap3(/*gapIndex*/0, /*from*/1.60, 2.40); setTriggerSynchronizationGap3(/*gapIndex*/1, /*from*/0.75, 1.25); break; - case TT_VVT_MITSUBISHI_6G75: - case TT_NISSAN_QR25: + case trigger_type_e::TT_VVT_MITSUBISHI_6G75: + case trigger_type_e::TT_NISSAN_QR25: initializeNissanQR25crank(this); break; - case TT_NISSAN_VQ30: + case trigger_type_e::TT_NISSAN_VQ30: initializeNissanVQ30cam(this); break; - case TT_NISSAN_VQ35: + case trigger_type_e::TT_NISSAN_VQ35: initializeNissanVQ35crank(this); break; - case TT_NISSAN_MR18_CRANK: + case trigger_type_e::TT_NISSAN_MR18_CRANK: initializeNissanMR18crank(this); break; - case TT_NISSAN_MR18_CAM_VVT: + case trigger_type_e::TT_NISSAN_MR18_CAM_VVT: initializeNissanMRvvt(this); break; - case TT_KAWA_KX450F: + case trigger_type_e::TT_KAWA_KX450F: configureKawaKX450F(this); break; - case TT_SKODA_FAVORIT: + case trigger_type_e::TT_SKODA_FAVORIT: setSkodaFavorit(this); break; - case TT_GM_60_2_2_2: + case trigger_type_e::TT_GM_60_2_2_2: configureGm60_2_2_2(this); break; - case TT_GM_7X: + case trigger_type_e::TT_GM_7X: configureGmTriggerWaveform(this); break; - case TT_MAZDA_DOHC_1_4: + case trigger_type_e::TT_MAZDA_DOHC_1_4: configureMazdaProtegeLx(this); break; - case TT_ONE_PLUS_ONE: + case trigger_type_e::TT_ONE_PLUS_ONE: configureOnePlusOne(this); break; - case TT_3_1_CAM: + case trigger_type_e::TT_3_1_CAM: configure3_1_cam(this); break; - case TT_MERCEDES_2_SEGMENT: + case trigger_type_e::TT_MERCEDES_2_SEGMENT: setMercedesTwoSegment(this); break; - case TT_ONE: + case trigger_type_e::TT_ONE: initializeSkippedToothTrigger(this, 1, 0, triggerOperationMode, SyncEdge::Rise); break; - case TT_MAZDA_SOHC_4: + case trigger_type_e::TT_MAZDA_SOHC_4: configureMazdaProtegeSOHC(this); break; - case TT_DAIHATSU: + case trigger_type_e::TT_DAIHATSU: configureDaihatsu4(this); break; - case TT_VVT_JZ: + case trigger_type_e::TT_VVT_JZ: initializeSkippedToothTrigger(this, 3, 0, triggerOperationMode, SyncEdge::RiseOnly); break; - case TT_36_2_1_1: + case trigger_type_e::TT_36_2_1_1: initialize36_2_1_1(this); break; - case TT_36_2_1: + case trigger_type_e::TT_36_2_1: initialize36_2_1(this); break; - case TT_TOOTHED_WHEEL_32_2: + case trigger_type_e::TT_TOOTHED_WHEEL_32_2: initializeSkippedToothTrigger(this, 32, 2, triggerOperationMode, SyncEdge::RiseOnly); // todo: why is this 32/2 asking for third gap while 60/2 is happy with just two gaps? // method above sets second gap, here we add third @@ -567,139 +567,139 @@ void TriggerWaveform::initializeTriggerWaveform(operation_mode_e triggerOperatio setThirdTriggerSynchronizationGap(1); break; - case TT_TOOTHED_WHEEL_60_2: + case trigger_type_e::TT_TOOTHED_WHEEL_60_2: initializeSkippedToothTrigger(this, 60, 2, triggerOperationMode, SyncEdge::RiseOnly); break; - case TT_TOOTHED_WHEEL_36_2: + case trigger_type_e::TT_TOOTHED_WHEEL_36_2: initializeSkippedToothTrigger(this, 36, 2, triggerOperationMode, SyncEdge::RiseOnly); setTriggerSynchronizationGap3(/*gapIndex*/0, /*from*/1.6, 3.5); setTriggerSynchronizationGap3(/*gapIndex*/1, /*from*/0.7, 1.3); // second gap is not required to synch on perfect signal but is needed to handle to reject cranking transition noise break; - case TT_60_2_VW: + case trigger_type_e::TT_60_2_VW: setVwConfiguration(this); break; - case TT_TOOTHED_WHEEL_36_1: + case trigger_type_e::TT_TOOTHED_WHEEL_36_1: initializeSkippedToothTrigger(this, 36, 1, triggerOperationMode, SyncEdge::RiseOnly); break; - case TT_VVT_BOSCH_QUICK_START: + case trigger_type_e::TT_VVT_BOSCH_QUICK_START: configureQuickStartSenderWheel(this); break; - case TT_VVT_BARRA_3_PLUS_1: + case trigger_type_e::TT_VVT_BARRA_3_PLUS_1: configureBarra3plus1cam(this); break; - case TT_HONDA_K_CAM_4_1: + case trigger_type_e::TT_HONDA_K_CAM_4_1: configureHondaK_4_1(this); break; - case TT_HONDA_K_CRANK_12_1: + case trigger_type_e::TT_HONDA_K_CRANK_12_1: configureHondaK_12_1(this); break; - case TT_SUBARU_EZ30: + case trigger_type_e::TT_SUBARU_EZ30: initializeSubaruEZ30(this); break; - case TT_VVT_MAZDA_SKYACTIV: + case trigger_type_e::TT_VVT_MAZDA_SKYACTIV: initializeMazdaSkyactivCam(this); break; - case TT_BENELLI_TRE: + case trigger_type_e::TT_BENELLI_TRE: configureBenelli(this); break; - case TT_MITSU_4G63_CAM: + case trigger_type_e::TT_MITSU_4G63_CAM: initializeMitsubishi4g63Cam(this); break; - case TT_MITSU_4G9x_CAM: + case trigger_type_e::TT_MITSU_4G9x_CAM: initializeMitsubishi4g9xCam(this); break; - case TT_1_16: + case trigger_type_e::TT_1_16: configureOnePlus16(this); break; - case TT_HONDA_CBR_600: + case trigger_type_e::TT_HONDA_CBR_600: configureHondaCbr600(this); break; - case TT_CHRYSLER_NGC_36_2_2: + case trigger_type_e::TT_CHRYSLER_NGC_36_2_2: configureChryslerNGC_36_2_2(this); break; - case TT_MITSUBISHI_4G93: + case trigger_type_e::TT_MITSUBISHI_4G93: initializeMitsubishi4G93(this); break; - case TT_DODGE_RAM: + case trigger_type_e::TT_DODGE_RAM: initDodgeRam(this); break; - case TT_JEEP_4_CYL: + case trigger_type_e::TT_JEEP_4_CYL: initJeep_XJ_4cyl_2500(this); break; - case TT_JEEP_18_2_2_2: + case trigger_type_e::TT_JEEP_18_2_2_2: initJeep18_2_2_2(this); break; - case TT_SUBARU_7_6: + case trigger_type_e::TT_SUBARU_7_6: initializeSubaru7_6(this); break; - case TT_36_2_2_2: + case trigger_type_e::TT_36_2_2_2: initialize36_2_2_2(this); break; - case TT_2JZ_3_34: + case trigger_type_e::TT_2JZ_3_34: initialize2jzGE3_34_simulation_shape(this); break; - case TT_12_TOOTH_CRANK: + case trigger_type_e::TT_12_TOOTH_CRANK: configure12ToothCrank(this); break; - case TT_NISSAN_SR20VE: + case trigger_type_e::TT_NISSAN_SR20VE: initializeNissanSR20VE_4(this); break; - case TT_ROVER_K: + case trigger_type_e::TT_ROVER_K: initializeRoverK(this); break; - case TT_FIAT_IAW_P8: + case trigger_type_e::TT_FIAT_IAW_P8: configureFiatIAQ_P8(this); break; - case TT_TRI_TACH: + case trigger_type_e::TT_TRI_TACH: configureTriTach(this); break; - case TT_GM_24x: + case trigger_type_e::TT_GM_24x: initGmLS24_5deg(this); break; - case TT_GM_24x_2: + case trigger_type_e::TT_GM_24x_2: initGmLS24_3deg(this); break; - case TT_SUBARU_7_WITHOUT_6: + case trigger_type_e::TT_SUBARU_7_WITHOUT_6: initializeSubaruOnly7(this); break; - case TT_SUBARU_SVX: + case trigger_type_e::TT_SUBARU_SVX: initializeSubaru_SVX(this); break; - case TT_SUBARU_SVX_CRANK_1: + case trigger_type_e::TT_SUBARU_SVX_CRANK_1: initializeSubaru_SVX(this); break; - case TT_SUBARU_SVX_CAM_VVT: + case trigger_type_e::TT_SUBARU_SVX_CAM_VVT: initializeSubaru_SVX(this); break; diff --git a/firmware/controllers/trigger/trigger_central.cpp b/firmware/controllers/trigger/trigger_central.cpp index 87f096b84b..2835c30d8b 100644 --- a/firmware/controllers/trigger/trigger_central.cpp +++ b/firmware/controllers/trigger/trigger_central.cpp @@ -708,7 +708,7 @@ void triggerInfo(void) { getTrigger_type_e(engineConfiguration->trigger.type), engineConfiguration->trigger.type, getSyncEdge(TRIGGER_WAVEFORM(syncEdge)), TRIGGER_WAVEFORM(tdcPosition)); - if (engineConfiguration->trigger.type == TT_TOOTHED_WHEEL) { + if (engineConfiguration->trigger.type == trigger_type_e::TT_TOOTHED_WHEEL) { efiPrintf("total %d/skipped %d", engineConfiguration->trigger.customTotalToothCount, engineConfiguration->trigger.customSkippedToothCount); } diff --git a/firmware/controllers/trigger/trigger_decoder.cpp b/firmware/controllers/trigger/trigger_decoder.cpp index e6c49126dd..98af3ceb39 100644 --- a/firmware/controllers/trigger/trigger_decoder.cpp +++ b/firmware/controllers/trigger/trigger_decoder.cpp @@ -639,7 +639,7 @@ bool TriggerDecoderBase::isSyncPoint(const TriggerWaveform& triggerShape, trigge // Instead of detecting short/long, this logic first checks for "maybe short" and "maybe long", // then simply tests longer vs. shorter instead of absolute value. - if (triggerType == TT_MIATA_VVT) { + if (triggerType == trigger_type_e::TT_MIATA_VVT) { auto secondGap = (float)toothDurations[1] / toothDurations[2]; bool currentGapOk = isInRange(triggerShape.syncronizationRatioFrom[0], (float)triggerSyncGapRatio, triggerShape.syncronizationRatioTo[0]); diff --git a/java_tools/ConfigDefinition.jar b/java_tools/ConfigDefinition.jar index 8fd9ebc7ae..1d22059c69 100644 Binary files a/java_tools/ConfigDefinition.jar and b/java_tools/ConfigDefinition.jar differ diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/newparse/ParseState.java b/java_tools/configuration_definition/src/main/java/com/rusefi/newparse/ParseState.java index d89cab2e93..825612d9ac 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/newparse/ParseState.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/newparse/ParseState.java @@ -83,9 +83,6 @@ public class ParseState implements DefinitionsState { if (stringValueMap == null) return null; for (Value value : stringValueMap.values()) { - if (value.isForceSize()) - continue; - if (isNumeric(value.getValue())) { valueNameById.put(value.getIntValue(), value.getName()); } else { diff --git a/java_tools/enum2string.jar b/java_tools/enum2string.jar index 8128da5789..168289989d 100644 Binary files a/java_tools/enum2string.jar and b/java_tools/enum2string.jar differ diff --git a/java_tools/enum_to_string/src/main/java/com/rusefi/ToJavaEnum.java b/java_tools/enum_to_string/src/main/java/com/rusefi/ToJavaEnum.java index 606b11218d..3c6990d221 100644 --- a/java_tools/enum_to_string/src/main/java/com/rusefi/ToJavaEnum.java +++ b/java_tools/enum_to_string/src/main/java/com/rusefi/ToJavaEnum.java @@ -12,10 +12,6 @@ import java.util.List; import java.util.Map; public class ToJavaEnum { - - public static final String FORCE_2_BYTES_SIZE = "Force_2_bytes_size"; - public static final String FORCE_4_BYTES_SIZE = "Force_4_bytes_size"; - public static void main(String[] args) throws IOException { InvokeReader invokeReader = new InvokeReader(args).invoke(); String outputPath = invokeReader.getOutputPath(); @@ -61,9 +57,7 @@ public class ToJavaEnum { int index = 0; for (Value value : sorted) { int numericValue = value.getIntValueMaybeResolve(registry); - if (index != numericValue - && !value.getName().startsWith(FORCE_2_BYTES_SIZE) - && !value.getName().startsWith(FORCE_4_BYTES_SIZE)) + if (index != numericValue) throw new IllegalStateException("Got explicit ordinal " + numericValue + " instead of ordinal " + index + " in " + value); sb.append("\t" + value.getName() + ",\n"); index++; diff --git a/java_tools/enum_to_string/src/main/java/com/rusefi/VariableRegistry.java b/java_tools/enum_to_string/src/main/java/com/rusefi/VariableRegistry.java index 213d6cef14..be18f1ae3b 100644 --- a/java_tools/enum_to_string/src/main/java/com/rusefi/VariableRegistry.java +++ b/java_tools/enum_to_string/src/main/java/com/rusefi/VariableRegistry.java @@ -110,9 +110,6 @@ public class VariableRegistry { TreeMap valueNameById = new TreeMap<>(); for (Value value : stringValueMap.values()) { - if (value.isForceSize()) - continue; - if (isNumeric(value.getValue())) { valueNameById.put(value.getIntValue(), value.getName()); } else { diff --git a/java_tools/enum_to_string/src/main/java/com/rusefi/enum_reader/Value.java b/java_tools/enum_to_string/src/main/java/com/rusefi/enum_reader/Value.java index 182f2dec2f..c418bc1e9e 100644 --- a/java_tools/enum_to_string/src/main/java/com/rusefi/enum_reader/Value.java +++ b/java_tools/enum_to_string/src/main/java/com/rusefi/enum_reader/Value.java @@ -4,9 +4,6 @@ import com.rusefi.VariableRegistry; import java.util.Objects; -import static com.rusefi.ToJavaEnum.FORCE_2_BYTES_SIZE; -import static com.rusefi.ToJavaEnum.FORCE_4_BYTES_SIZE; - public class Value implements Comparable { private final String name; private final String value; @@ -16,10 +13,6 @@ public class Value implements Comparable { this.value = value; } - public boolean isForceSize() { - return getName().startsWith(FORCE_2_BYTES_SIZE) || getName().startsWith(FORCE_4_BYTES_SIZE); - } - public String getName() { return name; } diff --git a/java_tools/enum_to_string/src/test/java/com/rusefi/EnumToStringTest.java b/java_tools/enum_to_string/src/test/java/com/rusefi/EnumToStringTest.java index 86d1211f35..294c187d9f 100644 --- a/java_tools/enum_to_string/src/test/java/com/rusefi/EnumToStringTest.java +++ b/java_tools/enum_to_string/src/test/java/com/rusefi/EnumToStringTest.java @@ -26,7 +26,6 @@ public class EnumToStringTest { assertTrue(isKeyValueLine("MIN")); assertTrue(isKeyValueLine("MIN = 2,")); assertTrue(isKeyValueLine("MIN = -3,")); - assertTrue(isKeyValueLine("Force_4_bytes_size_operation_mode_e = ENUM_32_BITS,")); assertTrue(isKeyValueLine("MIN = 0x02,")); assertTrue(isKeyValueLine("MIN = 0xa2,")); assertTrue(isKeyValueLine("MIN = 0xB2,")); diff --git a/unit_tests/engine_test_helper.cpp b/unit_tests/engine_test_helper.cpp index 65eb55393b..e373b46024 100644 --- a/unit_tests/engine_test_helper.cpp +++ b/unit_tests/engine_test_helper.cpp @@ -206,7 +206,7 @@ void EngineTestHelper::fireTriggerEventsWithDuration(float durationMs) { /** * Sends specified number of rise/fall trigger events, with specified amount of time between those. * - * This is helpful for TT_ONE trigger wheel decoder and probably other decoders as well. + * This is helpful for trigger_type_e::TT_ONE trigger wheel decoder and probably other decoders as well. */ void EngineTestHelper::fireTriggerEvents2(int count, float durationMs) { for (int i = 0; i < count; i++) { @@ -388,7 +388,7 @@ void EngineTestHelper::executeUntil(int timeUs) { void setupSimpleTestEngineWithMafAndTT_ONE_trigger(EngineTestHelper *eth, injection_mode_e injectionMode) { setCamOperationMode(); - setupSimpleTestEngineWithMaf(eth, injectionMode, TT_ONE); + setupSimpleTestEngineWithMaf(eth, injectionMode, trigger_type_e::TT_ONE); } void setVerboseTrigger(bool isEnabled) { diff --git a/unit_tests/tests/actuators/test_antilag.cpp b/unit_tests/tests/actuators/test_antilag.cpp index 7d53ed7bd7..88f8383d4e 100644 --- a/unit_tests/tests/actuators/test_antilag.cpp +++ b/unit_tests/tests/actuators/test_antilag.cpp @@ -2,7 +2,7 @@ #include "fuel_math.h" TEST(Actuators, AntiLag) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); engineConfiguration->antiLagEnabled = true; diff --git a/unit_tests/tests/actuators/test_boost.cpp b/unit_tests/tests/actuators/test_boost.cpp index 0fa34fbfc3..d48a6d2d18 100644 --- a/unit_tests/tests/actuators/test_boost.cpp +++ b/unit_tests/tests/actuators/test_boost.cpp @@ -12,7 +12,7 @@ TEST(BoostControl, Setpoint) { EXPECT_CALL(targetMap, getValue(_, _)) .WillRepeatedly([](float xRpm, float tps) { return tps; }); - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); engineConfiguration->boostType = CLOSED_LOOP; BoostController bc; @@ -32,7 +32,7 @@ TEST(BoostControl, Setpoint) { } TEST(BoostControl, ObservePlant) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); BoostController bc; @@ -53,7 +53,7 @@ TEST(BoostControl, OpenLoop) { EXPECT_CALL(openMap, getValue(_, _)) .WillRepeatedly([](float xRpm, float tps) { return tps; }); - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); BoostController bc; @@ -68,7 +68,7 @@ TEST(BoostControl, OpenLoop) { } TEST(BoostControl, TestClosedLoop) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); BoostController bc; @@ -107,7 +107,7 @@ TEST(BoostControl, TestClosedLoop) { } TEST(BoostControl, SetOutput) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); engineConfiguration->isBoostControlEnabled = true; diff --git a/unit_tests/tests/actuators/test_etb.cpp b/unit_tests/tests/actuators/test_etb.cpp index d66fe18de5..d59396293c 100644 --- a/unit_tests/tests/actuators/test_etb.cpp +++ b/unit_tests/tests/actuators/test_etb.cpp @@ -21,7 +21,7 @@ using ::testing::StrictMock; TEST(etb, initializationNoPedal) { StrictMock mocks[ETB_COUNT]; - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); for (int i = 0; i < ETB_COUNT; i++) { engine->etbControllers[i] = &mocks[i]; @@ -37,7 +37,7 @@ TEST(etb, initializationNoPedal) { TEST(etb, initializationMissingThrottle) { StrictMock mocks[ETB_COUNT]; - EngineTestHelper eth(TEST_ENGINE, [](engine_configuration_s* engineConfiguration) { + EngineTestHelper eth(engine_type_e::TEST_ENGINE, [](engine_configuration_s* engineConfiguration) { engineConfiguration->etbFunctions[0] = DC_None; engineConfiguration->etbFunctions[1] = DC_None; }); @@ -63,7 +63,7 @@ TEST(etb, initializationSingleThrottle) { EXPECT_CALL(mocks[0], isEtbMode()) .WillOnce(Return(TRUE)); - EngineTestHelper eth(TEST_ENGINE, [](engine_configuration_s* engineConfiguration) { + EngineTestHelper eth(engine_type_e::TEST_ENGINE, [](engine_configuration_s* engineConfiguration) { engineConfiguration->etbFunctions[0] = DC_Throttle1; engineConfiguration->etbFunctions[1] = DC_None; }); @@ -91,7 +91,7 @@ TEST(etb, initializationSingleThrottleInSecondSlot) { EXPECT_CALL(mocks[1], isEtbMode()) .WillOnce(Return(TRUE)); - EngineTestHelper eth(TEST_ENGINE, [](engine_configuration_s* engineConfiguration) { + EngineTestHelper eth(engine_type_e::TEST_ENGINE, [](engine_configuration_s* engineConfiguration) { engineConfiguration->etbFunctions[0] = DC_None; engineConfiguration->etbFunctions[1] = DC_Throttle1; }); @@ -121,7 +121,7 @@ TEST(etb, initializationDualThrottle) { EXPECT_CALL(mocks[1], isEtbMode()) .WillOnce(Return(TRUE)); - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); for (int i = 0; i < ETB_COUNT; i++) { engine->etbControllers[i] = &mocks[i]; @@ -152,7 +152,7 @@ TEST(etb, initializationWastegate) { EXPECT_CALL(mocks[0], isEtbMode()) .WillOnce(Return(false)); - EngineTestHelper eth(TEST_ENGINE, [](engine_configuration_s* engineConfiguration) { + EngineTestHelper eth(engine_type_e::TEST_ENGINE, [](engine_configuration_s* engineConfiguration) { engineConfiguration->etbFunctions[0] = DC_Wastegate; engineConfiguration->etbFunctions[1] = DC_None; }); @@ -234,7 +234,7 @@ TEST(etb, initializationNoThrottles) { // This tests the case where you don't want an ETB, and expect everything to go fine EtbController duts[2]; - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); for (int i = 0; i < ETB_COUNT; i++) { engine->etbControllers[i] = &duts[i]; @@ -257,7 +257,7 @@ TEST(etb, initializationNoThrottles) { TEST(etb, idlePlumbing) { StrictMock mocks[ETB_COUNT]; - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); Sensor::setMockValue(SensorType::AcceleratorPedal, 50.0f, true); @@ -271,7 +271,7 @@ TEST(etb, idlePlumbing) { } TEST(etb, testSetpointOnlyPedal) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); EtbController etb; @@ -330,7 +330,7 @@ TEST(etb, testSetpointOnlyPedal) { } TEST(etb, setpointSecondThrottleTrim) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); // Mock pedal map that's just passthru pedal -> target StrictMock pedalMap; @@ -357,7 +357,7 @@ TEST(etb, setpointSecondThrottleTrim) { } TEST(etb, setpointIdle) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); // Use ETB for idle, but don't give it any range (yet) engineConfiguration->etbIdleThrottleRange = 0; @@ -413,7 +413,7 @@ TEST(etb, setpointIdle) { } TEST(etb, setpointRevLimit) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); // Configure 5000 limit start, with 750 rpm taper engineConfiguration->etbRevLimitStart = 5000; @@ -488,7 +488,7 @@ TEST(etb, setpointWastegateController) { } TEST(etb, setpointLuaAdder) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); // Must have TPS & PPS initialized for ETB setup Sensor::setMockValue(SensorType::Tps1Primary, 0); @@ -570,7 +570,7 @@ TEST(etb, etbTpsSensor) { } TEST(etb, setOutputInvalid) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); // Redundant TPS & accelerator pedal required for init Sensor::setMockValue(SensorType::Tps1Primary, 0); @@ -589,7 +589,7 @@ TEST(etb, setOutputInvalid) { } TEST(etb, setOutputValid) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); StrictMock motor; // Must have TPS & PPS initialized for ETB setup @@ -609,7 +609,7 @@ TEST(etb, setOutputValid) { } TEST(etb, setOutputValid2) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); StrictMock motor; // Must have TPS & PPS initialized for ETB setup @@ -629,7 +629,7 @@ TEST(etb, setOutputValid2) { } TEST(etb, setOutputOutOfRangeHigh) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); StrictMock motor; // Must have TPS & PPS initialized for ETB setup @@ -649,7 +649,7 @@ TEST(etb, setOutputOutOfRangeHigh) { } TEST(etb, setOutputOutOfRangeLow) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); StrictMock motor; // Must have TPS & PPS initialized for ETB setup @@ -669,7 +669,7 @@ TEST(etb, setOutputOutOfRangeLow) { } TEST(etb, setOutputPauseControl) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); StrictMock motor; // Must have TPS & PPS initialized for ETB setup @@ -690,7 +690,7 @@ TEST(etb, setOutputPauseControl) { } TEST(etb, setOutputLimpHome) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); StrictMock motor; // Must have TPS & PPS initialized for ETB setup @@ -742,7 +742,7 @@ TEST(etb, closedLoopPid) { extern int timeNowUs; TEST(etb, jamDetection) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); pid_s pid = {}; @@ -793,7 +793,7 @@ TEST(etb, jamDetection) { } TEST(etb, openLoopThrottle) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); // Redundant TPS & accelerator pedal required for init Sensor::setMockValue(SensorType::Tps1Primary, 0); @@ -815,7 +815,7 @@ TEST(etb, openLoopThrottle) { } TEST(etb, openLoopNonThrottle) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); // Redundant TPS & accelerator pedal required for init Sensor::setMockValue(SensorType::Tps1Primary, 0); diff --git a/unit_tests/tests/actuators/test_etb_integrated.cpp b/unit_tests/tests/actuators/test_etb_integrated.cpp index 324ea9c3a1..431168d7ad 100644 --- a/unit_tests/tests/actuators/test_etb_integrated.cpp +++ b/unit_tests/tests/actuators/test_etb_integrated.cpp @@ -24,7 +24,7 @@ static EtbController * initEtbIntegratedTest() { } TEST(etb, integrated) { - EngineTestHelper eth(TEST_ENGINE); // we have a destructor so cannot move EngineTestHelper into utility method + EngineTestHelper eth(engine_type_e::TEST_ENGINE); // we have a destructor so cannot move EngineTestHelper into utility method EtbController *etb = initEtbIntegratedTest(); Sensor::setMockValue(SensorType::AcceleratorPedalPrimary, 40); @@ -50,7 +50,7 @@ TEST(etb, integrated) { extern int timeNowUs; TEST(etb, intermittentTps) { - EngineTestHelper eth(TEST_ENGINE); // we have a destructor so cannot move EngineTestHelper into utility method + EngineTestHelper eth(engine_type_e::TEST_ENGINE); // we have a destructor so cannot move EngineTestHelper into utility method EtbController *etb = initEtbIntegratedTest(); // Tell the sensor checker that the ignition is on @@ -94,7 +94,7 @@ TEST(etb, intermittentTps) { } TEST(etb, intermittentPps) { - EngineTestHelper eth(TEST_ENGINE); // we have a destructor so cannot move EngineTestHelper into utility method + EngineTestHelper eth(engine_type_e::TEST_ENGINE); // we have a destructor so cannot move EngineTestHelper into utility method Sensor::setMockValue(SensorType::AcceleratorPedal, 10, true); EtbController *etb = initEtbIntegratedTest(); diff --git a/unit_tests/tests/actuators/test_fan_control.cpp b/unit_tests/tests/actuators/test_fan_control.cpp index cc3017f53d..0934003a44 100644 --- a/unit_tests/tests/actuators/test_fan_control.cpp +++ b/unit_tests/tests/actuators/test_fan_control.cpp @@ -3,7 +3,7 @@ #include "fan_control.h" TEST(Actuators, Fan) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); engineConfiguration->fanOnTemperature = 90; engineConfiguration->fanOffTemperature = 80; diff --git a/unit_tests/tests/actuators/test_fuel_pump.cpp b/unit_tests/tests/actuators/test_fuel_pump.cpp index 0562e21eb8..16a148218b 100644 --- a/unit_tests/tests/actuators/test_fuel_pump.cpp +++ b/unit_tests/tests/actuators/test_fuel_pump.cpp @@ -12,7 +12,7 @@ extern int timeNowUs; TEST(Actuators, FuelPump) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); FuelPumpController dut; diff --git a/unit_tests/tests/actuators/test_gppwm.cpp b/unit_tests/tests/actuators/test_gppwm.cpp index 9e33030a27..29a635f0be 100644 --- a/unit_tests/tests/actuators/test_gppwm.cpp +++ b/unit_tests/tests/actuators/test_gppwm.cpp @@ -74,7 +74,7 @@ TEST(GpPwm, OutputOnOff) { } TEST(GpPwm, TestGetOutput) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); GppwmChannel ch; gppwm_channel cfg; diff --git a/unit_tests/tests/actuators/test_main_relay.cpp b/unit_tests/tests/actuators/test_main_relay.cpp index eb8f60eb8e..71e098dd76 100644 --- a/unit_tests/tests/actuators/test_main_relay.cpp +++ b/unit_tests/tests/actuators/test_main_relay.cpp @@ -3,7 +3,7 @@ #include "main_relay.h" TEST(Actuators, MainRelay) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); MainRelayController dut; diff --git a/unit_tests/tests/actuators/test_tacho.cpp b/unit_tests/tests/actuators/test_tacho.cpp index 14470751ba..d04f318b3d 100644 --- a/unit_tests/tests/actuators/test_tacho.cpp +++ b/unit_tests/tests/actuators/test_tacho.cpp @@ -5,7 +5,7 @@ extern float getTachDuty(void); TEST(Actuators, Tachometer) { // This engine has a tach pin set - we need that - EngineTestHelper eth(FRANKENSO_MAZDA_MIATA_2003); + EngineTestHelper eth(engine_type_e::FRANKENSO_MAZDA_MIATA_2003); // We don't actually care about ign/inj at all, just tach engineConfiguration->isInjectionEnabled = false; @@ -18,7 +18,7 @@ TEST(Actuators, Tachometer) { engineConfiguration->tachPulseDurationAsDutyCycle = true; // Set predictable trigger settings - engineConfiguration->trigger.type = TT_TOOTHED_WHEEL; + engineConfiguration->trigger.type = trigger_type_e::TT_TOOTHED_WHEEL; engineConfiguration->trigger.customTotalToothCount = 8; engineConfiguration->trigger.customSkippedToothCount = 0; setCamOperationMode(); diff --git a/unit_tests/tests/actuators/test_vvt.cpp b/unit_tests/tests/actuators/test_vvt.cpp index a4b1caf201..e88fc28efd 100644 --- a/unit_tests/tests/actuators/test_vvt.cpp +++ b/unit_tests/tests/actuators/test_vvt.cpp @@ -6,7 +6,7 @@ using ::testing::StrictMock; using ::testing::Return; TEST(Vvt, TestSetPoint) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); // Set up a mock target map StrictMock targetMap; @@ -25,7 +25,7 @@ TEST(Vvt, TestSetPoint) { } TEST(Vvt, observePlant) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); engine->triggerCentral.vvtPosition[0][0] = 23; @@ -43,7 +43,7 @@ TEST(Vvt, openLoop) { } TEST(Vvt, ClosedLoopNotInverted) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); VvtController dut; dut.init(0, 0, 0, nullptr); @@ -58,7 +58,7 @@ TEST(Vvt, ClosedLoopNotInverted) { } TEST(Vvt, ClosedLoopInverted) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); VvtController dut; dut.init(0, 0, 0, nullptr); diff --git a/unit_tests/tests/ignition_injection/injection_mode_transition.cpp b/unit_tests/tests/ignition_injection/injection_mode_transition.cpp index 427f5a475e..c4b19ef995 100644 --- a/unit_tests/tests/ignition_injection/injection_mode_transition.cpp +++ b/unit_tests/tests/ignition_injection/injection_mode_transition.cpp @@ -30,7 +30,7 @@ static void doRevolution(EngineTestHelper& eth, int periodMs) { // https://github.com/rusefi/rusefi/issues/1592 TEST(fuelControl, transitionIssue1592) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); engine->tdcMarkEnabled = false; setupSimpleTestEngineWithMafAndTT_ONE_trigger(ð, IM_SEQUENTIAL); @@ -40,7 +40,7 @@ TEST(fuelControl, transitionIssue1592) { // This is easiest to trip on a wheel that requires sync engineConfiguration->trigger.customTotalToothCount = 6; engineConfiguration->trigger.customSkippedToothCount = 1; - eth.setTriggerType(TT_TOOTHED_WHEEL); + eth.setTriggerType(trigger_type_e::TT_TOOTHED_WHEEL); setCamOperationMode(); engineConfiguration->isFasterEngineSpinUpEnabled = true; diff --git a/unit_tests/tests/ignition_injection/test_dwell_corner_case_issue_796.cpp b/unit_tests/tests/ignition_injection/test_dwell_corner_case_issue_796.cpp index 33fcffcda4..c28dff9016 100644 --- a/unit_tests/tests/ignition_injection/test_dwell_corner_case_issue_796.cpp +++ b/unit_tests/tests/ignition_injection/test_dwell_corner_case_issue_796.cpp @@ -9,7 +9,7 @@ TEST(scheduler, dwellIssue796) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); setupSimpleTestEngineWithMafAndTT_ONE_trigger(ð, IM_SEQUENTIAL); eth.fireTriggerEvents2(4 /* count */ , 600 /* ms */); diff --git a/unit_tests/tests/ignition_injection/test_fuelCut.cpp b/unit_tests/tests/ignition_injection/test_fuelCut.cpp index abdeb06e85..3f8ad84b38 100644 --- a/unit_tests/tests/ignition_injection/test_fuelCut.cpp +++ b/unit_tests/tests/ignition_injection/test_fuelCut.cpp @@ -16,7 +16,7 @@ using ::testing::_; #define EXPECT_CUT() EXPECT_FLOAT_EQ(0, engine->engineState.injectionDuration) TEST(fuelCut, coasting) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); EXPECT_CALL(*eth.mockAirmass, getAirmass(_, _)) .WillRepeatedly(Return(AirmassResult{0.1008f, 50.0f})); @@ -131,7 +131,7 @@ TEST(fuelCut, coasting) { } TEST(fuelCut, delay) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); EXPECT_CALL(*eth.mockAirmass, getAirmass(_, _)) .WillRepeatedly(Return(AirmassResult{0.1008f, 50.0f})); diff --git a/unit_tests/tests/ignition_injection/test_fuel_computer.cpp b/unit_tests/tests/ignition_injection/test_fuel_computer.cpp index a22c971269..438ff3cd3b 100644 --- a/unit_tests/tests/ignition_injection/test_fuel_computer.cpp +++ b/unit_tests/tests/ignition_injection/test_fuel_computer.cpp @@ -14,7 +14,7 @@ public: }; TEST(FuelComputer, getCycleFuel) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); MockFuelComputer dut; @@ -30,7 +30,7 @@ TEST(FuelComputer, getCycleFuel) { } TEST(FuelComputer, FlexFuel) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); FuelComputer dut; diff --git a/unit_tests/tests/ignition_injection/test_fuel_map.cpp b/unit_tests/tests/ignition_injection/test_fuel_map.cpp index 7b7d94a4a6..834692afca 100644 --- a/unit_tests/tests/ignition_injection/test_fuel_map.cpp +++ b/unit_tests/tests/ignition_injection/test_fuel_map.cpp @@ -16,7 +16,7 @@ using ::testing::FloatNear; TEST(misc, testFuelMap) { printf("Setting up FORD_ASPIRE_1996\r\n"); - EngineTestHelper eth(FORD_ASPIRE_1996); + EngineTestHelper eth(engine_type_e::FORD_ASPIRE_1996); for (int i = 0; i < VBAT_INJECTOR_CURVE_SIZE; i++) { engineConfiguration->injector.battLagCorrBins[i] = i; @@ -129,7 +129,7 @@ static void configureFordAspireTriggerWaveform(TriggerWaveform * s) { TEST(misc, testAngleResolver) { printf("*************************************************** testAngleResolver\r\n"); - EngineTestHelper eth(FORD_ASPIRE_1996); + EngineTestHelper eth(engine_type_e::FORD_ASPIRE_1996); engineConfiguration->globalTriggerAngleOffset = 175; diff --git a/unit_tests/tests/ignition_injection/test_fuel_math.cpp b/unit_tests/tests/ignition_injection/test_fuel_math.cpp index 90fda2c895..07117c9967 100644 --- a/unit_tests/tests/ignition_injection/test_fuel_math.cpp +++ b/unit_tests/tests/ignition_injection/test_fuel_math.cpp @@ -10,7 +10,7 @@ using ::testing::InSequence; using ::testing::_; TEST(FuelMath, getStandardAirCharge) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); // Miata 1839cc 4cyl engineConfiguration->displacement = 1.839f; @@ -37,7 +37,7 @@ TEST(FuelMath, getStandardAirCharge) { } TEST(AirmassModes, AlphaNNormal) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); // 4 cylinder 4 liter = easy math engineConfiguration->displacement = 4.0f; engineConfiguration->cylindersCount = 4; @@ -61,7 +61,7 @@ TEST(AirmassModes, AlphaNNormal) { } TEST(AirmassModes, AlphaNFailedTps) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); // Shouldn't get called StrictMock veTable; @@ -78,7 +78,7 @@ TEST(AirmassModes, AlphaNFailedTps) { } TEST(AirmassModes, MafNormal) { - EngineTestHelper eth(FORD_ASPIRE_1996); + EngineTestHelper eth(engine_type_e::FORD_ASPIRE_1996); engineConfiguration->fuelAlgorithm = LM_REAL_MAF; engineConfiguration->injector.flow = 200; @@ -119,7 +119,7 @@ TEST(AirmassModes, VeOverride) { } }; - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); DummyAirmassModel dut(veTable); // Use default mode - will call with 10 @@ -148,7 +148,7 @@ TEST(AirmassModes, FallbackMap) { EXPECT_CALL(mapFallback, getValue(5678, 20)).WillOnce(Return(75)); } - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); SpeedDensityAirmass dut(veTable, mapFallback); @@ -167,7 +167,7 @@ TEST(AirmassModes, FallbackMap) { void setInjectionMode(int value); TEST(FuelMath, testDifferentInjectionModes) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); setupSimpleTestEngineWithMafAndTT_ONE_trigger(ð); EXPECT_CALL(*eth.mockAirmass, getAirmass(_, _)) @@ -192,7 +192,7 @@ TEST(FuelMath, testDifferentInjectionModes) { } TEST(FuelMath, deadtime) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); setupSimpleTestEngineWithMafAndTT_ONE_trigger(ð); @@ -212,7 +212,7 @@ TEST(FuelMath, deadtime) { } TEST(FuelMath, CylinderFuelTrim) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); EXPECT_CALL(*eth.mockAirmass, getAirmass(_, _)) .WillRepeatedly(Return(AirmassResult{1, 50.0f})); @@ -242,7 +242,7 @@ struct MockIdle : public MockIdleController { }; TEST(FuelMath, IdleVeTable) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); MockAirmass dut; diff --git a/unit_tests/tests/ignition_injection/test_fuel_wall_wetting.cpp b/unit_tests/tests/ignition_injection/test_fuel_wall_wetting.cpp index d49b64492a..858d4c4370 100644 --- a/unit_tests/tests/ignition_injection/test_fuel_wall_wetting.cpp +++ b/unit_tests/tests/ignition_injection/test_fuel_wall_wetting.cpp @@ -16,7 +16,7 @@ struct MockWallController : public IWallFuelController { }; TEST(fuel, testWallWettingEnrichmentMath) { - EngineTestHelper eth(FORD_ASPIRE_1996); + EngineTestHelper eth(engine_type_e::FORD_ASPIRE_1996); MockWallController wallController; @@ -62,12 +62,12 @@ TEST(fuel, testWallWettingEnrichmentMath) { TEST(fuel, testWallWettingEnrichmentScheduling) { - EngineTestHelper eth(FORD_ASPIRE_1996); + EngineTestHelper eth(engine_type_e::FORD_ASPIRE_1996); engineConfiguration->isFasterEngineSpinUpEnabled = false; setCrankOperationMode(); - eth.setTriggerType(TT_ONE); + eth.setTriggerType(trigger_type_e::TT_ONE); eth.fireTriggerEvents2(/* count */ 4, 25 /* ms */); diff --git a/unit_tests/tests/ignition_injection/test_ignition_scheduling.cpp b/unit_tests/tests/ignition_injection/test_ignition_scheduling.cpp index 847364b024..d1cb38929b 100644 --- a/unit_tests/tests/ignition_injection/test_ignition_scheduling.cpp +++ b/unit_tests/tests/ignition_injection/test_ignition_scheduling.cpp @@ -11,7 +11,7 @@ using ::testing::_; TEST(ignition, twoCoils) { - EngineTestHelper eth(FRANKENSO_BMW_M73_F); + EngineTestHelper eth(engine_type_e::FRANKENSO_BMW_M73_F); // let's recalculate with zero timing so that we can focus on relation advance between cylinders setArrayValues(engine->engineState.timingAdvance, 0.0f); @@ -43,7 +43,7 @@ TEST(ignition, twoCoils) { } TEST(ignition, trailingSpark) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); engineConfiguration->isFasterEngineSpinUpEnabled = false; /** @@ -127,7 +127,7 @@ TEST(ignition, trailingSpark) { } TEST(ignition, CylinderTimingTrim) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); // Base timing 15 degrees setTable(config->ignitionTable, 15); diff --git a/unit_tests/tests/ignition_injection/test_injector_model.cpp b/unit_tests/tests/ignition_injection/test_injector_model.cpp index 1ef3f43e00..67196f21b4 100644 --- a/unit_tests/tests/ignition_injection/test_injector_model.cpp +++ b/unit_tests/tests/ignition_injection/test_injector_model.cpp @@ -106,7 +106,7 @@ TEST(InjectorModel, nonLinearFordMode) { } TEST(InjectorModel, nonlinearPolynomial) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); InjectorModel dut; engineConfiguration->applyNonlinearBelowPulse = 10; @@ -130,7 +130,7 @@ TEST(InjectorModel, nonlinearPolynomial) { } TEST(InjectorModel, Deadtime) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); // Some test data in the injector correction table for (size_t i = 0; i < efi::size(engineConfiguration->injector.battLagCorr); i++) { @@ -172,7 +172,7 @@ TEST_P(FlowRateFixture, PressureRatio) { StrictMock dut; EXPECT_CALL(dut, getFuelDifferentialPressure()).WillOnce(Return(400 * pressureRatio)); - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); // Use injector compensation engineConfiguration->injectorCompensationMode = ICM_SensedRailPressure; @@ -187,7 +187,7 @@ TEST_P(FlowRateFixture, PressureRatio) { TEST(InjectorModel, NegativePressureDelta) { StrictMock dut; - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); // Use injector compensation engineConfiguration->injectorCompensationMode = ICM_SensedRailPressure; @@ -204,7 +204,7 @@ TEST(InjectorModel, NegativePressureDelta) { TEST(InjectorModel, VariableInjectorFlowModeNone) { StrictMock dut; - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); engineConfiguration->injectorCompensationMode = ICM_None; @@ -215,7 +215,7 @@ TEST(InjectorModel, VariableInjectorFlowModeNone) { TEST(InjectorModel, RailPressureFixed) { InjectorModel dut; - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); // Reference pressure is 350kpa engineConfiguration->fuelReferencePressure = 350; @@ -234,7 +234,7 @@ TEST(InjectorModel, RailPressureFixed) { TEST(InjectorModel, RailPressureSensedAbsolute) { InjectorModel dut; - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); // Reference pressure is 350kpa engineConfiguration->injectorCompensationMode = ICM_SensedRailPressure; @@ -254,7 +254,7 @@ TEST(InjectorModel, RailPressureSensedAbsolute) { TEST(InjectorModel, RailPressureSensedGauge) { InjectorModel dut; - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); // Reference pressure is 350kpa engineConfiguration->injectorCompensationMode = ICM_SensedRailPressure; @@ -275,7 +275,7 @@ TEST(InjectorModel, RailPressureSensedGauge) { TEST(InjectorModel, RailPressureSensedDifferential) { InjectorModel dut; - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); // Reference pressure is 350kpa engineConfiguration->injectorCompensationMode = ICM_SensedRailPressure; @@ -293,7 +293,7 @@ TEST(InjectorModel, RailPressureSensedDifferential) { TEST(InjectorModel, FailedPressureSensor) { InjectorModel dut; - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); // Reference pressure is 350kpa engineConfiguration->injectorCompensationMode = ICM_SensedRailPressure; @@ -311,7 +311,7 @@ TEST(InjectorModel, FailedPressureSensor) { TEST(InjectorModel, MissingPressureSensor) { InjectorModel dut; - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); // Reference pressure is 350kpa engineConfiguration->injectorCompensationMode = ICM_SensedRailPressure; diff --git a/unit_tests/tests/ignition_injection/test_multispark.cpp b/unit_tests/tests/ignition_injection/test_multispark.cpp index ef84a8479f..7c86025797 100644 --- a/unit_tests/tests/ignition_injection/test_multispark.cpp +++ b/unit_tests/tests/ignition_injection/test_multispark.cpp @@ -9,7 +9,7 @@ #include "advance_map.h" TEST(Multispark, DefaultConfiguration) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); EXPECT_EQ(0, getMultiSparkCount(0 )); EXPECT_EQ(0, getMultiSparkCount(100 )); @@ -37,7 +37,7 @@ static void multisparkCfg() { } TEST(Multispark, EnabledNoMaxRpm) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); multisparkCfg(); @@ -62,7 +62,7 @@ TEST(Multispark, EnabledNoMaxRpm) { } TEST(Multispark, RpmLimit) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); multisparkCfg(); diff --git a/unit_tests/tests/ignition_injection/test_one_cylinder_logic.cpp b/unit_tests/tests/ignition_injection/test_one_cylinder_logic.cpp index 1e3f29f0ee..6293a87ad5 100644 --- a/unit_tests/tests/ignition_injection/test_one_cylinder_logic.cpp +++ b/unit_tests/tests/ignition_injection/test_one_cylinder_logic.cpp @@ -7,7 +7,7 @@ #include "spark_logic.h" TEST(issues, issueOneCylinderSpecialCase968) { - EngineTestHelper eth(GY6_139QMB); + EngineTestHelper eth(engine_type_e::GY6_139QMB); setTable(config->injectionPhase, -180.0f); engineConfiguration->isFasterEngineSpinUpEnabled = false; engine->tdcMarkEnabled = false; @@ -16,7 +16,7 @@ TEST(issues, issueOneCylinderSpecialCase968) { setCrankOperationMode(); - eth.setTriggerType(TT_ONE); + eth.setTriggerType(trigger_type_e::TT_ONE); ASSERT_EQ( 0, engine->executor.size()) << "start"; diff --git a/unit_tests/tests/ignition_injection/test_startOfCrankingPrimingPulse.cpp b/unit_tests/tests/ignition_injection/test_startOfCrankingPrimingPulse.cpp index 55219400da..931ca6c9db 100644 --- a/unit_tests/tests/ignition_injection/test_startOfCrankingPrimingPulse.cpp +++ b/unit_tests/tests/ignition_injection/test_startOfCrankingPrimingPulse.cpp @@ -8,7 +8,7 @@ #include "pch.h" TEST(engine, testPlainCrankingWithoutAdvancedFeatures) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); setTable(config->injectionPhase, -180.0f); engineConfiguration->isFasterEngineSpinUpEnabled = false; engine->tdcMarkEnabled = false; @@ -34,7 +34,7 @@ TEST(engine, testPlainCrankingWithoutAdvancedFeatures) { TEST(priming, startScheduling) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); ASSERT_EQ( 0, Sensor::getOrZero(SensorType::Rpm)) << "RPM=0"; @@ -45,7 +45,7 @@ TEST(priming, startScheduling) { } TEST(priming, duration) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); MockInjectorModel2 injectorModel; engine->module().set(&injectorModel); diff --git a/unit_tests/tests/lua/test_lookup.cpp b/unit_tests/tests/lua/test_lookup.cpp index 32a5ee8fbc..2f27c0e48d 100644 --- a/unit_tests/tests/lua/test_lookup.cpp +++ b/unit_tests/tests/lua/test_lookup.cpp @@ -2,7 +2,7 @@ #include "value_lookup.h" TEST(LuaBasic, configLookup) { - EngineTestHelper eth(FORD_ESCORT_GT); + EngineTestHelper eth(engine_type_e::FORD_ESCORT_GT); { const char * name = "ignitionDwellForCrankingMs"; setConfigValueByName(name, 1.6); diff --git a/unit_tests/tests/lua/test_lua_hooks.cpp b/unit_tests/tests/lua/test_lua_hooks.cpp index e18c2471c4..10388b960a 100644 --- a/unit_tests/tests/lua/test_lua_hooks.cpp +++ b/unit_tests/tests/lua/test_lua_hooks.cpp @@ -23,7 +23,7 @@ TEST(LuaHooks, TestCrc8) { } TEST(LuaHooks, TestGetCalibration) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); const char* sourceCode = R"( function testFunc() @@ -35,7 +35,7 @@ TEST(LuaHooks, TestGetCalibration) { } TEST(LuaHooks, TestSetCalibration) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); const char* sourceCode = R"( function testFunc() @@ -92,7 +92,7 @@ TEST(LuaHooks, Table3d) { end )"; - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); setTable(config->scriptTable2, (uint8_t)33); EXPECT_EQ(testLuaReturnsNumber(tableTest), 33); diff --git a/unit_tests/tests/lua/test_lua_vin.cpp b/unit_tests/tests/lua/test_lua_vin.cpp index 14f862d403..79527e883e 100644 --- a/unit_tests/tests/lua/test_lua_vin.cpp +++ b/unit_tests/tests/lua/test_lua_vin.cpp @@ -9,7 +9,7 @@ TEST(LuaVin, Test) { - EngineTestHelper eth(TEST_CRANK_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_CRANK_ENGINE); strcpy(engineConfiguration->vinNumber, "GM123"); diff --git a/unit_tests/tests/lua/test_lua_with_engine.cpp b/unit_tests/tests/lua/test_lua_with_engine.cpp index 769e59a319..37b31919fe 100644 --- a/unit_tests/tests/lua/test_lua_with_engine.cpp +++ b/unit_tests/tests/lua/test_lua_with_engine.cpp @@ -19,7 +19,7 @@ end )"; TEST(LuaHooks, TestCurve) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); strcpy(engineConfiguration->scriptCurveName[3], "hello"); setLinearCurve(config->scriptCurve4, 500, 600, 1); diff --git a/unit_tests/tests/sensor/test_frequency_sensor.cpp b/unit_tests/tests/sensor/test_frequency_sensor.cpp index 66248ce5b6..83d3dfc17e 100644 --- a/unit_tests/tests/sensor/test_frequency_sensor.cpp +++ b/unit_tests/tests/sensor/test_frequency_sensor.cpp @@ -50,7 +50,7 @@ public: */ TEST_F(FrequencySensorTest, testValidWithPwm) { ASSERT_TRUE(dut.Register()); - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); // Should be invalid - not set yet { diff --git a/unit_tests/tests/sensor/test_sensor_init.cpp b/unit_tests/tests/sensor/test_sensor_init.cpp index 8ff49b29e9..f455c5689b 100644 --- a/unit_tests/tests/sensor/test_sensor_init.cpp +++ b/unit_tests/tests/sensor/test_sensor_init.cpp @@ -24,7 +24,7 @@ static void postToFuncSensor(Sensor* s, float value) { } TEST(SensorInit, Tps) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); engineConfiguration->tpsMin = 200; // 1 volt engineConfiguration->tpsMax = 800; // 4 volts @@ -50,7 +50,7 @@ TEST(SensorInit, Tps) { } TEST(SensorInit, TpsValuesTooClose) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); // Should fail, 0.49 volts apart engineConfiguration->tpsMin = 200; // 1.00 volt @@ -97,7 +97,7 @@ TEST(SensorInit, TpsValuesTooClose) { } TEST(SensorInit, Pedal) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); engineConfiguration->throttlePedalPositionAdcChannel = EFI_ADC_0; engineConfiguration->throttlePedalUpVoltage = 1; @@ -124,7 +124,7 @@ TEST(SensorInit, Pedal) { } TEST(SensorInit, DriverIntentNoPedal) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); // We have no pedal - so we should get the TPS engineConfiguration->throttlePedalPositionAdcChannel = EFI_ADC_NONE; @@ -145,7 +145,7 @@ TEST(SensorInit, DriverIntentNoPedal) { TEST(SensorInit, DriverIntentWithPedal) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); // We have a pedal, so we should get it engineConfiguration->throttlePedalPositionAdcChannel = EFI_ADC_0; @@ -164,7 +164,7 @@ TEST(SensorInit, DriverIntentWithPedal) { } TEST(SensorInit, OilPressure) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); engineConfiguration->oilPressure.hwChannel = EFI_ADC_0; engineConfiguration->oilPressure.v1 = 1; @@ -189,7 +189,7 @@ TEST(SensorInit, OilPressure) { } TEST(SensorInit, Clt) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); // 2003 neon sensor engineConfiguration->clt.config = {0, 30, 100, 32500, 7550, 700, 2700}; @@ -212,7 +212,7 @@ TEST(SensorInit, Clt) { } TEST(SensorInit, Lambda) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); // No channel -> no sensor initLambda(); @@ -233,7 +233,7 @@ TEST(SensorInit, Lambda) { } TEST(SensorInit, Map) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); engineConfiguration->map.sensor.hwChannel = EFI_ADC_4; initMap(); diff --git a/unit_tests/tests/sensor/test_turbocharger_speed_converter.cpp b/unit_tests/tests/sensor/test_turbocharger_speed_converter.cpp index 4c2fdbe2ff..695727301c 100644 --- a/unit_tests/tests/sensor/test_turbocharger_speed_converter.cpp +++ b/unit_tests/tests/sensor/test_turbocharger_speed_converter.cpp @@ -1,7 +1,7 @@ #include "pch.h" #include "turbocharger_speed_converter.h" -static constexpr engine_type_e ENGINE_TEST_HELPER = TEST_ENGINE; +static constexpr engine_type_e ENGINE_TEST_HELPER = engine_type_e::TEST_ENGINE; class TurbochargerSpeedConverterTest : public ::testing::Test { diff --git a/unit_tests/tests/sensor/test_vehicle_speed_converter.cpp b/unit_tests/tests/sensor/test_vehicle_speed_converter.cpp index 46cd8e86a5..be3e717784 100644 --- a/unit_tests/tests/sensor/test_vehicle_speed_converter.cpp +++ b/unit_tests/tests/sensor/test_vehicle_speed_converter.cpp @@ -3,7 +3,7 @@ float GetVssFor(float revPerKm, float axle, float teeth, float hz) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); VehicleSpeedConverter dut; diff --git a/unit_tests/tests/test_accel_enrichment.cpp b/unit_tests/tests/test_accel_enrichment.cpp index d4cca79a32..e2b4458d62 100644 --- a/unit_tests/tests/test_accel_enrichment.cpp +++ b/unit_tests/tests/test_accel_enrichment.cpp @@ -15,7 +15,7 @@ TEST(fuel, testTpsAccelEnrichmentMath) { printf("====================================================================================== testAccelEnrichment\r\n"); - EngineTestHelper eth(FORD_ASPIRE_1996); + EngineTestHelper eth(engine_type_e::FORD_ASPIRE_1996); engine->rpmCalculator.setRpmValue(600); engine->periodicFastCallback(); @@ -40,14 +40,14 @@ TEST(fuel, testTpsAccelEnrichmentMath) { } TEST(fuel, testTpsAccelEnrichmentScheduling) { - EngineTestHelper eth(FORD_ASPIRE_1996); + EngineTestHelper eth(engine_type_e::FORD_ASPIRE_1996); setCrankOperationMode(); engineConfiguration->tpsAccelEnrichmentThreshold = 5; engineConfiguration->tpsAccelLookback = 2; - eth.setTriggerType(TT_ONE); + eth.setTriggerType(trigger_type_e::TT_ONE); Sensor::setMockValue(SensorType::Tps1, 0); @@ -97,7 +97,7 @@ static void doFractionalTpsIteration(int period, int divisor, int numCycles, std TEST(fuel, testAccelEnrichmentFractionalTps) { printf("====================================================================================== testAccelEnrichmentFractionalTps\r\n"); - EngineTestHelper eth(FORD_ASPIRE_1996); + EngineTestHelper eth(engine_type_e::FORD_ASPIRE_1996); // setup engineConfiguration->tpsAccelEnrichmentThreshold = 5; diff --git a/unit_tests/tests/test_can_serial.cpp b/unit_tests/tests/test_can_serial.cpp index 03f69ce281..53b434d0f0 100644 --- a/unit_tests/tests/test_can_serial.cpp +++ b/unit_tests/tests/test_can_serial.cpp @@ -55,7 +55,7 @@ public: TestCanStreamerState() : CanStreamerState(&streamer) {} void test(const std::vector & dataList, const std::vector & frames, int fifoLeftoverSize, const std::vector & receiveChunks) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); size_t totalSize = 0; std::string totalData; diff --git a/unit_tests/tests/test_can_wideband.cpp b/unit_tests/tests/test_can_wideband.cpp index d7a360f736..370dfe7b42 100644 --- a/unit_tests/tests/test_can_wideband.cpp +++ b/unit_tests/tests/test_can_wideband.cpp @@ -99,7 +99,7 @@ TEST(CanWideband, DecodeValidAemFormat) { TEST(CanWideband, DecodeRusefiStandard) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); AemXSeriesWideband dut(0, SensorType::Lambda1); dut.Register(); @@ -139,7 +139,7 @@ TEST(CanWideband, DecodeRusefiStandard) TEST(CanWideband, DecodeRusefiStandardWrongVersion) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); AemXSeriesWideband dut(0, SensorType::Lambda1); dut.Register(); diff --git a/unit_tests/tests/test_change_engine_type.cpp b/unit_tests/tests/test_change_engine_type.cpp index 65d6f40218..f93b191b79 100644 --- a/unit_tests/tests/test_change_engine_type.cpp +++ b/unit_tests/tests/test_change_engine_type.cpp @@ -13,7 +13,7 @@ TEST(misc, changeEngineType) { /** * this configuration has triggerInputDebugPins defined */ - EngineTestHelper eth (FORD_ASPIRE_1996); + EngineTestHelper eth(engine_type_e::FORD_ASPIRE_1996); brain_pin_e brainPin = engineConfiguration->triggerInputDebugPins[0]; ASSERT_TRUE(brainPin != Gpio::Unassigned); @@ -25,7 +25,7 @@ TEST(misc, changeEngineType) { // above we have asserted that triggerInputDebugPins is in fact used // now let's change into engine type without triggerInputDebugPins and assert shut down - setEngineType((int)CITROEN_TU3JP); + setEngineType(engine_type_e::CITROEN_TU3JP); ASSERT_TRUE(activeConfiguration.triggerInputDebugPins[0] == Gpio::Unassigned); ASSERT_TRUE(engineConfiguration->triggerInputDebugPins[0] == Gpio::Unassigned); diff --git a/unit_tests/tests/test_dynoview.cpp b/unit_tests/tests/test_dynoview.cpp index 7337a3f478..08b0aa01b7 100644 --- a/unit_tests/tests/test_dynoview.cpp +++ b/unit_tests/tests/test_dynoview.cpp @@ -17,7 +17,7 @@ void printResults(DynoView *dut) { TEST(DynoView, VSS_T1) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); DynoView dut; @@ -36,7 +36,7 @@ TEST(DynoView, VSS_T1) { } TEST(DynoView, algo) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); DynoView dut; @@ -60,7 +60,7 @@ TEST(DynoView, algo) { } TEST(DynoView, VSS_fast) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); DynoView dut; @@ -83,7 +83,7 @@ TEST(DynoView, VSS_fast) { TEST(DynoView, VSS_Torque) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); DynoView dut; diff --git a/unit_tests/tests/test_engine_math.cpp b/unit_tests/tests/test_engine_math.cpp index 313c3ca75b..f9d83adcc9 100644 --- a/unit_tests/tests/test_engine_math.cpp +++ b/unit_tests/tests/test_engine_math.cpp @@ -13,7 +13,7 @@ TEST(misc, testIgnitionPlanning) { printf("*************************************************** testIgnitionPlanning\r\n"); - EngineTestHelper eth(FORD_ESCORT_GT); + EngineTestHelper eth(engine_type_e::FORD_ESCORT_GT); engine->periodicFastCallback(); assertEqualsM("testIgnitionPlanning_AFR", 13.5, engine->fuelComputer.targetAFR); @@ -25,7 +25,7 @@ TEST(misc, testEngineMath) { printf("*************************************************** testEngineMath\r\n"); // todo: let's see if we can make 'engine' unneeded in this test? - EngineTestHelper eth(FORD_ESCORT_GT); + EngineTestHelper eth(engine_type_e::FORD_ESCORT_GT); setCamOperationMode(); engineConfiguration->fuelAlgorithm = LM_SPEED_DENSITY; diff --git a/unit_tests/tests/test_gear_detector.cpp b/unit_tests/tests/test_gear_detector.cpp index b028dd1ffc..c5ca7cf87f 100644 --- a/unit_tests/tests/test_gear_detector.cpp +++ b/unit_tests/tests/test_gear_detector.cpp @@ -1,7 +1,7 @@ #include "pch.h" float GetGearRatioFor(float revPerKm, float axle, float kph, float rpm) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); engineConfiguration->driveWheelRevPerKm = revPerKm; engineConfiguration->finalGearRatio = axle; @@ -29,7 +29,7 @@ TEST(GearDetector, ComputeGearRatio) { TEST(GearDetector, GetRpmInGear) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); engineConfiguration->driveWheelRevPerKm = 507; engineConfiguration->finalGearRatio = 4.10f; @@ -68,7 +68,7 @@ TEST(GearDetector, GetRpmInGear) { } TEST(GearDetector, DetermineGearSingleSpeed) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); auto& dut = engine->module().unmock(); engineConfiguration->totalGearsCount = 1; @@ -92,7 +92,7 @@ TEST(GearDetector, DetermineGearSingleSpeed) { } TEST(GearDetector, DetermineGear5Speed) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); auto& dut = engine->module().unmock(); engineConfiguration->totalGearsCount = 5; @@ -136,7 +136,7 @@ TEST(GearDetector, DetermineGear5Speed) { } TEST(GearDetector, MiataNb6Speed) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); auto& dut = engine->module().unmock(); engineConfiguration->totalGearsCount = 6; @@ -164,7 +164,7 @@ TEST(GearDetector, MiataNb6Speed) { } TEST(GearDetector, DetermineGear8Speed) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); auto& dut = engine->module().unmock(); // ZF 8HP 70 @@ -203,7 +203,7 @@ TEST(GearDetector, DetermineGear8Speed) { } TEST(GearDetector, ParameterValidation) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); auto& dut = engine->module().unmock(); // Defaults should work diff --git a/unit_tests/tests/test_gpio.cpp b/unit_tests/tests/test_gpio.cpp index 47f0b7d4d5..889a543ae0 100644 --- a/unit_tests/tests/test_gpio.cpp +++ b/unit_tests/tests/test_gpio.cpp @@ -1,7 +1,7 @@ #include "pch.h" TEST(gpio, testPinInitNonInverted) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); OutputPin dut; @@ -16,7 +16,7 @@ TEST(gpio, testPinInitNonInverted) { } TEST(gpio, testPinInitInverted) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); OutputPin dut; diff --git a/unit_tests/tests/test_hardware_reinit.cpp b/unit_tests/tests/test_hardware_reinit.cpp index b658029e2d..f0f92591be 100644 --- a/unit_tests/tests/test_hardware_reinit.cpp +++ b/unit_tests/tests/test_hardware_reinit.cpp @@ -1,7 +1,7 @@ #include "pch.h" TEST(hardware, reinit) { - EngineTestHelper eth(FRANKENSO_MIATA_NA6_MAP); + EngineTestHelper eth(engine_type_e::FRANKENSO_MIATA_NA6_MAP); ButtonDebounce::stopConfigurationList(); ButtonDebounce::startConfigurationList(); @@ -10,6 +10,6 @@ TEST(hardware, reinit) { ButtonDebounce::startConfigurationList(); - resetConfigurationExt(nullptr, DODGE_NEON_1995); - resetConfigurationExt(nullptr, FRANKENSO_MIATA_NA6_MAP); + resetConfigurationExt(nullptr, engine_type_e::DODGE_NEON_1995); + resetConfigurationExt(nullptr, engine_type_e::FRANKENSO_MIATA_NA6_MAP); } diff --git a/unit_tests/tests/test_hpfp.cpp b/unit_tests/tests/test_hpfp.cpp index e1f5853c4b..bd3b6f92ca 100755 --- a/unit_tests/tests/test_hpfp.cpp +++ b/unit_tests/tests/test_hpfp.cpp @@ -7,7 +7,7 @@ using ::testing::_; using ::testing::StrictMock; TEST(HPFP, Lobe) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); engineConfiguration->hpfpCam = HPFP_CAM_NONE; engineConfiguration->hpfpPeakPos = 123; @@ -51,7 +51,7 @@ TEST(HPFP, Lobe) { } TEST(HPFP, InjectionReplacementFuel) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); engineConfiguration->cylindersCount = 4; engineConfiguration->hpfpCamLobes = 4; @@ -104,7 +104,7 @@ TEST(HPFP, InjectionReplacementFuel) { } TEST(HPFP, PI) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); engineConfiguration->cylindersCount = 4; engineConfiguration->hpfpCamLobes = 4; @@ -161,7 +161,7 @@ TEST(HPFP, PI) { } TEST(HPFP, Angle) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); engineConfiguration->cylindersCount = 4; engineConfiguration->hpfpCamLobes = 4; @@ -207,7 +207,7 @@ TEST(HPFP, Angle) { } TEST(HPFP, Schedule) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); engineConfiguration->cylindersCount = 4; engineConfiguration->hpfpCamLobes = 4; diff --git a/unit_tests/tests/test_hpfp_integrated.cpp b/unit_tests/tests/test_hpfp_integrated.cpp index b415d9b6a9..fcdb18131c 100644 --- a/unit_tests/tests/test_hpfp_integrated.cpp +++ b/unit_tests/tests/test_hpfp_integrated.cpp @@ -8,7 +8,7 @@ #include "pch.h" TEST(HPFP, IntegratedSchedule) { - EngineTestHelper eth(TEST_ENGINE, [](engine_configuration_s* engineConfiguration) { + EngineTestHelper eth(engine_type_e::TEST_ENGINE, [](engine_configuration_s* engineConfiguration) { engineConfiguration->hpfpValvePin = Gpio::A2; // arbitrary }); @@ -19,7 +19,7 @@ TEST(HPFP, IntegratedSchedule) { engineConfiguration->trigger.customTotalToothCount = 16; engineConfiguration->trigger.customSkippedToothCount = 0; - eth.setTriggerType(TT_TOOTHED_WHEEL); + eth.setTriggerType(trigger_type_e::TT_TOOTHED_WHEEL); setCamOperationMode(); engineConfiguration->isFasterEngineSpinUpEnabled = true; diff --git a/unit_tests/tests/test_idle_controller.cpp b/unit_tests/tests/test_idle_controller.cpp index 42e1b79741..8968f7a77e 100644 --- a/unit_tests/tests/test_idle_controller.cpp +++ b/unit_tests/tests/test_idle_controller.cpp @@ -18,7 +18,7 @@ using ::testing::_; using ICP = IIdleController::Phase; TEST(idle_v2, timingPid) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); IdleController dut; engineConfiguration->useIdleTimingPidControl = true; @@ -50,7 +50,7 @@ TEST(idle_v2, timingPid) { } TEST(idle_v2, testTargetRpm) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); IdleController dut; for (size_t i = 0; i < efi::size(config->cltIdleRpmBins); i++) { @@ -63,7 +63,7 @@ TEST(idle_v2, testTargetRpm) { } TEST(idle_v2, testDeterminePhase) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); IdleController dut; // TPS threshold 5% for easy test @@ -108,7 +108,7 @@ TEST(idle_v2, testDeterminePhase) { } TEST(idle_v2, crankingOpenLoop) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); IdleController dut; engineConfiguration->crankingIACposition = 50; @@ -133,7 +133,7 @@ TEST(idle_v2, crankingOpenLoop) { } TEST(idle_v2, runningOpenLoopBasic) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); IdleController dut; engineConfiguration->manIdlePosition = 50; @@ -148,7 +148,7 @@ TEST(idle_v2, runningOpenLoopBasic) { } TEST(idle_v2, runningFanAcBump) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); IdleController dut; engineConfiguration->manIdlePosition = 50; @@ -186,7 +186,7 @@ TEST(idle_v2, runningFanAcBump) { } TEST(idle_v2, runningOpenLoopTpsTaper) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); IdleController dut; // Zero out base tempco table @@ -208,7 +208,7 @@ TEST(idle_v2, runningOpenLoopTpsTaper) { } TEST(idle_v2, runningOpenLoopRpmTaper) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); IdleController dut; // Zero out base tempco table @@ -236,7 +236,7 @@ struct MockOpenLoopIdler : public IdleController { }; TEST(idle_v2, testOpenLoopCranking) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); StrictMock dut; engineConfiguration->overrideCrankingIacSetting = true; @@ -248,7 +248,7 @@ TEST(idle_v2, testOpenLoopCranking) { } TEST(idle_v2, openLoopRunningTaper) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); StrictMock dut; EXPECT_CALL(dut, getRunningOpenLoop(0, 30, SensorResult(0))).WillRepeatedly(Return(25)); @@ -272,7 +272,7 @@ TEST(idle_v2, openLoopRunningTaper) { } TEST(idle_v2, getCrankingTaperFraction) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); StrictMock dut; engineConfiguration->afterCrankingIACtaperDuration = 500; @@ -300,7 +300,7 @@ TEST(idle_v2, getCrankingTaperFraction) { } TEST(idle_v2, openLoopCoastingTable) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); IdleController dut; // enable & configure feature @@ -317,7 +317,7 @@ TEST(idle_v2, openLoopCoastingTable) { extern int timeNowUs; TEST(idle_v2, closedLoopBasic) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); IdleController dut; dut.init(); @@ -344,7 +344,7 @@ TEST(idle_v2, closedLoopBasic) { } TEST(idle_v2, closedLoopDeadzone) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); IdleController dut; dut.init(); @@ -380,7 +380,7 @@ struct IntegrationIdleMock : public IdleController { }; TEST(idle_v2, IntegrationManual) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); StrictMock dut; SensorResult expectedTps = 1; @@ -411,7 +411,7 @@ TEST(idle_v2, IntegrationManual) { } TEST(idle_v2, IntegrationAutomatic) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); StrictMock dut; engineConfiguration->idleMode = IM_AUTO; @@ -447,7 +447,7 @@ TEST(idle_v2, IntegrationAutomatic) { } TEST(idle_v2, IntegrationClamping) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); StrictMock dut; engineConfiguration->idleMode = IM_AUTO; diff --git a/unit_tests/tests/test_knock.cpp b/unit_tests/tests/test_knock.cpp index 1292dfca30..2a5c36bc0a 100644 --- a/unit_tests/tests/test_knock.cpp +++ b/unit_tests/tests/test_knock.cpp @@ -15,7 +15,7 @@ struct MockKnockController : public KnockControllerBase { }; TEST(Knock, Retards) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); // Aggression of 10% engineConfiguration->knockRetardAggression = 10; @@ -48,7 +48,7 @@ TEST(Knock, Retards) { } TEST(Knock, Reapply) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); MockKnockController dut; dut.onFastCallback(); diff --git a/unit_tests/tests/test_launch.cpp b/unit_tests/tests/test_launch.cpp index 4070b9cb9f..ae9abb703e 100644 --- a/unit_tests/tests/test_launch.cpp +++ b/unit_tests/tests/test_launch.cpp @@ -3,7 +3,7 @@ #include "launch_control.h" TEST(LaunchControl, TpsCondition) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); LaunchControlBase dut; @@ -24,7 +24,7 @@ TEST(LaunchControl, TpsCondition) { TEST(LaunchControl, VSSCondition) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); LaunchControlBase dut; @@ -41,7 +41,7 @@ TEST(LaunchControl, VSSCondition) { } TEST(LaunchControl, RPMCondition) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); LaunchControlBase dut; @@ -53,7 +53,7 @@ TEST(LaunchControl, RPMCondition) { } TEST(LaunchControl, SwitchInputCondition) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); LaunchControlBase dut; @@ -95,7 +95,7 @@ TEST(LaunchControl, SwitchInputCondition) { } TEST(LaunchControl, CombinedCondition) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); LaunchControlBase dut; @@ -138,7 +138,7 @@ static void setDefaultLaunchParameters() { } TEST(LaunchControl, CompleteRun) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); initLaunchControl(); diff --git a/unit_tests/tests/test_limp.cpp b/unit_tests/tests/test_limp.cpp index f62d68d9c2..4aea57ce08 100644 --- a/unit_tests/tests/test_limp.cpp +++ b/unit_tests/tests/test_limp.cpp @@ -21,7 +21,7 @@ TEST(limp, testFatalError) { } TEST(limp, revLimit) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); engineConfiguration->rpmHardLimit = 2500; @@ -44,7 +44,7 @@ TEST(limp, revLimit) { } TEST(limp, revLimitCltBased) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); engineConfiguration->rpmHardLimit = 2500; @@ -94,7 +94,7 @@ TEST(limp, revLimitCltBased) { } TEST(limp, boostCut) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); // Cut above 100kPa engineConfiguration->boostCutPressure = 100; @@ -131,7 +131,7 @@ TEST(limp, boostCut) { extern int timeNowUs; TEST(limp, oilPressureFailureCase) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); engineConfiguration->minOilPressureAfterStart = 200; LimpManager dut; @@ -164,7 +164,7 @@ TEST(limp, oilPressureFailureCase) { } TEST(limp, oilPressureSuccessCase) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); engineConfiguration->minOilPressureAfterStart = 200; LimpManager dut; diff --git a/unit_tests/tests/test_start_stop.cpp b/unit_tests/tests/test_start_stop.cpp index 8e391a86ce..da3be3fe37 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 }}; - EngineTestHelper eth(PROTEUS_BMW_M73, sensorVals); + EngineTestHelper eth(engine_type_e::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 diff --git a/unit_tests/tests/test_stft.cpp b/unit_tests/tests/test_stft.cpp index af02ab2301..18190312dd 100644 --- a/unit_tests/tests/test_stft.cpp +++ b/unit_tests/tests/test_stft.cpp @@ -77,7 +77,7 @@ TEST(ClosedLoopFuel, CellSelection) { } TEST(ClosedLoopFuel, afrLimits) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); engineConfiguration->stft.minAfr = 10; // 10.0 AFR engineConfiguration->stft.maxAfr = 18; // 18.0 AFR diff --git a/unit_tests/tests/test_tunerstudio.cpp b/unit_tests/tests/test_tunerstudio.cpp index 75eb08413c..0f75b9cca9 100644 --- a/unit_tests/tests/test_tunerstudio.cpp +++ b/unit_tests/tests/test_tunerstudio.cpp @@ -68,7 +68,7 @@ TEST(binary, testWriteCrc) { } TEST(TunerstudioCommands, writeChunkEngineConfig) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); ::testing::NiceMock channel; uint8_t* configBytes = reinterpret_cast(config); diff --git a/unit_tests/tests/trigger/test_2jz_vvt.cpp b/unit_tests/tests/trigger/test_2jz_vvt.cpp index db1311855b..23c012245d 100644 --- a/unit_tests/tests/trigger/test_2jz_vvt.cpp +++ b/unit_tests/tests/trigger/test_2jz_vvt.cpp @@ -8,10 +8,10 @@ #include "pch.h" TEST(sensors, test2jz) { - EngineTestHelper eth(TOYOTA_2JZ_GTE_VVTi); + EngineTestHelper eth(engine_type_e::TOYOTA_2JZ_GTE_VVTi); engineConfiguration->isFasterEngineSpinUpEnabled = false; - eth.setTriggerType(TT_ONE); + eth.setTriggerType(trigger_type_e::TT_ONE); ASSERT_EQ( 0, Sensor::getOrZero(SensorType::Rpm)) << "test2jz RPM"; for (int i = 0; i < 2;i++) { diff --git a/unit_tests/tests/trigger/test_all_triggers.cpp b/unit_tests/tests/trigger/test_all_triggers.cpp index eef10a47c1..b59d9d6694 100644 --- a/unit_tests/tests/trigger/test_all_triggers.cpp +++ b/unit_tests/tests/trigger/test_all_triggers.cpp @@ -4,12 +4,12 @@ #include "pch.h" // uncomment to test starting from specific trigger -//#define TEST_FROM_TRIGGER_ID ((int)TT_MAZDA_MIATA_NA) +//#define TEST_FROM_TRIGGER_ID ((int)trigger_type_e::TT_MAZDA_MIATA_NA) // uncomment to test only newest trigger -//#define TEST_FROM_TRIGGER_ID ((int)TT_UNUSED - 1) +//#define TEST_FROM_TRIGGER_ID ((int)trigger_type_e::TT_UNUSED - 1) #define TEST_FROM_TRIGGER_ID 1 -#define TEST_TO_TRIGGER_ID TT_UNUSED +#define TEST_TO_TRIGGER_ID (int)trigger_type_e::TT_UNUSED // uncomment to test only one trigger //#define TEST_TO_TRIGGER_ID (TEST_FROM_TRIGGER_ID + 1) @@ -33,7 +33,7 @@ struct TriggerExportHelper static TriggerExportHelper exportHelper; -class AllTriggersFixture : public ::testing::TestWithParam { +class AllTriggersFixture : public ::testing::TestWithParam { }; INSTANTIATE_TEST_SUITE_P( @@ -41,7 +41,7 @@ INSTANTIATE_TEST_SUITE_P( AllTriggersFixture, // Test all triggers from the first valid trigger thru the last // (Skip index 0, that's custom toothed wheel which is covered by others) - ::testing::Range((trigger_type_e)TEST_FROM_TRIGGER_ID, (trigger_type_e)TEST_TO_TRIGGER_ID) + ::testing::Range(TEST_FROM_TRIGGER_ID, TEST_TO_TRIGGER_ID) ); extern bool printTriggerDebug; @@ -52,7 +52,7 @@ TEST_P(AllTriggersFixture, TestTrigger) { //printTriggerDebug = true; //printTriggerTrace = true; - auto tt = GetParam(); + auto tt = (trigger_type_e)GetParam(); auto fp = exportHelper.fp; printf("Exporting %s\r\n", getTrigger_type_e(tt)); diff --git a/unit_tests/tests/trigger/test_cam_vvt_input.cpp b/unit_tests/tests/trigger/test_cam_vvt_input.cpp index 08f8a90a8b..58f99cc055 100644 --- a/unit_tests/tests/trigger/test_cam_vvt_input.cpp +++ b/unit_tests/tests/trigger/test_cam_vvt_input.cpp @@ -13,9 +13,9 @@ extern WarningCodeState unitTestWarningCodeState; extern WaveChart waveChart; TEST(trigger, testNoStartUpWarningsNoSyncronizationTrigger) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); // one tooth does not need synchronization it just counts tooth - eth.setTriggerType(TT_ONE); + eth.setTriggerType(trigger_type_e::TT_ONE); ASSERT_EQ( 0, round(Sensor::getOrZero(SensorType::Rpm))) << "testNoStartUpWarnings RPM"; eth.fireTriggerEvents2(/*count*/10, /*duration*/50); @@ -24,11 +24,11 @@ TEST(trigger, testNoStartUpWarningsNoSyncronizationTrigger) { } TEST(trigger, testNoStartUpWarnings) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); // for this test we need a trigger with isSynchronizationNeeded=true engineConfiguration->trigger.customTotalToothCount = 3; engineConfiguration->trigger.customSkippedToothCount = 1; - eth.setTriggerType(TT_TOOTHED_WHEEL); + eth.setTriggerType(trigger_type_e::TT_TOOTHED_WHEEL); ASSERT_EQ( 0, round(Sensor::getOrZero(SensorType::Rpm))) << "testNoStartUpWarnings RPM"; for (int i = 0;i < 10;i++) { @@ -58,7 +58,7 @@ TEST(trigger, testNoStartUpWarnings) { } TEST(trigger, testNoisyInput) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); ASSERT_EQ( 0, round(Sensor::getOrZero(SensorType::Rpm))) << "testNoisyInput RPM"; @@ -80,13 +80,13 @@ TEST(trigger, testNoisyInput) { TEST(trigger, testCamInput) { // setting some weird engine - EngineTestHelper eth(FORD_ESCORT_GT); + EngineTestHelper eth(engine_type_e::FORD_ESCORT_GT); // changing to 'ONE TOOTH' trigger on CRANK with CAM/VVT setCrankOperationMode(); engineConfiguration->vvtMode[0] = VVT_FIRST_HALF; engineConfiguration->vvtOffsets[0] = 360; - eth.setTriggerType(TT_ONE); + eth.setTriggerType(trigger_type_e::TT_ONE); engineConfiguration->camInputs[0] = Gpio::A10; // we just need to indicate that we have CAM ASSERT_EQ( 0, round(Sensor::getOrZero(SensorType::Rpm))) << "testCamInput RPM"; @@ -132,7 +132,7 @@ TEST(trigger, testCamInput) { } TEST(trigger, testNB2CamInput) { - EngineTestHelper eth(FRANKENSO_MAZDA_MIATA_2003); + EngineTestHelper eth(engine_type_e::FRANKENSO_MAZDA_MIATA_2003); engineConfiguration->isFasterEngineSpinUpEnabled = false; diff --git a/unit_tests/tests/trigger/test_fasterEngineSpinningUp.cpp b/unit_tests/tests/trigger/test_fasterEngineSpinningUp.cpp index 8ad4867d19..d7452c56b5 100644 --- a/unit_tests/tests/trigger/test_fasterEngineSpinningUp.cpp +++ b/unit_tests/tests/trigger/test_fasterEngineSpinningUp.cpp @@ -7,7 +7,7 @@ #include "pch.h" TEST(cranking, testFasterEngineSpinningUp) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); setTable(config->injectionPhase, -180.0f); engine->tdcMarkEnabled = false; // turn on FasterEngineSpinUp mode @@ -39,7 +39,7 @@ TEST(cranking, testFasterEngineSpinningUp) { // check all events starting from now // advance 1 revolution - // because we have trivial TT_ONE trigger here synchronization would happen with just one rise front + // because we have trivial trigger_type_e::TT_ONE trigger here synchronization would happen with just one rise front eth.fireRise(200); // check if the mode is changed @@ -104,11 +104,11 @@ TEST(cranking, testFasterEngineSpinningUp) { } static void doTestFasterEngineSpinningUp60_2(int startUpDelayMs, int rpm1, int expectedRpm) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); // turn on FasterEngineSpinUp mode engineConfiguration->isFasterEngineSpinUpEnabled = true; - setupSimpleTestEngineWithMaf(ð, IM_SEQUENTIAL, TT_TOOTHED_WHEEL_60_2); + setupSimpleTestEngineWithMaf(ð, IM_SEQUENTIAL, trigger_type_e::TT_TOOTHED_WHEEL_60_2); eth.moveTimeForwardMs(startUpDelayMs); // fire 30 tooth rise/fall signals diff --git a/unit_tests/tests/trigger/test_injection_scheduling.cpp b/unit_tests/tests/trigger/test_injection_scheduling.cpp index 68158e642b..112222791e 100644 --- a/unit_tests/tests/trigger/test_injection_scheduling.cpp +++ b/unit_tests/tests/trigger/test_injection_scheduling.cpp @@ -9,7 +9,7 @@ using ::testing::InSequence; TEST(injectionScheduling, InjectionIsScheduled) { StrictMock mockExec; - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); engine->executor.setMockExecutor(&mockExec); efitick_t nowNt = 1000000; @@ -49,7 +49,7 @@ TEST(injectionScheduling, InjectionIsScheduled) { TEST(injectionScheduling, InjectionIsScheduledBeforeWraparound) { StrictMock mockExec; - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); engine->executor.setMockExecutor(&mockExec); efitick_t nowNt = 1000000; @@ -88,7 +88,7 @@ TEST(injectionScheduling, InjectionIsScheduledBeforeWraparound) { TEST(injectionScheduling, InjectionIsScheduledAfterWraparound) { StrictMock mockExec; - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); engine->executor.setMockExecutor(&mockExec); efitick_t nowNt = 1000000; @@ -128,7 +128,7 @@ TEST(injectionScheduling, InjectionNotScheduled) { // StrictMock since we expect no scheduler calls! StrictMock mockExec; - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); engine->executor.setMockExecutor(&mockExec); efitick_t nowNt = 1000000; diff --git a/unit_tests/tests/trigger/test_map_cam.cpp b/unit_tests/tests/trigger/test_map_cam.cpp index 549c1596a7..56d7020361 100644 --- a/unit_tests/tests/trigger/test_map_cam.cpp +++ b/unit_tests/tests/trigger/test_map_cam.cpp @@ -6,7 +6,7 @@ TEST(trigger, map_cam_by_magic_point) { - EngineTestHelper eth(TEST_CRANK_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_CRANK_ENGINE); engineConfiguration->isFasterEngineSpinUpEnabled = false; engineConfiguration->camInputs[0] = Gpio::A0; diff --git a/unit_tests/tests/trigger/test_miata_na_tdc.cpp b/unit_tests/tests/trigger/test_miata_na_tdc.cpp index 19aeee28fa..64b3223ede 100644 --- a/unit_tests/tests/trigger/test_miata_na_tdc.cpp +++ b/unit_tests/tests/trigger/test_miata_na_tdc.cpp @@ -4,7 +4,7 @@ #include "trigger_emulator_algo.h" TEST(miata, miata_na_tdc) { - EngineTestHelper eth(FRANKENSO_MIATA_NA6_MAP); + EngineTestHelper eth(engine_type_e::FRANKENSO_MIATA_NA6_MAP); engineConfiguration->alwaysInstantRpm = true; #define TEST_REVOLUTIONS 6 diff --git a/unit_tests/tests/trigger/test_nissan_vq_vvt.cpp b/unit_tests/tests/trigger/test_nissan_vq_vvt.cpp index 729581231e..20d391bd65 100644 --- a/unit_tests/tests/trigger/test_nissan_vq_vvt.cpp +++ b/unit_tests/tests/trigger/test_nissan_vq_vvt.cpp @@ -71,7 +71,7 @@ TEST(nissan, vq_vvt) { // hold a reference to the heap allocated scheduling events until the test is done std::vector> ptrs; - EngineTestHelper eth (HELLEN_121_NISSAN_6_CYL); + EngineTestHelper eth(engine_type_e::HELLEN_121_NISSAN_6_CYL); engineConfiguration->isFasterEngineSpinUpEnabled = false; engineConfiguration->isIgnitionEnabled = false; engineConfiguration->isInjectionEnabled = false; diff --git a/unit_tests/tests/trigger/test_override_gaps.cpp b/unit_tests/tests/trigger/test_override_gaps.cpp index e7fbad3f72..b1bdc347ea 100644 --- a/unit_tests/tests/trigger/test_override_gaps.cpp +++ b/unit_tests/tests/trigger/test_override_gaps.cpp @@ -8,7 +8,7 @@ #include "pch.h" TEST(subaru, overrideGap) { - EngineTestHelper eth(FRANKENSO_MIATA_NA6_MAP); + EngineTestHelper eth(engine_type_e::FRANKENSO_MIATA_NA6_MAP); engineConfiguration->overrideTriggerGaps = true; engineConfiguration->gapTrackingLengthOverride = 2; @@ -17,7 +17,7 @@ TEST(subaru, overrideGap) { engineConfiguration->triggerGapOverrideFrom[1] = 0.75; engineConfiguration->triggerGapOverrideTo[1] = 1.25; - eth.setTriggerType(TT_SUBARU_7_WITHOUT_6); + eth.setTriggerType(trigger_type_e::TT_SUBARU_7_WITHOUT_6); ASSERT_EQ(2, engine->triggerCentral.triggerShape.gapTrackingLength); diff --git a/unit_tests/tests/trigger/test_quad_cam.cpp b/unit_tests/tests/trigger/test_quad_cam.cpp index 13fd07fa0c..c4c1c5bf55 100644 --- a/unit_tests/tests/trigger/test_quad_cam.cpp +++ b/unit_tests/tests/trigger/test_quad_cam.cpp @@ -7,7 +7,7 @@ TEST(trigger, testQuadCam) { // setting some weird engine - EngineTestHelper eth(FORD_ESCORT_GT); + EngineTestHelper eth(engine_type_e::FORD_ESCORT_GT); engineConfiguration->isFasterEngineSpinUpEnabled = false; engineConfiguration->alwaysInstantRpm = true; @@ -20,7 +20,7 @@ TEST(trigger, testQuadCam) { engineConfiguration->camInputs[0] = Gpio::A10; // we just need to indicate that we have CAM // this crank trigger would be easier to test, crank shape is less important for this test - eth.setTriggerType(TT_ONE); + eth.setTriggerType(trigger_type_e::TT_ONE); ASSERT_EQ(0, Sensor::getOrZero(SensorType::Rpm)); diff --git a/unit_tests/tests/trigger/test_real_4b11.cpp b/unit_tests/tests/trigger/test_real_4b11.cpp index fbac02eadb..caeb1dc38e 100644 --- a/unit_tests/tests/trigger/test_real_4b11.cpp +++ b/unit_tests/tests/trigger/test_real_4b11.cpp @@ -10,11 +10,11 @@ TEST(real4b11, running) { CsvReader reader(1, /* vvtCount */ 0); reader.open("tests/trigger/resources/4b11-running.csv"); - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); engineConfiguration->isFasterEngineSpinUpEnabled = true; engineConfiguration->alwaysInstantRpm = true; - eth.setTriggerType(TT_36_2_1); + eth.setTriggerType(trigger_type_e::TT_36_2_1); int eventCount = 0; bool gotRpm = false; @@ -46,11 +46,11 @@ TEST(real4b11, runningDoubledEdge) { // This log has an extra duplicate edge at 5.393782 seconds (hand added) reader.open("tests/trigger/resources/4b11-running-doubled-edge.csv"); - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); engineConfiguration->isFasterEngineSpinUpEnabled = true; engineConfiguration->alwaysInstantRpm = true; - eth.setTriggerType(TT_36_2_1); + eth.setTriggerType(trigger_type_e::TT_36_2_1); int eventCount = 0; bool gotRpm = false; diff --git a/unit_tests/tests/trigger/test_real_4g93.cpp b/unit_tests/tests/trigger/test_real_4g93.cpp index d3520ec753..3c8ebab886 100644 --- a/unit_tests/tests/trigger/test_real_4g93.cpp +++ b/unit_tests/tests/trigger/test_real_4g93.cpp @@ -10,7 +10,7 @@ TEST(real4g93, cranking) { CsvReader reader(1, /* vvtCount */ 1); reader.open("tests/trigger/resources/4g93-cranking.csv"); - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); engineConfiguration->isFasterEngineSpinUpEnabled = true; engineConfiguration->alwaysInstantRpm = true; @@ -21,7 +21,7 @@ TEST(real4g93, cranking) { engineConfiguration->trigger.customTotalToothCount = 2; engineConfiguration->trigger.customSkippedToothCount = 0; engineConfiguration->skippedWheelOnCam = false; - eth.setTriggerType(TT_TOOTHED_WHEEL); + eth.setTriggerType(trigger_type_e::TT_TOOTHED_WHEEL); bool gotRpm = false; bool gotSync = false; @@ -60,13 +60,13 @@ TEST(real4g93, crankingOn11) { CsvReader reader(2, /* vvtCount */ 0); reader.open("tests/trigger/resources/4g93-cranking.csv"); - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); engineConfiguration->isFasterEngineSpinUpEnabled = true; engineConfiguration->alwaysInstantRpm = true; engineConfiguration->isPhaseSyncRequiredForIgnition = true; - eth.setTriggerType(TT_MITSUBISHI_4G93); + eth.setTriggerType(trigger_type_e::TT_MITSUBISHI_4G93); bool gotRpm = false; while (reader.haveMore()) { @@ -90,11 +90,11 @@ TEST(real4g93, crankingCamOnly) { CsvReader reader(1, /* vvtCount */ 0); reader.open("tests/trigger/resources/4g93-cranking-cam-only.csv"); - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); engineConfiguration->isFasterEngineSpinUpEnabled = true; engineConfiguration->alwaysInstantRpm = true; - eth.setTriggerType(TT_MITSU_4G9x_CAM); + eth.setTriggerType(trigger_type_e::TT_MITSU_4G9x_CAM); bool gotRpm = false; bool gotSync = false; diff --git a/unit_tests/tests/trigger/test_real_cranking_miata_NA.cpp b/unit_tests/tests/trigger/test_real_cranking_miata_NA.cpp index 0694f216d7..c91a6c0256 100644 --- a/unit_tests/tests/trigger/test_real_cranking_miata_NA.cpp +++ b/unit_tests/tests/trigger/test_real_cranking_miata_NA.cpp @@ -15,7 +15,7 @@ TEST(cranking, realCrankingFromFile) { // this logic data file has first trigger channel in second column and second trigger channel in first column reader.open("tests/trigger/resources/cranking_na_3.csv", REVERSE_ORDER); - EngineTestHelper eth (FRANKENSO_MIATA_NA6_MAP); + EngineTestHelper eth(engine_type_e::FRANKENSO_MIATA_NA6_MAP); engineConfiguration->alwaysInstantRpm = true; ssize_t read; diff --git a/unit_tests/tests/trigger/test_real_cranking_miata_na6.cpp b/unit_tests/tests/trigger/test_real_cranking_miata_na6.cpp index e066bb3f24..28661cfecc 100644 --- a/unit_tests/tests/trigger/test_real_cranking_miata_na6.cpp +++ b/unit_tests/tests/trigger/test_real_cranking_miata_na6.cpp @@ -35,7 +35,7 @@ static void fireTriggerEvent(EngineTestHelper*eth, double timestampS, TriggerWhe } TEST(cranking, hardcodedRealCranking) { - EngineTestHelper eth(FRANKENSO_MIATA_NA6_MAP); + EngineTestHelper eth(engine_type_e::FRANKENSO_MIATA_NA6_MAP); engineConfiguration->alwaysInstantRpm = true; #define EVENT(timestamp, channel, value) { fireTriggerEvent(ð, timestamp, channel, value); } @@ -169,7 +169,7 @@ TEST(cranking, naCrankFromFile) { CsvReader reader(2, /* vvtCount */ 0); reader.open("tests/trigger/resources/cranking_na_4.csv", REVERSE_ORDER); - EngineTestHelper eth(FRANKENSO_MIATA_NA6_MAP); + EngineTestHelper eth(engine_type_e::FRANKENSO_MIATA_NA6_MAP); engineConfiguration->alwaysInstantRpm = true; while (reader.haveMore()) { diff --git a/unit_tests/tests/trigger/test_real_cranking_nissan_vq40.cpp b/unit_tests/tests/trigger/test_real_cranking_nissan_vq40.cpp index 6b0dc0e234..7afcdeb472 100644 --- a/unit_tests/tests/trigger/test_real_cranking_nissan_vq40.cpp +++ b/unit_tests/tests/trigger/test_real_cranking_nissan_vq40.cpp @@ -12,7 +12,7 @@ static void test(int engineSyncCam, float camOffsetAdd) { CsvReader reader(1, /* vvtCount */ 2); reader.open("tests/trigger/resources/nissan_vq40_cranking-1.csv"); - EngineTestHelper eth (HELLEN_121_NISSAN_6_CYL); + EngineTestHelper eth(engine_type_e::HELLEN_121_NISSAN_6_CYL); engineConfiguration->isFasterEngineSpinUpEnabled = false; engineConfiguration->alwaysInstantRpm = true; diff --git a/unit_tests/tests/trigger/test_real_gm_24x.cpp b/unit_tests/tests/trigger/test_real_gm_24x.cpp index 47922e19a0..4c1aac36aa 100644 --- a/unit_tests/tests/trigger/test_real_gm_24x.cpp +++ b/unit_tests/tests/trigger/test_real_gm_24x.cpp @@ -6,11 +6,11 @@ TEST(crankingGm24x, gmRealCrankingFromFile) { CsvReader reader(1, /* vvtCount */ 0); reader.open("tests/trigger/resources/gm_24x_cranking.csv"); - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); engineConfiguration->isFasterEngineSpinUpEnabled = true; engineConfiguration->alwaysInstantRpm = true; - eth.setTriggerType(TT_GM_24x); + eth.setTriggerType(trigger_type_e::TT_GM_24x); int eventCount = 0; bool gotRpm = false; diff --git a/unit_tests/tests/trigger/test_real_k20.cpp b/unit_tests/tests/trigger/test_real_k20.cpp index f6525f791a..ecf5a919af 100644 --- a/unit_tests/tests/trigger/test_real_k20.cpp +++ b/unit_tests/tests/trigger/test_real_k20.cpp @@ -12,7 +12,7 @@ TEST(realk20, cranking) { reader.open("tests/trigger/resources/civic-K20-cranking.csv", NORMAL_ORDER, REVERSE_ORDER); reader.twoBanksSingleCamMode = false; - EngineTestHelper eth (PROTEUS_HONDA_K); + EngineTestHelper eth(engine_type_e::PROTEUS_HONDA_K); while (reader.haveMore()) { reader.processLine(ð); diff --git a/unit_tests/tests/trigger/test_real_k24a2.cpp b/unit_tests/tests/trigger/test_real_k24a2.cpp index a18ac0c721..a478f01662 100644 --- a/unit_tests/tests/trigger/test_real_k24a2.cpp +++ b/unit_tests/tests/trigger/test_real_k24a2.cpp @@ -6,11 +6,11 @@ static void doTest(const char* testFile, int expectedRpm) { CsvReader reader(/* triggerCount */ 1, /* vvtCount */ 0); reader.open(testFile); - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); engineConfiguration->isFasterEngineSpinUpEnabled = true; engineConfiguration->alwaysInstantRpm = true; - eth.setTriggerType(TT_HONDA_K_CRANK_12_1); + eth.setTriggerType(trigger_type_e::TT_HONDA_K_CRANK_12_1); while (reader.haveMore()) { reader.processLine(ð); diff --git a/unit_tests/tests/trigger/test_real_nb2_cranking.cpp b/unit_tests/tests/trigger/test_real_nb2_cranking.cpp index 12dbf7b5df..3e0db3526e 100644 --- a/unit_tests/tests/trigger/test_real_nb2_cranking.cpp +++ b/unit_tests/tests/trigger/test_real_nb2_cranking.cpp @@ -12,7 +12,7 @@ TEST(realCrankingNB2, normalCranking) { CsvReader reader(1, /* vvtCount */ 1); reader.open("tests/trigger/resources/nb2-cranking-good.csv"); - EngineTestHelper eth (HELLEN_NB2); + EngineTestHelper eth(engine_type_e::HELLEN_NB2); engineConfiguration->alwaysInstantRpm = true; while (reader.haveMore()) { @@ -37,7 +37,7 @@ TEST(realCrankingNB2, crankingMissingInjector) { CsvReader reader(1, /* vvtCount */ 1); reader.open("tests/trigger/resources/nb2-cranking-good-missing-injector-1.csv"); - EngineTestHelper eth (HELLEN_NB2); + EngineTestHelper eth(engine_type_e::HELLEN_NB2); engineConfiguration->alwaysInstantRpm = true; while (reader.haveMore()) { diff --git a/unit_tests/tests/trigger/test_real_volkswagen.cpp b/unit_tests/tests/trigger/test_real_volkswagen.cpp index 2d6160fe19..a3261ee82f 100644 --- a/unit_tests/tests/trigger/test_real_volkswagen.cpp +++ b/unit_tests/tests/trigger/test_real_volkswagen.cpp @@ -13,9 +13,9 @@ TEST(crankingVW, vwRealCrankingFromFile) { CsvReader reader(1, /* vvtCount */ 0); reader.open("tests/trigger/resources/nick_1.csv"); - EngineTestHelper eth (VW_ABA); + EngineTestHelper eth(engine_type_e::VW_ABA); engineConfiguration->alwaysInstantRpm = true; - eth.setTriggerType(TT_60_2_VW); + eth.setTriggerType(trigger_type_e::TT_60_2_VW); while (reader.haveMore()) { reader.processLine(ð); @@ -26,9 +26,9 @@ TEST(crankingVW, vwRealCrankingFromFile) { } TEST(crankingVW, crankingTwiceWithGap) { - EngineTestHelper eth (VW_ABA); + EngineTestHelper eth(engine_type_e::VW_ABA); engineConfiguration->alwaysInstantRpm = true; - eth.setTriggerType(TT_60_2_VW); + eth.setTriggerType(trigger_type_e::TT_60_2_VW); { CsvReader reader(1, /* vvtCount */ 0); diff --git a/unit_tests/tests/trigger/test_rpm_multiplier.cpp b/unit_tests/tests/trigger/test_rpm_multiplier.cpp index 02c4d3b978..018f0cc194 100644 --- a/unit_tests/tests/trigger/test_rpm_multiplier.cpp +++ b/unit_tests/tests/trigger/test_rpm_multiplier.cpp @@ -10,10 +10,10 @@ #include "pch.h" static void runRpmTest(bool isTwoStroke, bool isCam, int expected) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); engineConfiguration->twoStroke = isTwoStroke; engineConfiguration->skippedWheelOnCam = isCam; - eth.setTriggerType(TT_ONE); + eth.setTriggerType(trigger_type_e::TT_ONE); eth.smartFireTriggerEvents2(/*count*/200, /*delay*/ 40); ASSERT_EQ(expected, Sensor::getOrZero(SensorType::Rpm)); diff --git a/unit_tests/tests/trigger/test_symmetrical_crank.cpp b/unit_tests/tests/trigger/test_symmetrical_crank.cpp index f337b18f32..fb08a51ce7 100644 --- a/unit_tests/tests/trigger/test_symmetrical_crank.cpp +++ b/unit_tests/tests/trigger/test_symmetrical_crank.cpp @@ -15,7 +15,7 @@ static void postFourEvents(EngineTestHelper *eth, float mult) { } TEST(engine, testAngleLogicInSymmetricalCrankIssue2980) { - EngineTestHelper eth(FRANKENSO_MAZDA_MIATA_2003); + EngineTestHelper eth(engine_type_e::FRANKENSO_MAZDA_MIATA_2003); TriggerFormDetails *triggerForm = &engine->triggerCentral.triggerFormDetails; @@ -44,7 +44,7 @@ TEST(engine, testAngleLogicInSymmetricalCrankIssue2980) { TEST(engine, testSymmetricalCrank) { - EngineTestHelper eth(FRANKENSO_MAZDA_MIATA_2003); + EngineTestHelper eth(engine_type_e::FRANKENSO_MAZDA_MIATA_2003); // this test is not about isFasterEngineSpinUpEnabled so let's disable it to simplify things engineConfiguration->isFasterEngineSpinUpEnabled = false; diff --git a/unit_tests/tests/trigger/test_trigger_decoder.cpp b/unit_tests/tests/trigger/test_trigger_decoder.cpp index c8c480c7ca..dbf2187ab7 100644 --- a/unit_tests/tests/trigger/test_trigger_decoder.cpp +++ b/unit_tests/tests/trigger/test_trigger_decoder.cpp @@ -44,16 +44,16 @@ static int getTriggerZeroEventIndex(engine_type_e engineType) { } TEST(trigger, testSkipped2_0) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); // for this test we need a trigger with isSynchronizationNeeded=true engineConfiguration->trigger.customTotalToothCount = 2; engineConfiguration->trigger.customSkippedToothCount = 0; - eth.setTriggerType(TT_TOOTHED_WHEEL); + eth.setTriggerType(trigger_type_e::TT_TOOTHED_WHEEL); ASSERT_EQ( 0, round(Sensor::getOrZero(SensorType::Rpm))) << "testNoStartUpWarnings RPM"; } TEST(trigger, testSomethingWeird) { - EngineTestHelper eth(FORD_INLINE_6_1995); + EngineTestHelper eth(engine_type_e::FORD_INLINE_6_1995); TriggerDecoderBase state_("test"); TriggerDecoderBase *sta = &state_; @@ -80,9 +80,9 @@ TEST(trigger, testSomethingWeird) { } TEST(trigger, test1995FordInline6TriggerDecoder) { - ASSERT_EQ( 0, getTriggerZeroEventIndex(FORD_INLINE_6_1995)) << "triggerIndex "; + ASSERT_EQ( 0, getTriggerZeroEventIndex(engine_type_e::FORD_INLINE_6_1995)) << "triggerIndex "; - EngineTestHelper eth(FORD_INLINE_6_1995); + EngineTestHelper eth(engine_type_e::FORD_INLINE_6_1995); engineConfiguration->isFasterEngineSpinUpEnabled = false; setWholeTimingTable(-13); @@ -110,7 +110,7 @@ TEST(trigger, test1995FordInline6TriggerDecoder) { } TEST(misc, testGetCoilDutyCycleIssue977) { - EngineTestHelper eth(FORD_ASPIRE_1996); + EngineTestHelper eth(engine_type_e::FORD_ASPIRE_1996); int rpm = 2000; engine->rpmCalculator.setRpmValue(rpm); @@ -122,9 +122,9 @@ TEST(misc, testGetCoilDutyCycleIssue977) { TEST(misc, testFordAspire) { printf("*************************************************** testFordAspire\r\n"); - ASSERT_EQ( 4, getTriggerZeroEventIndex(FORD_ASPIRE_1996)) << "getTriggerZeroEventIndex"; + ASSERT_EQ( 4, getTriggerZeroEventIndex(engine_type_e::FORD_ASPIRE_1996)) << "getTriggerZeroEventIndex"; - EngineTestHelper eth(FORD_ASPIRE_1996); + EngineTestHelper eth(engine_type_e::FORD_ASPIRE_1996); ASSERT_EQ( 4, getTriggerCentral()->triggerShape.getTriggerWaveformSynchPointIndex()) << "getTriggerWaveformSynchPointIndex"; @@ -169,7 +169,7 @@ static void assertREqualsM(const char *msg, void *expected, void *actual) { extern bool_t debugSignalExecutor; TEST(misc, testRpmCalculator) { - EngineTestHelper eth(FORD_INLINE_6_1995); + EngineTestHelper eth(engine_type_e::FORD_INLINE_6_1995); setTable(config->injectionPhase, -180.0f); @@ -316,7 +316,7 @@ TEST(misc, testRpmCalculator) { } TEST(trigger, testAnotherTriggerDecoder) { - testTriggerDecoder2("Miata 2003", FRANKENSO_MAZDA_MIATA_2003, 3, 0.38888889, 0.0); + testTriggerDecoder2("Miata 2003", engine_type_e::FRANKENSO_MAZDA_MIATA_2003, 3, 0.38888889, 0.0); } TEST(trigger, testTriggerDecoder) { @@ -338,34 +338,34 @@ TEST(trigger, testTriggerDecoder) { } printf("====================================================================================== testTriggerDecoder part 2\r\n"); - testTriggerDecoder2("Dodge Neon 1995", DODGE_NEON_1995, 0, 0.4931, 0.2070); + testTriggerDecoder2("Dodge Neon 1995", engine_type_e::DODGE_NEON_1995, 0, 0.4931, 0.2070); - testTriggerDecoder2("ford aspire", FORD_ASPIRE_1996, 4, 0.0000, 0.5); + testTriggerDecoder2("ford aspire", engine_type_e::FORD_ASPIRE_1996, 4, 0.0000, 0.5); - testTriggerDecoder2("dodge ram", DODGE_RAM, 16, 0.5000, 0.06); + testTriggerDecoder2("dodge ram", engine_type_e::DODGE_RAM, 16, 0.5000, 0.06); - testTriggerDecoder2("Miata NB2", HELLEN_NB2, 3, 0.3888888955, 0); + testTriggerDecoder2("Miata NB2", engine_type_e::HELLEN_NB2, 3, 0.3888888955, 0); printf("====================================================================================== testTriggerDecoder part 3\r\n"); - testTriggerDecoder2("test 2/1 both", TEST_ISSUE_366_BOTH, 0, 0.2500, 0.0); - testTriggerDecoder2("test 2/1 rise", TEST_ISSUE_366_RISE, 0, 0.0000, 0.0); + testTriggerDecoder2("test 2/1 both", engine_type_e::TEST_ISSUE_366_BOTH, 0, 0.2500, 0.0); + testTriggerDecoder2("test 2/1 rise", engine_type_e::TEST_ISSUE_366_RISE, 0, 0.0000, 0.0); - testTriggerDecoder2("test engine", TEST_ENGINE, 0, 0.7500, 0.2500); - testTriggerDecoder2("testGY6_139QMB", GY6_139QMB, 0, 0.4375, 0.0); - testTriggerDecoder2("testSubary", SUBARU_2003_WRX, 0, 0.4000, 0.0); + testTriggerDecoder2("test engine", engine_type_e::TEST_ENGINE, 0, 0.7500, 0.2500); + testTriggerDecoder2("testGY6_139QMB", engine_type_e::GY6_139QMB, 0, 0.4375, 0.0); + testTriggerDecoder2("testSubary", engine_type_e::SUBARU_2003_WRX, 0, 0.4000, 0.0); - testTriggerDecoder2("testFordEscortGt", FORD_ESCORT_GT, 0, 0.8096, 0.3844); + testTriggerDecoder2("testFordEscortGt", engine_type_e::FORD_ESCORT_GT, 0, 0.8096, 0.3844); - testTriggerDecoder2("NISSAN_PRIMERA", NISSAN_PRIMERA, 2, 0.9611, 0.0); + testTriggerDecoder2("NISSAN_PRIMERA", engine_type_e::NISSAN_PRIMERA, 2, 0.9611, 0.0); - testTriggerDecoder2("test1+1", DEFAULT_FRANKENSO, 0, 0.7500, 0.2500); + testTriggerDecoder2("test1+1", engine_type_e::DEFAULT_FRANKENSO, 0, 0.7500, 0.2500); - testTriggerDecoder2("testCitroen", CITROEN_TU3JP, 0, 0.4833, 0); + testTriggerDecoder2("testCitroen", engine_type_e::CITROEN_TU3JP, 0, 0.4833, 0); - testTriggerDecoder2("testMitsu", MITSU_4G93, 9, 0.3553, 0.3752); + testTriggerDecoder2("testMitsu", engine_type_e::MITSU_4G93, 9, 0.3553, 0.3752); { - EngineTestHelper eth(MITSU_4G93); + EngineTestHelper eth(engine_type_e::MITSU_4G93); eth.persistentConfig.engineConfiguration.sensorChartMode = SC_DETAILED_RPM; @@ -373,14 +373,14 @@ TEST(trigger, testTriggerDecoder) { } - testTriggerDecoder2("citroen", CITROEN_TU3JP, 0, 0.4833, 0.0, 2.9994); + testTriggerDecoder2("citroen", engine_type_e::CITROEN_TU3JP, 0, 0.4833, 0.0, 2.9994); - testTriggerDecoder2("CAMARO_4", CAMARO_4, 40, 0.5, 0); + testTriggerDecoder2("CAMARO_4", engine_type_e::CAMARO_4, 40, 0.5, 0); - testTriggerDecoder2("neon NGC4", DODGE_NEON_2003_CRANK, 6, 0.5000, 0.0, CHRYSLER_NGC4_GAP); + testTriggerDecoder2("neon NGC4", engine_type_e::DODGE_NEON_2003_CRANK, 6, 0.5000, 0.0, CHRYSLER_NGC4_GAP); { - EngineTestHelper eth(DODGE_NEON_2003_CRANK); + EngineTestHelper eth(engine_type_e::DODGE_NEON_2003_CRANK); printf("!!!!!!!!!!!!!!!!!! Now trying with only rising edges !!!!!!!!!!!!!!!!!\r\n"); @@ -389,9 +389,9 @@ TEST(trigger, testTriggerDecoder) { } - testTriggerDecoder2("sachs", SACHS, 0, 0.4800, 0.000); + testTriggerDecoder2("sachs", engine_type_e::SACHS, 0, 0.4800, 0.000); - testTriggerDecoder2("vw ABA", VW_ABA, 0, 0.51666, 0.0); + testTriggerDecoder2("vw ABA", engine_type_e::VW_ABA, 0, 0.51666, 0.0); } static void assertInjectionEventBase(const char *msg, InjectionEvent *ev, int injectorIndex, int eventIndex, angle_t angleOffset) { @@ -540,7 +540,7 @@ static void setArray(float* p, size_t count, float value) { void doTestFuelSchedulerBug299smallAndMedium(int startUpDelayMs) { printf("*************************************************** testFuelSchedulerBug299 small to medium\r\n"); - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); setTable(config->injectionPhase, -180.0f); engineConfiguration->isFasterEngineSpinUpEnabled = false; engine->tdcMarkEnabled = false; @@ -788,7 +788,7 @@ TEST(big, testFuelSchedulerBug299smallAndMedium) { } TEST(big, testTwoWireBatch) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); setTable(config->injectionPhase, -180.0f); setupSimpleTestEngineWithMafAndTT_ONE_trigger(ð); EXPECT_CALL(*eth.mockAirmass, getAirmass(_, _)) @@ -817,7 +817,7 @@ TEST(big, testTwoWireBatch) { TEST(big, testSequential) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); setTable(config->injectionPhase, -180.0f); EXPECT_CALL(*eth.mockAirmass, getAirmass(_, _)) .WillRepeatedly(Return(AirmassResult{0.1008f, 50.0f})); @@ -845,7 +845,7 @@ TEST(big, testSequential) { } TEST(big, testFuelSchedulerBug299smallAndLarge) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); setTable(config->injectionPhase, -180.0f); engineConfiguration->isFasterEngineSpinUpEnabled = false; engine->tdcMarkEnabled = false; @@ -964,7 +964,7 @@ TEST(big, testFuelSchedulerBug299smallAndLarge) { TEST(big, testSparkReverseOrderBug319) { printf("*************************************************** testSparkReverseOrderBug319 small to medium\r\n"); - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); engineConfiguration->isFasterEngineSpinUpEnabled = false; engine->tdcMarkEnabled = false; @@ -979,7 +979,7 @@ TEST(big, testSparkReverseOrderBug319) { // this is needed to update injectorLag engine->updateSlowSensors(); - eth.setTriggerType(TT_ONE); + eth.setTriggerType(trigger_type_e::TT_ONE); eth.engine.periodicFastCallback(); setWholeTimingTable(0); @@ -1069,7 +1069,7 @@ TEST(big, testSparkReverseOrderBug319) { TEST(big, testMissedSpark299) { printf("*************************************************** testMissedSpark299\r\n"); - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); engineConfiguration->ignitionMode = IM_WASTED_SPARK; setupSimpleTestEngineWithMafAndTT_ONE_trigger(ð); engineConfiguration->isIgnitionEnabled = true; diff --git a/unit_tests/tests/trigger/test_trigger_decoder_2.cpp b/unit_tests/tests/trigger/test_trigger_decoder_2.cpp index 05cdbc4d18..e7ea4c9ae5 100644 --- a/unit_tests/tests/trigger/test_trigger_decoder_2.cpp +++ b/unit_tests/tests/trigger/test_trigger_decoder_2.cpp @@ -41,7 +41,7 @@ static auto makeTriggerShape(operation_mode_e mode, const TriggerConfiguration& #define doTooth(dut, shape, cfg, t) dut.decodeTriggerEvent("", shape, nullptr, cfg, SHAFT_PRIMARY_RISING, t) TEST(TriggerDecoder, FindsFirstSyncPoint) { - MockTriggerConfiguration cfg({TT_TOOTHED_WHEEL, 4, 1}); + MockTriggerConfiguration cfg({trigger_type_e::TT_TOOTHED_WHEEL, 4, 1}); cfg.update(); auto shape = makeTriggerShape(FOUR_STROKE_CAM_SENSOR, cfg); @@ -84,7 +84,7 @@ TEST(TriggerDecoder, FindsFirstSyncPoint) { TEST(TriggerDecoder, FindsSyncPointMultipleRevolutions) { - MockTriggerConfiguration cfg({TT_TOOTHED_WHEEL, 4, 1}); + MockTriggerConfiguration cfg({trigger_type_e::TT_TOOTHED_WHEEL, 4, 1}); cfg.update(); auto shape = makeTriggerShape(FOUR_STROKE_CAM_SENSOR, cfg); @@ -134,7 +134,7 @@ TEST(TriggerDecoder, FindsSyncPointMultipleRevolutions) { } TEST(TriggerDecoder, TooManyTeeth_CausesError) { - MockTriggerConfiguration cfg({TT_TOOTHED_WHEEL, 4, 1}); + MockTriggerConfiguration cfg({trigger_type_e::TT_TOOTHED_WHEEL, 4, 1}); cfg.update(); auto shape = makeTriggerShape(FOUR_STROKE_CAM_SENSOR, cfg); @@ -212,7 +212,7 @@ TEST(TriggerDecoder, TooManyTeeth_CausesError) { } TEST(TriggerDecoder, NotEnoughTeeth_CausesError) { - MockTriggerConfiguration cfg({TT_TOOTHED_WHEEL, 4, 1}); + MockTriggerConfiguration cfg({trigger_type_e::TT_TOOTHED_WHEEL, 4, 1}); cfg.update(); auto shape = makeTriggerShape(FOUR_STROKE_CAM_SENSOR, cfg); @@ -289,7 +289,7 @@ TEST(TriggerDecoder, NotEnoughTeeth_CausesError) { } TEST(TriggerDecoder, PrimaryDecoderNoDisambiguation) { - MockTriggerConfiguration cfg({TT_TOOTHED_WHEEL, 4, 1}); + MockTriggerConfiguration cfg({trigger_type_e::TT_TOOTHED_WHEEL, 4, 1}); cfg.update(); auto shape = makeTriggerShape(FOUR_STROKE_CAM_SENSOR, cfg); @@ -320,7 +320,7 @@ TEST(TriggerDecoder, PrimaryDecoderNoDisambiguation) { } TEST(TriggerDecoder, PrimaryDecoderNeedsDisambiguation) { - MockTriggerConfiguration cfg({TT_TOOTHED_WHEEL, 4, 1}); + MockTriggerConfiguration cfg({trigger_type_e::TT_TOOTHED_WHEEL, 4, 1}); cfg.update(); auto shape = makeTriggerShape(FOUR_STROKE_CRANK_SENSOR, cfg); diff --git a/unit_tests/tests/trigger/test_trigger_input_adc.cpp b/unit_tests/tests/trigger/test_trigger_input_adc.cpp index 89ef0d77c3..e8d93c0f08 100644 --- a/unit_tests/tests/trigger/test_trigger_input_adc.cpp +++ b/unit_tests/tests/trigger/test_trigger_input_adc.cpp @@ -72,7 +72,7 @@ static void simulateTrigger(TriggerAdcDetector &trigAdcState, CsvReader &reader, TEST(big, testTriggerInputAdc) { printf("====================================================================================== testTriggerInputAdc\r\n"); - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); engineConfiguration->ignitionMode = IM_WASTED_SPARK; @@ -80,7 +80,7 @@ TEST(big, testTriggerInputAdc) { engineConfiguration->analogInputDividerCoefficient = 2.0f; // we'll test on 60-2 wheel - eth.setTriggerType(TT_TOOTHED_WHEEL_60_2); + eth.setTriggerType(trigger_type_e::TT_TOOTHED_WHEEL_60_2); ASSERT_EQ(0, engine->triggerCentral.triggerState.totalTriggerErrorCounter); ASSERT_EQ(0, Sensor::getOrZero(SensorType::Rpm)) << "testTriggerInputAdc RPM #1"; diff --git a/unit_tests/tests/trigger/test_trigger_multi_sync.cpp b/unit_tests/tests/trigger/test_trigger_multi_sync.cpp index 39ddd8190e..5e78015505 100644 --- a/unit_tests/tests/trigger/test_trigger_multi_sync.cpp +++ b/unit_tests/tests/trigger/test_trigger_multi_sync.cpp @@ -11,6 +11,6 @@ // TEST(trigger, miataNA) { // TriggerWaveform naShape; // initializeMazdaMiataNaShape(&naShape); -// EngineTestHelper eth(FRANKENSO_MIATA_NA6_MAP); +// EngineTestHelper eth(engine_type_e::FRANKENSO_MIATA_NA6_MAP); // // todo: https://github.com/rusefi/rusefi/issues/679 // } diff --git a/unit_tests/tests/trigger/test_trigger_skipped_wheel.cpp b/unit_tests/tests/trigger/test_trigger_skipped_wheel.cpp index 1db114e74a..1991b0cd33 100644 --- a/unit_tests/tests/trigger/test_trigger_skipped_wheel.cpp +++ b/unit_tests/tests/trigger/test_trigger_skipped_wheel.cpp @@ -3,10 +3,10 @@ #include "trigger_decoder.h" TEST(trigger, testCustomSkipped) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); engineConfiguration->trigger.customTotalToothCount = 24; engineConfiguration->trigger.customSkippedToothCount = 2; - eth.setTriggerType(TT_TOOTHED_WHEEL); + eth.setTriggerType(trigger_type_e::TT_TOOTHED_WHEEL); } diff --git a/unit_tests/tests/util/test_timer.cpp b/unit_tests/tests/util/test_timer.cpp index bfbf24c838..cc7785b2d4 100644 --- a/unit_tests/tests/util/test_timer.cpp +++ b/unit_tests/tests/util/test_timer.cpp @@ -2,7 +2,7 @@ #include "timer.h" TEST(util, timer) { - EngineTestHelper eth(TEST_ENGINE); + EngineTestHelper eth(engine_type_e::TEST_ENGINE); Timer timer; ASSERT_TRUE(timer.hasElapsedSec(3)); timer.reset();