From 6909098c7f2834ac7bd332e4b7c81a5ab29a54cf Mon Sep 17 00:00:00 2001 From: rusEfi Date: Sat, 8 Nov 2014 14:07:47 -0600 Subject: [PATCH] auto-sync --- firmware/config/engines/dodge_neon.cpp | 20 ++++++++++++++++++-- firmware/controllers/settings.cpp | 11 +++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/firmware/config/engines/dodge_neon.cpp b/firmware/config/engines/dodge_neon.cpp index d81807a882..d59bf900c5 100644 --- a/firmware/config/engines/dodge_neon.cpp +++ b/firmware/config/engines/dodge_neon.cpp @@ -61,7 +61,11 @@ void setDodgeNeon1995EngineConfiguration(engine_configuration_s *engineConfigura // set_cranking_fuel 5 engineConfiguration->crankingSettings.baseCrankingFuel = 5; - // set_whole_fuel_map 3 + /** + * that's 1995 config + */ + + // set_whole_fuel_map 9 setWholeFuelMap(engineConfiguration, 9); setWholeTimingTable(engineConfiguration, 12); @@ -82,8 +86,12 @@ void setDodgeNeon1995EngineConfiguration(engine_configuration_s *engineConfigura // set_injection_offset 510 engineConfiguration->injectionOffset = 510; + /** + * that's 1995 config + */ + // set_cranking_charge_angle 70 - engineConfiguration->crankingChargeAngle = 7; + engineConfiguration->crankingChargeAngle = 70; // set_cranking_timing_angle 0 engineConfiguration->crankingTimingAngle = 0; @@ -142,6 +150,14 @@ void setDodgeNeonNGCEngineConfiguration(engine_configuration_s *engineConfigurat engineConfiguration->displacement = 1.996; engineConfiguration->cylindersCount = 4; + /** + * that's NGC config + */ + + // set_whole_fuel_map 12 + setWholeFuelMap(engineConfiguration, 12); + setWholeTimingTable(engineConfiguration, 12); + // set_cranking_charge_angle 70 engineConfiguration->crankingChargeAngle = 70; // set_cranking_timing_angle 710 diff --git a/firmware/controllers/settings.cpp b/firmware/controllers/settings.cpp index 9626b79ee9..e6859658a0 100644 --- a/firmware/controllers/settings.cpp +++ b/firmware/controllers/settings.cpp @@ -431,6 +431,11 @@ static void setWholeTimingMap(float value) { } } +static void setWholeTimingMapCmd(float value) { + scheduleMsg(&logger, "Setting whole timing advance map to %f", value); + setWholeTimingMap(value); +} + static void setWholeFuelMapCmd(float value) { scheduleMsg(&logger, "Setting whole fuel map to %f", value); if (engineConfiguration->algorithm == LM_SPEED_DENSITY) { @@ -713,6 +718,10 @@ static void enableSelfStimulation(void) { scheduleMsg(&logger, "self stimulation enabled"); } +static void stopEngine(void) { + +} + static void disableSelfStimulation(void) { engineConfiguration->directSelfStimulation = false; scheduleMsg(&logger, "self stimulation disabled"); @@ -774,6 +783,7 @@ void initSettings(engine_configuration_s *engineConfiguration) { addConsoleActionI("set_cranking_injection_mode", setCrankingInjectionMode); addConsoleActionI("set_injection_mode", setInjectionMode); + addConsoleActionF("set_whole_timing_map", setWholeTimingMapCmd); addConsoleActionF("set_whole_fuel_map", setWholeFuelMapCmd); addConsoleActionSSS("set_fuel_map", setFuelMap); @@ -783,6 +793,7 @@ void initSettings(engine_configuration_s *engineConfiguration) { addConsoleActionI("set_rpm_hard_limit", setRpmHardLimit); addConsoleActionI("set_firing_order", setFiringOrder); addConsoleActionI("set_algorithm", setAlgorithm); + addConsoleActionI("stopengine", stopEngine); // todo: refactor this - looks like all boolean flags should be controlled with less code duplication addConsoleAction("enable_injection", enableInjection);