FATAL error helping humans decide what they want regarding WBO input fix #5226

firmware/CHANGELOG.md

@@ -47,6 +47,7 @@ Release template (copy/paste this for new release):
  - CAN bus AFR value inverted #5160
  - Subaru EZ30 tdcPosition is now 240
  - ETB control improvements hellen boards #5196
+ - Require either analog AFR or CAN AFR input not both #5226
 
 ## February 2023 Release - "Day 346"
 

firmware/init/sensor/init_sensors.cpp

@@ -41,6 +41,9 @@ void deInitIfValid(const char* msg, adc_channel_e channel) {
 }
 
 static void initOldAnalogInputs() {
+    if (isAdcChannelValid(engineConfiguration->afr.hwChannel) && engineConfiguration->enableAemXSeries) {
+        firmwareError(OBD_PCM_Processor_Fault, "Please pick either analog AFR or CAN AFR input not both.");
+    }
 	initIfValid("AFR", engineConfiguration->afr.hwChannel);
 	initIfValid("AUXF#1", engineConfiguration->auxFastSensor1_adcChannel);
 	initIfValid("CJ125 UR", engineConfiguration->cj125ur);

firmware/tunerstudio/rusefi.input

@@ -289,6 +289,8 @@ enable2ndByteCanID = false
 	requiresPowerCycle = auxSerialRxPin
 	requiresPowerCycle = auxSerialTxPin
 
+	requiresPowerCycle = enableAemXSeries
+
 	requiresPowerCycle = etb_use_two_wires
 	requiresPowerCycle = etbFreq
 	requiresPowerCycle = etbFunctions1