From 57dbdec8f3dba55c94414b2897138d505828fe91 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Sat, 28 Feb 2015 08:04:29 -0600 Subject: [PATCH] auto-sync --- .../config/engines/citroenBerlingoTU3JP.cpp | 8 +++--- firmware/config/engines/dodge_neon.cpp | 4 +-- firmware/config/engines/ford_aspire.cpp | 12 ++++----- firmware/config/engines/honda_accord.cpp | 4 +-- firmware/config/engines/mazda_miata.cpp | 25 ++++++++++--------- .../controllers/algo/engine_configuration.cpp | 8 +++--- firmware/controllers/math/engine_math.cpp | 8 +++--- firmware/controllers/math/engine_math.h | 9 +++---- firmware/rusefi.cpp | 2 +- 9 files changed, 40 insertions(+), 40 deletions(-) diff --git a/firmware/config/engines/citroenBerlingoTU3JP.cpp b/firmware/config/engines/citroenBerlingoTU3JP.cpp index 6a0263e7da..4801238905 100644 --- a/firmware/config/engines/citroenBerlingoTU3JP.cpp +++ b/firmware/config/engines/citroenBerlingoTU3JP.cpp @@ -100,10 +100,10 @@ void setCitroenBerlingoTU3JPConfiguration(DECLARE_ENGINE_PARAMETER_F) { * Algorithm Alpha-N setting */ engineConfiguration->algorithm = LM_ALPHA_N; - setFuelLoadBin(engineConfiguration, 0, 100); - setFuelRpmBin(engineConfiguration, 800, 7000); - setTimingLoadBin(engineConfiguration, 0, 100); - setTimingRpmBin(engineConfiguration, 800, 7000); + setFuelLoadBin(0, 100 PASS_ENGINE_PARAMETER); + setFuelRpmBin(800, 7000 PASS_ENGINE_PARAMETER); + setTimingLoadBin(0, 100 PASS_ENGINE_PARAMETER); + setTimingRpmBin(800, 7000 PASS_ENGINE_PARAMETER); /** * Outputs diff --git a/firmware/config/engines/dodge_neon.cpp b/firmware/config/engines/dodge_neon.cpp index 6761d4db1d..33dff1157e 100644 --- a/firmware/config/engines/dodge_neon.cpp +++ b/firmware/config/engines/dodge_neon.cpp @@ -236,8 +236,8 @@ void setDodgeNeonNGCEngineConfiguration(DECLARE_ENGINE_PARAMETER_F) { // I want to start with a simple Alpha-N engineConfiguration->algorithm = LM_ALPHA_N; // engineConfiguration->algorithm = LM_SPEED_DENSITY; - setFuelLoadBin(engineConfiguration, 0, 100); - setTimingLoadBin(engineConfiguration, 0, 100); + setFuelLoadBin(0, 100 PASS_ENGINE_PARAMETER); + setTimingLoadBin(0, 100 PASS_ENGINE_PARAMETER); boardConfiguration->malfunctionIndicatorPin = GPIO_UNASSIGNED; diff --git a/firmware/config/engines/ford_aspire.cpp b/firmware/config/engines/ford_aspire.cpp index c965b03d51..56a1263870 100644 --- a/firmware/config/engines/ford_aspire.cpp +++ b/firmware/config/engines/ford_aspire.cpp @@ -66,12 +66,12 @@ static const ignition_table_t default_aspire_timing_table = { EXTERN_ENGINE; -static void setDefaultAspireMaps(engine_configuration_s *engineConfiguration) { +static void setDefaultAspireMaps(DECLARE_ENGINE_PARAMETER_F) { - setFuelLoadBin(engineConfiguration, 1.2, 4.4); - setFuelRpmBin(engineConfiguration, 800, 7000); - setTimingLoadBin(engineConfiguration, 1.2, 4.4); - setTimingRpmBin(engineConfiguration, 800, 7000); + setFuelLoadBin(1.2, 4.4 PASS_ENGINE_PARAMETER); + setFuelRpmBin(800, 7000 PASS_ENGINE_PARAMETER); + setTimingLoadBin(1.2, 4.4 PASS_ENGINE_PARAMETER); + setTimingRpmBin(800, 7000 PASS_ENGINE_PARAMETER); copyFuelTable(default_aspire_fuel_table, engineConfiguration->fuelTable); copyTimingTable(default_aspire_timing_table, engineConfiguration->ignitionTable); @@ -106,7 +106,7 @@ void setFordAspireEngineConfiguration(DECLARE_ENGINE_PARAMETER_F) { engineConfiguration->ignitionBaseAngle = 87; engineConfiguration->injectionAngle = 54 + 360; - setDefaultAspireMaps(engineConfiguration); + setDefaultAspireMaps(PASS_ENGINE_PARAMETER_F); // set_cranking_rpm 550 engineConfiguration->cranking.rpm = 550; // set_cranking_charge_angle 70 diff --git a/firmware/config/engines/honda_accord.cpp b/firmware/config/engines/honda_accord.cpp index 8a1aefd66b..3b5ceb83b0 100644 --- a/firmware/config/engines/honda_accord.cpp +++ b/firmware/config/engines/honda_accord.cpp @@ -52,8 +52,8 @@ static void setHondaAccordConfigurationCommon(DECLARE_ENGINE_PARAMETER_F) { // engineConfiguration->algorithm = LM_SPEED_DENSITY; // I want to start with a simple Alpha-N engineConfiguration->algorithm = LM_ALPHA_N; - setFuelLoadBin(engineConfiguration, 0, 100); - setTimingLoadBin(engineConfiguration, 0, 100); + setFuelLoadBin(0, 100 PASS_ENGINE_PARAMETER); + setTimingLoadBin(0, 100 PASS_ENGINE_PARAMETER); /** * 18K Ohm @ -20C diff --git a/firmware/config/engines/mazda_miata.cpp b/firmware/config/engines/mazda_miata.cpp index 0139506b8c..56da4bdac3 100644 --- a/firmware/config/engines/mazda_miata.cpp +++ b/firmware/config/engines/mazda_miata.cpp @@ -127,7 +127,8 @@ static void setDefaultCrankingFuel(engine_configuration_s *engineConfiguration) EXTERN_ENGINE; -static void commonMiataNa(engine_configuration_s *engineConfiguration, board_configuration_s *boardConfiguration) { +static void commonMiataNa(DECLARE_ENGINE_PARAMETER_F) { + board_configuration_s *boardConfiguration = &engineConfiguration->bc; engineConfiguration->trigger.type = TT_MAZDA_MIATA_NA; engineConfiguration->digitalChartSize = 100; @@ -135,8 +136,8 @@ static void commonMiataNa(engine_configuration_s *engineConfiguration, board_con boardConfiguration->triggerInputPins[1] = GPIOA_5; // 2E White CKP engineConfiguration->ignitionMode = IM_WASTED_SPARK; - setFuelLoadBin(engineConfiguration, 1.2, 4.4); - setFuelRpmBin(engineConfiguration, 800, 7000); + setFuelLoadBin(1.2, 4.4 PASS_ENGINE_PARAMETER); + setFuelRpmBin(800, 7000 PASS_ENGINE_PARAMETER); boardConfiguration->idleSolenoidFrequency = 160; @@ -205,7 +206,7 @@ void setMiata1990(DECLARE_ENGINE_PARAMETER_F) { common079721_2351(engineConfiguration, boardConfiguration); - commonMiataNa(engineConfiguration, boardConfiguration); + commonMiataNa(PASS_ENGINE_PARAMETER_F); // Frankenstein: low side - out #1: PC14 // Frankenstein: low side - out #2: PC15 @@ -254,8 +255,8 @@ void setFordEscortGt(DECLARE_ENGINE_PARAMETER_F) { // engineConfiguration->algorithm = LM_REAL_MAF; boardConfiguration->tunerStudioSerialSpeed = 9600; - setFuelLoadBin(engineConfiguration, 1.2, 4.4); - setFuelRpmBin(engineConfiguration, 800, 7000); + setFuelLoadBin(1.2, 4.4 PASS_ENGINE_PARAMETER); + setFuelRpmBin(800, 7000 PASS_ENGINE_PARAMETER); // boardConfiguration->triggerInputPins[0] = GPIOC_6; // 2G YEL/BLU // boardConfiguration->triggerInputPins[1] = GPIOA_5; // 2E White CKP @@ -361,9 +362,9 @@ void setFordEscortGt(DECLARE_ENGINE_PARAMETER_F) { // end of Ford Escort GT config } -static void setMiata1994_common(engine_configuration_s *engineConfiguration, - board_configuration_s *boardConfiguration) { - commonMiataNa(engineConfiguration, boardConfiguration); +static void setMiata1994_common(DECLARE_ENGINE_PARAMETER_F) { + board_configuration_s *boardConfiguration = &engineConfiguration->bc; + commonMiataNa(PASS_ENGINE_PARAMETER_F); engineConfiguration->specs.displacement = 1.839; // set_cranking_timing_angle 0 @@ -438,7 +439,7 @@ static void setMiata1994_common(engine_configuration_s *engineConfiguration, */ void setMiata1994_d(DECLARE_ENGINE_PARAMETER_F) { board_configuration_s *boardConfiguration = &engineConfiguration->bc; - setMiata1994_common(engineConfiguration, boardConfiguration); + setMiata1994_common(PASS_ENGINE_PARAMETER_F); engineConfiguration->vbattDividerCoeff = ((float) (8.2 + 33)) / 8.2 * 2; /** * This board was avoiding PE0 & PE1 mosfets altogether @@ -454,7 +455,7 @@ void setMiata1994_d(DECLARE_ENGINE_PARAMETER_F) { void setMiata1994_s(DECLARE_ENGINE_PARAMETER_F) { board_configuration_s *boardConfiguration = &engineConfiguration->bc; - setMiata1994_common(engineConfiguration, boardConfiguration); + setMiata1994_common(PASS_ENGINE_PARAMETER_F); engineConfiguration->vbattDividerCoeff = ((float) (10.0 + 33)) / 10 * 2; boardConfiguration->triggerSimulatorPins[2] = GPIO_UNASSIGNED; @@ -497,7 +498,7 @@ void setMiata1994_s(DECLARE_ENGINE_PARAMETER_F) { */ void setMiata1996(DECLARE_ENGINE_PARAMETER_F) { board_configuration_s *boardConfiguration = &engineConfiguration->bc; - commonMiataNa(engineConfiguration, boardConfiguration); + commonMiataNa(PASS_ENGINE_PARAMETER_F); engineConfiguration->specs.displacement = 1.839; copyFuelTable(miata_maf_fuel_table, engineConfiguration->fuelTable); diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index 7e0e486dcd..15d0573a2b 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -180,10 +180,10 @@ void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_F) { setConstantDwell(engineConfiguration, 4); // 4ms is global default dwell engineConfiguration->useConstantDwellDuringCranking = false; - setFuelLoadBin(engineConfiguration, 1.2, 4.4); - setFuelRpmBin(engineConfiguration, 800, 7000); - setTimingLoadBin(engineConfiguration, 1.2, 4.4); - setTimingRpmBin(engineConfiguration, 800, 7000); + setFuelLoadBin(1.2, 4.4 PASS_ENGINE_PARAMETER); + setFuelRpmBin(800, 7000 PASS_ENGINE_PARAMETER); + setTimingLoadBin(1.2, 4.4 PASS_ENGINE_PARAMETER); + setTimingRpmBin(800, 7000 PASS_ENGINE_PARAMETER); setTableBin2(engineConfiguration->map.samplingAngleBins, MAP_ANGLE_SIZE, 800, 7000, 1); setTableBin2(engineConfiguration->map.samplingAngle, MAP_ANGLE_SIZE, 100, 130, 1); diff --git a/firmware/controllers/math/engine_math.cpp b/firmware/controllers/math/engine_math.cpp index e15a6dfc08..456d1bb5cb 100644 --- a/firmware/controllers/math/engine_math.cpp +++ b/firmware/controllers/math/engine_math.cpp @@ -366,19 +366,19 @@ void prepareOutputSignals(DECLARE_ENGINE_PARAMETER_F) { #endif -void setFuelRpmBin(engine_configuration_s *engineConfiguration, float from, float to) { +void setFuelRpmBin(float from, float to DECLARE_ENGINE_PARAMETER_S) { setTableBin(engineConfiguration->fuelRpmBins, FUEL_RPM_COUNT, from, to); } -void setFuelLoadBin(engine_configuration_s *engineConfiguration, float from, float to) { +void setFuelLoadBin(float from, float to DECLARE_ENGINE_PARAMETER_S) { setTableBin(engineConfiguration->fuelLoadBins, FUEL_LOAD_COUNT, from, to); } -void setTimingRpmBin(engine_configuration_s *engineConfiguration, float from, float to) { +void setTimingRpmBin(float from, float to DECLARE_ENGINE_PARAMETER_S) { setTableBin(engineConfiguration->ignitionRpmBins, IGN_RPM_COUNT, from, to); } -void setTimingLoadBin(engine_configuration_s *engineConfiguration, float from, float to) { +void setTimingLoadBin(float from, float to DECLARE_ENGINE_PARAMETER_S) { setTableBin(engineConfiguration->ignitionLoadBins, IGN_LOAD_COUNT, from, to); } diff --git a/firmware/controllers/math/engine_math.h b/firmware/controllers/math/engine_math.h index 2dd0fe6d07..aef0ac47ce 100644 --- a/firmware/controllers/math/engine_math.h +++ b/firmware/controllers/math/engine_math.h @@ -55,15 +55,14 @@ float getCrankshaftRevolutionTimeMs(int rpm); float getEngineLoadT(DECLARE_ENGINE_PARAMETER_F); - float getSparkDwellMsT(int rpm DECLARE_ENGINE_PARAMETER_S); int getCylinderId(firing_order_e firingOrder, int index); -void setFuelRpmBin(engine_configuration_s *engineConfiguration, float from, float to); -void setFuelLoadBin(engine_configuration_s *engineConfiguration, float from, float to); -void setTimingRpmBin(engine_configuration_s *engineConfiguration, float from, float to); -void setTimingLoadBin(engine_configuration_s *engineConfiguration, float from, float to); +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 setSingleCoilDwell(engine_configuration_s *engineConfiguration); diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp index 67602e61ef..1645f2402a 100644 --- a/firmware/rusefi.cpp +++ b/firmware/rusefi.cpp @@ -276,5 +276,5 @@ int getRusEfiVersion(void) { return 1; // this is here to make the compiler happy about the unused array if (UNUSED_CCM_SIZE[0] == 0) return 1; // this is here to make the compiler happy about the unused array - return 20150227; + return 20150228; }