diff --git a/firmware/config/engines/GY6_139QMB.h b/firmware/config/engines/GY6_139QMB.h index f6abe46596..348ab05d46 100644 --- a/firmware/config/engines/GY6_139QMB.h +++ b/firmware/config/engines/GY6_139QMB.h @@ -11,6 +11,6 @@ #include "engine.h" -void setGy6139qmbDefaultEngineConfiguration(DECLARE_ENGINE_PARAMETER_F); +void setGy6139qmbDefaultEngineConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE); #endif /* GY6_139QMB_H_ */ diff --git a/firmware/config/engines/bmw_e34.h b/firmware/config/engines/bmw_e34.h index a7de71295c..fdbb59a808 100644 --- a/firmware/config/engines/bmw_e34.h +++ b/firmware/config/engines/bmw_e34.h @@ -10,6 +10,6 @@ #include "engine.h" -void setBmwE34(DECLARE_ENGINE_PARAMETER_F); +void setBmwE34(DECLARE_ENGINE_PARAMETER_SIGNATURE); #endif /* BMW_E34_H_ */ diff --git a/firmware/config/engines/chevrolet_c20_1973.h b/firmware/config/engines/chevrolet_c20_1973.h index a01de44576..ed0cf616a0 100644 --- a/firmware/config/engines/chevrolet_c20_1973.h +++ b/firmware/config/engines/chevrolet_c20_1973.h @@ -10,6 +10,6 @@ #include "engine.h" -void set1973c20(DECLARE_ENGINE_PARAMETER_F); +void set1973c20(DECLARE_ENGINE_PARAMETER_SIGNATURE); #endif /* CONFIG_ENGINES_CHEVROLET_C20_1973_H_ */ diff --git a/firmware/config/engines/chevrolet_camaro_4.h b/firmware/config/engines/chevrolet_camaro_4.h index b55cc7a636..fc1240364c 100644 --- a/firmware/config/engines/chevrolet_camaro_4.h +++ b/firmware/config/engines/chevrolet_camaro_4.h @@ -10,6 +10,6 @@ #include "engine.h" -void setCamaro4(DECLARE_ENGINE_PARAMETER_F); +void setCamaro4(DECLARE_ENGINE_PARAMETER_SIGNATURE); #endif /* CONFIG_ENGINES_CHEVROLET_CAMARO_4_H_ */ diff --git a/firmware/config/engines/citroenBerlingoTU3JP.h b/firmware/config/engines/citroenBerlingoTU3JP.h index ad4084017e..970157b9b7 100644 --- a/firmware/config/engines/citroenBerlingoTU3JP.h +++ b/firmware/config/engines/citroenBerlingoTU3JP.h @@ -10,6 +10,6 @@ #include "engine.h" -void setCitroenBerlingoTU3JPConfiguration(DECLARE_ENGINE_PARAMETER_F); +void setCitroenBerlingoTU3JPConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE); #endif /* CITROENBERLINGOTU3JP_H_ */ diff --git a/firmware/config/engines/custom_engine.h b/firmware/config/engines/custom_engine.h index 10a5db2e39..7fe83c4515 100644 --- a/firmware/config/engines/custom_engine.h +++ b/firmware/config/engines/custom_engine.h @@ -9,10 +9,10 @@ #include "engine.h" -void setCustomEngineConfiguration(DECLARE_ENGINE_PARAMETER_F); +void setCustomEngineConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE); void setFrankenso_01_LCD(board_configuration_s *boardConfiguration); void disableLCD(board_configuration_s *boardConfiguration); -void setFrankensoBoardTestConfiguration(DECLARE_ENGINE_PARAMETER_F); +void setFrankensoBoardTestConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE); #endif /* CONFIG_ENGINES_CUSTOM_ENGINE_H_ */ diff --git a/firmware/config/engines/daihatsu.cpp b/firmware/config/engines/daihatsu.cpp index 56cd8be26f..728c24db7a 100644 --- a/firmware/config/engines/daihatsu.cpp +++ b/firmware/config/engines/daihatsu.cpp @@ -13,7 +13,7 @@ EXTERN_ENGINE; -void setDaihatsu(DECLARE_ENGINE_PARAMETER_F) { +void setDaihatsu(DECLARE_ENGINE_PARAMETER_SIGNATURE) { engineConfiguration->trigger.type = TT_36_2_2_2; engineConfiguration->specs.cylindersCount = 3; diff --git a/firmware/config/engines/daihatsu.h b/firmware/config/engines/daihatsu.h index d816cf2ed6..1bb092c86d 100644 --- a/firmware/config/engines/daihatsu.h +++ b/firmware/config/engines/daihatsu.h @@ -7,4 +7,4 @@ #include "engine.h" -void setDaihatsu(DECLARE_ENGINE_PARAMETER_F); +void setDaihatsu(DECLARE_ENGINE_PARAMETER_SIGNATURE); diff --git a/firmware/config/engines/dodge_neon.h b/firmware/config/engines/dodge_neon.h index 4bf1824a64..2540b45afa 100644 --- a/firmware/config/engines/dodge_neon.h +++ b/firmware/config/engines/dodge_neon.h @@ -13,14 +13,14 @@ #include "engine.h" -void setDodgeNeon1995EngineConfiguration(DECLARE_ENGINE_PARAMETER_F); +void setDodgeNeon1995EngineConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE); -void setDodgeNeonNGCEngineConfiguration(DECLARE_ENGINE_PARAMETER_F); +void setDodgeNeonNGCEngineConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE); /** * testing or broken CAM sensor option */ -void setDodgeNeonNGCEngineConfigurationCrankBased(DECLARE_ENGINE_PARAMETER_F); +void setDodgeNeonNGCEngineConfigurationCrankBased(DECLARE_ENGINE_PARAMETER_SIGNATURE); #endif /* EFI_SUPPORT_DODGE_NEON */ diff --git a/firmware/config/engines/dodge_ram.h b/firmware/config/engines/dodge_ram.h index 74cf78f39b..1dddee9a97 100644 --- a/firmware/config/engines/dodge_ram.h +++ b/firmware/config/engines/dodge_ram.h @@ -10,6 +10,6 @@ #include "engine.h" -void setDodgeRam1996(DECLARE_ENGINE_PARAMETER_F); +void setDodgeRam1996(DECLARE_ENGINE_PARAMETER_SIGNATURE); #endif /* CONFIG_ENGINES_DODGE_RAM_H_ */ diff --git a/firmware/config/engines/dodge_stratus.h b/firmware/config/engines/dodge_stratus.h index c17820dfdd..18f94187f5 100644 --- a/firmware/config/engines/dodge_stratus.h +++ b/firmware/config/engines/dodge_stratus.h @@ -10,6 +10,6 @@ #include "engine.h" -void setDodgeStratus(DECLARE_ENGINE_PARAMETER_F); +void setDodgeStratus(DECLARE_ENGINE_PARAMETER_SIGNATURE); #endif /* CONFIG_ENGINES_DODGE_STRATUS_H_ */ diff --git a/firmware/config/engines/engine_template.cpp b/firmware/config/engines/engine_template.cpp index 9d0463ce93..0f53d3cd94 100644 --- a/firmware/config/engines/engine_template.cpp +++ b/firmware/config/engines/engine_template.cpp @@ -10,6 +10,6 @@ EXTERN_ENGINE; -void setEngineTemplateConfiguration(DECLARE_ENGINE_PARAMETER_F) { - setCustomEngineConfiguration(PASS_ENGINE_PARAMETER_F); +void setEngineTemplateConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE) { + setCustomEngineConfiguration(PASS_ENGINE_PARAMETER_SIGNATURE); } diff --git a/firmware/config/engines/engine_template.h b/firmware/config/engines/engine_template.h index cd1976c24c..7030a8f7c2 100644 --- a/firmware/config/engines/engine_template.h +++ b/firmware/config/engines/engine_template.h @@ -9,6 +9,6 @@ #define CONFIG_ENGINES_ENGINE_TEMPLATE_H_ #include "engine.h" -void setEngineTemplateConfiguration(DECLARE_ENGINE_PARAMETER_F); +void setEngineTemplateConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE); #endif /* CONFIG_ENGINES_ENGINE_TEMPLATE_H_ */ diff --git a/firmware/config/engines/ford_1995_inline_6.h b/firmware/config/engines/ford_1995_inline_6.h index 4944e17431..deead28342 100644 --- a/firmware/config/engines/ford_1995_inline_6.h +++ b/firmware/config/engines/ford_1995_inline_6.h @@ -10,6 +10,6 @@ #include "engine_configuration.h" -void setFordInline6(DECLARE_ENGINE_PARAMETER_F); +void setFordInline6(DECLARE_ENGINE_PARAMETER_SIGNATURE); #endif /* FORD_1995_INLINE_6_H_ */ diff --git a/firmware/config/engines/ford_aspire.h b/firmware/config/engines/ford_aspire.h index 57b65116e2..d9e78c9964 100644 --- a/firmware/config/engines/ford_aspire.h +++ b/firmware/config/engines/ford_aspire.h @@ -14,6 +14,6 @@ #include "engine.h" -void setFordAspireEngineConfiguration(DECLARE_ENGINE_PARAMETER_F); +void setFordAspireEngineConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE); #endif /* FORD_ASPIRE_H_ */ diff --git a/firmware/config/engines/ford_festiva.h b/firmware/config/engines/ford_festiva.h index 9a61f3866e..1249dcdbb6 100644 --- a/firmware/config/engines/ford_festiva.h +++ b/firmware/config/engines/ford_festiva.h @@ -10,6 +10,6 @@ #include "engine.h" -void setFordEscortGt(DECLARE_ENGINE_PARAMETER_F); +void setFordEscortGt(DECLARE_ENGINE_PARAMETER_SIGNATURE); #endif /* CONFIG_ENGINES_FORD_FESTIVA_H_ */ diff --git a/firmware/config/engines/ford_fiesta.cpp b/firmware/config/engines/ford_fiesta.cpp index 1e8340977e..ad9931ad75 100644 --- a/firmware/config/engines/ford_fiesta.cpp +++ b/firmware/config/engines/ford_fiesta.cpp @@ -18,7 +18,7 @@ EXTERN_ENGINE; -void setFordFiestaDefaultEngineConfiguration(DECLARE_ENGINE_PARAMETER_F) { +void setFordFiestaDefaultEngineConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE) { engineConfiguration->rpmHardLimit = 7000; setOperationMode(engineConfiguration, FOUR_STROKE_CRANK_SENSOR); diff --git a/firmware/config/engines/ford_fiesta.h b/firmware/config/engines/ford_fiesta.h index 84739aaf58..b88f2d755a 100644 --- a/firmware/config/engines/ford_fiesta.h +++ b/firmware/config/engines/ford_fiesta.h @@ -11,7 +11,7 @@ #include "engine.h" -void setFordFiestaDefaultEngineConfiguration(DECLARE_ENGINE_PARAMETER_F); +void setFordFiestaDefaultEngineConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE); #endif /* EFI_SUPPORT_FORD_FIESTA */ #endif /* FORD_FIESTA_H_ */ diff --git a/firmware/config/engines/geo_storm.cpp b/firmware/config/engines/geo_storm.cpp index bc8383f282..b8e1beb291 100644 --- a/firmware/config/engines/geo_storm.cpp +++ b/firmware/config/engines/geo_storm.cpp @@ -10,7 +10,7 @@ EXTERN_ENGINE; -void setGeoStormConfiguration(DECLARE_ENGINE_PARAMETER_F) { - setCustomEngineConfiguration(PASS_ENGINE_PARAMETER_F); +void setGeoStormConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE) { + setCustomEngineConfiguration(PASS_ENGINE_PARAMETER_SIGNATURE); } diff --git a/firmware/config/engines/geo_storm.h b/firmware/config/engines/geo_storm.h index b91f75cf6f..10fb281c68 100644 --- a/firmware/config/engines/geo_storm.h +++ b/firmware/config/engines/geo_storm.h @@ -9,6 +9,6 @@ #define CONFIG_ENGINES_GEO_STORM_H_ #include "engine.h" -void setGeoStormConfiguration(DECLARE_ENGINE_PARAMETER_F); +void setGeoStormConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE); #endif /* CONFIG_ENGINES_GEO_STORM_H_ */ diff --git a/firmware/config/engines/gm_2_2.cpp b/firmware/config/engines/gm_2_2.cpp index df0c4b709a..336632abf5 100644 --- a/firmware/config/engines/gm_2_2.cpp +++ b/firmware/config/engines/gm_2_2.cpp @@ -13,7 +13,7 @@ EXTERN_ENGINE ; -void setGm2_2(DECLARE_ENGINE_PARAMETER_F) { +void setGm2_2(DECLARE_ENGINE_PARAMETER_SIGNATURE) { setOperationMode(engineConfiguration, FOUR_STROKE_CAM_SENSOR); engineConfiguration->trigger.type = TT_ONE_PLUS_TOOTHED_WHEEL_60_2; diff --git a/firmware/config/engines/gm_2_2.h b/firmware/config/engines/gm_2_2.h index 3e0acddf07..ecb847f7e9 100644 --- a/firmware/config/engines/gm_2_2.h +++ b/firmware/config/engines/gm_2_2.h @@ -10,6 +10,6 @@ #include "engine.h" -void setGm2_2(DECLARE_ENGINE_PARAMETER_F); +void setGm2_2(DECLARE_ENGINE_PARAMETER_SIGNATURE); #endif /* CONFIG_ENGINES_GM_2_2_H_ */ diff --git a/firmware/config/engines/honda_600.h b/firmware/config/engines/honda_600.h index ef78fe2f42..faa9faf9b6 100644 --- a/firmware/config/engines/honda_600.h +++ b/firmware/config/engines/honda_600.h @@ -9,6 +9,6 @@ #define CONFIG_ENGINES_HONDA_600_H_ #include "engine.h" -void setHonda600(DECLARE_ENGINE_PARAMETER_F); +void setHonda600(DECLARE_ENGINE_PARAMETER_SIGNATURE); #endif /* CONFIG_ENGINES_HONDA_600_H_ */ diff --git a/firmware/config/engines/honda_accord.h b/firmware/config/engines/honda_accord.h index 1b4f5df63e..80fed52708 100644 --- a/firmware/config/engines/honda_accord.h +++ b/firmware/config/engines/honda_accord.h @@ -10,12 +10,12 @@ #include "engine.h" -void setHondaAccordConfigurationTwoWires(DECLARE_ENGINE_PARAMETER_F); -void setHondaAccordConfigurationThreeWires(DECLARE_ENGINE_PARAMETER_F); -void setHondaAccordConfigurationDip(DECLARE_ENGINE_PARAMETER_F); -void setHondaAccordConfiguration1_24(DECLARE_ENGINE_PARAMETER_F); -void setHondaAccordConfiguration1_24_shifted(DECLARE_ENGINE_PARAMETER_F); -void setHondaCivic4_0_both(DECLARE_ENGINE_PARAMETER_F); -void setHondaCivic4_0_rise(DECLARE_ENGINE_PARAMETER_F); +void setHondaAccordConfigurationTwoWires(DECLARE_ENGINE_PARAMETER_SIGNATURE); +void setHondaAccordConfigurationThreeWires(DECLARE_ENGINE_PARAMETER_SIGNATURE); +void setHondaAccordConfigurationDip(DECLARE_ENGINE_PARAMETER_SIGNATURE); +void setHondaAccordConfiguration1_24(DECLARE_ENGINE_PARAMETER_SIGNATURE); +void setHondaAccordConfiguration1_24_shifted(DECLARE_ENGINE_PARAMETER_SIGNATURE); +void setHondaCivic4_0_both(DECLARE_ENGINE_PARAMETER_SIGNATURE); +void setHondaCivic4_0_rise(DECLARE_ENGINE_PARAMETER_SIGNATURE); #endif /* HONDA_ACCORD_H_ */ diff --git a/firmware/config/engines/lada_kalina.h b/firmware/config/engines/lada_kalina.h index e6ee08ec9c..e673d2e5cb 100644 --- a/firmware/config/engines/lada_kalina.h +++ b/firmware/config/engines/lada_kalina.h @@ -10,6 +10,6 @@ #include "engine.h" -void setLadaKalina(DECLARE_ENGINE_PARAMETER_F); +void setLadaKalina(DECLARE_ENGINE_PARAMETER_SIGNATURE); #endif /* CONFIG_ENGINES_LADA_KALINA_H_ */ diff --git a/firmware/config/engines/mazda_626.h b/firmware/config/engines/mazda_626.h index ddc71ba11b..9191f6e1b2 100644 --- a/firmware/config/engines/mazda_626.h +++ b/firmware/config/engines/mazda_626.h @@ -11,6 +11,6 @@ #include "engine.h" -void setMazda626EngineConfiguration(DECLARE_ENGINE_PARAMETER_F); +void setMazda626EngineConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE); #endif /* CONFIG_ENGINES_MAZDA_626_H_ */ diff --git a/firmware/config/engines/mazda_miata.h b/firmware/config/engines/mazda_miata.h index fb3b6a95eb..fdbf5c7c78 100644 --- a/firmware/config/engines/mazda_miata.h +++ b/firmware/config/engines/mazda_miata.h @@ -15,9 +15,9 @@ #include "engine.h" void common079721_2351(engine_configuration_s *engineConfiguration, board_configuration_s *boardConfiguration); -void setMiata1990(DECLARE_ENGINE_PARAMETER_F); -void setMiata1994_d(DECLARE_ENGINE_PARAMETER_F); -void setMiata1994_s(DECLARE_ENGINE_PARAMETER_F); -void setMiata1996(DECLARE_ENGINE_PARAMETER_F); +void setMiata1990(DECLARE_ENGINE_PARAMETER_SIGNATURE); +void setMiata1994_d(DECLARE_ENGINE_PARAMETER_SIGNATURE); +void setMiata1994_s(DECLARE_ENGINE_PARAMETER_SIGNATURE); +void setMiata1996(DECLARE_ENGINE_PARAMETER_SIGNATURE); #endif /* MAZDA_MIATA_H_ */ diff --git a/firmware/config/engines/mazda_miata_1_6.h b/firmware/config/engines/mazda_miata_1_6.h index a808ea6d77..8b57f78052 100644 --- a/firmware/config/engines/mazda_miata_1_6.h +++ b/firmware/config/engines/mazda_miata_1_6.h @@ -9,6 +9,6 @@ #define CONFIG_ENGINES_MAZDA_MIATA_1_6_H_ #include "engine.h" -void setMiataNA_1_6_Configuration(DECLARE_ENGINE_PARAMETER_F); +void setMiataNA_1_6_Configuration(DECLARE_ENGINE_PARAMETER_SIGNATURE); #endif /* CONFIG_ENGINES_MAZDA_MIATA_1_6_H_ */ diff --git a/firmware/config/engines/mazda_miata_nb.h b/firmware/config/engines/mazda_miata_nb.h index ccd0bcb548..6dfd12b6c9 100644 --- a/firmware/config/engines/mazda_miata_nb.h +++ b/firmware/config/engines/mazda_miata_nb.h @@ -10,6 +10,6 @@ #include "engine.h" -void setMazdaMiataNb1EngineConfiguration(DECLARE_ENGINE_PARAMETER_F); +void setMazdaMiataNb1EngineConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE); #endif /* MAZDA_MIATA_NB1_H_ */ diff --git a/firmware/config/engines/mazda_miata_vvt.h b/firmware/config/engines/mazda_miata_vvt.h index d0e7f7f6cd..9f4b1f76e4 100644 --- a/firmware/config/engines/mazda_miata_vvt.h +++ b/firmware/config/engines/mazda_miata_vvt.h @@ -12,10 +12,10 @@ #include "engine.h" -void setMazdaMiataNbInjectorLag(DECLARE_ENGINE_PARAMETER_F); -void setMazdaMiataNbTpsTps(DECLARE_ENGINE_PARAMETER_F); +void setMazdaMiataNbInjectorLag(DECLARE_ENGINE_PARAMETER_SIGNATURE); +void setMazdaMiataNbTpsTps(DECLARE_ENGINE_PARAMETER_SIGNATURE); -void setMazdaMiata2003EngineConfiguration(DECLARE_ENGINE_PARAMETER_F); -void setMazdaMiata2003EngineConfigurationNewBoard(DECLARE_ENGINE_PARAMETER_F); +void setMazdaMiata2003EngineConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE); +void setMazdaMiata2003EngineConfigurationNewBoard(DECLARE_ENGINE_PARAMETER_SIGNATURE); #endif /* CONFIG_ENGINES_MAZDA_MIATA_VVT_H_ */ diff --git a/firmware/config/engines/mitsubishi.h b/firmware/config/engines/mitsubishi.h index ae4165147d..3db65f7787 100644 --- a/firmware/config/engines/mitsubishi.h +++ b/firmware/config/engines/mitsubishi.h @@ -9,6 +9,6 @@ #include "engine.h" -void setMitsubishiConfiguration(DECLARE_ENGINE_PARAMETER_F); +void setMitsubishiConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE); #endif /* MITSUBISHI_H_ */ diff --git a/firmware/config/engines/prometheus.cpp b/firmware/config/engines/prometheus.cpp index a2ca889d68..d5251340ae 100644 --- a/firmware/config/engines/prometheus.cpp +++ b/firmware/config/engines/prometheus.cpp @@ -9,7 +9,7 @@ #include "prometheus.h" -void setPrometheusDefaults(DECLARE_ENGINE_PARAMETER_F) { +void setPrometheusDefaults(DECLARE_ENGINE_PARAMETER_SIGNATURE) { } diff --git a/firmware/config/engines/prometheus.h b/firmware/config/engines/prometheus.h index 05e94ce3fb..cf71bb1a38 100644 --- a/firmware/config/engines/prometheus.h +++ b/firmware/config/engines/prometheus.h @@ -9,6 +9,6 @@ #define CONFIG_ENGINES_PROMETHEUS_H_ #include "engine.h" -void setPrometheusDefaults(DECLARE_ENGINE_PARAMETER_F); +void setPrometheusDefaults(DECLARE_ENGINE_PARAMETER_SIGNATURE); #endif /* CONFIG_ENGINES_PROMETHEUS_H_ */ diff --git a/firmware/config/engines/rover_v8.h b/firmware/config/engines/rover_v8.h index 17830daaf1..72222b1d21 100644 --- a/firmware/config/engines/rover_v8.h +++ b/firmware/config/engines/rover_v8.h @@ -10,6 +10,6 @@ #include "engine.h" void setFrankenstein_01_LCD(board_configuration_s *boardConfiguration); -void setRoverv8(DECLARE_ENGINE_PARAMETER_F); +void setRoverv8(DECLARE_ENGINE_PARAMETER_SIGNATURE); #endif /* ROVER_V8_H_ */ diff --git a/firmware/config/engines/sachs.h b/firmware/config/engines/sachs.h index 9f63f33b1e..3da29b06cd 100644 --- a/firmware/config/engines/sachs.h +++ b/firmware/config/engines/sachs.h @@ -9,6 +9,6 @@ #include "engine.h" -void setSachs(DECLARE_ENGINE_PARAMETER_F); +void setSachs(DECLARE_ENGINE_PARAMETER_SIGNATURE); #endif /* CONFIG_ENGINES_SACHS_H_ */ diff --git a/firmware/config/engines/subaru.cpp b/firmware/config/engines/subaru.cpp index d80b72f645..a2a352705a 100644 --- a/firmware/config/engines/subaru.cpp +++ b/firmware/config/engines/subaru.cpp @@ -13,7 +13,7 @@ EXTERN_ENGINE; -void setSubaru2003Wrx(DECLARE_ENGINE_PARAMETER_F) { +void setSubaru2003Wrx(DECLARE_ENGINE_PARAMETER_SIGNATURE) { setFrankenso_01_LCD(boardConfiguration); setFrankenso0_1_joystick(engineConfiguration); diff --git a/firmware/config/engines/subaru.h b/firmware/config/engines/subaru.h index 875b550806..7629ecd6f6 100644 --- a/firmware/config/engines/subaru.h +++ b/firmware/config/engines/subaru.h @@ -9,6 +9,6 @@ #include "engine.h" -void setSubaru2003Wrx(DECLARE_ENGINE_PARAMETER_F); +void setSubaru2003Wrx(DECLARE_ENGINE_PARAMETER_SIGNATURE); #endif /* SUBARU_H_ */ diff --git a/firmware/config/engines/suzuki_vitara.cpp b/firmware/config/engines/suzuki_vitara.cpp index 8da62bb55c..86985e8713 100644 --- a/firmware/config/engines/suzuki_vitara.cpp +++ b/firmware/config/engines/suzuki_vitara.cpp @@ -11,7 +11,7 @@ EXTERN_ENGINE; -void setSuzukiVitara(DECLARE_ENGINE_PARAMETER_F) { +void setSuzukiVitara(DECLARE_ENGINE_PARAMETER_SIGNATURE) { engineConfiguration->trigger.type = TT_MAZDA_SOHC_4; engineConfiguration->specs.cylindersCount = 4; engineConfiguration->specs.displacement = 1.590; diff --git a/firmware/config/engines/suzuki_vitara.h b/firmware/config/engines/suzuki_vitara.h index 9ac9bd09fc..2c913b3f13 100644 --- a/firmware/config/engines/suzuki_vitara.h +++ b/firmware/config/engines/suzuki_vitara.h @@ -10,6 +10,6 @@ #include "engine.h" -void setSuzukiVitara(DECLARE_ENGINE_PARAMETER_F); +void setSuzukiVitara(DECLARE_ENGINE_PARAMETER_SIGNATURE); #endif /* CONFIG_ENGINES_SUZUKI_VITARA_H_ */ diff --git a/firmware/config/engines/test_engine.h b/firmware/config/engines/test_engine.h index 46799de4db..b8d267e165 100644 --- a/firmware/config/engines/test_engine.h +++ b/firmware/config/engines/test_engine.h @@ -9,10 +9,10 @@ #include "engine_configuration.h" -void setTestEngineConfiguration(DECLARE_ENGINE_PARAMETER_F); -void setTestVVTEngineConfiguration(DECLARE_ENGINE_PARAMETER_F); +void setTestEngineConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE); +void setTestVVTEngineConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE); -void setTestEngineIssue366both(DECLARE_ENGINE_PARAMETER_F); -void setTestEngineIssue366rise(DECLARE_ENGINE_PARAMETER_F); +void setTestEngineIssue366both(DECLARE_ENGINE_PARAMETER_SIGNATURE); +void setTestEngineIssue366rise(DECLARE_ENGINE_PARAMETER_SIGNATURE); #endif /* TEST_ENGINE_H_ */ diff --git a/firmware/config/engines/toyota_jzs147.cpp b/firmware/config/engines/toyota_jzs147.cpp index 771d731ae5..af4e854aef 100644 --- a/firmware/config/engines/toyota_jzs147.cpp +++ b/firmware/config/engines/toyota_jzs147.cpp @@ -23,8 +23,8 @@ EXTERN_ENGINE; -static void common2jz(DECLARE_ENGINE_PARAMETER_F) { - setCustomEngineConfiguration(PASS_ENGINE_PARAMETER_F); // default pinout +static void common2jz(DECLARE_ENGINE_PARAMETER_SIGNATURE) { + setCustomEngineConfiguration(PASS_ENGINE_PARAMETER_SIGNATURE); // default pinout engineConfiguration->specs.displacement = 3.0; engineConfiguration->specs.cylindersCount = 6; @@ -67,8 +67,8 @@ static void common2jz(DECLARE_ENGINE_PARAMETER_F) { } -void setToyota_jzs147EngineConfiguration(DECLARE_ENGINE_PARAMETER_F) { - common2jz(PASS_ENGINE_PARAMETER_F); +void setToyota_jzs147EngineConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE) { + common2jz(PASS_ENGINE_PARAMETER_SIGNATURE); setOperationMode(engineConfiguration, FOUR_STROKE_CAM_SENSOR); engineConfiguration->trigger.type = TT_2JZ_1_12; @@ -95,8 +95,8 @@ void setToyota_jzs147EngineConfiguration(DECLARE_ENGINE_PARAMETER_F) { } -void setToyota_2jz_vics(DECLARE_ENGINE_PARAMETER_F) { - common2jz(PASS_ENGINE_PARAMETER_F); +void setToyota_2jz_vics(DECLARE_ENGINE_PARAMETER_SIGNATURE) { + common2jz(PASS_ENGINE_PARAMETER_SIGNATURE); boardConfiguration->isSdCardEnabled = true; diff --git a/firmware/config/engines/toyota_jzs147.h b/firmware/config/engines/toyota_jzs147.h index cb2d35117b..c424e440fd 100644 --- a/firmware/config/engines/toyota_jzs147.h +++ b/firmware/config/engines/toyota_jzs147.h @@ -10,7 +10,7 @@ #include "engine.h" -void setToyota_jzs147EngineConfiguration(DECLARE_ENGINE_PARAMETER_F); -void setToyota_2jz_vics(DECLARE_ENGINE_PARAMETER_F); +void setToyota_jzs147EngineConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE); +void setToyota_2jz_vics(DECLARE_ENGINE_PARAMETER_SIGNATURE); #endif /* CONFIG_ENGINES_TOYOTA_JZS147_H_ */ diff --git a/firmware/config/engines/vw.h b/firmware/config/engines/vw.h index a4da621c20..95fbf5fe9d 100644 --- a/firmware/config/engines/vw.h +++ b/firmware/config/engines/vw.h @@ -10,6 +10,6 @@ #include "engine.h" -void setVwAba(DECLARE_ENGINE_PARAMETER_F); +void setVwAba(DECLARE_ENGINE_PARAMETER_SIGNATURE); #endif /* CONFIG_ENGINES_VW_H_ */ diff --git a/firmware/config/engines/zil130.cpp b/firmware/config/engines/zil130.cpp index 970afcfd31..b082d10e19 100644 --- a/firmware/config/engines/zil130.cpp +++ b/firmware/config/engines/zil130.cpp @@ -14,8 +14,8 @@ EXTERN_ENGINE; -void setZil130(DECLARE_ENGINE_PARAMETER_F) { - setCustomEngineConfiguration(PASS_ENGINE_PARAMETER_F); +void setZil130(DECLARE_ENGINE_PARAMETER_SIGNATURE) { + setCustomEngineConfiguration(PASS_ENGINE_PARAMETER_SIGNATURE); engineConfiguration->specs.cylindersCount = 8; diff --git a/firmware/config/engines/zil130.h b/firmware/config/engines/zil130.h index f43d3ef97e..6b6f34baa9 100644 --- a/firmware/config/engines/zil130.h +++ b/firmware/config/engines/zil130.h @@ -9,6 +9,6 @@ #define ZIL130_H_ #include "engine.h" -void setZil130(DECLARE_ENGINE_PARAMETER_F); +void setZil130(DECLARE_ENGINE_PARAMETER_SIGNATURE); #endif /* ZIL130_H_ */ diff --git a/firmware/console/binary/tunerstudio.cpp b/firmware/console/binary/tunerstudio.cpp index afd88f0f5b..77bc6b185a 100644 --- a/firmware/console/binary/tunerstudio.cpp +++ b/firmware/console/binary/tunerstudio.cpp @@ -388,7 +388,7 @@ void requestBurn(void) { #if EFI_INTERNAL_FLASH || defined(__DOXYGEN__) setNeedToWriteConfiguration(); #endif - incrementGlobalConfigurationVersion(PASS_ENGINE_PARAMETER_F); + incrementGlobalConfigurationVersion(PASS_ENGINE_PARAMETER_SIGNATURE); } static void sendResponseCode(ts_response_format_e mode, ts_channel_s *tsChannel, const uint8_t responseCode) { diff --git a/firmware/console/binary/tunerstudio.h b/firmware/console/binary/tunerstudio.h index d06e9f3393..ed66748c55 100644 --- a/firmware/console/binary/tunerstudio.h +++ b/firmware/console/binary/tunerstudio.h @@ -50,7 +50,7 @@ void handleBurnCommand(ts_channel_s *tsChannel, ts_response_format_e mode, uint1 void tunerStudioDebug(const char *msg); void tunerStudioError(const char *msg); -void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_ENGINE_PARAMETER_S); +void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_ENGINE_PARAMETER_SUFFIX); void printTsStats(void); void requestBurn(void); diff --git a/firmware/controllers/algo/accel_enrichment.h b/firmware/controllers/algo/accel_enrichment.h index 6dda111965..bf5abb094e 100644 --- a/firmware/controllers/algo/accel_enrichment.h +++ b/firmware/controllers/algo/accel_enrichment.h @@ -25,20 +25,20 @@ public: /** * @return Extra engine load value for fuel logic calculation */ - float getEngineLoadEnrichment(DECLARE_ENGINE_PARAMETER_F); + float getEngineLoadEnrichment(DECLARE_ENGINE_PARAMETER_SIGNATURE); /** * @return Extra fuel squirt duration for TPS acceleration */ - floatms_t getTpsEnrichment(DECLARE_ENGINE_PARAMETER_F); - int getMaxDeltaIndex(DECLARE_ENGINE_PARAMETER_F); - float getMaxDelta(DECLARE_ENGINE_PARAMETER_F); + floatms_t getTpsEnrichment(DECLARE_ENGINE_PARAMETER_SIGNATURE); + int getMaxDeltaIndex(DECLARE_ENGINE_PARAMETER_SIGNATURE); + float getMaxDelta(DECLARE_ENGINE_PARAMETER_SIGNATURE); - void onEngineCycle(DECLARE_ENGINE_PARAMETER_F); - void onEngineCycleTps(DECLARE_ENGINE_PARAMETER_F); + void onEngineCycle(DECLARE_ENGINE_PARAMETER_SIGNATURE); + void onEngineCycleTps(DECLARE_ENGINE_PARAMETER_SIGNATURE); void reset(); void setLength(int length); cyclic_buffer cb; - void onNewValue(float currentValue DECLARE_ENGINE_PARAMETER_S); + void onNewValue(float currentValue DECLARE_ENGINE_PARAMETER_SUFFIX); private: float previousValue; @@ -51,7 +51,7 @@ public: * @param target desired squirt duration * @return total adjusted fuel squirt duration once wall wetting is taken into effect */ - floatms_t adjust(int injectorIndex, floatms_t target DECLARE_ENGINE_PARAMETER_S); + floatms_t adjust(int injectorIndex, floatms_t target DECLARE_ENGINE_PARAMETER_SUFFIX); floatms_t getWallFuel(int injectorIndex); void reset(); private: @@ -61,7 +61,7 @@ private: floatms_t wallFuel[INJECTION_PIN_COUNT]; }; -void initAccelEnrichment(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_S); +void initAccelEnrichment(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX); void setEngineLoadAccelLen(int len); void setEngineLoadAccelThr(float value); diff --git a/firmware/controllers/algo/advance_map.h b/firmware/controllers/algo/advance_map.h index c34faa7bcb..b8d2f2ca5a 100644 --- a/firmware/controllers/algo/advance_map.h +++ b/firmware/controllers/algo/advance_map.h @@ -10,11 +10,11 @@ #include "engine.h" -angle_t getAdvance(int rpm, float engineLoad DECLARE_ENGINE_PARAMETER_S); -void setDefaultIatTimingCorrection(DECLARE_ENGINE_PARAMETER_F); -void prepareTimingMap(DECLARE_ENGINE_PARAMETER_F); +angle_t getAdvance(int rpm, float engineLoad DECLARE_ENGINE_PARAMETER_SUFFIX); +void setDefaultIatTimingCorrection(DECLARE_ENGINE_PARAMETER_SIGNATURE); +void prepareTimingMap(DECLARE_ENGINE_PARAMETER_SIGNATURE); float getTopAdvanceForBore(chamber_style_e style, int octane, double compression, double bore); float getInitialAdvance(int rpm, float map, float advanceMax); -void buildTimingMap(float advanceMax DECLARE_ENGINE_PARAMETER_S); +void buildTimingMap(float advanceMax DECLARE_ENGINE_PARAMETER_SUFFIX); #endif /* ADVANCE_H_ */ diff --git a/firmware/controllers/algo/algo.cpp b/firmware/controllers/algo/algo.cpp index 7044d3ac6f..7ba3a08295 100644 --- a/firmware/controllers/algo/algo.cpp +++ b/firmware/controllers/algo/algo.cpp @@ -29,10 +29,10 @@ EXTERN_ENGINE; -void initDataStructures(DECLARE_ENGINE_PARAMETER_F) { - prepareFuelMap(PASS_ENGINE_PARAMETER_F); - prepareTimingMap(PASS_ENGINE_PARAMETER_F); - initSpeedDensity(PASS_ENGINE_PARAMETER_F); +void initDataStructures(DECLARE_ENGINE_PARAMETER_SIGNATURE) { + prepareFuelMap(PASS_ENGINE_PARAMETER_SIGNATURE); + prepareTimingMap(PASS_ENGINE_PARAMETER_SIGNATURE); + initSpeedDensity(PASS_ENGINE_PARAMETER_SIGNATURE); } void initAlgo(Logging *sharedLogger) { diff --git a/firmware/controllers/algo/algo.h b/firmware/controllers/algo/algo.h index 5bdd61cb0e..a01ae779b3 100644 --- a/firmware/controllers/algo/algo.h +++ b/firmware/controllers/algo/algo.h @@ -10,7 +10,7 @@ #include "main.h" #include "engine_configuration.h" -void initDataStructures(DECLARE_ENGINE_PARAMETER_F); +void initDataStructures(DECLARE_ENGINE_PARAMETER_SIGNATURE); void initAlgo(Logging *sharedLogger); #endif /* ALGO_H_ */ diff --git a/firmware/controllers/algo/aux_pid.cpp b/firmware/controllers/algo/aux_pid.cpp index eabb9426c2..bac177d291 100644 --- a/firmware/controllers/algo/aux_pid.cpp +++ b/firmware/controllers/algo/aux_pid.cpp @@ -81,8 +81,8 @@ static msg_t auxPidThread(int param) { } - float value = engine->triggerCentral.vvtPosition; // getVBatt(PASS_ENGINE_PARAMETER_F); // that's temporary - float targetValue = fsioTable1.getValue(rpm, getEngineLoadT(PASS_ENGINE_PARAMETER_F)); + float value = engine->triggerCentral.vvtPosition; // getVBatt(PASS_ENGINE_PARAMETER_SIGNATURE); // that's temporary + float targetValue = fsioTable1.getValue(rpm, getEngineLoadT(PASS_ENGINE_PARAMETER_SIGNATURE)); float pwm = auxPid.getValue(targetValue, value); if (engineConfiguration->isVerboseAuxPid1) { diff --git a/firmware/controllers/algo/engine.h b/firmware/controllers/algo/engine.h index 6d235d2265..eef965236d 100644 --- a/firmware/controllers/algo/engine.h +++ b/firmware/controllers/algo/engine.h @@ -43,8 +43,8 @@ public: /** * this method schedules all fuel events for an engine cycle */ - void addFuelEvents(DECLARE_ENGINE_PARAMETER_F); - bool addFuelEventsForCylinder(int i DECLARE_ENGINE_PARAMETER_S); + void addFuelEvents(DECLARE_ENGINE_PARAMETER_SIGNATURE); + bool addFuelEventsForCylinder(int i DECLARE_ENGINE_PARAMETER_SUFFIX); InjectionEvent elements[MAX_INJECTION_OUTPUT_COUNT]; bool isReady; @@ -94,8 +94,8 @@ public: class EngineState { public: EngineState(); - void periodicFastCallback(DECLARE_ENGINE_PARAMETER_F); - void updateSlowSensors(DECLARE_ENGINE_PARAMETER_F); + void periodicFastCallback(DECLARE_ENGINE_PARAMETER_SIGNATURE); + void updateSlowSensors(DECLARE_ENGINE_PARAMETER_SIGNATURE); efitick_t crankingTime; @@ -243,7 +243,7 @@ public: Engine(); void setConfig(persistent_config_s *config); void reset(); - injection_mode_e getCurrentInjectionMode(DECLARE_ENGINE_PARAMETER_F); + injection_mode_e getCurrentInjectionMode(DECLARE_ENGINE_PARAMETER_SIGNATURE); OutputSignalPair fuelActuators[INJECTION_PIN_COUNT]; IgnitionEventList ignitionEvents; @@ -324,8 +324,8 @@ public: */ floatms_t actualLastInjection; - void periodicFastCallback(DECLARE_ENGINE_PARAMETER_F); - void updateSlowSensors(DECLARE_ENGINE_PARAMETER_F); + void periodicFastCallback(DECLARE_ENGINE_PARAMETER_SIGNATURE); + void updateSlowSensors(DECLARE_ENGINE_PARAMETER_SIGNATURE); bool clutchUpState; bool clutchDownState; @@ -436,17 +436,17 @@ private: class StartupFuelPumping { public: StartupFuelPumping(); - void update(DECLARE_ENGINE_PARAMETER_F); + void update(DECLARE_ENGINE_PARAMETER_SIGNATURE); bool isTpsAbove50; int pumpsCounter; private: void setPumpsCounter(int newValue); }; -void prepareShapes(DECLARE_ENGINE_PARAMETER_F); -void resetConfigurationExt(Logging * logger, engine_type_e engineType DECLARE_ENGINE_PARAMETER_S); -void applyNonPersistentConfiguration(Logging * logger DECLARE_ENGINE_PARAMETER_S); -void prepareOutputSignals(DECLARE_ENGINE_PARAMETER_F); -void assertEngineReference(DECLARE_ENGINE_PARAMETER_F); +void prepareShapes(DECLARE_ENGINE_PARAMETER_SIGNATURE); +void resetConfigurationExt(Logging * logger, engine_type_e engineType DECLARE_ENGINE_PARAMETER_SUFFIX); +void applyNonPersistentConfiguration(Logging * logger DECLARE_ENGINE_PARAMETER_SUFFIX); +void prepareOutputSignals(DECLARE_ENGINE_PARAMETER_SIGNATURE); +void assertEngineReference(DECLARE_ENGINE_PARAMETER_SIGNATURE); #endif /* H_ENGINE_H_ */ diff --git a/firmware/controllers/algo/engine_configuration.h b/firmware/controllers/algo/engine_configuration.h index a901143123..adad2b3a20 100644 --- a/firmware/controllers/algo/engine_configuration.h +++ b/firmware/controllers/algo/engine_configuration.h @@ -42,19 +42,19 @@ typedef struct { } persistent_config_container_s; void prepareVoidConfiguration(engine_configuration_s *activeConfiguration); -void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_F); +void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE); void setAfrMap(afr_table_t table, float value); void setMap(fuel_table_t table, float value); -void setWholeFuelMap(float value DECLARE_ENGINE_PARAMETER_S); -void setWholeIgnitionIatCorr(float value DECLARE_ENGINE_PARAMETER_S); -void setFuelTablesLoadBin(float minValue, float maxValue DECLARE_ENGINE_PARAMETER_S); -void setWholeIatCorrTimingTable(float value DECLARE_ENGINE_PARAMETER_S); -void setWholeTimingTable(angle_t value DECLARE_ENGINE_PARAMETER_S); -void setConstantDwell(floatms_t dwellMs DECLARE_ENGINE_PARAMETER_S); +void setWholeFuelMap(float value DECLARE_ENGINE_PARAMETER_SUFFIX); +void setWholeIgnitionIatCorr(float value DECLARE_ENGINE_PARAMETER_SUFFIX); +void setFuelTablesLoadBin(float minValue, float maxValue DECLARE_ENGINE_PARAMETER_SUFFIX); +void setWholeIatCorrTimingTable(float value DECLARE_ENGINE_PARAMETER_SUFFIX); +void setWholeTimingTable(angle_t value DECLARE_ENGINE_PARAMETER_SUFFIX); +void setConstantDwell(floatms_t dwellMs DECLARE_ENGINE_PARAMETER_SUFFIX); void printFloatArray(const char *prefix, float array[], int size); void rememberCurrentConfiguration(void); -void incrementGlobalConfigurationVersion(DECLARE_ENGINE_PARAMETER_F); +void incrementGlobalConfigurationVersion(DECLARE_ENGINE_PARAMETER_SIGNATURE); int getGlobalConfigurationVersion(void); void commonFrankensoAnalogInputs(engine_configuration_s *engineConfiguration); diff --git a/firmware/controllers/algo/fuel_math.h b/firmware/controllers/algo/fuel_math.h index 6de6894e71..5d0e30be3a 100644 --- a/firmware/controllers/algo/fuel_math.h +++ b/firmware/controllers/algo/fuel_math.h @@ -10,31 +10,31 @@ #include "engine.h" -void prepareFuelMap(DECLARE_ENGINE_PARAMETER_F); +void prepareFuelMap(DECLARE_ENGINE_PARAMETER_SIGNATURE); /** * @return total injection time into all cylinders, before CLT & IAT corrections */ -floatms_t getBaseFuel(int rpm DECLARE_ENGINE_PARAMETER_S); +floatms_t getBaseFuel(int rpm DECLARE_ENGINE_PARAMETER_SUFFIX); /** * @return baseFuel with CLT and IAT corrections */ -floatms_t getRunningFuel(floatms_t baseFuel DECLARE_ENGINE_PARAMETER_S); +floatms_t getRunningFuel(floatms_t baseFuel DECLARE_ENGINE_PARAMETER_SUFFIX); -floatms_t getRealMafFuel(float airMass, int rpm DECLARE_ENGINE_PARAMETER_S); +floatms_t getRealMafFuel(float airMass, int rpm DECLARE_ENGINE_PARAMETER_SUFFIX); floatms_t getBaseTableFuel(int rpm, float engineLoad); -float getBaroCorrection(DECLARE_ENGINE_PARAMETER_F); -int getNumberOfInjections(injection_mode_e mode DECLARE_ENGINE_PARAMETER_S); -angle_t getinjectionOffset(float rpm DECLARE_ENGINE_PARAMETER_S); -float getIatFuelCorrection(float iat DECLARE_ENGINE_PARAMETER_S); -floatms_t getInjectorLag(float vBatt DECLARE_ENGINE_PARAMETER_S); -float getCltFuelCorrection(DECLARE_ENGINE_PARAMETER_F); -angle_t getCltTimingCorrection(DECLARE_ENGINE_PARAMETER_F); -floatms_t getCrankingFuel(DECLARE_ENGINE_PARAMETER_F); -floatms_t getCrankingFuel3(float coolantTemperature, uint32_t revolutionCounterSinceStart DECLARE_ENGINE_PARAMETER_S); -floatms_t getInjectionDuration(int rpm DECLARE_ENGINE_PARAMETER_S); -percent_t getInjectorDutyCycle(int rpm DECLARE_ENGINE_PARAMETER_S); +float getBaroCorrection(DECLARE_ENGINE_PARAMETER_SIGNATURE); +int getNumberOfInjections(injection_mode_e mode DECLARE_ENGINE_PARAMETER_SUFFIX); +angle_t getinjectionOffset(float rpm DECLARE_ENGINE_PARAMETER_SUFFIX); +float getIatFuelCorrection(float iat DECLARE_ENGINE_PARAMETER_SUFFIX); +floatms_t getInjectorLag(float vBatt DECLARE_ENGINE_PARAMETER_SUFFIX); +float getCltFuelCorrection(DECLARE_ENGINE_PARAMETER_SIGNATURE); +angle_t getCltTimingCorrection(DECLARE_ENGINE_PARAMETER_SIGNATURE); +floatms_t getCrankingFuel(DECLARE_ENGINE_PARAMETER_SIGNATURE); +floatms_t getCrankingFuel3(float coolantTemperature, uint32_t revolutionCounterSinceStart DECLARE_ENGINE_PARAMETER_SUFFIX); +floatms_t getInjectionDuration(int rpm DECLARE_ENGINE_PARAMETER_SUFFIX); +percent_t getInjectorDutyCycle(int rpm DECLARE_ENGINE_PARAMETER_SUFFIX); #endif /* FUEL_MAP_H_ */ diff --git a/firmware/controllers/algo/idle_controller.h b/firmware/controllers/algo/idle_controller.h index 987d56b885..0f08ad5626 100644 --- a/firmware/controllers/algo/idle_controller.h +++ b/firmware/controllers/algo/idle_controller.h @@ -21,9 +21,9 @@ class IdleValveState { public: IdleValveState(); - void init(DECLARE_ENGINE_PARAMETER_F); + void init(DECLARE_ENGINE_PARAMETER_SIGNATURE); void setTargetRpm(int targetRpm); - percent_t getIdle(int currentRpm, efitimems_t now DECLARE_ENGINE_PARAMETER_S); + percent_t getIdle(int currentRpm, efitimems_t now DECLARE_ENGINE_PARAMETER_SUFFIX); int time; diff --git a/firmware/controllers/alternatorController.cpp b/firmware/controllers/alternatorController.cpp index 787bd1fc78..c501699a20 100644 --- a/firmware/controllers/alternatorController.cpp +++ b/firmware/controllers/alternatorController.cpp @@ -85,7 +85,7 @@ static msg_t AltCtrlThread(int param) { continue; } - float vBatt = getVBatt(PASS_ENGINE_PARAMETER_F); + float vBatt = getVBatt(PASS_ENGINE_PARAMETER_SIGNATURE); float targetVoltage = engineConfiguration->targetVBatt; if (boardConfiguration->onOffAlternatorLogic) { @@ -123,7 +123,7 @@ void showAltInfo(void) { engineConfiguration->alternatorDT); scheduleMsg(logger, "p=%f/i=%f/d=%f offset=%f", engineConfiguration->alternatorControl.pFactor, 0, 0, engineConfiguration->alternatorControl.offset); // todo: i & d - scheduleMsg(logger, "vbatt=%f/duty=%f/target=%f", getVBatt(PASS_ENGINE_PARAMETER_F), currentAltDuty, + scheduleMsg(logger, "vbatt=%f/duty=%f/target=%f", getVBatt(PASS_ENGINE_PARAMETER_SIGNATURE), currentAltDuty, engineConfiguration->targetVBatt); } diff --git a/firmware/controllers/core/fsio_impl.h b/firmware/controllers/core/fsio_impl.h index c7b44905bf..742f6c42f1 100644 --- a/firmware/controllers/core/fsio_impl.h +++ b/firmware/controllers/core/fsio_impl.h @@ -19,11 +19,11 @@ typedef Map3D fsio8_Map3D_u8t; float getLEValue(Engine *engine, calc_stack_t *s, le_action_e action); -void setFsio(int index, brain_pin_e pin, const char * exp DECLARE_ENGINE_PARAMETER_S); -void setFsioExt(int index, brain_pin_e pin, const char * exp, int freq DECLARE_ENGINE_PARAMETER_S); +void setFsio(int index, brain_pin_e pin, const char * exp DECLARE_ENGINE_PARAMETER_SUFFIX); +void setFsioExt(int index, brain_pin_e pin, const char * exp, int freq DECLARE_ENGINE_PARAMETER_SUFFIX); -void initFsioImpl(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_S); +void initFsioImpl(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX); void runFsio(void); -void applyFsioConfiguration(DECLARE_ENGINE_PARAMETER_F); +void applyFsioConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE); #endif /* LE_FUNCTIONS_H_ */ diff --git a/firmware/controllers/electronic_throttle.cpp b/firmware/controllers/electronic_throttle.cpp index d08bc6a223..2a08ad034a 100644 --- a/firmware/controllers/electronic_throttle.cpp +++ b/firmware/controllers/electronic_throttle.cpp @@ -72,7 +72,7 @@ static bool wasEtbBraking = false; static msg_t etbThread(void *arg) { UNUSED(arg); while (true) { - percent_t pedal = getPedalPosition(PASS_ENGINE_PARAMETER_F); + percent_t pedal = getPedalPosition(PASS_ENGINE_PARAMETER_SIGNATURE); percent_t tps = getTPS(); currentEtbDuty = pid.getValue(pedal, getTPS()); diff --git a/firmware/controllers/engine_controller.h b/firmware/controllers/engine_controller.h index a7f13022b0..015ed070bc 100644 --- a/firmware/controllers/engine_controller.h +++ b/firmware/controllers/engine_controller.h @@ -15,9 +15,9 @@ #include "engine.h" char * getPinNameByAdcChannel(const char *msg, adc_channel_e hwChannel, char *buffer); -void initPeriodicEvents(DECLARE_ENGINE_PARAMETER_F); -void initEngineContoller(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_S); -void commonInitEngineController(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_S); +void initPeriodicEvents(DECLARE_ENGINE_PARAMETER_SIGNATURE); +void initEngineContoller(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX); +void commonInitEngineController(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX); void setVBattVoltage(float voltage); void setMapVoltage(float voltage); diff --git a/firmware/controllers/lcd_controller.cpp b/firmware/controllers/lcd_controller.cpp index d858bf88b9..126af39358 100644 --- a/firmware/controllers/lcd_controller.cpp +++ b/firmware/controllers/lcd_controller.cpp @@ -119,7 +119,7 @@ void initLcdController(void) { static char * prepareVBattMapLine(char *buffer) { char *ptr = buffer; *ptr++ = 'V'; - ptr = ftoa(ptr, getVBatt(PASS_ENGINE_PARAMETER_F), 10.0f); + ptr = ftoa(ptr, getVBatt(PASS_ENGINE_PARAMETER_SIGNATURE), 10.0f); ptr = appendStr(ptr, " M"); ptr = ftoa(ptr, getRawMap(), 10.0f); @@ -131,7 +131,7 @@ static char * prepareCltIatTpsLine(char *buffer) { *ptr++ = 'C'; ptr = appendStr(ptr, " TP"); - ptr = itoa10(ptr, (int) getTPS(PASS_ENGINE_PARAMETER_F)); + ptr = itoa10(ptr, (int) getTPS(PASS_ENGINE_PARAMETER_SIGNATURE)); return ptr; } @@ -232,10 +232,10 @@ static void showLine(lcd_line_e line, int screenY) { #endif return; case LL_CLT_TEMPERATURE: - lcdPrintf("Coolant %f", getCoolantTemperature(PASS_ENGINE_PARAMETER_F)); + lcdPrintf("Coolant %f", getCoolantTemperature(PASS_ENGINE_PARAMETER_SIGNATURE)); return; case LL_IAT_TEMPERATURE: - lcdPrintf("Intake Air %f", getIntakeAirTemperature(PASS_ENGINE_PARAMETER_F)); + lcdPrintf("Intake Air %f", getIntakeAirTemperature(PASS_ENGINE_PARAMETER_SIGNATURE)); return; case LL_ALGORITHM: lcdPrintf(getEngine_load_mode_e(engineConfiguration->fuelAlgorithm)); @@ -255,11 +255,11 @@ static void showLine(lcd_line_e line, int screenY) { lcdPrintf("Throttle %s %f%%", buffer, getTPS()); return; case LL_FUEL_CLT_CORRECTION: - lcdPrintf("CLT corr %fv", getCltFuelCorrection(PASS_ENGINE_PARAMETER_F)); + lcdPrintf("CLT corr %fv", getCltFuelCorrection(PASS_ENGINE_PARAMETER_SIGNATURE)); return; case LL_VBATT: - lcdPrintf("Battery %fv", getVBatt(PASS_ENGINE_PARAMETER_F)); + lcdPrintf("Battery %fv", getVBatt(PASS_ENGINE_PARAMETER_SIGNATURE)); return; case LL_KNOCK: getPinNameByAdcChannel("hip", engineConfiguration->hipOutputChannel, buffer); @@ -276,14 +276,14 @@ static void showLine(lcd_line_e line, int screenY) { return; #endif case LL_AFR: - if (hasAfrSensor(PASS_ENGINE_PARAMETER_F)) { + if (hasAfrSensor(PASS_ENGINE_PARAMETER_SIGNATURE)) { lcdPrintf("AFR: %f", getAfr()); } else { lcdPrintf("AFR: none"); } return; case LL_MAP: - if (hasMapSensor(PASS_ENGINE_PARAMETER_F)) { + if (hasMapSensor(PASS_ENGINE_PARAMETER_SIGNATURE)) { lcdPrintf("MAP %f", getMap()); } else { lcdPrintf("MAP: none"); @@ -291,14 +291,14 @@ static void showLine(lcd_line_e line, int screenY) { return; case LL_MAF_V: if (hasMafSensor()) { - lcdPrintf("MAF: %fv", getMaf(PASS_ENGINE_PARAMETER_F)); + lcdPrintf("MAF: %fv", getMaf(PASS_ENGINE_PARAMETER_SIGNATURE)); } else { lcdPrintf("MAF: none"); } return; case LL_MAF_KG_HR: if (hasMafSensor()) { - lcdPrintf("MAF: %f kg/hr", getRealMaf(PASS_ENGINE_PARAMETER_F)); + lcdPrintf("MAF: %f kg/hr", getRealMaf(PASS_ENGINE_PARAMETER_SIGNATURE)); } else { lcdPrintf("MAF: none"); } diff --git a/firmware/controllers/math/biquad.cpp b/firmware/controllers/math/biquad.cpp index c73c9ef59c..0d3d52d96a 100644 --- a/firmware/controllers/math/biquad.cpp +++ b/firmware/controllers/math/biquad.cpp @@ -14,7 +14,7 @@ Biquad::Biquad() { z1 = z2 = 0; } -void Biquad::initValue(float input DECLARE_ENGINE_PARAMETER_S) { +void Biquad::initValue(float input DECLARE_ENGINE_PARAMETER_SUFFIX) { a0 = engineConfiguration->biQuad.a0; a1 = engineConfiguration->biQuad.a1; a2 = engineConfiguration->biQuad.a2; diff --git a/firmware/controllers/math/biquad.h b/firmware/controllers/math/biquad.h index 3ddcec330b..6badcff1a7 100644 --- a/firmware/controllers/math/biquad.h +++ b/firmware/controllers/math/biquad.h @@ -13,7 +13,7 @@ class Biquad { public: Biquad(); - void initValue(float input DECLARE_ENGINE_PARAMETER_S); + void initValue(float input DECLARE_ENGINE_PARAMETER_SUFFIX); float getValue(float input); float a0, a1, a2, b1, b2; diff --git a/firmware/controllers/math/engine_math.h b/firmware/controllers/math/engine_math.h index ab0179bd7e..308e20087e 100644 --- a/firmware/controllers/math/engine_math.h +++ b/firmware/controllers/math/engine_math.h @@ -14,7 +14,7 @@ #include "table_helper.h" #include "engine.h" -void setAlgorithm(engine_load_mode_e algo DECLARE_ENGINE_PARAMETER_S); +void setAlgorithm(engine_load_mode_e algo DECLARE_ENGINE_PARAMETER_SUFFIX); #if EFI_ENABLE_ASSERTS @@ -23,7 +23,7 @@ void setAlgorithm(engine_load_mode_e algo DECLARE_ENGINE_PARAMETER_S); #define assertAngleRange(angle, msg) {} #endif -void setInjectorLag(float value DECLARE_ENGINE_PARAMETER_S); +void setInjectorLag(float value DECLARE_ENGINE_PARAMETER_SUFFIX); /** @@ -61,20 +61,20 @@ void setInjectorLag(float value DECLARE_ENGINE_PARAMETER_S); #define getOneDegreeTimeNt(rpm) (US2NT(1000000) * 60.0f / 360 / (rpm)) floatms_t getCrankshaftRevolutionTimeMs(int rpm); -floatms_t getEngineCycleDuration(int rpm DECLARE_ENGINE_PARAMETER_S); +floatms_t getEngineCycleDuration(int rpm DECLARE_ENGINE_PARAMETER_SUFFIX); #define isCrankingR(rpm) ((rpm) > 0 && (rpm) < CONFIG(cranking.rpm)) -float getEngineLoadT(DECLARE_ENGINE_PARAMETER_F); +float getEngineLoadT(DECLARE_ENGINE_PARAMETER_SIGNATURE); -floatms_t getSparkDwell(int rpm DECLARE_ENGINE_PARAMETER_S); +floatms_t getSparkDwell(int rpm DECLARE_ENGINE_PARAMETER_SUFFIX); -int getCylinderId(int index DECLARE_ENGINE_PARAMETER_S); +int getCylinderId(int index DECLARE_ENGINE_PARAMETER_SUFFIX); -void setFuelRpmBin(float from, float to DECLARE_ENGINE_PARAMETER_S); -void setFuelLoadBin(float from, float to DECLARE_ENGINE_PARAMETER_S); -void setTimingRpmBin(float from, float to DECLARE_ENGINE_PARAMETER_S); -void setTimingLoadBin(float from, float to DECLARE_ENGINE_PARAMETER_S); +void setFuelRpmBin(float from, float to DECLARE_ENGINE_PARAMETER_SUFFIX); +void setFuelLoadBin(float from, float to DECLARE_ENGINE_PARAMETER_SUFFIX); +void setTimingRpmBin(float from, float to DECLARE_ENGINE_PARAMETER_SUFFIX); +void setTimingLoadBin(float from, float to DECLARE_ENGINE_PARAMETER_SUFFIX); void setSingleCoilDwell(engine_configuration_s *engineConfiguration); diff --git a/firmware/controllers/math/speed_density.cpp b/firmware/controllers/math/speed_density.cpp index 261dc02d90..0041dd0de5 100644 --- a/firmware/controllers/math/speed_density.cpp +++ b/firmware/controllers/math/speed_density.cpp @@ -27,7 +27,7 @@ baroCorr_Map3D_t baroCorrMap("baro"); #define tpMin 0 #define tpMax 100 // http://rusefi.com/math/t_charge.html -float getTCharge(int rpm, float tps, float coolantTemp, float airTemp DECLARE_ENGINE_PARAMETER_S) { +float getTCharge(int rpm, float tps, float coolantTemp, float airTemp DECLARE_ENGINE_PARAMETER_SUFFIX) { float minRpmKcurrentTPS = interpolate(tpMin, engineConfiguration->tChargeMinRpmMinTps, tpMax, engineConfiguration->tChargeMinRpmMaxTps, tps); float maxRpmKcurrentTPS = interpolate(tpMin, engineConfiguration->tChargeMaxRpmMinTps, tpMax, @@ -81,7 +81,7 @@ EXTERN_ENGINE; /** * @return per cylinder injection time, in Milliseconds */ -floatms_t getSpeedDensityFuel(DECLARE_ENGINE_PARAMETER_F) { +floatms_t getSpeedDensityFuel(DECLARE_ENGINE_PARAMETER_SIGNATURE) { /** * most of the values are pre-calculated for performance reasons */ @@ -93,7 +93,7 @@ floatms_t getSpeedDensityFuel(DECLARE_ENGINE_PARAMETER_F) { float map = getMap(); efiAssert(!cisnan(map), "NaN map", 0); - float adjustedMap = map + engine->engineLoadAccelEnrichment.getEngineLoadEnrichment(PASS_ENGINE_PARAMETER_F); + float adjustedMap = map + engine->engineLoadAccelEnrichment.getEngineLoadEnrichment(PASS_ENGINE_PARAMETER_SIGNATURE); efiAssert(!cisnan(adjustedMap), "NaN adjustedMap", 0); float airMass = getAirMass(engineConfiguration, ENGINE(engineState.currentVE), adjustedMap, tChargeK); @@ -114,7 +114,7 @@ static const baro_corr_table_t default_baro_corr = { {1.141, 1.086, 1.039, 1} }; -void setDefaultVETable(DECLARE_ENGINE_PARAMETER_F) { +void setDefaultVETable(DECLARE_ENGINE_PARAMETER_SIGNATURE) { setRpmTableBin(config->veRpmBins, FUEL_RPM_COUNT); veMap.setAll(80); @@ -130,7 +130,7 @@ void setDefaultVETable(DECLARE_ENGINE_PARAMETER_F) { memcpy(engineConfiguration->baroCorrTable, default_baro_corr, sizeof(default_baro_corr)); } -void initSpeedDensity(DECLARE_ENGINE_PARAMETER_F) { +void initSpeedDensity(DECLARE_ENGINE_PARAMETER_SIGNATURE) { veMap.init(config->veTable, config->veLoadBins, config->veRpmBins); // ve2Map.init(engineConfiguration->ve2Table, engineConfiguration->ve2LoadBins, engineConfiguration->ve2RpmBins); afrMap.init(config->afrTable, config->afrLoadBins, config->afrRpmBins); diff --git a/firmware/controllers/math/speed_density.h b/firmware/controllers/math/speed_density.h index 12f9407198..78d815f970 100644 --- a/firmware/controllers/math/speed_density.h +++ b/firmware/controllers/math/speed_density.h @@ -9,7 +9,7 @@ #include "engine.h" -float getTCharge(int rpm, float tps, float coolantTemp, float airTemp DECLARE_ENGINE_PARAMETER_S); +float getTCharge(int rpm, float tps, float coolantTemp, float airTemp DECLARE_ENGINE_PARAMETER_SUFFIX); void setDetaultVETable(persistent_config_s *config); float getAirMass(engine_configuration_s *engineConfiguration, float VE, float MAP, float tempK); float sdMath(engine_configuration_s *engineConfiguration, float airMass, float AFR); @@ -18,8 +18,8 @@ float sdMath(engine_configuration_s *engineConfiguration, float airMass, float A #define cc_minute_to_gramm_second(ccm) ((ccm) * 0.0119997981) -void setDefaultVETable(DECLARE_ENGINE_PARAMETER_F); -void initSpeedDensity(DECLARE_ENGINE_PARAMETER_F); -floatms_t getSpeedDensityFuel(DECLARE_ENGINE_PARAMETER_F); +void setDefaultVETable(DECLARE_ENGINE_PARAMETER_SIGNATURE); +void initSpeedDensity(DECLARE_ENGINE_PARAMETER_SIGNATURE); +floatms_t getSpeedDensityFuel(DECLARE_ENGINE_PARAMETER_SIGNATURE); #endif /* SPEED_DENSITY_H_ */ diff --git a/firmware/controllers/sensors/allsensors.h b/firmware/controllers/sensors/allsensors.h index 53a1bcbcfa..c88c90ba70 100644 --- a/firmware/controllers/sensors/allsensors.h +++ b/firmware/controllers/sensors/allsensors.h @@ -25,8 +25,8 @@ #include "adc_math.h" #endif -void initSensors(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_S); +void initSensors(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX); -bool getAcToggle(DECLARE_ENGINE_PARAMETER_F); +bool getAcToggle(DECLARE_ENGINE_PARAMETER_SIGNATURE); #endif /*SENSORS_H_*/ diff --git a/firmware/controllers/sensors/ego.cpp b/firmware/controllers/sensors/ego.cpp index 89ad25fb87..724fcd4da2 100644 --- a/firmware/controllers/sensors/ego.cpp +++ b/firmware/controllers/sensors/ego.cpp @@ -8,11 +8,11 @@ EXTERN_ENGINE; -bool hasAfrSensor(DECLARE_ENGINE_PARAMETER_F) { +bool hasAfrSensor(DECLARE_ENGINE_PARAMETER_SIGNATURE) { return engineConfiguration->afr.hwChannel != EFI_ADC_NONE; } -float getAfr(DECLARE_ENGINE_PARAMETER_F) { +float getAfr(DECLARE_ENGINE_PARAMETER_SIGNATURE) { afr_sensor_s * sensor = &CONFIG(afr); float volts = getVoltageDivided("ego", sensor->hwChannel); @@ -65,7 +65,7 @@ static void initEgoSensor(afr_sensor_s *sensor, ego_sensor_e type) { } } -void setEgoSensor(ego_sensor_e type DECLARE_ENGINE_PARAMETER_S) { +void setEgoSensor(ego_sensor_e type DECLARE_ENGINE_PARAMETER_SUFFIX) { boardConfiguration->afr_type = type; initEgoSensor(&engineConfiguration->afr, type); } diff --git a/firmware/controllers/sensors/ego.h b/firmware/controllers/sensors/ego.h index 2930291fd8..652343d69a 100644 --- a/firmware/controllers/sensors/ego.h +++ b/firmware/controllers/sensors/ego.h @@ -14,8 +14,8 @@ #include "rusefi_enums.h" #include "engine_configuration.h" -float getAfr(DECLARE_ENGINE_PARAMETER_F); -bool hasAfrSensor(DECLARE_ENGINE_PARAMETER_F); -void setEgoSensor(ego_sensor_e type DECLARE_ENGINE_PARAMETER_S); +float getAfr(DECLARE_ENGINE_PARAMETER_SIGNATURE); +bool hasAfrSensor(DECLARE_ENGINE_PARAMETER_SIGNATURE); +void setEgoSensor(ego_sensor_e type DECLARE_ENGINE_PARAMETER_SUFFIX); #endif diff --git a/firmware/controllers/sensors/hip9011_lookup.cpp b/firmware/controllers/sensors/hip9011_lookup.cpp index bfa467a4c5..3c24fca0f3 100644 --- a/firmware/controllers/sensors/hip9011_lookup.cpp +++ b/firmware/controllers/sensors/hip9011_lookup.cpp @@ -84,7 +84,7 @@ int getHip9011BandIndex(float frequency) { EXTERN_ENGINE; -void initEngineNoiseTable(DECLARE_ENGINE_PARAMETER_F) { +void initEngineNoiseTable(DECLARE_ENGINE_PARAMETER_SIGNATURE) { setRpmTableBin(engineConfiguration->knockNoiseRpmBins, ENGINE_NOISE_CURVE_SIZE); engineConfiguration->knockNoise[0] = 2; // 800 diff --git a/firmware/controllers/sensors/hip9011_lookup.h b/firmware/controllers/sensors/hip9011_lookup.h index d866218334..47f9a4effc 100644 --- a/firmware/controllers/sensors/hip9011_lookup.h +++ b/firmware/controllers/sensors/hip9011_lookup.h @@ -30,6 +30,6 @@ void prepareHip9011RpmLookup(float angleWindowWidth); extern float rpmLookup[INT_LOOKUP_SIZE]; int getIntegrationIndexByRpm(float rpm); -void initEngineNoiseTable(DECLARE_ENGINE_PARAMETER_F); +void initEngineNoiseTable(DECLARE_ENGINE_PARAMETER_SIGNATURE); #endif /* CONTROLLERS_SENSORS_HIP9011_LOOKUP_H_ */ diff --git a/firmware/controllers/sensors/maf.cpp b/firmware/controllers/sensors/maf.cpp index 39606648a0..7eb249e3e7 100644 --- a/firmware/controllers/sensors/maf.cpp +++ b/firmware/controllers/sensors/maf.cpp @@ -9,18 +9,18 @@ EXTERN_ENGINE /** * @return MAF sensor voltage */ -float getMaf(DECLARE_ENGINE_PARAMETER_F) { +float getMaf(DECLARE_ENGINE_PARAMETER_SIGNATURE) { return getMafT(engineConfiguration); } -bool hasMafSensor(DECLARE_ENGINE_PARAMETER_F) { +bool hasMafSensor(DECLARE_ENGINE_PARAMETER_SIGNATURE) { return engineConfiguration->mafAdcChannel != EFI_ADC_NONE; } /** * @return kg/hour value */ -float getRealMaf(DECLARE_ENGINE_PARAMETER_F) { +float getRealMaf(DECLARE_ENGINE_PARAMETER_SIGNATURE) { int mafAdc = getAdcValue("maf", engineConfiguration->mafAdcChannel); /** * here we drop from 12 bit ADC to 8 bit index diff --git a/firmware/controllers/sensors/maf.h b/firmware/controllers/sensors/maf.h index f853a68352..d3e5211ffe 100644 --- a/firmware/controllers/sensors/maf.h +++ b/firmware/controllers/sensors/maf.h @@ -15,9 +15,9 @@ #include "main.h" #define getMafT(ec) (getVoltageDivided("maf", ec->mafAdcChannel)) -float getMaf(DECLARE_ENGINE_PARAMETER_F); -bool hasMafSensor(DECLARE_ENGINE_PARAMETER_F); -float getRealMaf(DECLARE_ENGINE_PARAMETER_F); +float getMaf(DECLARE_ENGINE_PARAMETER_SIGNATURE); +bool hasMafSensor(DECLARE_ENGINE_PARAMETER_SIGNATURE); +float getRealMaf(DECLARE_ENGINE_PARAMETER_SIGNATURE); void setBosch0280218037(persistent_config_s *engineConfiguration); void setBosch0280218004(persistent_config_s *engineConfiguration); diff --git a/firmware/controllers/sensors/map.h b/firmware/controllers/sensors/map.h index 5578d30ac5..7ad5ebcab5 100644 --- a/firmware/controllers/sensors/map.h +++ b/firmware/controllers/sensors/map.h @@ -7,24 +7,24 @@ #include "engine_configuration.h" #include "sensor_types.h" -void initMapDecoder(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_S); +void initMapDecoder(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX); /** * @return Raw MAP sensor value right now */ -float getRawMap(DECLARE_ENGINE_PARAMETER_F); -float getBaroPressure(DECLARE_ENGINE_PARAMETER_F); -bool hasBaroSensor(DECLARE_ENGINE_PARAMETER_F); -bool hasMapSensor(DECLARE_ENGINE_PARAMETER_F); +float getRawMap(DECLARE_ENGINE_PARAMETER_SIGNATURE); +float getBaroPressure(DECLARE_ENGINE_PARAMETER_SIGNATURE); +bool hasBaroSensor(DECLARE_ENGINE_PARAMETER_SIGNATURE); +bool hasMapSensor(DECLARE_ENGINE_PARAMETER_SIGNATURE); /** * @return MAP value averaged within a window of measurement */ float getMap(void); float getMapVoltage(void); -float getMapByVoltage(float voltage DECLARE_ENGINE_PARAMETER_S); -float decodePressure(float voltage, air_pressure_sensor_config_s * mapConfig DECLARE_ENGINE_PARAMETER_S); -float validateMap(float mapKPa DECLARE_ENGINE_PARAMETER_S); +float getMapByVoltage(float voltage DECLARE_ENGINE_PARAMETER_SUFFIX); +float decodePressure(float voltage, air_pressure_sensor_config_s * mapConfig DECLARE_ENGINE_PARAMETER_SUFFIX); +float validateMap(float mapKPa DECLARE_ENGINE_PARAMETER_SUFFIX); #define INHG2KPA(inhg) ((inhg * 3.386375)) #define KPA2INHG(kpa) ((kpa) / 3.386375) diff --git a/firmware/controllers/sensors/thermistors.cpp b/firmware/controllers/sensors/thermistors.cpp index 880136e30e..d920cacd40 100644 --- a/firmware/controllers/sensors/thermistors.cpp +++ b/firmware/controllers/sensors/thermistors.cpp @@ -97,15 +97,15 @@ bool isValidIntakeAirTemperature(float temperature) { return !cisnan(temperature) && temperature > -50 && temperature < 100; } -bool hasCltSensor(DECLARE_ENGINE_PARAMETER_F) { +bool hasCltSensor(DECLARE_ENGINE_PARAMETER_SIGNATURE) { return engineConfiguration->clt.adcChannel != EFI_ADC_NONE; } /** * @return coolant temperature, in Celsius */ -float getCoolantTemperature(DECLARE_ENGINE_PARAMETER_F) { - if (!hasCltSensor(PASS_ENGINE_PARAMETER_F)) { +float getCoolantTemperature(DECLARE_ENGINE_PARAMETER_SIGNATURE) { + if (!hasCltSensor(PASS_ENGINE_PARAMETER_SIGNATURE)) { engine->isCltBroken = false; return NO_CLT_SENSOR_TEMPERATURE; } @@ -178,15 +178,15 @@ void ThermistorMath::prepareThermistorCurve(thermistor_conf_s *tc) { #endif } -bool hasIatSensor(DECLARE_ENGINE_PARAMETER_F) { +bool hasIatSensor(DECLARE_ENGINE_PARAMETER_SIGNATURE) { return engineConfiguration->iat.adcChannel != EFI_ADC_NONE; } /** * @return Celsius value */ -float getIntakeAirTemperature(DECLARE_ENGINE_PARAMETER_F) { - if (!hasIatSensor(PASS_ENGINE_PARAMETER_F)) { +float getIntakeAirTemperature(DECLARE_ENGINE_PARAMETER_SIGNATURE) { + if (!hasIatSensor(PASS_ENGINE_PARAMETER_SIGNATURE)) { return NO_IAT_SENSOR_TEMPERATURE; } float temperature = getTemperatureC(&engineConfiguration->iat, &engine->engineState.iatCurve); @@ -228,7 +228,7 @@ static void testCltByR(float resistance) { } #endif -void initThermistors(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_S) { +void initThermistors(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX) { logger = sharedLogger; efiAssertVoid(engine!=NULL, "e NULL initThermistors"); diff --git a/firmware/controllers/sensors/thermistors.h b/firmware/controllers/sensors/thermistors.h index 16deb491a7..9e049f2bee 100644 --- a/firmware/controllers/sensors/thermistors.h +++ b/firmware/controllers/sensors/thermistors.h @@ -33,19 +33,19 @@ float convertFtoCelcius(float tempF); float getKelvinTemperature(float resistance, ThermistorMath *tm); float getResistance(ThermistorConf *config, float voltage); float getTemperatureC(ThermistorConf *config, ThermistorMath *tm); -float getCoolantTemperature(DECLARE_ENGINE_PARAMETER_F); +float getCoolantTemperature(DECLARE_ENGINE_PARAMETER_SIGNATURE); bool isValidCoolantTemperature(float temperature); -float getIntakeAirTemperature(DECLARE_ENGINE_PARAMETER_F); +float getIntakeAirTemperature(DECLARE_ENGINE_PARAMETER_SIGNATURE); bool isValidIntakeAirTemperature(float temperature); -bool hasIatSensor(DECLARE_ENGINE_PARAMETER_F); -bool hasCltSensor(DECLARE_ENGINE_PARAMETER_F); +bool hasIatSensor(DECLARE_ENGINE_PARAMETER_SIGNATURE); +bool hasCltSensor(DECLARE_ENGINE_PARAMETER_SIGNATURE); void setThermistorConfiguration(ThermistorConf * tc, float temp1, float r1, float temp2, float r2, float temp3, float r3); class Engine; -void initThermistors(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_S); +void initThermistors(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX); void setCommonNTCSensor(ThermistorConf *thermistorConf); void setDodgeSensor(ThermistorConf *thermistorConf); diff --git a/firmware/controllers/sensors/tps.h b/firmware/controllers/sensors/tps.h index 5a895361b8..2b84a82730 100644 --- a/firmware/controllers/sensors/tps.h +++ b/firmware/controllers/sensors/tps.h @@ -16,19 +16,19 @@ // we have 12 bit precision and TS uses 10 bit precision #define TPS_TS_CONVERSION 4 -bool hasPedalPositionSensor(DECLARE_ENGINE_PARAMETER_F); -percent_t getPedalPosition(DECLARE_ENGINE_PARAMETER_F); +bool hasPedalPositionSensor(DECLARE_ENGINE_PARAMETER_SIGNATURE); +percent_t getPedalPosition(DECLARE_ENGINE_PARAMETER_SIGNATURE); /** * Throttle Position Sensor * In case of dual TPS this function would return logical TPS position * @return Current TPS position, percent of WOT. 0 means idle and 100 means Wide Open Throttle */ -percent_t getTPS(DECLARE_ENGINE_PARAMETER_F); -bool hasTpsSensor(DECLARE_ENGINE_PARAMETER_F); +percent_t getTPS(DECLARE_ENGINE_PARAMETER_SIGNATURE); +bool hasTpsSensor(DECLARE_ENGINE_PARAMETER_SIGNATURE); int convertVoltageTo10bitADC(float voltage); -int getTPS12bitAdc(DECLARE_ENGINE_PARAMETER_F); -float getTPSVoltage(DECLARE_ENGINE_PARAMETER_F); -percent_t getTpsValue(int adc DECLARE_ENGINE_PARAMETER_S); +int getTPS12bitAdc(DECLARE_ENGINE_PARAMETER_SIGNATURE); +float getTPSVoltage(DECLARE_ENGINE_PARAMETER_SIGNATURE); +percent_t getTpsValue(int adc DECLARE_ENGINE_PARAMETER_SUFFIX); typedef struct { efitimeus_t prevTime; diff --git a/firmware/controllers/sensors/voltage.cpp b/firmware/controllers/sensors/voltage.cpp index 32f7e3d676..700e10bc58 100644 --- a/firmware/controllers/sensors/voltage.cpp +++ b/firmware/controllers/sensors/voltage.cpp @@ -14,15 +14,15 @@ EXTERN_ENGINE; -float getVRef(DECLARE_ENGINE_PARAMETER_F) { +float getVRef(DECLARE_ENGINE_PARAMETER_SIGNATURE) { // not currently used return getVoltageDivided("vref", engineConfiguration->vRefAdcChannel); return NAN; } -bool hasVBatt(DECLARE_ENGINE_PARAMETER_F) { +bool hasVBatt(DECLARE_ENGINE_PARAMETER_SIGNATURE) { return engineConfiguration->vbattAdcChannel != EFI_ADC_NONE; } -float getVBatt(DECLARE_ENGINE_PARAMETER_F) { +float getVBatt(DECLARE_ENGINE_PARAMETER_SIGNATURE) { return getVoltage("vbatt", engineConfiguration->vbattAdcChannel) * engineConfiguration->vbattDividerCoeff; } diff --git a/firmware/controllers/sensors/voltage.h b/firmware/controllers/sensors/voltage.h index 198324f801..b6a7387377 100644 --- a/firmware/controllers/sensors/voltage.h +++ b/firmware/controllers/sensors/voltage.h @@ -13,8 +13,8 @@ #include "main.h" #include "engine_configuration.h" -float getVRef(DECLARE_ENGINE_PARAMETER_F); -float getVBatt(DECLARE_ENGINE_PARAMETER_F); -bool hasVBatt(DECLARE_ENGINE_PARAMETER_F); +float getVRef(DECLARE_ENGINE_PARAMETER_SIGNATURE); +float getVBatt(DECLARE_ENGINE_PARAMETER_SIGNATURE); +bool hasVBatt(DECLARE_ENGINE_PARAMETER_SIGNATURE); #endif diff --git a/firmware/controllers/tachometer.cpp b/firmware/controllers/tachometer.cpp index ace049d227..dc69f4fa49 100644 --- a/firmware/controllers/tachometer.cpp +++ b/firmware/controllers/tachometer.cpp @@ -22,7 +22,7 @@ static void turnTachPinLow(void) { } static void tachSignalCallback(trigger_event_e ckpSignalType, - uint32_t index DECLARE_ENGINE_PARAMETER_S) { + uint32_t index DECLARE_ENGINE_PARAMETER_SUFFIX) { if (index != engineConfiguration->tachPulseTriggerIndex) { return; } diff --git a/firmware/controllers/trigger/decoders/trigger_bmw.h b/firmware/controllers/trigger/decoders/trigger_bmw.h index d00d9501c7..04b5e056ee 100644 --- a/firmware/controllers/trigger/decoders/trigger_bmw.h +++ b/firmware/controllers/trigger/decoders/trigger_bmw.h @@ -9,6 +9,6 @@ #include "engine.h" -void configureMiniCooperTriggerShape(TriggerShape *s DECLARE_ENGINE_PARAMETER_S); +void configureMiniCooperTriggerShape(TriggerShape *s DECLARE_ENGINE_PARAMETER_SUFFIX); #endif /* TRIGGER_BMW_H_ */ diff --git a/firmware/controllers/trigger/decoders/trigger_chrysler.h b/firmware/controllers/trigger/decoders/trigger_chrysler.h index 47cb6b69d8..5ebff84ba6 100644 --- a/firmware/controllers/trigger/decoders/trigger_chrysler.h +++ b/firmware/controllers/trigger/decoders/trigger_chrysler.h @@ -13,13 +13,13 @@ #define CHRYSLER_NGC4_GAP 1 #define CHRYSLER_NGC6_GAP 1.5 -void configureNeon1995TriggerShape(TriggerShape *s DECLARE_ENGINE_PARAMETER_S); -void configureNeon2003TriggerShapeCam(TriggerShape *s DECLARE_ENGINE_PARAMETER_S); -void configureNeon2003TriggerShapeCrank(TriggerShape *s DECLARE_ENGINE_PARAMETER_S); -void initDodgeRam(TriggerShape *s DECLARE_ENGINE_PARAMETER_S); +void configureNeon1995TriggerShape(TriggerShape *s DECLARE_ENGINE_PARAMETER_SUFFIX); +void configureNeon2003TriggerShapeCam(TriggerShape *s DECLARE_ENGINE_PARAMETER_SUFFIX); +void configureNeon2003TriggerShapeCrank(TriggerShape *s DECLARE_ENGINE_PARAMETER_SUFFIX); +void initDodgeRam(TriggerShape *s DECLARE_ENGINE_PARAMETER_SUFFIX); -void configureDodgeStratusTriggerShape(TriggerShape *s DECLARE_ENGINE_PARAMETER_S); +void configureDodgeStratusTriggerShape(TriggerShape *s DECLARE_ENGINE_PARAMETER_SUFFIX); -void initJeep18_2_2_2(TriggerShape *s DECLARE_ENGINE_PARAMETER_S); +void initJeep18_2_2_2(TriggerShape *s DECLARE_ENGINE_PARAMETER_SUFFIX); #endif /* TRIGGER_CHRYSLER_H_ */ diff --git a/firmware/controllers/trigger/decoders/trigger_gm.h b/firmware/controllers/trigger/decoders/trigger_gm.h index 991fe8ba0f..d471bd3504 100644 --- a/firmware/controllers/trigger/decoders/trigger_gm.h +++ b/firmware/controllers/trigger/decoders/trigger_gm.h @@ -10,7 +10,7 @@ #include "trigger_structure.h" -void configureGmTriggerShape(TriggerShape *s DECLARE_ENGINE_PARAMETER_S); -void initGmLS24(TriggerShape *s DECLARE_ENGINE_PARAMETER_S); +void configureGmTriggerShape(TriggerShape *s DECLARE_ENGINE_PARAMETER_SUFFIX); +void initGmLS24(TriggerShape *s DECLARE_ENGINE_PARAMETER_SUFFIX); #endif /* TRIGGER_GM_H_ */ diff --git a/firmware/controllers/trigger/decoders/trigger_honda.h b/firmware/controllers/trigger/decoders/trigger_honda.h index 1922375865..dcb15f1c7b 100644 --- a/firmware/controllers/trigger/decoders/trigger_honda.h +++ b/firmware/controllers/trigger/decoders/trigger_honda.h @@ -10,17 +10,17 @@ #include "trigger_structure.h" -void configureHondaAccordCDDip(TriggerShape *s DECLARE_ENGINE_PARAMETER_S); -void configureHondaAccordShifted(TriggerShape *s DECLARE_ENGINE_PARAMETER_S); +void configureHondaAccordCDDip(TriggerShape *s DECLARE_ENGINE_PARAMETER_SUFFIX); +void configureHondaAccordShifted(TriggerShape *s DECLARE_ENGINE_PARAMETER_SUFFIX); void configureHonda_1_4_24(TriggerShape *s, bool withOneEventSignal, bool withFourEventSignal, trigger_wheel_e const oneEventWave, trigger_wheel_e const fourEventWave, - float d DECLARE_ENGINE_PARAMETER_S); + float d DECLARE_ENGINE_PARAMETER_SUFFIX); -void configureOnePlus16(TriggerShape *s, operation_mode_e operationMode DECLARE_ENGINE_PARAMETER_S); +void configureOnePlus16(TriggerShape *s, operation_mode_e operationMode DECLARE_ENGINE_PARAMETER_SUFFIX); -void configureHondaCbr600(TriggerShape *s DECLARE_ENGINE_PARAMETER_S); -void configureHondaCbr600custom(TriggerShape *s DECLARE_ENGINE_PARAMETER_S); +void configureHondaCbr600(TriggerShape *s DECLARE_ENGINE_PARAMETER_SUFFIX); +void configureHondaCbr600custom(TriggerShape *s DECLARE_ENGINE_PARAMETER_SUFFIX); #endif /* CONTROLLERS_TRIGGER_TRIGGER_HONDA_H_ */ diff --git a/firmware/controllers/trigger/decoders/trigger_mazda.h b/firmware/controllers/trigger/decoders/trigger_mazda.h index 431d7f05fc..d1423f439f 100644 --- a/firmware/controllers/trigger/decoders/trigger_mazda.h +++ b/firmware/controllers/trigger/decoders/trigger_mazda.h @@ -13,11 +13,11 @@ #define MIATA_NA_GAP 1.4930f -void initializeMazdaMiataNaShape(TriggerShape *s DECLARE_ENGINE_PARAMETER_S); -void initializeMazdaMiataNb1Shape(TriggerShape *s DECLARE_ENGINE_PARAMETER_S); -void initializeMazdaMiataNb2Crank(TriggerShape *s DECLARE_ENGINE_PARAMETER_S); -void initializeMazdaMiataVVtTestShape(TriggerShape *s DECLARE_ENGINE_PARAMETER_S); -void configureMazdaProtegeSOHC(TriggerShape *s DECLARE_ENGINE_PARAMETER_S); -void configureMazdaProtegeLx(TriggerShape *s DECLARE_ENGINE_PARAMETER_S); +void initializeMazdaMiataNaShape(TriggerShape *s DECLARE_ENGINE_PARAMETER_SUFFIX); +void initializeMazdaMiataNb1Shape(TriggerShape *s DECLARE_ENGINE_PARAMETER_SUFFIX); +void initializeMazdaMiataNb2Crank(TriggerShape *s DECLARE_ENGINE_PARAMETER_SUFFIX); +void initializeMazdaMiataVVtTestShape(TriggerShape *s DECLARE_ENGINE_PARAMETER_SUFFIX); +void configureMazdaProtegeSOHC(TriggerShape *s DECLARE_ENGINE_PARAMETER_SUFFIX); +void configureMazdaProtegeLx(TriggerShape *s DECLARE_ENGINE_PARAMETER_SUFFIX); #endif /* TRIGGER_MAZDA_H_ */ diff --git a/firmware/controllers/trigger/decoders/trigger_mitsubishi.h b/firmware/controllers/trigger/decoders/trigger_mitsubishi.h index b82fe89aaa..0ad68ce52a 100644 --- a/firmware/controllers/trigger/decoders/trigger_mitsubishi.h +++ b/firmware/controllers/trigger/decoders/trigger_mitsubishi.h @@ -9,7 +9,7 @@ #include "trigger_structure.h" -void initializeMitsubishi4g18(TriggerShape *s DECLARE_ENGINE_PARAMETER_S); -void configureFordAspireTriggerShape(TriggerShape * s DECLARE_ENGINE_PARAMETER_S); +void initializeMitsubishi4g18(TriggerShape *s DECLARE_ENGINE_PARAMETER_SUFFIX); +void configureFordAspireTriggerShape(TriggerShape * s DECLARE_ENGINE_PARAMETER_SUFFIX); #endif /* TRIGGER_MITSUBISHI_H_ */ diff --git a/firmware/controllers/trigger/decoders/trigger_nissan.h b/firmware/controllers/trigger/decoders/trigger_nissan.h index 5c7fc2ddf3..dd6f5467a8 100644 --- a/firmware/controllers/trigger/decoders/trigger_nissan.h +++ b/firmware/controllers/trigger/decoders/trigger_nissan.h @@ -10,7 +10,7 @@ #include "trigger_structure.h" -void initializeNissanSR20VE_4(TriggerShape *s DECLARE_ENGINE_PARAMETER_S); -void initializeNissanSR20VE_4_360(TriggerShape *s DECLARE_ENGINE_PARAMETER_S); +void initializeNissanSR20VE_4(TriggerShape *s DECLARE_ENGINE_PARAMETER_SUFFIX); +void initializeNissanSR20VE_4_360(TriggerShape *s DECLARE_ENGINE_PARAMETER_SUFFIX); #endif /* CONTROLLERS_TRIGGER_TRIGGER_NISSAN_H_ */ diff --git a/firmware/controllers/trigger/decoders/trigger_rover.h b/firmware/controllers/trigger/decoders/trigger_rover.h index 1f852393c1..0d7c9d06a6 100644 --- a/firmware/controllers/trigger/decoders/trigger_rover.h +++ b/firmware/controllers/trigger/decoders/trigger_rover.h @@ -11,6 +11,6 @@ #include "trigger_structure.h" -void initializeRoverK(TriggerShape *s DECLARE_ENGINE_PARAMETER_S); +void initializeRoverK(TriggerShape *s DECLARE_ENGINE_PARAMETER_SUFFIX); #endif /* CONTROLLERS_TRIGGER_TRIGGER_ROVER_H_ */ diff --git a/firmware/controllers/trigger/decoders/trigger_subaru.h b/firmware/controllers/trigger/decoders/trigger_subaru.h index 56bd18d9e6..7a4524968c 100644 --- a/firmware/controllers/trigger/decoders/trigger_subaru.h +++ b/firmware/controllers/trigger/decoders/trigger_subaru.h @@ -10,7 +10,7 @@ #include "engine.h" -void initialize36_2_2_2(TriggerShape *s DECLARE_ENGINE_PARAMETER_S); -void initializeSubaru7_6(TriggerShape *s DECLARE_ENGINE_PARAMETER_S); +void initialize36_2_2_2(TriggerShape *s DECLARE_ENGINE_PARAMETER_SUFFIX); +void initializeSubaru7_6(TriggerShape *s DECLARE_ENGINE_PARAMETER_SUFFIX); #endif /* CONTROLLERS_TRIGGER_TRIGGER_SUBARU_H_ */ diff --git a/firmware/controllers/trigger/decoders/trigger_toyota.h b/firmware/controllers/trigger/decoders/trigger_toyota.h index ef668dead9..7cc8b57b41 100644 --- a/firmware/controllers/trigger/decoders/trigger_toyota.h +++ b/firmware/controllers/trigger/decoders/trigger_toyota.h @@ -10,7 +10,7 @@ #include "engine.h" -void initialize2jzGE1_12(TriggerShape *s DECLARE_ENGINE_PARAMETER_S); -void initialize2jzGE3_34(TriggerShape *s DECLARE_ENGINE_PARAMETER_S); +void initialize2jzGE1_12(TriggerShape *s DECLARE_ENGINE_PARAMETER_SUFFIX); +void initialize2jzGE3_34(TriggerShape *s DECLARE_ENGINE_PARAMETER_SUFFIX); #endif /* CONTROLLERS_TRIGGER_TRIGGER_TOYOTA_H_ */ diff --git a/firmware/controllers/trigger/decoders/trigger_universal.h b/firmware/controllers/trigger/decoders/trigger_universal.h index 647d95014e..15321e0f61 100644 --- a/firmware/controllers/trigger/decoders/trigger_universal.h +++ b/firmware/controllers/trigger/decoders/trigger_universal.h @@ -19,14 +19,14 @@ void addSkippedToothTriggerEvents(trigger_wheel_e wheel, TriggerShape *s, int totalTeethCount, int skippedCount, float toothWidth, - float offset, float engineCycle, float filterLeft, float filterRight DECLARE_ENGINE_PARAMETER_S); + float offset, float engineCycle, float filterLeft, float filterRight DECLARE_ENGINE_PARAMETER_SUFFIX); -void initializeSkippedToothTriggerShapeExt(TriggerShape *s, int totalTeethCount, int skippedCount, operation_mode_e operationMode DECLARE_ENGINE_PARAMETER_S);; +void initializeSkippedToothTriggerShapeExt(TriggerShape *s, int totalTeethCount, int skippedCount, operation_mode_e operationMode DECLARE_ENGINE_PARAMETER_SUFFIX);; -void configureOnePlus60_2(TriggerShape *s, operation_mode_e operationMode DECLARE_ENGINE_PARAMETER_S); +void configureOnePlus60_2(TriggerShape *s, operation_mode_e operationMode DECLARE_ENGINE_PARAMETER_SUFFIX); -void configure3_1_cam(TriggerShape *s, operation_mode_e operationMode DECLARE_ENGINE_PARAMETER_S); +void configure3_1_cam(TriggerShape *s, operation_mode_e operationMode DECLARE_ENGINE_PARAMETER_SUFFIX); -void configureOnePlusOne(TriggerShape *s, operation_mode_e operationMode DECLARE_ENGINE_PARAMETER_S); +void configureOnePlusOne(TriggerShape *s, operation_mode_e operationMode DECLARE_ENGINE_PARAMETER_SUFFIX); #endif /* CONTROLLERS_TRIGGER_DECODERS_TRIGGER_UNIVERSAL_H_ */ diff --git a/firmware/controllers/trigger/main_trigger_callback.h b/firmware/controllers/trigger/main_trigger_callback.h index aaba8f437d..9d1a9b79e9 100644 --- a/firmware/controllers/trigger/main_trigger_callback.h +++ b/firmware/controllers/trigger/main_trigger_callback.h @@ -16,7 +16,7 @@ #include "engine.h" void initMainEventListener(Logging *sharedLogger, Engine *engine); -void mainTriggerCallback(trigger_event_e ckpSignalType, uint32_t eventIndex DECLARE_ENGINE_PARAMETER_S); +void mainTriggerCallback(trigger_event_e ckpSignalType, uint32_t eventIndex DECLARE_ENGINE_PARAMETER_SUFFIX); int isIgnitionTimingError(void); diff --git a/firmware/controllers/trigger/rpm_calculator.h b/firmware/controllers/trigger/rpm_calculator.h index 843fe26846..f7a76e1037 100644 --- a/firmware/controllers/trigger/rpm_calculator.h +++ b/firmware/controllers/trigger/rpm_calculator.h @@ -42,14 +42,14 @@ public: /** * Please note that this is a relatively heavy method due to getTimeNowNt() usage */ - bool isRunning(DECLARE_ENGINE_PARAMETER_F); - int getRpm(DECLARE_ENGINE_PARAMETER_F); + bool isRunning(DECLARE_ENGINE_PARAMETER_SIGNATURE); + int getRpm(DECLARE_ENGINE_PARAMETER_SIGNATURE); /** * This method is invoked once per engine cycle right after we calculate new RPM value */ void onNewEngineCycle(); uint32_t getRevolutionCounter(void); - void setRpmValue(int value DECLARE_ENGINE_PARAMETER_S); + void setRpmValue(int value DECLARE_ENGINE_PARAMETER_SUFFIX); uint32_t getRevolutionCounterSinceStart(void); float getRpmAcceleration(); /** @@ -79,16 +79,16 @@ private: /** * @brief Current RPM */ -#define getRpmE(engine) (engine)->rpmCalculator.getRpm(PASS_ENGINE_PARAMETER_F) +#define getRpmE(engine) (engine)->rpmCalculator.getRpm(PASS_ENGINE_PARAMETER_SIGNATURE) bool isCrankingE(Engine *engine); -void rpmShaftPositionCallback(trigger_event_e ckpSignalType, uint32_t index DECLARE_ENGINE_PARAMETER_S); +void rpmShaftPositionCallback(trigger_event_e ckpSignalType, uint32_t index DECLARE_ENGINE_PARAMETER_SUFFIX); /** * @brief Initialize RPM calculator */ void initRpmCalculator(Logging *sharedLogger, Engine *engine); -float getCrankshaftAngleNt(efitime_t timeNt DECLARE_ENGINE_PARAMETER_S); +float getCrankshaftAngleNt(efitime_t timeNt DECLARE_ENGINE_PARAMETER_SUFFIX); #endif diff --git a/firmware/controllers/trigger/spark_logic.h b/firmware/controllers/trigger/spark_logic.h index 79ac7c93bb..1e091c68d7 100644 --- a/firmware/controllers/trigger/spark_logic.h +++ b/firmware/controllers/trigger/spark_logic.h @@ -11,11 +11,11 @@ #include "engine.h" int isInjectionEnabled(engine_configuration_s *engineConfiguration); -void handleSpark(bool limitedSpark, uint32_t trgEventIndex, int rpm DECLARE_ENGINE_PARAMETER_S); +void handleSpark(bool limitedSpark, uint32_t trgEventIndex, int rpm DECLARE_ENGINE_PARAMETER_SUFFIX); void initSparkLogic(Logging *sharedLogger); void turnSparkPinHigh(IgnitionEvent *event); void turnSparkPinLow(IgnitionEvent *event); -int getNumberOfSparks(ignition_mode_e mode DECLARE_ENGINE_PARAMETER_S); -percent_t getCoilDutyCycle(int rpm DECLARE_ENGINE_PARAMETER_S); +int getNumberOfSparks(ignition_mode_e mode DECLARE_ENGINE_PARAMETER_SUFFIX); +percent_t getCoilDutyCycle(int rpm DECLARE_ENGINE_PARAMETER_SUFFIX); #endif /* CONTROLLERS_TRIGGER_SPARK_LOGIC_H_ */ diff --git a/firmware/controllers/trigger/trigger_central.h b/firmware/controllers/trigger/trigger_central.h index 1330181049..03622ffe0d 100644 --- a/firmware/controllers/trigger/trigger_central.h +++ b/firmware/controllers/trigger/trigger_central.h @@ -13,7 +13,7 @@ #include "trigger_decoder.h" class Engine; -typedef void (*ShaftPositionListener)(trigger_event_e signal, uint32_t index DECLARE_ENGINE_PARAMETER_S); +typedef void (*ShaftPositionListener)(trigger_event_e signal, uint32_t index DECLARE_ENGINE_PARAMETER_SUFFIX); #ifdef __cplusplus class Engine; @@ -25,7 +25,7 @@ class TriggerCentral { public: TriggerCentral(); void addEventListener(ShaftPositionListener handler, const char *name, Engine *engine); - void handleShaftSignal(trigger_event_e signal DECLARE_ENGINE_PARAMETER_S); + void handleShaftSignal(trigger_event_e signal DECLARE_ENGINE_PARAMETER_SUFFIX); int getHwEventCounter(int index); void resetCounters(); TriggerState triggerState; @@ -46,8 +46,8 @@ private: #endif void triggerInfo(void); -efitime_t getCrankEventCounter(DECLARE_ENGINE_PARAMETER_F); -efitime_t getStartOfRevolutionIndex(DECLARE_ENGINE_PARAMETER_F); +efitime_t getCrankEventCounter(DECLARE_ENGINE_PARAMETER_SIGNATURE); +efitime_t getStartOfRevolutionIndex(DECLARE_ENGINE_PARAMETER_SIGNATURE); void hwHandleShaftSignal(trigger_event_e signal); void hwHandleVvtCamSignal(trigger_value_e front); float getTriggerDutyCycle(int index); diff --git a/firmware/controllers/trigger/trigger_decoder.h b/firmware/controllers/trigger/trigger_decoder.h index 81f8e757f2..9f63770b9a 100644 --- a/firmware/controllers/trigger/trigger_decoder.h +++ b/firmware/controllers/trigger/trigger_decoder.h @@ -53,9 +53,9 @@ public: void intTotalEventCounter(); efitime_t getTotalEventCounter(); efitime_t getStartOfRevolutionIndex(); - void decodeTriggerEvent(trigger_event_e const signal, efitime_t nowUs DECLARE_ENGINE_PARAMETER_S); + void decodeTriggerEvent(trigger_event_e const signal, efitime_t nowUs DECLARE_ENGINE_PARAMETER_SUFFIX); - bool isValidIndex(DECLARE_ENGINE_PARAMETER_F); + bool isValidIndex(DECLARE_ENGINE_PARAMETER_SIGNATURE); float getTriggerDutyCycle(int index); TriggerStateCallback cycleCallback; @@ -116,7 +116,7 @@ private: }; angle_t getEngineCycle(operation_mode_e operationMode); -uint32_t findTriggerZeroEventIndex(TriggerState *state, TriggerShape * shape, trigger_config_s const*triggerConfig DECLARE_ENGINE_PARAMETER_S); +uint32_t findTriggerZeroEventIndex(TriggerState *state, TriggerShape * shape, trigger_config_s const*triggerConfig DECLARE_ENGINE_PARAMETER_SUFFIX); class Engine; diff --git a/firmware/controllers/trigger/trigger_simulator.h b/firmware/controllers/trigger/trigger_simulator.h index 617e0b1007..64d4430e69 100644 --- a/firmware/controllers/trigger/trigger_simulator.h +++ b/firmware/controllers/trigger/trigger_simulator.h @@ -16,12 +16,12 @@ public: TriggerStimulatorHelper(); uint32_t doFindTrigger(TriggerShape * shape, - trigger_config_s const*triggerConfig, TriggerState *state DECLARE_ENGINE_PARAMETER_S); + trigger_config_s const*triggerConfig, TriggerState *state DECLARE_ENGINE_PARAMETER_SUFFIX); - void nextStep(TriggerState *state, TriggerShape * shape, int i, trigger_config_s const*triggerConfig DECLARE_ENGINE_PARAMETER_S); + void nextStep(TriggerState *state, TriggerShape * shape, int i, trigger_config_s const*triggerConfig DECLARE_ENGINE_PARAMETER_SUFFIX); void assertSyncPositionAndSetDutyCycle(const uint32_t index, TriggerState *state, TriggerShape * shape, - trigger_config_s const*triggerConfig DECLARE_ENGINE_PARAMETER_S); + trigger_config_s const*triggerConfig DECLARE_ENGINE_PARAMETER_SUFFIX); }; bool isUsefulSignal(trigger_event_e signal, engine_configuration_s *engineConfiguration); diff --git a/firmware/controllers/trigger/trigger_structure.h b/firmware/controllers/trigger/trigger_structure.h index cfa28ee263..2ff5749317 100644 --- a/firmware/controllers/trigger/trigger_structure.h +++ b/firmware/controllers/trigger/trigger_structure.h @@ -51,9 +51,9 @@ class TriggerState; class TriggerShape { public: TriggerShape(); - void initializeTriggerShape(Logging *logger DECLARE_ENGINE_PARAMETER_S); + void initializeTriggerShape(Logging *logger DECLARE_ENGINE_PARAMETER_SUFFIX); void findTriggerPosition( - event_trigger_position_s *position, angle_t angleOffset DECLARE_ENGINE_PARAMETER_S); + event_trigger_position_s *position, angle_t angleOffset DECLARE_ENGINE_PARAMETER_SUFFIX); bool isSynchronizationNeeded; bool needSecondTriggerInput; @@ -151,9 +151,9 @@ public: */ int size; - void addEvent2(angle_t angle, trigger_wheel_e const waveIndex, trigger_value_e const state DECLARE_ENGINE_PARAMETER_S); + void addEvent2(angle_t angle, trigger_wheel_e const waveIndex, trigger_value_e const state DECLARE_ENGINE_PARAMETER_SUFFIX); - void addEvent2(angle_t angle, trigger_wheel_e const waveIndex, trigger_value_e const stateParam, float filterLeft, float filterRight DECLARE_ENGINE_PARAMETER_S); + void addEvent2(angle_t angle, trigger_wheel_e const waveIndex, trigger_value_e const stateParam, float filterLeft, float filterRight DECLARE_ENGINE_PARAMETER_SUFFIX); operation_mode_e getOperationMode(); void initialize(operation_mode_e operationMode, bool needSecondTriggerInput); @@ -170,11 +170,11 @@ public: int getSize() const; int getTriggerShapeSynchPointIndex(); - void prepareShape(DECLARE_ENGINE_PARAMETER_F); + void prepareShape(DECLARE_ENGINE_PARAMETER_SIGNATURE); private: trigger_shape_helper h; - int findAngleIndex(float target DECLARE_ENGINE_PARAMETER_S); + int findAngleIndex(float target DECLARE_ENGINE_PARAMETER_SUFFIX); /** * index of synchronization event within TriggerShape @@ -207,11 +207,11 @@ private: angle_t getAngle(int phaseIndex) const; angle_t getCycleDuration() const; - void calculateTriggerSynchPoint(TriggerState *state DECLARE_ENGINE_PARAMETER_S); + void calculateTriggerSynchPoint(TriggerState *state DECLARE_ENGINE_PARAMETER_SUFFIX); }; -void setVwConfiguration(TriggerShape *s DECLARE_ENGINE_PARAMETER_S); +void setVwConfiguration(TriggerShape *s DECLARE_ENGINE_PARAMETER_SUFFIX); -void setToothedWheelConfiguration(TriggerShape *s, int total, int skipped, operation_mode_e operationMode DECLARE_ENGINE_PARAMETER_S); +void setToothedWheelConfiguration(TriggerShape *s, int total, int skipped, operation_mode_e operationMode DECLARE_ENGINE_PARAMETER_SUFFIX); #endif /* TRIGGER_STRUCTURE_H_ */ diff --git a/firmware/development/trigger_emulator.cpp b/firmware/development/trigger_emulator.cpp index 9e0e75b409..df68a3d322 100644 --- a/firmware/development/trigger_emulator.cpp +++ b/firmware/development/trigger_emulator.cpp @@ -29,7 +29,7 @@ static OutputPin emulatorOutputs[3]; EXTERN_ENGINE; -void initTriggerEmulator(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_S) { +void initTriggerEmulator(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX) { #if EFI_EMULATE_POSITION_SENSORS || defined(__DOXYGEN__) diff --git a/firmware/development/trigger_emulator.h b/firmware/development/trigger_emulator.h index 82363d513e..86f309e368 100644 --- a/firmware/development/trigger_emulator.h +++ b/firmware/development/trigger_emulator.h @@ -14,7 +14,7 @@ #include "trigger_structure.h" #include "engine.h" -void initTriggerEmulator(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_S); -void setTriggerEmulatorRPM(int value DECLARE_ENGINE_PARAMETER_S); +void initTriggerEmulator(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX); +void setTriggerEmulatorRPM(int value DECLARE_ENGINE_PARAMETER_SUFFIX); #endif /* DIST_EMULATOR_H_ */ diff --git a/firmware/development/wave_analyzer.cpp b/firmware/development/wave_analyzer.cpp index 6abfc4de5e..a89822d481 100644 --- a/firmware/development/wave_analyzer.cpp +++ b/firmware/development/wave_analyzer.cpp @@ -152,7 +152,7 @@ WaveReader::WaveReader() { last_wave_low_widthUs = 0; } -static void waTriggerEventListener(trigger_event_e ckpSignalType, uint32_t index DECLARE_ENGINE_PARAMETER_S) { +static void waTriggerEventListener(trigger_event_e ckpSignalType, uint32_t index DECLARE_ENGINE_PARAMETER_SUFFIX) { (void)ckpSignalType; if (index != 0) { return; diff --git a/firmware/hw_layer/HIP9011.cpp b/firmware/hw_layer/HIP9011.cpp index 9585126d1d..585d3c0c17 100644 --- a/firmware/hw_layer/HIP9011.cpp +++ b/firmware/hw_layer/HIP9011.cpp @@ -228,7 +228,7 @@ static void endIntegration(void) { /** * Shaft Position callback used to start or finish HIP integration */ -static void intHoldCallback(trigger_event_e ckpEventType, uint32_t index DECLARE_ENGINE_PARAMETER_S) { +static void intHoldCallback(trigger_event_e ckpEventType, uint32_t index DECLARE_ENGINE_PARAMETER_SUFFIX) { // this callback is invoked on interrupt thread engine->m.beforeHipCb = GET_TIMESTAMP(); if (index != 0) diff --git a/firmware/hw_layer/accelerometer.cpp b/firmware/hw_layer/accelerometer.cpp index 828a2b00d4..b84d130fb5 100644 --- a/firmware/hw_layer/accelerometer.cpp +++ b/firmware/hw_layer/accelerometer.cpp @@ -8,14 +8,14 @@ #include "main.h" //#include "lis302dl.h" -void initAccelerometer(DECLARE_ENGINE_PARAMETER_F) { +void initAccelerometer(DECLARE_ENGINE_PARAMETER_SIGNATURE) { } -float getLongitudinalAcceleration(DECLARE_ENGINE_PARAMETER_F) { +float getLongitudinalAcceleration(DECLARE_ENGINE_PARAMETER_SIGNATURE) { return 0; } -float getTransverseAcceleration(DECLARE_ENGINE_PARAMETER_F) { +float getTransverseAcceleration(DECLARE_ENGINE_PARAMETER_SIGNATURE) { return 0; } diff --git a/firmware/hw_layer/accelerometer.h b/firmware/hw_layer/accelerometer.h index e41856eeab..f44afda1ee 100644 --- a/firmware/hw_layer/accelerometer.h +++ b/firmware/hw_layer/accelerometer.h @@ -9,14 +9,14 @@ #define HW_LAYER_ACCELEROMETER_H_ -void initAccelerometer(DECLARE_ENGINE_PARAMETER_F); +void initAccelerometer(DECLARE_ENGINE_PARAMETER_SIGNATURE); /** * Acceleration/braking */ -float getLongitudinalAcceleration(DECLARE_ENGINE_PARAMETER_F); +float getLongitudinalAcceleration(DECLARE_ENGINE_PARAMETER_SIGNATURE); /** * Turns */ -float getTransverseAcceleration(DECLARE_ENGINE_PARAMETER_F); +float getTransverseAcceleration(DECLARE_ENGINE_PARAMETER_SIGNATURE); #endif /* HW_LAYER_ACCELEROMETER_H_ */ diff --git a/firmware/hw_layer/can_hw.cpp b/firmware/hw_layer/can_hw.cpp index e94f75ff11..cdf34f567f 100644 --- a/firmware/hw_layer/can_hw.cpp +++ b/firmware/hw_layer/can_hw.cpp @@ -272,18 +272,18 @@ void setCanType(int type) { #endif /* EFI_PROD_CODE */ -void enableFrankensoCan(DECLARE_ENGINE_PARAMETER_F) { +void enableFrankensoCan(DECLARE_ENGINE_PARAMETER_SIGNATURE) { boardConfiguration->canTxPin = GPIOB_6; boardConfiguration->canRxPin = GPIOB_12; engineConfiguration->canReadEnabled = false; } -void stopCanPins(DECLARE_ENGINE_PARAMETER_F) { +void stopCanPins(DECLARE_ENGINE_PARAMETER_SIGNATURE) { unmarkPin(activeConfiguration.bc.canTxPin); unmarkPin(activeConfiguration.bc.canRxPin); } -void startCanPins(DECLARE_ENGINE_PARAMETER_F) { +void startCanPins(DECLARE_ENGINE_PARAMETER_SIGNATURE) { efiSetPadMode("CAN TX", boardConfiguration->canTxPin, PAL_MODE_ALTERNATE(EFI_CAN_TX_AF)); efiSetPadMode("CAN RX", boardConfiguration->canRxPin, PAL_MODE_ALTERNATE(EFI_CAN_RX_AF)); } diff --git a/firmware/hw_layer/can_hw.h b/firmware/hw_layer/can_hw.h index 62b2000d0f..f70f30c2ba 100644 --- a/firmware/hw_layer/can_hw.h +++ b/firmware/hw_layer/can_hw.h @@ -27,12 +27,12 @@ #define CAN_VAG_CLT 0x289 void initCan(void); -void stopCanPins(DECLARE_ENGINE_PARAMETER_F); -void startCanPins(DECLARE_ENGINE_PARAMETER_F); +void stopCanPins(DECLARE_ENGINE_PARAMETER_SIGNATURE); +void startCanPins(DECLARE_ENGINE_PARAMETER_SIGNATURE); void commonTxInit(int eid); void sendMessage(); void setCanType(int type); void setTxBit(int offset, int index); -void enableFrankensoCan(DECLARE_ENGINE_PARAMETER_F); +void enableFrankensoCan(DECLARE_ENGINE_PARAMETER_SIGNATURE); #endif /* CAN_HW_H_ */ diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp index 2b579b2498..73701f3ea4 100644 --- a/firmware/rusefi.cpp +++ b/firmware/rusefi.cpp @@ -151,7 +151,7 @@ static void scheduleReboot(void) { void runRusEfi(void) { efiAssertVoid(getRemainingStack(chThdGetSelfX()) > 512, "init s"); - assertEngineReference(PASS_ENGINE_PARAMETER_F); + assertEngineReference(PASS_ENGINE_PARAMETER_SIGNATURE); initIntermediateLoggingBuffer(); initErrorHandling(); @@ -167,7 +167,7 @@ void runRusEfi(void) { /** * we need to initialize table objects before default configuration can set values */ - initDataStructures(PASS_ENGINE_PARAMETER_F); + initDataStructures(PASS_ENGINE_PARAMETER_SIGNATURE); /** * First thing is reading configuration from flash memory. @@ -200,7 +200,7 @@ void runRusEfi(void) { * Now let's initialize actual engine control logic * todo: should we initialize some? most? controllers before hardware? */ - initEngineContoller(&sharedLogger PASS_ENGINE_PARAMETER_F); + initEngineContoller(&sharedLogger PASS_ENGINE_PARAMETER_SIGNATURE); #if EFI_PERF_METRICS || defined(__DOXYGEN__) initTimePerfActions(&sharedLogger); diff --git a/unit_tests/test_speed_density.cpp b/unit_tests/test_speed_density.cpp index 96917d9c39..15c36be62b 100644 --- a/unit_tests/test_speed_density.cpp +++ b/unit_tests/test_speed_density.cpp @@ -23,7 +23,7 @@ void testSpeedDensity(void) { eth.applyTriggerShape(); eth.fireTriggerEvents(36); - assertEqualsM("RPM", 1500, eth.engine.rpmCalculator.getRpm(PASS_ENGINE_PARAMETER_F)); + assertEqualsM("RPM", 1500, eth.engine.rpmCalculator.getRpm(PASS_ENGINE_PARAMETER_SIGNATURE)); // 427 cubic inches, that's a LOT of engine eth.ec->specs.displacement = 6.99728;