Index: firmware/App/Drivers/InternalADC.c =================================================================== diff -u -r380b0afc95467d0861ff3aa2cdcde5d5d7ac85e7 -r8cbddbe34a4ffed5a4d9fac07a065799c5862611 --- firmware/App/Drivers/InternalADC.c (.../InternalADC.c) (revision 380b0afc95467d0861ff3aa2cdcde5d5d7ac85e7) +++ firmware/App/Drivers/InternalADC.c (.../InternalADC.c) (revision 8cbddbe34a4ffed5a4d9fac07a065799c5862611) @@ -33,14 +33,14 @@ /// Mapping from enumerated used ADC channel to processor channel ID. const INT_ADC_CHANNEL_T ADC_CHANNEL_NUM_TO_CHANNEL_ID[ MAX_ADC_CHANNELS ] = { - INT_ADC_AVAILABLE_1, // 0 + INT_ADC_NOT_USED, // 0 INT_ADC_PS_THERMISTOR, // 1 INT_ADC_PBA_ADC_REF, // 2 INT_ADC_24V_ACTUATORS_REG, // 3 INT_ADC_1_2V_PROCESSOR, // 4 INT_ADC_5V_SENSORS, // 5 - INT_ADC_DUMMY, // 6 - INT_ADC_AVAILABLE_2, // 7 + INT_ADC_NOT_USED, // 6 + INT_ADC_NOT_USED, // 7 INT_ADC_PRIMARY_ALARM_CURRENT_HG, // 8 INT_ADC_NOT_USED, // 9 INT_ADC_BOARD_THERMISTOR, // 10 @@ -51,23 +51,19 @@ INT_ADC_NOT_USED, // 15 INT_ADC_BLOOD_PUMP_SPEED, // 16 INT_ADC_BLOOD_PUMP_MOTOR_CURRENT, // 17 - INT_ADC_AVAILABLE_3, // 18 - INT_ADC_AVAILABLE_4, // 19 + INT_ADC_BACKUP_V, // 18 + INT_ADC_NOT_USED, // 19 INT_ADC_NOT_USED, // 20 INT_ADC_NOT_USED, // 21 INT_ADC_24V_ACTUATORS, // 22 - INT_ADC_NOT_USED_2 // 23 + INT_ADC_NOT_USED // 23 }; const F32 ADC_CHANNEL_READ_TO_UNITS[ NUM_OF_INT_ADC_CHANNELS ] = { 0.0, // - INT_ADC_NOT_USED 1.601601, // RPM - INT_ADC_BLOOD_PUMP_SPEED 0.003002, // A - INT_ADC_BLOOD_PUMP_MOTOR_CURRENT - 1.601601, // V - INT_ADC_AVAILABLE_1 - 0.003002, // V - INT_ADC_AVAILABLE_2 - 1.601601, // V - INT_ADC_AVAILABLE_3 - 0.003002, // V - INT_ADC_AVAILABLE_4 0.001221, // V - INT_ADC_PS_THERMISTOR 0.001465, // V - INT_ADC_REFIN_1 0.009420, // V - INT_ADC_24V_ACTUATORS_REG @@ -80,7 +76,7 @@ 0.001465, // V - INT_ADC_5V_LOGIC 0.073240, // mA - INT_ADC_PRIMARY_ALARM_CURRENT_LG 0.007106, // V - INT_ADC_24V_ACTUATORS - 0.0, // - INT_ADC_NOT_USED_2 + 0.007106, // V - INT_ADC_BACKUP_V 0.000000, // V - INT_ADC_DUMMY };