From af1790ee98935702a1cfbe5d48315a6c8a0f9744 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Fri, 15 May 2015 21:05:02 -0400 Subject: [PATCH] auto-sync --- firmware/config/engines/GY6_139QMB.cpp | 2 -- firmware/config/engines/gm_2_2.cpp | 2 -- firmware/config/engines/honda_accord.cpp | 3 --- firmware/config/engines/mazda_626.cpp | 1 - firmware/config/engines/mazda_miata.cpp | 8 -------- firmware/config/engines/mazda_miata_nb.cpp | 1 - firmware/config/engines/mitsubishi.cpp | 1 - unit_tests/engine_test_helper.cpp | 6 ++++-- unit_tests/global.h | 11 ++++++----- 9 files changed, 10 insertions(+), 25 deletions(-) diff --git a/firmware/config/engines/GY6_139QMB.cpp b/firmware/config/engines/GY6_139QMB.cpp index 8a99de2780..328c20f85f 100644 --- a/firmware/config/engines/GY6_139QMB.cpp +++ b/firmware/config/engines/GY6_139QMB.cpp @@ -76,8 +76,6 @@ static void setDefault139qmbMaps(DECLARE_ENGINE_PARAMETER_F) { } void setGy6139qmbDefaultEngineConfiguration(DECLARE_ENGINE_PARAMETER_F) { - board_configuration_s * boardConfiguration = &engineConfiguration->bc; - setDefault139qmbMaps(PASS_ENGINE_PARAMETER_F); // engineConfiguration->map.sensor.type = MT_3V_SENSOR; initEgoSensor(&engineConfiguration->afr, ES_NarrowBand); diff --git a/firmware/config/engines/gm_2_2.cpp b/firmware/config/engines/gm_2_2.cpp index 5f9c40cddb..572bdd0365 100644 --- a/firmware/config/engines/gm_2_2.cpp +++ b/firmware/config/engines/gm_2_2.cpp @@ -14,8 +14,6 @@ EXTERN_ENGINE ; void setGm2_2(DECLARE_ENGINE_PARAMETER_F) { - board_configuration_s * boardConfiguration = &engineConfiguration->bc; - setOperationMode(engineConfiguration, FOUR_STROKE_CAM_SENSOR); engineConfiguration->trigger.type = TT_ONE_PLUS_TOOTHED_WHEEL_60_2; diff --git a/firmware/config/engines/honda_accord.cpp b/firmware/config/engines/honda_accord.cpp index 32af5aef9d..a0cba6bff5 100644 --- a/firmware/config/engines/honda_accord.cpp +++ b/firmware/config/engines/honda_accord.cpp @@ -31,12 +31,9 @@ void setFrankenso_01_LCD(board_configuration_s *boardConfiguration) { EXTERN_ENGINE; static void setHondaAccordConfigurationCommon(DECLARE_ENGINE_PARAMETER_F) { - board_configuration_s *boardConfiguration = &engineConfiguration->bc; - engineConfiguration->map.sensor.type = MT_DENSO183; boardConfiguration->isFastAdcEnabled = true; - engineConfiguration->ignitionMode = IM_ONE_COIL; engineConfiguration->injectionMode = IM_BATCH; diff --git a/firmware/config/engines/mazda_626.cpp b/firmware/config/engines/mazda_626.cpp index e1d45562d6..8ef2d6fb4c 100644 --- a/firmware/config/engines/mazda_626.cpp +++ b/firmware/config/engines/mazda_626.cpp @@ -21,7 +21,6 @@ EXTERN_ENGINE; void setMazda626EngineConfiguration(DECLARE_ENGINE_PARAMETER_F) { setCustomEngineConfiguration(PASS_ENGINE_PARAMETER_F); - board_configuration_s *boardConfiguration = &engineConfiguration->bc; engineConfiguration->trigger.type = TT_MAZDA_DOHC_1_4; engineConfiguration->engineChartSize = 150; diff --git a/firmware/config/engines/mazda_miata.cpp b/firmware/config/engines/mazda_miata.cpp index 91b6639a56..8019abb165 100644 --- a/firmware/config/engines/mazda_miata.cpp +++ b/firmware/config/engines/mazda_miata.cpp @@ -128,7 +128,6 @@ static void setDefaultCrankingFuel(engine_configuration_s *engineConfiguration) EXTERN_ENGINE; static void commonMiataNa(DECLARE_ENGINE_PARAMETER_F) { - board_configuration_s *boardConfiguration = &engineConfiguration->bc; engineConfiguration->trigger.type = TT_MAZDA_MIATA_NA; engineConfiguration->engineChartSize = 100; @@ -202,8 +201,6 @@ static void common079721_2351(engine_configuration_s *engineConfiguration, board } void setMiata1990(DECLARE_ENGINE_PARAMETER_F) { - board_configuration_s *boardConfiguration = &engineConfiguration->bc; - common079721_2351(engineConfiguration, boardConfiguration); commonMiataNa(PASS_ENGINE_PARAMETER_F); @@ -238,7 +235,6 @@ void setMiata1990(DECLARE_ENGINE_PARAMETER_F) { * set_engine_type 14 */ void setFordEscortGt(DECLARE_ENGINE_PARAMETER_F) { - board_configuration_s *boardConfiguration = &engineConfiguration->bc; engineConfiguration->trigger.type = TT_MAZDA_DOHC_1_4; common079721_2351(engineConfiguration, boardConfiguration); @@ -363,7 +359,6 @@ void setFordEscortGt(DECLARE_ENGINE_PARAMETER_F) { } static void setMiata1994_common(DECLARE_ENGINE_PARAMETER_F) { - board_configuration_s *boardConfiguration = &engineConfiguration->bc; commonMiataNa(PASS_ENGINE_PARAMETER_F); engineConfiguration->specs.displacement = 1.839; @@ -438,7 +433,6 @@ static void setMiata1994_common(DECLARE_ENGINE_PARAMETER_F) { * set_engine_type 20 */ void setMiata1994_d(DECLARE_ENGINE_PARAMETER_F) { - board_configuration_s *boardConfiguration = &engineConfiguration->bc; setMiata1994_common(PASS_ENGINE_PARAMETER_F); engineConfiguration->vbattDividerCoeff = ((float) (8.2 + 33)) / 8.2 * 2; /** @@ -454,7 +448,6 @@ void setMiata1994_d(DECLARE_ENGINE_PARAMETER_F) { } void setMiata1994_s(DECLARE_ENGINE_PARAMETER_F) { - board_configuration_s *boardConfiguration = &engineConfiguration->bc; setMiata1994_common(PASS_ENGINE_PARAMETER_F); engineConfiguration->vbattDividerCoeff = ((float) (10.0 + 33)) / 10 * 2; @@ -501,7 +494,6 @@ void setMiata1994_s(DECLARE_ENGINE_PARAMETER_F) { * Tom tomiata, Frankenstein board */ void setMiata1996(DECLARE_ENGINE_PARAMETER_F) { - board_configuration_s *boardConfiguration = &engineConfiguration->bc; commonMiataNa(PASS_ENGINE_PARAMETER_F); engineConfiguration->specs.displacement = 1.839; diff --git a/firmware/config/engines/mazda_miata_nb.cpp b/firmware/config/engines/mazda_miata_nb.cpp index 30d455500e..6bcd4efd78 100644 --- a/firmware/config/engines/mazda_miata_nb.cpp +++ b/firmware/config/engines/mazda_miata_nb.cpp @@ -13,7 +13,6 @@ EXTERN_ENGINE; void setMazdaMiataNbEngineConfiguration(DECLARE_ENGINE_PARAMETER_F) { - board_configuration_s *boardConfiguration = &engineConfiguration->bc; // set_rpm_hard_limit 3000 engineConfiguration->rpmHardLimit = 3000; // yes, 3k. let's play it safe for now diff --git a/firmware/config/engines/mitsubishi.cpp b/firmware/config/engines/mitsubishi.cpp index c174d7978b..f7539fbfee 100644 --- a/firmware/config/engines/mitsubishi.cpp +++ b/firmware/config/engines/mitsubishi.cpp @@ -16,7 +16,6 @@ EXTERN_ENGINE; void setMitsubishiConfiguration(DECLARE_ENGINE_PARAMETER_F) { - board_configuration_s *boardConfiguration = &engineConfiguration->bc; engineConfiguration->engineType = MITSU_4G93; engineConfiguration->trigger.type = TT_MITSU; diff --git a/unit_tests/engine_test_helper.cpp b/unit_tests/engine_test_helper.cpp index 64695d9cce..8ab59869a1 100644 --- a/unit_tests/engine_test_helper.cpp +++ b/unit_tests/engine_test_helper.cpp @@ -17,6 +17,7 @@ EngineTestHelper::EngineTestHelper(engine_type_e engineType) : engine (&persiste ec = &persistentConfig.engineConfiguration; engineConfiguration = ec; + board_configuration_s * boardConfiguration = &engineConfiguration->bc; persistent_config_s *config = &persistentConfig; setTableValue(config->cltFuelCorrBins, config->cltFuelCorr, CLT_CURVE_SIZE, -40, 1.5); @@ -49,9 +50,10 @@ EngineTestHelper::EngineTestHelper(engine_type_e engineType) : engine (&persiste void EngineTestHelper::fireTriggerEvents() { for (int i = 0; i < 24; i++) { timeNow += 5000; // 5ms - triggerCentral.handleShaftSignal(SHAFT_PRIMARY_UP, &engine, engine.engineConfiguration, &persistentConfig); + board_configuration_s * boardConfiguration = &engine.engineConfiguration->bc; + triggerCentral.handleShaftSignal(SHAFT_PRIMARY_UP, &engine, engine.engineConfiguration, &persistentConfig, boardConfiguration); timeNow += 5000; - triggerCentral.handleShaftSignal(SHAFT_PRIMARY_DOWN, &engine, engine.engineConfiguration, &persistentConfig); + triggerCentral.handleShaftSignal(SHAFT_PRIMARY_DOWN, &engine, engine.engineConfiguration, &persistentConfig, boardConfiguration); } } diff --git a/unit_tests/global.h b/unit_tests/global.h index 7fc597c3d2..76cefbef4f 100644 --- a/unit_tests/global.h +++ b/unit_tests/global.h @@ -38,14 +38,15 @@ typedef int bool_t; class Engine; #endif -#define DECLARE_ENGINE_PARAMETER_F Engine *engine, engine_configuration_s *engineConfiguration, persistent_config_s *config -#define DECLARE_ENGINE_PARAMETER_S , Engine *engine, engine_configuration_s *engineConfiguration, persistent_config_s *config -#define PASS_ENGINE_PARAMETER_F engine, engineConfiguration, config -#define PASS_ENGINE_PARAMETER , engine, engineConfiguration, config +#define DECLARE_ENGINE_PARAMETER_F Engine *engine, engine_configuration_s *engineConfiguration, persistent_config_s *config, board_configuration_s *boardConfiguration +#define DECLARE_ENGINE_PARAMETER_S , Engine *engine, engine_configuration_s *engineConfiguration, persistent_config_s *config, board_configuration_s *boardConfiguration +#define PASS_ENGINE_PARAMETER_F engine, engineConfiguration, config, boardConfiguration +#define PASS_ENGINE_PARAMETER , engine, engineConfiguration, config, boardConfiguration #define EXPAND_EngineTestHelper Engine *engine = ð.engine; \ engine_configuration_s *engineConfiguration = engine->engineConfiguration; \ - persistent_config_s *config = engine->config; + persistent_config_s *config = engine->config; \ + board_configuration_s *boardConfiguration = &engineConfiguration->bc; #define CONFIG(x) engineConfiguration->x #define ENGINE(x) engine->x