diff --git a/firmware/controllers/sensors/auto_generated_sensor.cpp b/firmware/controllers/sensors/auto_generated_sensor.cpp index 20160a1579..4968df7618 100644 --- a/firmware/controllers/sensors/auto_generated_sensor.cpp +++ b/firmware/controllers/sensors/auto_generated_sensor.cpp @@ -13,21 +13,21 @@ case SensorType::AcceleratorPedalPrimary: return "AcceleratorPedalPrimary"; case SensorType::AcceleratorPedalSecondary: return "AcceleratorPedalSecondary"; -case SensorType::Aux1: +case SensorType::AuxAnalog1: return "Aux1"; -case SensorType::Aux2: +case SensorType::AuxAnalog2: return "Aux2"; -case SensorType::Aux3: +case SensorType::AuxAnalog3: return "Aux3"; -case SensorType::Aux4: +case SensorType::AuxAnalog4: return "Aux4"; -case SensorType::Aux5: +case SensorType::AuxAnalog5: return "Aux5"; -case SensorType::Aux6: +case SensorType::AuxAnalog6: return "Aux6"; -case SensorType::Aux7: +case SensorType::AuxAnalog7: return "Aux7"; -case SensorType::Aux8: +case SensorType::AuxAnalog8: return "Aux8"; case SensorType::AuxLinear1: return "AuxLinear1"; diff --git a/firmware/controllers/sensors/sensor_type.h b/firmware/controllers/sensors/sensor_type.h index 5449c4adee..0076a61889 100644 --- a/firmware/controllers/sensors/sensor_type.h +++ b/firmware/controllers/sensors/sensor_type.h @@ -69,14 +69,15 @@ enum class SensorType : unsigned char { FuelLevel, - Aux1, - Aux2, - Aux3, - Aux4, - Aux5, - Aux6, - Aux7, - Aux8, + // auxiliary analog voltage inputs for Lua + AuxAnalog1, + AuxAnalog2, + AuxAnalog3, + AuxAnalog4, + AuxAnalog5, + AuxAnalog6, + AuxAnalog7, + AuxAnalog8, VehicleSpeed, diff --git a/firmware/init/sensor/init_aux.cpp b/firmware/init/sensor/init_aux.cpp index 536bb8d0c5..b0b5fb4bfe 100644 --- a/firmware/init/sensor/init_aux.cpp +++ b/firmware/init/sensor/init_aux.cpp @@ -8,14 +8,14 @@ // These aux sensors just read voltage - so the converter function has nothing to do static FunctionalSensor auxSensors[] = { - { SensorType::Aux1, MS2NT(50) }, - { SensorType::Aux2, MS2NT(50) }, - { SensorType::Aux3, MS2NT(50) }, - { SensorType::Aux4, MS2NT(50) }, - { SensorType::Aux5, MS2NT(50) }, - { SensorType::Aux6, MS2NT(50) }, - { SensorType::Aux7, MS2NT(50) }, - { SensorType::Aux8, MS2NT(50) }, + { SensorType::AuxAnalog1, MS2NT(50) }, + { SensorType::AuxAnalog2, MS2NT(50) }, + { SensorType::AuxAnalog3, MS2NT(50) }, + { SensorType::AuxAnalog4, MS2NT(50) }, + { SensorType::AuxAnalog5, MS2NT(50) }, + { SensorType::AuxAnalog6, MS2NT(50) }, + { SensorType::AuxAnalog7, MS2NT(50) }, + { SensorType::AuxAnalog8, MS2NT(50) }, }; static_assert(efi::size(auxSensors) == AUX_ANALOG_INPUT_COUNT);