auto-sync

firmware/config/engines/dodge_neon.cpp

@@ -258,7 +258,7 @@ void setDodgeNeon1995EngineConfiguration(DECLARE_ENGINE_PARAMETER_F) {
 }
 
 void setDodgeNeonNGCEngineConfiguration(DECLARE_ENGINE_PARAMETER_F) {
-	engineConfiguration->trigger.type = TT_DODGE_NEON_2003;
+	engineConfiguration->trigger.type = TT_DODGE_NEON_2003_CAM;
 	setFrankenso_01_LCD(boardConfiguration);
 	setFrankenso0_1_joystick(engineConfiguration);
 

firmware/controllers/algo/auto_generated_enums.cpp

@@ -62,8 +62,10 @@ case CUSTOM_ENGINE:
   return "CUSTOM_ENGINE";
 case DODGE_NEON_1995:
   return "DODGE_NEON_1995";
-case DODGE_NEON_2003:
-  return "DODGE_NEON_2003";
+case DODGE_NEON_2003_CAM:
+  return "NEON_2003_CAM";
+case DODGE_NEON_2003_CRANK:
+  return "NEON_2003_CRANK";
 case ET_UNUSED:
   return "ET_UNUSED";
 case FORD_ASPIRE_1996:
@@ -135,8 +137,10 @@ case TT_DODGE_NEON_1995:
   return "TT_DODGE_NEON_1995";
 case TT_GM_LS_24:
 	return "TT_GM_LS_24";
-case TT_DODGE_NEON_2003:
-  return "TT_DODGE_NEON_2003";
+case TT_DODGE_NEON_2003_CAM:
+  return "TT_NEON_2003_CAM";
+case TT_DODGE_NEON_2003_CRANK:
+  return "TT_NEON_2003_CRANK";
 case TT_FORD_ASPIRE:
   return "TT_FORD_ASPIRE";
 case TT_MAZDA_SOHC_4:

firmware/controllers/algo/engine_configuration.cpp

@@ -839,7 +839,8 @@ void resetConfigurationExt(Logging * logger, engine_type_e engineType DECLARE_EN
 	case DODGE_NEON_1995:
 		setDodgeNeon1995EngineConfiguration(PASS_ENGINE_PARAMETER_F);
 		break;
-	case DODGE_NEON_2003:
+	case DODGE_NEON_2003_CAM:
+	case DODGE_NEON_2003_CRANK:
 		setDodgeNeonNGCEngineConfiguration(PASS_ENGINE_PARAMETER_F);
 		break;
 	case LADA_KALINA:

firmware/controllers/algo/rusefi_enums.h

@@ -88,7 +88,7 @@ typedef enum {
 
 	SUBARU_2003_WRX = 22,
 
-	DODGE_NEON_2003 = 23,
+	DODGE_NEON_2003_CAM = 23,
 	MIATA_1994_SPAGS = 24,
 
 	BMW_E34 = 25,
@@ -134,7 +134,9 @@ typedef enum {
 
 	TEST_ENGINE_VVT = 45,
 
-	ET_UNUSED = 46,
+	DODGE_NEON_2003_CRANK = 46,
+
+	ET_UNUSED = 47,
 
 	Force_4b_engine_type = ENUM_32_BITS,
 } engine_type_e;
@@ -161,7 +163,8 @@ typedef enum {
 
 	TT_HONDA_ACCORD_CD_DIP = 13,
 
-	TT_DODGE_NEON_2003 = 14,
+	// cam-based
+	TT_DODGE_NEON_2003_CAM = 14,
 
 	TT_MAZDA_DOHC_1_4 = 15,
 
@@ -195,8 +198,10 @@ typedef enum {
 	// skipped 3/1 with cam sensor for testing
 	TT_3_1_CAM = 31,
 
-	TT_UNUSED = 32, // this is used if we want to iterate over all trigger types
+	// crank-based in case your cam is broken
+	TT_DODGE_NEON_2003_CRANK = 32,
 
+	TT_UNUSED = 33, // this is used if we want to iterate over all trigger types
 
 	Force_4b_trigger_type = ENUM_32_BITS,
 } trigger_type_e;

firmware/controllers/settings.cpp

@@ -119,8 +119,6 @@ const char* getConfigurationName(engine_type_e engineType) {
 #if EFI_SUPPORT_DODGE_NEON
 	case DODGE_NEON_1995:
 		return "Neon95";
-	case DODGE_NEON_2003:
-		return "Neon03";
 #endif /* EFI_SUPPORT_DODGE_NEON */
 #if EFI_SUPPORT_FORD_ASPIRE
 	case FORD_ASPIRE_1996:

firmware/controllers/trigger/trigger_decoder.cpp

@@ -483,7 +483,8 @@ void TriggerShape::initializeTriggerShape(Logging *logger DECLARE_ENGINE_PARAMET
 		configureDodgeStratusTriggerShape(triggerShape PASS_ENGINE_PARAMETER);
 		break;
 
-	case TT_DODGE_NEON_2003:
+	case TT_DODGE_NEON_2003_CAM:
+	case TT_DODGE_NEON_2003_CRANK:
 		configureNeon2003TriggerShape(triggerShape PASS_ENGINE_PARAMETER);
 		break;
 

unit_tests/test_trigger_decoder.cpp

@@ -546,12 +546,12 @@ void testTriggerDecoder(void) {
 
 	testTriggerDecoder2("MAZDA_323", MAZDA_323, 0, 0.4833, 0);
 
-	testTriggerDecoder3("neon NGC4", DODGE_NEON_2003, 6, 0.5000, 0.0, CHRYSLER_NGC4_GAP);
+	testTriggerDecoder3("neon NGC4", DODGE_NEON_2003_CAM, 6, 0.5000, 0.0, CHRYSLER_NGC4_GAP);
 
 	{
 		printTriggerDebug = true;
 
-		EngineTestHelper eth(DODGE_NEON_2003);
+		EngineTestHelper eth(DODGE_NEON_2003_CAM);
 		EXPAND_EngineTestHelper;
 
 		printf("!!!!!!!!!!!!!!!!!! Now trying with only rising edges !!!!!!!!!!!!!!!!!\r\n");