From d796d1d30ee1de251ed851a038b8a7dec2e5da4a Mon Sep 17 00:00:00 2001
From: GitHub git update Action <action@github.com>
Date: Fri, 6 Sep 2024 18:01:53 +0000
Subject: [PATCH] Auto-generated Default Tune

[no ci]
---
 generated/simulator_tune.msq                  | 108 +++++++++---------
 generated/simulator_tune_BMW_M52.msq          | 108 +++++++++---------
 generated/simulator_tune_HARLEY.msq           | 108 +++++++++---------
 ...simulator_tune_HELLEN_121_NISSAN_6_CYL.msq | 108 +++++++++---------
 ...ator_tune_HELLEN_154_HYUNDAI_COUPE_BK1.msq | 108 +++++++++---------
 ...ator_tune_HELLEN_154_HYUNDAI_COUPE_BK2.msq | 108 +++++++++---------
 generated/simulator_tune_HONDA_K.msq          | 108 +++++++++---------
 generated/simulator_tune_HONDA_OBD1.msq       | 108 +++++++++---------
 generated/simulator_tune_HYUNDAI_PB.msq       | 108 +++++++++---------
 generated/simulator_tune_MAVERICK_X3.msq      | 108 +++++++++---------
 generated/simulator_tune_MAZDA_MIATA_NA6.msq  | 108 +++++++++---------
 generated/simulator_tune_MAZDA_MIATA_NA94.msq | 108 +++++++++---------
 generated/simulator_tune_MAZDA_MIATA_NA96.msq | 108 +++++++++---------
 generated/simulator_tune_MAZDA_MIATA_NB1.msq  | 108 +++++++++---------
 generated/simulator_tune_MAZDA_MIATA_NB2.msq  | 108 +++++++++---------
 generated/simulator_tune_MERCEDES_M111.msq    | 108 +++++++++---------
 generated/simulator_tune_POLARIS_RZR.msq      | 108 +++++++++---------
 17 files changed, 918 insertions(+), 918 deletions(-)

diff --git a/generated/simulator_tune.msq b/generated/simulator_tune.msq
index cfe7bd7..0314e49 100644
--- a/generated/simulator_tune.msq
+++ b/generated/simulator_tune.msq
@@ -157,7 +157,7 @@
         <constant digits="2" name="map_sensor_lowValue" units="kpa">0.0</constant>
         <constant digits="2" name="map_sensor_highValue" units="kpa">0.0</constant>
         <constant name="map_sensor_type">"MPX4250"</constant>
-        <constant name="map_sensor_hwChannel">"NONE"</constant>
+        <constant name="map_sensor_hwChannel">"Disabled"</constant>
         <constant digits="1" name="clt_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="clt_tempC_2" units="*C">23.8889</constant>
         <constant digits="1" name="clt_tempC_3" units="*C">48.8889</constant>
@@ -165,7 +165,7 @@
         <constant digits="1" name="clt_resistance_2" units="Ohm">2100.0</constant>
         <constant digits="1" name="clt_resistance_3" units="Ohm">1000.0</constant>
         <constant digits="1" name="clt_bias_resistor" units="Ohm">1500.0</constant>
-        <constant name="clt_adcChannel">"NONE"</constant>
+        <constant name="clt_adcChannel">"Disabled"</constant>
         <constant digits="1" name="iat_tempC_1" units="*C">-20.0</constant>
         <constant digits="1" name="iat_tempC_2" units="*C">23.8889</constant>
         <constant digits="1" name="iat_tempC_3" units="*C">120.0</constant>
@@ -173,7 +173,7 @@
         <constant digits="1" name="iat_resistance_2" units="Ohm">2100.0</constant>
         <constant digits="1" name="iat_resistance_3" units="Ohm">100.0</constant>
         <constant digits="1" name="iat_bias_resistor" units="Ohm">2700.0</constant>
-        <constant name="iat_adcChannel">"NONE"</constant>
+        <constant name="iat_adcChannel">"Disabled"</constant>
         <constant digits="2" name="launchTimingRetard" units="deg">0.0</constant>
         <constant digits="0" name="hip9011PrescalerAndSDO" units="integer">0.0</constant>
         <constant digits="0" name="unusedFloatHere" units="">0.0</constant>
@@ -209,10 +209,10 @@
         <constant digits="1" name="driveWheelRevPerKm" units="revs/km">1000.0</constant>
         <constant digits="2" name="canSleepPeriodMs" units="ms">50.0</constant>
         <constant digits="0" name="byFirmwareVersion" units="index">2.0240906E7</constant>
-        <constant name="tps1_1AdcChannel">"NONE"</constant>
-        <constant name="vbattAdcChannel">"NONE"</constant>
-        <constant name="fuelLevelSensor">"NONE"</constant>
-        <constant name="tps2_1AdcChannel">"NONE"</constant>
+        <constant name="tps1_1AdcChannel">"Disabled"</constant>
+        <constant name="vbattAdcChannel">"Disabled"</constant>
+        <constant name="fuelLevelSensor">"Disabled"</constant>
+        <constant name="tps2_1AdcChannel">"Disabled"</constant>
         <constant digits="4" name="idle_derivativeFilterLoss" units="x">0.0</constant>
         <constant digits="0" name="trailingSparkAngle" units="angle">10.0</constant>
         <constant name="trigger_type">"60-2"</constant>
@@ -221,7 +221,7 @@
         <constant digits="1" name="airByRpmTaper" units="%">0.0</constant>
         <constant name="hip9011SpiDevice">"Off"</constant>
         <constant digits="0" name="boostControlSafeDutyCycle" units="%">0.0</constant>
-        <constant name="mafAdcChannel">"NONE"</constant>
+        <constant name="mafAdcChannel">"Disabled"</constant>
         <constant digits="0" name="acrRevolutions" units="">5.0</constant>
         <constant digits="0" name="calibrationBirthday" units="">2.0240906E7</constant>
         <constant digits="3" name="adcVcc" units="volts">3.0</constant>
@@ -230,13 +230,13 @@
         <constant name="camInputs2">"NONE"</constant>
         <constant name="camInputs3">"NONE"</constant>
         <constant name="camInputs4">"NONE"</constant>
-        <constant name="afr_hwChannel">"NONE"</constant>
-        <constant name="afr_hwChannel2">"NONE"</constant>
+        <constant name="afr_hwChannel">"Disabled"</constant>
+        <constant name="afr_hwChannel2">"Disabled"</constant>
         <constant digits="2" name="afr_v1" units="volts">0.0</constant>
         <constant digits="2" name="afr_value1" units="AFR">9.996</constant>
         <constant digits="2" name="afr_v2" units="volts">5.0</constant>
         <constant digits="2" name="afr_value2" units="AFR">19.992</constant>
-        <constant name="throttlePedalPositionAdcChannel">"NONE"</constant>
+        <constant name="throttlePedalPositionAdcChannel">"Disabled"</constant>
         <constant digits="1" name="etbSplit" units="%">5.0</constant>
         <constant name="tle6240_cs">"NONE"</constant>
         <constant name="tle6240_csPinMode">"default"</constant>
@@ -245,7 +245,7 @@
         <constant digits="2" name="baroSensor_lowValue" units="kpa">0.0</constant>
         <constant digits="2" name="baroSensor_highValue" units="kpa">500.0</constant>
         <constant name="baroSensor_type">"Custom"</constant>
-        <constant name="baroSensor_hwChannel">"NONE"</constant>
+        <constant name="baroSensor_hwChannel">"Disabled"</constant>
         <constant digits="0" name="idle_solenoidFrequency" units="Hz">300.0</constant>
         <constant name="idle_solenoidPin">"NONE"</constant>
         <constant name="idle_stepperDirectionPin">"NONE"</constant>
@@ -308,10 +308,10 @@
         <constant name="brakePedalPinMode">"PULLUP"</constant>
         <constant name="mc33972_cs">"NONE"</constant>
         <constant name="mc33972_csPinMode">"default"</constant>
-        <constant name="auxFastSensor1_adcChannel">"NONE"</constant>
-        <constant name="tps1_2AdcChannel">"NONE"</constant>
-        <constant name="tps2_2AdcChannel">"NONE"</constant>
-        <constant name="throttlePedalPositionSecondAdcChannel">"NONE"</constant>
+        <constant name="auxFastSensor1_adcChannel">"Disabled"</constant>
+        <constant name="tps1_2AdcChannel">"Disabled"</constant>
+        <constant name="tps2_2AdcChannel">"Disabled"</constant>
+        <constant name="throttlePedalPositionSecondAdcChannel">"Disabled"</constant>
         <constant name="afr_type">"14Point7"</constant>
         <constant name="mc33810_cs1">"NONE"</constant>
         <constant digits="4" name="idle_antiwindupFreq" units="x">0.0</constant>
@@ -328,7 +328,7 @@
         <constant digits="3" name="fordInjectorSmallPulseSlope" units="g/s">0.0</constant>
         <constant name="triggerSimulatorPinModes1">"default"</constant>
         <constant name="triggerSimulatorPinModes2">"default"</constant>
-        <constant name="maf2AdcChannel">"NONE"</constant>
+        <constant name="maf2AdcChannel">"Disabled"</constant>
         <constant name="o2heaterPin">"NONE"</constant>
         <constant name="o2heaterPinModeTodO">"default"</constant>
         <constant digits="0" name="lambdaProtectionMinRpm" units="RPM">2500.0</constant>
@@ -405,7 +405,7 @@
         <constant digits="1" name="stoichRatioSecondary" units=":1">9.0</constant>
         <constant digits="0" name="etbMaximumPosition" units="%">100.0</constant>
         <constant digits="0" name="sdCardLogFrequency" units="hz">50.0</constant>
-        <constant name="idlePositionChannel">"NONE"</constant>
+        <constant name="idlePositionChannel">"Disabled"</constant>
         <constant digits="0" name="launchCorrectionsEndRpm" units="">0.0</constant>
         <constant name="starterRelayDisablePin">"NONE"</constant>
         <constant name="starterRelayDisablePinMode">"default"</constant>
@@ -637,9 +637,9 @@
         <constant name="launchActivateInverted">"false"</constant>
         <constant name="twoStroke">"Four Stroke"</constant>
         <constant name="skippedWheelOnCam">"On crankshaft"</constant>
-        <constant name="hipOutputChannel">"NONE"</constant>
+        <constant name="hipOutputChannel">"Disabled"</constant>
         <constant name="acSwitch">"NONE"</constant>
-        <constant name="vRefAdcChannel">"NONE"</constant>
+        <constant name="vRefAdcChannel">"Disabled"</constant>
         <constant digits="0" name="etbNeutralPosition" units="%">0.0</constant>
         <constant name="idleMode">"Open Loop"</constant>
         <constant name="isInjectionEnabled">"true"</constant>
@@ -812,7 +812,7 @@
         <constant name="can2TxPin">"NONE"</constant>
         <constant name="can2RxPin">"NONE"</constant>
         <constant name="starterControlPinMode">"default"</constant>
-        <constant name="wastegatePositionSensor">"NONE"</constant>
+        <constant name="wastegatePositionSensor">"Disabled"</constant>
         <constant name="ignOverrideMode">"None"</constant>
         <constant name="injectorPressureType">"Low"</constant>
         <constant name="hpfpValvePin">"NONE"</constant>
@@ -858,7 +858,7 @@
         <constant digits="2" name="mapLowValueVoltage" units="v">0.0</constant>
         <constant digits="2" name="mapHighValueVoltage" units="v">5.0</constant>
         <constant digits="2" name="egoValueShift" units="value">0.0</constant>
-        <constant name="vvtPins1">"INVALID"</constant>
+        <constant name="vvtPins1">"PA0"</constant>
         <constant name="vvtPins2">"NONE"</constant>
         <constant name="vvtPins3">"NONE"</constant>
         <constant name="vvtPins4">"NONE"</constant>
@@ -875,14 +875,14 @@
         <constant name="vvtMode2">"Inactive"</constant>
         <constant digits="0" name="fan2ExtraIdle" units="%">2.0</constant>
         <constant digits="2" name="primingDelay" units="sec">0.5</constant>
-        <constant name="auxAnalogInputs1">"NONE"</constant>
-        <constant name="auxAnalogInputs2">"NONE"</constant>
-        <constant name="auxAnalogInputs3">"NONE"</constant>
-        <constant name="auxAnalogInputs4">"NONE"</constant>
-        <constant name="auxAnalogInputs5">"NONE"</constant>
-        <constant name="auxAnalogInputs6">"NONE"</constant>
-        <constant name="auxAnalogInputs7">"NONE"</constant>
-        <constant name="auxAnalogInputs8">"NONE"</constant>
+        <constant name="auxAnalogInputs1">"Disabled"</constant>
+        <constant name="auxAnalogInputs2">"Disabled"</constant>
+        <constant name="auxAnalogInputs3">"Disabled"</constant>
+        <constant name="auxAnalogInputs4">"Disabled"</constant>
+        <constant name="auxAnalogInputs5">"Disabled"</constant>
+        <constant name="auxAnalogInputs6">"Disabled"</constant>
+        <constant name="auxAnalogInputs7">"Disabled"</constant>
+        <constant name="auxAnalogInputs8">"Disabled"</constant>
         <constant name="trailingCoilPins1">"NONE"</constant>
         <constant name="trailingCoilPins2">"NONE"</constant>
         <constant name="trailingCoilPins3">"NONE"</constant>
@@ -907,7 +907,7 @@
         <constant digits="1" name="auxTempSensor1_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="auxTempSensor1_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="auxTempSensor1_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="auxTempSensor1_adcChannel">"NONE"</constant>
+        <constant name="auxTempSensor1_adcChannel">"Disabled"</constant>
         <constant digits="1" name="auxTempSensor2_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="auxTempSensor2_tempC_2" units="*C">0.0</constant>
         <constant digits="1" name="auxTempSensor2_tempC_3" units="*C">0.0</constant>
@@ -915,7 +915,7 @@
         <constant digits="1" name="auxTempSensor2_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="auxTempSensor2_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="auxTempSensor2_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="auxTempSensor2_adcChannel">"NONE"</constant>
+        <constant name="auxTempSensor2_adcChannel">"Disabled"</constant>
         <constant digits="0" name="knockSamplingDuration" units="Deg">45.0</constant>
         <constant digits="0" name="etbFreq" units="Hz">800.0</constant>
         <constant digits="4" name="etbWastegatePid_pFactor" units="">1.0</constant>
@@ -987,7 +987,7 @@
          80.0
          100.0
 </constant>
-        <constant name="oilPressure_hwChannel">"NONE"</constant>
+        <constant name="oilPressure_hwChannel">"Disabled"</constant>
         <constant digits="2" name="oilPressure_v1" units="volts">0.5</constant>
         <constant digits="2" name="oilPressure_value1" units="">0.0</constant>
         <constant digits="2" name="oilPressure_v2" units="volts">4.5</constant>
@@ -1008,12 +1008,12 @@
         <constant digits="0" name="coastingFuelCutClt" units="C">60.0</constant>
         <constant digits="0" name="pidExtraForLowRpm" units="%">0.0</constant>
         <constant digits="0" name="coastingFuelCutMap" units="kPa">30.0</constant>
-        <constant name="highPressureFuel_hwChannel">"NONE"</constant>
+        <constant name="highPressureFuel_hwChannel">"Disabled"</constant>
         <constant digits="2" name="highPressureFuel_v1" units="volts">0.0</constant>
         <constant digits="2" name="highPressureFuel_value1" units="">0.0</constant>
         <constant digits="2" name="highPressureFuel_v2" units="volts">0.0</constant>
         <constant digits="2" name="highPressureFuel_value2" units="">0.0</constant>
-        <constant name="lowPressureFuel_hwChannel">"NONE"</constant>
+        <constant name="lowPressureFuel_hwChannel">"Disabled"</constant>
         <constant digits="2" name="lowPressureFuel_v1" units="volts">0.0</constant>
         <constant digits="2" name="lowPressureFuel_value1" units="">0.0</constant>
         <constant digits="2" name="lowPressureFuel_v2" units="volts">0.0</constant>
@@ -1349,12 +1349,12 @@
         <constant name="gearControllerMode">"None"</constant>
         <constant name="transmissionControllerMode">"None"</constant>
         <constant digits="0" name="acrDisablePhase" units="deg">0.0</constant>
-        <constant name="auxLinear1_hwChannel">"NONE"</constant>
+        <constant name="auxLinear1_hwChannel">"Disabled"</constant>
         <constant digits="2" name="auxLinear1_v1" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear1_value1" units="">0.0</constant>
         <constant digits="2" name="auxLinear1_v2" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear1_value2" units="">0.0</constant>
-        <constant name="auxLinear2_hwChannel">"NONE"</constant>
+        <constant name="auxLinear2_hwChannel">"Disabled"</constant>
         <constant digits="2" name="auxLinear2_v1" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear2_value1" units="">0.0</constant>
         <constant digits="2" name="auxLinear2_v2" units="volts">0.0</constant>
@@ -1488,7 +1488,7 @@
         <constant digits="1" name="oilTempSensor_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="oilTempSensor_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="oilTempSensor_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="oilTempSensor_adcChannel">"NONE"</constant>
+        <constant name="oilTempSensor_adcChannel">"Disabled"</constant>
         <constant digits="1" name="fuelTempSensor_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="fuelTempSensor_tempC_2" units="*C">0.0</constant>
         <constant digits="1" name="fuelTempSensor_tempC_3" units="*C">0.0</constant>
@@ -1496,7 +1496,7 @@
         <constant digits="1" name="fuelTempSensor_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="fuelTempSensor_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="fuelTempSensor_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="fuelTempSensor_adcChannel">"NONE"</constant>
+        <constant name="fuelTempSensor_adcChannel">"Disabled"</constant>
         <constant digits="1" name="ambientTempSensor_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="ambientTempSensor_tempC_2" units="*C">0.0</constant>
         <constant digits="1" name="ambientTempSensor_tempC_3" units="*C">0.0</constant>
@@ -1504,7 +1504,7 @@
         <constant digits="1" name="ambientTempSensor_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="ambientTempSensor_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="ambientTempSensor_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="ambientTempSensor_adcChannel">"NONE"</constant>
+        <constant name="ambientTempSensor_adcChannel">"Disabled"</constant>
         <constant digits="1" name="compressorDischargeTemperature_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="compressorDischargeTemperature_tempC_2" units="*C">0.0</constant>
         <constant digits="1" name="compressorDischargeTemperature_tempC_3" units="*C">0.0</constant>
@@ -1512,9 +1512,9 @@
         <constant digits="1" name="compressorDischargeTemperature_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="compressorDischargeTemperature_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="compressorDischargeTemperature_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="compressorDischargeTemperature_adcChannel">"NONE"</constant>
-        <constant name="throttleInletPressureChannel">"NONE"</constant>
-        <constant name="compressorDischargePressureChannel">"NONE"</constant>
+        <constant name="compressorDischargeTemperature_adcChannel">"Disabled"</constant>
+        <constant name="throttleInletPressureChannel">"Disabled"</constant>
+        <constant name="compressorDischargePressureChannel">"Disabled"</constant>
         <constant name="dacOutputPins1">"NONE"</constant>
         <constant name="dacOutputPins2">"NONE"</constant>
         <constant name="speedometerOutputPin">"NONE"</constant>
@@ -1523,7 +1523,7 @@
         <constant digits="0" name="simulatorCamPosition2" units="">0.0</constant>
         <constant digits="0" name="simulatorCamPosition3" units="">0.0</constant>
         <constant digits="0" name="simulatorCamPosition4" units="">0.0</constant>
-        <constant name="ignKeyAdcChannel">"NONE"</constant>
+        <constant name="ignKeyAdcChannel">"Disabled"</constant>
         <constant name="spi6MisoMode">"default"</constant>
         <constant digits="3" name="triggerVVTGapOverrideFrom1" units="ratio">0.0</constant>
         <constant digits="3" name="triggerVVTGapOverrideFrom2" units="ratio">0.0</constant>
@@ -1598,18 +1598,18 @@
         <constant digits="0" name="device_uid1" units="">0.0</constant>
         <constant digits="0" name="device_uid2" units="">0.0</constant>
         <constant digits="0" name="device_uid3" units="">0.0</constant>
-        <constant name="tcu_rangeAnalogInput1">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput2">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput3">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput4">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput5">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput6">"NONE"</constant>
+        <constant name="tcu_rangeAnalogInput1">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput2">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput3">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput4">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput5">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput6">"Disabled"</constant>
         <constant digits="1" name="tcu_rangeSensorBiasResistor" units="Ohm">0.0</constant>
         <constant name="msIoBox0_id">"Off"</constant>
         <constant name="msIoBox0_vss">"Off"</constant>
         <constant digits="2" name="mc33810Nomi" units="A">5.5</constant>
         <constant digits="0" name="mc33810Maxi" units="A">14.0</constant>
-        <constant name="acPressure_hwChannel">"NONE"</constant>
+        <constant name="acPressure_hwChannel">"Disabled"</constant>
         <constant digits="2" name="acPressure_v1" units="volts">0.0</constant>
         <constant digits="2" name="acPressure_value1" units="">0.0</constant>
         <constant digits="2" name="acPressure_v2" units="volts">0.0</constant>
@@ -1617,12 +1617,12 @@
         <constant digits="0" name="minAcPressure" units="kPa">100.0</constant>
         <constant digits="0" name="maxAcPressure" units="kPa">300.0</constant>
         <constant digits="1" name="minimumOilPressureTimeout" units="sec">0.5</constant>
-        <constant name="auxLinear3_hwChannel">"NONE"</constant>
+        <constant name="auxLinear3_hwChannel">"Disabled"</constant>
         <constant digits="2" name="auxLinear3_v1" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear3_value1" units="">0.0</constant>
         <constant digits="2" name="auxLinear3_v2" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear3_value2" units="">0.0</constant>
-        <constant name="auxLinear4_hwChannel">"NONE"</constant>
+        <constant name="auxLinear4_hwChannel">"Disabled"</constant>
         <constant digits="2" name="auxLinear4_v1" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear4_value1" units="">0.0</constant>
         <constant digits="2" name="auxLinear4_v2" units="volts">0.0</constant>
@@ -4760,7 +4760,7 @@ end</constant>
          0.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240830" nPages="1" signature="rusEFI main.2024.09.06.mega100.821184268" version="5.0"/>
+    <versionInfo firmwareInfo="20240830" nPages="1" signature="rusEFI main.2024.09.06.mega100.2965644658" version="5.0"/>
     <bibliography author="rusEFI 20240830" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/generated/simulator_tune_BMW_M52.msq b/generated/simulator_tune_BMW_M52.msq
index a837051..cd7b322 100644
--- a/generated/simulator_tune_BMW_M52.msq
+++ b/generated/simulator_tune_BMW_M52.msq
@@ -157,7 +157,7 @@
         <constant digits="2" name="map_sensor_lowValue" units="kpa">0.0</constant>
         <constant digits="2" name="map_sensor_highValue" units="kpa">0.0</constant>
         <constant name="map_sensor_type">"MPX4250"</constant>
-        <constant name="map_sensor_hwChannel">"NONE"</constant>
+        <constant name="map_sensor_hwChannel">"Disabled"</constant>
         <constant digits="1" name="clt_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="clt_tempC_2" units="*C">23.8889</constant>
         <constant digits="1" name="clt_tempC_3" units="*C">48.8889</constant>
@@ -165,7 +165,7 @@
         <constant digits="1" name="clt_resistance_2" units="Ohm">2100.0</constant>
         <constant digits="1" name="clt_resistance_3" units="Ohm">1000.0</constant>
         <constant digits="1" name="clt_bias_resistor" units="Ohm">1500.0</constant>
-        <constant name="clt_adcChannel">"NONE"</constant>
+        <constant name="clt_adcChannel">"Disabled"</constant>
         <constant digits="1" name="iat_tempC_1" units="*C">-20.0</constant>
         <constant digits="1" name="iat_tempC_2" units="*C">23.8889</constant>
         <constant digits="1" name="iat_tempC_3" units="*C">120.0</constant>
@@ -173,7 +173,7 @@
         <constant digits="1" name="iat_resistance_2" units="Ohm">2100.0</constant>
         <constant digits="1" name="iat_resistance_3" units="Ohm">100.0</constant>
         <constant digits="1" name="iat_bias_resistor" units="Ohm">2700.0</constant>
-        <constant name="iat_adcChannel">"NONE"</constant>
+        <constant name="iat_adcChannel">"Disabled"</constant>
         <constant digits="2" name="launchTimingRetard" units="deg">0.0</constant>
         <constant digits="0" name="hip9011PrescalerAndSDO" units="integer">0.0</constant>
         <constant digits="0" name="unusedFloatHere" units="">0.0</constant>
@@ -209,10 +209,10 @@
         <constant digits="1" name="driveWheelRevPerKm" units="revs/km">1000.0</constant>
         <constant digits="2" name="canSleepPeriodMs" units="ms">50.0</constant>
         <constant digits="0" name="byFirmwareVersion" units="index">0.0</constant>
-        <constant name="tps1_1AdcChannel">"NONE"</constant>
-        <constant name="vbattAdcChannel">"NONE"</constant>
-        <constant name="fuelLevelSensor">"NONE"</constant>
-        <constant name="tps2_1AdcChannel">"NONE"</constant>
+        <constant name="tps1_1AdcChannel">"Disabled"</constant>
+        <constant name="vbattAdcChannel">"Disabled"</constant>
+        <constant name="fuelLevelSensor">"Disabled"</constant>
+        <constant name="tps2_1AdcChannel">"Disabled"</constant>
         <constant digits="4" name="idle_derivativeFilterLoss" units="x">0.0</constant>
         <constant digits="0" name="trailingSparkAngle" units="angle">10.0</constant>
         <constant name="trigger_type">"60-2"</constant>
@@ -221,7 +221,7 @@
         <constant digits="1" name="airByRpmTaper" units="%">0.0</constant>
         <constant name="hip9011SpiDevice">"Off"</constant>
         <constant digits="0" name="boostControlSafeDutyCycle" units="%">0.0</constant>
-        <constant name="mafAdcChannel">"NONE"</constant>
+        <constant name="mafAdcChannel">"Disabled"</constant>
         <constant digits="0" name="acrRevolutions" units="">5.0</constant>
         <constant digits="0" name="calibrationBirthday" units="">2.0240906E7</constant>
         <constant digits="3" name="adcVcc" units="volts">3.0</constant>
@@ -230,13 +230,13 @@
         <constant name="camInputs2">"NONE"</constant>
         <constant name="camInputs3">"NONE"</constant>
         <constant name="camInputs4">"NONE"</constant>
-        <constant name="afr_hwChannel">"NONE"</constant>
-        <constant name="afr_hwChannel2">"NONE"</constant>
+        <constant name="afr_hwChannel">"Disabled"</constant>
+        <constant name="afr_hwChannel2">"Disabled"</constant>
         <constant digits="2" name="afr_v1" units="volts">0.0</constant>
         <constant digits="2" name="afr_value1" units="AFR">9.996</constant>
         <constant digits="2" name="afr_v2" units="volts">5.0</constant>
         <constant digits="2" name="afr_value2" units="AFR">19.992</constant>
-        <constant name="throttlePedalPositionAdcChannel">"NONE"</constant>
+        <constant name="throttlePedalPositionAdcChannel">"Disabled"</constant>
         <constant digits="1" name="etbSplit" units="%">5.0</constant>
         <constant name="tle6240_cs">"NONE"</constant>
         <constant name="tle6240_csPinMode">"default"</constant>
@@ -245,7 +245,7 @@
         <constant digits="2" name="baroSensor_lowValue" units="kpa">0.0</constant>
         <constant digits="2" name="baroSensor_highValue" units="kpa">500.0</constant>
         <constant name="baroSensor_type">"Custom"</constant>
-        <constant name="baroSensor_hwChannel">"NONE"</constant>
+        <constant name="baroSensor_hwChannel">"Disabled"</constant>
         <constant digits="0" name="idle_solenoidFrequency" units="Hz">300.0</constant>
         <constant name="idle_solenoidPin">"NONE"</constant>
         <constant name="idle_stepperDirectionPin">"NONE"</constant>
@@ -308,10 +308,10 @@
         <constant name="brakePedalPinMode">"PULLUP"</constant>
         <constant name="mc33972_cs">"NONE"</constant>
         <constant name="mc33972_csPinMode">"default"</constant>
-        <constant name="auxFastSensor1_adcChannel">"NONE"</constant>
-        <constant name="tps1_2AdcChannel">"NONE"</constant>
-        <constant name="tps2_2AdcChannel">"NONE"</constant>
-        <constant name="throttlePedalPositionSecondAdcChannel">"NONE"</constant>
+        <constant name="auxFastSensor1_adcChannel">"Disabled"</constant>
+        <constant name="tps1_2AdcChannel">"Disabled"</constant>
+        <constant name="tps2_2AdcChannel">"Disabled"</constant>
+        <constant name="throttlePedalPositionSecondAdcChannel">"Disabled"</constant>
         <constant name="afr_type">"14Point7"</constant>
         <constant name="mc33810_cs1">"NONE"</constant>
         <constant digits="4" name="idle_antiwindupFreq" units="x">0.0</constant>
@@ -328,7 +328,7 @@
         <constant digits="3" name="fordInjectorSmallPulseSlope" units="g/s">0.0</constant>
         <constant name="triggerSimulatorPinModes1">"default"</constant>
         <constant name="triggerSimulatorPinModes2">"default"</constant>
-        <constant name="maf2AdcChannel">"NONE"</constant>
+        <constant name="maf2AdcChannel">"Disabled"</constant>
         <constant name="o2heaterPin">"NONE"</constant>
         <constant name="o2heaterPinModeTodO">"default"</constant>
         <constant digits="0" name="lambdaProtectionMinRpm" units="RPM">2500.0</constant>
@@ -405,7 +405,7 @@
         <constant digits="1" name="stoichRatioSecondary" units=":1">9.0</constant>
         <constant digits="0" name="etbMaximumPosition" units="%">100.0</constant>
         <constant digits="0" name="sdCardLogFrequency" units="hz">50.0</constant>
-        <constant name="idlePositionChannel">"NONE"</constant>
+        <constant name="idlePositionChannel">"Disabled"</constant>
         <constant digits="0" name="launchCorrectionsEndRpm" units="">0.0</constant>
         <constant name="starterRelayDisablePin">"NONE"</constant>
         <constant name="starterRelayDisablePinMode">"default"</constant>
@@ -637,9 +637,9 @@
         <constant name="launchActivateInverted">"false"</constant>
         <constant name="twoStroke">"Four Stroke"</constant>
         <constant name="skippedWheelOnCam">"On crankshaft"</constant>
-        <constant name="hipOutputChannel">"NONE"</constant>
+        <constant name="hipOutputChannel">"Disabled"</constant>
         <constant name="acSwitch">"NONE"</constant>
-        <constant name="vRefAdcChannel">"NONE"</constant>
+        <constant name="vRefAdcChannel">"Disabled"</constant>
         <constant digits="0" name="etbNeutralPosition" units="%">0.0</constant>
         <constant name="idleMode">"Open Loop"</constant>
         <constant name="isInjectionEnabled">"true"</constant>
@@ -812,7 +812,7 @@
         <constant name="can2TxPin">"NONE"</constant>
         <constant name="can2RxPin">"NONE"</constant>
         <constant name="starterControlPinMode">"default"</constant>
-        <constant name="wastegatePositionSensor">"NONE"</constant>
+        <constant name="wastegatePositionSensor">"Disabled"</constant>
         <constant name="ignOverrideMode">"None"</constant>
         <constant name="injectorPressureType">"Low"</constant>
         <constant name="hpfpValvePin">"NONE"</constant>
@@ -858,7 +858,7 @@
         <constant digits="2" name="mapLowValueVoltage" units="v">0.0</constant>
         <constant digits="2" name="mapHighValueVoltage" units="v">5.0</constant>
         <constant digits="2" name="egoValueShift" units="value">0.0</constant>
-        <constant name="vvtPins1">"INVALID"</constant>
+        <constant name="vvtPins1">"PA0"</constant>
         <constant name="vvtPins2">"NONE"</constant>
         <constant name="vvtPins3">"NONE"</constant>
         <constant name="vvtPins4">"NONE"</constant>
@@ -875,14 +875,14 @@
         <constant name="vvtMode2">"Inactive"</constant>
         <constant digits="0" name="fan2ExtraIdle" units="%">2.0</constant>
         <constant digits="2" name="primingDelay" units="sec">0.5</constant>
-        <constant name="auxAnalogInputs1">"NONE"</constant>
-        <constant name="auxAnalogInputs2">"NONE"</constant>
-        <constant name="auxAnalogInputs3">"NONE"</constant>
-        <constant name="auxAnalogInputs4">"NONE"</constant>
-        <constant name="auxAnalogInputs5">"NONE"</constant>
-        <constant name="auxAnalogInputs6">"NONE"</constant>
-        <constant name="auxAnalogInputs7">"NONE"</constant>
-        <constant name="auxAnalogInputs8">"NONE"</constant>
+        <constant name="auxAnalogInputs1">"Disabled"</constant>
+        <constant name="auxAnalogInputs2">"Disabled"</constant>
+        <constant name="auxAnalogInputs3">"Disabled"</constant>
+        <constant name="auxAnalogInputs4">"Disabled"</constant>
+        <constant name="auxAnalogInputs5">"Disabled"</constant>
+        <constant name="auxAnalogInputs6">"Disabled"</constant>
+        <constant name="auxAnalogInputs7">"Disabled"</constant>
+        <constant name="auxAnalogInputs8">"Disabled"</constant>
         <constant name="trailingCoilPins1">"NONE"</constant>
         <constant name="trailingCoilPins2">"NONE"</constant>
         <constant name="trailingCoilPins3">"NONE"</constant>
@@ -907,7 +907,7 @@
         <constant digits="1" name="auxTempSensor1_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="auxTempSensor1_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="auxTempSensor1_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="auxTempSensor1_adcChannel">"NONE"</constant>
+        <constant name="auxTempSensor1_adcChannel">"Disabled"</constant>
         <constant digits="1" name="auxTempSensor2_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="auxTempSensor2_tempC_2" units="*C">0.0</constant>
         <constant digits="1" name="auxTempSensor2_tempC_3" units="*C">0.0</constant>
@@ -915,7 +915,7 @@
         <constant digits="1" name="auxTempSensor2_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="auxTempSensor2_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="auxTempSensor2_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="auxTempSensor2_adcChannel">"NONE"</constant>
+        <constant name="auxTempSensor2_adcChannel">"Disabled"</constant>
         <constant digits="0" name="knockSamplingDuration" units="Deg">45.0</constant>
         <constant digits="0" name="etbFreq" units="Hz">800.0</constant>
         <constant digits="4" name="etbWastegatePid_pFactor" units="">1.0</constant>
@@ -987,7 +987,7 @@
          80.0
          100.0
 </constant>
-        <constant name="oilPressure_hwChannel">"NONE"</constant>
+        <constant name="oilPressure_hwChannel">"Disabled"</constant>
         <constant digits="2" name="oilPressure_v1" units="volts">0.5</constant>
         <constant digits="2" name="oilPressure_value1" units="">0.0</constant>
         <constant digits="2" name="oilPressure_v2" units="volts">4.5</constant>
@@ -1008,12 +1008,12 @@
         <constant digits="0" name="coastingFuelCutClt" units="C">60.0</constant>
         <constant digits="0" name="pidExtraForLowRpm" units="%">0.0</constant>
         <constant digits="0" name="coastingFuelCutMap" units="kPa">30.0</constant>
-        <constant name="highPressureFuel_hwChannel">"NONE"</constant>
+        <constant name="highPressureFuel_hwChannel">"Disabled"</constant>
         <constant digits="2" name="highPressureFuel_v1" units="volts">0.0</constant>
         <constant digits="2" name="highPressureFuel_value1" units="">0.0</constant>
         <constant digits="2" name="highPressureFuel_v2" units="volts">0.0</constant>
         <constant digits="2" name="highPressureFuel_value2" units="">0.0</constant>
-        <constant name="lowPressureFuel_hwChannel">"NONE"</constant>
+        <constant name="lowPressureFuel_hwChannel">"Disabled"</constant>
         <constant digits="2" name="lowPressureFuel_v1" units="volts">0.0</constant>
         <constant digits="2" name="lowPressureFuel_value1" units="">0.0</constant>
         <constant digits="2" name="lowPressureFuel_v2" units="volts">0.0</constant>
@@ -1349,12 +1349,12 @@
         <constant name="gearControllerMode">"None"</constant>
         <constant name="transmissionControllerMode">"None"</constant>
         <constant digits="0" name="acrDisablePhase" units="deg">0.0</constant>
-        <constant name="auxLinear1_hwChannel">"NONE"</constant>
+        <constant name="auxLinear1_hwChannel">"Disabled"</constant>
         <constant digits="2" name="auxLinear1_v1" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear1_value1" units="">0.0</constant>
         <constant digits="2" name="auxLinear1_v2" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear1_value2" units="">0.0</constant>
-        <constant name="auxLinear2_hwChannel">"NONE"</constant>
+        <constant name="auxLinear2_hwChannel">"Disabled"</constant>
         <constant digits="2" name="auxLinear2_v1" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear2_value1" units="">0.0</constant>
         <constant digits="2" name="auxLinear2_v2" units="volts">0.0</constant>
@@ -1488,7 +1488,7 @@
         <constant digits="1" name="oilTempSensor_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="oilTempSensor_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="oilTempSensor_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="oilTempSensor_adcChannel">"NONE"</constant>
+        <constant name="oilTempSensor_adcChannel">"Disabled"</constant>
         <constant digits="1" name="fuelTempSensor_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="fuelTempSensor_tempC_2" units="*C">0.0</constant>
         <constant digits="1" name="fuelTempSensor_tempC_3" units="*C">0.0</constant>
@@ -1496,7 +1496,7 @@
         <constant digits="1" name="fuelTempSensor_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="fuelTempSensor_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="fuelTempSensor_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="fuelTempSensor_adcChannel">"NONE"</constant>
+        <constant name="fuelTempSensor_adcChannel">"Disabled"</constant>
         <constant digits="1" name="ambientTempSensor_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="ambientTempSensor_tempC_2" units="*C">0.0</constant>
         <constant digits="1" name="ambientTempSensor_tempC_3" units="*C">0.0</constant>
@@ -1504,7 +1504,7 @@
         <constant digits="1" name="ambientTempSensor_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="ambientTempSensor_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="ambientTempSensor_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="ambientTempSensor_adcChannel">"NONE"</constant>
+        <constant name="ambientTempSensor_adcChannel">"Disabled"</constant>
         <constant digits="1" name="compressorDischargeTemperature_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="compressorDischargeTemperature_tempC_2" units="*C">0.0</constant>
         <constant digits="1" name="compressorDischargeTemperature_tempC_3" units="*C">0.0</constant>
@@ -1512,9 +1512,9 @@
         <constant digits="1" name="compressorDischargeTemperature_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="compressorDischargeTemperature_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="compressorDischargeTemperature_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="compressorDischargeTemperature_adcChannel">"NONE"</constant>
-        <constant name="throttleInletPressureChannel">"NONE"</constant>
-        <constant name="compressorDischargePressureChannel">"NONE"</constant>
+        <constant name="compressorDischargeTemperature_adcChannel">"Disabled"</constant>
+        <constant name="throttleInletPressureChannel">"Disabled"</constant>
+        <constant name="compressorDischargePressureChannel">"Disabled"</constant>
         <constant name="dacOutputPins1">"NONE"</constant>
         <constant name="dacOutputPins2">"NONE"</constant>
         <constant name="speedometerOutputPin">"NONE"</constant>
@@ -1523,7 +1523,7 @@
         <constant digits="0" name="simulatorCamPosition2" units="">0.0</constant>
         <constant digits="0" name="simulatorCamPosition3" units="">0.0</constant>
         <constant digits="0" name="simulatorCamPosition4" units="">0.0</constant>
-        <constant name="ignKeyAdcChannel">"NONE"</constant>
+        <constant name="ignKeyAdcChannel">"Disabled"</constant>
         <constant name="spi6MisoMode">"default"</constant>
         <constant digits="3" name="triggerVVTGapOverrideFrom1" units="ratio">0.0</constant>
         <constant digits="3" name="triggerVVTGapOverrideFrom2" units="ratio">0.0</constant>
@@ -1598,18 +1598,18 @@
         <constant digits="0" name="device_uid1" units="">0.0</constant>
         <constant digits="0" name="device_uid2" units="">0.0</constant>
         <constant digits="0" name="device_uid3" units="">0.0</constant>
-        <constant name="tcu_rangeAnalogInput1">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput2">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput3">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput4">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput5">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput6">"NONE"</constant>
+        <constant name="tcu_rangeAnalogInput1">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput2">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput3">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput4">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput5">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput6">"Disabled"</constant>
         <constant digits="1" name="tcu_rangeSensorBiasResistor" units="Ohm">0.0</constant>
         <constant name="msIoBox0_id">"Off"</constant>
         <constant name="msIoBox0_vss">"Off"</constant>
         <constant digits="2" name="mc33810Nomi" units="A">5.5</constant>
         <constant digits="0" name="mc33810Maxi" units="A">14.0</constant>
-        <constant name="acPressure_hwChannel">"NONE"</constant>
+        <constant name="acPressure_hwChannel">"Disabled"</constant>
         <constant digits="2" name="acPressure_v1" units="volts">0.0</constant>
         <constant digits="2" name="acPressure_value1" units="">0.0</constant>
         <constant digits="2" name="acPressure_v2" units="volts">0.0</constant>
@@ -1617,12 +1617,12 @@
         <constant digits="0" name="minAcPressure" units="kPa">100.0</constant>
         <constant digits="0" name="maxAcPressure" units="kPa">300.0</constant>
         <constant digits="1" name="minimumOilPressureTimeout" units="sec">0.5</constant>
-        <constant name="auxLinear3_hwChannel">"NONE"</constant>
+        <constant name="auxLinear3_hwChannel">"Disabled"</constant>
         <constant digits="2" name="auxLinear3_v1" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear3_value1" units="">0.0</constant>
         <constant digits="2" name="auxLinear3_v2" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear3_value2" units="">0.0</constant>
-        <constant name="auxLinear4_hwChannel">"NONE"</constant>
+        <constant name="auxLinear4_hwChannel">"Disabled"</constant>
         <constant digits="2" name="auxLinear4_v1" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear4_value1" units="">0.0</constant>
         <constant digits="2" name="auxLinear4_v2" units="volts">0.0</constant>
@@ -4760,7 +4760,7 @@ end</constant>
          0.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240830" nPages="1" signature="rusEFI main.2024.09.06.mega100.821184268" version="5.0"/>
+    <versionInfo firmwareInfo="20240830" nPages="1" signature="rusEFI main.2024.09.06.mega100.2965644658" version="5.0"/>
     <bibliography author="rusEFI 20240830" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/generated/simulator_tune_HARLEY.msq b/generated/simulator_tune_HARLEY.msq
index 2b96dc6..a085102 100644
--- a/generated/simulator_tune_HARLEY.msq
+++ b/generated/simulator_tune_HARLEY.msq
@@ -157,7 +157,7 @@
         <constant digits="2" name="map_sensor_lowValue" units="kpa">20.0</constant>
         <constant digits="2" name="map_sensor_highValue" units="kpa">101.3</constant>
         <constant name="map_sensor_type">"Custom"</constant>
-        <constant name="map_sensor_hwChannel">"NONE"</constant>
+        <constant name="map_sensor_hwChannel">"Disabled"</constant>
         <constant digits="1" name="clt_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="clt_tempC_2" units="*C">23.8889</constant>
         <constant digits="1" name="clt_tempC_3" units="*C">48.8889</constant>
@@ -165,7 +165,7 @@
         <constant digits="1" name="clt_resistance_2" units="Ohm">2100.0</constant>
         <constant digits="1" name="clt_resistance_3" units="Ohm">1000.0</constant>
         <constant digits="1" name="clt_bias_resistor" units="Ohm">1500.0</constant>
-        <constant name="clt_adcChannel">"NONE"</constant>
+        <constant name="clt_adcChannel">"Disabled"</constant>
         <constant digits="1" name="iat_tempC_1" units="*C">-20.0</constant>
         <constant digits="1" name="iat_tempC_2" units="*C">23.8889</constant>
         <constant digits="1" name="iat_tempC_3" units="*C">120.0</constant>
@@ -173,7 +173,7 @@
         <constant digits="1" name="iat_resistance_2" units="Ohm">2100.0</constant>
         <constant digits="1" name="iat_resistance_3" units="Ohm">100.0</constant>
         <constant digits="1" name="iat_bias_resistor" units="Ohm">2700.0</constant>
-        <constant name="iat_adcChannel">"NONE"</constant>
+        <constant name="iat_adcChannel">"Disabled"</constant>
         <constant digits="2" name="launchTimingRetard" units="deg">0.0</constant>
         <constant digits="0" name="hip9011PrescalerAndSDO" units="integer">0.0</constant>
         <constant digits="0" name="unusedFloatHere" units="">0.0</constant>
@@ -209,10 +209,10 @@
         <constant digits="1" name="driveWheelRevPerKm" units="revs/km">1000.0</constant>
         <constant digits="2" name="canSleepPeriodMs" units="ms">50.0</constant>
         <constant digits="0" name="byFirmwareVersion" units="index">0.0</constant>
-        <constant name="tps1_1AdcChannel">"NONE"</constant>
-        <constant name="vbattAdcChannel">"NONE"</constant>
-        <constant name="fuelLevelSensor">"NONE"</constant>
-        <constant name="tps2_1AdcChannel">"NONE"</constant>
+        <constant name="tps1_1AdcChannel">"Disabled"</constant>
+        <constant name="vbattAdcChannel">"Disabled"</constant>
+        <constant name="fuelLevelSensor">"Disabled"</constant>
+        <constant name="tps2_1AdcChannel">"Disabled"</constant>
         <constant digits="4" name="idle_derivativeFilterLoss" units="x">0.0</constant>
         <constant digits="0" name="trailingSparkAngle" units="angle">10.0</constant>
         <constant name="trigger_type">"60-2"</constant>
@@ -221,7 +221,7 @@
         <constant digits="1" name="airByRpmTaper" units="%">0.0</constant>
         <constant name="hip9011SpiDevice">"Off"</constant>
         <constant digits="0" name="boostControlSafeDutyCycle" units="%">0.0</constant>
-        <constant name="mafAdcChannel">"NONE"</constant>
+        <constant name="mafAdcChannel">"Disabled"</constant>
         <constant digits="0" name="acrRevolutions" units="">5.0</constant>
         <constant digits="0" name="calibrationBirthday" units="">2.0240906E7</constant>
         <constant digits="3" name="adcVcc" units="volts">3.0</constant>
@@ -230,13 +230,13 @@
         <constant name="camInputs2">"NONE"</constant>
         <constant name="camInputs3">"NONE"</constant>
         <constant name="camInputs4">"NONE"</constant>
-        <constant name="afr_hwChannel">"NONE"</constant>
-        <constant name="afr_hwChannel2">"NONE"</constant>
+        <constant name="afr_hwChannel">"Disabled"</constant>
+        <constant name="afr_hwChannel2">"Disabled"</constant>
         <constant digits="2" name="afr_v1" units="volts">0.0</constant>
         <constant digits="2" name="afr_value1" units="AFR">9.996</constant>
         <constant digits="2" name="afr_v2" units="volts">5.0</constant>
         <constant digits="2" name="afr_value2" units="AFR">19.992</constant>
-        <constant name="throttlePedalPositionAdcChannel">"NONE"</constant>
+        <constant name="throttlePedalPositionAdcChannel">"Disabled"</constant>
         <constant digits="1" name="etbSplit" units="%">5.0</constant>
         <constant name="tle6240_cs">"NONE"</constant>
         <constant name="tle6240_csPinMode">"default"</constant>
@@ -245,7 +245,7 @@
         <constant digits="2" name="baroSensor_lowValue" units="kpa">0.0</constant>
         <constant digits="2" name="baroSensor_highValue" units="kpa">500.0</constant>
         <constant name="baroSensor_type">"Custom"</constant>
-        <constant name="baroSensor_hwChannel">"NONE"</constant>
+        <constant name="baroSensor_hwChannel">"Disabled"</constant>
         <constant digits="0" name="idle_solenoidFrequency" units="Hz">300.0</constant>
         <constant name="idle_solenoidPin">"NONE"</constant>
         <constant name="idle_stepperDirectionPin">"NONE"</constant>
@@ -308,10 +308,10 @@
         <constant name="brakePedalPinMode">"PULLUP"</constant>
         <constant name="mc33972_cs">"NONE"</constant>
         <constant name="mc33972_csPinMode">"default"</constant>
-        <constant name="auxFastSensor1_adcChannel">"NONE"</constant>
-        <constant name="tps1_2AdcChannel">"NONE"</constant>
-        <constant name="tps2_2AdcChannel">"NONE"</constant>
-        <constant name="throttlePedalPositionSecondAdcChannel">"NONE"</constant>
+        <constant name="auxFastSensor1_adcChannel">"Disabled"</constant>
+        <constant name="tps1_2AdcChannel">"Disabled"</constant>
+        <constant name="tps2_2AdcChannel">"Disabled"</constant>
+        <constant name="throttlePedalPositionSecondAdcChannel">"Disabled"</constant>
         <constant name="afr_type">"14Point7"</constant>
         <constant name="mc33810_cs1">"NONE"</constant>
         <constant digits="4" name="idle_antiwindupFreq" units="x">0.0</constant>
@@ -328,7 +328,7 @@
         <constant digits="3" name="fordInjectorSmallPulseSlope" units="g/s">0.0</constant>
         <constant name="triggerSimulatorPinModes1">"default"</constant>
         <constant name="triggerSimulatorPinModes2">"default"</constant>
-        <constant name="maf2AdcChannel">"NONE"</constant>
+        <constant name="maf2AdcChannel">"Disabled"</constant>
         <constant name="o2heaterPin">"NONE"</constant>
         <constant name="o2heaterPinModeTodO">"default"</constant>
         <constant digits="0" name="lambdaProtectionMinRpm" units="RPM">2500.0</constant>
@@ -405,7 +405,7 @@
         <constant digits="1" name="stoichRatioSecondary" units=":1">9.0</constant>
         <constant digits="0" name="etbMaximumPosition" units="%">100.0</constant>
         <constant digits="0" name="sdCardLogFrequency" units="hz">50.0</constant>
-        <constant name="idlePositionChannel">"NONE"</constant>
+        <constant name="idlePositionChannel">"Disabled"</constant>
         <constant digits="0" name="launchCorrectionsEndRpm" units="">0.0</constant>
         <constant name="starterRelayDisablePin">"NONE"</constant>
         <constant name="starterRelayDisablePinMode">"default"</constant>
@@ -638,9 +638,9 @@
         <constant name="launchActivateInverted">"false"</constant>
         <constant name="twoStroke">"Four Stroke"</constant>
         <constant name="skippedWheelOnCam">"On crankshaft"</constant>
-        <constant name="hipOutputChannel">"NONE"</constant>
+        <constant name="hipOutputChannel">"Disabled"</constant>
         <constant name="acSwitch">"NONE"</constant>
-        <constant name="vRefAdcChannel">"NONE"</constant>
+        <constant name="vRefAdcChannel">"Disabled"</constant>
         <constant digits="0" name="etbNeutralPosition" units="%">0.0</constant>
         <constant name="idleMode">"Open Loop"</constant>
         <constant name="isInjectionEnabled">"true"</constant>
@@ -813,7 +813,7 @@
         <constant name="can2TxPin">"NONE"</constant>
         <constant name="can2RxPin">"NONE"</constant>
         <constant name="starterControlPinMode">"default"</constant>
-        <constant name="wastegatePositionSensor">"NONE"</constant>
+        <constant name="wastegatePositionSensor">"Disabled"</constant>
         <constant name="ignOverrideMode">"None"</constant>
         <constant name="injectorPressureType">"Low"</constant>
         <constant name="hpfpValvePin">"NONE"</constant>
@@ -859,7 +859,7 @@
         <constant digits="2" name="mapLowValueVoltage" units="v">0.79</constant>
         <constant digits="2" name="mapHighValueVoltage" units="v">4.0</constant>
         <constant digits="2" name="egoValueShift" units="value">0.0</constant>
-        <constant name="vvtPins1">"INVALID"</constant>
+        <constant name="vvtPins1">"PA0"</constant>
         <constant name="vvtPins2">"NONE"</constant>
         <constant name="vvtPins3">"NONE"</constant>
         <constant name="vvtPins4">"NONE"</constant>
@@ -876,14 +876,14 @@
         <constant name="vvtMode2">"Inactive"</constant>
         <constant digits="0" name="fan2ExtraIdle" units="%">2.0</constant>
         <constant digits="2" name="primingDelay" units="sec">0.5</constant>
-        <constant name="auxAnalogInputs1">"NONE"</constant>
-        <constant name="auxAnalogInputs2">"NONE"</constant>
-        <constant name="auxAnalogInputs3">"NONE"</constant>
-        <constant name="auxAnalogInputs4">"NONE"</constant>
-        <constant name="auxAnalogInputs5">"NONE"</constant>
-        <constant name="auxAnalogInputs6">"NONE"</constant>
-        <constant name="auxAnalogInputs7">"NONE"</constant>
-        <constant name="auxAnalogInputs8">"NONE"</constant>
+        <constant name="auxAnalogInputs1">"Disabled"</constant>
+        <constant name="auxAnalogInputs2">"Disabled"</constant>
+        <constant name="auxAnalogInputs3">"Disabled"</constant>
+        <constant name="auxAnalogInputs4">"Disabled"</constant>
+        <constant name="auxAnalogInputs5">"Disabled"</constant>
+        <constant name="auxAnalogInputs6">"Disabled"</constant>
+        <constant name="auxAnalogInputs7">"Disabled"</constant>
+        <constant name="auxAnalogInputs8">"Disabled"</constant>
         <constant name="trailingCoilPins1">"NONE"</constant>
         <constant name="trailingCoilPins2">"NONE"</constant>
         <constant name="trailingCoilPins3">"NONE"</constant>
@@ -908,7 +908,7 @@
         <constant digits="1" name="auxTempSensor1_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="auxTempSensor1_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="auxTempSensor1_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="auxTempSensor1_adcChannel">"NONE"</constant>
+        <constant name="auxTempSensor1_adcChannel">"Disabled"</constant>
         <constant digits="1" name="auxTempSensor2_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="auxTempSensor2_tempC_2" units="*C">0.0</constant>
         <constant digits="1" name="auxTempSensor2_tempC_3" units="*C">0.0</constant>
@@ -916,7 +916,7 @@
         <constant digits="1" name="auxTempSensor2_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="auxTempSensor2_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="auxTempSensor2_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="auxTempSensor2_adcChannel">"NONE"</constant>
+        <constant name="auxTempSensor2_adcChannel">"Disabled"</constant>
         <constant digits="0" name="knockSamplingDuration" units="Deg">45.0</constant>
         <constant digits="0" name="etbFreq" units="Hz">800.0</constant>
         <constant digits="4" name="etbWastegatePid_pFactor" units="">1.0</constant>
@@ -988,7 +988,7 @@
          80.0
          100.0
 </constant>
-        <constant name="oilPressure_hwChannel">"NONE"</constant>
+        <constant name="oilPressure_hwChannel">"Disabled"</constant>
         <constant digits="2" name="oilPressure_v1" units="volts">0.5</constant>
         <constant digits="2" name="oilPressure_value1" units="">0.0</constant>
         <constant digits="2" name="oilPressure_v2" units="volts">4.5</constant>
@@ -1009,12 +1009,12 @@
         <constant digits="0" name="coastingFuelCutClt" units="C">60.0</constant>
         <constant digits="0" name="pidExtraForLowRpm" units="%">0.0</constant>
         <constant digits="0" name="coastingFuelCutMap" units="kPa">30.0</constant>
-        <constant name="highPressureFuel_hwChannel">"NONE"</constant>
+        <constant name="highPressureFuel_hwChannel">"Disabled"</constant>
         <constant digits="2" name="highPressureFuel_v1" units="volts">0.0</constant>
         <constant digits="2" name="highPressureFuel_value1" units="">0.0</constant>
         <constant digits="2" name="highPressureFuel_v2" units="volts">0.0</constant>
         <constant digits="2" name="highPressureFuel_value2" units="">0.0</constant>
-        <constant name="lowPressureFuel_hwChannel">"NONE"</constant>
+        <constant name="lowPressureFuel_hwChannel">"Disabled"</constant>
         <constant digits="2" name="lowPressureFuel_v1" units="volts">0.0</constant>
         <constant digits="2" name="lowPressureFuel_value1" units="">0.0</constant>
         <constant digits="2" name="lowPressureFuel_v2" units="volts">0.0</constant>
@@ -1352,12 +1352,12 @@
         <constant name="gearControllerMode">"None"</constant>
         <constant name="transmissionControllerMode">"None"</constant>
         <constant digits="0" name="acrDisablePhase" units="deg">0.0</constant>
-        <constant name="auxLinear1_hwChannel">"NONE"</constant>
+        <constant name="auxLinear1_hwChannel">"Disabled"</constant>
         <constant digits="2" name="auxLinear1_v1" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear1_value1" units="">0.0</constant>
         <constant digits="2" name="auxLinear1_v2" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear1_value2" units="">0.0</constant>
-        <constant name="auxLinear2_hwChannel">"NONE"</constant>
+        <constant name="auxLinear2_hwChannel">"Disabled"</constant>
         <constant digits="2" name="auxLinear2_v1" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear2_value1" units="">0.0</constant>
         <constant digits="2" name="auxLinear2_v2" units="volts">0.0</constant>
@@ -1491,7 +1491,7 @@
         <constant digits="1" name="oilTempSensor_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="oilTempSensor_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="oilTempSensor_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="oilTempSensor_adcChannel">"NONE"</constant>
+        <constant name="oilTempSensor_adcChannel">"Disabled"</constant>
         <constant digits="1" name="fuelTempSensor_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="fuelTempSensor_tempC_2" units="*C">0.0</constant>
         <constant digits="1" name="fuelTempSensor_tempC_3" units="*C">0.0</constant>
@@ -1499,7 +1499,7 @@
         <constant digits="1" name="fuelTempSensor_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="fuelTempSensor_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="fuelTempSensor_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="fuelTempSensor_adcChannel">"NONE"</constant>
+        <constant name="fuelTempSensor_adcChannel">"Disabled"</constant>
         <constant digits="1" name="ambientTempSensor_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="ambientTempSensor_tempC_2" units="*C">0.0</constant>
         <constant digits="1" name="ambientTempSensor_tempC_3" units="*C">0.0</constant>
@@ -1507,7 +1507,7 @@
         <constant digits="1" name="ambientTempSensor_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="ambientTempSensor_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="ambientTempSensor_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="ambientTempSensor_adcChannel">"NONE"</constant>
+        <constant name="ambientTempSensor_adcChannel">"Disabled"</constant>
         <constant digits="1" name="compressorDischargeTemperature_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="compressorDischargeTemperature_tempC_2" units="*C">0.0</constant>
         <constant digits="1" name="compressorDischargeTemperature_tempC_3" units="*C">0.0</constant>
@@ -1515,9 +1515,9 @@
         <constant digits="1" name="compressorDischargeTemperature_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="compressorDischargeTemperature_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="compressorDischargeTemperature_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="compressorDischargeTemperature_adcChannel">"NONE"</constant>
-        <constant name="throttleInletPressureChannel">"NONE"</constant>
-        <constant name="compressorDischargePressureChannel">"NONE"</constant>
+        <constant name="compressorDischargeTemperature_adcChannel">"Disabled"</constant>
+        <constant name="throttleInletPressureChannel">"Disabled"</constant>
+        <constant name="compressorDischargePressureChannel">"Disabled"</constant>
         <constant name="dacOutputPins1">"NONE"</constant>
         <constant name="dacOutputPins2">"NONE"</constant>
         <constant name="speedometerOutputPin">"NONE"</constant>
@@ -1526,7 +1526,7 @@
         <constant digits="0" name="simulatorCamPosition2" units="">0.0</constant>
         <constant digits="0" name="simulatorCamPosition3" units="">0.0</constant>
         <constant digits="0" name="simulatorCamPosition4" units="">0.0</constant>
-        <constant name="ignKeyAdcChannel">"NONE"</constant>
+        <constant name="ignKeyAdcChannel">"Disabled"</constant>
         <constant name="spi6MisoMode">"default"</constant>
         <constant digits="3" name="triggerVVTGapOverrideFrom1" units="ratio">0.0</constant>
         <constant digits="3" name="triggerVVTGapOverrideFrom2" units="ratio">0.0</constant>
@@ -1601,18 +1601,18 @@
         <constant digits="0" name="device_uid1" units="">0.0</constant>
         <constant digits="0" name="device_uid2" units="">0.0</constant>
         <constant digits="0" name="device_uid3" units="">0.0</constant>
-        <constant name="tcu_rangeAnalogInput1">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput2">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput3">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput4">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput5">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput6">"NONE"</constant>
+        <constant name="tcu_rangeAnalogInput1">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput2">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput3">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput4">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput5">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput6">"Disabled"</constant>
         <constant digits="1" name="tcu_rangeSensorBiasResistor" units="Ohm">0.0</constant>
         <constant name="msIoBox0_id">"Off"</constant>
         <constant name="msIoBox0_vss">"Off"</constant>
         <constant digits="2" name="mc33810Nomi" units="A">5.5</constant>
         <constant digits="0" name="mc33810Maxi" units="A">14.0</constant>
-        <constant name="acPressure_hwChannel">"NONE"</constant>
+        <constant name="acPressure_hwChannel">"Disabled"</constant>
         <constant digits="2" name="acPressure_v1" units="volts">0.0</constant>
         <constant digits="2" name="acPressure_value1" units="">0.0</constant>
         <constant digits="2" name="acPressure_v2" units="volts">0.0</constant>
@@ -1620,12 +1620,12 @@
         <constant digits="0" name="minAcPressure" units="kPa">100.0</constant>
         <constant digits="0" name="maxAcPressure" units="kPa">300.0</constant>
         <constant digits="1" name="minimumOilPressureTimeout" units="sec">0.5</constant>
-        <constant name="auxLinear3_hwChannel">"NONE"</constant>
+        <constant name="auxLinear3_hwChannel">"Disabled"</constant>
         <constant digits="2" name="auxLinear3_v1" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear3_value1" units="">0.0</constant>
         <constant digits="2" name="auxLinear3_v2" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear3_value2" units="">0.0</constant>
-        <constant name="auxLinear4_hwChannel">"NONE"</constant>
+        <constant name="auxLinear4_hwChannel">"Disabled"</constant>
         <constant digits="2" name="auxLinear4_v1" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear4_value1" units="">0.0</constant>
         <constant digits="2" name="auxLinear4_v2" units="volts">0.0</constant>
@@ -4763,7 +4763,7 @@ end</constant>
          0.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240830" nPages="1" signature="rusEFI main.2024.09.06.mega100.821184268" version="5.0"/>
+    <versionInfo firmwareInfo="20240830" nPages="1" signature="rusEFI main.2024.09.06.mega100.2965644658" version="5.0"/>
     <bibliography author="rusEFI 20240830" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/generated/simulator_tune_HELLEN_121_NISSAN_6_CYL.msq b/generated/simulator_tune_HELLEN_121_NISSAN_6_CYL.msq
index 661f085..443ddc6 100644
--- a/generated/simulator_tune_HELLEN_121_NISSAN_6_CYL.msq
+++ b/generated/simulator_tune_HELLEN_121_NISSAN_6_CYL.msq
@@ -157,7 +157,7 @@
         <constant digits="2" name="map_sensor_lowValue" units="kpa">0.0</constant>
         <constant digits="2" name="map_sensor_highValue" units="kpa">0.0</constant>
         <constant name="map_sensor_type">"MPX4250"</constant>
-        <constant name="map_sensor_hwChannel">"NONE"</constant>
+        <constant name="map_sensor_hwChannel">"Disabled"</constant>
         <constant digits="1" name="clt_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="clt_tempC_2" units="*C">23.8889</constant>
         <constant digits="1" name="clt_tempC_3" units="*C">48.8889</constant>
@@ -165,7 +165,7 @@
         <constant digits="1" name="clt_resistance_2" units="Ohm">2100.0</constant>
         <constant digits="1" name="clt_resistance_3" units="Ohm">1000.0</constant>
         <constant digits="1" name="clt_bias_resistor" units="Ohm">1500.0</constant>
-        <constant name="clt_adcChannel">"NONE"</constant>
+        <constant name="clt_adcChannel">"Disabled"</constant>
         <constant digits="1" name="iat_tempC_1" units="*C">-20.0</constant>
         <constant digits="1" name="iat_tempC_2" units="*C">23.8889</constant>
         <constant digits="1" name="iat_tempC_3" units="*C">120.0</constant>
@@ -173,7 +173,7 @@
         <constant digits="1" name="iat_resistance_2" units="Ohm">2100.0</constant>
         <constant digits="1" name="iat_resistance_3" units="Ohm">100.0</constant>
         <constant digits="1" name="iat_bias_resistor" units="Ohm">2700.0</constant>
-        <constant name="iat_adcChannel">"NONE"</constant>
+        <constant name="iat_adcChannel">"Disabled"</constant>
         <constant digits="2" name="launchTimingRetard" units="deg">0.0</constant>
         <constant digits="0" name="hip9011PrescalerAndSDO" units="integer">0.0</constant>
         <constant digits="0" name="unusedFloatHere" units="">0.0</constant>
@@ -209,10 +209,10 @@
         <constant digits="1" name="driveWheelRevPerKm" units="revs/km">1000.0</constant>
         <constant digits="2" name="canSleepPeriodMs" units="ms">50.0</constant>
         <constant digits="0" name="byFirmwareVersion" units="index">0.0</constant>
-        <constant name="tps1_1AdcChannel">"NONE"</constant>
-        <constant name="vbattAdcChannel">"NONE"</constant>
-        <constant name="fuelLevelSensor">"NONE"</constant>
-        <constant name="tps2_1AdcChannel">"NONE"</constant>
+        <constant name="tps1_1AdcChannel">"Disabled"</constant>
+        <constant name="vbattAdcChannel">"Disabled"</constant>
+        <constant name="fuelLevelSensor">"Disabled"</constant>
+        <constant name="tps2_1AdcChannel">"Disabled"</constant>
         <constant digits="4" name="idle_derivativeFilterLoss" units="x">0.0</constant>
         <constant digits="0" name="trailingSparkAngle" units="angle">10.0</constant>
         <constant name="trigger_type">"Nissan VQ35"</constant>
@@ -221,7 +221,7 @@
         <constant digits="1" name="airByRpmTaper" units="%">0.0</constant>
         <constant name="hip9011SpiDevice">"Off"</constant>
         <constant digits="0" name="boostControlSafeDutyCycle" units="%">0.0</constant>
-        <constant name="mafAdcChannel">"NONE"</constant>
+        <constant name="mafAdcChannel">"Disabled"</constant>
         <constant digits="0" name="acrRevolutions" units="">5.0</constant>
         <constant digits="0" name="calibrationBirthday" units="">2.0240906E7</constant>
         <constant digits="3" name="adcVcc" units="volts">3.0</constant>
@@ -230,13 +230,13 @@
         <constant name="camInputs2">"NONE"</constant>
         <constant name="camInputs3">"NONE"</constant>
         <constant name="camInputs4">"NONE"</constant>
-        <constant name="afr_hwChannel">"NONE"</constant>
-        <constant name="afr_hwChannel2">"NONE"</constant>
+        <constant name="afr_hwChannel">"Disabled"</constant>
+        <constant name="afr_hwChannel2">"Disabled"</constant>
         <constant digits="2" name="afr_v1" units="volts">0.0</constant>
         <constant digits="2" name="afr_value1" units="AFR">9.996</constant>
         <constant digits="2" name="afr_v2" units="volts">5.0</constant>
         <constant digits="2" name="afr_value2" units="AFR">19.992</constant>
-        <constant name="throttlePedalPositionAdcChannel">"NONE"</constant>
+        <constant name="throttlePedalPositionAdcChannel">"Disabled"</constant>
         <constant digits="1" name="etbSplit" units="%">5.0</constant>
         <constant name="tle6240_cs">"NONE"</constant>
         <constant name="tle6240_csPinMode">"default"</constant>
@@ -245,7 +245,7 @@
         <constant digits="2" name="baroSensor_lowValue" units="kpa">0.0</constant>
         <constant digits="2" name="baroSensor_highValue" units="kpa">500.0</constant>
         <constant name="baroSensor_type">"Custom"</constant>
-        <constant name="baroSensor_hwChannel">"NONE"</constant>
+        <constant name="baroSensor_hwChannel">"Disabled"</constant>
         <constant digits="0" name="idle_solenoidFrequency" units="Hz">300.0</constant>
         <constant name="idle_solenoidPin">"NONE"</constant>
         <constant name="idle_stepperDirectionPin">"NONE"</constant>
@@ -308,10 +308,10 @@
         <constant name="brakePedalPinMode">"PULLUP"</constant>
         <constant name="mc33972_cs">"NONE"</constant>
         <constant name="mc33972_csPinMode">"default"</constant>
-        <constant name="auxFastSensor1_adcChannel">"NONE"</constant>
-        <constant name="tps1_2AdcChannel">"NONE"</constant>
-        <constant name="tps2_2AdcChannel">"NONE"</constant>
-        <constant name="throttlePedalPositionSecondAdcChannel">"NONE"</constant>
+        <constant name="auxFastSensor1_adcChannel">"Disabled"</constant>
+        <constant name="tps1_2AdcChannel">"Disabled"</constant>
+        <constant name="tps2_2AdcChannel">"Disabled"</constant>
+        <constant name="throttlePedalPositionSecondAdcChannel">"Disabled"</constant>
         <constant name="afr_type">"14Point7"</constant>
         <constant name="mc33810_cs1">"NONE"</constant>
         <constant digits="4" name="idle_antiwindupFreq" units="x">0.0</constant>
@@ -328,7 +328,7 @@
         <constant digits="3" name="fordInjectorSmallPulseSlope" units="g/s">0.0</constant>
         <constant name="triggerSimulatorPinModes1">"default"</constant>
         <constant name="triggerSimulatorPinModes2">"default"</constant>
-        <constant name="maf2AdcChannel">"NONE"</constant>
+        <constant name="maf2AdcChannel">"Disabled"</constant>
         <constant name="o2heaterPin">"NONE"</constant>
         <constant name="o2heaterPinModeTodO">"default"</constant>
         <constant digits="0" name="lambdaProtectionMinRpm" units="RPM">2500.0</constant>
@@ -405,7 +405,7 @@
         <constant digits="1" name="stoichRatioSecondary" units=":1">9.0</constant>
         <constant digits="0" name="etbMaximumPosition" units="%">100.0</constant>
         <constant digits="0" name="sdCardLogFrequency" units="hz">50.0</constant>
-        <constant name="idlePositionChannel">"NONE"</constant>
+        <constant name="idlePositionChannel">"Disabled"</constant>
         <constant digits="0" name="launchCorrectionsEndRpm" units="">0.0</constant>
         <constant name="starterRelayDisablePin">"NONE"</constant>
         <constant name="starterRelayDisablePinMode">"default"</constant>
@@ -638,9 +638,9 @@
         <constant name="launchActivateInverted">"false"</constant>
         <constant name="twoStroke">"Four Stroke"</constant>
         <constant name="skippedWheelOnCam">"On crankshaft"</constant>
-        <constant name="hipOutputChannel">"NONE"</constant>
+        <constant name="hipOutputChannel">"Disabled"</constant>
         <constant name="acSwitch">"NONE"</constant>
-        <constant name="vRefAdcChannel">"NONE"</constant>
+        <constant name="vRefAdcChannel">"Disabled"</constant>
         <constant digits="0" name="etbNeutralPosition" units="%">0.0</constant>
         <constant name="idleMode">"Open Loop"</constant>
         <constant name="isInjectionEnabled">"true"</constant>
@@ -813,7 +813,7 @@
         <constant name="can2TxPin">"NONE"</constant>
         <constant name="can2RxPin">"NONE"</constant>
         <constant name="starterControlPinMode">"default"</constant>
-        <constant name="wastegatePositionSensor">"NONE"</constant>
+        <constant name="wastegatePositionSensor">"Disabled"</constant>
         <constant name="ignOverrideMode">"None"</constant>
         <constant name="injectorPressureType">"Low"</constant>
         <constant name="hpfpValvePin">"NONE"</constant>
@@ -859,7 +859,7 @@
         <constant digits="2" name="mapLowValueVoltage" units="v">0.0</constant>
         <constant digits="2" name="mapHighValueVoltage" units="v">5.0</constant>
         <constant digits="2" name="egoValueShift" units="value">0.0</constant>
-        <constant name="vvtPins1">"INVALID"</constant>
+        <constant name="vvtPins1">"PA0"</constant>
         <constant name="vvtPins2">"NONE"</constant>
         <constant name="vvtPins3">"NONE"</constant>
         <constant name="vvtPins4">"NONE"</constant>
@@ -876,14 +876,14 @@
         <constant name="vvtMode2">"Inactive"</constant>
         <constant digits="0" name="fan2ExtraIdle" units="%">2.0</constant>
         <constant digits="2" name="primingDelay" units="sec">0.5</constant>
-        <constant name="auxAnalogInputs1">"NONE"</constant>
-        <constant name="auxAnalogInputs2">"NONE"</constant>
-        <constant name="auxAnalogInputs3">"NONE"</constant>
-        <constant name="auxAnalogInputs4">"NONE"</constant>
-        <constant name="auxAnalogInputs5">"NONE"</constant>
-        <constant name="auxAnalogInputs6">"NONE"</constant>
-        <constant name="auxAnalogInputs7">"NONE"</constant>
-        <constant name="auxAnalogInputs8">"NONE"</constant>
+        <constant name="auxAnalogInputs1">"Disabled"</constant>
+        <constant name="auxAnalogInputs2">"Disabled"</constant>
+        <constant name="auxAnalogInputs3">"Disabled"</constant>
+        <constant name="auxAnalogInputs4">"Disabled"</constant>
+        <constant name="auxAnalogInputs5">"Disabled"</constant>
+        <constant name="auxAnalogInputs6">"Disabled"</constant>
+        <constant name="auxAnalogInputs7">"Disabled"</constant>
+        <constant name="auxAnalogInputs8">"Disabled"</constant>
         <constant name="trailingCoilPins1">"NONE"</constant>
         <constant name="trailingCoilPins2">"NONE"</constant>
         <constant name="trailingCoilPins3">"NONE"</constant>
@@ -908,7 +908,7 @@
         <constant digits="1" name="auxTempSensor1_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="auxTempSensor1_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="auxTempSensor1_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="auxTempSensor1_adcChannel">"NONE"</constant>
+        <constant name="auxTempSensor1_adcChannel">"Disabled"</constant>
         <constant digits="1" name="auxTempSensor2_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="auxTempSensor2_tempC_2" units="*C">0.0</constant>
         <constant digits="1" name="auxTempSensor2_tempC_3" units="*C">0.0</constant>
@@ -916,7 +916,7 @@
         <constant digits="1" name="auxTempSensor2_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="auxTempSensor2_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="auxTempSensor2_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="auxTempSensor2_adcChannel">"NONE"</constant>
+        <constant name="auxTempSensor2_adcChannel">"Disabled"</constant>
         <constant digits="0" name="knockSamplingDuration" units="Deg">45.0</constant>
         <constant digits="0" name="etbFreq" units="Hz">800.0</constant>
         <constant digits="4" name="etbWastegatePid_pFactor" units="">1.0</constant>
@@ -988,7 +988,7 @@
          80.0
          100.0
 </constant>
-        <constant name="oilPressure_hwChannel">"NONE"</constant>
+        <constant name="oilPressure_hwChannel">"Disabled"</constant>
         <constant digits="2" name="oilPressure_v1" units="volts">0.5</constant>
         <constant digits="2" name="oilPressure_value1" units="">0.0</constant>
         <constant digits="2" name="oilPressure_v2" units="volts">4.5</constant>
@@ -1009,12 +1009,12 @@
         <constant digits="0" name="coastingFuelCutClt" units="C">60.0</constant>
         <constant digits="0" name="pidExtraForLowRpm" units="%">0.0</constant>
         <constant digits="0" name="coastingFuelCutMap" units="kPa">30.0</constant>
-        <constant name="highPressureFuel_hwChannel">"NONE"</constant>
+        <constant name="highPressureFuel_hwChannel">"Disabled"</constant>
         <constant digits="2" name="highPressureFuel_v1" units="volts">0.0</constant>
         <constant digits="2" name="highPressureFuel_value1" units="">0.0</constant>
         <constant digits="2" name="highPressureFuel_v2" units="volts">0.0</constant>
         <constant digits="2" name="highPressureFuel_value2" units="">0.0</constant>
-        <constant name="lowPressureFuel_hwChannel">"NONE"</constant>
+        <constant name="lowPressureFuel_hwChannel">"Disabled"</constant>
         <constant digits="2" name="lowPressureFuel_v1" units="volts">0.0</constant>
         <constant digits="2" name="lowPressureFuel_value1" units="">0.0</constant>
         <constant digits="2" name="lowPressureFuel_v2" units="volts">0.0</constant>
@@ -1350,12 +1350,12 @@
         <constant name="gearControllerMode">"None"</constant>
         <constant name="transmissionControllerMode">"None"</constant>
         <constant digits="0" name="acrDisablePhase" units="deg">0.0</constant>
-        <constant name="auxLinear1_hwChannel">"NONE"</constant>
+        <constant name="auxLinear1_hwChannel">"Disabled"</constant>
         <constant digits="2" name="auxLinear1_v1" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear1_value1" units="">0.0</constant>
         <constant digits="2" name="auxLinear1_v2" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear1_value2" units="">0.0</constant>
-        <constant name="auxLinear2_hwChannel">"NONE"</constant>
+        <constant name="auxLinear2_hwChannel">"Disabled"</constant>
         <constant digits="2" name="auxLinear2_v1" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear2_value1" units="">0.0</constant>
         <constant digits="2" name="auxLinear2_v2" units="volts">0.0</constant>
@@ -1489,7 +1489,7 @@
         <constant digits="1" name="oilTempSensor_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="oilTempSensor_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="oilTempSensor_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="oilTempSensor_adcChannel">"NONE"</constant>
+        <constant name="oilTempSensor_adcChannel">"Disabled"</constant>
         <constant digits="1" name="fuelTempSensor_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="fuelTempSensor_tempC_2" units="*C">0.0</constant>
         <constant digits="1" name="fuelTempSensor_tempC_3" units="*C">0.0</constant>
@@ -1497,7 +1497,7 @@
         <constant digits="1" name="fuelTempSensor_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="fuelTempSensor_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="fuelTempSensor_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="fuelTempSensor_adcChannel">"NONE"</constant>
+        <constant name="fuelTempSensor_adcChannel">"Disabled"</constant>
         <constant digits="1" name="ambientTempSensor_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="ambientTempSensor_tempC_2" units="*C">0.0</constant>
         <constant digits="1" name="ambientTempSensor_tempC_3" units="*C">0.0</constant>
@@ -1505,7 +1505,7 @@
         <constant digits="1" name="ambientTempSensor_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="ambientTempSensor_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="ambientTempSensor_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="ambientTempSensor_adcChannel">"NONE"</constant>
+        <constant name="ambientTempSensor_adcChannel">"Disabled"</constant>
         <constant digits="1" name="compressorDischargeTemperature_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="compressorDischargeTemperature_tempC_2" units="*C">0.0</constant>
         <constant digits="1" name="compressorDischargeTemperature_tempC_3" units="*C">0.0</constant>
@@ -1513,9 +1513,9 @@
         <constant digits="1" name="compressorDischargeTemperature_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="compressorDischargeTemperature_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="compressorDischargeTemperature_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="compressorDischargeTemperature_adcChannel">"NONE"</constant>
-        <constant name="throttleInletPressureChannel">"NONE"</constant>
-        <constant name="compressorDischargePressureChannel">"NONE"</constant>
+        <constant name="compressorDischargeTemperature_adcChannel">"Disabled"</constant>
+        <constant name="throttleInletPressureChannel">"Disabled"</constant>
+        <constant name="compressorDischargePressureChannel">"Disabled"</constant>
         <constant name="dacOutputPins1">"NONE"</constant>
         <constant name="dacOutputPins2">"NONE"</constant>
         <constant name="speedometerOutputPin">"NONE"</constant>
@@ -1524,7 +1524,7 @@
         <constant digits="0" name="simulatorCamPosition2" units="">0.0</constant>
         <constant digits="0" name="simulatorCamPosition3" units="">0.0</constant>
         <constant digits="0" name="simulatorCamPosition4" units="">0.0</constant>
-        <constant name="ignKeyAdcChannel">"NONE"</constant>
+        <constant name="ignKeyAdcChannel">"Disabled"</constant>
         <constant name="spi6MisoMode">"default"</constant>
         <constant digits="3" name="triggerVVTGapOverrideFrom1" units="ratio">0.0</constant>
         <constant digits="3" name="triggerVVTGapOverrideFrom2" units="ratio">0.0</constant>
@@ -1599,18 +1599,18 @@
         <constant digits="0" name="device_uid1" units="">0.0</constant>
         <constant digits="0" name="device_uid2" units="">0.0</constant>
         <constant digits="0" name="device_uid3" units="">0.0</constant>
-        <constant name="tcu_rangeAnalogInput1">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput2">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput3">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput4">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput5">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput6">"NONE"</constant>
+        <constant name="tcu_rangeAnalogInput1">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput2">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput3">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput4">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput5">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput6">"Disabled"</constant>
         <constant digits="1" name="tcu_rangeSensorBiasResistor" units="Ohm">0.0</constant>
         <constant name="msIoBox0_id">"Off"</constant>
         <constant name="msIoBox0_vss">"Off"</constant>
         <constant digits="2" name="mc33810Nomi" units="A">5.5</constant>
         <constant digits="0" name="mc33810Maxi" units="A">14.0</constant>
-        <constant name="acPressure_hwChannel">"NONE"</constant>
+        <constant name="acPressure_hwChannel">"Disabled"</constant>
         <constant digits="2" name="acPressure_v1" units="volts">0.0</constant>
         <constant digits="2" name="acPressure_value1" units="">0.0</constant>
         <constant digits="2" name="acPressure_v2" units="volts">0.0</constant>
@@ -1618,12 +1618,12 @@
         <constant digits="0" name="minAcPressure" units="kPa">100.0</constant>
         <constant digits="0" name="maxAcPressure" units="kPa">300.0</constant>
         <constant digits="1" name="minimumOilPressureTimeout" units="sec">0.5</constant>
-        <constant name="auxLinear3_hwChannel">"NONE"</constant>
+        <constant name="auxLinear3_hwChannel">"Disabled"</constant>
         <constant digits="2" name="auxLinear3_v1" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear3_value1" units="">0.0</constant>
         <constant digits="2" name="auxLinear3_v2" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear3_value2" units="">0.0</constant>
-        <constant name="auxLinear4_hwChannel">"NONE"</constant>
+        <constant name="auxLinear4_hwChannel">"Disabled"</constant>
         <constant digits="2" name="auxLinear4_v1" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear4_value1" units="">0.0</constant>
         <constant digits="2" name="auxLinear4_v2" units="volts">0.0</constant>
@@ -4924,7 +4924,7 @@ canRxAdd(IN_35D, onCanRxAc)</constant>
          0.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240830" nPages="1" signature="rusEFI main.2024.09.06.mega100.821184268" version="5.0"/>
+    <versionInfo firmwareInfo="20240830" nPages="1" signature="rusEFI main.2024.09.06.mega100.2965644658" version="5.0"/>
     <bibliography author="rusEFI 20240830" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/generated/simulator_tune_HELLEN_154_HYUNDAI_COUPE_BK1.msq b/generated/simulator_tune_HELLEN_154_HYUNDAI_COUPE_BK1.msq
index f058e2d..6c04c4b 100644
--- a/generated/simulator_tune_HELLEN_154_HYUNDAI_COUPE_BK1.msq
+++ b/generated/simulator_tune_HELLEN_154_HYUNDAI_COUPE_BK1.msq
@@ -157,7 +157,7 @@
         <constant digits="2" name="map_sensor_lowValue" units="kpa">0.0</constant>
         <constant digits="2" name="map_sensor_highValue" units="kpa">0.0</constant>
         <constant name="map_sensor_type">"MPX4250"</constant>
-        <constant name="map_sensor_hwChannel">"NONE"</constant>
+        <constant name="map_sensor_hwChannel">"Disabled"</constant>
         <constant digits="1" name="clt_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="clt_tempC_2" units="*C">23.8889</constant>
         <constant digits="1" name="clt_tempC_3" units="*C">48.8889</constant>
@@ -165,7 +165,7 @@
         <constant digits="1" name="clt_resistance_2" units="Ohm">2100.0</constant>
         <constant digits="1" name="clt_resistance_3" units="Ohm">1000.0</constant>
         <constant digits="1" name="clt_bias_resistor" units="Ohm">1500.0</constant>
-        <constant name="clt_adcChannel">"NONE"</constant>
+        <constant name="clt_adcChannel">"Disabled"</constant>
         <constant digits="1" name="iat_tempC_1" units="*C">-20.0</constant>
         <constant digits="1" name="iat_tempC_2" units="*C">23.8889</constant>
         <constant digits="1" name="iat_tempC_3" units="*C">120.0</constant>
@@ -173,7 +173,7 @@
         <constant digits="1" name="iat_resistance_2" units="Ohm">2100.0</constant>
         <constant digits="1" name="iat_resistance_3" units="Ohm">100.0</constant>
         <constant digits="1" name="iat_bias_resistor" units="Ohm">2700.0</constant>
-        <constant name="iat_adcChannel">"NONE"</constant>
+        <constant name="iat_adcChannel">"Disabled"</constant>
         <constant digits="2" name="launchTimingRetard" units="deg">0.0</constant>
         <constant digits="0" name="hip9011PrescalerAndSDO" units="integer">0.0</constant>
         <constant digits="0" name="unusedFloatHere" units="">0.0</constant>
@@ -209,10 +209,10 @@
         <constant digits="1" name="driveWheelRevPerKm" units="revs/km">1000.0</constant>
         <constant digits="2" name="canSleepPeriodMs" units="ms">50.0</constant>
         <constant digits="0" name="byFirmwareVersion" units="index">0.0</constant>
-        <constant name="tps1_1AdcChannel">"NONE"</constant>
-        <constant name="vbattAdcChannel">"NONE"</constant>
-        <constant name="fuelLevelSensor">"NONE"</constant>
-        <constant name="tps2_1AdcChannel">"NONE"</constant>
+        <constant name="tps1_1AdcChannel">"Disabled"</constant>
+        <constant name="vbattAdcChannel">"Disabled"</constant>
+        <constant name="fuelLevelSensor">"Disabled"</constant>
+        <constant name="tps2_1AdcChannel">"Disabled"</constant>
         <constant digits="4" name="idle_derivativeFilterLoss" units="x">0.0</constant>
         <constant digits="0" name="trailingSparkAngle" units="angle">10.0</constant>
         <constant name="trigger_type">"60-2"</constant>
@@ -221,7 +221,7 @@
         <constant digits="1" name="airByRpmTaper" units="%">0.0</constant>
         <constant name="hip9011SpiDevice">"Off"</constant>
         <constant digits="0" name="boostControlSafeDutyCycle" units="%">0.0</constant>
-        <constant name="mafAdcChannel">"NONE"</constant>
+        <constant name="mafAdcChannel">"Disabled"</constant>
         <constant digits="0" name="acrRevolutions" units="">5.0</constant>
         <constant digits="0" name="calibrationBirthday" units="">2.0240906E7</constant>
         <constant digits="3" name="adcVcc" units="volts">3.0</constant>
@@ -230,13 +230,13 @@
         <constant name="camInputs2">"NONE"</constant>
         <constant name="camInputs3">"NONE"</constant>
         <constant name="camInputs4">"NONE"</constant>
-        <constant name="afr_hwChannel">"NONE"</constant>
-        <constant name="afr_hwChannel2">"NONE"</constant>
+        <constant name="afr_hwChannel">"Disabled"</constant>
+        <constant name="afr_hwChannel2">"Disabled"</constant>
         <constant digits="2" name="afr_v1" units="volts">0.0</constant>
         <constant digits="2" name="afr_value1" units="AFR">9.996</constant>
         <constant digits="2" name="afr_v2" units="volts">5.0</constant>
         <constant digits="2" name="afr_value2" units="AFR">19.992</constant>
-        <constant name="throttlePedalPositionAdcChannel">"NONE"</constant>
+        <constant name="throttlePedalPositionAdcChannel">"Disabled"</constant>
         <constant digits="1" name="etbSplit" units="%">5.0</constant>
         <constant name="tle6240_cs">"NONE"</constant>
         <constant name="tle6240_csPinMode">"default"</constant>
@@ -245,7 +245,7 @@
         <constant digits="2" name="baroSensor_lowValue" units="kpa">0.0</constant>
         <constant digits="2" name="baroSensor_highValue" units="kpa">500.0</constant>
         <constant name="baroSensor_type">"Custom"</constant>
-        <constant name="baroSensor_hwChannel">"NONE"</constant>
+        <constant name="baroSensor_hwChannel">"Disabled"</constant>
         <constant digits="0" name="idle_solenoidFrequency" units="Hz">300.0</constant>
         <constant name="idle_solenoidPin">"NONE"</constant>
         <constant name="idle_stepperDirectionPin">"NONE"</constant>
@@ -308,10 +308,10 @@
         <constant name="brakePedalPinMode">"PULLUP"</constant>
         <constant name="mc33972_cs">"NONE"</constant>
         <constant name="mc33972_csPinMode">"default"</constant>
-        <constant name="auxFastSensor1_adcChannel">"NONE"</constant>
-        <constant name="tps1_2AdcChannel">"NONE"</constant>
-        <constant name="tps2_2AdcChannel">"NONE"</constant>
-        <constant name="throttlePedalPositionSecondAdcChannel">"NONE"</constant>
+        <constant name="auxFastSensor1_adcChannel">"Disabled"</constant>
+        <constant name="tps1_2AdcChannel">"Disabled"</constant>
+        <constant name="tps2_2AdcChannel">"Disabled"</constant>
+        <constant name="throttlePedalPositionSecondAdcChannel">"Disabled"</constant>
         <constant name="afr_type">"14Point7"</constant>
         <constant name="mc33810_cs1">"NONE"</constant>
         <constant digits="4" name="idle_antiwindupFreq" units="x">0.0</constant>
@@ -328,7 +328,7 @@
         <constant digits="3" name="fordInjectorSmallPulseSlope" units="g/s">0.0</constant>
         <constant name="triggerSimulatorPinModes1">"default"</constant>
         <constant name="triggerSimulatorPinModes2">"default"</constant>
-        <constant name="maf2AdcChannel">"NONE"</constant>
+        <constant name="maf2AdcChannel">"Disabled"</constant>
         <constant name="o2heaterPin">"NONE"</constant>
         <constant name="o2heaterPinModeTodO">"default"</constant>
         <constant digits="0" name="lambdaProtectionMinRpm" units="RPM">2500.0</constant>
@@ -405,7 +405,7 @@
         <constant digits="1" name="stoichRatioSecondary" units=":1">9.0</constant>
         <constant digits="0" name="etbMaximumPosition" units="%">100.0</constant>
         <constant digits="0" name="sdCardLogFrequency" units="hz">50.0</constant>
-        <constant name="idlePositionChannel">"NONE"</constant>
+        <constant name="idlePositionChannel">"Disabled"</constant>
         <constant digits="0" name="launchCorrectionsEndRpm" units="">0.0</constant>
         <constant name="starterRelayDisablePin">"NONE"</constant>
         <constant name="starterRelayDisablePinMode">"default"</constant>
@@ -639,9 +639,9 @@
         <constant name="launchActivateInverted">"false"</constant>
         <constant name="twoStroke">"Four Stroke"</constant>
         <constant name="skippedWheelOnCam">"On crankshaft"</constant>
-        <constant name="hipOutputChannel">"NONE"</constant>
+        <constant name="hipOutputChannel">"Disabled"</constant>
         <constant name="acSwitch">"NONE"</constant>
-        <constant name="vRefAdcChannel">"NONE"</constant>
+        <constant name="vRefAdcChannel">"Disabled"</constant>
         <constant digits="0" name="etbNeutralPosition" units="%">0.0</constant>
         <constant name="idleMode">"Open Loop"</constant>
         <constant name="isInjectionEnabled">"true"</constant>
@@ -814,7 +814,7 @@
         <constant name="can2TxPin">"NONE"</constant>
         <constant name="can2RxPin">"NONE"</constant>
         <constant name="starterControlPinMode">"default"</constant>
-        <constant name="wastegatePositionSensor">"NONE"</constant>
+        <constant name="wastegatePositionSensor">"Disabled"</constant>
         <constant name="ignOverrideMode">"None"</constant>
         <constant name="injectorPressureType">"Low"</constant>
         <constant name="hpfpValvePin">"NONE"</constant>
@@ -860,7 +860,7 @@
         <constant digits="2" name="mapLowValueVoltage" units="v">0.0</constant>
         <constant digits="2" name="mapHighValueVoltage" units="v">5.0</constant>
         <constant digits="2" name="egoValueShift" units="value">0.0</constant>
-        <constant name="vvtPins1">"INVALID"</constant>
+        <constant name="vvtPins1">"PA0"</constant>
         <constant name="vvtPins2">"NONE"</constant>
         <constant name="vvtPins3">"NONE"</constant>
         <constant name="vvtPins4">"NONE"</constant>
@@ -877,14 +877,14 @@
         <constant name="vvtMode2">"Inactive"</constant>
         <constant digits="0" name="fan2ExtraIdle" units="%">2.0</constant>
         <constant digits="2" name="primingDelay" units="sec">0.5</constant>
-        <constant name="auxAnalogInputs1">"NONE"</constant>
-        <constant name="auxAnalogInputs2">"NONE"</constant>
-        <constant name="auxAnalogInputs3">"NONE"</constant>
-        <constant name="auxAnalogInputs4">"NONE"</constant>
-        <constant name="auxAnalogInputs5">"NONE"</constant>
-        <constant name="auxAnalogInputs6">"NONE"</constant>
-        <constant name="auxAnalogInputs7">"NONE"</constant>
-        <constant name="auxAnalogInputs8">"NONE"</constant>
+        <constant name="auxAnalogInputs1">"Disabled"</constant>
+        <constant name="auxAnalogInputs2">"Disabled"</constant>
+        <constant name="auxAnalogInputs3">"Disabled"</constant>
+        <constant name="auxAnalogInputs4">"Disabled"</constant>
+        <constant name="auxAnalogInputs5">"Disabled"</constant>
+        <constant name="auxAnalogInputs6">"Disabled"</constant>
+        <constant name="auxAnalogInputs7">"Disabled"</constant>
+        <constant name="auxAnalogInputs8">"Disabled"</constant>
         <constant name="trailingCoilPins1">"NONE"</constant>
         <constant name="trailingCoilPins2">"NONE"</constant>
         <constant name="trailingCoilPins3">"NONE"</constant>
@@ -909,7 +909,7 @@
         <constant digits="1" name="auxTempSensor1_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="auxTempSensor1_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="auxTempSensor1_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="auxTempSensor1_adcChannel">"NONE"</constant>
+        <constant name="auxTempSensor1_adcChannel">"Disabled"</constant>
         <constant digits="1" name="auxTempSensor2_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="auxTempSensor2_tempC_2" units="*C">0.0</constant>
         <constant digits="1" name="auxTempSensor2_tempC_3" units="*C">0.0</constant>
@@ -917,7 +917,7 @@
         <constant digits="1" name="auxTempSensor2_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="auxTempSensor2_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="auxTempSensor2_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="auxTempSensor2_adcChannel">"NONE"</constant>
+        <constant name="auxTempSensor2_adcChannel">"Disabled"</constant>
         <constant digits="0" name="knockSamplingDuration" units="Deg">45.0</constant>
         <constant digits="0" name="etbFreq" units="Hz">800.0</constant>
         <constant digits="4" name="etbWastegatePid_pFactor" units="">1.0</constant>
@@ -989,7 +989,7 @@
          80.0
          100.0
 </constant>
-        <constant name="oilPressure_hwChannel">"NONE"</constant>
+        <constant name="oilPressure_hwChannel">"Disabled"</constant>
         <constant digits="2" name="oilPressure_v1" units="volts">0.5</constant>
         <constant digits="2" name="oilPressure_value1" units="">0.0</constant>
         <constant digits="2" name="oilPressure_v2" units="volts">4.5</constant>
@@ -1010,12 +1010,12 @@
         <constant digits="0" name="coastingFuelCutClt" units="C">60.0</constant>
         <constant digits="0" name="pidExtraForLowRpm" units="%">0.0</constant>
         <constant digits="0" name="coastingFuelCutMap" units="kPa">30.0</constant>
-        <constant name="highPressureFuel_hwChannel">"NONE"</constant>
+        <constant name="highPressureFuel_hwChannel">"Disabled"</constant>
         <constant digits="2" name="highPressureFuel_v1" units="volts">0.0</constant>
         <constant digits="2" name="highPressureFuel_value1" units="">0.0</constant>
         <constant digits="2" name="highPressureFuel_v2" units="volts">0.0</constant>
         <constant digits="2" name="highPressureFuel_value2" units="">0.0</constant>
-        <constant name="lowPressureFuel_hwChannel">"NONE"</constant>
+        <constant name="lowPressureFuel_hwChannel">"Disabled"</constant>
         <constant digits="2" name="lowPressureFuel_v1" units="volts">0.0</constant>
         <constant digits="2" name="lowPressureFuel_value1" units="">0.0</constant>
         <constant digits="2" name="lowPressureFuel_v2" units="volts">0.0</constant>
@@ -1351,12 +1351,12 @@
         <constant name="gearControllerMode">"None"</constant>
         <constant name="transmissionControllerMode">"None"</constant>
         <constant digits="0" name="acrDisablePhase" units="deg">0.0</constant>
-        <constant name="auxLinear1_hwChannel">"NONE"</constant>
+        <constant name="auxLinear1_hwChannel">"Disabled"</constant>
         <constant digits="2" name="auxLinear1_v1" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear1_value1" units="">0.0</constant>
         <constant digits="2" name="auxLinear1_v2" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear1_value2" units="">0.0</constant>
-        <constant name="auxLinear2_hwChannel">"NONE"</constant>
+        <constant name="auxLinear2_hwChannel">"Disabled"</constant>
         <constant digits="2" name="auxLinear2_v1" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear2_value1" units="">0.0</constant>
         <constant digits="2" name="auxLinear2_v2" units="volts">0.0</constant>
@@ -1490,7 +1490,7 @@
         <constant digits="1" name="oilTempSensor_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="oilTempSensor_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="oilTempSensor_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="oilTempSensor_adcChannel">"NONE"</constant>
+        <constant name="oilTempSensor_adcChannel">"Disabled"</constant>
         <constant digits="1" name="fuelTempSensor_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="fuelTempSensor_tempC_2" units="*C">0.0</constant>
         <constant digits="1" name="fuelTempSensor_tempC_3" units="*C">0.0</constant>
@@ -1498,7 +1498,7 @@
         <constant digits="1" name="fuelTempSensor_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="fuelTempSensor_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="fuelTempSensor_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="fuelTempSensor_adcChannel">"NONE"</constant>
+        <constant name="fuelTempSensor_adcChannel">"Disabled"</constant>
         <constant digits="1" name="ambientTempSensor_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="ambientTempSensor_tempC_2" units="*C">0.0</constant>
         <constant digits="1" name="ambientTempSensor_tempC_3" units="*C">0.0</constant>
@@ -1506,7 +1506,7 @@
         <constant digits="1" name="ambientTempSensor_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="ambientTempSensor_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="ambientTempSensor_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="ambientTempSensor_adcChannel">"NONE"</constant>
+        <constant name="ambientTempSensor_adcChannel">"Disabled"</constant>
         <constant digits="1" name="compressorDischargeTemperature_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="compressorDischargeTemperature_tempC_2" units="*C">0.0</constant>
         <constant digits="1" name="compressorDischargeTemperature_tempC_3" units="*C">0.0</constant>
@@ -1514,9 +1514,9 @@
         <constant digits="1" name="compressorDischargeTemperature_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="compressorDischargeTemperature_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="compressorDischargeTemperature_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="compressorDischargeTemperature_adcChannel">"NONE"</constant>
-        <constant name="throttleInletPressureChannel">"NONE"</constant>
-        <constant name="compressorDischargePressureChannel">"NONE"</constant>
+        <constant name="compressorDischargeTemperature_adcChannel">"Disabled"</constant>
+        <constant name="throttleInletPressureChannel">"Disabled"</constant>
+        <constant name="compressorDischargePressureChannel">"Disabled"</constant>
         <constant name="dacOutputPins1">"NONE"</constant>
         <constant name="dacOutputPins2">"NONE"</constant>
         <constant name="speedometerOutputPin">"NONE"</constant>
@@ -1525,7 +1525,7 @@
         <constant digits="0" name="simulatorCamPosition2" units="">0.0</constant>
         <constant digits="0" name="simulatorCamPosition3" units="">0.0</constant>
         <constant digits="0" name="simulatorCamPosition4" units="">0.0</constant>
-        <constant name="ignKeyAdcChannel">"NONE"</constant>
+        <constant name="ignKeyAdcChannel">"Disabled"</constant>
         <constant name="spi6MisoMode">"default"</constant>
         <constant digits="3" name="triggerVVTGapOverrideFrom1" units="ratio">0.0</constant>
         <constant digits="3" name="triggerVVTGapOverrideFrom2" units="ratio">0.0</constant>
@@ -1600,18 +1600,18 @@
         <constant digits="0" name="device_uid1" units="">0.0</constant>
         <constant digits="0" name="device_uid2" units="">0.0</constant>
         <constant digits="0" name="device_uid3" units="">0.0</constant>
-        <constant name="tcu_rangeAnalogInput1">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput2">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput3">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput4">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput5">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput6">"NONE"</constant>
+        <constant name="tcu_rangeAnalogInput1">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput2">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput3">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput4">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput5">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput6">"Disabled"</constant>
         <constant digits="1" name="tcu_rangeSensorBiasResistor" units="Ohm">0.0</constant>
         <constant name="msIoBox0_id">"Off"</constant>
         <constant name="msIoBox0_vss">"Off"</constant>
         <constant digits="2" name="mc33810Nomi" units="A">5.5</constant>
         <constant digits="0" name="mc33810Maxi" units="A">14.0</constant>
-        <constant name="acPressure_hwChannel">"NONE"</constant>
+        <constant name="acPressure_hwChannel">"Disabled"</constant>
         <constant digits="2" name="acPressure_v1" units="volts">0.0</constant>
         <constant digits="2" name="acPressure_value1" units="">0.0</constant>
         <constant digits="2" name="acPressure_v2" units="volts">0.0</constant>
@@ -1619,12 +1619,12 @@
         <constant digits="0" name="minAcPressure" units="kPa">100.0</constant>
         <constant digits="0" name="maxAcPressure" units="kPa">300.0</constant>
         <constant digits="1" name="minimumOilPressureTimeout" units="sec">0.5</constant>
-        <constant name="auxLinear3_hwChannel">"NONE"</constant>
+        <constant name="auxLinear3_hwChannel">"Disabled"</constant>
         <constant digits="2" name="auxLinear3_v1" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear3_value1" units="">0.0</constant>
         <constant digits="2" name="auxLinear3_v2" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear3_value2" units="">0.0</constant>
-        <constant name="auxLinear4_hwChannel">"NONE"</constant>
+        <constant name="auxLinear4_hwChannel">"Disabled"</constant>
         <constant digits="2" name="auxLinear4_v1" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear4_value1" units="">0.0</constant>
         <constant digits="2" name="auxLinear4_v2" units="volts">0.0</constant>
@@ -4809,7 +4809,7 @@ end</constant>
          0.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240830" nPages="1" signature="rusEFI main.2024.09.06.mega100.821184268" version="5.0"/>
+    <versionInfo firmwareInfo="20240830" nPages="1" signature="rusEFI main.2024.09.06.mega100.2965644658" version="5.0"/>
     <bibliography author="rusEFI 20240830" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/generated/simulator_tune_HELLEN_154_HYUNDAI_COUPE_BK2.msq b/generated/simulator_tune_HELLEN_154_HYUNDAI_COUPE_BK2.msq
index 60d212b..d765bd3 100644
--- a/generated/simulator_tune_HELLEN_154_HYUNDAI_COUPE_BK2.msq
+++ b/generated/simulator_tune_HELLEN_154_HYUNDAI_COUPE_BK2.msq
@@ -157,7 +157,7 @@
         <constant digits="2" name="map_sensor_lowValue" units="kpa">0.0</constant>
         <constant digits="2" name="map_sensor_highValue" units="kpa">0.0</constant>
         <constant name="map_sensor_type">"MPX4250"</constant>
-        <constant name="map_sensor_hwChannel">"NONE"</constant>
+        <constant name="map_sensor_hwChannel">"Disabled"</constant>
         <constant digits="1" name="clt_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="clt_tempC_2" units="*C">23.8889</constant>
         <constant digits="1" name="clt_tempC_3" units="*C">48.8889</constant>
@@ -165,7 +165,7 @@
         <constant digits="1" name="clt_resistance_2" units="Ohm">2100.0</constant>
         <constant digits="1" name="clt_resistance_3" units="Ohm">1000.0</constant>
         <constant digits="1" name="clt_bias_resistor" units="Ohm">1500.0</constant>
-        <constant name="clt_adcChannel">"NONE"</constant>
+        <constant name="clt_adcChannel">"Disabled"</constant>
         <constant digits="1" name="iat_tempC_1" units="*C">-20.0</constant>
         <constant digits="1" name="iat_tempC_2" units="*C">23.8889</constant>
         <constant digits="1" name="iat_tempC_3" units="*C">120.0</constant>
@@ -173,7 +173,7 @@
         <constant digits="1" name="iat_resistance_2" units="Ohm">2100.0</constant>
         <constant digits="1" name="iat_resistance_3" units="Ohm">100.0</constant>
         <constant digits="1" name="iat_bias_resistor" units="Ohm">2700.0</constant>
-        <constant name="iat_adcChannel">"NONE"</constant>
+        <constant name="iat_adcChannel">"Disabled"</constant>
         <constant digits="2" name="launchTimingRetard" units="deg">0.0</constant>
         <constant digits="0" name="hip9011PrescalerAndSDO" units="integer">0.0</constant>
         <constant digits="0" name="unusedFloatHere" units="">0.0</constant>
@@ -209,10 +209,10 @@
         <constant digits="1" name="driveWheelRevPerKm" units="revs/km">1000.0</constant>
         <constant digits="2" name="canSleepPeriodMs" units="ms">50.0</constant>
         <constant digits="0" name="byFirmwareVersion" units="index">0.0</constant>
-        <constant name="tps1_1AdcChannel">"NONE"</constant>
-        <constant name="vbattAdcChannel">"NONE"</constant>
-        <constant name="fuelLevelSensor">"NONE"</constant>
-        <constant name="tps2_1AdcChannel">"NONE"</constant>
+        <constant name="tps1_1AdcChannel">"Disabled"</constant>
+        <constant name="vbattAdcChannel">"Disabled"</constant>
+        <constant name="fuelLevelSensor">"Disabled"</constant>
+        <constant name="tps2_1AdcChannel">"Disabled"</constant>
         <constant digits="4" name="idle_derivativeFilterLoss" units="x">0.0</constant>
         <constant digits="0" name="trailingSparkAngle" units="angle">10.0</constant>
         <constant name="trigger_type">"60-2"</constant>
@@ -221,7 +221,7 @@
         <constant digits="1" name="airByRpmTaper" units="%">0.0</constant>
         <constant name="hip9011SpiDevice">"Off"</constant>
         <constant digits="0" name="boostControlSafeDutyCycle" units="%">0.0</constant>
-        <constant name="mafAdcChannel">"NONE"</constant>
+        <constant name="mafAdcChannel">"Disabled"</constant>
         <constant digits="0" name="acrRevolutions" units="">5.0</constant>
         <constant digits="0" name="calibrationBirthday" units="">2.0240906E7</constant>
         <constant digits="3" name="adcVcc" units="volts">3.0</constant>
@@ -230,13 +230,13 @@
         <constant name="camInputs2">"NONE"</constant>
         <constant name="camInputs3">"NONE"</constant>
         <constant name="camInputs4">"NONE"</constant>
-        <constant name="afr_hwChannel">"NONE"</constant>
-        <constant name="afr_hwChannel2">"NONE"</constant>
+        <constant name="afr_hwChannel">"Disabled"</constant>
+        <constant name="afr_hwChannel2">"Disabled"</constant>
         <constant digits="2" name="afr_v1" units="volts">0.0</constant>
         <constant digits="2" name="afr_value1" units="AFR">9.996</constant>
         <constant digits="2" name="afr_v2" units="volts">5.0</constant>
         <constant digits="2" name="afr_value2" units="AFR">19.992</constant>
-        <constant name="throttlePedalPositionAdcChannel">"NONE"</constant>
+        <constant name="throttlePedalPositionAdcChannel">"Disabled"</constant>
         <constant digits="1" name="etbSplit" units="%">5.0</constant>
         <constant name="tle6240_cs">"NONE"</constant>
         <constant name="tle6240_csPinMode">"default"</constant>
@@ -245,7 +245,7 @@
         <constant digits="2" name="baroSensor_lowValue" units="kpa">0.0</constant>
         <constant digits="2" name="baroSensor_highValue" units="kpa">500.0</constant>
         <constant name="baroSensor_type">"Custom"</constant>
-        <constant name="baroSensor_hwChannel">"NONE"</constant>
+        <constant name="baroSensor_hwChannel">"Disabled"</constant>
         <constant digits="0" name="idle_solenoidFrequency" units="Hz">300.0</constant>
         <constant name="idle_solenoidPin">"NONE"</constant>
         <constant name="idle_stepperDirectionPin">"NONE"</constant>
@@ -308,10 +308,10 @@
         <constant name="brakePedalPinMode">"PULLUP"</constant>
         <constant name="mc33972_cs">"NONE"</constant>
         <constant name="mc33972_csPinMode">"default"</constant>
-        <constant name="auxFastSensor1_adcChannel">"NONE"</constant>
-        <constant name="tps1_2AdcChannel">"NONE"</constant>
-        <constant name="tps2_2AdcChannel">"NONE"</constant>
-        <constant name="throttlePedalPositionSecondAdcChannel">"NONE"</constant>
+        <constant name="auxFastSensor1_adcChannel">"Disabled"</constant>
+        <constant name="tps1_2AdcChannel">"Disabled"</constant>
+        <constant name="tps2_2AdcChannel">"Disabled"</constant>
+        <constant name="throttlePedalPositionSecondAdcChannel">"Disabled"</constant>
         <constant name="afr_type">"14Point7"</constant>
         <constant name="mc33810_cs1">"NONE"</constant>
         <constant digits="4" name="idle_antiwindupFreq" units="x">0.0</constant>
@@ -328,7 +328,7 @@
         <constant digits="3" name="fordInjectorSmallPulseSlope" units="g/s">0.0</constant>
         <constant name="triggerSimulatorPinModes1">"default"</constant>
         <constant name="triggerSimulatorPinModes2">"default"</constant>
-        <constant name="maf2AdcChannel">"NONE"</constant>
+        <constant name="maf2AdcChannel">"Disabled"</constant>
         <constant name="o2heaterPin">"NONE"</constant>
         <constant name="o2heaterPinModeTodO">"default"</constant>
         <constant digits="0" name="lambdaProtectionMinRpm" units="RPM">2500.0</constant>
@@ -405,7 +405,7 @@
         <constant digits="1" name="stoichRatioSecondary" units=":1">9.0</constant>
         <constant digits="0" name="etbMaximumPosition" units="%">100.0</constant>
         <constant digits="0" name="sdCardLogFrequency" units="hz">50.0</constant>
-        <constant name="idlePositionChannel">"NONE"</constant>
+        <constant name="idlePositionChannel">"Disabled"</constant>
         <constant digits="0" name="launchCorrectionsEndRpm" units="">0.0</constant>
         <constant name="starterRelayDisablePin">"NONE"</constant>
         <constant name="starterRelayDisablePinMode">"default"</constant>
@@ -639,9 +639,9 @@
         <constant name="launchActivateInverted">"false"</constant>
         <constant name="twoStroke">"Four Stroke"</constant>
         <constant name="skippedWheelOnCam">"On crankshaft"</constant>
-        <constant name="hipOutputChannel">"NONE"</constant>
+        <constant name="hipOutputChannel">"Disabled"</constant>
         <constant name="acSwitch">"NONE"</constant>
-        <constant name="vRefAdcChannel">"NONE"</constant>
+        <constant name="vRefAdcChannel">"Disabled"</constant>
         <constant digits="0" name="etbNeutralPosition" units="%">0.0</constant>
         <constant name="idleMode">"Open Loop"</constant>
         <constant name="isInjectionEnabled">"true"</constant>
@@ -814,7 +814,7 @@
         <constant name="can2TxPin">"NONE"</constant>
         <constant name="can2RxPin">"NONE"</constant>
         <constant name="starterControlPinMode">"default"</constant>
-        <constant name="wastegatePositionSensor">"NONE"</constant>
+        <constant name="wastegatePositionSensor">"Disabled"</constant>
         <constant name="ignOverrideMode">"None"</constant>
         <constant name="injectorPressureType">"Low"</constant>
         <constant name="hpfpValvePin">"NONE"</constant>
@@ -860,7 +860,7 @@
         <constant digits="2" name="mapLowValueVoltage" units="v">0.0</constant>
         <constant digits="2" name="mapHighValueVoltage" units="v">5.0</constant>
         <constant digits="2" name="egoValueShift" units="value">0.0</constant>
-        <constant name="vvtPins1">"INVALID"</constant>
+        <constant name="vvtPins1">"PA0"</constant>
         <constant name="vvtPins2">"NONE"</constant>
         <constant name="vvtPins3">"NONE"</constant>
         <constant name="vvtPins4">"NONE"</constant>
@@ -877,14 +877,14 @@
         <constant name="vvtMode2">"Inactive"</constant>
         <constant digits="0" name="fan2ExtraIdle" units="%">2.0</constant>
         <constant digits="2" name="primingDelay" units="sec">0.5</constant>
-        <constant name="auxAnalogInputs1">"NONE"</constant>
-        <constant name="auxAnalogInputs2">"NONE"</constant>
-        <constant name="auxAnalogInputs3">"NONE"</constant>
-        <constant name="auxAnalogInputs4">"NONE"</constant>
-        <constant name="auxAnalogInputs5">"NONE"</constant>
-        <constant name="auxAnalogInputs6">"NONE"</constant>
-        <constant name="auxAnalogInputs7">"NONE"</constant>
-        <constant name="auxAnalogInputs8">"NONE"</constant>
+        <constant name="auxAnalogInputs1">"Disabled"</constant>
+        <constant name="auxAnalogInputs2">"Disabled"</constant>
+        <constant name="auxAnalogInputs3">"Disabled"</constant>
+        <constant name="auxAnalogInputs4">"Disabled"</constant>
+        <constant name="auxAnalogInputs5">"Disabled"</constant>
+        <constant name="auxAnalogInputs6">"Disabled"</constant>
+        <constant name="auxAnalogInputs7">"Disabled"</constant>
+        <constant name="auxAnalogInputs8">"Disabled"</constant>
         <constant name="trailingCoilPins1">"NONE"</constant>
         <constant name="trailingCoilPins2">"NONE"</constant>
         <constant name="trailingCoilPins3">"NONE"</constant>
@@ -909,7 +909,7 @@
         <constant digits="1" name="auxTempSensor1_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="auxTempSensor1_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="auxTempSensor1_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="auxTempSensor1_adcChannel">"NONE"</constant>
+        <constant name="auxTempSensor1_adcChannel">"Disabled"</constant>
         <constant digits="1" name="auxTempSensor2_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="auxTempSensor2_tempC_2" units="*C">0.0</constant>
         <constant digits="1" name="auxTempSensor2_tempC_3" units="*C">0.0</constant>
@@ -917,7 +917,7 @@
         <constant digits="1" name="auxTempSensor2_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="auxTempSensor2_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="auxTempSensor2_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="auxTempSensor2_adcChannel">"NONE"</constant>
+        <constant name="auxTempSensor2_adcChannel">"Disabled"</constant>
         <constant digits="0" name="knockSamplingDuration" units="Deg">45.0</constant>
         <constant digits="0" name="etbFreq" units="Hz">800.0</constant>
         <constant digits="4" name="etbWastegatePid_pFactor" units="">1.0</constant>
@@ -989,7 +989,7 @@
          80.0
          100.0
 </constant>
-        <constant name="oilPressure_hwChannel">"NONE"</constant>
+        <constant name="oilPressure_hwChannel">"Disabled"</constant>
         <constant digits="2" name="oilPressure_v1" units="volts">0.5</constant>
         <constant digits="2" name="oilPressure_value1" units="">0.0</constant>
         <constant digits="2" name="oilPressure_v2" units="volts">4.5</constant>
@@ -1010,12 +1010,12 @@
         <constant digits="0" name="coastingFuelCutClt" units="C">60.0</constant>
         <constant digits="0" name="pidExtraForLowRpm" units="%">0.0</constant>
         <constant digits="0" name="coastingFuelCutMap" units="kPa">30.0</constant>
-        <constant name="highPressureFuel_hwChannel">"NONE"</constant>
+        <constant name="highPressureFuel_hwChannel">"Disabled"</constant>
         <constant digits="2" name="highPressureFuel_v1" units="volts">0.0</constant>
         <constant digits="2" name="highPressureFuel_value1" units="">0.0</constant>
         <constant digits="2" name="highPressureFuel_v2" units="volts">0.0</constant>
         <constant digits="2" name="highPressureFuel_value2" units="">0.0</constant>
-        <constant name="lowPressureFuel_hwChannel">"NONE"</constant>
+        <constant name="lowPressureFuel_hwChannel">"Disabled"</constant>
         <constant digits="2" name="lowPressureFuel_v1" units="volts">0.0</constant>
         <constant digits="2" name="lowPressureFuel_value1" units="">0.0</constant>
         <constant digits="2" name="lowPressureFuel_v2" units="volts">0.0</constant>
@@ -1351,12 +1351,12 @@
         <constant name="gearControllerMode">"None"</constant>
         <constant name="transmissionControllerMode">"None"</constant>
         <constant digits="0" name="acrDisablePhase" units="deg">0.0</constant>
-        <constant name="auxLinear1_hwChannel">"NONE"</constant>
+        <constant name="auxLinear1_hwChannel">"Disabled"</constant>
         <constant digits="2" name="auxLinear1_v1" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear1_value1" units="">0.0</constant>
         <constant digits="2" name="auxLinear1_v2" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear1_value2" units="">0.0</constant>
-        <constant name="auxLinear2_hwChannel">"NONE"</constant>
+        <constant name="auxLinear2_hwChannel">"Disabled"</constant>
         <constant digits="2" name="auxLinear2_v1" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear2_value1" units="">0.0</constant>
         <constant digits="2" name="auxLinear2_v2" units="volts">0.0</constant>
@@ -1490,7 +1490,7 @@
         <constant digits="1" name="oilTempSensor_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="oilTempSensor_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="oilTempSensor_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="oilTempSensor_adcChannel">"NONE"</constant>
+        <constant name="oilTempSensor_adcChannel">"Disabled"</constant>
         <constant digits="1" name="fuelTempSensor_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="fuelTempSensor_tempC_2" units="*C">0.0</constant>
         <constant digits="1" name="fuelTempSensor_tempC_3" units="*C">0.0</constant>
@@ -1498,7 +1498,7 @@
         <constant digits="1" name="fuelTempSensor_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="fuelTempSensor_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="fuelTempSensor_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="fuelTempSensor_adcChannel">"NONE"</constant>
+        <constant name="fuelTempSensor_adcChannel">"Disabled"</constant>
         <constant digits="1" name="ambientTempSensor_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="ambientTempSensor_tempC_2" units="*C">0.0</constant>
         <constant digits="1" name="ambientTempSensor_tempC_3" units="*C">0.0</constant>
@@ -1506,7 +1506,7 @@
         <constant digits="1" name="ambientTempSensor_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="ambientTempSensor_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="ambientTempSensor_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="ambientTempSensor_adcChannel">"NONE"</constant>
+        <constant name="ambientTempSensor_adcChannel">"Disabled"</constant>
         <constant digits="1" name="compressorDischargeTemperature_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="compressorDischargeTemperature_tempC_2" units="*C">0.0</constant>
         <constant digits="1" name="compressorDischargeTemperature_tempC_3" units="*C">0.0</constant>
@@ -1514,9 +1514,9 @@
         <constant digits="1" name="compressorDischargeTemperature_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="compressorDischargeTemperature_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="compressorDischargeTemperature_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="compressorDischargeTemperature_adcChannel">"NONE"</constant>
-        <constant name="throttleInletPressureChannel">"NONE"</constant>
-        <constant name="compressorDischargePressureChannel">"NONE"</constant>
+        <constant name="compressorDischargeTemperature_adcChannel">"Disabled"</constant>
+        <constant name="throttleInletPressureChannel">"Disabled"</constant>
+        <constant name="compressorDischargePressureChannel">"Disabled"</constant>
         <constant name="dacOutputPins1">"NONE"</constant>
         <constant name="dacOutputPins2">"NONE"</constant>
         <constant name="speedometerOutputPin">"NONE"</constant>
@@ -1525,7 +1525,7 @@
         <constant digits="0" name="simulatorCamPosition2" units="">0.0</constant>
         <constant digits="0" name="simulatorCamPosition3" units="">0.0</constant>
         <constant digits="0" name="simulatorCamPosition4" units="">0.0</constant>
-        <constant name="ignKeyAdcChannel">"NONE"</constant>
+        <constant name="ignKeyAdcChannel">"Disabled"</constant>
         <constant name="spi6MisoMode">"default"</constant>
         <constant digits="3" name="triggerVVTGapOverrideFrom1" units="ratio">0.0</constant>
         <constant digits="3" name="triggerVVTGapOverrideFrom2" units="ratio">0.0</constant>
@@ -1600,18 +1600,18 @@
         <constant digits="0" name="device_uid1" units="">0.0</constant>
         <constant digits="0" name="device_uid2" units="">0.0</constant>
         <constant digits="0" name="device_uid3" units="">0.0</constant>
-        <constant name="tcu_rangeAnalogInput1">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput2">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput3">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput4">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput5">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput6">"NONE"</constant>
+        <constant name="tcu_rangeAnalogInput1">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput2">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput3">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput4">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput5">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput6">"Disabled"</constant>
         <constant digits="1" name="tcu_rangeSensorBiasResistor" units="Ohm">0.0</constant>
         <constant name="msIoBox0_id">"Off"</constant>
         <constant name="msIoBox0_vss">"Off"</constant>
         <constant digits="2" name="mc33810Nomi" units="A">5.5</constant>
         <constant digits="0" name="mc33810Maxi" units="A">14.0</constant>
-        <constant name="acPressure_hwChannel">"NONE"</constant>
+        <constant name="acPressure_hwChannel">"Disabled"</constant>
         <constant digits="2" name="acPressure_v1" units="volts">0.0</constant>
         <constant digits="2" name="acPressure_value1" units="">0.0</constant>
         <constant digits="2" name="acPressure_v2" units="volts">0.0</constant>
@@ -1619,12 +1619,12 @@
         <constant digits="0" name="minAcPressure" units="kPa">100.0</constant>
         <constant digits="0" name="maxAcPressure" units="kPa">300.0</constant>
         <constant digits="1" name="minimumOilPressureTimeout" units="sec">0.5</constant>
-        <constant name="auxLinear3_hwChannel">"NONE"</constant>
+        <constant name="auxLinear3_hwChannel">"Disabled"</constant>
         <constant digits="2" name="auxLinear3_v1" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear3_value1" units="">0.0</constant>
         <constant digits="2" name="auxLinear3_v2" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear3_value2" units="">0.0</constant>
-        <constant name="auxLinear4_hwChannel">"NONE"</constant>
+        <constant name="auxLinear4_hwChannel">"Disabled"</constant>
         <constant digits="2" name="auxLinear4_v1" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear4_value1" units="">0.0</constant>
         <constant digits="2" name="auxLinear4_v2" units="volts">0.0</constant>
@@ -4809,7 +4809,7 @@ end</constant>
          0.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240830" nPages="1" signature="rusEFI main.2024.09.06.mega100.821184268" version="5.0"/>
+    <versionInfo firmwareInfo="20240830" nPages="1" signature="rusEFI main.2024.09.06.mega100.2965644658" version="5.0"/>
     <bibliography author="rusEFI 20240830" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/generated/simulator_tune_HONDA_K.msq b/generated/simulator_tune_HONDA_K.msq
index cc6bcdc..86cabb9 100644
--- a/generated/simulator_tune_HONDA_K.msq
+++ b/generated/simulator_tune_HONDA_K.msq
@@ -157,7 +157,7 @@
         <constant digits="2" name="map_sensor_lowValue" units="kpa">0.0</constant>
         <constant digits="2" name="map_sensor_highValue" units="kpa">0.0</constant>
         <constant name="map_sensor_type">"DENSO183"</constant>
-        <constant name="map_sensor_hwChannel">"NONE"</constant>
+        <constant name="map_sensor_hwChannel">"Disabled"</constant>
         <constant digits="1" name="clt_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="clt_tempC_2" units="*C">23.8889</constant>
         <constant digits="1" name="clt_tempC_3" units="*C">48.8889</constant>
@@ -165,7 +165,7 @@
         <constant digits="1" name="clt_resistance_2" units="Ohm">2100.0</constant>
         <constant digits="1" name="clt_resistance_3" units="Ohm">1000.0</constant>
         <constant digits="1" name="clt_bias_resistor" units="Ohm">1500.0</constant>
-        <constant name="clt_adcChannel">"NONE"</constant>
+        <constant name="clt_adcChannel">"Disabled"</constant>
         <constant digits="1" name="iat_tempC_1" units="*C">-20.0</constant>
         <constant digits="1" name="iat_tempC_2" units="*C">23.8889</constant>
         <constant digits="1" name="iat_tempC_3" units="*C">120.0</constant>
@@ -173,7 +173,7 @@
         <constant digits="1" name="iat_resistance_2" units="Ohm">2100.0</constant>
         <constant digits="1" name="iat_resistance_3" units="Ohm">100.0</constant>
         <constant digits="1" name="iat_bias_resistor" units="Ohm">2700.0</constant>
-        <constant name="iat_adcChannel">"NONE"</constant>
+        <constant name="iat_adcChannel">"Disabled"</constant>
         <constant digits="2" name="launchTimingRetard" units="deg">0.0</constant>
         <constant digits="0" name="hip9011PrescalerAndSDO" units="integer">0.0</constant>
         <constant digits="0" name="unusedFloatHere" units="">0.0</constant>
@@ -209,10 +209,10 @@
         <constant digits="1" name="driveWheelRevPerKm" units="revs/km">1000.0</constant>
         <constant digits="2" name="canSleepPeriodMs" units="ms">50.0</constant>
         <constant digits="0" name="byFirmwareVersion" units="index">0.0</constant>
-        <constant name="tps1_1AdcChannel">"NONE"</constant>
-        <constant name="vbattAdcChannel">"NONE"</constant>
-        <constant name="fuelLevelSensor">"NONE"</constant>
-        <constant name="tps2_1AdcChannel">"NONE"</constant>
+        <constant name="tps1_1AdcChannel">"Disabled"</constant>
+        <constant name="vbattAdcChannel">"Disabled"</constant>
+        <constant name="fuelLevelSensor">"Disabled"</constant>
+        <constant name="tps2_1AdcChannel">"Disabled"</constant>
         <constant digits="4" name="idle_derivativeFilterLoss" units="x">0.0</constant>
         <constant digits="0" name="trailingSparkAngle" units="angle">10.0</constant>
         <constant name="trigger_type">"Honda K 12+1"</constant>
@@ -221,7 +221,7 @@
         <constant digits="1" name="airByRpmTaper" units="%">0.0</constant>
         <constant name="hip9011SpiDevice">"Off"</constant>
         <constant digits="0" name="boostControlSafeDutyCycle" units="%">0.0</constant>
-        <constant name="mafAdcChannel">"NONE"</constant>
+        <constant name="mafAdcChannel">"Disabled"</constant>
         <constant digits="0" name="acrRevolutions" units="">5.0</constant>
         <constant digits="0" name="calibrationBirthday" units="">2.0240906E7</constant>
         <constant digits="3" name="adcVcc" units="volts">3.0</constant>
@@ -230,13 +230,13 @@
         <constant name="camInputs2">"NONE"</constant>
         <constant name="camInputs3">"NONE"</constant>
         <constant name="camInputs4">"NONE"</constant>
-        <constant name="afr_hwChannel">"NONE"</constant>
-        <constant name="afr_hwChannel2">"NONE"</constant>
+        <constant name="afr_hwChannel">"Disabled"</constant>
+        <constant name="afr_hwChannel2">"Disabled"</constant>
         <constant digits="2" name="afr_v1" units="volts">0.0</constant>
         <constant digits="2" name="afr_value1" units="AFR">9.996</constant>
         <constant digits="2" name="afr_v2" units="volts">5.0</constant>
         <constant digits="2" name="afr_value2" units="AFR">19.992</constant>
-        <constant name="throttlePedalPositionAdcChannel">"NONE"</constant>
+        <constant name="throttlePedalPositionAdcChannel">"Disabled"</constant>
         <constant digits="1" name="etbSplit" units="%">5.0</constant>
         <constant name="tle6240_cs">"NONE"</constant>
         <constant name="tle6240_csPinMode">"default"</constant>
@@ -245,7 +245,7 @@
         <constant digits="2" name="baroSensor_lowValue" units="kpa">0.0</constant>
         <constant digits="2" name="baroSensor_highValue" units="kpa">500.0</constant>
         <constant name="baroSensor_type">"Custom"</constant>
-        <constant name="baroSensor_hwChannel">"NONE"</constant>
+        <constant name="baroSensor_hwChannel">"Disabled"</constant>
         <constant digits="0" name="idle_solenoidFrequency" units="Hz">300.0</constant>
         <constant name="idle_solenoidPin">"NONE"</constant>
         <constant name="idle_stepperDirectionPin">"NONE"</constant>
@@ -308,10 +308,10 @@
         <constant name="brakePedalPinMode">"PULLUP"</constant>
         <constant name="mc33972_cs">"NONE"</constant>
         <constant name="mc33972_csPinMode">"default"</constant>
-        <constant name="auxFastSensor1_adcChannel">"NONE"</constant>
-        <constant name="tps1_2AdcChannel">"NONE"</constant>
-        <constant name="tps2_2AdcChannel">"NONE"</constant>
-        <constant name="throttlePedalPositionSecondAdcChannel">"NONE"</constant>
+        <constant name="auxFastSensor1_adcChannel">"Disabled"</constant>
+        <constant name="tps1_2AdcChannel">"Disabled"</constant>
+        <constant name="tps2_2AdcChannel">"Disabled"</constant>
+        <constant name="throttlePedalPositionSecondAdcChannel">"Disabled"</constant>
         <constant name="afr_type">"14Point7"</constant>
         <constant name="mc33810_cs1">"NONE"</constant>
         <constant digits="4" name="idle_antiwindupFreq" units="x">0.0</constant>
@@ -328,7 +328,7 @@
         <constant digits="3" name="fordInjectorSmallPulseSlope" units="g/s">0.0</constant>
         <constant name="triggerSimulatorPinModes1">"default"</constant>
         <constant name="triggerSimulatorPinModes2">"default"</constant>
-        <constant name="maf2AdcChannel">"NONE"</constant>
+        <constant name="maf2AdcChannel">"Disabled"</constant>
         <constant name="o2heaterPin">"NONE"</constant>
         <constant name="o2heaterPinModeTodO">"default"</constant>
         <constant digits="0" name="lambdaProtectionMinRpm" units="RPM">2500.0</constant>
@@ -405,7 +405,7 @@
         <constant digits="1" name="stoichRatioSecondary" units=":1">9.0</constant>
         <constant digits="0" name="etbMaximumPosition" units="%">100.0</constant>
         <constant digits="0" name="sdCardLogFrequency" units="hz">50.0</constant>
-        <constant name="idlePositionChannel">"NONE"</constant>
+        <constant name="idlePositionChannel">"Disabled"</constant>
         <constant digits="0" name="launchCorrectionsEndRpm" units="">0.0</constant>
         <constant name="starterRelayDisablePin">"NONE"</constant>
         <constant name="starterRelayDisablePinMode">"default"</constant>
@@ -639,9 +639,9 @@
         <constant name="launchActivateInverted">"false"</constant>
         <constant name="twoStroke">"Four Stroke"</constant>
         <constant name="skippedWheelOnCam">"On crankshaft"</constant>
-        <constant name="hipOutputChannel">"NONE"</constant>
+        <constant name="hipOutputChannel">"Disabled"</constant>
         <constant name="acSwitch">"NONE"</constant>
-        <constant name="vRefAdcChannel">"NONE"</constant>
+        <constant name="vRefAdcChannel">"Disabled"</constant>
         <constant digits="0" name="etbNeutralPosition" units="%">0.0</constant>
         <constant name="idleMode">"Open Loop"</constant>
         <constant name="isInjectionEnabled">"true"</constant>
@@ -814,7 +814,7 @@
         <constant name="can2TxPin">"NONE"</constant>
         <constant name="can2RxPin">"NONE"</constant>
         <constant name="starterControlPinMode">"default"</constant>
-        <constant name="wastegatePositionSensor">"NONE"</constant>
+        <constant name="wastegatePositionSensor">"Disabled"</constant>
         <constant name="ignOverrideMode">"None"</constant>
         <constant name="injectorPressureType">"Low"</constant>
         <constant name="hpfpValvePin">"NONE"</constant>
@@ -860,7 +860,7 @@
         <constant digits="2" name="mapLowValueVoltage" units="v">0.0</constant>
         <constant digits="2" name="mapHighValueVoltage" units="v">5.0</constant>
         <constant digits="2" name="egoValueShift" units="value">0.0</constant>
-        <constant name="vvtPins1">"INVALID"</constant>
+        <constant name="vvtPins1">"PA0"</constant>
         <constant name="vvtPins2">"NONE"</constant>
         <constant name="vvtPins3">"NONE"</constant>
         <constant name="vvtPins4">"NONE"</constant>
@@ -877,14 +877,14 @@
         <constant name="vvtMode2">"Honda K Exhaust"</constant>
         <constant digits="0" name="fan2ExtraIdle" units="%">2.0</constant>
         <constant digits="2" name="primingDelay" units="sec">0.5</constant>
-        <constant name="auxAnalogInputs1">"NONE"</constant>
-        <constant name="auxAnalogInputs2">"NONE"</constant>
-        <constant name="auxAnalogInputs3">"NONE"</constant>
-        <constant name="auxAnalogInputs4">"NONE"</constant>
-        <constant name="auxAnalogInputs5">"NONE"</constant>
-        <constant name="auxAnalogInputs6">"NONE"</constant>
-        <constant name="auxAnalogInputs7">"NONE"</constant>
-        <constant name="auxAnalogInputs8">"NONE"</constant>
+        <constant name="auxAnalogInputs1">"Disabled"</constant>
+        <constant name="auxAnalogInputs2">"Disabled"</constant>
+        <constant name="auxAnalogInputs3">"Disabled"</constant>
+        <constant name="auxAnalogInputs4">"Disabled"</constant>
+        <constant name="auxAnalogInputs5">"Disabled"</constant>
+        <constant name="auxAnalogInputs6">"Disabled"</constant>
+        <constant name="auxAnalogInputs7">"Disabled"</constant>
+        <constant name="auxAnalogInputs8">"Disabled"</constant>
         <constant name="trailingCoilPins1">"NONE"</constant>
         <constant name="trailingCoilPins2">"NONE"</constant>
         <constant name="trailingCoilPins3">"NONE"</constant>
@@ -909,7 +909,7 @@
         <constant digits="1" name="auxTempSensor1_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="auxTempSensor1_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="auxTempSensor1_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="auxTempSensor1_adcChannel">"NONE"</constant>
+        <constant name="auxTempSensor1_adcChannel">"Disabled"</constant>
         <constant digits="1" name="auxTempSensor2_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="auxTempSensor2_tempC_2" units="*C">0.0</constant>
         <constant digits="1" name="auxTempSensor2_tempC_3" units="*C">0.0</constant>
@@ -917,7 +917,7 @@
         <constant digits="1" name="auxTempSensor2_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="auxTempSensor2_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="auxTempSensor2_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="auxTempSensor2_adcChannel">"NONE"</constant>
+        <constant name="auxTempSensor2_adcChannel">"Disabled"</constant>
         <constant digits="0" name="knockSamplingDuration" units="Deg">45.0</constant>
         <constant digits="0" name="etbFreq" units="Hz">800.0</constant>
         <constant digits="4" name="etbWastegatePid_pFactor" units="">1.0</constant>
@@ -989,7 +989,7 @@
          80.0
          100.0
 </constant>
-        <constant name="oilPressure_hwChannel">"NONE"</constant>
+        <constant name="oilPressure_hwChannel">"Disabled"</constant>
         <constant digits="2" name="oilPressure_v1" units="volts">0.5</constant>
         <constant digits="2" name="oilPressure_value1" units="">0.0</constant>
         <constant digits="2" name="oilPressure_v2" units="volts">4.5</constant>
@@ -1010,12 +1010,12 @@
         <constant digits="0" name="coastingFuelCutClt" units="C">60.0</constant>
         <constant digits="0" name="pidExtraForLowRpm" units="%">0.0</constant>
         <constant digits="0" name="coastingFuelCutMap" units="kPa">30.0</constant>
-        <constant name="highPressureFuel_hwChannel">"NONE"</constant>
+        <constant name="highPressureFuel_hwChannel">"Disabled"</constant>
         <constant digits="2" name="highPressureFuel_v1" units="volts">0.0</constant>
         <constant digits="2" name="highPressureFuel_value1" units="">0.0</constant>
         <constant digits="2" name="highPressureFuel_v2" units="volts">0.0</constant>
         <constant digits="2" name="highPressureFuel_value2" units="">0.0</constant>
-        <constant name="lowPressureFuel_hwChannel">"NONE"</constant>
+        <constant name="lowPressureFuel_hwChannel">"Disabled"</constant>
         <constant digits="2" name="lowPressureFuel_v1" units="volts">0.0</constant>
         <constant digits="2" name="lowPressureFuel_value1" units="">0.0</constant>
         <constant digits="2" name="lowPressureFuel_v2" units="volts">0.0</constant>
@@ -1351,12 +1351,12 @@
         <constant name="gearControllerMode">"None"</constant>
         <constant name="transmissionControllerMode">"None"</constant>
         <constant digits="0" name="acrDisablePhase" units="deg">0.0</constant>
-        <constant name="auxLinear1_hwChannel">"NONE"</constant>
+        <constant name="auxLinear1_hwChannel">"Disabled"</constant>
         <constant digits="2" name="auxLinear1_v1" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear1_value1" units="">0.0</constant>
         <constant digits="2" name="auxLinear1_v2" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear1_value2" units="">0.0</constant>
-        <constant name="auxLinear2_hwChannel">"NONE"</constant>
+        <constant name="auxLinear2_hwChannel">"Disabled"</constant>
         <constant digits="2" name="auxLinear2_v1" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear2_value1" units="">0.0</constant>
         <constant digits="2" name="auxLinear2_v2" units="volts">0.0</constant>
@@ -1490,7 +1490,7 @@
         <constant digits="1" name="oilTempSensor_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="oilTempSensor_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="oilTempSensor_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="oilTempSensor_adcChannel">"NONE"</constant>
+        <constant name="oilTempSensor_adcChannel">"Disabled"</constant>
         <constant digits="1" name="fuelTempSensor_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="fuelTempSensor_tempC_2" units="*C">0.0</constant>
         <constant digits="1" name="fuelTempSensor_tempC_3" units="*C">0.0</constant>
@@ -1498,7 +1498,7 @@
         <constant digits="1" name="fuelTempSensor_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="fuelTempSensor_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="fuelTempSensor_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="fuelTempSensor_adcChannel">"NONE"</constant>
+        <constant name="fuelTempSensor_adcChannel">"Disabled"</constant>
         <constant digits="1" name="ambientTempSensor_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="ambientTempSensor_tempC_2" units="*C">0.0</constant>
         <constant digits="1" name="ambientTempSensor_tempC_3" units="*C">0.0</constant>
@@ -1506,7 +1506,7 @@
         <constant digits="1" name="ambientTempSensor_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="ambientTempSensor_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="ambientTempSensor_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="ambientTempSensor_adcChannel">"NONE"</constant>
+        <constant name="ambientTempSensor_adcChannel">"Disabled"</constant>
         <constant digits="1" name="compressorDischargeTemperature_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="compressorDischargeTemperature_tempC_2" units="*C">0.0</constant>
         <constant digits="1" name="compressorDischargeTemperature_tempC_3" units="*C">0.0</constant>
@@ -1514,9 +1514,9 @@
         <constant digits="1" name="compressorDischargeTemperature_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="compressorDischargeTemperature_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="compressorDischargeTemperature_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="compressorDischargeTemperature_adcChannel">"NONE"</constant>
-        <constant name="throttleInletPressureChannel">"NONE"</constant>
-        <constant name="compressorDischargePressureChannel">"NONE"</constant>
+        <constant name="compressorDischargeTemperature_adcChannel">"Disabled"</constant>
+        <constant name="throttleInletPressureChannel">"Disabled"</constant>
+        <constant name="compressorDischargePressureChannel">"Disabled"</constant>
         <constant name="dacOutputPins1">"NONE"</constant>
         <constant name="dacOutputPins2">"NONE"</constant>
         <constant name="speedometerOutputPin">"NONE"</constant>
@@ -1525,7 +1525,7 @@
         <constant digits="0" name="simulatorCamPosition2" units="">0.0</constant>
         <constant digits="0" name="simulatorCamPosition3" units="">0.0</constant>
         <constant digits="0" name="simulatorCamPosition4" units="">0.0</constant>
-        <constant name="ignKeyAdcChannel">"NONE"</constant>
+        <constant name="ignKeyAdcChannel">"Disabled"</constant>
         <constant name="spi6MisoMode">"default"</constant>
         <constant digits="3" name="triggerVVTGapOverrideFrom1" units="ratio">0.0</constant>
         <constant digits="3" name="triggerVVTGapOverrideFrom2" units="ratio">0.0</constant>
@@ -1600,18 +1600,18 @@
         <constant digits="0" name="device_uid1" units="">0.0</constant>
         <constant digits="0" name="device_uid2" units="">0.0</constant>
         <constant digits="0" name="device_uid3" units="">0.0</constant>
-        <constant name="tcu_rangeAnalogInput1">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput2">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput3">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput4">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput5">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput6">"NONE"</constant>
+        <constant name="tcu_rangeAnalogInput1">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput2">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput3">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput4">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput5">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput6">"Disabled"</constant>
         <constant digits="1" name="tcu_rangeSensorBiasResistor" units="Ohm">0.0</constant>
         <constant name="msIoBox0_id">"Off"</constant>
         <constant name="msIoBox0_vss">"Off"</constant>
         <constant digits="2" name="mc33810Nomi" units="A">5.5</constant>
         <constant digits="0" name="mc33810Maxi" units="A">14.0</constant>
-        <constant name="acPressure_hwChannel">"NONE"</constant>
+        <constant name="acPressure_hwChannel">"Disabled"</constant>
         <constant digits="2" name="acPressure_v1" units="volts">0.0</constant>
         <constant digits="2" name="acPressure_value1" units="">0.0</constant>
         <constant digits="2" name="acPressure_v2" units="volts">0.0</constant>
@@ -1619,12 +1619,12 @@
         <constant digits="0" name="minAcPressure" units="kPa">100.0</constant>
         <constant digits="0" name="maxAcPressure" units="kPa">300.0</constant>
         <constant digits="1" name="minimumOilPressureTimeout" units="sec">0.5</constant>
-        <constant name="auxLinear3_hwChannel">"NONE"</constant>
+        <constant name="auxLinear3_hwChannel">"Disabled"</constant>
         <constant digits="2" name="auxLinear3_v1" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear3_value1" units="">0.0</constant>
         <constant digits="2" name="auxLinear3_v2" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear3_value2" units="">0.0</constant>
-        <constant name="auxLinear4_hwChannel">"NONE"</constant>
+        <constant name="auxLinear4_hwChannel">"Disabled"</constant>
         <constant digits="2" name="auxLinear4_v1" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear4_value1" units="">0.0</constant>
         <constant digits="2" name="auxLinear4_v2" units="volts">0.0</constant>
@@ -4762,7 +4762,7 @@ end</constant>
          0.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240830" nPages="1" signature="rusEFI main.2024.09.06.mega100.821184268" version="5.0"/>
+    <versionInfo firmwareInfo="20240830" nPages="1" signature="rusEFI main.2024.09.06.mega100.2965644658" version="5.0"/>
     <bibliography author="rusEFI 20240830" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/generated/simulator_tune_HONDA_OBD1.msq b/generated/simulator_tune_HONDA_OBD1.msq
index 8e3c4da..1318897 100644
--- a/generated/simulator_tune_HONDA_OBD1.msq
+++ b/generated/simulator_tune_HONDA_OBD1.msq
@@ -157,7 +157,7 @@
         <constant digits="2" name="map_sensor_lowValue" units="kpa">0.0</constant>
         <constant digits="2" name="map_sensor_highValue" units="kpa">0.0</constant>
         <constant name="map_sensor_type">"DENSO183"</constant>
-        <constant name="map_sensor_hwChannel">"NONE"</constant>
+        <constant name="map_sensor_hwChannel">"Disabled"</constant>
         <constant digits="1" name="clt_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="clt_tempC_2" units="*C">23.8889</constant>
         <constant digits="1" name="clt_tempC_3" units="*C">48.8889</constant>
@@ -165,7 +165,7 @@
         <constant digits="1" name="clt_resistance_2" units="Ohm">2100.0</constant>
         <constant digits="1" name="clt_resistance_3" units="Ohm">1000.0</constant>
         <constant digits="1" name="clt_bias_resistor" units="Ohm">1500.0</constant>
-        <constant name="clt_adcChannel">"NONE"</constant>
+        <constant name="clt_adcChannel">"Disabled"</constant>
         <constant digits="1" name="iat_tempC_1" units="*C">-20.0</constant>
         <constant digits="1" name="iat_tempC_2" units="*C">23.8889</constant>
         <constant digits="1" name="iat_tempC_3" units="*C">120.0</constant>
@@ -173,7 +173,7 @@
         <constant digits="1" name="iat_resistance_2" units="Ohm">2100.0</constant>
         <constant digits="1" name="iat_resistance_3" units="Ohm">100.0</constant>
         <constant digits="1" name="iat_bias_resistor" units="Ohm">2700.0</constant>
-        <constant name="iat_adcChannel">"NONE"</constant>
+        <constant name="iat_adcChannel">"Disabled"</constant>
         <constant digits="2" name="launchTimingRetard" units="deg">0.0</constant>
         <constant digits="0" name="hip9011PrescalerAndSDO" units="integer">0.0</constant>
         <constant digits="0" name="unusedFloatHere" units="">0.0</constant>
@@ -209,10 +209,10 @@
         <constant digits="1" name="driveWheelRevPerKm" units="revs/km">1000.0</constant>
         <constant digits="2" name="canSleepPeriodMs" units="ms">50.0</constant>
         <constant digits="0" name="byFirmwareVersion" units="index">0.0</constant>
-        <constant name="tps1_1AdcChannel">"NONE"</constant>
-        <constant name="vbattAdcChannel">"NONE"</constant>
-        <constant name="fuelLevelSensor">"NONE"</constant>
-        <constant name="tps2_1AdcChannel">"NONE"</constant>
+        <constant name="tps1_1AdcChannel">"Disabled"</constant>
+        <constant name="vbattAdcChannel">"Disabled"</constant>
+        <constant name="fuelLevelSensor">"Disabled"</constant>
+        <constant name="tps2_1AdcChannel">"Disabled"</constant>
         <constant digits="4" name="idle_derivativeFilterLoss" units="x">0.0</constant>
         <constant digits="0" name="trailingSparkAngle" units="angle">10.0</constant>
         <constant name="trigger_type">"12crank/24cam"</constant>
@@ -221,7 +221,7 @@
         <constant digits="1" name="airByRpmTaper" units="%">0.0</constant>
         <constant name="hip9011SpiDevice">"Off"</constant>
         <constant digits="0" name="boostControlSafeDutyCycle" units="%">0.0</constant>
-        <constant name="mafAdcChannel">"NONE"</constant>
+        <constant name="mafAdcChannel">"Disabled"</constant>
         <constant digits="0" name="acrRevolutions" units="">5.0</constant>
         <constant digits="0" name="calibrationBirthday" units="">2.0240906E7</constant>
         <constant digits="3" name="adcVcc" units="volts">3.0</constant>
@@ -230,13 +230,13 @@
         <constant name="camInputs2">"NONE"</constant>
         <constant name="camInputs3">"NONE"</constant>
         <constant name="camInputs4">"NONE"</constant>
-        <constant name="afr_hwChannel">"NONE"</constant>
-        <constant name="afr_hwChannel2">"NONE"</constant>
+        <constant name="afr_hwChannel">"Disabled"</constant>
+        <constant name="afr_hwChannel2">"Disabled"</constant>
         <constant digits="2" name="afr_v1" units="volts">0.0</constant>
         <constant digits="2" name="afr_value1" units="AFR">9.996</constant>
         <constant digits="2" name="afr_v2" units="volts">5.0</constant>
         <constant digits="2" name="afr_value2" units="AFR">19.992</constant>
-        <constant name="throttlePedalPositionAdcChannel">"NONE"</constant>
+        <constant name="throttlePedalPositionAdcChannel">"Disabled"</constant>
         <constant digits="1" name="etbSplit" units="%">5.0</constant>
         <constant name="tle6240_cs">"NONE"</constant>
         <constant name="tle6240_csPinMode">"default"</constant>
@@ -245,7 +245,7 @@
         <constant digits="2" name="baroSensor_lowValue" units="kpa">0.0</constant>
         <constant digits="2" name="baroSensor_highValue" units="kpa">500.0</constant>
         <constant name="baroSensor_type">"Custom"</constant>
-        <constant name="baroSensor_hwChannel">"NONE"</constant>
+        <constant name="baroSensor_hwChannel">"Disabled"</constant>
         <constant digits="0" name="idle_solenoidFrequency" units="Hz">300.0</constant>
         <constant name="idle_solenoidPin">"NONE"</constant>
         <constant name="idle_stepperDirectionPin">"NONE"</constant>
@@ -308,10 +308,10 @@
         <constant name="brakePedalPinMode">"PULLUP"</constant>
         <constant name="mc33972_cs">"NONE"</constant>
         <constant name="mc33972_csPinMode">"default"</constant>
-        <constant name="auxFastSensor1_adcChannel">"NONE"</constant>
-        <constant name="tps1_2AdcChannel">"NONE"</constant>
-        <constant name="tps2_2AdcChannel">"NONE"</constant>
-        <constant name="throttlePedalPositionSecondAdcChannel">"NONE"</constant>
+        <constant name="auxFastSensor1_adcChannel">"Disabled"</constant>
+        <constant name="tps1_2AdcChannel">"Disabled"</constant>
+        <constant name="tps2_2AdcChannel">"Disabled"</constant>
+        <constant name="throttlePedalPositionSecondAdcChannel">"Disabled"</constant>
         <constant name="afr_type">"14Point7"</constant>
         <constant name="mc33810_cs1">"NONE"</constant>
         <constant digits="4" name="idle_antiwindupFreq" units="x">0.0</constant>
@@ -328,7 +328,7 @@
         <constant digits="3" name="fordInjectorSmallPulseSlope" units="g/s">0.0</constant>
         <constant name="triggerSimulatorPinModes1">"default"</constant>
         <constant name="triggerSimulatorPinModes2">"default"</constant>
-        <constant name="maf2AdcChannel">"NONE"</constant>
+        <constant name="maf2AdcChannel">"Disabled"</constant>
         <constant name="o2heaterPin">"NONE"</constant>
         <constant name="o2heaterPinModeTodO">"default"</constant>
         <constant digits="0" name="lambdaProtectionMinRpm" units="RPM">2500.0</constant>
@@ -405,7 +405,7 @@
         <constant digits="1" name="stoichRatioSecondary" units=":1">9.0</constant>
         <constant digits="0" name="etbMaximumPosition" units="%">100.0</constant>
         <constant digits="0" name="sdCardLogFrequency" units="hz">50.0</constant>
-        <constant name="idlePositionChannel">"NONE"</constant>
+        <constant name="idlePositionChannel">"Disabled"</constant>
         <constant digits="0" name="launchCorrectionsEndRpm" units="">0.0</constant>
         <constant name="starterRelayDisablePin">"NONE"</constant>
         <constant name="starterRelayDisablePinMode">"default"</constant>
@@ -638,9 +638,9 @@
         <constant name="launchActivateInverted">"false"</constant>
         <constant name="twoStroke">"Four Stroke"</constant>
         <constant name="skippedWheelOnCam">"On crankshaft"</constant>
-        <constant name="hipOutputChannel">"NONE"</constant>
+        <constant name="hipOutputChannel">"Disabled"</constant>
         <constant name="acSwitch">"NONE"</constant>
-        <constant name="vRefAdcChannel">"NONE"</constant>
+        <constant name="vRefAdcChannel">"Disabled"</constant>
         <constant digits="0" name="etbNeutralPosition" units="%">0.0</constant>
         <constant name="idleMode">"Open Loop"</constant>
         <constant name="isInjectionEnabled">"true"</constant>
@@ -813,7 +813,7 @@
         <constant name="can2TxPin">"NONE"</constant>
         <constant name="can2RxPin">"NONE"</constant>
         <constant name="starterControlPinMode">"default"</constant>
-        <constant name="wastegatePositionSensor">"NONE"</constant>
+        <constant name="wastegatePositionSensor">"Disabled"</constant>
         <constant name="ignOverrideMode">"None"</constant>
         <constant name="injectorPressureType">"Low"</constant>
         <constant name="hpfpValvePin">"NONE"</constant>
@@ -859,7 +859,7 @@
         <constant digits="2" name="mapLowValueVoltage" units="v">0.0</constant>
         <constant digits="2" name="mapHighValueVoltage" units="v">5.0</constant>
         <constant digits="2" name="egoValueShift" units="value">0.0</constant>
-        <constant name="vvtPins1">"INVALID"</constant>
+        <constant name="vvtPins1">"PA0"</constant>
         <constant name="vvtPins2">"NONE"</constant>
         <constant name="vvtPins3">"NONE"</constant>
         <constant name="vvtPins4">"NONE"</constant>
@@ -876,14 +876,14 @@
         <constant name="vvtMode2">"Inactive"</constant>
         <constant digits="0" name="fan2ExtraIdle" units="%">2.0</constant>
         <constant digits="2" name="primingDelay" units="sec">0.5</constant>
-        <constant name="auxAnalogInputs1">"NONE"</constant>
-        <constant name="auxAnalogInputs2">"NONE"</constant>
-        <constant name="auxAnalogInputs3">"NONE"</constant>
-        <constant name="auxAnalogInputs4">"NONE"</constant>
-        <constant name="auxAnalogInputs5">"NONE"</constant>
-        <constant name="auxAnalogInputs6">"NONE"</constant>
-        <constant name="auxAnalogInputs7">"NONE"</constant>
-        <constant name="auxAnalogInputs8">"NONE"</constant>
+        <constant name="auxAnalogInputs1">"Disabled"</constant>
+        <constant name="auxAnalogInputs2">"Disabled"</constant>
+        <constant name="auxAnalogInputs3">"Disabled"</constant>
+        <constant name="auxAnalogInputs4">"Disabled"</constant>
+        <constant name="auxAnalogInputs5">"Disabled"</constant>
+        <constant name="auxAnalogInputs6">"Disabled"</constant>
+        <constant name="auxAnalogInputs7">"Disabled"</constant>
+        <constant name="auxAnalogInputs8">"Disabled"</constant>
         <constant name="trailingCoilPins1">"NONE"</constant>
         <constant name="trailingCoilPins2">"NONE"</constant>
         <constant name="trailingCoilPins3">"NONE"</constant>
@@ -908,7 +908,7 @@
         <constant digits="1" name="auxTempSensor1_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="auxTempSensor1_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="auxTempSensor1_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="auxTempSensor1_adcChannel">"NONE"</constant>
+        <constant name="auxTempSensor1_adcChannel">"Disabled"</constant>
         <constant digits="1" name="auxTempSensor2_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="auxTempSensor2_tempC_2" units="*C">0.0</constant>
         <constant digits="1" name="auxTempSensor2_tempC_3" units="*C">0.0</constant>
@@ -916,7 +916,7 @@
         <constant digits="1" name="auxTempSensor2_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="auxTempSensor2_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="auxTempSensor2_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="auxTempSensor2_adcChannel">"NONE"</constant>
+        <constant name="auxTempSensor2_adcChannel">"Disabled"</constant>
         <constant digits="0" name="knockSamplingDuration" units="Deg">45.0</constant>
         <constant digits="0" name="etbFreq" units="Hz">800.0</constant>
         <constant digits="4" name="etbWastegatePid_pFactor" units="">1.0</constant>
@@ -988,7 +988,7 @@
          80.0
          100.0
 </constant>
-        <constant name="oilPressure_hwChannel">"NONE"</constant>
+        <constant name="oilPressure_hwChannel">"Disabled"</constant>
         <constant digits="2" name="oilPressure_v1" units="volts">0.5</constant>
         <constant digits="2" name="oilPressure_value1" units="">0.0</constant>
         <constant digits="2" name="oilPressure_v2" units="volts">4.5</constant>
@@ -1009,12 +1009,12 @@
         <constant digits="0" name="coastingFuelCutClt" units="C">60.0</constant>
         <constant digits="0" name="pidExtraForLowRpm" units="%">0.0</constant>
         <constant digits="0" name="coastingFuelCutMap" units="kPa">30.0</constant>
-        <constant name="highPressureFuel_hwChannel">"NONE"</constant>
+        <constant name="highPressureFuel_hwChannel">"Disabled"</constant>
         <constant digits="2" name="highPressureFuel_v1" units="volts">0.0</constant>
         <constant digits="2" name="highPressureFuel_value1" units="">0.0</constant>
         <constant digits="2" name="highPressureFuel_v2" units="volts">0.0</constant>
         <constant digits="2" name="highPressureFuel_value2" units="">0.0</constant>
-        <constant name="lowPressureFuel_hwChannel">"NONE"</constant>
+        <constant name="lowPressureFuel_hwChannel">"Disabled"</constant>
         <constant digits="2" name="lowPressureFuel_v1" units="volts">0.0</constant>
         <constant digits="2" name="lowPressureFuel_value1" units="">0.0</constant>
         <constant digits="2" name="lowPressureFuel_v2" units="volts">0.0</constant>
@@ -1350,12 +1350,12 @@
         <constant name="gearControllerMode">"None"</constant>
         <constant name="transmissionControllerMode">"None"</constant>
         <constant digits="0" name="acrDisablePhase" units="deg">0.0</constant>
-        <constant name="auxLinear1_hwChannel">"NONE"</constant>
+        <constant name="auxLinear1_hwChannel">"Disabled"</constant>
         <constant digits="2" name="auxLinear1_v1" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear1_value1" units="">0.0</constant>
         <constant digits="2" name="auxLinear1_v2" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear1_value2" units="">0.0</constant>
-        <constant name="auxLinear2_hwChannel">"NONE"</constant>
+        <constant name="auxLinear2_hwChannel">"Disabled"</constant>
         <constant digits="2" name="auxLinear2_v1" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear2_value1" units="">0.0</constant>
         <constant digits="2" name="auxLinear2_v2" units="volts">0.0</constant>
@@ -1489,7 +1489,7 @@
         <constant digits="1" name="oilTempSensor_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="oilTempSensor_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="oilTempSensor_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="oilTempSensor_adcChannel">"NONE"</constant>
+        <constant name="oilTempSensor_adcChannel">"Disabled"</constant>
         <constant digits="1" name="fuelTempSensor_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="fuelTempSensor_tempC_2" units="*C">0.0</constant>
         <constant digits="1" name="fuelTempSensor_tempC_3" units="*C">0.0</constant>
@@ -1497,7 +1497,7 @@
         <constant digits="1" name="fuelTempSensor_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="fuelTempSensor_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="fuelTempSensor_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="fuelTempSensor_adcChannel">"NONE"</constant>
+        <constant name="fuelTempSensor_adcChannel">"Disabled"</constant>
         <constant digits="1" name="ambientTempSensor_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="ambientTempSensor_tempC_2" units="*C">0.0</constant>
         <constant digits="1" name="ambientTempSensor_tempC_3" units="*C">0.0</constant>
@@ -1505,7 +1505,7 @@
         <constant digits="1" name="ambientTempSensor_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="ambientTempSensor_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="ambientTempSensor_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="ambientTempSensor_adcChannel">"NONE"</constant>
+        <constant name="ambientTempSensor_adcChannel">"Disabled"</constant>
         <constant digits="1" name="compressorDischargeTemperature_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="compressorDischargeTemperature_tempC_2" units="*C">0.0</constant>
         <constant digits="1" name="compressorDischargeTemperature_tempC_3" units="*C">0.0</constant>
@@ -1513,9 +1513,9 @@
         <constant digits="1" name="compressorDischargeTemperature_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="compressorDischargeTemperature_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="compressorDischargeTemperature_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="compressorDischargeTemperature_adcChannel">"NONE"</constant>
-        <constant name="throttleInletPressureChannel">"NONE"</constant>
-        <constant name="compressorDischargePressureChannel">"NONE"</constant>
+        <constant name="compressorDischargeTemperature_adcChannel">"Disabled"</constant>
+        <constant name="throttleInletPressureChannel">"Disabled"</constant>
+        <constant name="compressorDischargePressureChannel">"Disabled"</constant>
         <constant name="dacOutputPins1">"NONE"</constant>
         <constant name="dacOutputPins2">"NONE"</constant>
         <constant name="speedometerOutputPin">"NONE"</constant>
@@ -1524,7 +1524,7 @@
         <constant digits="0" name="simulatorCamPosition2" units="">0.0</constant>
         <constant digits="0" name="simulatorCamPosition3" units="">0.0</constant>
         <constant digits="0" name="simulatorCamPosition4" units="">0.0</constant>
-        <constant name="ignKeyAdcChannel">"NONE"</constant>
+        <constant name="ignKeyAdcChannel">"Disabled"</constant>
         <constant name="spi6MisoMode">"default"</constant>
         <constant digits="3" name="triggerVVTGapOverrideFrom1" units="ratio">0.0</constant>
         <constant digits="3" name="triggerVVTGapOverrideFrom2" units="ratio">0.0</constant>
@@ -1599,18 +1599,18 @@
         <constant digits="0" name="device_uid1" units="">0.0</constant>
         <constant digits="0" name="device_uid2" units="">0.0</constant>
         <constant digits="0" name="device_uid3" units="">0.0</constant>
-        <constant name="tcu_rangeAnalogInput1">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput2">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput3">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput4">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput5">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput6">"NONE"</constant>
+        <constant name="tcu_rangeAnalogInput1">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput2">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput3">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput4">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput5">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput6">"Disabled"</constant>
         <constant digits="1" name="tcu_rangeSensorBiasResistor" units="Ohm">0.0</constant>
         <constant name="msIoBox0_id">"Off"</constant>
         <constant name="msIoBox0_vss">"Off"</constant>
         <constant digits="2" name="mc33810Nomi" units="A">5.5</constant>
         <constant digits="0" name="mc33810Maxi" units="A">14.0</constant>
-        <constant name="acPressure_hwChannel">"NONE"</constant>
+        <constant name="acPressure_hwChannel">"Disabled"</constant>
         <constant digits="2" name="acPressure_v1" units="volts">0.0</constant>
         <constant digits="2" name="acPressure_value1" units="">0.0</constant>
         <constant digits="2" name="acPressure_v2" units="volts">0.0</constant>
@@ -1618,12 +1618,12 @@
         <constant digits="0" name="minAcPressure" units="kPa">100.0</constant>
         <constant digits="0" name="maxAcPressure" units="kPa">300.0</constant>
         <constant digits="1" name="minimumOilPressureTimeout" units="sec">0.5</constant>
-        <constant name="auxLinear3_hwChannel">"NONE"</constant>
+        <constant name="auxLinear3_hwChannel">"Disabled"</constant>
         <constant digits="2" name="auxLinear3_v1" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear3_value1" units="">0.0</constant>
         <constant digits="2" name="auxLinear3_v2" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear3_value2" units="">0.0</constant>
-        <constant name="auxLinear4_hwChannel">"NONE"</constant>
+        <constant name="auxLinear4_hwChannel">"Disabled"</constant>
         <constant digits="2" name="auxLinear4_v1" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear4_value1" units="">0.0</constant>
         <constant digits="2" name="auxLinear4_v2" units="volts">0.0</constant>
@@ -4761,7 +4761,7 @@ end</constant>
          0.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240830" nPages="1" signature="rusEFI main.2024.09.06.mega100.821184268" version="5.0"/>
+    <versionInfo firmwareInfo="20240830" nPages="1" signature="rusEFI main.2024.09.06.mega100.2965644658" version="5.0"/>
     <bibliography author="rusEFI 20240830" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/generated/simulator_tune_HYUNDAI_PB.msq b/generated/simulator_tune_HYUNDAI_PB.msq
index ef869a1..2c2fb6a 100644
--- a/generated/simulator_tune_HYUNDAI_PB.msq
+++ b/generated/simulator_tune_HYUNDAI_PB.msq
@@ -157,7 +157,7 @@
         <constant digits="2" name="map_sensor_lowValue" units="kpa">20.0</constant>
         <constant digits="2" name="map_sensor_highValue" units="kpa">101.3</constant>
         <constant name="map_sensor_type">"Custom"</constant>
-        <constant name="map_sensor_hwChannel">"NONE"</constant>
+        <constant name="map_sensor_hwChannel">"Disabled"</constant>
         <constant digits="1" name="clt_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="clt_tempC_2" units="*C">23.8889</constant>
         <constant digits="1" name="clt_tempC_3" units="*C">48.8889</constant>
@@ -165,7 +165,7 @@
         <constant digits="1" name="clt_resistance_2" units="Ohm">2100.0</constant>
         <constant digits="1" name="clt_resistance_3" units="Ohm">1000.0</constant>
         <constant digits="1" name="clt_bias_resistor" units="Ohm">1500.0</constant>
-        <constant name="clt_adcChannel">"NONE"</constant>
+        <constant name="clt_adcChannel">"Disabled"</constant>
         <constant digits="1" name="iat_tempC_1" units="*C">-20.0</constant>
         <constant digits="1" name="iat_tempC_2" units="*C">23.8889</constant>
         <constant digits="1" name="iat_tempC_3" units="*C">120.0</constant>
@@ -173,7 +173,7 @@
         <constant digits="1" name="iat_resistance_2" units="Ohm">2100.0</constant>
         <constant digits="1" name="iat_resistance_3" units="Ohm">100.0</constant>
         <constant digits="1" name="iat_bias_resistor" units="Ohm">2700.0</constant>
-        <constant name="iat_adcChannel">"NONE"</constant>
+        <constant name="iat_adcChannel">"Disabled"</constant>
         <constant digits="2" name="launchTimingRetard" units="deg">0.0</constant>
         <constant digits="0" name="hip9011PrescalerAndSDO" units="integer">0.0</constant>
         <constant digits="0" name="unusedFloatHere" units="">0.0</constant>
@@ -209,10 +209,10 @@
         <constant digits="1" name="driveWheelRevPerKm" units="revs/km">1000.0</constant>
         <constant digits="2" name="canSleepPeriodMs" units="ms">50.0</constant>
         <constant digits="0" name="byFirmwareVersion" units="index">0.0</constant>
-        <constant name="tps1_1AdcChannel">"NONE"</constant>
-        <constant name="vbattAdcChannel">"NONE"</constant>
-        <constant name="fuelLevelSensor">"NONE"</constant>
-        <constant name="tps2_1AdcChannel">"NONE"</constant>
+        <constant name="tps1_1AdcChannel">"Disabled"</constant>
+        <constant name="vbattAdcChannel">"Disabled"</constant>
+        <constant name="fuelLevelSensor">"Disabled"</constant>
+        <constant name="tps2_1AdcChannel">"Disabled"</constant>
         <constant digits="4" name="idle_derivativeFilterLoss" units="x">0.0</constant>
         <constant digits="0" name="trailingSparkAngle" units="angle">10.0</constant>
         <constant name="trigger_type">"60-2"</constant>
@@ -221,7 +221,7 @@
         <constant digits="1" name="airByRpmTaper" units="%">0.0</constant>
         <constant name="hip9011SpiDevice">"Off"</constant>
         <constant digits="0" name="boostControlSafeDutyCycle" units="%">0.0</constant>
-        <constant name="mafAdcChannel">"NONE"</constant>
+        <constant name="mafAdcChannel">"Disabled"</constant>
         <constant digits="0" name="acrRevolutions" units="">5.0</constant>
         <constant digits="0" name="calibrationBirthday" units="">2.0240906E7</constant>
         <constant digits="3" name="adcVcc" units="volts">3.0</constant>
@@ -230,13 +230,13 @@
         <constant name="camInputs2">"NONE"</constant>
         <constant name="camInputs3">"NONE"</constant>
         <constant name="camInputs4">"NONE"</constant>
-        <constant name="afr_hwChannel">"NONE"</constant>
-        <constant name="afr_hwChannel2">"NONE"</constant>
+        <constant name="afr_hwChannel">"Disabled"</constant>
+        <constant name="afr_hwChannel2">"Disabled"</constant>
         <constant digits="2" name="afr_v1" units="volts">0.0</constant>
         <constant digits="2" name="afr_value1" units="AFR">9.996</constant>
         <constant digits="2" name="afr_v2" units="volts">5.0</constant>
         <constant digits="2" name="afr_value2" units="AFR">19.992</constant>
-        <constant name="throttlePedalPositionAdcChannel">"NONE"</constant>
+        <constant name="throttlePedalPositionAdcChannel">"Disabled"</constant>
         <constant digits="1" name="etbSplit" units="%">5.0</constant>
         <constant name="tle6240_cs">"NONE"</constant>
         <constant name="tle6240_csPinMode">"default"</constant>
@@ -245,7 +245,7 @@
         <constant digits="2" name="baroSensor_lowValue" units="kpa">0.0</constant>
         <constant digits="2" name="baroSensor_highValue" units="kpa">500.0</constant>
         <constant name="baroSensor_type">"Custom"</constant>
-        <constant name="baroSensor_hwChannel">"NONE"</constant>
+        <constant name="baroSensor_hwChannel">"Disabled"</constant>
         <constant digits="0" name="idle_solenoidFrequency" units="Hz">300.0</constant>
         <constant name="idle_solenoidPin">"NONE"</constant>
         <constant name="idle_stepperDirectionPin">"NONE"</constant>
@@ -308,10 +308,10 @@
         <constant name="brakePedalPinMode">"PULLUP"</constant>
         <constant name="mc33972_cs">"NONE"</constant>
         <constant name="mc33972_csPinMode">"default"</constant>
-        <constant name="auxFastSensor1_adcChannel">"NONE"</constant>
-        <constant name="tps1_2AdcChannel">"NONE"</constant>
-        <constant name="tps2_2AdcChannel">"NONE"</constant>
-        <constant name="throttlePedalPositionSecondAdcChannel">"NONE"</constant>
+        <constant name="auxFastSensor1_adcChannel">"Disabled"</constant>
+        <constant name="tps1_2AdcChannel">"Disabled"</constant>
+        <constant name="tps2_2AdcChannel">"Disabled"</constant>
+        <constant name="throttlePedalPositionSecondAdcChannel">"Disabled"</constant>
         <constant name="afr_type">"14Point7"</constant>
         <constant name="mc33810_cs1">"NONE"</constant>
         <constant digits="4" name="idle_antiwindupFreq" units="x">0.0</constant>
@@ -328,7 +328,7 @@
         <constant digits="3" name="fordInjectorSmallPulseSlope" units="g/s">0.0</constant>
         <constant name="triggerSimulatorPinModes1">"default"</constant>
         <constant name="triggerSimulatorPinModes2">"default"</constant>
-        <constant name="maf2AdcChannel">"NONE"</constant>
+        <constant name="maf2AdcChannel">"Disabled"</constant>
         <constant name="o2heaterPin">"NONE"</constant>
         <constant name="o2heaterPinModeTodO">"default"</constant>
         <constant digits="0" name="lambdaProtectionMinRpm" units="RPM">2500.0</constant>
@@ -405,7 +405,7 @@
         <constant digits="1" name="stoichRatioSecondary" units=":1">9.0</constant>
         <constant digits="0" name="etbMaximumPosition" units="%">100.0</constant>
         <constant digits="0" name="sdCardLogFrequency" units="hz">50.0</constant>
-        <constant name="idlePositionChannel">"NONE"</constant>
+        <constant name="idlePositionChannel">"Disabled"</constant>
         <constant digits="0" name="launchCorrectionsEndRpm" units="">0.0</constant>
         <constant name="starterRelayDisablePin">"NONE"</constant>
         <constant name="starterRelayDisablePinMode">"default"</constant>
@@ -639,9 +639,9 @@
         <constant name="launchActivateInverted">"false"</constant>
         <constant name="twoStroke">"Four Stroke"</constant>
         <constant name="skippedWheelOnCam">"On crankshaft"</constant>
-        <constant name="hipOutputChannel">"NONE"</constant>
+        <constant name="hipOutputChannel">"Disabled"</constant>
         <constant name="acSwitch">"NONE"</constant>
-        <constant name="vRefAdcChannel">"NONE"</constant>
+        <constant name="vRefAdcChannel">"Disabled"</constant>
         <constant digits="0" name="etbNeutralPosition" units="%">0.0</constant>
         <constant name="idleMode">"Open Loop"</constant>
         <constant name="isInjectionEnabled">"true"</constant>
@@ -814,7 +814,7 @@
         <constant name="can2TxPin">"NONE"</constant>
         <constant name="can2RxPin">"NONE"</constant>
         <constant name="starterControlPinMode">"default"</constant>
-        <constant name="wastegatePositionSensor">"NONE"</constant>
+        <constant name="wastegatePositionSensor">"Disabled"</constant>
         <constant name="ignOverrideMode">"None"</constant>
         <constant name="injectorPressureType">"High"</constant>
         <constant name="hpfpValvePin">"NONE"</constant>
@@ -860,7 +860,7 @@
         <constant digits="2" name="mapLowValueVoltage" units="v">0.79</constant>
         <constant digits="2" name="mapHighValueVoltage" units="v">4.0</constant>
         <constant digits="2" name="egoValueShift" units="value">0.0</constant>
-        <constant name="vvtPins1">"INVALID"</constant>
+        <constant name="vvtPins1">"PA0"</constant>
         <constant name="vvtPins2">"NONE"</constant>
         <constant name="vvtPins3">"NONE"</constant>
         <constant name="vvtPins4">"NONE"</constant>
@@ -877,14 +877,14 @@
         <constant name="vvtMode2">"Single Tooth"</constant>
         <constant digits="0" name="fan2ExtraIdle" units="%">2.0</constant>
         <constant digits="2" name="primingDelay" units="sec">0.5</constant>
-        <constant name="auxAnalogInputs1">"NONE"</constant>
-        <constant name="auxAnalogInputs2">"NONE"</constant>
-        <constant name="auxAnalogInputs3">"NONE"</constant>
-        <constant name="auxAnalogInputs4">"NONE"</constant>
-        <constant name="auxAnalogInputs5">"NONE"</constant>
-        <constant name="auxAnalogInputs6">"NONE"</constant>
-        <constant name="auxAnalogInputs7">"NONE"</constant>
-        <constant name="auxAnalogInputs8">"NONE"</constant>
+        <constant name="auxAnalogInputs1">"Disabled"</constant>
+        <constant name="auxAnalogInputs2">"Disabled"</constant>
+        <constant name="auxAnalogInputs3">"Disabled"</constant>
+        <constant name="auxAnalogInputs4">"Disabled"</constant>
+        <constant name="auxAnalogInputs5">"Disabled"</constant>
+        <constant name="auxAnalogInputs6">"Disabled"</constant>
+        <constant name="auxAnalogInputs7">"Disabled"</constant>
+        <constant name="auxAnalogInputs8">"Disabled"</constant>
         <constant name="trailingCoilPins1">"NONE"</constant>
         <constant name="trailingCoilPins2">"NONE"</constant>
         <constant name="trailingCoilPins3">"NONE"</constant>
@@ -909,7 +909,7 @@
         <constant digits="1" name="auxTempSensor1_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="auxTempSensor1_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="auxTempSensor1_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="auxTempSensor1_adcChannel">"NONE"</constant>
+        <constant name="auxTempSensor1_adcChannel">"Disabled"</constant>
         <constant digits="1" name="auxTempSensor2_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="auxTempSensor2_tempC_2" units="*C">0.0</constant>
         <constant digits="1" name="auxTempSensor2_tempC_3" units="*C">0.0</constant>
@@ -917,7 +917,7 @@
         <constant digits="1" name="auxTempSensor2_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="auxTempSensor2_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="auxTempSensor2_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="auxTempSensor2_adcChannel">"NONE"</constant>
+        <constant name="auxTempSensor2_adcChannel">"Disabled"</constant>
         <constant digits="0" name="knockSamplingDuration" units="Deg">45.0</constant>
         <constant digits="0" name="etbFreq" units="Hz">800.0</constant>
         <constant digits="4" name="etbWastegatePid_pFactor" units="">1.0</constant>
@@ -989,7 +989,7 @@
          80.0
          100.0
 </constant>
-        <constant name="oilPressure_hwChannel">"NONE"</constant>
+        <constant name="oilPressure_hwChannel">"Disabled"</constant>
         <constant digits="2" name="oilPressure_v1" units="volts">0.5</constant>
         <constant digits="2" name="oilPressure_value1" units="">0.0</constant>
         <constant digits="2" name="oilPressure_v2" units="volts">4.5</constant>
@@ -1010,12 +1010,12 @@
         <constant digits="0" name="coastingFuelCutClt" units="C">60.0</constant>
         <constant digits="0" name="pidExtraForLowRpm" units="%">0.0</constant>
         <constant digits="0" name="coastingFuelCutMap" units="kPa">30.0</constant>
-        <constant name="highPressureFuel_hwChannel">"NONE"</constant>
+        <constant name="highPressureFuel_hwChannel">"Disabled"</constant>
         <constant digits="2" name="highPressureFuel_v1" units="volts">0.5</constant>
         <constant digits="2" name="highPressureFuel_value1" units="">0.0</constant>
         <constant digits="2" name="highPressureFuel_v2" units="volts">4.5</constant>
         <constant digits="2" name="highPressureFuel_value2" units="">20000.0</constant>
-        <constant name="lowPressureFuel_hwChannel">"NONE"</constant>
+        <constant name="lowPressureFuel_hwChannel">"Disabled"</constant>
         <constant digits="2" name="lowPressureFuel_v1" units="volts">0.0</constant>
         <constant digits="2" name="lowPressureFuel_value1" units="">0.0</constant>
         <constant digits="2" name="lowPressureFuel_v2" units="volts">0.0</constant>
@@ -1351,12 +1351,12 @@
         <constant name="gearControllerMode">"None"</constant>
         <constant name="transmissionControllerMode">"None"</constant>
         <constant digits="0" name="acrDisablePhase" units="deg">0.0</constant>
-        <constant name="auxLinear1_hwChannel">"NONE"</constant>
+        <constant name="auxLinear1_hwChannel">"Disabled"</constant>
         <constant digits="2" name="auxLinear1_v1" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear1_value1" units="">0.0</constant>
         <constant digits="2" name="auxLinear1_v2" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear1_value2" units="">0.0</constant>
-        <constant name="auxLinear2_hwChannel">"NONE"</constant>
+        <constant name="auxLinear2_hwChannel">"Disabled"</constant>
         <constant digits="2" name="auxLinear2_v1" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear2_value1" units="">0.0</constant>
         <constant digits="2" name="auxLinear2_v2" units="volts">0.0</constant>
@@ -1490,7 +1490,7 @@
         <constant digits="1" name="oilTempSensor_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="oilTempSensor_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="oilTempSensor_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="oilTempSensor_adcChannel">"NONE"</constant>
+        <constant name="oilTempSensor_adcChannel">"Disabled"</constant>
         <constant digits="1" name="fuelTempSensor_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="fuelTempSensor_tempC_2" units="*C">0.0</constant>
         <constant digits="1" name="fuelTempSensor_tempC_3" units="*C">0.0</constant>
@@ -1498,7 +1498,7 @@
         <constant digits="1" name="fuelTempSensor_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="fuelTempSensor_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="fuelTempSensor_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="fuelTempSensor_adcChannel">"NONE"</constant>
+        <constant name="fuelTempSensor_adcChannel">"Disabled"</constant>
         <constant digits="1" name="ambientTempSensor_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="ambientTempSensor_tempC_2" units="*C">0.0</constant>
         <constant digits="1" name="ambientTempSensor_tempC_3" units="*C">0.0</constant>
@@ -1506,7 +1506,7 @@
         <constant digits="1" name="ambientTempSensor_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="ambientTempSensor_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="ambientTempSensor_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="ambientTempSensor_adcChannel">"NONE"</constant>
+        <constant name="ambientTempSensor_adcChannel">"Disabled"</constant>
         <constant digits="1" name="compressorDischargeTemperature_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="compressorDischargeTemperature_tempC_2" units="*C">0.0</constant>
         <constant digits="1" name="compressorDischargeTemperature_tempC_3" units="*C">0.0</constant>
@@ -1514,9 +1514,9 @@
         <constant digits="1" name="compressorDischargeTemperature_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="compressorDischargeTemperature_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="compressorDischargeTemperature_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="compressorDischargeTemperature_adcChannel">"NONE"</constant>
-        <constant name="throttleInletPressureChannel">"NONE"</constant>
-        <constant name="compressorDischargePressureChannel">"NONE"</constant>
+        <constant name="compressorDischargeTemperature_adcChannel">"Disabled"</constant>
+        <constant name="throttleInletPressureChannel">"Disabled"</constant>
+        <constant name="compressorDischargePressureChannel">"Disabled"</constant>
         <constant name="dacOutputPins1">"NONE"</constant>
         <constant name="dacOutputPins2">"NONE"</constant>
         <constant name="speedometerOutputPin">"NONE"</constant>
@@ -1525,7 +1525,7 @@
         <constant digits="0" name="simulatorCamPosition2" units="">0.0</constant>
         <constant digits="0" name="simulatorCamPosition3" units="">0.0</constant>
         <constant digits="0" name="simulatorCamPosition4" units="">0.0</constant>
-        <constant name="ignKeyAdcChannel">"NONE"</constant>
+        <constant name="ignKeyAdcChannel">"Disabled"</constant>
         <constant name="spi6MisoMode">"default"</constant>
         <constant digits="3" name="triggerVVTGapOverrideFrom1" units="ratio">0.0</constant>
         <constant digits="3" name="triggerVVTGapOverrideFrom2" units="ratio">0.0</constant>
@@ -1600,18 +1600,18 @@
         <constant digits="0" name="device_uid1" units="">0.0</constant>
         <constant digits="0" name="device_uid2" units="">0.0</constant>
         <constant digits="0" name="device_uid3" units="">0.0</constant>
-        <constant name="tcu_rangeAnalogInput1">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput2">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput3">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput4">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput5">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput6">"NONE"</constant>
+        <constant name="tcu_rangeAnalogInput1">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput2">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput3">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput4">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput5">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput6">"Disabled"</constant>
         <constant digits="1" name="tcu_rangeSensorBiasResistor" units="Ohm">0.0</constant>
         <constant name="msIoBox0_id">"Off"</constant>
         <constant name="msIoBox0_vss">"Off"</constant>
         <constant digits="2" name="mc33810Nomi" units="A">5.5</constant>
         <constant digits="0" name="mc33810Maxi" units="A">14.0</constant>
-        <constant name="acPressure_hwChannel">"NONE"</constant>
+        <constant name="acPressure_hwChannel">"Disabled"</constant>
         <constant digits="2" name="acPressure_v1" units="volts">0.0</constant>
         <constant digits="2" name="acPressure_value1" units="">0.0</constant>
         <constant digits="2" name="acPressure_v2" units="volts">0.0</constant>
@@ -1619,12 +1619,12 @@
         <constant digits="0" name="minAcPressure" units="kPa">100.0</constant>
         <constant digits="0" name="maxAcPressure" units="kPa">300.0</constant>
         <constant digits="1" name="minimumOilPressureTimeout" units="sec">0.5</constant>
-        <constant name="auxLinear3_hwChannel">"NONE"</constant>
+        <constant name="auxLinear3_hwChannel">"Disabled"</constant>
         <constant digits="2" name="auxLinear3_v1" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear3_value1" units="">0.0</constant>
         <constant digits="2" name="auxLinear3_v2" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear3_value2" units="">0.0</constant>
-        <constant name="auxLinear4_hwChannel">"NONE"</constant>
+        <constant name="auxLinear4_hwChannel">"Disabled"</constant>
         <constant digits="2" name="auxLinear4_v1" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear4_value1" units="">0.0</constant>
         <constant digits="2" name="auxLinear4_v2" units="volts">0.0</constant>
@@ -4852,7 +4852,7 @@ end</constant>
          0.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240830" nPages="1" signature="rusEFI main.2024.09.06.mega100.821184268" version="5.0"/>
+    <versionInfo firmwareInfo="20240830" nPages="1" signature="rusEFI main.2024.09.06.mega100.2965644658" version="5.0"/>
     <bibliography author="rusEFI 20240830" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/generated/simulator_tune_MAVERICK_X3.msq b/generated/simulator_tune_MAVERICK_X3.msq
index 9bbf17e..87cf055 100644
--- a/generated/simulator_tune_MAVERICK_X3.msq
+++ b/generated/simulator_tune_MAVERICK_X3.msq
@@ -157,7 +157,7 @@
         <constant digits="2" name="map_sensor_lowValue" units="kpa">0.0</constant>
         <constant digits="2" name="map_sensor_highValue" units="kpa">0.0</constant>
         <constant name="map_sensor_type">"MPX4250"</constant>
-        <constant name="map_sensor_hwChannel">"NONE"</constant>
+        <constant name="map_sensor_hwChannel">"Disabled"</constant>
         <constant digits="1" name="clt_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="clt_tempC_2" units="*C">23.8889</constant>
         <constant digits="1" name="clt_tempC_3" units="*C">48.8889</constant>
@@ -165,7 +165,7 @@
         <constant digits="1" name="clt_resistance_2" units="Ohm">2100.0</constant>
         <constant digits="1" name="clt_resistance_3" units="Ohm">1000.0</constant>
         <constant digits="1" name="clt_bias_resistor" units="Ohm">1500.0</constant>
-        <constant name="clt_adcChannel">"NONE"</constant>
+        <constant name="clt_adcChannel">"Disabled"</constant>
         <constant digits="1" name="iat_tempC_1" units="*C">-20.0</constant>
         <constant digits="1" name="iat_tempC_2" units="*C">23.8889</constant>
         <constant digits="1" name="iat_tempC_3" units="*C">120.0</constant>
@@ -173,7 +173,7 @@
         <constant digits="1" name="iat_resistance_2" units="Ohm">2100.0</constant>
         <constant digits="1" name="iat_resistance_3" units="Ohm">100.0</constant>
         <constant digits="1" name="iat_bias_resistor" units="Ohm">2700.0</constant>
-        <constant name="iat_adcChannel">"NONE"</constant>
+        <constant name="iat_adcChannel">"Disabled"</constant>
         <constant digits="2" name="launchTimingRetard" units="deg">0.0</constant>
         <constant digits="0" name="hip9011PrescalerAndSDO" units="integer">0.0</constant>
         <constant digits="0" name="unusedFloatHere" units="">0.0</constant>
@@ -209,10 +209,10 @@
         <constant digits="1" name="driveWheelRevPerKm" units="revs/km">1000.0</constant>
         <constant digits="2" name="canSleepPeriodMs" units="ms">50.0</constant>
         <constant digits="0" name="byFirmwareVersion" units="index">0.0</constant>
-        <constant name="tps1_1AdcChannel">"NONE"</constant>
-        <constant name="vbattAdcChannel">"NONE"</constant>
-        <constant name="fuelLevelSensor">"NONE"</constant>
-        <constant name="tps2_1AdcChannel">"NONE"</constant>
+        <constant name="tps1_1AdcChannel">"Disabled"</constant>
+        <constant name="vbattAdcChannel">"Disabled"</constant>
+        <constant name="fuelLevelSensor">"Disabled"</constant>
+        <constant name="tps2_1AdcChannel">"Disabled"</constant>
         <constant digits="4" name="idle_derivativeFilterLoss" units="x">0.0</constant>
         <constant digits="0" name="trailingSparkAngle" units="angle">10.0</constant>
         <constant name="trigger_type">"36-2"</constant>
@@ -221,7 +221,7 @@
         <constant digits="1" name="airByRpmTaper" units="%">0.0</constant>
         <constant name="hip9011SpiDevice">"Off"</constant>
         <constant digits="0" name="boostControlSafeDutyCycle" units="%">0.0</constant>
-        <constant name="mafAdcChannel">"NONE"</constant>
+        <constant name="mafAdcChannel">"Disabled"</constant>
         <constant digits="0" name="acrRevolutions" units="">5.0</constant>
         <constant digits="0" name="calibrationBirthday" units="">2.0240906E7</constant>
         <constant digits="3" name="adcVcc" units="volts">3.0</constant>
@@ -230,13 +230,13 @@
         <constant name="camInputs2">"NONE"</constant>
         <constant name="camInputs3">"NONE"</constant>
         <constant name="camInputs4">"NONE"</constant>
-        <constant name="afr_hwChannel">"NONE"</constant>
-        <constant name="afr_hwChannel2">"NONE"</constant>
+        <constant name="afr_hwChannel">"Disabled"</constant>
+        <constant name="afr_hwChannel2">"Disabled"</constant>
         <constant digits="2" name="afr_v1" units="volts">0.0</constant>
         <constant digits="2" name="afr_value1" units="AFR">9.996</constant>
         <constant digits="2" name="afr_v2" units="volts">5.0</constant>
         <constant digits="2" name="afr_value2" units="AFR">19.992</constant>
-        <constant name="throttlePedalPositionAdcChannel">"NONE"</constant>
+        <constant name="throttlePedalPositionAdcChannel">"Disabled"</constant>
         <constant digits="1" name="etbSplit" units="%">5.0</constant>
         <constant name="tle6240_cs">"NONE"</constant>
         <constant name="tle6240_csPinMode">"default"</constant>
@@ -245,7 +245,7 @@
         <constant digits="2" name="baroSensor_lowValue" units="kpa">0.0</constant>
         <constant digits="2" name="baroSensor_highValue" units="kpa">500.0</constant>
         <constant name="baroSensor_type">"Custom"</constant>
-        <constant name="baroSensor_hwChannel">"NONE"</constant>
+        <constant name="baroSensor_hwChannel">"Disabled"</constant>
         <constant digits="0" name="idle_solenoidFrequency" units="Hz">300.0</constant>
         <constant name="idle_solenoidPin">"NONE"</constant>
         <constant name="idle_stepperDirectionPin">"NONE"</constant>
@@ -308,10 +308,10 @@
         <constant name="brakePedalPinMode">"PULLUP"</constant>
         <constant name="mc33972_cs">"NONE"</constant>
         <constant name="mc33972_csPinMode">"default"</constant>
-        <constant name="auxFastSensor1_adcChannel">"NONE"</constant>
-        <constant name="tps1_2AdcChannel">"NONE"</constant>
-        <constant name="tps2_2AdcChannel">"NONE"</constant>
-        <constant name="throttlePedalPositionSecondAdcChannel">"NONE"</constant>
+        <constant name="auxFastSensor1_adcChannel">"Disabled"</constant>
+        <constant name="tps1_2AdcChannel">"Disabled"</constant>
+        <constant name="tps2_2AdcChannel">"Disabled"</constant>
+        <constant name="throttlePedalPositionSecondAdcChannel">"Disabled"</constant>
         <constant name="afr_type">"14Point7"</constant>
         <constant name="mc33810_cs1">"NONE"</constant>
         <constant digits="4" name="idle_antiwindupFreq" units="x">0.0</constant>
@@ -328,7 +328,7 @@
         <constant digits="3" name="fordInjectorSmallPulseSlope" units="g/s">0.0</constant>
         <constant name="triggerSimulatorPinModes1">"default"</constant>
         <constant name="triggerSimulatorPinModes2">"default"</constant>
-        <constant name="maf2AdcChannel">"NONE"</constant>
+        <constant name="maf2AdcChannel">"Disabled"</constant>
         <constant name="o2heaterPin">"NONE"</constant>
         <constant name="o2heaterPinModeTodO">"default"</constant>
         <constant digits="0" name="lambdaProtectionMinRpm" units="RPM">2500.0</constant>
@@ -405,7 +405,7 @@
         <constant digits="1" name="stoichRatioSecondary" units=":1">9.0</constant>
         <constant digits="0" name="etbMaximumPosition" units="%">100.0</constant>
         <constant digits="0" name="sdCardLogFrequency" units="hz">50.0</constant>
-        <constant name="idlePositionChannel">"NONE"</constant>
+        <constant name="idlePositionChannel">"Disabled"</constant>
         <constant digits="0" name="launchCorrectionsEndRpm" units="">0.0</constant>
         <constant name="starterRelayDisablePin">"NONE"</constant>
         <constant name="starterRelayDisablePinMode">"default"</constant>
@@ -639,9 +639,9 @@
         <constant name="launchActivateInverted">"false"</constant>
         <constant name="twoStroke">"Four Stroke"</constant>
         <constant name="skippedWheelOnCam">"On crankshaft"</constant>
-        <constant name="hipOutputChannel">"NONE"</constant>
+        <constant name="hipOutputChannel">"Disabled"</constant>
         <constant name="acSwitch">"NONE"</constant>
-        <constant name="vRefAdcChannel">"NONE"</constant>
+        <constant name="vRefAdcChannel">"Disabled"</constant>
         <constant digits="0" name="etbNeutralPosition" units="%">0.0</constant>
         <constant name="idleMode">"Open Loop"</constant>
         <constant name="isInjectionEnabled">"true"</constant>
@@ -814,7 +814,7 @@
         <constant name="can2TxPin">"NONE"</constant>
         <constant name="can2RxPin">"NONE"</constant>
         <constant name="starterControlPinMode">"default"</constant>
-        <constant name="wastegatePositionSensor">"NONE"</constant>
+        <constant name="wastegatePositionSensor">"Disabled"</constant>
         <constant name="ignOverrideMode">"None"</constant>
         <constant name="injectorPressureType">"Low"</constant>
         <constant name="hpfpValvePin">"NONE"</constant>
@@ -860,7 +860,7 @@
         <constant digits="2" name="mapLowValueVoltage" units="v">0.0</constant>
         <constant digits="2" name="mapHighValueVoltage" units="v">5.0</constant>
         <constant digits="2" name="egoValueShift" units="value">0.0</constant>
-        <constant name="vvtPins1">"INVALID"</constant>
+        <constant name="vvtPins1">"PA0"</constant>
         <constant name="vvtPins2">"NONE"</constant>
         <constant name="vvtPins3">"NONE"</constant>
         <constant name="vvtPins4">"NONE"</constant>
@@ -877,14 +877,14 @@
         <constant name="vvtMode2">"Inactive"</constant>
         <constant digits="0" name="fan2ExtraIdle" units="%">0.0</constant>
         <constant digits="2" name="primingDelay" units="sec">0.5</constant>
-        <constant name="auxAnalogInputs1">"NONE"</constant>
-        <constant name="auxAnalogInputs2">"NONE"</constant>
-        <constant name="auxAnalogInputs3">"NONE"</constant>
-        <constant name="auxAnalogInputs4">"NONE"</constant>
-        <constant name="auxAnalogInputs5">"NONE"</constant>
-        <constant name="auxAnalogInputs6">"NONE"</constant>
-        <constant name="auxAnalogInputs7">"NONE"</constant>
-        <constant name="auxAnalogInputs8">"NONE"</constant>
+        <constant name="auxAnalogInputs1">"Disabled"</constant>
+        <constant name="auxAnalogInputs2">"Disabled"</constant>
+        <constant name="auxAnalogInputs3">"Disabled"</constant>
+        <constant name="auxAnalogInputs4">"Disabled"</constant>
+        <constant name="auxAnalogInputs5">"Disabled"</constant>
+        <constant name="auxAnalogInputs6">"Disabled"</constant>
+        <constant name="auxAnalogInputs7">"Disabled"</constant>
+        <constant name="auxAnalogInputs8">"Disabled"</constant>
         <constant name="trailingCoilPins1">"NONE"</constant>
         <constant name="trailingCoilPins2">"NONE"</constant>
         <constant name="trailingCoilPins3">"NONE"</constant>
@@ -909,7 +909,7 @@
         <constant digits="1" name="auxTempSensor1_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="auxTempSensor1_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="auxTempSensor1_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="auxTempSensor1_adcChannel">"NONE"</constant>
+        <constant name="auxTempSensor1_adcChannel">"Disabled"</constant>
         <constant digits="1" name="auxTempSensor2_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="auxTempSensor2_tempC_2" units="*C">0.0</constant>
         <constant digits="1" name="auxTempSensor2_tempC_3" units="*C">0.0</constant>
@@ -917,7 +917,7 @@
         <constant digits="1" name="auxTempSensor2_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="auxTempSensor2_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="auxTempSensor2_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="auxTempSensor2_adcChannel">"NONE"</constant>
+        <constant name="auxTempSensor2_adcChannel">"Disabled"</constant>
         <constant digits="0" name="knockSamplingDuration" units="Deg">45.0</constant>
         <constant digits="0" name="etbFreq" units="Hz">800.0</constant>
         <constant digits="4" name="etbWastegatePid_pFactor" units="">1.0</constant>
@@ -989,7 +989,7 @@
          80.0
          100.0
 </constant>
-        <constant name="oilPressure_hwChannel">"NONE"</constant>
+        <constant name="oilPressure_hwChannel">"Disabled"</constant>
         <constant digits="2" name="oilPressure_v1" units="volts">0.5</constant>
         <constant digits="2" name="oilPressure_value1" units="">0.0</constant>
         <constant digits="2" name="oilPressure_v2" units="volts">4.5</constant>
@@ -1010,12 +1010,12 @@
         <constant digits="0" name="coastingFuelCutClt" units="C">60.0</constant>
         <constant digits="0" name="pidExtraForLowRpm" units="%">0.0</constant>
         <constant digits="0" name="coastingFuelCutMap" units="kPa">30.0</constant>
-        <constant name="highPressureFuel_hwChannel">"NONE"</constant>
+        <constant name="highPressureFuel_hwChannel">"Disabled"</constant>
         <constant digits="2" name="highPressureFuel_v1" units="volts">0.0</constant>
         <constant digits="2" name="highPressureFuel_value1" units="">0.0</constant>
         <constant digits="2" name="highPressureFuel_v2" units="volts">0.0</constant>
         <constant digits="2" name="highPressureFuel_value2" units="">0.0</constant>
-        <constant name="lowPressureFuel_hwChannel">"NONE"</constant>
+        <constant name="lowPressureFuel_hwChannel">"Disabled"</constant>
         <constant digits="2" name="lowPressureFuel_v1" units="volts">0.0</constant>
         <constant digits="2" name="lowPressureFuel_value1" units="">0.0</constant>
         <constant digits="2" name="lowPressureFuel_v2" units="volts">0.0</constant>
@@ -1351,12 +1351,12 @@
         <constant name="gearControllerMode">"None"</constant>
         <constant name="transmissionControllerMode">"None"</constant>
         <constant digits="0" name="acrDisablePhase" units="deg">0.0</constant>
-        <constant name="auxLinear1_hwChannel">"NONE"</constant>
+        <constant name="auxLinear1_hwChannel">"Disabled"</constant>
         <constant digits="2" name="auxLinear1_v1" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear1_value1" units="">0.0</constant>
         <constant digits="2" name="auxLinear1_v2" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear1_value2" units="">0.0</constant>
-        <constant name="auxLinear2_hwChannel">"NONE"</constant>
+        <constant name="auxLinear2_hwChannel">"Disabled"</constant>
         <constant digits="2" name="auxLinear2_v1" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear2_value1" units="">0.0</constant>
         <constant digits="2" name="auxLinear2_v2" units="volts">0.0</constant>
@@ -1490,7 +1490,7 @@
         <constant digits="1" name="oilTempSensor_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="oilTempSensor_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="oilTempSensor_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="oilTempSensor_adcChannel">"NONE"</constant>
+        <constant name="oilTempSensor_adcChannel">"Disabled"</constant>
         <constant digits="1" name="fuelTempSensor_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="fuelTempSensor_tempC_2" units="*C">0.0</constant>
         <constant digits="1" name="fuelTempSensor_tempC_3" units="*C">0.0</constant>
@@ -1498,7 +1498,7 @@
         <constant digits="1" name="fuelTempSensor_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="fuelTempSensor_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="fuelTempSensor_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="fuelTempSensor_adcChannel">"NONE"</constant>
+        <constant name="fuelTempSensor_adcChannel">"Disabled"</constant>
         <constant digits="1" name="ambientTempSensor_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="ambientTempSensor_tempC_2" units="*C">0.0</constant>
         <constant digits="1" name="ambientTempSensor_tempC_3" units="*C">0.0</constant>
@@ -1506,7 +1506,7 @@
         <constant digits="1" name="ambientTempSensor_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="ambientTempSensor_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="ambientTempSensor_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="ambientTempSensor_adcChannel">"NONE"</constant>
+        <constant name="ambientTempSensor_adcChannel">"Disabled"</constant>
         <constant digits="1" name="compressorDischargeTemperature_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="compressorDischargeTemperature_tempC_2" units="*C">0.0</constant>
         <constant digits="1" name="compressorDischargeTemperature_tempC_3" units="*C">0.0</constant>
@@ -1514,9 +1514,9 @@
         <constant digits="1" name="compressorDischargeTemperature_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="compressorDischargeTemperature_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="compressorDischargeTemperature_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="compressorDischargeTemperature_adcChannel">"NONE"</constant>
-        <constant name="throttleInletPressureChannel">"NONE"</constant>
-        <constant name="compressorDischargePressureChannel">"NONE"</constant>
+        <constant name="compressorDischargeTemperature_adcChannel">"Disabled"</constant>
+        <constant name="throttleInletPressureChannel">"Disabled"</constant>
+        <constant name="compressorDischargePressureChannel">"Disabled"</constant>
         <constant name="dacOutputPins1">"NONE"</constant>
         <constant name="dacOutputPins2">"NONE"</constant>
         <constant name="speedometerOutputPin">"NONE"</constant>
@@ -1525,7 +1525,7 @@
         <constant digits="0" name="simulatorCamPosition2" units="">0.0</constant>
         <constant digits="0" name="simulatorCamPosition3" units="">0.0</constant>
         <constant digits="0" name="simulatorCamPosition4" units="">0.0</constant>
-        <constant name="ignKeyAdcChannel">"NONE"</constant>
+        <constant name="ignKeyAdcChannel">"Disabled"</constant>
         <constant name="spi6MisoMode">"default"</constant>
         <constant digits="3" name="triggerVVTGapOverrideFrom1" units="ratio">0.0</constant>
         <constant digits="3" name="triggerVVTGapOverrideFrom2" units="ratio">0.0</constant>
@@ -1600,18 +1600,18 @@
         <constant digits="0" name="device_uid1" units="">0.0</constant>
         <constant digits="0" name="device_uid2" units="">0.0</constant>
         <constant digits="0" name="device_uid3" units="">0.0</constant>
-        <constant name="tcu_rangeAnalogInput1">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput2">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput3">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput4">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput5">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput6">"NONE"</constant>
+        <constant name="tcu_rangeAnalogInput1">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput2">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput3">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput4">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput5">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput6">"Disabled"</constant>
         <constant digits="1" name="tcu_rangeSensorBiasResistor" units="Ohm">0.0</constant>
         <constant name="msIoBox0_id">"Off"</constant>
         <constant name="msIoBox0_vss">"Off"</constant>
         <constant digits="2" name="mc33810Nomi" units="A">5.5</constant>
         <constant digits="0" name="mc33810Maxi" units="A">14.0</constant>
-        <constant name="acPressure_hwChannel">"NONE"</constant>
+        <constant name="acPressure_hwChannel">"Disabled"</constant>
         <constant digits="2" name="acPressure_v1" units="volts">0.0</constant>
         <constant digits="2" name="acPressure_value1" units="">0.0</constant>
         <constant digits="2" name="acPressure_v2" units="volts">0.0</constant>
@@ -1619,12 +1619,12 @@
         <constant digits="0" name="minAcPressure" units="kPa">100.0</constant>
         <constant digits="0" name="maxAcPressure" units="kPa">300.0</constant>
         <constant digits="1" name="minimumOilPressureTimeout" units="sec">0.5</constant>
-        <constant name="auxLinear3_hwChannel">"NONE"</constant>
+        <constant name="auxLinear3_hwChannel">"Disabled"</constant>
         <constant digits="2" name="auxLinear3_v1" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear3_value1" units="">0.0</constant>
         <constant digits="2" name="auxLinear3_v2" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear3_value2" units="">0.0</constant>
-        <constant name="auxLinear4_hwChannel">"NONE"</constant>
+        <constant name="auxLinear4_hwChannel">"Disabled"</constant>
         <constant digits="2" name="auxLinear4_v1" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear4_value1" units="">0.0</constant>
         <constant digits="2" name="auxLinear4_v2" units="volts">0.0</constant>
@@ -4759,7 +4759,7 @@ end</constant>
          0.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240830" nPages="1" signature="rusEFI main.2024.09.06.mega100.821184268" version="5.0"/>
+    <versionInfo firmwareInfo="20240830" nPages="1" signature="rusEFI main.2024.09.06.mega100.2965644658" version="5.0"/>
     <bibliography author="rusEFI 20240830" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/generated/simulator_tune_MAZDA_MIATA_NA6.msq b/generated/simulator_tune_MAZDA_MIATA_NA6.msq
index 70f9f63..b126940 100644
--- a/generated/simulator_tune_MAZDA_MIATA_NA6.msq
+++ b/generated/simulator_tune_MAZDA_MIATA_NA6.msq
@@ -157,7 +157,7 @@
         <constant digits="2" name="map_sensor_lowValue" units="kpa">0.0</constant>
         <constant digits="2" name="map_sensor_highValue" units="kpa">0.0</constant>
         <constant name="map_sensor_type">"MPX4250"</constant>
-        <constant name="map_sensor_hwChannel">"NONE"</constant>
+        <constant name="map_sensor_hwChannel">"Disabled"</constant>
         <constant digits="1" name="clt_tempC_1" units="*C">-20.0</constant>
         <constant digits="1" name="clt_tempC_2" units="*C">40.0</constant>
         <constant digits="1" name="clt_tempC_3" units="*C">80.0</constant>
@@ -165,7 +165,7 @@
         <constant digits="1" name="clt_resistance_2" units="Ohm">1150.0</constant>
         <constant digits="1" name="clt_resistance_3" units="Ohm">330.0</constant>
         <constant digits="1" name="clt_bias_resistor" units="Ohm">2700.0</constant>
-        <constant name="clt_adcChannel">"NONE"</constant>
+        <constant name="clt_adcChannel">"Disabled"</constant>
         <constant digits="1" name="iat_tempC_1" units="*C">-20.0</constant>
         <constant digits="1" name="iat_tempC_2" units="*C">40.0</constant>
         <constant digits="1" name="iat_tempC_3" units="*C">80.0</constant>
@@ -173,7 +173,7 @@
         <constant digits="1" name="iat_resistance_2" units="Ohm">1150.0</constant>
         <constant digits="1" name="iat_resistance_3" units="Ohm">330.0</constant>
         <constant digits="1" name="iat_bias_resistor" units="Ohm">2700.0</constant>
-        <constant name="iat_adcChannel">"NONE"</constant>
+        <constant name="iat_adcChannel">"Disabled"</constant>
         <constant digits="2" name="launchTimingRetard" units="deg">0.0</constant>
         <constant digits="0" name="hip9011PrescalerAndSDO" units="integer">0.0</constant>
         <constant digits="0" name="unusedFloatHere" units="">0.0</constant>
@@ -209,10 +209,10 @@
         <constant digits="1" name="driveWheelRevPerKm" units="revs/km">551.0</constant>
         <constant digits="2" name="canSleepPeriodMs" units="ms">50.0</constant>
         <constant digits="0" name="byFirmwareVersion" units="index">0.0</constant>
-        <constant name="tps1_1AdcChannel">"NONE"</constant>
-        <constant name="vbattAdcChannel">"NONE"</constant>
-        <constant name="fuelLevelSensor">"NONE"</constant>
-        <constant name="tps2_1AdcChannel">"NONE"</constant>
+        <constant name="tps1_1AdcChannel">"Disabled"</constant>
+        <constant name="vbattAdcChannel">"Disabled"</constant>
+        <constant name="fuelLevelSensor">"Disabled"</constant>
+        <constant name="tps2_1AdcChannel">"Disabled"</constant>
         <constant digits="4" name="idle_derivativeFilterLoss" units="x">0.0</constant>
         <constant digits="0" name="trailingSparkAngle" units="angle">10.0</constant>
         <constant name="trigger_type">"Miata NA"</constant>
@@ -221,7 +221,7 @@
         <constant digits="1" name="airByRpmTaper" units="%">0.0</constant>
         <constant name="hip9011SpiDevice">"Off"</constant>
         <constant digits="0" name="boostControlSafeDutyCycle" units="%">0.0</constant>
-        <constant name="mafAdcChannel">"NONE"</constant>
+        <constant name="mafAdcChannel">"Disabled"</constant>
         <constant digits="0" name="acrRevolutions" units="">5.0</constant>
         <constant digits="0" name="calibrationBirthday" units="">2.0240906E7</constant>
         <constant digits="3" name="adcVcc" units="volts">3.0</constant>
@@ -230,13 +230,13 @@
         <constant name="camInputs2">"NONE"</constant>
         <constant name="camInputs3">"NONE"</constant>
         <constant name="camInputs4">"NONE"</constant>
-        <constant name="afr_hwChannel">"NONE"</constant>
-        <constant name="afr_hwChannel2">"NONE"</constant>
+        <constant name="afr_hwChannel">"Disabled"</constant>
+        <constant name="afr_hwChannel2">"Disabled"</constant>
         <constant digits="2" name="afr_v1" units="volts">0.0</constant>
         <constant digits="2" name="afr_value1" units="AFR">9.996</constant>
         <constant digits="2" name="afr_v2" units="volts">5.0</constant>
         <constant digits="2" name="afr_value2" units="AFR">19.992</constant>
-        <constant name="throttlePedalPositionAdcChannel">"NONE"</constant>
+        <constant name="throttlePedalPositionAdcChannel">"Disabled"</constant>
         <constant digits="1" name="etbSplit" units="%">5.0</constant>
         <constant name="tle6240_cs">"NONE"</constant>
         <constant name="tle6240_csPinMode">"default"</constant>
@@ -245,7 +245,7 @@
         <constant digits="2" name="baroSensor_lowValue" units="kpa">0.0</constant>
         <constant digits="2" name="baroSensor_highValue" units="kpa">500.0</constant>
         <constant name="baroSensor_type">"Custom"</constant>
-        <constant name="baroSensor_hwChannel">"NONE"</constant>
+        <constant name="baroSensor_hwChannel">"Disabled"</constant>
         <constant digits="0" name="idle_solenoidFrequency" units="Hz">300.0</constant>
         <constant name="idle_solenoidPin">"NONE"</constant>
         <constant name="idle_stepperDirectionPin">"NONE"</constant>
@@ -308,10 +308,10 @@
         <constant name="brakePedalPinMode">"PULLUP"</constant>
         <constant name="mc33972_cs">"NONE"</constant>
         <constant name="mc33972_csPinMode">"default"</constant>
-        <constant name="auxFastSensor1_adcChannel">"NONE"</constant>
-        <constant name="tps1_2AdcChannel">"NONE"</constant>
-        <constant name="tps2_2AdcChannel">"NONE"</constant>
-        <constant name="throttlePedalPositionSecondAdcChannel">"NONE"</constant>
+        <constant name="auxFastSensor1_adcChannel">"Disabled"</constant>
+        <constant name="tps1_2AdcChannel">"Disabled"</constant>
+        <constant name="tps2_2AdcChannel">"Disabled"</constant>
+        <constant name="throttlePedalPositionSecondAdcChannel">"Disabled"</constant>
         <constant name="afr_type">"14Point7"</constant>
         <constant name="mc33810_cs1">"NONE"</constant>
         <constant digits="4" name="idle_antiwindupFreq" units="x">0.0</constant>
@@ -328,7 +328,7 @@
         <constant digits="3" name="fordInjectorSmallPulseSlope" units="g/s">0.0</constant>
         <constant name="triggerSimulatorPinModes1">"default"</constant>
         <constant name="triggerSimulatorPinModes2">"default"</constant>
-        <constant name="maf2AdcChannel">"NONE"</constant>
+        <constant name="maf2AdcChannel">"Disabled"</constant>
         <constant name="o2heaterPin">"NONE"</constant>
         <constant name="o2heaterPinModeTodO">"default"</constant>
         <constant digits="0" name="lambdaProtectionMinRpm" units="RPM">2500.0</constant>
@@ -405,7 +405,7 @@
         <constant digits="1" name="stoichRatioSecondary" units=":1">9.0</constant>
         <constant digits="0" name="etbMaximumPosition" units="%">100.0</constant>
         <constant digits="0" name="sdCardLogFrequency" units="hz">50.0</constant>
-        <constant name="idlePositionChannel">"NONE"</constant>
+        <constant name="idlePositionChannel">"Disabled"</constant>
         <constant digits="0" name="launchCorrectionsEndRpm" units="">0.0</constant>
         <constant name="starterRelayDisablePin">"NONE"</constant>
         <constant name="starterRelayDisablePinMode">"default"</constant>
@@ -639,9 +639,9 @@
         <constant name="launchActivateInverted">"false"</constant>
         <constant name="twoStroke">"Four Stroke"</constant>
         <constant name="skippedWheelOnCam">"On crankshaft"</constant>
-        <constant name="hipOutputChannel">"NONE"</constant>
+        <constant name="hipOutputChannel">"Disabled"</constant>
         <constant name="acSwitch">"NONE"</constant>
-        <constant name="vRefAdcChannel">"NONE"</constant>
+        <constant name="vRefAdcChannel">"Disabled"</constant>
         <constant digits="0" name="etbNeutralPosition" units="%">0.0</constant>
         <constant name="idleMode">"Open Loop + Closed Loop"</constant>
         <constant name="isInjectionEnabled">"true"</constant>
@@ -814,7 +814,7 @@
         <constant name="can2TxPin">"NONE"</constant>
         <constant name="can2RxPin">"NONE"</constant>
         <constant name="starterControlPinMode">"default"</constant>
-        <constant name="wastegatePositionSensor">"NONE"</constant>
+        <constant name="wastegatePositionSensor">"Disabled"</constant>
         <constant name="ignOverrideMode">"None"</constant>
         <constant name="injectorPressureType">"Low"</constant>
         <constant name="hpfpValvePin">"NONE"</constant>
@@ -860,7 +860,7 @@
         <constant digits="2" name="mapLowValueVoltage" units="v">0.0</constant>
         <constant digits="2" name="mapHighValueVoltage" units="v">5.0</constant>
         <constant digits="2" name="egoValueShift" units="value">0.0</constant>
-        <constant name="vvtPins1">"INVALID"</constant>
+        <constant name="vvtPins1">"PA0"</constant>
         <constant name="vvtPins2">"NONE"</constant>
         <constant name="vvtPins3">"NONE"</constant>
         <constant name="vvtPins4">"NONE"</constant>
@@ -877,14 +877,14 @@
         <constant name="vvtMode2">"Inactive"</constant>
         <constant digits="0" name="fan2ExtraIdle" units="%">2.0</constant>
         <constant digits="2" name="primingDelay" units="sec">0.5</constant>
-        <constant name="auxAnalogInputs1">"NONE"</constant>
-        <constant name="auxAnalogInputs2">"NONE"</constant>
-        <constant name="auxAnalogInputs3">"NONE"</constant>
-        <constant name="auxAnalogInputs4">"NONE"</constant>
-        <constant name="auxAnalogInputs5">"NONE"</constant>
-        <constant name="auxAnalogInputs6">"NONE"</constant>
-        <constant name="auxAnalogInputs7">"NONE"</constant>
-        <constant name="auxAnalogInputs8">"NONE"</constant>
+        <constant name="auxAnalogInputs1">"Disabled"</constant>
+        <constant name="auxAnalogInputs2">"Disabled"</constant>
+        <constant name="auxAnalogInputs3">"Disabled"</constant>
+        <constant name="auxAnalogInputs4">"Disabled"</constant>
+        <constant name="auxAnalogInputs5">"Disabled"</constant>
+        <constant name="auxAnalogInputs6">"Disabled"</constant>
+        <constant name="auxAnalogInputs7">"Disabled"</constant>
+        <constant name="auxAnalogInputs8">"Disabled"</constant>
         <constant name="trailingCoilPins1">"NONE"</constant>
         <constant name="trailingCoilPins2">"NONE"</constant>
         <constant name="trailingCoilPins3">"NONE"</constant>
@@ -909,7 +909,7 @@
         <constant digits="1" name="auxTempSensor1_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="auxTempSensor1_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="auxTempSensor1_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="auxTempSensor1_adcChannel">"NONE"</constant>
+        <constant name="auxTempSensor1_adcChannel">"Disabled"</constant>
         <constant digits="1" name="auxTempSensor2_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="auxTempSensor2_tempC_2" units="*C">0.0</constant>
         <constant digits="1" name="auxTempSensor2_tempC_3" units="*C">0.0</constant>
@@ -917,7 +917,7 @@
         <constant digits="1" name="auxTempSensor2_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="auxTempSensor2_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="auxTempSensor2_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="auxTempSensor2_adcChannel">"NONE"</constant>
+        <constant name="auxTempSensor2_adcChannel">"Disabled"</constant>
         <constant digits="0" name="knockSamplingDuration" units="Deg">45.0</constant>
         <constant digits="0" name="etbFreq" units="Hz">800.0</constant>
         <constant digits="4" name="etbWastegatePid_pFactor" units="">1.0</constant>
@@ -989,7 +989,7 @@
          80.0
          100.0
 </constant>
-        <constant name="oilPressure_hwChannel">"NONE"</constant>
+        <constant name="oilPressure_hwChannel">"Disabled"</constant>
         <constant digits="2" name="oilPressure_v1" units="volts">0.5</constant>
         <constant digits="2" name="oilPressure_value1" units="">0.0</constant>
         <constant digits="2" name="oilPressure_v2" units="volts">4.5</constant>
@@ -1010,12 +1010,12 @@
         <constant digits="0" name="coastingFuelCutClt" units="C">60.0</constant>
         <constant digits="0" name="pidExtraForLowRpm" units="%">0.0</constant>
         <constant digits="0" name="coastingFuelCutMap" units="kPa">30.0</constant>
-        <constant name="highPressureFuel_hwChannel">"NONE"</constant>
+        <constant name="highPressureFuel_hwChannel">"Disabled"</constant>
         <constant digits="2" name="highPressureFuel_v1" units="volts">0.0</constant>
         <constant digits="2" name="highPressureFuel_value1" units="">0.0</constant>
         <constant digits="2" name="highPressureFuel_v2" units="volts">0.0</constant>
         <constant digits="2" name="highPressureFuel_value2" units="">0.0</constant>
-        <constant name="lowPressureFuel_hwChannel">"NONE"</constant>
+        <constant name="lowPressureFuel_hwChannel">"Disabled"</constant>
         <constant digits="2" name="lowPressureFuel_v1" units="volts">0.0</constant>
         <constant digits="2" name="lowPressureFuel_value1" units="">0.0</constant>
         <constant digits="2" name="lowPressureFuel_v2" units="volts">0.0</constant>
@@ -1351,12 +1351,12 @@
         <constant name="gearControllerMode">"None"</constant>
         <constant name="transmissionControllerMode">"None"</constant>
         <constant digits="0" name="acrDisablePhase" units="deg">0.0</constant>
-        <constant name="auxLinear1_hwChannel">"NONE"</constant>
+        <constant name="auxLinear1_hwChannel">"Disabled"</constant>
         <constant digits="2" name="auxLinear1_v1" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear1_value1" units="">0.0</constant>
         <constant digits="2" name="auxLinear1_v2" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear1_value2" units="">0.0</constant>
-        <constant name="auxLinear2_hwChannel">"NONE"</constant>
+        <constant name="auxLinear2_hwChannel">"Disabled"</constant>
         <constant digits="2" name="auxLinear2_v1" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear2_value1" units="">0.0</constant>
         <constant digits="2" name="auxLinear2_v2" units="volts">0.0</constant>
@@ -1490,7 +1490,7 @@
         <constant digits="1" name="oilTempSensor_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="oilTempSensor_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="oilTempSensor_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="oilTempSensor_adcChannel">"NONE"</constant>
+        <constant name="oilTempSensor_adcChannel">"Disabled"</constant>
         <constant digits="1" name="fuelTempSensor_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="fuelTempSensor_tempC_2" units="*C">0.0</constant>
         <constant digits="1" name="fuelTempSensor_tempC_3" units="*C">0.0</constant>
@@ -1498,7 +1498,7 @@
         <constant digits="1" name="fuelTempSensor_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="fuelTempSensor_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="fuelTempSensor_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="fuelTempSensor_adcChannel">"NONE"</constant>
+        <constant name="fuelTempSensor_adcChannel">"Disabled"</constant>
         <constant digits="1" name="ambientTempSensor_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="ambientTempSensor_tempC_2" units="*C">0.0</constant>
         <constant digits="1" name="ambientTempSensor_tempC_3" units="*C">0.0</constant>
@@ -1506,7 +1506,7 @@
         <constant digits="1" name="ambientTempSensor_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="ambientTempSensor_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="ambientTempSensor_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="ambientTempSensor_adcChannel">"NONE"</constant>
+        <constant name="ambientTempSensor_adcChannel">"Disabled"</constant>
         <constant digits="1" name="compressorDischargeTemperature_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="compressorDischargeTemperature_tempC_2" units="*C">0.0</constant>
         <constant digits="1" name="compressorDischargeTemperature_tempC_3" units="*C">0.0</constant>
@@ -1514,9 +1514,9 @@
         <constant digits="1" name="compressorDischargeTemperature_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="compressorDischargeTemperature_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="compressorDischargeTemperature_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="compressorDischargeTemperature_adcChannel">"NONE"</constant>
-        <constant name="throttleInletPressureChannel">"NONE"</constant>
-        <constant name="compressorDischargePressureChannel">"NONE"</constant>
+        <constant name="compressorDischargeTemperature_adcChannel">"Disabled"</constant>
+        <constant name="throttleInletPressureChannel">"Disabled"</constant>
+        <constant name="compressorDischargePressureChannel">"Disabled"</constant>
         <constant name="dacOutputPins1">"NONE"</constant>
         <constant name="dacOutputPins2">"NONE"</constant>
         <constant name="speedometerOutputPin">"NONE"</constant>
@@ -1525,7 +1525,7 @@
         <constant digits="0" name="simulatorCamPosition2" units="">0.0</constant>
         <constant digits="0" name="simulatorCamPosition3" units="">0.0</constant>
         <constant digits="0" name="simulatorCamPosition4" units="">0.0</constant>
-        <constant name="ignKeyAdcChannel">"NONE"</constant>
+        <constant name="ignKeyAdcChannel">"Disabled"</constant>
         <constant name="spi6MisoMode">"default"</constant>
         <constant digits="3" name="triggerVVTGapOverrideFrom1" units="ratio">0.0</constant>
         <constant digits="3" name="triggerVVTGapOverrideFrom2" units="ratio">0.0</constant>
@@ -1600,18 +1600,18 @@
         <constant digits="0" name="device_uid1" units="">0.0</constant>
         <constant digits="0" name="device_uid2" units="">0.0</constant>
         <constant digits="0" name="device_uid3" units="">0.0</constant>
-        <constant name="tcu_rangeAnalogInput1">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput2">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput3">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput4">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput5">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput6">"NONE"</constant>
+        <constant name="tcu_rangeAnalogInput1">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput2">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput3">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput4">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput5">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput6">"Disabled"</constant>
         <constant digits="1" name="tcu_rangeSensorBiasResistor" units="Ohm">0.0</constant>
         <constant name="msIoBox0_id">"Off"</constant>
         <constant name="msIoBox0_vss">"Off"</constant>
         <constant digits="2" name="mc33810Nomi" units="A">5.5</constant>
         <constant digits="0" name="mc33810Maxi" units="A">14.0</constant>
-        <constant name="acPressure_hwChannel">"NONE"</constant>
+        <constant name="acPressure_hwChannel">"Disabled"</constant>
         <constant digits="2" name="acPressure_v1" units="volts">0.0</constant>
         <constant digits="2" name="acPressure_value1" units="">0.0</constant>
         <constant digits="2" name="acPressure_v2" units="volts">0.0</constant>
@@ -1619,12 +1619,12 @@
         <constant digits="0" name="minAcPressure" units="kPa">100.0</constant>
         <constant digits="0" name="maxAcPressure" units="kPa">300.0</constant>
         <constant digits="1" name="minimumOilPressureTimeout" units="sec">0.5</constant>
-        <constant name="auxLinear3_hwChannel">"NONE"</constant>
+        <constant name="auxLinear3_hwChannel">"Disabled"</constant>
         <constant digits="2" name="auxLinear3_v1" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear3_value1" units="">0.0</constant>
         <constant digits="2" name="auxLinear3_v2" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear3_value2" units="">0.0</constant>
-        <constant name="auxLinear4_hwChannel">"NONE"</constant>
+        <constant name="auxLinear4_hwChannel">"Disabled"</constant>
         <constant digits="2" name="auxLinear4_v1" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear4_value1" units="">0.0</constant>
         <constant digits="2" name="auxLinear4_v2" units="volts">0.0</constant>
@@ -4762,7 +4762,7 @@ end</constant>
          0.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240830" nPages="1" signature="rusEFI main.2024.09.06.mega100.821184268" version="5.0"/>
+    <versionInfo firmwareInfo="20240830" nPages="1" signature="rusEFI main.2024.09.06.mega100.2965644658" version="5.0"/>
     <bibliography author="rusEFI 20240830" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/generated/simulator_tune_MAZDA_MIATA_NA94.msq b/generated/simulator_tune_MAZDA_MIATA_NA94.msq
index 864d31c..0d1a1e8 100644
--- a/generated/simulator_tune_MAZDA_MIATA_NA94.msq
+++ b/generated/simulator_tune_MAZDA_MIATA_NA94.msq
@@ -157,7 +157,7 @@
         <constant digits="2" name="map_sensor_lowValue" units="kpa">0.0</constant>
         <constant digits="2" name="map_sensor_highValue" units="kpa">0.0</constant>
         <constant name="map_sensor_type">"MPX4250"</constant>
-        <constant name="map_sensor_hwChannel">"NONE"</constant>
+        <constant name="map_sensor_hwChannel">"Disabled"</constant>
         <constant digits="1" name="clt_tempC_1" units="*C">-20.0</constant>
         <constant digits="1" name="clt_tempC_2" units="*C">40.0</constant>
         <constant digits="1" name="clt_tempC_3" units="*C">80.0</constant>
@@ -165,7 +165,7 @@
         <constant digits="1" name="clt_resistance_2" units="Ohm">1150.0</constant>
         <constant digits="1" name="clt_resistance_3" units="Ohm">330.0</constant>
         <constant digits="1" name="clt_bias_resistor" units="Ohm">2700.0</constant>
-        <constant name="clt_adcChannel">"NONE"</constant>
+        <constant name="clt_adcChannel">"Disabled"</constant>
         <constant digits="1" name="iat_tempC_1" units="*C">-20.0</constant>
         <constant digits="1" name="iat_tempC_2" units="*C">40.0</constant>
         <constant digits="1" name="iat_tempC_3" units="*C">80.0</constant>
@@ -173,7 +173,7 @@
         <constant digits="1" name="iat_resistance_2" units="Ohm">1150.0</constant>
         <constant digits="1" name="iat_resistance_3" units="Ohm">330.0</constant>
         <constant digits="1" name="iat_bias_resistor" units="Ohm">2700.0</constant>
-        <constant name="iat_adcChannel">"NONE"</constant>
+        <constant name="iat_adcChannel">"Disabled"</constant>
         <constant digits="2" name="launchTimingRetard" units="deg">0.0</constant>
         <constant digits="0" name="hip9011PrescalerAndSDO" units="integer">0.0</constant>
         <constant digits="0" name="unusedFloatHere" units="">0.0</constant>
@@ -209,10 +209,10 @@
         <constant digits="1" name="driveWheelRevPerKm" units="revs/km">551.0</constant>
         <constant digits="2" name="canSleepPeriodMs" units="ms">50.0</constant>
         <constant digits="0" name="byFirmwareVersion" units="index">0.0</constant>
-        <constant name="tps1_1AdcChannel">"NONE"</constant>
-        <constant name="vbattAdcChannel">"NONE"</constant>
-        <constant name="fuelLevelSensor">"NONE"</constant>
-        <constant name="tps2_1AdcChannel">"NONE"</constant>
+        <constant name="tps1_1AdcChannel">"Disabled"</constant>
+        <constant name="vbattAdcChannel">"Disabled"</constant>
+        <constant name="fuelLevelSensor">"Disabled"</constant>
+        <constant name="tps2_1AdcChannel">"Disabled"</constant>
         <constant digits="4" name="idle_derivativeFilterLoss" units="x">0.0</constant>
         <constant digits="0" name="trailingSparkAngle" units="angle">10.0</constant>
         <constant name="trigger_type">"Miata NA"</constant>
@@ -221,7 +221,7 @@
         <constant digits="1" name="airByRpmTaper" units="%">0.0</constant>
         <constant name="hip9011SpiDevice">"Off"</constant>
         <constant digits="0" name="boostControlSafeDutyCycle" units="%">0.0</constant>
-        <constant name="mafAdcChannel">"NONE"</constant>
+        <constant name="mafAdcChannel">"Disabled"</constant>
         <constant digits="0" name="acrRevolutions" units="">5.0</constant>
         <constant digits="0" name="calibrationBirthday" units="">2.0240906E7</constant>
         <constant digits="3" name="adcVcc" units="volts">3.0</constant>
@@ -230,13 +230,13 @@
         <constant name="camInputs2">"NONE"</constant>
         <constant name="camInputs3">"NONE"</constant>
         <constant name="camInputs4">"NONE"</constant>
-        <constant name="afr_hwChannel">"NONE"</constant>
-        <constant name="afr_hwChannel2">"NONE"</constant>
+        <constant name="afr_hwChannel">"Disabled"</constant>
+        <constant name="afr_hwChannel2">"Disabled"</constant>
         <constant digits="2" name="afr_v1" units="volts">0.0</constant>
         <constant digits="2" name="afr_value1" units="AFR">9.996</constant>
         <constant digits="2" name="afr_v2" units="volts">5.0</constant>
         <constant digits="2" name="afr_value2" units="AFR">19.992</constant>
-        <constant name="throttlePedalPositionAdcChannel">"NONE"</constant>
+        <constant name="throttlePedalPositionAdcChannel">"Disabled"</constant>
         <constant digits="1" name="etbSplit" units="%">5.0</constant>
         <constant name="tle6240_cs">"NONE"</constant>
         <constant name="tle6240_csPinMode">"default"</constant>
@@ -245,7 +245,7 @@
         <constant digits="2" name="baroSensor_lowValue" units="kpa">0.0</constant>
         <constant digits="2" name="baroSensor_highValue" units="kpa">500.0</constant>
         <constant name="baroSensor_type">"Custom"</constant>
-        <constant name="baroSensor_hwChannel">"NONE"</constant>
+        <constant name="baroSensor_hwChannel">"Disabled"</constant>
         <constant digits="0" name="idle_solenoidFrequency" units="Hz">300.0</constant>
         <constant name="idle_solenoidPin">"NONE"</constant>
         <constant name="idle_stepperDirectionPin">"NONE"</constant>
@@ -308,10 +308,10 @@
         <constant name="brakePedalPinMode">"PULLUP"</constant>
         <constant name="mc33972_cs">"NONE"</constant>
         <constant name="mc33972_csPinMode">"default"</constant>
-        <constant name="auxFastSensor1_adcChannel">"NONE"</constant>
-        <constant name="tps1_2AdcChannel">"NONE"</constant>
-        <constant name="tps2_2AdcChannel">"NONE"</constant>
-        <constant name="throttlePedalPositionSecondAdcChannel">"NONE"</constant>
+        <constant name="auxFastSensor1_adcChannel">"Disabled"</constant>
+        <constant name="tps1_2AdcChannel">"Disabled"</constant>
+        <constant name="tps2_2AdcChannel">"Disabled"</constant>
+        <constant name="throttlePedalPositionSecondAdcChannel">"Disabled"</constant>
         <constant name="afr_type">"14Point7"</constant>
         <constant name="mc33810_cs1">"NONE"</constant>
         <constant digits="4" name="idle_antiwindupFreq" units="x">0.0</constant>
@@ -328,7 +328,7 @@
         <constant digits="3" name="fordInjectorSmallPulseSlope" units="g/s">0.0</constant>
         <constant name="triggerSimulatorPinModes1">"default"</constant>
         <constant name="triggerSimulatorPinModes2">"default"</constant>
-        <constant name="maf2AdcChannel">"NONE"</constant>
+        <constant name="maf2AdcChannel">"Disabled"</constant>
         <constant name="o2heaterPin">"NONE"</constant>
         <constant name="o2heaterPinModeTodO">"default"</constant>
         <constant digits="0" name="lambdaProtectionMinRpm" units="RPM">2500.0</constant>
@@ -405,7 +405,7 @@
         <constant digits="1" name="stoichRatioSecondary" units=":1">9.0</constant>
         <constant digits="0" name="etbMaximumPosition" units="%">100.0</constant>
         <constant digits="0" name="sdCardLogFrequency" units="hz">50.0</constant>
-        <constant name="idlePositionChannel">"NONE"</constant>
+        <constant name="idlePositionChannel">"Disabled"</constant>
         <constant digits="0" name="launchCorrectionsEndRpm" units="">0.0</constant>
         <constant name="starterRelayDisablePin">"NONE"</constant>
         <constant name="starterRelayDisablePinMode">"default"</constant>
@@ -639,9 +639,9 @@
         <constant name="launchActivateInverted">"false"</constant>
         <constant name="twoStroke">"Four Stroke"</constant>
         <constant name="skippedWheelOnCam">"On crankshaft"</constant>
-        <constant name="hipOutputChannel">"NONE"</constant>
+        <constant name="hipOutputChannel">"Disabled"</constant>
         <constant name="acSwitch">"NONE"</constant>
-        <constant name="vRefAdcChannel">"NONE"</constant>
+        <constant name="vRefAdcChannel">"Disabled"</constant>
         <constant digits="0" name="etbNeutralPosition" units="%">0.0</constant>
         <constant name="idleMode">"Open Loop + Closed Loop"</constant>
         <constant name="isInjectionEnabled">"true"</constant>
@@ -814,7 +814,7 @@
         <constant name="can2TxPin">"NONE"</constant>
         <constant name="can2RxPin">"NONE"</constant>
         <constant name="starterControlPinMode">"default"</constant>
-        <constant name="wastegatePositionSensor">"NONE"</constant>
+        <constant name="wastegatePositionSensor">"Disabled"</constant>
         <constant name="ignOverrideMode">"None"</constant>
         <constant name="injectorPressureType">"Low"</constant>
         <constant name="hpfpValvePin">"NONE"</constant>
@@ -860,7 +860,7 @@
         <constant digits="2" name="mapLowValueVoltage" units="v">0.0</constant>
         <constant digits="2" name="mapHighValueVoltage" units="v">5.0</constant>
         <constant digits="2" name="egoValueShift" units="value">0.0</constant>
-        <constant name="vvtPins1">"INVALID"</constant>
+        <constant name="vvtPins1">"PA0"</constant>
         <constant name="vvtPins2">"NONE"</constant>
         <constant name="vvtPins3">"NONE"</constant>
         <constant name="vvtPins4">"NONE"</constant>
@@ -877,14 +877,14 @@
         <constant name="vvtMode2">"Inactive"</constant>
         <constant digits="0" name="fan2ExtraIdle" units="%">2.0</constant>
         <constant digits="2" name="primingDelay" units="sec">0.5</constant>
-        <constant name="auxAnalogInputs1">"NONE"</constant>
-        <constant name="auxAnalogInputs2">"NONE"</constant>
-        <constant name="auxAnalogInputs3">"NONE"</constant>
-        <constant name="auxAnalogInputs4">"NONE"</constant>
-        <constant name="auxAnalogInputs5">"NONE"</constant>
-        <constant name="auxAnalogInputs6">"NONE"</constant>
-        <constant name="auxAnalogInputs7">"NONE"</constant>
-        <constant name="auxAnalogInputs8">"NONE"</constant>
+        <constant name="auxAnalogInputs1">"Disabled"</constant>
+        <constant name="auxAnalogInputs2">"Disabled"</constant>
+        <constant name="auxAnalogInputs3">"Disabled"</constant>
+        <constant name="auxAnalogInputs4">"Disabled"</constant>
+        <constant name="auxAnalogInputs5">"Disabled"</constant>
+        <constant name="auxAnalogInputs6">"Disabled"</constant>
+        <constant name="auxAnalogInputs7">"Disabled"</constant>
+        <constant name="auxAnalogInputs8">"Disabled"</constant>
         <constant name="trailingCoilPins1">"NONE"</constant>
         <constant name="trailingCoilPins2">"NONE"</constant>
         <constant name="trailingCoilPins3">"NONE"</constant>
@@ -909,7 +909,7 @@
         <constant digits="1" name="auxTempSensor1_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="auxTempSensor1_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="auxTempSensor1_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="auxTempSensor1_adcChannel">"NONE"</constant>
+        <constant name="auxTempSensor1_adcChannel">"Disabled"</constant>
         <constant digits="1" name="auxTempSensor2_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="auxTempSensor2_tempC_2" units="*C">0.0</constant>
         <constant digits="1" name="auxTempSensor2_tempC_3" units="*C">0.0</constant>
@@ -917,7 +917,7 @@
         <constant digits="1" name="auxTempSensor2_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="auxTempSensor2_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="auxTempSensor2_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="auxTempSensor2_adcChannel">"NONE"</constant>
+        <constant name="auxTempSensor2_adcChannel">"Disabled"</constant>
         <constant digits="0" name="knockSamplingDuration" units="Deg">45.0</constant>
         <constant digits="0" name="etbFreq" units="Hz">800.0</constant>
         <constant digits="4" name="etbWastegatePid_pFactor" units="">1.0</constant>
@@ -989,7 +989,7 @@
          80.0
          100.0
 </constant>
-        <constant name="oilPressure_hwChannel">"NONE"</constant>
+        <constant name="oilPressure_hwChannel">"Disabled"</constant>
         <constant digits="2" name="oilPressure_v1" units="volts">0.5</constant>
         <constant digits="2" name="oilPressure_value1" units="">0.0</constant>
         <constant digits="2" name="oilPressure_v2" units="volts">4.5</constant>
@@ -1010,12 +1010,12 @@
         <constant digits="0" name="coastingFuelCutClt" units="C">60.0</constant>
         <constant digits="0" name="pidExtraForLowRpm" units="%">0.0</constant>
         <constant digits="0" name="coastingFuelCutMap" units="kPa">30.0</constant>
-        <constant name="highPressureFuel_hwChannel">"NONE"</constant>
+        <constant name="highPressureFuel_hwChannel">"Disabled"</constant>
         <constant digits="2" name="highPressureFuel_v1" units="volts">0.0</constant>
         <constant digits="2" name="highPressureFuel_value1" units="">0.0</constant>
         <constant digits="2" name="highPressureFuel_v2" units="volts">0.0</constant>
         <constant digits="2" name="highPressureFuel_value2" units="">0.0</constant>
-        <constant name="lowPressureFuel_hwChannel">"NONE"</constant>
+        <constant name="lowPressureFuel_hwChannel">"Disabled"</constant>
         <constant digits="2" name="lowPressureFuel_v1" units="volts">0.0</constant>
         <constant digits="2" name="lowPressureFuel_value1" units="">0.0</constant>
         <constant digits="2" name="lowPressureFuel_v2" units="volts">0.0</constant>
@@ -1351,12 +1351,12 @@
         <constant name="gearControllerMode">"None"</constant>
         <constant name="transmissionControllerMode">"None"</constant>
         <constant digits="0" name="acrDisablePhase" units="deg">0.0</constant>
-        <constant name="auxLinear1_hwChannel">"NONE"</constant>
+        <constant name="auxLinear1_hwChannel">"Disabled"</constant>
         <constant digits="2" name="auxLinear1_v1" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear1_value1" units="">0.0</constant>
         <constant digits="2" name="auxLinear1_v2" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear1_value2" units="">0.0</constant>
-        <constant name="auxLinear2_hwChannel">"NONE"</constant>
+        <constant name="auxLinear2_hwChannel">"Disabled"</constant>
         <constant digits="2" name="auxLinear2_v1" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear2_value1" units="">0.0</constant>
         <constant digits="2" name="auxLinear2_v2" units="volts">0.0</constant>
@@ -1490,7 +1490,7 @@
         <constant digits="1" name="oilTempSensor_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="oilTempSensor_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="oilTempSensor_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="oilTempSensor_adcChannel">"NONE"</constant>
+        <constant name="oilTempSensor_adcChannel">"Disabled"</constant>
         <constant digits="1" name="fuelTempSensor_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="fuelTempSensor_tempC_2" units="*C">0.0</constant>
         <constant digits="1" name="fuelTempSensor_tempC_3" units="*C">0.0</constant>
@@ -1498,7 +1498,7 @@
         <constant digits="1" name="fuelTempSensor_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="fuelTempSensor_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="fuelTempSensor_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="fuelTempSensor_adcChannel">"NONE"</constant>
+        <constant name="fuelTempSensor_adcChannel">"Disabled"</constant>
         <constant digits="1" name="ambientTempSensor_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="ambientTempSensor_tempC_2" units="*C">0.0</constant>
         <constant digits="1" name="ambientTempSensor_tempC_3" units="*C">0.0</constant>
@@ -1506,7 +1506,7 @@
         <constant digits="1" name="ambientTempSensor_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="ambientTempSensor_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="ambientTempSensor_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="ambientTempSensor_adcChannel">"NONE"</constant>
+        <constant name="ambientTempSensor_adcChannel">"Disabled"</constant>
         <constant digits="1" name="compressorDischargeTemperature_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="compressorDischargeTemperature_tempC_2" units="*C">0.0</constant>
         <constant digits="1" name="compressorDischargeTemperature_tempC_3" units="*C">0.0</constant>
@@ -1514,9 +1514,9 @@
         <constant digits="1" name="compressorDischargeTemperature_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="compressorDischargeTemperature_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="compressorDischargeTemperature_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="compressorDischargeTemperature_adcChannel">"NONE"</constant>
-        <constant name="throttleInletPressureChannel">"NONE"</constant>
-        <constant name="compressorDischargePressureChannel">"NONE"</constant>
+        <constant name="compressorDischargeTemperature_adcChannel">"Disabled"</constant>
+        <constant name="throttleInletPressureChannel">"Disabled"</constant>
+        <constant name="compressorDischargePressureChannel">"Disabled"</constant>
         <constant name="dacOutputPins1">"NONE"</constant>
         <constant name="dacOutputPins2">"NONE"</constant>
         <constant name="speedometerOutputPin">"NONE"</constant>
@@ -1525,7 +1525,7 @@
         <constant digits="0" name="simulatorCamPosition2" units="">0.0</constant>
         <constant digits="0" name="simulatorCamPosition3" units="">0.0</constant>
         <constant digits="0" name="simulatorCamPosition4" units="">0.0</constant>
-        <constant name="ignKeyAdcChannel">"NONE"</constant>
+        <constant name="ignKeyAdcChannel">"Disabled"</constant>
         <constant name="spi6MisoMode">"default"</constant>
         <constant digits="3" name="triggerVVTGapOverrideFrom1" units="ratio">0.0</constant>
         <constant digits="3" name="triggerVVTGapOverrideFrom2" units="ratio">0.0</constant>
@@ -1600,18 +1600,18 @@
         <constant digits="0" name="device_uid1" units="">0.0</constant>
         <constant digits="0" name="device_uid2" units="">0.0</constant>
         <constant digits="0" name="device_uid3" units="">0.0</constant>
-        <constant name="tcu_rangeAnalogInput1">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput2">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput3">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput4">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput5">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput6">"NONE"</constant>
+        <constant name="tcu_rangeAnalogInput1">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput2">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput3">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput4">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput5">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput6">"Disabled"</constant>
         <constant digits="1" name="tcu_rangeSensorBiasResistor" units="Ohm">0.0</constant>
         <constant name="msIoBox0_id">"Off"</constant>
         <constant name="msIoBox0_vss">"Off"</constant>
         <constant digits="2" name="mc33810Nomi" units="A">5.5</constant>
         <constant digits="0" name="mc33810Maxi" units="A">14.0</constant>
-        <constant name="acPressure_hwChannel">"NONE"</constant>
+        <constant name="acPressure_hwChannel">"Disabled"</constant>
         <constant digits="2" name="acPressure_v1" units="volts">0.0</constant>
         <constant digits="2" name="acPressure_value1" units="">0.0</constant>
         <constant digits="2" name="acPressure_v2" units="volts">0.0</constant>
@@ -1619,12 +1619,12 @@
         <constant digits="0" name="minAcPressure" units="kPa">100.0</constant>
         <constant digits="0" name="maxAcPressure" units="kPa">300.0</constant>
         <constant digits="1" name="minimumOilPressureTimeout" units="sec">0.5</constant>
-        <constant name="auxLinear3_hwChannel">"NONE"</constant>
+        <constant name="auxLinear3_hwChannel">"Disabled"</constant>
         <constant digits="2" name="auxLinear3_v1" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear3_value1" units="">0.0</constant>
         <constant digits="2" name="auxLinear3_v2" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear3_value2" units="">0.0</constant>
-        <constant name="auxLinear4_hwChannel">"NONE"</constant>
+        <constant name="auxLinear4_hwChannel">"Disabled"</constant>
         <constant digits="2" name="auxLinear4_v1" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear4_value1" units="">0.0</constant>
         <constant digits="2" name="auxLinear4_v2" units="volts">0.0</constant>
@@ -4762,7 +4762,7 @@ end</constant>
          0.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240830" nPages="1" signature="rusEFI main.2024.09.06.mega100.821184268" version="5.0"/>
+    <versionInfo firmwareInfo="20240830" nPages="1" signature="rusEFI main.2024.09.06.mega100.2965644658" version="5.0"/>
     <bibliography author="rusEFI 20240830" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/generated/simulator_tune_MAZDA_MIATA_NA96.msq b/generated/simulator_tune_MAZDA_MIATA_NA96.msq
index 7bb1e96..2e4f429 100644
--- a/generated/simulator_tune_MAZDA_MIATA_NA96.msq
+++ b/generated/simulator_tune_MAZDA_MIATA_NA96.msq
@@ -157,7 +157,7 @@
         <constant digits="2" name="map_sensor_lowValue" units="kpa">0.0</constant>
         <constant digits="2" name="map_sensor_highValue" units="kpa">0.0</constant>
         <constant name="map_sensor_type">"MPXH6400"</constant>
-        <constant name="map_sensor_hwChannel">"NONE"</constant>
+        <constant name="map_sensor_hwChannel">"Disabled"</constant>
         <constant digits="1" name="clt_tempC_1" units="*C">-20.0</constant>
         <constant digits="1" name="clt_tempC_2" units="*C">40.0</constant>
         <constant digits="1" name="clt_tempC_3" units="*C">80.0</constant>
@@ -165,7 +165,7 @@
         <constant digits="1" name="clt_resistance_2" units="Ohm">1150.0</constant>
         <constant digits="1" name="clt_resistance_3" units="Ohm">330.0</constant>
         <constant digits="1" name="clt_bias_resistor" units="Ohm">2700.0</constant>
-        <constant name="clt_adcChannel">"NONE"</constant>
+        <constant name="clt_adcChannel">"Disabled"</constant>
         <constant digits="1" name="iat_tempC_1" units="*C">-20.0</constant>
         <constant digits="1" name="iat_tempC_2" units="*C">40.0</constant>
         <constant digits="1" name="iat_tempC_3" units="*C">80.0</constant>
@@ -173,7 +173,7 @@
         <constant digits="1" name="iat_resistance_2" units="Ohm">1150.0</constant>
         <constant digits="1" name="iat_resistance_3" units="Ohm">330.0</constant>
         <constant digits="1" name="iat_bias_resistor" units="Ohm">2700.0</constant>
-        <constant name="iat_adcChannel">"NONE"</constant>
+        <constant name="iat_adcChannel">"Disabled"</constant>
         <constant digits="2" name="launchTimingRetard" units="deg">0.0</constant>
         <constant digits="0" name="hip9011PrescalerAndSDO" units="integer">0.0</constant>
         <constant digits="0" name="unusedFloatHere" units="">0.0</constant>
@@ -209,10 +209,10 @@
         <constant digits="1" name="driveWheelRevPerKm" units="revs/km">551.0</constant>
         <constant digits="2" name="canSleepPeriodMs" units="ms">50.0</constant>
         <constant digits="0" name="byFirmwareVersion" units="index">0.0</constant>
-        <constant name="tps1_1AdcChannel">"NONE"</constant>
-        <constant name="vbattAdcChannel">"NONE"</constant>
-        <constant name="fuelLevelSensor">"NONE"</constant>
-        <constant name="tps2_1AdcChannel">"NONE"</constant>
+        <constant name="tps1_1AdcChannel">"Disabled"</constant>
+        <constant name="vbattAdcChannel">"Disabled"</constant>
+        <constant name="fuelLevelSensor">"Disabled"</constant>
+        <constant name="tps2_1AdcChannel">"Disabled"</constant>
         <constant digits="4" name="idle_derivativeFilterLoss" units="x">0.08</constant>
         <constant digits="0" name="trailingSparkAngle" units="angle">10.0</constant>
         <constant name="trigger_type">"Miata NA"</constant>
@@ -221,7 +221,7 @@
         <constant digits="1" name="airByRpmTaper" units="%">0.0</constant>
         <constant name="hip9011SpiDevice">"Off"</constant>
         <constant digits="0" name="boostControlSafeDutyCycle" units="%">0.0</constant>
-        <constant name="mafAdcChannel">"NONE"</constant>
+        <constant name="mafAdcChannel">"Disabled"</constant>
         <constant digits="0" name="acrRevolutions" units="">5.0</constant>
         <constant digits="0" name="calibrationBirthday" units="">2.0240906E7</constant>
         <constant digits="3" name="adcVcc" units="volts">3.0</constant>
@@ -230,13 +230,13 @@
         <constant name="camInputs2">"NONE"</constant>
         <constant name="camInputs3">"NONE"</constant>
         <constant name="camInputs4">"NONE"</constant>
-        <constant name="afr_hwChannel">"NONE"</constant>
-        <constant name="afr_hwChannel2">"NONE"</constant>
+        <constant name="afr_hwChannel">"Disabled"</constant>
+        <constant name="afr_hwChannel2">"Disabled"</constant>
         <constant digits="2" name="afr_v1" units="volts">0.0</constant>
         <constant digits="2" name="afr_value1" units="AFR">9.996</constant>
         <constant digits="2" name="afr_v2" units="volts">5.0</constant>
         <constant digits="2" name="afr_value2" units="AFR">19.992</constant>
-        <constant name="throttlePedalPositionAdcChannel">"NONE"</constant>
+        <constant name="throttlePedalPositionAdcChannel">"Disabled"</constant>
         <constant digits="1" name="etbSplit" units="%">5.0</constant>
         <constant name="tle6240_cs">"NONE"</constant>
         <constant name="tle6240_csPinMode">"default"</constant>
@@ -245,7 +245,7 @@
         <constant digits="2" name="baroSensor_lowValue" units="kpa">0.0</constant>
         <constant digits="2" name="baroSensor_highValue" units="kpa">500.0</constant>
         <constant name="baroSensor_type">"Custom"</constant>
-        <constant name="baroSensor_hwChannel">"NONE"</constant>
+        <constant name="baroSensor_hwChannel">"Disabled"</constant>
         <constant digits="0" name="idle_solenoidFrequency" units="Hz">300.0</constant>
         <constant name="idle_solenoidPin">"NONE"</constant>
         <constant name="idle_stepperDirectionPin">"NONE"</constant>
@@ -308,10 +308,10 @@
         <constant name="brakePedalPinMode">"PULLUP"</constant>
         <constant name="mc33972_cs">"NONE"</constant>
         <constant name="mc33972_csPinMode">"default"</constant>
-        <constant name="auxFastSensor1_adcChannel">"NONE"</constant>
-        <constant name="tps1_2AdcChannel">"NONE"</constant>
-        <constant name="tps2_2AdcChannel">"NONE"</constant>
-        <constant name="throttlePedalPositionSecondAdcChannel">"NONE"</constant>
+        <constant name="auxFastSensor1_adcChannel">"Disabled"</constant>
+        <constant name="tps1_2AdcChannel">"Disabled"</constant>
+        <constant name="tps2_2AdcChannel">"Disabled"</constant>
+        <constant name="throttlePedalPositionSecondAdcChannel">"Disabled"</constant>
         <constant name="afr_type">"14Point7"</constant>
         <constant name="mc33810_cs1">"NONE"</constant>
         <constant digits="4" name="idle_antiwindupFreq" units="x">0.03</constant>
@@ -328,7 +328,7 @@
         <constant digits="3" name="fordInjectorSmallPulseSlope" units="g/s">0.0</constant>
         <constant name="triggerSimulatorPinModes1">"default"</constant>
         <constant name="triggerSimulatorPinModes2">"default"</constant>
-        <constant name="maf2AdcChannel">"NONE"</constant>
+        <constant name="maf2AdcChannel">"Disabled"</constant>
         <constant name="o2heaterPin">"NONE"</constant>
         <constant name="o2heaterPinModeTodO">"default"</constant>
         <constant digits="0" name="lambdaProtectionMinRpm" units="RPM">2500.0</constant>
@@ -405,7 +405,7 @@
         <constant digits="1" name="stoichRatioSecondary" units=":1">9.0</constant>
         <constant digits="0" name="etbMaximumPosition" units="%">100.0</constant>
         <constant digits="0" name="sdCardLogFrequency" units="hz">50.0</constant>
-        <constant name="idlePositionChannel">"NONE"</constant>
+        <constant name="idlePositionChannel">"Disabled"</constant>
         <constant digits="0" name="launchCorrectionsEndRpm" units="">0.0</constant>
         <constant name="starterRelayDisablePin">"NONE"</constant>
         <constant name="starterRelayDisablePinMode">"default"</constant>
@@ -639,9 +639,9 @@
         <constant name="launchActivateInverted">"false"</constant>
         <constant name="twoStroke">"Four Stroke"</constant>
         <constant name="skippedWheelOnCam">"On crankshaft"</constant>
-        <constant name="hipOutputChannel">"NONE"</constant>
+        <constant name="hipOutputChannel">"Disabled"</constant>
         <constant name="acSwitch">"NONE"</constant>
-        <constant name="vRefAdcChannel">"NONE"</constant>
+        <constant name="vRefAdcChannel">"Disabled"</constant>
         <constant digits="0" name="etbNeutralPosition" units="%">0.0</constant>
         <constant name="idleMode">"Open Loop + Closed Loop"</constant>
         <constant name="isInjectionEnabled">"true"</constant>
@@ -814,7 +814,7 @@
         <constant name="can2TxPin">"NONE"</constant>
         <constant name="can2RxPin">"NONE"</constant>
         <constant name="starterControlPinMode">"default"</constant>
-        <constant name="wastegatePositionSensor">"NONE"</constant>
+        <constant name="wastegatePositionSensor">"Disabled"</constant>
         <constant name="ignOverrideMode">"None"</constant>
         <constant name="injectorPressureType">"Low"</constant>
         <constant name="hpfpValvePin">"NONE"</constant>
@@ -860,7 +860,7 @@
         <constant digits="2" name="mapLowValueVoltage" units="v">0.0</constant>
         <constant digits="2" name="mapHighValueVoltage" units="v">5.0</constant>
         <constant digits="2" name="egoValueShift" units="value">0.0</constant>
-        <constant name="vvtPins1">"INVALID"</constant>
+        <constant name="vvtPins1">"PA0"</constant>
         <constant name="vvtPins2">"NONE"</constant>
         <constant name="vvtPins3">"NONE"</constant>
         <constant name="vvtPins4">"NONE"</constant>
@@ -877,14 +877,14 @@
         <constant name="vvtMode2">"Inactive"</constant>
         <constant digits="0" name="fan2ExtraIdle" units="%">2.0</constant>
         <constant digits="2" name="primingDelay" units="sec">0.5</constant>
-        <constant name="auxAnalogInputs1">"NONE"</constant>
-        <constant name="auxAnalogInputs2">"NONE"</constant>
-        <constant name="auxAnalogInputs3">"NONE"</constant>
-        <constant name="auxAnalogInputs4">"NONE"</constant>
-        <constant name="auxAnalogInputs5">"NONE"</constant>
-        <constant name="auxAnalogInputs6">"NONE"</constant>
-        <constant name="auxAnalogInputs7">"NONE"</constant>
-        <constant name="auxAnalogInputs8">"NONE"</constant>
+        <constant name="auxAnalogInputs1">"Disabled"</constant>
+        <constant name="auxAnalogInputs2">"Disabled"</constant>
+        <constant name="auxAnalogInputs3">"Disabled"</constant>
+        <constant name="auxAnalogInputs4">"Disabled"</constant>
+        <constant name="auxAnalogInputs5">"Disabled"</constant>
+        <constant name="auxAnalogInputs6">"Disabled"</constant>
+        <constant name="auxAnalogInputs7">"Disabled"</constant>
+        <constant name="auxAnalogInputs8">"Disabled"</constant>
         <constant name="trailingCoilPins1">"NONE"</constant>
         <constant name="trailingCoilPins2">"NONE"</constant>
         <constant name="trailingCoilPins3">"NONE"</constant>
@@ -909,7 +909,7 @@
         <constant digits="1" name="auxTempSensor1_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="auxTempSensor1_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="auxTempSensor1_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="auxTempSensor1_adcChannel">"NONE"</constant>
+        <constant name="auxTempSensor1_adcChannel">"Disabled"</constant>
         <constant digits="1" name="auxTempSensor2_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="auxTempSensor2_tempC_2" units="*C">0.0</constant>
         <constant digits="1" name="auxTempSensor2_tempC_3" units="*C">0.0</constant>
@@ -917,7 +917,7 @@
         <constant digits="1" name="auxTempSensor2_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="auxTempSensor2_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="auxTempSensor2_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="auxTempSensor2_adcChannel">"NONE"</constant>
+        <constant name="auxTempSensor2_adcChannel">"Disabled"</constant>
         <constant digits="0" name="knockSamplingDuration" units="Deg">45.0</constant>
         <constant digits="0" name="etbFreq" units="Hz">800.0</constant>
         <constant digits="4" name="etbWastegatePid_pFactor" units="">1.0</constant>
@@ -989,7 +989,7 @@
          80.0
          100.0
 </constant>
-        <constant name="oilPressure_hwChannel">"NONE"</constant>
+        <constant name="oilPressure_hwChannel">"Disabled"</constant>
         <constant digits="2" name="oilPressure_v1" units="volts">0.5</constant>
         <constant digits="2" name="oilPressure_value1" units="">0.0</constant>
         <constant digits="2" name="oilPressure_v2" units="volts">4.5</constant>
@@ -1010,12 +1010,12 @@
         <constant digits="0" name="coastingFuelCutClt" units="C">60.0</constant>
         <constant digits="0" name="pidExtraForLowRpm" units="%">0.0</constant>
         <constant digits="0" name="coastingFuelCutMap" units="kPa">30.0</constant>
-        <constant name="highPressureFuel_hwChannel">"NONE"</constant>
+        <constant name="highPressureFuel_hwChannel">"Disabled"</constant>
         <constant digits="2" name="highPressureFuel_v1" units="volts">0.0</constant>
         <constant digits="2" name="highPressureFuel_value1" units="">0.0</constant>
         <constant digits="2" name="highPressureFuel_v2" units="volts">0.0</constant>
         <constant digits="2" name="highPressureFuel_value2" units="">0.0</constant>
-        <constant name="lowPressureFuel_hwChannel">"NONE"</constant>
+        <constant name="lowPressureFuel_hwChannel">"Disabled"</constant>
         <constant digits="2" name="lowPressureFuel_v1" units="volts">0.0</constant>
         <constant digits="2" name="lowPressureFuel_value1" units="">0.0</constant>
         <constant digits="2" name="lowPressureFuel_v2" units="volts">0.0</constant>
@@ -1351,12 +1351,12 @@
         <constant name="gearControllerMode">"None"</constant>
         <constant name="transmissionControllerMode">"None"</constant>
         <constant digits="0" name="acrDisablePhase" units="deg">0.0</constant>
-        <constant name="auxLinear1_hwChannel">"NONE"</constant>
+        <constant name="auxLinear1_hwChannel">"Disabled"</constant>
         <constant digits="2" name="auxLinear1_v1" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear1_value1" units="">0.0</constant>
         <constant digits="2" name="auxLinear1_v2" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear1_value2" units="">0.0</constant>
-        <constant name="auxLinear2_hwChannel">"NONE"</constant>
+        <constant name="auxLinear2_hwChannel">"Disabled"</constant>
         <constant digits="2" name="auxLinear2_v1" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear2_value1" units="">0.0</constant>
         <constant digits="2" name="auxLinear2_v2" units="volts">0.0</constant>
@@ -1490,7 +1490,7 @@
         <constant digits="1" name="oilTempSensor_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="oilTempSensor_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="oilTempSensor_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="oilTempSensor_adcChannel">"NONE"</constant>
+        <constant name="oilTempSensor_adcChannel">"Disabled"</constant>
         <constant digits="1" name="fuelTempSensor_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="fuelTempSensor_tempC_2" units="*C">0.0</constant>
         <constant digits="1" name="fuelTempSensor_tempC_3" units="*C">0.0</constant>
@@ -1498,7 +1498,7 @@
         <constant digits="1" name="fuelTempSensor_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="fuelTempSensor_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="fuelTempSensor_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="fuelTempSensor_adcChannel">"NONE"</constant>
+        <constant name="fuelTempSensor_adcChannel">"Disabled"</constant>
         <constant digits="1" name="ambientTempSensor_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="ambientTempSensor_tempC_2" units="*C">0.0</constant>
         <constant digits="1" name="ambientTempSensor_tempC_3" units="*C">0.0</constant>
@@ -1506,7 +1506,7 @@
         <constant digits="1" name="ambientTempSensor_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="ambientTempSensor_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="ambientTempSensor_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="ambientTempSensor_adcChannel">"NONE"</constant>
+        <constant name="ambientTempSensor_adcChannel">"Disabled"</constant>
         <constant digits="1" name="compressorDischargeTemperature_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="compressorDischargeTemperature_tempC_2" units="*C">0.0</constant>
         <constant digits="1" name="compressorDischargeTemperature_tempC_3" units="*C">0.0</constant>
@@ -1514,9 +1514,9 @@
         <constant digits="1" name="compressorDischargeTemperature_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="compressorDischargeTemperature_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="compressorDischargeTemperature_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="compressorDischargeTemperature_adcChannel">"NONE"</constant>
-        <constant name="throttleInletPressureChannel">"NONE"</constant>
-        <constant name="compressorDischargePressureChannel">"NONE"</constant>
+        <constant name="compressorDischargeTemperature_adcChannel">"Disabled"</constant>
+        <constant name="throttleInletPressureChannel">"Disabled"</constant>
+        <constant name="compressorDischargePressureChannel">"Disabled"</constant>
         <constant name="dacOutputPins1">"NONE"</constant>
         <constant name="dacOutputPins2">"NONE"</constant>
         <constant name="speedometerOutputPin">"NONE"</constant>
@@ -1525,7 +1525,7 @@
         <constant digits="0" name="simulatorCamPosition2" units="">0.0</constant>
         <constant digits="0" name="simulatorCamPosition3" units="">0.0</constant>
         <constant digits="0" name="simulatorCamPosition4" units="">0.0</constant>
-        <constant name="ignKeyAdcChannel">"NONE"</constant>
+        <constant name="ignKeyAdcChannel">"Disabled"</constant>
         <constant name="spi6MisoMode">"default"</constant>
         <constant digits="3" name="triggerVVTGapOverrideFrom1" units="ratio">0.0</constant>
         <constant digits="3" name="triggerVVTGapOverrideFrom2" units="ratio">0.0</constant>
@@ -1600,18 +1600,18 @@
         <constant digits="0" name="device_uid1" units="">0.0</constant>
         <constant digits="0" name="device_uid2" units="">0.0</constant>
         <constant digits="0" name="device_uid3" units="">0.0</constant>
-        <constant name="tcu_rangeAnalogInput1">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput2">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput3">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput4">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput5">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput6">"NONE"</constant>
+        <constant name="tcu_rangeAnalogInput1">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput2">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput3">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput4">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput5">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput6">"Disabled"</constant>
         <constant digits="1" name="tcu_rangeSensorBiasResistor" units="Ohm">0.0</constant>
         <constant name="msIoBox0_id">"Off"</constant>
         <constant name="msIoBox0_vss">"Off"</constant>
         <constant digits="2" name="mc33810Nomi" units="A">5.5</constant>
         <constant digits="0" name="mc33810Maxi" units="A">14.0</constant>
-        <constant name="acPressure_hwChannel">"NONE"</constant>
+        <constant name="acPressure_hwChannel">"Disabled"</constant>
         <constant digits="2" name="acPressure_v1" units="volts">0.0</constant>
         <constant digits="2" name="acPressure_value1" units="">0.0</constant>
         <constant digits="2" name="acPressure_v2" units="volts">0.0</constant>
@@ -1619,12 +1619,12 @@
         <constant digits="0" name="minAcPressure" units="kPa">100.0</constant>
         <constant digits="0" name="maxAcPressure" units="kPa">300.0</constant>
         <constant digits="1" name="minimumOilPressureTimeout" units="sec">0.5</constant>
-        <constant name="auxLinear3_hwChannel">"NONE"</constant>
+        <constant name="auxLinear3_hwChannel">"Disabled"</constant>
         <constant digits="2" name="auxLinear3_v1" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear3_value1" units="">0.0</constant>
         <constant digits="2" name="auxLinear3_v2" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear3_value2" units="">0.0</constant>
-        <constant name="auxLinear4_hwChannel">"NONE"</constant>
+        <constant name="auxLinear4_hwChannel">"Disabled"</constant>
         <constant digits="2" name="auxLinear4_v1" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear4_value1" units="">0.0</constant>
         <constant digits="2" name="auxLinear4_v2" units="volts">0.0</constant>
@@ -4762,7 +4762,7 @@ end</constant>
          0.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240830" nPages="1" signature="rusEFI main.2024.09.06.mega100.821184268" version="5.0"/>
+    <versionInfo firmwareInfo="20240830" nPages="1" signature="rusEFI main.2024.09.06.mega100.2965644658" version="5.0"/>
     <bibliography author="rusEFI 20240830" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/generated/simulator_tune_MAZDA_MIATA_NB1.msq b/generated/simulator_tune_MAZDA_MIATA_NB1.msq
index fd6e955..54ba604 100644
--- a/generated/simulator_tune_MAZDA_MIATA_NB1.msq
+++ b/generated/simulator_tune_MAZDA_MIATA_NB1.msq
@@ -157,7 +157,7 @@
         <constant digits="2" name="map_sensor_lowValue" units="kpa">0.0</constant>
         <constant digits="2" name="map_sensor_highValue" units="kpa">0.0</constant>
         <constant name="map_sensor_type">"MPX4250"</constant>
-        <constant name="map_sensor_hwChannel">"NONE"</constant>
+        <constant name="map_sensor_hwChannel">"Disabled"</constant>
         <constant digits="1" name="clt_tempC_1" units="*C">-20.0</constant>
         <constant digits="1" name="clt_tempC_2" units="*C">23.8889</constant>
         <constant digits="1" name="clt_tempC_3" units="*C">120.0</constant>
@@ -165,7 +165,7 @@
         <constant digits="1" name="clt_resistance_2" units="Ohm">2100.0</constant>
         <constant digits="1" name="clt_resistance_3" units="Ohm">100.0</constant>
         <constant digits="1" name="clt_bias_resistor" units="Ohm">2700.0</constant>
-        <constant name="clt_adcChannel">"NONE"</constant>
+        <constant name="clt_adcChannel">"Disabled"</constant>
         <constant digits="1" name="iat_tempC_1" units="*C">-20.0</constant>
         <constant digits="1" name="iat_tempC_2" units="*C">23.8889</constant>
         <constant digits="1" name="iat_tempC_3" units="*C">120.0</constant>
@@ -173,7 +173,7 @@
         <constant digits="1" name="iat_resistance_2" units="Ohm">2100.0</constant>
         <constant digits="1" name="iat_resistance_3" units="Ohm">100.0</constant>
         <constant digits="1" name="iat_bias_resistor" units="Ohm">2700.0</constant>
-        <constant name="iat_adcChannel">"NONE"</constant>
+        <constant name="iat_adcChannel">"Disabled"</constant>
         <constant digits="2" name="launchTimingRetard" units="deg">0.0</constant>
         <constant digits="0" name="hip9011PrescalerAndSDO" units="integer">0.0</constant>
         <constant digits="0" name="unusedFloatHere" units="">0.0</constant>
@@ -209,10 +209,10 @@
         <constant digits="1" name="driveWheelRevPerKm" units="revs/km">551.0</constant>
         <constant digits="2" name="canSleepPeriodMs" units="ms">50.0</constant>
         <constant digits="0" name="byFirmwareVersion" units="index">0.0</constant>
-        <constant name="tps1_1AdcChannel">"NONE"</constant>
-        <constant name="vbattAdcChannel">"NONE"</constant>
-        <constant name="fuelLevelSensor">"NONE"</constant>
-        <constant name="tps2_1AdcChannel">"NONE"</constant>
+        <constant name="tps1_1AdcChannel">"Disabled"</constant>
+        <constant name="vbattAdcChannel">"Disabled"</constant>
+        <constant name="fuelLevelSensor">"Disabled"</constant>
+        <constant name="tps2_1AdcChannel">"Disabled"</constant>
         <constant digits="4" name="idle_derivativeFilterLoss" units="x">0.08</constant>
         <constant digits="0" name="trailingSparkAngle" units="angle">10.0</constant>
         <constant name="trigger_type">"Miata NB"</constant>
@@ -221,7 +221,7 @@
         <constant digits="1" name="airByRpmTaper" units="%">0.0</constant>
         <constant name="hip9011SpiDevice">"Off"</constant>
         <constant digits="0" name="boostControlSafeDutyCycle" units="%">0.0</constant>
-        <constant name="mafAdcChannel">"NONE"</constant>
+        <constant name="mafAdcChannel">"Disabled"</constant>
         <constant digits="0" name="acrRevolutions" units="">5.0</constant>
         <constant digits="0" name="calibrationBirthday" units="">2.0240906E7</constant>
         <constant digits="3" name="adcVcc" units="volts">3.0</constant>
@@ -230,13 +230,13 @@
         <constant name="camInputs2">"NONE"</constant>
         <constant name="camInputs3">"NONE"</constant>
         <constant name="camInputs4">"NONE"</constant>
-        <constant name="afr_hwChannel">"NONE"</constant>
-        <constant name="afr_hwChannel2">"NONE"</constant>
+        <constant name="afr_hwChannel">"Disabled"</constant>
+        <constant name="afr_hwChannel2">"Disabled"</constant>
         <constant digits="2" name="afr_v1" units="volts">0.0</constant>
         <constant digits="2" name="afr_value1" units="AFR">9.996</constant>
         <constant digits="2" name="afr_v2" units="volts">5.0</constant>
         <constant digits="2" name="afr_value2" units="AFR">19.992</constant>
-        <constant name="throttlePedalPositionAdcChannel">"NONE"</constant>
+        <constant name="throttlePedalPositionAdcChannel">"Disabled"</constant>
         <constant digits="1" name="etbSplit" units="%">5.0</constant>
         <constant name="tle6240_cs">"NONE"</constant>
         <constant name="tle6240_csPinMode">"default"</constant>
@@ -245,7 +245,7 @@
         <constant digits="2" name="baroSensor_lowValue" units="kpa">0.0</constant>
         <constant digits="2" name="baroSensor_highValue" units="kpa">500.0</constant>
         <constant name="baroSensor_type">"Custom"</constant>
-        <constant name="baroSensor_hwChannel">"NONE"</constant>
+        <constant name="baroSensor_hwChannel">"Disabled"</constant>
         <constant digits="0" name="idle_solenoidFrequency" units="Hz">300.0</constant>
         <constant name="idle_solenoidPin">"NONE"</constant>
         <constant name="idle_stepperDirectionPin">"NONE"</constant>
@@ -308,10 +308,10 @@
         <constant name="brakePedalPinMode">"PULLUP"</constant>
         <constant name="mc33972_cs">"NONE"</constant>
         <constant name="mc33972_csPinMode">"default"</constant>
-        <constant name="auxFastSensor1_adcChannel">"NONE"</constant>
-        <constant name="tps1_2AdcChannel">"NONE"</constant>
-        <constant name="tps2_2AdcChannel">"NONE"</constant>
-        <constant name="throttlePedalPositionSecondAdcChannel">"NONE"</constant>
+        <constant name="auxFastSensor1_adcChannel">"Disabled"</constant>
+        <constant name="tps1_2AdcChannel">"Disabled"</constant>
+        <constant name="tps2_2AdcChannel">"Disabled"</constant>
+        <constant name="throttlePedalPositionSecondAdcChannel">"Disabled"</constant>
         <constant name="afr_type">"14Point7"</constant>
         <constant name="mc33810_cs1">"NONE"</constant>
         <constant digits="4" name="idle_antiwindupFreq" units="x">0.03</constant>
@@ -328,7 +328,7 @@
         <constant digits="3" name="fordInjectorSmallPulseSlope" units="g/s">0.0</constant>
         <constant name="triggerSimulatorPinModes1">"default"</constant>
         <constant name="triggerSimulatorPinModes2">"default"</constant>
-        <constant name="maf2AdcChannel">"NONE"</constant>
+        <constant name="maf2AdcChannel">"Disabled"</constant>
         <constant name="o2heaterPin">"NONE"</constant>
         <constant name="o2heaterPinModeTodO">"default"</constant>
         <constant digits="0" name="lambdaProtectionMinRpm" units="RPM">2500.0</constant>
@@ -405,7 +405,7 @@
         <constant digits="1" name="stoichRatioSecondary" units=":1">9.0</constant>
         <constant digits="0" name="etbMaximumPosition" units="%">100.0</constant>
         <constant digits="0" name="sdCardLogFrequency" units="hz">50.0</constant>
-        <constant name="idlePositionChannel">"NONE"</constant>
+        <constant name="idlePositionChannel">"Disabled"</constant>
         <constant digits="0" name="launchCorrectionsEndRpm" units="">0.0</constant>
         <constant name="starterRelayDisablePin">"NONE"</constant>
         <constant name="starterRelayDisablePinMode">"default"</constant>
@@ -639,9 +639,9 @@
         <constant name="launchActivateInverted">"false"</constant>
         <constant name="twoStroke">"Four Stroke"</constant>
         <constant name="skippedWheelOnCam">"On crankshaft"</constant>
-        <constant name="hipOutputChannel">"NONE"</constant>
+        <constant name="hipOutputChannel">"Disabled"</constant>
         <constant name="acSwitch">"NONE"</constant>
-        <constant name="vRefAdcChannel">"NONE"</constant>
+        <constant name="vRefAdcChannel">"Disabled"</constant>
         <constant digits="0" name="etbNeutralPosition" units="%">0.0</constant>
         <constant name="idleMode">"Open Loop + Closed Loop"</constant>
         <constant name="isInjectionEnabled">"true"</constant>
@@ -814,7 +814,7 @@
         <constant name="can2TxPin">"NONE"</constant>
         <constant name="can2RxPin">"NONE"</constant>
         <constant name="starterControlPinMode">"default"</constant>
-        <constant name="wastegatePositionSensor">"NONE"</constant>
+        <constant name="wastegatePositionSensor">"Disabled"</constant>
         <constant name="ignOverrideMode">"None"</constant>
         <constant name="injectorPressureType">"Low"</constant>
         <constant name="hpfpValvePin">"NONE"</constant>
@@ -860,7 +860,7 @@
         <constant digits="2" name="mapLowValueVoltage" units="v">0.0</constant>
         <constant digits="2" name="mapHighValueVoltage" units="v">5.0</constant>
         <constant digits="2" name="egoValueShift" units="value">0.0</constant>
-        <constant name="vvtPins1">"INVALID"</constant>
+        <constant name="vvtPins1">"PA0"</constant>
         <constant name="vvtPins2">"NONE"</constant>
         <constant name="vvtPins3">"NONE"</constant>
         <constant name="vvtPins4">"NONE"</constant>
@@ -877,14 +877,14 @@
         <constant name="vvtMode2">"Inactive"</constant>
         <constant digits="0" name="fan2ExtraIdle" units="%">2.0</constant>
         <constant digits="2" name="primingDelay" units="sec">0.5</constant>
-        <constant name="auxAnalogInputs1">"NONE"</constant>
-        <constant name="auxAnalogInputs2">"NONE"</constant>
-        <constant name="auxAnalogInputs3">"NONE"</constant>
-        <constant name="auxAnalogInputs4">"NONE"</constant>
-        <constant name="auxAnalogInputs5">"NONE"</constant>
-        <constant name="auxAnalogInputs6">"NONE"</constant>
-        <constant name="auxAnalogInputs7">"NONE"</constant>
-        <constant name="auxAnalogInputs8">"NONE"</constant>
+        <constant name="auxAnalogInputs1">"Disabled"</constant>
+        <constant name="auxAnalogInputs2">"Disabled"</constant>
+        <constant name="auxAnalogInputs3">"Disabled"</constant>
+        <constant name="auxAnalogInputs4">"Disabled"</constant>
+        <constant name="auxAnalogInputs5">"Disabled"</constant>
+        <constant name="auxAnalogInputs6">"Disabled"</constant>
+        <constant name="auxAnalogInputs7">"Disabled"</constant>
+        <constant name="auxAnalogInputs8">"Disabled"</constant>
         <constant name="trailingCoilPins1">"NONE"</constant>
         <constant name="trailingCoilPins2">"NONE"</constant>
         <constant name="trailingCoilPins3">"NONE"</constant>
@@ -909,7 +909,7 @@
         <constant digits="1" name="auxTempSensor1_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="auxTempSensor1_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="auxTempSensor1_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="auxTempSensor1_adcChannel">"NONE"</constant>
+        <constant name="auxTempSensor1_adcChannel">"Disabled"</constant>
         <constant digits="1" name="auxTempSensor2_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="auxTempSensor2_tempC_2" units="*C">0.0</constant>
         <constant digits="1" name="auxTempSensor2_tempC_3" units="*C">0.0</constant>
@@ -917,7 +917,7 @@
         <constant digits="1" name="auxTempSensor2_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="auxTempSensor2_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="auxTempSensor2_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="auxTempSensor2_adcChannel">"NONE"</constant>
+        <constant name="auxTempSensor2_adcChannel">"Disabled"</constant>
         <constant digits="0" name="knockSamplingDuration" units="Deg">45.0</constant>
         <constant digits="0" name="etbFreq" units="Hz">800.0</constant>
         <constant digits="4" name="etbWastegatePid_pFactor" units="">1.0</constant>
@@ -989,7 +989,7 @@
          80.0
          100.0
 </constant>
-        <constant name="oilPressure_hwChannel">"NONE"</constant>
+        <constant name="oilPressure_hwChannel">"Disabled"</constant>
         <constant digits="2" name="oilPressure_v1" units="volts">0.5</constant>
         <constant digits="2" name="oilPressure_value1" units="">0.0</constant>
         <constant digits="2" name="oilPressure_v2" units="volts">4.5</constant>
@@ -1010,12 +1010,12 @@
         <constant digits="0" name="coastingFuelCutClt" units="C">60.0</constant>
         <constant digits="0" name="pidExtraForLowRpm" units="%">0.0</constant>
         <constant digits="0" name="coastingFuelCutMap" units="kPa">30.0</constant>
-        <constant name="highPressureFuel_hwChannel">"NONE"</constant>
+        <constant name="highPressureFuel_hwChannel">"Disabled"</constant>
         <constant digits="2" name="highPressureFuel_v1" units="volts">0.0</constant>
         <constant digits="2" name="highPressureFuel_value1" units="">0.0</constant>
         <constant digits="2" name="highPressureFuel_v2" units="volts">0.0</constant>
         <constant digits="2" name="highPressureFuel_value2" units="">0.0</constant>
-        <constant name="lowPressureFuel_hwChannel">"NONE"</constant>
+        <constant name="lowPressureFuel_hwChannel">"Disabled"</constant>
         <constant digits="2" name="lowPressureFuel_v1" units="volts">0.0</constant>
         <constant digits="2" name="lowPressureFuel_value1" units="">0.0</constant>
         <constant digits="2" name="lowPressureFuel_v2" units="volts">0.0</constant>
@@ -1351,12 +1351,12 @@
         <constant name="gearControllerMode">"None"</constant>
         <constant name="transmissionControllerMode">"None"</constant>
         <constant digits="0" name="acrDisablePhase" units="deg">0.0</constant>
-        <constant name="auxLinear1_hwChannel">"NONE"</constant>
+        <constant name="auxLinear1_hwChannel">"Disabled"</constant>
         <constant digits="2" name="auxLinear1_v1" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear1_value1" units="">0.0</constant>
         <constant digits="2" name="auxLinear1_v2" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear1_value2" units="">0.0</constant>
-        <constant name="auxLinear2_hwChannel">"NONE"</constant>
+        <constant name="auxLinear2_hwChannel">"Disabled"</constant>
         <constant digits="2" name="auxLinear2_v1" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear2_value1" units="">0.0</constant>
         <constant digits="2" name="auxLinear2_v2" units="volts">0.0</constant>
@@ -1490,7 +1490,7 @@
         <constant digits="1" name="oilTempSensor_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="oilTempSensor_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="oilTempSensor_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="oilTempSensor_adcChannel">"NONE"</constant>
+        <constant name="oilTempSensor_adcChannel">"Disabled"</constant>
         <constant digits="1" name="fuelTempSensor_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="fuelTempSensor_tempC_2" units="*C">0.0</constant>
         <constant digits="1" name="fuelTempSensor_tempC_3" units="*C">0.0</constant>
@@ -1498,7 +1498,7 @@
         <constant digits="1" name="fuelTempSensor_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="fuelTempSensor_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="fuelTempSensor_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="fuelTempSensor_adcChannel">"NONE"</constant>
+        <constant name="fuelTempSensor_adcChannel">"Disabled"</constant>
         <constant digits="1" name="ambientTempSensor_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="ambientTempSensor_tempC_2" units="*C">0.0</constant>
         <constant digits="1" name="ambientTempSensor_tempC_3" units="*C">0.0</constant>
@@ -1506,7 +1506,7 @@
         <constant digits="1" name="ambientTempSensor_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="ambientTempSensor_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="ambientTempSensor_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="ambientTempSensor_adcChannel">"NONE"</constant>
+        <constant name="ambientTempSensor_adcChannel">"Disabled"</constant>
         <constant digits="1" name="compressorDischargeTemperature_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="compressorDischargeTemperature_tempC_2" units="*C">0.0</constant>
         <constant digits="1" name="compressorDischargeTemperature_tempC_3" units="*C">0.0</constant>
@@ -1514,9 +1514,9 @@
         <constant digits="1" name="compressorDischargeTemperature_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="compressorDischargeTemperature_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="compressorDischargeTemperature_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="compressorDischargeTemperature_adcChannel">"NONE"</constant>
-        <constant name="throttleInletPressureChannel">"NONE"</constant>
-        <constant name="compressorDischargePressureChannel">"NONE"</constant>
+        <constant name="compressorDischargeTemperature_adcChannel">"Disabled"</constant>
+        <constant name="throttleInletPressureChannel">"Disabled"</constant>
+        <constant name="compressorDischargePressureChannel">"Disabled"</constant>
         <constant name="dacOutputPins1">"NONE"</constant>
         <constant name="dacOutputPins2">"NONE"</constant>
         <constant name="speedometerOutputPin">"NONE"</constant>
@@ -1525,7 +1525,7 @@
         <constant digits="0" name="simulatorCamPosition2" units="">0.0</constant>
         <constant digits="0" name="simulatorCamPosition3" units="">0.0</constant>
         <constant digits="0" name="simulatorCamPosition4" units="">0.0</constant>
-        <constant name="ignKeyAdcChannel">"NONE"</constant>
+        <constant name="ignKeyAdcChannel">"Disabled"</constant>
         <constant name="spi6MisoMode">"default"</constant>
         <constant digits="3" name="triggerVVTGapOverrideFrom1" units="ratio">0.0</constant>
         <constant digits="3" name="triggerVVTGapOverrideFrom2" units="ratio">0.0</constant>
@@ -1600,18 +1600,18 @@
         <constant digits="0" name="device_uid1" units="">0.0</constant>
         <constant digits="0" name="device_uid2" units="">0.0</constant>
         <constant digits="0" name="device_uid3" units="">0.0</constant>
-        <constant name="tcu_rangeAnalogInput1">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput2">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput3">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput4">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput5">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput6">"NONE"</constant>
+        <constant name="tcu_rangeAnalogInput1">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput2">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput3">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput4">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput5">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput6">"Disabled"</constant>
         <constant digits="1" name="tcu_rangeSensorBiasResistor" units="Ohm">0.0</constant>
         <constant name="msIoBox0_id">"Off"</constant>
         <constant name="msIoBox0_vss">"Off"</constant>
         <constant digits="2" name="mc33810Nomi" units="A">5.5</constant>
         <constant digits="0" name="mc33810Maxi" units="A">14.0</constant>
-        <constant name="acPressure_hwChannel">"NONE"</constant>
+        <constant name="acPressure_hwChannel">"Disabled"</constant>
         <constant digits="2" name="acPressure_v1" units="volts">0.0</constant>
         <constant digits="2" name="acPressure_value1" units="">0.0</constant>
         <constant digits="2" name="acPressure_v2" units="volts">0.0</constant>
@@ -1619,12 +1619,12 @@
         <constant digits="0" name="minAcPressure" units="kPa">100.0</constant>
         <constant digits="0" name="maxAcPressure" units="kPa">300.0</constant>
         <constant digits="1" name="minimumOilPressureTimeout" units="sec">0.5</constant>
-        <constant name="auxLinear3_hwChannel">"NONE"</constant>
+        <constant name="auxLinear3_hwChannel">"Disabled"</constant>
         <constant digits="2" name="auxLinear3_v1" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear3_value1" units="">0.0</constant>
         <constant digits="2" name="auxLinear3_v2" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear3_value2" units="">0.0</constant>
-        <constant name="auxLinear4_hwChannel">"NONE"</constant>
+        <constant name="auxLinear4_hwChannel">"Disabled"</constant>
         <constant digits="2" name="auxLinear4_v1" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear4_value1" units="">0.0</constant>
         <constant digits="2" name="auxLinear4_v2" units="volts">0.0</constant>
@@ -4762,7 +4762,7 @@ end</constant>
          0.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240830" nPages="1" signature="rusEFI main.2024.09.06.mega100.821184268" version="5.0"/>
+    <versionInfo firmwareInfo="20240830" nPages="1" signature="rusEFI main.2024.09.06.mega100.2965644658" version="5.0"/>
     <bibliography author="rusEFI 20240830" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/generated/simulator_tune_MAZDA_MIATA_NB2.msq b/generated/simulator_tune_MAZDA_MIATA_NB2.msq
index c3758eb..38509ab 100644
--- a/generated/simulator_tune_MAZDA_MIATA_NB2.msq
+++ b/generated/simulator_tune_MAZDA_MIATA_NB2.msq
@@ -157,7 +157,7 @@
         <constant digits="2" name="map_sensor_lowValue" units="kpa">0.0</constant>
         <constant digits="2" name="map_sensor_highValue" units="kpa">0.0</constant>
         <constant name="map_sensor_type">"MPX4250"</constant>
-        <constant name="map_sensor_hwChannel">"NONE"</constant>
+        <constant name="map_sensor_hwChannel">"Disabled"</constant>
         <constant digits="1" name="clt_tempC_1" units="*C">-20.0</constant>
         <constant digits="1" name="clt_tempC_2" units="*C">23.8889</constant>
         <constant digits="1" name="clt_tempC_3" units="*C">120.0</constant>
@@ -165,7 +165,7 @@
         <constant digits="1" name="clt_resistance_2" units="Ohm">2100.0</constant>
         <constant digits="1" name="clt_resistance_3" units="Ohm">100.0</constant>
         <constant digits="1" name="clt_bias_resistor" units="Ohm">2700.0</constant>
-        <constant name="clt_adcChannel">"NONE"</constant>
+        <constant name="clt_adcChannel">"Disabled"</constant>
         <constant digits="1" name="iat_tempC_1" units="*C">-20.0</constant>
         <constant digits="1" name="iat_tempC_2" units="*C">23.8889</constant>
         <constant digits="1" name="iat_tempC_3" units="*C">120.0</constant>
@@ -173,7 +173,7 @@
         <constant digits="1" name="iat_resistance_2" units="Ohm">2100.0</constant>
         <constant digits="1" name="iat_resistance_3" units="Ohm">100.0</constant>
         <constant digits="1" name="iat_bias_resistor" units="Ohm">2700.0</constant>
-        <constant name="iat_adcChannel">"NONE"</constant>
+        <constant name="iat_adcChannel">"Disabled"</constant>
         <constant digits="2" name="launchTimingRetard" units="deg">0.0</constant>
         <constant digits="0" name="hip9011PrescalerAndSDO" units="integer">0.0</constant>
         <constant digits="0" name="unusedFloatHere" units="">0.0</constant>
@@ -209,10 +209,10 @@
         <constant digits="1" name="driveWheelRevPerKm" units="revs/km">538.0</constant>
         <constant digits="2" name="canSleepPeriodMs" units="ms">50.0</constant>
         <constant digits="0" name="byFirmwareVersion" units="index">0.0</constant>
-        <constant name="tps1_1AdcChannel">"NONE"</constant>
-        <constant name="vbattAdcChannel">"NONE"</constant>
-        <constant name="fuelLevelSensor">"NONE"</constant>
-        <constant name="tps2_1AdcChannel">"NONE"</constant>
+        <constant name="tps1_1AdcChannel">"Disabled"</constant>
+        <constant name="vbattAdcChannel">"Disabled"</constant>
+        <constant name="fuelLevelSensor">"Disabled"</constant>
+        <constant name="tps2_1AdcChannel">"Disabled"</constant>
         <constant digits="4" name="idle_derivativeFilterLoss" units="x">0.08</constant>
         <constant digits="0" name="trailingSparkAngle" units="angle">10.0</constant>
         <constant name="trigger_type">"Miata NB"</constant>
@@ -221,7 +221,7 @@
         <constant digits="1" name="airByRpmTaper" units="%">0.0</constant>
         <constant name="hip9011SpiDevice">"Off"</constant>
         <constant digits="0" name="boostControlSafeDutyCycle" units="%">0.0</constant>
-        <constant name="mafAdcChannel">"NONE"</constant>
+        <constant name="mafAdcChannel">"Disabled"</constant>
         <constant digits="0" name="acrRevolutions" units="">5.0</constant>
         <constant digits="0" name="calibrationBirthday" units="">2.0240906E7</constant>
         <constant digits="3" name="adcVcc" units="volts">3.0</constant>
@@ -230,13 +230,13 @@
         <constant name="camInputs2">"NONE"</constant>
         <constant name="camInputs3">"NONE"</constant>
         <constant name="camInputs4">"NONE"</constant>
-        <constant name="afr_hwChannel">"NONE"</constant>
-        <constant name="afr_hwChannel2">"NONE"</constant>
+        <constant name="afr_hwChannel">"Disabled"</constant>
+        <constant name="afr_hwChannel2">"Disabled"</constant>
         <constant digits="2" name="afr_v1" units="volts">0.0</constant>
         <constant digits="2" name="afr_value1" units="AFR">9.996</constant>
         <constant digits="2" name="afr_v2" units="volts">5.0</constant>
         <constant digits="2" name="afr_value2" units="AFR">19.992</constant>
-        <constant name="throttlePedalPositionAdcChannel">"NONE"</constant>
+        <constant name="throttlePedalPositionAdcChannel">"Disabled"</constant>
         <constant digits="1" name="etbSplit" units="%">5.0</constant>
         <constant name="tle6240_cs">"NONE"</constant>
         <constant name="tle6240_csPinMode">"default"</constant>
@@ -245,7 +245,7 @@
         <constant digits="2" name="baroSensor_lowValue" units="kpa">0.0</constant>
         <constant digits="2" name="baroSensor_highValue" units="kpa">500.0</constant>
         <constant name="baroSensor_type">"Custom"</constant>
-        <constant name="baroSensor_hwChannel">"NONE"</constant>
+        <constant name="baroSensor_hwChannel">"Disabled"</constant>
         <constant digits="0" name="idle_solenoidFrequency" units="Hz">300.0</constant>
         <constant name="idle_solenoidPin">"NONE"</constant>
         <constant name="idle_stepperDirectionPin">"NONE"</constant>
@@ -308,10 +308,10 @@
         <constant name="brakePedalPinMode">"PULLUP"</constant>
         <constant name="mc33972_cs">"NONE"</constant>
         <constant name="mc33972_csPinMode">"default"</constant>
-        <constant name="auxFastSensor1_adcChannel">"NONE"</constant>
-        <constant name="tps1_2AdcChannel">"NONE"</constant>
-        <constant name="tps2_2AdcChannel">"NONE"</constant>
-        <constant name="throttlePedalPositionSecondAdcChannel">"NONE"</constant>
+        <constant name="auxFastSensor1_adcChannel">"Disabled"</constant>
+        <constant name="tps1_2AdcChannel">"Disabled"</constant>
+        <constant name="tps2_2AdcChannel">"Disabled"</constant>
+        <constant name="throttlePedalPositionSecondAdcChannel">"Disabled"</constant>
         <constant name="afr_type">"14Point7"</constant>
         <constant name="mc33810_cs1">"NONE"</constant>
         <constant digits="4" name="idle_antiwindupFreq" units="x">0.03</constant>
@@ -328,7 +328,7 @@
         <constant digits="3" name="fordInjectorSmallPulseSlope" units="g/s">0.0</constant>
         <constant name="triggerSimulatorPinModes1">"default"</constant>
         <constant name="triggerSimulatorPinModes2">"default"</constant>
-        <constant name="maf2AdcChannel">"NONE"</constant>
+        <constant name="maf2AdcChannel">"Disabled"</constant>
         <constant name="o2heaterPin">"NONE"</constant>
         <constant name="o2heaterPinModeTodO">"default"</constant>
         <constant digits="0" name="lambdaProtectionMinRpm" units="RPM">2500.0</constant>
@@ -405,7 +405,7 @@
         <constant digits="1" name="stoichRatioSecondary" units=":1">9.0</constant>
         <constant digits="0" name="etbMaximumPosition" units="%">100.0</constant>
         <constant digits="0" name="sdCardLogFrequency" units="hz">50.0</constant>
-        <constant name="idlePositionChannel">"NONE"</constant>
+        <constant name="idlePositionChannel">"Disabled"</constant>
         <constant digits="0" name="launchCorrectionsEndRpm" units="">0.0</constant>
         <constant name="starterRelayDisablePin">"NONE"</constant>
         <constant name="starterRelayDisablePinMode">"default"</constant>
@@ -640,9 +640,9 @@
         <constant name="launchActivateInverted">"false"</constant>
         <constant name="twoStroke">"Four Stroke"</constant>
         <constant name="skippedWheelOnCam">"On crankshaft"</constant>
-        <constant name="hipOutputChannel">"NONE"</constant>
+        <constant name="hipOutputChannel">"Disabled"</constant>
         <constant name="acSwitch">"NONE"</constant>
-        <constant name="vRefAdcChannel">"NONE"</constant>
+        <constant name="vRefAdcChannel">"Disabled"</constant>
         <constant digits="0" name="etbNeutralPosition" units="%">0.0</constant>
         <constant name="idleMode">"Open Loop + Closed Loop"</constant>
         <constant name="isInjectionEnabled">"true"</constant>
@@ -815,7 +815,7 @@
         <constant name="can2TxPin">"NONE"</constant>
         <constant name="can2RxPin">"NONE"</constant>
         <constant name="starterControlPinMode">"default"</constant>
-        <constant name="wastegatePositionSensor">"NONE"</constant>
+        <constant name="wastegatePositionSensor">"Disabled"</constant>
         <constant name="ignOverrideMode">"None"</constant>
         <constant name="injectorPressureType">"Low"</constant>
         <constant name="hpfpValvePin">"NONE"</constant>
@@ -861,7 +861,7 @@
         <constant digits="2" name="mapLowValueVoltage" units="v">0.0</constant>
         <constant digits="2" name="mapHighValueVoltage" units="v">5.0</constant>
         <constant digits="2" name="egoValueShift" units="value">0.0</constant>
-        <constant name="vvtPins1">"INVALID"</constant>
+        <constant name="vvtPins1">"PA0"</constant>
         <constant name="vvtPins2">"NONE"</constant>
         <constant name="vvtPins3">"NONE"</constant>
         <constant name="vvtPins4">"NONE"</constant>
@@ -878,14 +878,14 @@
         <constant name="vvtMode2">"Inactive"</constant>
         <constant digits="0" name="fan2ExtraIdle" units="%">2.0</constant>
         <constant digits="2" name="primingDelay" units="sec">0.5</constant>
-        <constant name="auxAnalogInputs1">"NONE"</constant>
-        <constant name="auxAnalogInputs2">"NONE"</constant>
-        <constant name="auxAnalogInputs3">"NONE"</constant>
-        <constant name="auxAnalogInputs4">"NONE"</constant>
-        <constant name="auxAnalogInputs5">"NONE"</constant>
-        <constant name="auxAnalogInputs6">"NONE"</constant>
-        <constant name="auxAnalogInputs7">"NONE"</constant>
-        <constant name="auxAnalogInputs8">"NONE"</constant>
+        <constant name="auxAnalogInputs1">"Disabled"</constant>
+        <constant name="auxAnalogInputs2">"Disabled"</constant>
+        <constant name="auxAnalogInputs3">"Disabled"</constant>
+        <constant name="auxAnalogInputs4">"Disabled"</constant>
+        <constant name="auxAnalogInputs5">"Disabled"</constant>
+        <constant name="auxAnalogInputs6">"Disabled"</constant>
+        <constant name="auxAnalogInputs7">"Disabled"</constant>
+        <constant name="auxAnalogInputs8">"Disabled"</constant>
         <constant name="trailingCoilPins1">"NONE"</constant>
         <constant name="trailingCoilPins2">"NONE"</constant>
         <constant name="trailingCoilPins3">"NONE"</constant>
@@ -910,7 +910,7 @@
         <constant digits="1" name="auxTempSensor1_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="auxTempSensor1_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="auxTempSensor1_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="auxTempSensor1_adcChannel">"NONE"</constant>
+        <constant name="auxTempSensor1_adcChannel">"Disabled"</constant>
         <constant digits="1" name="auxTempSensor2_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="auxTempSensor2_tempC_2" units="*C">0.0</constant>
         <constant digits="1" name="auxTempSensor2_tempC_3" units="*C">0.0</constant>
@@ -918,7 +918,7 @@
         <constant digits="1" name="auxTempSensor2_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="auxTempSensor2_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="auxTempSensor2_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="auxTempSensor2_adcChannel">"NONE"</constant>
+        <constant name="auxTempSensor2_adcChannel">"Disabled"</constant>
         <constant digits="0" name="knockSamplingDuration" units="Deg">45.0</constant>
         <constant digits="0" name="etbFreq" units="Hz">800.0</constant>
         <constant digits="4" name="etbWastegatePid_pFactor" units="">1.0</constant>
@@ -990,7 +990,7 @@
          80.0
          100.0
 </constant>
-        <constant name="oilPressure_hwChannel">"NONE"</constant>
+        <constant name="oilPressure_hwChannel">"Disabled"</constant>
         <constant digits="2" name="oilPressure_v1" units="volts">0.5</constant>
         <constant digits="2" name="oilPressure_value1" units="">0.0</constant>
         <constant digits="2" name="oilPressure_v2" units="volts">4.5</constant>
@@ -1011,12 +1011,12 @@
         <constant digits="0" name="coastingFuelCutClt" units="C">60.0</constant>
         <constant digits="0" name="pidExtraForLowRpm" units="%">0.0</constant>
         <constant digits="0" name="coastingFuelCutMap" units="kPa">30.0</constant>
-        <constant name="highPressureFuel_hwChannel">"NONE"</constant>
+        <constant name="highPressureFuel_hwChannel">"Disabled"</constant>
         <constant digits="2" name="highPressureFuel_v1" units="volts">0.0</constant>
         <constant digits="2" name="highPressureFuel_value1" units="">0.0</constant>
         <constant digits="2" name="highPressureFuel_v2" units="volts">0.0</constant>
         <constant digits="2" name="highPressureFuel_value2" units="">0.0</constant>
-        <constant name="lowPressureFuel_hwChannel">"NONE"</constant>
+        <constant name="lowPressureFuel_hwChannel">"Disabled"</constant>
         <constant digits="2" name="lowPressureFuel_v1" units="volts">0.0</constant>
         <constant digits="2" name="lowPressureFuel_value1" units="">0.0</constant>
         <constant digits="2" name="lowPressureFuel_v2" units="volts">0.0</constant>
@@ -1352,12 +1352,12 @@
         <constant name="gearControllerMode">"None"</constant>
         <constant name="transmissionControllerMode">"None"</constant>
         <constant digits="0" name="acrDisablePhase" units="deg">0.0</constant>
-        <constant name="auxLinear1_hwChannel">"NONE"</constant>
+        <constant name="auxLinear1_hwChannel">"Disabled"</constant>
         <constant digits="2" name="auxLinear1_v1" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear1_value1" units="">0.0</constant>
         <constant digits="2" name="auxLinear1_v2" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear1_value2" units="">0.0</constant>
-        <constant name="auxLinear2_hwChannel">"NONE"</constant>
+        <constant name="auxLinear2_hwChannel">"Disabled"</constant>
         <constant digits="2" name="auxLinear2_v1" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear2_value1" units="">0.0</constant>
         <constant digits="2" name="auxLinear2_v2" units="volts">0.0</constant>
@@ -1491,7 +1491,7 @@
         <constant digits="1" name="oilTempSensor_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="oilTempSensor_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="oilTempSensor_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="oilTempSensor_adcChannel">"NONE"</constant>
+        <constant name="oilTempSensor_adcChannel">"Disabled"</constant>
         <constant digits="1" name="fuelTempSensor_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="fuelTempSensor_tempC_2" units="*C">0.0</constant>
         <constant digits="1" name="fuelTempSensor_tempC_3" units="*C">0.0</constant>
@@ -1499,7 +1499,7 @@
         <constant digits="1" name="fuelTempSensor_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="fuelTempSensor_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="fuelTempSensor_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="fuelTempSensor_adcChannel">"NONE"</constant>
+        <constant name="fuelTempSensor_adcChannel">"Disabled"</constant>
         <constant digits="1" name="ambientTempSensor_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="ambientTempSensor_tempC_2" units="*C">0.0</constant>
         <constant digits="1" name="ambientTempSensor_tempC_3" units="*C">0.0</constant>
@@ -1507,7 +1507,7 @@
         <constant digits="1" name="ambientTempSensor_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="ambientTempSensor_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="ambientTempSensor_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="ambientTempSensor_adcChannel">"NONE"</constant>
+        <constant name="ambientTempSensor_adcChannel">"Disabled"</constant>
         <constant digits="1" name="compressorDischargeTemperature_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="compressorDischargeTemperature_tempC_2" units="*C">0.0</constant>
         <constant digits="1" name="compressorDischargeTemperature_tempC_3" units="*C">0.0</constant>
@@ -1515,9 +1515,9 @@
         <constant digits="1" name="compressorDischargeTemperature_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="compressorDischargeTemperature_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="compressorDischargeTemperature_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="compressorDischargeTemperature_adcChannel">"NONE"</constant>
-        <constant name="throttleInletPressureChannel">"NONE"</constant>
-        <constant name="compressorDischargePressureChannel">"NONE"</constant>
+        <constant name="compressorDischargeTemperature_adcChannel">"Disabled"</constant>
+        <constant name="throttleInletPressureChannel">"Disabled"</constant>
+        <constant name="compressorDischargePressureChannel">"Disabled"</constant>
         <constant name="dacOutputPins1">"NONE"</constant>
         <constant name="dacOutputPins2">"NONE"</constant>
         <constant name="speedometerOutputPin">"NONE"</constant>
@@ -1526,7 +1526,7 @@
         <constant digits="0" name="simulatorCamPosition2" units="">0.0</constant>
         <constant digits="0" name="simulatorCamPosition3" units="">0.0</constant>
         <constant digits="0" name="simulatorCamPosition4" units="">0.0</constant>
-        <constant name="ignKeyAdcChannel">"NONE"</constant>
+        <constant name="ignKeyAdcChannel">"Disabled"</constant>
         <constant name="spi6MisoMode">"default"</constant>
         <constant digits="3" name="triggerVVTGapOverrideFrom1" units="ratio">0.0</constant>
         <constant digits="3" name="triggerVVTGapOverrideFrom2" units="ratio">0.0</constant>
@@ -1601,18 +1601,18 @@
         <constant digits="0" name="device_uid1" units="">0.0</constant>
         <constant digits="0" name="device_uid2" units="">0.0</constant>
         <constant digits="0" name="device_uid3" units="">0.0</constant>
-        <constant name="tcu_rangeAnalogInput1">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput2">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput3">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput4">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput5">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput6">"NONE"</constant>
+        <constant name="tcu_rangeAnalogInput1">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput2">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput3">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput4">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput5">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput6">"Disabled"</constant>
         <constant digits="1" name="tcu_rangeSensorBiasResistor" units="Ohm">0.0</constant>
         <constant name="msIoBox0_id">"Off"</constant>
         <constant name="msIoBox0_vss">"Off"</constant>
         <constant digits="2" name="mc33810Nomi" units="A">5.5</constant>
         <constant digits="0" name="mc33810Maxi" units="A">14.0</constant>
-        <constant name="acPressure_hwChannel">"NONE"</constant>
+        <constant name="acPressure_hwChannel">"Disabled"</constant>
         <constant digits="2" name="acPressure_v1" units="volts">0.0</constant>
         <constant digits="2" name="acPressure_value1" units="">0.0</constant>
         <constant digits="2" name="acPressure_v2" units="volts">0.0</constant>
@@ -1620,12 +1620,12 @@
         <constant digits="0" name="minAcPressure" units="kPa">100.0</constant>
         <constant digits="0" name="maxAcPressure" units="kPa">300.0</constant>
         <constant digits="1" name="minimumOilPressureTimeout" units="sec">0.5</constant>
-        <constant name="auxLinear3_hwChannel">"NONE"</constant>
+        <constant name="auxLinear3_hwChannel">"Disabled"</constant>
         <constant digits="2" name="auxLinear3_v1" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear3_value1" units="">0.0</constant>
         <constant digits="2" name="auxLinear3_v2" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear3_value2" units="">0.0</constant>
-        <constant name="auxLinear4_hwChannel">"NONE"</constant>
+        <constant name="auxLinear4_hwChannel">"Disabled"</constant>
         <constant digits="2" name="auxLinear4_v1" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear4_value1" units="">0.0</constant>
         <constant digits="2" name="auxLinear4_v2" units="volts">0.0</constant>
@@ -4763,7 +4763,7 @@ end</constant>
          0.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240830" nPages="1" signature="rusEFI main.2024.09.06.mega100.821184268" version="5.0"/>
+    <versionInfo firmwareInfo="20240830" nPages="1" signature="rusEFI main.2024.09.06.mega100.2965644658" version="5.0"/>
     <bibliography author="rusEFI 20240830" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/generated/simulator_tune_MERCEDES_M111.msq b/generated/simulator_tune_MERCEDES_M111.msq
index c809924..613c788 100644
--- a/generated/simulator_tune_MERCEDES_M111.msq
+++ b/generated/simulator_tune_MERCEDES_M111.msq
@@ -157,7 +157,7 @@
         <constant digits="2" name="map_sensor_lowValue" units="kpa">20.0</constant>
         <constant digits="2" name="map_sensor_highValue" units="kpa">250.0</constant>
         <constant name="map_sensor_type">"Custom"</constant>
-        <constant name="map_sensor_hwChannel">"NONE"</constant>
+        <constant name="map_sensor_hwChannel">"Disabled"</constant>
         <constant digits="1" name="clt_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="clt_tempC_2" units="*C">30.0</constant>
         <constant digits="1" name="clt_tempC_3" units="*C">50.0</constant>
@@ -165,7 +165,7 @@
         <constant digits="1" name="clt_resistance_2" units="Ohm">1750.0</constant>
         <constant digits="1" name="clt_resistance_3" units="Ohm">750.0</constant>
         <constant digits="1" name="clt_bias_resistor" units="Ohm">1500.0</constant>
-        <constant name="clt_adcChannel">"NONE"</constant>
+        <constant name="clt_adcChannel">"Disabled"</constant>
         <constant digits="1" name="iat_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="iat_tempC_2" units="*C">22.0</constant>
         <constant digits="1" name="iat_tempC_3" units="*C">100.0</constant>
@@ -173,7 +173,7 @@
         <constant digits="1" name="iat_resistance_2" units="Ohm">2180.0</constant>
         <constant digits="1" name="iat_resistance_3" units="Ohm">180.0</constant>
         <constant digits="1" name="iat_bias_resistor" units="Ohm">2700.0</constant>
-        <constant name="iat_adcChannel">"NONE"</constant>
+        <constant name="iat_adcChannel">"Disabled"</constant>
         <constant digits="2" name="launchTimingRetard" units="deg">0.0</constant>
         <constant digits="0" name="hip9011PrescalerAndSDO" units="integer">0.0</constant>
         <constant digits="0" name="unusedFloatHere" units="">0.0</constant>
@@ -209,10 +209,10 @@
         <constant digits="1" name="driveWheelRevPerKm" units="revs/km">1000.0</constant>
         <constant digits="2" name="canSleepPeriodMs" units="ms">50.0</constant>
         <constant digits="0" name="byFirmwareVersion" units="index">0.0</constant>
-        <constant name="tps1_1AdcChannel">"NONE"</constant>
-        <constant name="vbattAdcChannel">"NONE"</constant>
-        <constant name="fuelLevelSensor">"NONE"</constant>
-        <constant name="tps2_1AdcChannel">"NONE"</constant>
+        <constant name="tps1_1AdcChannel">"Disabled"</constant>
+        <constant name="vbattAdcChannel">"Disabled"</constant>
+        <constant name="fuelLevelSensor">"Disabled"</constant>
+        <constant name="tps2_1AdcChannel">"Disabled"</constant>
         <constant digits="4" name="idle_derivativeFilterLoss" units="x">0.0</constant>
         <constant digits="0" name="trailingSparkAngle" units="angle">10.0</constant>
         <constant name="trigger_type">"60-2"</constant>
@@ -221,7 +221,7 @@
         <constant digits="1" name="airByRpmTaper" units="%">0.0</constant>
         <constant name="hip9011SpiDevice">"Off"</constant>
         <constant digits="0" name="boostControlSafeDutyCycle" units="%">0.0</constant>
-        <constant name="mafAdcChannel">"NONE"</constant>
+        <constant name="mafAdcChannel">"Disabled"</constant>
         <constant digits="0" name="acrRevolutions" units="">5.0</constant>
         <constant digits="0" name="calibrationBirthday" units="">2.0240906E7</constant>
         <constant digits="3" name="adcVcc" units="volts">3.0</constant>
@@ -230,13 +230,13 @@
         <constant name="camInputs2">"NONE"</constant>
         <constant name="camInputs3">"NONE"</constant>
         <constant name="camInputs4">"NONE"</constant>
-        <constant name="afr_hwChannel">"NONE"</constant>
-        <constant name="afr_hwChannel2">"NONE"</constant>
+        <constant name="afr_hwChannel">"Disabled"</constant>
+        <constant name="afr_hwChannel2">"Disabled"</constant>
         <constant digits="2" name="afr_v1" units="volts">0.0</constant>
         <constant digits="2" name="afr_value1" units="AFR">9.996</constant>
         <constant digits="2" name="afr_v2" units="volts">5.0</constant>
         <constant digits="2" name="afr_value2" units="AFR">19.992</constant>
-        <constant name="throttlePedalPositionAdcChannel">"NONE"</constant>
+        <constant name="throttlePedalPositionAdcChannel">"Disabled"</constant>
         <constant digits="1" name="etbSplit" units="%">5.0</constant>
         <constant name="tle6240_cs">"NONE"</constant>
         <constant name="tle6240_csPinMode">"default"</constant>
@@ -245,7 +245,7 @@
         <constant digits="2" name="baroSensor_lowValue" units="kpa">0.0</constant>
         <constant digits="2" name="baroSensor_highValue" units="kpa">500.0</constant>
         <constant name="baroSensor_type">"Custom"</constant>
-        <constant name="baroSensor_hwChannel">"NONE"</constant>
+        <constant name="baroSensor_hwChannel">"Disabled"</constant>
         <constant digits="0" name="idle_solenoidFrequency" units="Hz">300.0</constant>
         <constant name="idle_solenoidPin">"NONE"</constant>
         <constant name="idle_stepperDirectionPin">"NONE"</constant>
@@ -308,10 +308,10 @@
         <constant name="brakePedalPinMode">"PULLUP"</constant>
         <constant name="mc33972_cs">"NONE"</constant>
         <constant name="mc33972_csPinMode">"default"</constant>
-        <constant name="auxFastSensor1_adcChannel">"NONE"</constant>
-        <constant name="tps1_2AdcChannel">"NONE"</constant>
-        <constant name="tps2_2AdcChannel">"NONE"</constant>
-        <constant name="throttlePedalPositionSecondAdcChannel">"NONE"</constant>
+        <constant name="auxFastSensor1_adcChannel">"Disabled"</constant>
+        <constant name="tps1_2AdcChannel">"Disabled"</constant>
+        <constant name="tps2_2AdcChannel">"Disabled"</constant>
+        <constant name="throttlePedalPositionSecondAdcChannel">"Disabled"</constant>
         <constant name="afr_type">"14Point7"</constant>
         <constant name="mc33810_cs1">"NONE"</constant>
         <constant digits="4" name="idle_antiwindupFreq" units="x">0.0</constant>
@@ -328,7 +328,7 @@
         <constant digits="3" name="fordInjectorSmallPulseSlope" units="g/s">0.0</constant>
         <constant name="triggerSimulatorPinModes1">"default"</constant>
         <constant name="triggerSimulatorPinModes2">"default"</constant>
-        <constant name="maf2AdcChannel">"NONE"</constant>
+        <constant name="maf2AdcChannel">"Disabled"</constant>
         <constant name="o2heaterPin">"NONE"</constant>
         <constant name="o2heaterPinModeTodO">"default"</constant>
         <constant digits="0" name="lambdaProtectionMinRpm" units="RPM">2500.0</constant>
@@ -405,7 +405,7 @@
         <constant digits="1" name="stoichRatioSecondary" units=":1">9.0</constant>
         <constant digits="0" name="etbMaximumPosition" units="%">100.0</constant>
         <constant digits="0" name="sdCardLogFrequency" units="hz">50.0</constant>
-        <constant name="idlePositionChannel">"NONE"</constant>
+        <constant name="idlePositionChannel">"Disabled"</constant>
         <constant digits="0" name="launchCorrectionsEndRpm" units="">0.0</constant>
         <constant name="starterRelayDisablePin">"NONE"</constant>
         <constant name="starterRelayDisablePinMode">"default"</constant>
@@ -639,9 +639,9 @@
         <constant name="launchActivateInverted">"false"</constant>
         <constant name="twoStroke">"Four Stroke"</constant>
         <constant name="skippedWheelOnCam">"On crankshaft"</constant>
-        <constant name="hipOutputChannel">"NONE"</constant>
+        <constant name="hipOutputChannel">"Disabled"</constant>
         <constant name="acSwitch">"NONE"</constant>
-        <constant name="vRefAdcChannel">"NONE"</constant>
+        <constant name="vRefAdcChannel">"Disabled"</constant>
         <constant digits="0" name="etbNeutralPosition" units="%">0.0</constant>
         <constant name="idleMode">"Open Loop"</constant>
         <constant name="isInjectionEnabled">"true"</constant>
@@ -814,7 +814,7 @@
         <constant name="can2TxPin">"NONE"</constant>
         <constant name="can2RxPin">"NONE"</constant>
         <constant name="starterControlPinMode">"default"</constant>
-        <constant name="wastegatePositionSensor">"NONE"</constant>
+        <constant name="wastegatePositionSensor">"Disabled"</constant>
         <constant name="ignOverrideMode">"None"</constant>
         <constant name="injectorPressureType">"Low"</constant>
         <constant name="hpfpValvePin">"NONE"</constant>
@@ -860,7 +860,7 @@
         <constant digits="2" name="mapLowValueVoltage" units="v">0.3</constant>
         <constant digits="2" name="mapHighValueVoltage" units="v">4.65</constant>
         <constant digits="2" name="egoValueShift" units="value">0.0</constant>
-        <constant name="vvtPins1">"INVALID"</constant>
+        <constant name="vvtPins1">"PA0"</constant>
         <constant name="vvtPins2">"NONE"</constant>
         <constant name="vvtPins3">"NONE"</constant>
         <constant name="vvtPins4">"NONE"</constant>
@@ -877,14 +877,14 @@
         <constant name="vvtMode2">"Inactive"</constant>
         <constant digits="0" name="fan2ExtraIdle" units="%">2.0</constant>
         <constant digits="2" name="primingDelay" units="sec">0.5</constant>
-        <constant name="auxAnalogInputs1">"NONE"</constant>
-        <constant name="auxAnalogInputs2">"NONE"</constant>
-        <constant name="auxAnalogInputs3">"NONE"</constant>
-        <constant name="auxAnalogInputs4">"NONE"</constant>
-        <constant name="auxAnalogInputs5">"NONE"</constant>
-        <constant name="auxAnalogInputs6">"NONE"</constant>
-        <constant name="auxAnalogInputs7">"NONE"</constant>
-        <constant name="auxAnalogInputs8">"NONE"</constant>
+        <constant name="auxAnalogInputs1">"Disabled"</constant>
+        <constant name="auxAnalogInputs2">"Disabled"</constant>
+        <constant name="auxAnalogInputs3">"Disabled"</constant>
+        <constant name="auxAnalogInputs4">"Disabled"</constant>
+        <constant name="auxAnalogInputs5">"Disabled"</constant>
+        <constant name="auxAnalogInputs6">"Disabled"</constant>
+        <constant name="auxAnalogInputs7">"Disabled"</constant>
+        <constant name="auxAnalogInputs8">"Disabled"</constant>
         <constant name="trailingCoilPins1">"NONE"</constant>
         <constant name="trailingCoilPins2">"NONE"</constant>
         <constant name="trailingCoilPins3">"NONE"</constant>
@@ -909,7 +909,7 @@
         <constant digits="1" name="auxTempSensor1_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="auxTempSensor1_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="auxTempSensor1_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="auxTempSensor1_adcChannel">"NONE"</constant>
+        <constant name="auxTempSensor1_adcChannel">"Disabled"</constant>
         <constant digits="1" name="auxTempSensor2_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="auxTempSensor2_tempC_2" units="*C">0.0</constant>
         <constant digits="1" name="auxTempSensor2_tempC_3" units="*C">0.0</constant>
@@ -917,7 +917,7 @@
         <constant digits="1" name="auxTempSensor2_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="auxTempSensor2_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="auxTempSensor2_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="auxTempSensor2_adcChannel">"NONE"</constant>
+        <constant name="auxTempSensor2_adcChannel">"Disabled"</constant>
         <constant digits="0" name="knockSamplingDuration" units="Deg">45.0</constant>
         <constant digits="0" name="etbFreq" units="Hz">800.0</constant>
         <constant digits="4" name="etbWastegatePid_pFactor" units="">1.0</constant>
@@ -989,7 +989,7 @@
          80.0
          100.0
 </constant>
-        <constant name="oilPressure_hwChannel">"NONE"</constant>
+        <constant name="oilPressure_hwChannel">"Disabled"</constant>
         <constant digits="2" name="oilPressure_v1" units="volts">0.5</constant>
         <constant digits="2" name="oilPressure_value1" units="">0.0</constant>
         <constant digits="2" name="oilPressure_v2" units="volts">4.5</constant>
@@ -1010,12 +1010,12 @@
         <constant digits="0" name="coastingFuelCutClt" units="C">60.0</constant>
         <constant digits="0" name="pidExtraForLowRpm" units="%">0.0</constant>
         <constant digits="0" name="coastingFuelCutMap" units="kPa">30.0</constant>
-        <constant name="highPressureFuel_hwChannel">"NONE"</constant>
+        <constant name="highPressureFuel_hwChannel">"Disabled"</constant>
         <constant digits="2" name="highPressureFuel_v1" units="volts">0.0</constant>
         <constant digits="2" name="highPressureFuel_value1" units="">0.0</constant>
         <constant digits="2" name="highPressureFuel_v2" units="volts">0.0</constant>
         <constant digits="2" name="highPressureFuel_value2" units="">0.0</constant>
-        <constant name="lowPressureFuel_hwChannel">"NONE"</constant>
+        <constant name="lowPressureFuel_hwChannel">"Disabled"</constant>
         <constant digits="2" name="lowPressureFuel_v1" units="volts">0.0</constant>
         <constant digits="2" name="lowPressureFuel_value1" units="">0.0</constant>
         <constant digits="2" name="lowPressureFuel_v2" units="volts">0.0</constant>
@@ -1351,12 +1351,12 @@
         <constant name="gearControllerMode">"None"</constant>
         <constant name="transmissionControllerMode">"None"</constant>
         <constant digits="0" name="acrDisablePhase" units="deg">0.0</constant>
-        <constant name="auxLinear1_hwChannel">"NONE"</constant>
+        <constant name="auxLinear1_hwChannel">"Disabled"</constant>
         <constant digits="2" name="auxLinear1_v1" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear1_value1" units="">0.0</constant>
         <constant digits="2" name="auxLinear1_v2" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear1_value2" units="">0.0</constant>
-        <constant name="auxLinear2_hwChannel">"NONE"</constant>
+        <constant name="auxLinear2_hwChannel">"Disabled"</constant>
         <constant digits="2" name="auxLinear2_v1" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear2_value1" units="">0.0</constant>
         <constant digits="2" name="auxLinear2_v2" units="volts">0.0</constant>
@@ -1490,7 +1490,7 @@
         <constant digits="1" name="oilTempSensor_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="oilTempSensor_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="oilTempSensor_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="oilTempSensor_adcChannel">"NONE"</constant>
+        <constant name="oilTempSensor_adcChannel">"Disabled"</constant>
         <constant digits="1" name="fuelTempSensor_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="fuelTempSensor_tempC_2" units="*C">0.0</constant>
         <constant digits="1" name="fuelTempSensor_tempC_3" units="*C">0.0</constant>
@@ -1498,7 +1498,7 @@
         <constant digits="1" name="fuelTempSensor_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="fuelTempSensor_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="fuelTempSensor_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="fuelTempSensor_adcChannel">"NONE"</constant>
+        <constant name="fuelTempSensor_adcChannel">"Disabled"</constant>
         <constant digits="1" name="ambientTempSensor_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="ambientTempSensor_tempC_2" units="*C">0.0</constant>
         <constant digits="1" name="ambientTempSensor_tempC_3" units="*C">0.0</constant>
@@ -1506,7 +1506,7 @@
         <constant digits="1" name="ambientTempSensor_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="ambientTempSensor_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="ambientTempSensor_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="ambientTempSensor_adcChannel">"NONE"</constant>
+        <constant name="ambientTempSensor_adcChannel">"Disabled"</constant>
         <constant digits="1" name="compressorDischargeTemperature_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="compressorDischargeTemperature_tempC_2" units="*C">0.0</constant>
         <constant digits="1" name="compressorDischargeTemperature_tempC_3" units="*C">0.0</constant>
@@ -1514,9 +1514,9 @@
         <constant digits="1" name="compressorDischargeTemperature_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="compressorDischargeTemperature_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="compressorDischargeTemperature_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="compressorDischargeTemperature_adcChannel">"NONE"</constant>
-        <constant name="throttleInletPressureChannel">"NONE"</constant>
-        <constant name="compressorDischargePressureChannel">"NONE"</constant>
+        <constant name="compressorDischargeTemperature_adcChannel">"Disabled"</constant>
+        <constant name="throttleInletPressureChannel">"Disabled"</constant>
+        <constant name="compressorDischargePressureChannel">"Disabled"</constant>
         <constant name="dacOutputPins1">"NONE"</constant>
         <constant name="dacOutputPins2">"NONE"</constant>
         <constant name="speedometerOutputPin">"NONE"</constant>
@@ -1525,7 +1525,7 @@
         <constant digits="0" name="simulatorCamPosition2" units="">0.0</constant>
         <constant digits="0" name="simulatorCamPosition3" units="">0.0</constant>
         <constant digits="0" name="simulatorCamPosition4" units="">0.0</constant>
-        <constant name="ignKeyAdcChannel">"NONE"</constant>
+        <constant name="ignKeyAdcChannel">"Disabled"</constant>
         <constant name="spi6MisoMode">"default"</constant>
         <constant digits="3" name="triggerVVTGapOverrideFrom1" units="ratio">0.0</constant>
         <constant digits="3" name="triggerVVTGapOverrideFrom2" units="ratio">0.0</constant>
@@ -1600,18 +1600,18 @@
         <constant digits="0" name="device_uid1" units="">0.0</constant>
         <constant digits="0" name="device_uid2" units="">0.0</constant>
         <constant digits="0" name="device_uid3" units="">0.0</constant>
-        <constant name="tcu_rangeAnalogInput1">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput2">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput3">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput4">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput5">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput6">"NONE"</constant>
+        <constant name="tcu_rangeAnalogInput1">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput2">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput3">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput4">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput5">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput6">"Disabled"</constant>
         <constant digits="1" name="tcu_rangeSensorBiasResistor" units="Ohm">0.0</constant>
         <constant name="msIoBox0_id">"Off"</constant>
         <constant name="msIoBox0_vss">"Off"</constant>
         <constant digits="2" name="mc33810Nomi" units="A">5.5</constant>
         <constant digits="0" name="mc33810Maxi" units="A">14.0</constant>
-        <constant name="acPressure_hwChannel">"NONE"</constant>
+        <constant name="acPressure_hwChannel">"Disabled"</constant>
         <constant digits="2" name="acPressure_v1" units="volts">0.0</constant>
         <constant digits="2" name="acPressure_value1" units="">0.0</constant>
         <constant digits="2" name="acPressure_v2" units="volts">0.0</constant>
@@ -1619,12 +1619,12 @@
         <constant digits="0" name="minAcPressure" units="kPa">100.0</constant>
         <constant digits="0" name="maxAcPressure" units="kPa">300.0</constant>
         <constant digits="1" name="minimumOilPressureTimeout" units="sec">0.5</constant>
-        <constant name="auxLinear3_hwChannel">"NONE"</constant>
+        <constant name="auxLinear3_hwChannel">"Disabled"</constant>
         <constant digits="2" name="auxLinear3_v1" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear3_value1" units="">0.0</constant>
         <constant digits="2" name="auxLinear3_v2" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear3_value2" units="">0.0</constant>
-        <constant name="auxLinear4_hwChannel">"NONE"</constant>
+        <constant name="auxLinear4_hwChannel">"Disabled"</constant>
         <constant digits="2" name="auxLinear4_v1" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear4_value1" units="">0.0</constant>
         <constant digits="2" name="auxLinear4_v2" units="volts">0.0</constant>
@@ -4762,7 +4762,7 @@ end</constant>
          0.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240830" nPages="1" signature="rusEFI main.2024.09.06.mega100.821184268" version="5.0"/>
+    <versionInfo firmwareInfo="20240830" nPages="1" signature="rusEFI main.2024.09.06.mega100.2965644658" version="5.0"/>
     <bibliography author="rusEFI 20240830" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/generated/simulator_tune_POLARIS_RZR.msq b/generated/simulator_tune_POLARIS_RZR.msq
index 48a8917..8df5005 100644
--- a/generated/simulator_tune_POLARIS_RZR.msq
+++ b/generated/simulator_tune_POLARIS_RZR.msq
@@ -157,7 +157,7 @@
         <constant digits="2" name="map_sensor_lowValue" units="kpa">0.0</constant>
         <constant digits="2" name="map_sensor_highValue" units="kpa">0.0</constant>
         <constant name="map_sensor_type">"MPX4250"</constant>
-        <constant name="map_sensor_hwChannel">"NONE"</constant>
+        <constant name="map_sensor_hwChannel">"Disabled"</constant>
         <constant digits="1" name="clt_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="clt_tempC_2" units="*C">23.8889</constant>
         <constant digits="1" name="clt_tempC_3" units="*C">48.8889</constant>
@@ -165,7 +165,7 @@
         <constant digits="1" name="clt_resistance_2" units="Ohm">2100.0</constant>
         <constant digits="1" name="clt_resistance_3" units="Ohm">1000.0</constant>
         <constant digits="1" name="clt_bias_resistor" units="Ohm">1500.0</constant>
-        <constant name="clt_adcChannel">"NONE"</constant>
+        <constant name="clt_adcChannel">"Disabled"</constant>
         <constant digits="1" name="iat_tempC_1" units="*C">-20.0</constant>
         <constant digits="1" name="iat_tempC_2" units="*C">23.8889</constant>
         <constant digits="1" name="iat_tempC_3" units="*C">120.0</constant>
@@ -173,7 +173,7 @@
         <constant digits="1" name="iat_resistance_2" units="Ohm">2100.0</constant>
         <constant digits="1" name="iat_resistance_3" units="Ohm">100.0</constant>
         <constant digits="1" name="iat_bias_resistor" units="Ohm">2700.0</constant>
-        <constant name="iat_adcChannel">"NONE"</constant>
+        <constant name="iat_adcChannel">"Disabled"</constant>
         <constant digits="2" name="launchTimingRetard" units="deg">0.0</constant>
         <constant digits="0" name="hip9011PrescalerAndSDO" units="integer">0.0</constant>
         <constant digits="0" name="unusedFloatHere" units="">0.0</constant>
@@ -209,10 +209,10 @@
         <constant digits="1" name="driveWheelRevPerKm" units="revs/km">1000.0</constant>
         <constant digits="2" name="canSleepPeriodMs" units="ms">50.0</constant>
         <constant digits="0" name="byFirmwareVersion" units="index">0.0</constant>
-        <constant name="tps1_1AdcChannel">"NONE"</constant>
-        <constant name="vbattAdcChannel">"NONE"</constant>
-        <constant name="fuelLevelSensor">"NONE"</constant>
-        <constant name="tps2_1AdcChannel">"NONE"</constant>
+        <constant name="tps1_1AdcChannel">"Disabled"</constant>
+        <constant name="vbattAdcChannel">"Disabled"</constant>
+        <constant name="fuelLevelSensor">"Disabled"</constant>
+        <constant name="tps2_1AdcChannel">"Disabled"</constant>
         <constant digits="4" name="idle_derivativeFilterLoss" units="x">0.0</constant>
         <constant digits="0" name="trailingSparkAngle" units="angle">10.0</constant>
         <constant name="trigger_type">"36-2"</constant>
@@ -221,7 +221,7 @@
         <constant digits="1" name="airByRpmTaper" units="%">0.0</constant>
         <constant name="hip9011SpiDevice">"Off"</constant>
         <constant digits="0" name="boostControlSafeDutyCycle" units="%">0.0</constant>
-        <constant name="mafAdcChannel">"NONE"</constant>
+        <constant name="mafAdcChannel">"Disabled"</constant>
         <constant digits="0" name="acrRevolutions" units="">5.0</constant>
         <constant digits="0" name="calibrationBirthday" units="">2.0240906E7</constant>
         <constant digits="3" name="adcVcc" units="volts">3.0</constant>
@@ -230,13 +230,13 @@
         <constant name="camInputs2">"NONE"</constant>
         <constant name="camInputs3">"NONE"</constant>
         <constant name="camInputs4">"NONE"</constant>
-        <constant name="afr_hwChannel">"NONE"</constant>
-        <constant name="afr_hwChannel2">"NONE"</constant>
+        <constant name="afr_hwChannel">"Disabled"</constant>
+        <constant name="afr_hwChannel2">"Disabled"</constant>
         <constant digits="2" name="afr_v1" units="volts">0.0</constant>
         <constant digits="2" name="afr_value1" units="AFR">9.996</constant>
         <constant digits="2" name="afr_v2" units="volts">5.0</constant>
         <constant digits="2" name="afr_value2" units="AFR">19.992</constant>
-        <constant name="throttlePedalPositionAdcChannel">"NONE"</constant>
+        <constant name="throttlePedalPositionAdcChannel">"Disabled"</constant>
         <constant digits="1" name="etbSplit" units="%">5.0</constant>
         <constant name="tle6240_cs">"NONE"</constant>
         <constant name="tle6240_csPinMode">"default"</constant>
@@ -245,7 +245,7 @@
         <constant digits="2" name="baroSensor_lowValue" units="kpa">0.0</constant>
         <constant digits="2" name="baroSensor_highValue" units="kpa">500.0</constant>
         <constant name="baroSensor_type">"Custom"</constant>
-        <constant name="baroSensor_hwChannel">"NONE"</constant>
+        <constant name="baroSensor_hwChannel">"Disabled"</constant>
         <constant digits="0" name="idle_solenoidFrequency" units="Hz">300.0</constant>
         <constant name="idle_solenoidPin">"NONE"</constant>
         <constant name="idle_stepperDirectionPin">"NONE"</constant>
@@ -308,10 +308,10 @@
         <constant name="brakePedalPinMode">"PULLUP"</constant>
         <constant name="mc33972_cs">"NONE"</constant>
         <constant name="mc33972_csPinMode">"default"</constant>
-        <constant name="auxFastSensor1_adcChannel">"NONE"</constant>
-        <constant name="tps1_2AdcChannel">"NONE"</constant>
-        <constant name="tps2_2AdcChannel">"NONE"</constant>
-        <constant name="throttlePedalPositionSecondAdcChannel">"NONE"</constant>
+        <constant name="auxFastSensor1_adcChannel">"Disabled"</constant>
+        <constant name="tps1_2AdcChannel">"Disabled"</constant>
+        <constant name="tps2_2AdcChannel">"Disabled"</constant>
+        <constant name="throttlePedalPositionSecondAdcChannel">"Disabled"</constant>
         <constant name="afr_type">"14Point7"</constant>
         <constant name="mc33810_cs1">"NONE"</constant>
         <constant digits="4" name="idle_antiwindupFreq" units="x">0.0</constant>
@@ -328,7 +328,7 @@
         <constant digits="3" name="fordInjectorSmallPulseSlope" units="g/s">0.0</constant>
         <constant name="triggerSimulatorPinModes1">"default"</constant>
         <constant name="triggerSimulatorPinModes2">"default"</constant>
-        <constant name="maf2AdcChannel">"NONE"</constant>
+        <constant name="maf2AdcChannel">"Disabled"</constant>
         <constant name="o2heaterPin">"NONE"</constant>
         <constant name="o2heaterPinModeTodO">"default"</constant>
         <constant digits="0" name="lambdaProtectionMinRpm" units="RPM">2500.0</constant>
@@ -405,7 +405,7 @@
         <constant digits="1" name="stoichRatioSecondary" units=":1">9.0</constant>
         <constant digits="0" name="etbMaximumPosition" units="%">100.0</constant>
         <constant digits="0" name="sdCardLogFrequency" units="hz">50.0</constant>
-        <constant name="idlePositionChannel">"NONE"</constant>
+        <constant name="idlePositionChannel">"Disabled"</constant>
         <constant digits="0" name="launchCorrectionsEndRpm" units="">0.0</constant>
         <constant name="starterRelayDisablePin">"NONE"</constant>
         <constant name="starterRelayDisablePinMode">"default"</constant>
@@ -639,9 +639,9 @@
         <constant name="launchActivateInverted">"false"</constant>
         <constant name="twoStroke">"Four Stroke"</constant>
         <constant name="skippedWheelOnCam">"On crankshaft"</constant>
-        <constant name="hipOutputChannel">"NONE"</constant>
+        <constant name="hipOutputChannel">"Disabled"</constant>
         <constant name="acSwitch">"NONE"</constant>
-        <constant name="vRefAdcChannel">"NONE"</constant>
+        <constant name="vRefAdcChannel">"Disabled"</constant>
         <constant digits="0" name="etbNeutralPosition" units="%">0.0</constant>
         <constant name="idleMode">"Open Loop"</constant>
         <constant name="isInjectionEnabled">"true"</constant>
@@ -814,7 +814,7 @@
         <constant name="can2TxPin">"NONE"</constant>
         <constant name="can2RxPin">"NONE"</constant>
         <constant name="starterControlPinMode">"default"</constant>
-        <constant name="wastegatePositionSensor">"NONE"</constant>
+        <constant name="wastegatePositionSensor">"Disabled"</constant>
         <constant name="ignOverrideMode">"None"</constant>
         <constant name="injectorPressureType">"Low"</constant>
         <constant name="hpfpValvePin">"NONE"</constant>
@@ -860,7 +860,7 @@
         <constant digits="2" name="mapLowValueVoltage" units="v">0.0</constant>
         <constant digits="2" name="mapHighValueVoltage" units="v">5.0</constant>
         <constant digits="2" name="egoValueShift" units="value">0.0</constant>
-        <constant name="vvtPins1">"INVALID"</constant>
+        <constant name="vvtPins1">"PA0"</constant>
         <constant name="vvtPins2">"NONE"</constant>
         <constant name="vvtPins3">"NONE"</constant>
         <constant name="vvtPins4">"NONE"</constant>
@@ -877,14 +877,14 @@
         <constant name="vvtMode2">"Inactive"</constant>
         <constant digits="0" name="fan2ExtraIdle" units="%">0.0</constant>
         <constant digits="2" name="primingDelay" units="sec">0.5</constant>
-        <constant name="auxAnalogInputs1">"NONE"</constant>
-        <constant name="auxAnalogInputs2">"NONE"</constant>
-        <constant name="auxAnalogInputs3">"NONE"</constant>
-        <constant name="auxAnalogInputs4">"NONE"</constant>
-        <constant name="auxAnalogInputs5">"NONE"</constant>
-        <constant name="auxAnalogInputs6">"NONE"</constant>
-        <constant name="auxAnalogInputs7">"NONE"</constant>
-        <constant name="auxAnalogInputs8">"NONE"</constant>
+        <constant name="auxAnalogInputs1">"Disabled"</constant>
+        <constant name="auxAnalogInputs2">"Disabled"</constant>
+        <constant name="auxAnalogInputs3">"Disabled"</constant>
+        <constant name="auxAnalogInputs4">"Disabled"</constant>
+        <constant name="auxAnalogInputs5">"Disabled"</constant>
+        <constant name="auxAnalogInputs6">"Disabled"</constant>
+        <constant name="auxAnalogInputs7">"Disabled"</constant>
+        <constant name="auxAnalogInputs8">"Disabled"</constant>
         <constant name="trailingCoilPins1">"NONE"</constant>
         <constant name="trailingCoilPins2">"NONE"</constant>
         <constant name="trailingCoilPins3">"NONE"</constant>
@@ -909,7 +909,7 @@
         <constant digits="1" name="auxTempSensor1_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="auxTempSensor1_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="auxTempSensor1_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="auxTempSensor1_adcChannel">"NONE"</constant>
+        <constant name="auxTempSensor1_adcChannel">"Disabled"</constant>
         <constant digits="1" name="auxTempSensor2_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="auxTempSensor2_tempC_2" units="*C">0.0</constant>
         <constant digits="1" name="auxTempSensor2_tempC_3" units="*C">0.0</constant>
@@ -917,7 +917,7 @@
         <constant digits="1" name="auxTempSensor2_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="auxTempSensor2_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="auxTempSensor2_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="auxTempSensor2_adcChannel">"NONE"</constant>
+        <constant name="auxTempSensor2_adcChannel">"Disabled"</constant>
         <constant digits="0" name="knockSamplingDuration" units="Deg">45.0</constant>
         <constant digits="0" name="etbFreq" units="Hz">800.0</constant>
         <constant digits="4" name="etbWastegatePid_pFactor" units="">1.0</constant>
@@ -989,7 +989,7 @@
          80.0
          100.0
 </constant>
-        <constant name="oilPressure_hwChannel">"NONE"</constant>
+        <constant name="oilPressure_hwChannel">"Disabled"</constant>
         <constant digits="2" name="oilPressure_v1" units="volts">0.5</constant>
         <constant digits="2" name="oilPressure_value1" units="">0.0</constant>
         <constant digits="2" name="oilPressure_v2" units="volts">4.5</constant>
@@ -1010,12 +1010,12 @@
         <constant digits="0" name="coastingFuelCutClt" units="C">60.0</constant>
         <constant digits="0" name="pidExtraForLowRpm" units="%">0.0</constant>
         <constant digits="0" name="coastingFuelCutMap" units="kPa">30.0</constant>
-        <constant name="highPressureFuel_hwChannel">"NONE"</constant>
+        <constant name="highPressureFuel_hwChannel">"Disabled"</constant>
         <constant digits="2" name="highPressureFuel_v1" units="volts">0.0</constant>
         <constant digits="2" name="highPressureFuel_value1" units="">0.0</constant>
         <constant digits="2" name="highPressureFuel_v2" units="volts">0.0</constant>
         <constant digits="2" name="highPressureFuel_value2" units="">0.0</constant>
-        <constant name="lowPressureFuel_hwChannel">"NONE"</constant>
+        <constant name="lowPressureFuel_hwChannel">"Disabled"</constant>
         <constant digits="2" name="lowPressureFuel_v1" units="volts">0.0</constant>
         <constant digits="2" name="lowPressureFuel_value1" units="">0.0</constant>
         <constant digits="2" name="lowPressureFuel_v2" units="volts">0.0</constant>
@@ -1351,12 +1351,12 @@
         <constant name="gearControllerMode">"None"</constant>
         <constant name="transmissionControllerMode">"None"</constant>
         <constant digits="0" name="acrDisablePhase" units="deg">0.0</constant>
-        <constant name="auxLinear1_hwChannel">"NONE"</constant>
+        <constant name="auxLinear1_hwChannel">"Disabled"</constant>
         <constant digits="2" name="auxLinear1_v1" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear1_value1" units="">0.0</constant>
         <constant digits="2" name="auxLinear1_v2" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear1_value2" units="">0.0</constant>
-        <constant name="auxLinear2_hwChannel">"NONE"</constant>
+        <constant name="auxLinear2_hwChannel">"Disabled"</constant>
         <constant digits="2" name="auxLinear2_v1" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear2_value1" units="">0.0</constant>
         <constant digits="2" name="auxLinear2_v2" units="volts">0.0</constant>
@@ -1490,7 +1490,7 @@
         <constant digits="1" name="oilTempSensor_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="oilTempSensor_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="oilTempSensor_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="oilTempSensor_adcChannel">"NONE"</constant>
+        <constant name="oilTempSensor_adcChannel">"Disabled"</constant>
         <constant digits="1" name="fuelTempSensor_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="fuelTempSensor_tempC_2" units="*C">0.0</constant>
         <constant digits="1" name="fuelTempSensor_tempC_3" units="*C">0.0</constant>
@@ -1498,7 +1498,7 @@
         <constant digits="1" name="fuelTempSensor_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="fuelTempSensor_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="fuelTempSensor_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="fuelTempSensor_adcChannel">"NONE"</constant>
+        <constant name="fuelTempSensor_adcChannel">"Disabled"</constant>
         <constant digits="1" name="ambientTempSensor_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="ambientTempSensor_tempC_2" units="*C">0.0</constant>
         <constant digits="1" name="ambientTempSensor_tempC_3" units="*C">0.0</constant>
@@ -1506,7 +1506,7 @@
         <constant digits="1" name="ambientTempSensor_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="ambientTempSensor_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="ambientTempSensor_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="ambientTempSensor_adcChannel">"NONE"</constant>
+        <constant name="ambientTempSensor_adcChannel">"Disabled"</constant>
         <constant digits="1" name="compressorDischargeTemperature_tempC_1" units="*C">0.0</constant>
         <constant digits="1" name="compressorDischargeTemperature_tempC_2" units="*C">0.0</constant>
         <constant digits="1" name="compressorDischargeTemperature_tempC_3" units="*C">0.0</constant>
@@ -1514,9 +1514,9 @@
         <constant digits="1" name="compressorDischargeTemperature_resistance_2" units="Ohm">0.0</constant>
         <constant digits="1" name="compressorDischargeTemperature_resistance_3" units="Ohm">0.0</constant>
         <constant digits="1" name="compressorDischargeTemperature_bias_resistor" units="Ohm">0.0</constant>
-        <constant name="compressorDischargeTemperature_adcChannel">"NONE"</constant>
-        <constant name="throttleInletPressureChannel">"NONE"</constant>
-        <constant name="compressorDischargePressureChannel">"NONE"</constant>
+        <constant name="compressorDischargeTemperature_adcChannel">"Disabled"</constant>
+        <constant name="throttleInletPressureChannel">"Disabled"</constant>
+        <constant name="compressorDischargePressureChannel">"Disabled"</constant>
         <constant name="dacOutputPins1">"NONE"</constant>
         <constant name="dacOutputPins2">"NONE"</constant>
         <constant name="speedometerOutputPin">"NONE"</constant>
@@ -1525,7 +1525,7 @@
         <constant digits="0" name="simulatorCamPosition2" units="">0.0</constant>
         <constant digits="0" name="simulatorCamPosition3" units="">0.0</constant>
         <constant digits="0" name="simulatorCamPosition4" units="">0.0</constant>
-        <constant name="ignKeyAdcChannel">"NONE"</constant>
+        <constant name="ignKeyAdcChannel">"Disabled"</constant>
         <constant name="spi6MisoMode">"default"</constant>
         <constant digits="3" name="triggerVVTGapOverrideFrom1" units="ratio">0.0</constant>
         <constant digits="3" name="triggerVVTGapOverrideFrom2" units="ratio">0.0</constant>
@@ -1600,18 +1600,18 @@
         <constant digits="0" name="device_uid1" units="">0.0</constant>
         <constant digits="0" name="device_uid2" units="">0.0</constant>
         <constant digits="0" name="device_uid3" units="">0.0</constant>
-        <constant name="tcu_rangeAnalogInput1">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput2">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput3">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput4">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput5">"NONE"</constant>
-        <constant name="tcu_rangeAnalogInput6">"NONE"</constant>
+        <constant name="tcu_rangeAnalogInput1">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput2">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput3">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput4">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput5">"Disabled"</constant>
+        <constant name="tcu_rangeAnalogInput6">"Disabled"</constant>
         <constant digits="1" name="tcu_rangeSensorBiasResistor" units="Ohm">0.0</constant>
         <constant name="msIoBox0_id">"Off"</constant>
         <constant name="msIoBox0_vss">"Off"</constant>
         <constant digits="2" name="mc33810Nomi" units="A">5.5</constant>
         <constant digits="0" name="mc33810Maxi" units="A">14.0</constant>
-        <constant name="acPressure_hwChannel">"NONE"</constant>
+        <constant name="acPressure_hwChannel">"Disabled"</constant>
         <constant digits="2" name="acPressure_v1" units="volts">0.0</constant>
         <constant digits="2" name="acPressure_value1" units="">0.0</constant>
         <constant digits="2" name="acPressure_v2" units="volts">0.0</constant>
@@ -1619,12 +1619,12 @@
         <constant digits="0" name="minAcPressure" units="kPa">100.0</constant>
         <constant digits="0" name="maxAcPressure" units="kPa">300.0</constant>
         <constant digits="1" name="minimumOilPressureTimeout" units="sec">0.5</constant>
-        <constant name="auxLinear3_hwChannel">"NONE"</constant>
+        <constant name="auxLinear3_hwChannel">"Disabled"</constant>
         <constant digits="2" name="auxLinear3_v1" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear3_value1" units="">0.0</constant>
         <constant digits="2" name="auxLinear3_v2" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear3_value2" units="">0.0</constant>
-        <constant name="auxLinear4_hwChannel">"NONE"</constant>
+        <constant name="auxLinear4_hwChannel">"Disabled"</constant>
         <constant digits="2" name="auxLinear4_v1" units="volts">0.0</constant>
         <constant digits="2" name="auxLinear4_value1" units="">0.0</constant>
         <constant digits="2" name="auxLinear4_v2" units="volts">0.0</constant>
@@ -4759,7 +4759,7 @@ end</constant>
          0.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240830" nPages="1" signature="rusEFI main.2024.09.06.mega100.821184268" version="5.0"/>
+    <versionInfo firmwareInfo="20240830" nPages="1" signature="rusEFI main.2024.09.06.mega100.2965644658" version="5.0"/>
     <bibliography author="rusEFI 20240830" writeDate="date"/>
     <settings/>
     <userComments/>