diff --git a/firmware/config/engines/chevrolet_camaro_4.cpp b/firmware/config/engines/chevrolet_camaro_4.cpp index fa4d36ab3e..c417f99b61 100644 --- a/firmware/config/engines/chevrolet_camaro_4.cpp +++ b/firmware/config/engines/chevrolet_camaro_4.cpp @@ -15,7 +15,7 @@ EXTERN_CONFIG; void setCamaro4(DECLARE_CONFIG_PARAMETER_SIGNATURE) { - setCustomEngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); + setFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); setAlgorithm(LM_SPEED_DENSITY PASS_CONFIG_PARAMETER_SUFFIX); diff --git a/firmware/config/engines/custom_engine.cpp b/firmware/config/engines/custom_engine.cpp index 1073724251..9e733b982a 100644 --- a/firmware/config/engines/custom_engine.cpp +++ b/firmware/config/engines/custom_engine.cpp @@ -80,9 +80,8 @@ void disableLCD(board_configuration_s *boardConfiguration) { boardConfiguration->HD44780_db7 = GPIO_UNASSIGNED; } -// todo: should this be renamed to 'setFrankensoConfiguration'? // todo: should this be part of more default configurations? -void setCustomEngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { +void setFrankensoConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { engineConfiguration->trigger.type = TT_ONE_PLUS_ONE; setFrankenso_01_LCD(boardConfiguration); @@ -192,7 +191,7 @@ void setCustomEngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { } void setFrankensoBoardTestConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { - setCustomEngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); + setFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); engineConfiguration->directSelfStimulation = true; // this engine type is used for board validation diff --git a/firmware/config/engines/custom_engine.h b/firmware/config/engines/custom_engine.h index c4527b28ed..d287bce89e 100644 --- a/firmware/config/engines/custom_engine.h +++ b/firmware/config/engines/custom_engine.h @@ -9,7 +9,7 @@ #include "engine_configuration.h" -void setCustomEngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE); +void setFrankensoConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE); void setFrankenso_01_LCD(board_configuration_s *boardConfiguration); void disableLCD(board_configuration_s *boardConfiguration); void runSchedulingPrecisionTestIfNeeded(void); diff --git a/firmware/config/engines/dodge_ram.cpp b/firmware/config/engines/dodge_ram.cpp index a4f3ea25d6..58d6a3d476 100644 --- a/firmware/config/engines/dodge_ram.cpp +++ b/firmware/config/engines/dodge_ram.cpp @@ -16,7 +16,7 @@ EXTERN_CONFIG; void setDodgeRam1996(DECLARE_CONFIG_PARAMETER_SIGNATURE) { - setCustomEngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); + setFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); setOperationMode(engineConfiguration, FOUR_STROKE_CAM_SENSOR); engineConfiguration->trigger.type = TT_DODGE_RAM; diff --git a/firmware/config/engines/engine_template.cpp b/firmware/config/engines/engine_template.cpp index 1bd9fb8eef..ffbcab0078 100644 --- a/firmware/config/engines/engine_template.cpp +++ b/firmware/config/engines/engine_template.cpp @@ -11,5 +11,5 @@ EXTERN_CONFIG; void setEngineTemplateConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { - setCustomEngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); + setFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); } diff --git a/firmware/config/engines/geo_storm.cpp b/firmware/config/engines/geo_storm.cpp index 6e6680ede5..e45fd7708e 100644 --- a/firmware/config/engines/geo_storm.cpp +++ b/firmware/config/engines/geo_storm.cpp @@ -11,6 +11,6 @@ EXTERN_CONFIG; void setGeoStormConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { - setCustomEngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); + setFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); } diff --git a/firmware/config/engines/lada_kalina.cpp b/firmware/config/engines/lada_kalina.cpp index 661374778f..ed03a3b18d 100644 --- a/firmware/config/engines/lada_kalina.cpp +++ b/firmware/config/engines/lada_kalina.cpp @@ -14,7 +14,7 @@ EXTERN_CONFIG; void setLadaKalina(DECLARE_CONFIG_PARAMETER_SIGNATURE) { - setCustomEngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); + setFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); disableLCD(boardConfiguration); boardConfiguration->HD44780_rs = GPIO_UNASSIGNED; diff --git a/firmware/config/engines/mazda_626.cpp b/firmware/config/engines/mazda_626.cpp index c337cba749..23bae14b75 100644 --- a/firmware/config/engines/mazda_626.cpp +++ b/firmware/config/engines/mazda_626.cpp @@ -18,7 +18,7 @@ EXTERN_CONFIG; void setMazda626EngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { - setCustomEngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); + setFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); setOperationMode(engineConfiguration, FOUR_STROKE_CRANK_SENSOR); // engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_60_2; diff --git a/firmware/config/engines/mazda_miata_1_6.cpp b/firmware/config/engines/mazda_miata_1_6.cpp index a1172c7ca5..27677d8e44 100644 --- a/firmware/config/engines/mazda_miata_1_6.cpp +++ b/firmware/config/engines/mazda_miata_1_6.cpp @@ -125,8 +125,8 @@ void miataNAcommon(DECLARE_CONFIG_PARAMETER_SIGNATURE) { engineConfiguration->ignitionMode = IM_WASTED_SPARK; } -void setMiataNA6_MAP_Configuration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { - setCustomEngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); +void setMiataNA6_MAP_Frankenso(DECLARE_CONFIG_PARAMETER_SIGNATURE) { + setFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); boardConfiguration->isHip9011Enabled = false; boardConfiguration->isSdCardEnabled = false; @@ -273,8 +273,8 @@ void setMiataNA6_MAP_Configuration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { copyFuelTable(miataNA6_maf_fuel_table, config->fuelTable); } -void setMiataNA6_VAF_Configuration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { - setMiataNA6_MAP_Configuration(PASS_CONFIG_PARAMETER_SIGNATURE); +void setMiataNA6_VAF_Frankenso(DECLARE_CONFIG_PARAMETER_SIGNATURE) { + setMiataNA6_MAP_Frankenso(PASS_CONFIG_PARAMETER_SIGNATURE); engineConfiguration->fuelAlgorithm = LM_PLAIN_MAF; /** @@ -283,3 +283,7 @@ void setMiataNA6_VAF_Configuration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { engineConfiguration->tps1_1AdcChannel = EFI_ADC_NONE; // todo: MAF-based ignition table? } + +void setMiataNA6_VAF_MRE(DECLARE_CONFIG_PARAMETER_SIGNATURE) { + +} diff --git a/firmware/config/engines/mazda_miata_1_6.h b/firmware/config/engines/mazda_miata_1_6.h index aeeca59346..411c2d3548 100644 --- a/firmware/config/engines/mazda_miata_1_6.h +++ b/firmware/config/engines/mazda_miata_1_6.h @@ -10,8 +10,10 @@ #include "engine_configuration.h" -void setMiataNA6_VAF_Configuration(DECLARE_CONFIG_PARAMETER_SIGNATURE); -void setMiataNA6_MAP_Configuration(DECLARE_CONFIG_PARAMETER_SIGNATURE); +void setMiataNA6_VAF_Frankenso(DECLARE_CONFIG_PARAMETER_SIGNATURE); +void setMiataNA6_MAP_Frankenso(DECLARE_CONFIG_PARAMETER_SIGNATURE); void miataNAcommon(DECLARE_CONFIG_PARAMETER_SIGNATURE); +void setMiataNA6_VAF_MRE(DECLARE_CONFIG_PARAMETER_SIGNATURE); + #endif /* CONFIG_ENGINES_MAZDA_MIATA_1_6_H_ */ diff --git a/firmware/config/engines/mazda_miata_na8.cpp b/firmware/config/engines/mazda_miata_na8.cpp index 8235ad443d..d9612ad1f6 100644 --- a/firmware/config/engines/mazda_miata_na8.cpp +++ b/firmware/config/engines/mazda_miata_na8.cpp @@ -19,7 +19,7 @@ EXTERN_CONFIG; * See also setMiataNA_1_6_Configuration */ void setMazdaMiataNA8Configuration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { - setCustomEngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); + setFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); // blue jumper wire to W45 bottom jumper, not OEM engineConfiguration->map.sensor.hwChannel = EFI_ADC_7; diff --git a/firmware/config/engines/mazda_miata_vvt.cpp b/firmware/config/engines/mazda_miata_vvt.cpp index 88fcbd771a..6b39fba7d6 100644 --- a/firmware/config/engines/mazda_miata_vvt.cpp +++ b/firmware/config/engines/mazda_miata_vvt.cpp @@ -238,7 +238,7 @@ void setMazdaMiataNbInjectorLag(DECLARE_CONFIG_PARAMETER_SIGNATURE) { } void setMazdaMiata2003EngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { - setCustomEngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); + setFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); engineConfiguration->trigger.type = TT_MIATA_VVT; setOperationMode(engineConfiguration, FOUR_STROKE_SYMMETRICAL_CRANK_SENSOR); @@ -387,7 +387,7 @@ void setMazdaMiata2003EngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { // Frankenso analog #6 pin 3R, W56 (5th lower row pin from the end) top <> W45 bottom jumper, not OEM - // see setCustomEngineConfiguration + // see setFrankensoConfiguration // map.sensor.hwChannel = EFI_ADC_0; W53 engineConfiguration->map.sensor.type = MT_GM_3_BAR; diff --git a/firmware/config/engines/toyota_jzs147.cpp b/firmware/config/engines/toyota_jzs147.cpp index 24bb511eb5..9ecd394696 100644 --- a/firmware/config/engines/toyota_jzs147.cpp +++ b/firmware/config/engines/toyota_jzs147.cpp @@ -24,7 +24,7 @@ EXTERN_CONFIG; static void common2jz(DECLARE_CONFIG_PARAMETER_SIGNATURE) { - setCustomEngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); // default pinout + setFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); // default pinout engineConfiguration->specs.displacement = 3.0; engineConfiguration->specs.cylindersCount = 6; diff --git a/firmware/config/engines/vw.cpp b/firmware/config/engines/vw.cpp index 646fd611fb..d15b73bc13 100644 --- a/firmware/config/engines/vw.cpp +++ b/firmware/config/engines/vw.cpp @@ -16,7 +16,7 @@ EXTERN_CONFIG; void setVwAba(DECLARE_CONFIG_PARAMETER_SIGNATURE) { - setCustomEngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); + setFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); setWholeTimingTable_d(20 PASS_CONFIG_PARAMETER_SUFFIX); // set cranking_timing_angle 10 diff --git a/firmware/config/engines/zil130.cpp b/firmware/config/engines/zil130.cpp index 95b9ee90f1..2cf22aafd9 100644 --- a/firmware/config/engines/zil130.cpp +++ b/firmware/config/engines/zil130.cpp @@ -15,7 +15,7 @@ EXTERN_CONFIG; void setZil130(DECLARE_CONFIG_PARAMETER_SIGNATURE) { - setCustomEngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); + setFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); engineConfiguration->specs.cylindersCount = 8; diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index ddbfce8edd..31f7ea7ff2 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -1048,7 +1048,7 @@ void resetConfigurationExt(Logging * logger, engine_type_e engineType DECLARE_EN switch (engineType) { case DEFAULT_FRANKENSO: setDefaultFrankensoConfiguration(PASS_ENGINE_PARAMETER_SIGNATURE); - setCustomEngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); + setFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); break; case MRE_MIATA_NA6: case ACURA_RSX: @@ -1101,11 +1101,11 @@ void resetConfigurationExt(Logging * logger, engine_type_e engineType DECLARE_EN break; case MIATA_NA6_MAP: setDefaultFrankensoConfiguration(PASS_ENGINE_PARAMETER_SIGNATURE); - setMiataNA6_MAP_Configuration(PASS_CONFIG_PARAMETER_SIGNATURE); + setMiataNA6_MAP_Frankenso(PASS_CONFIG_PARAMETER_SIGNATURE); break; case MIATA_NA6_VAF: setDefaultFrankensoConfiguration(PASS_ENGINE_PARAMETER_SIGNATURE); - setMiataNA6_VAF_Configuration(PASS_CONFIG_PARAMETER_SIGNATURE); + setMiataNA6_VAF_Frankenso(PASS_CONFIG_PARAMETER_SIGNATURE); break; case ETB_BENCH_ENGINE: setDefaultFrankensoConfiguration(PASS_ENGINE_PARAMETER_SIGNATURE);