only:Ordinal out of range 130 in vvtPins1 while 79 UINT16

rusefi/fw-custom-example#9
rusefi · Jun 16, 2024 · 5be3289 · 5be3289
1 parent a2fef22
commit 5be3289
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 12 deletions.
diff --git a/firmware/config/engines/canam.cpp b/firmware/config/engines/canam.cpp
@@ -83,7 +83,7 @@ void setMaverickX3() {
 	  // todo: matches Hyundai TODO extract method?
 	  setTPS1Calibration(98, 926, 891, 69);
 
-#if HW_PROTEUS
+#if HW_PROTEUS && EFI_PROD_CODE
     engineConfiguration->camInputs[0] = PROTEUS_DIGITAL_6;
    	engineConfiguration->vehicleSpeedSensorInputPin = PROTEUS_DIGITAL_5;
 	engineConfiguration->auxAnalogInputs[0] = PROTEUS_IN_ANALOG_VOLT_4;

diff --git a/firmware/config/engines/harley.cpp b/firmware/config/engines/harley.cpp
@@ -46,7 +46,7 @@ void setHarley() {
 
 	setCustomMap(/*lowValue*/ 20, /*mapLowValueVoltage*/ 0.79, /*highValue*/ 101.3, /*mapHighValueVoltage*/ 4);
 
-#if HW_PROTEUS
+#if HW_PROTEUS && EFI_PROD_CODE
     engineConfiguration->acrPin = Gpio::PROTEUS_IGN_8;
     engineConfiguration->acrPin2 = Gpio::PROTEUS_IGN_9;
 

diff --git a/firmware/config/engines/hyundai.cpp b/firmware/config/engines/hyundai.cpp
@@ -104,7 +104,7 @@ void setHyundaiPb() {
 	engineConfiguration->map.sensor.hwChannel = H144_IN_MAP2;
 #endif // HW_HELLEN_4CHAN
 
-#if HW_PROTEUS
+#if HW_PROTEUS && EFI_PROD_CODE
 	engineConfiguration->highPressureFuel.hwChannel = PROTEUS_IN_ANALOG_VOLT_4;
 	setCommonNTCSensor(&engineConfiguration->clt, PROTEUS_DEFAULT_AT_PULLUP);
 	setCommonNTCSensor(&engineConfiguration->iat, PROTEUS_DEFAULT_AT_PULLUP);

diff --git a/firmware/config/engines/m111.cpp b/firmware/config/engines/m111.cpp
@@ -62,16 +62,12 @@ void setMercedesM111EngineConfiguration() {
     scBypass->pin = MRE_GPOUT_3;
 #endif // HW_MICRO_RUSEFI
 
-#if HW_MICRO_RUSEFI
+    strcpy(engineConfiguration->gpPwmNote[1], "SC Clutch");
+#if HW_MICRO_RUSEFI && EFI_PROD_CODE
 	gppwm_channel *scClutch = &engineConfiguration->gppwm[1];
     scClutch->pin = MRE_LS_2;
     engineConfiguration->vvtPins[0] = MRE_LS_1;
-#endif // HW_MICRO_RUSEFI
-    strcpy(engineConfiguration->gpPwmNote[1], "SC Clutch");
 
-
-
-#if HW_MICRO_RUSEFI
 	engineConfiguration->fuelPumpPin = MRE_GPOUT_1; // more or less MRE default
 	engineConfiguration->fanPin = MRE_GPOUT_2; // more or less MRE default
     setPPSInputs(MRE_IN_PPS, MRE_IN_PPS2);
@@ -86,7 +82,7 @@ void setMercedesM111EngineConfiguration() {
     // honda cable position sensor
     setPPSCalibration(0.38, 4.77, 4.64, 2.47);
 
-#if HW_PROTEUS
+#if HW_PROTEUS && EFI_PROD_CODE
     engineConfiguration->triggerInputPins[0] = PROTEUS_VR_1;
     engineConfiguration->camInputs[0] = PROTEUS_DIGITAL_2;
 

diff --git a/firmware/config/engines/nissan_vq.cpp b/firmware/config/engines/nissan_vq.cpp
@@ -64,7 +64,7 @@ void setHellen121nissanVQ() {
 	// we have this here and not in board_configuration.cpp so that unit test would get this value
 	engineConfiguration->invertCamVVTSignal = true;
 
-#if HW_HELLEN
+#if HW_HELLEN && EFI_PROD_CODE
 	engineConfiguration->vvtPins[0 * CAMS_PER_BANK] = H176_LS_7;
 	engineConfiguration->vvtPins[1 * CAMS_PER_BANK] = H176_LS_8;
 #endif

diff --git a/firmware/controllers/algo/defaults/default_base_engine.cpp b/firmware/controllers/algo/defaults/default_base_engine.cpp
@@ -159,7 +159,7 @@ void setDefaultBaseEngine() {
 #if EFI_SIMULATOR
 	engineConfiguration->vvtMode[0] = VVT_SINGLE_TOOTH;
 	engineConfiguration->vvtOffsets[0] = 450;
-	engineConfiguration->vvtPins[0] = Gpio::I0; // a random unused pin needed to unblock startSimplePwmExt()
+	engineConfiguration->vvtPins[0] = Gpio::E0; // a random unused pin needed to unblock startSimplePwmExt()
 #endif // EFI_SIMULATOR
 
 #if EFI_SIMULATOR