From 7c86a945d9250772b9ef036c357c6fb159fed187 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Wed, 11 Feb 2015 22:07:58 -0600 Subject: [PATCH] auto-sync --- firmware/config/engines/dodge_neon.cpp | 2 +- firmware/config/engines/ford_aspire.cpp | 2 +- firmware/config/engines/honda_accord.cpp | 2 +- firmware/config/engines/mazda_miata.cpp | 12 +++++++++--- firmware/config/engines/mitsubishi.cpp | 2 +- firmware/controllers/algo/advance_map.cpp | 2 +- java_console/autotest/src/com/rusefi/AutoTest.java | 11 ++++++----- 7 files changed, 20 insertions(+), 13 deletions(-) diff --git a/firmware/config/engines/dodge_neon.cpp b/firmware/config/engines/dodge_neon.cpp index 38074d64d7..9bee565e2b 100644 --- a/firmware/config/engines/dodge_neon.cpp +++ b/firmware/config/engines/dodge_neon.cpp @@ -221,7 +221,7 @@ void setDodgeNeonNGCEngineConfiguration(engine_configuration_s *engineConfigurat // set_cranking_charge_angle 70 engineConfiguration->crankingChargeAngle = 70; // set_cranking_timing_angle 710 - engineConfiguration->crankingTimingAngle = 710; + engineConfiguration->crankingTimingAngle = -710; /** diff --git a/firmware/config/engines/ford_aspire.cpp b/firmware/config/engines/ford_aspire.cpp index f83fdda5be..38ee3d504d 100644 --- a/firmware/config/engines/ford_aspire.cpp +++ b/firmware/config/engines/ford_aspire.cpp @@ -109,7 +109,7 @@ void setFordAspireEngineConfiguration(engine_configuration_s *engineConfiguratio // set_cranking_charge_angle 70 engineConfiguration->crankingChargeAngle = 70; // set_cranking_timing_angle 37 - engineConfiguration->crankingTimingAngle = 37; + engineConfiguration->crankingTimingAngle = -37; setSingleCoilDwell(engineConfiguration); engineConfiguration->ignitionMode = IM_ONE_COIL; diff --git a/firmware/config/engines/honda_accord.cpp b/firmware/config/engines/honda_accord.cpp index 1e4fff742e..5bf785f5e3 100644 --- a/firmware/config/engines/honda_accord.cpp +++ b/firmware/config/engines/honda_accord.cpp @@ -65,7 +65,7 @@ static void setHondaAccordConfigurationCommon(engine_configuration_s *engineConf // set_cranking_charge_angle 35 engineConfiguration->crankingChargeAngle = 70; // set_cranking_timing_angle 0 - engineConfiguration->crankingTimingAngle = 45; + engineConfiguration->crankingTimingAngle = -45; // set_global_trigger_offset_angle 34 engineConfiguration->globalTriggerAngleOffset = 34; diff --git a/firmware/config/engines/mazda_miata.cpp b/firmware/config/engines/mazda_miata.cpp index 06350c15f2..5eb971ab04 100644 --- a/firmware/config/engines/mazda_miata.cpp +++ b/firmware/config/engines/mazda_miata.cpp @@ -259,11 +259,17 @@ void setFordEscortGt(engine_configuration_s *engineConfiguration) { engineConfiguration->map.sensor.type = MT_DENSO183; // set_global_trigger_offset_angle 659 - engineConfiguration->globalTriggerAngleOffset = 659; + engineConfiguration->globalTriggerAngleOffset = 0; // set_ignition_offset 170 - engineConfiguration->ignitionBaseAngle = 170; + engineConfiguration->ignitionBaseAngle = 0; // set_injection_offset 510 - engineConfiguration->injectionAngle = 59; + engineConfiguration->injectionAngle = 0; + + engineConfiguration->crankingTimingAngle = 10; + engineConfiguration->crankingChargeAngle = 70; + + setWholeTimingTable(engineConfiguration, 10); + setSingleCoilDwell(engineConfiguration); engineConfiguration->ignitionMode = IM_ONE_COIL; diff --git a/firmware/config/engines/mitsubishi.cpp b/firmware/config/engines/mitsubishi.cpp index fe28cdfc19..d66afec09f 100644 --- a/firmware/config/engines/mitsubishi.cpp +++ b/firmware/config/engines/mitsubishi.cpp @@ -33,7 +33,7 @@ void setMitsubishiConfiguration(engine_configuration_s *engineConfiguration, boa // set_cranking_charge_angle 70 engineConfiguration->crankingChargeAngle = 70; // set_cranking_timing_angle 715 - engineConfiguration->crankingTimingAngle = 715; + engineConfiguration->crankingTimingAngle = -715; // set_whole_fuel_map 3 setWholeFuelMap(engineConfiguration, 3); diff --git a/firmware/controllers/algo/advance_map.cpp b/firmware/controllers/algo/advance_map.cpp index af8b3dd5d9..5776371678 100644 --- a/firmware/controllers/algo/advance_map.cpp +++ b/firmware/controllers/algo/advance_map.cpp @@ -45,7 +45,7 @@ float getBaseAdvance(int rpm, float engineLoad DECLARE_ENGINE_PARAMETER_S) { float getAdvance(int rpm, float engineLoad DECLARE_ENGINE_PARAMETER_S) { float angle; if (isCrankingR(rpm)) { - angle = -engineConfiguration->crankingTimingAngle; + angle = engineConfiguration->crankingTimingAngle; } else { angle = getBaseAdvance(rpm, engineLoad PASS_ENGINE_PARAMETER); } diff --git a/java_console/autotest/src/com/rusefi/AutoTest.java b/java_console/autotest/src/com/rusefi/AutoTest.java index 16a71cc468..e57af0b1b8 100644 --- a/java_console/autotest/src/com/rusefi/AutoTest.java +++ b/java_console/autotest/src/com/rusefi/AutoTest.java @@ -36,7 +36,7 @@ public class AutoTest { sendCommand("set_engine_type 14"); WaveChart chart; IoUtil.changeRpm(200); - String msg = "ProtegeLX"; + String msg = "ProtegeLX cranking"; chart = nextChart(); double x = 100; assertWave(msg, chart, WaveChart.SPARK_1, 0.194433, x, x + 180, x + 360, x + 540); @@ -44,6 +44,7 @@ public class AutoTest { assertWave(msg, chart, WaveChart.INJECTOR_1, 0.00626666, x, x + 180, x + 360, x + 540); assertWave(msg, chart, WaveChart.INJECTOR_2, 0.00626666, x, x + 180, x + 360, x + 540); + msg = "ProtegeLX running"; IoUtil.changeRpm(2000); chart = nextChart(); x = 121; @@ -134,17 +135,17 @@ public class AutoTest { IoUtil.changeRpm(200); sendCommand("set_cranking_charge_angle 65"); - sendCommand("set_cranking_timing_angle 31"); + sendCommand("set_cranking_timing_angle -31"); chart = nextChart(); x = 55; - assertWave("aspire", chart, WaveChart.SPARK_1, 0.18, x, x + 180, x + 360, x + 540); + assertWave("aspire cranking", chart, WaveChart.SPARK_1, 0.18, x, x + 180, x + 360, x + 540); - sendCommand("set_cranking_timing_angle 40"); + sendCommand("set_cranking_timing_angle -40"); chart = nextChart(); x = 64; assertWave("aspire", chart, WaveChart.SPARK_1, 0.18, x, x + 180, x + 360, x + 540); - sendCommand("set_cranking_timing_angle -149"); + sendCommand("set_cranking_timing_angle 149"); sendCommand("set_cranking_charge_angle 40"); chart = nextChart();