From 04ec8171da6ae7173c7d751d3e0381570b4aa752 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Wed, 1 Oct 2014 18:03:00 -0500 Subject: [PATCH] auto-sync --- firmware/config/engines/dodge_neon.cpp | 8 +++++++- firmware/config/engines/dodge_neon.h | 5 ++++- firmware/controllers/algo/engine_configuration.cpp | 5 ++++- firmware/controllers/algo/enum_strings.cpp | 4 +++- firmware/controllers/trigger/trigger_chrysler.cpp | 7 ++++++- firmware/controllers/trigger/trigger_chrysler.h | 3 ++- firmware/controllers/trigger/trigger_decoder.cpp | 6 +++++- firmware/rusefi.cpp | 2 +- 8 files changed, 32 insertions(+), 8 deletions(-) diff --git a/firmware/config/engines/dodge_neon.cpp b/firmware/config/engines/dodge_neon.cpp index f1391acdd5..c4ab80db35 100644 --- a/firmware/config/engines/dodge_neon.cpp +++ b/firmware/config/engines/dodge_neon.cpp @@ -18,7 +18,7 @@ #include "thermistors.h" #include "engine_math.h" -void setDodgeNeonEngineConfiguration(engine_configuration_s *engineConfiguration, +void setDodgeNeon1995EngineConfiguration(engine_configuration_s *engineConfiguration, board_configuration_s *boardConfiguration) { engineConfiguration->triggerConfig.triggerType = TT_DODGE_NEON_1995; @@ -104,5 +104,11 @@ void setDodgeNeonEngineConfiguration(engine_configuration_s *engineConfiguration engineConfiguration->analogChartFrequency = 7; } +void setDodgeNeonNGCEngineConfiguration(engine_configuration_s *engineConfiguration, + board_configuration_s *boardConfiguration) { + engineConfiguration->triggerConfig.triggerType = TT_DODGE_NEON_2003; +} + + #endif /* EFI_SUPPORT_DODGE_NEON */ diff --git a/firmware/config/engines/dodge_neon.h b/firmware/config/engines/dodge_neon.h index baae197d11..a84f7744c5 100644 --- a/firmware/config/engines/dodge_neon.h +++ b/firmware/config/engines/dodge_neon.h @@ -13,7 +13,10 @@ #include "engine_configuration.h" -void setDodgeNeonEngineConfiguration(engine_configuration_s *engineConfiguration, +void setDodgeNeon1995EngineConfiguration(engine_configuration_s *engineConfiguration, + board_configuration_s *boardConfiguration); + +void setDodgeNeonNGCEngineConfiguration(engine_configuration_s *engineConfiguration, board_configuration_s *boardConfiguration); #endif /* EFI_SUPPORT_DODGE_NEON */ diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index 5fbf445e84..d96b45d978 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -414,7 +414,10 @@ void resetConfigurationExt(Logging * logger, engine_type_e engineType, engine_co switch (engineType) { #if EFI_SUPPORT_DODGE_NEON || defined(__DOXYGEN__) case DODGE_NEON_1995: - setDodgeNeonEngineConfiguration(engineConfiguration, boardConfiguration); + setDodgeNeon1995EngineConfiguration(engineConfiguration, boardConfiguration); + break; + case DODGE_NEON_2003: + setDodgeNeonNGCEngineConfiguration(engineConfiguration, boardConfiguration); break; #endif /* EFI_SUPPORT_DODGE_NEON */ #if EFI_SUPPORT_FORD_ASPIRE || defined(__DOXYGEN__) diff --git a/firmware/controllers/algo/enum_strings.cpp b/firmware/controllers/algo/enum_strings.cpp index 43dd43d37e..14086ddc0f 100644 --- a/firmware/controllers/algo/enum_strings.cpp +++ b/firmware/controllers/algo/enum_strings.cpp @@ -16,7 +16,9 @@ const char* getConfigurationName(engine_type_e engineType) { switch (engineType) { #if EFI_SUPPORT_DODGE_NEON case DODGE_NEON_1995: - return "Dodge Neon"; + return "Neon 1995"; + case DODGE_NEON_2003: + return "Neon 2003"; #endif /* EFI_SUPPORT_DODGE_NEON */ #if EFI_SUPPORT_FORD_ASPIRE case FORD_ASPIRE_1996: diff --git a/firmware/controllers/trigger/trigger_chrysler.cpp b/firmware/controllers/trigger/trigger_chrysler.cpp index 6250b360f4..d937f43451 100644 --- a/firmware/controllers/trigger/trigger_chrysler.cpp +++ b/firmware/controllers/trigger/trigger_chrysler.cpp @@ -7,7 +7,12 @@ #include "trigger_chrysler.h" -void configureNeonTriggerShape(trigger_shape_s *s) { +void configureNeon2003TriggerShape(trigger_shape_s *s) { + s->reset(FOUR_STROKE_CAM_SENSOR); + +} + +void configureNeon1995TriggerShape(trigger_shape_s *s) { s->reset(FOUR_STROKE_CAM_SENSOR); setTriggerSynchronizationGap(s, 0.72); diff --git a/firmware/controllers/trigger/trigger_chrysler.h b/firmware/controllers/trigger/trigger_chrysler.h index adbf3339ea..eec78115dd 100644 --- a/firmware/controllers/trigger/trigger_chrysler.h +++ b/firmware/controllers/trigger/trigger_chrysler.h @@ -10,6 +10,7 @@ #include "trigger_structure.h" -void configureNeonTriggerShape(trigger_shape_s *s); +void configureNeon1995TriggerShape(trigger_shape_s *s); +void configureNeon2003TriggerShape(trigger_shape_s *s); #endif /* TRIGGER_CHRYSLER_H_ */ diff --git a/firmware/controllers/trigger/trigger_decoder.cpp b/firmware/controllers/trigger/trigger_decoder.cpp index edfe6c511d..3d51cad3d4 100644 --- a/firmware/controllers/trigger/trigger_decoder.cpp +++ b/firmware/controllers/trigger/trigger_decoder.cpp @@ -209,7 +209,11 @@ void initializeTriggerShape(Logging *logger, engine_configuration_s const *engin return; case TT_DODGE_NEON_1995: - configureNeonTriggerShape(triggerShape); + configureNeon1995TriggerShape(triggerShape); + return; + + case TT_DODGE_NEON_2003: + configureNeon2003TriggerShape(triggerShape); return; case TT_FORD_ASPIRE: diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp index fe3408b3dd..9cd397cf93 100644 --- a/firmware/rusefi.cpp +++ b/firmware/rusefi.cpp @@ -241,5 +241,5 @@ void firmwareError(const char *fmt, ...) { } int getRusEfiVersion(void) { - return 20140928; + return 20141001; }