Index: firmware/App/Drivers/InternalADC.c =================================================================== diff -u -r533272e6ef2873fcfe7a41338a6c88c7a601605d -r129a1c2f4343bc85efdb4767c2dec35e4ba8ce98 --- firmware/App/Drivers/InternalADC.c (.../InternalADC.c) (revision 533272e6ef2873fcfe7a41338a6c88c7a601605d) +++ firmware/App/Drivers/InternalADC.c (.../InternalADC.c) (revision 129a1c2f4343bc85efdb4767c2dec35e4ba8ce98) @@ -18,47 +18,35 @@ const INT_ADC_CHANNEL_T ADC_CHANNEL_NUM_TO_CHANNEL_ID[ MAX_ADC_CHANNELS ] = { 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_24V_ACTUATORS_REG, // 1 + INT_ADC_1_2V_PROCESSOR, // 2 + INT_ADC_5V_SENSORS, // 3 + INT_ADC_NOT_USED, // 4 + INT_ADC_NOT_USED, // 5 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 - INT_ADC_1_25_FPGA_ADC_REF, // 11 - INT_ADC_3_3V, // 12 - INT_ADC_5V_LOGIC, // 13 - INT_ADC_PRIMARY_ALARM_CURRENT_LG, // 14 + INT_ADC_BOARD_THERMISTOR, // 7 + INT_ADC_1_25_FPGA_ADC_REF, // 8 + INT_ADC_3_3V, // 9 + INT_ADC_5V_LOGIC, // 10 + INT_ADC_NOT_USED, // 11 + INT_ADC_BACKUP_V, // 12 + INT_ADC_NOT_USED, // 13 + INT_ADC_NOT_USED, // 14 INT_ADC_NOT_USED, // 15 - INT_ADC_BLOOD_PUMP_SPEED, // 16 - INT_ADC_BLOOD_PUMP_MOTOR_CURRENT, // 17 - 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 // 23 + INT_ADC_24V_ACTUATORS, // 16 + INT_ADC_NOT_USED // 17 }; 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 - 0.001221, // V - INT_ADC_PS_THERMISTOR - 0.001465, // V - INT_ADC_REFIN_1 0.009420, // V - INT_ADC_24V_ACTUATORS_REG 0.000733, // V - INT_ADC_1_2V_PROCESSOR 0.001465, // V - INT_ADC_5V_SENSORS - 0.014650, // mA - INT_ADC_PRIMARY_ALARM_CURRENT_HG 0.001221, // V - INT_ADC_BOARD_THERMISTOR 0.000733, // V - INT_ADC_1_25_FPGA_ADC_REF 0.001465, // V - INT_ADC_3_3V 0.001465, // V - INT_ADC_5V_LOGIC - 0.073240, // mA - INT_ADC_PRIMARY_ALARM_CURRENT_LG 0.007106, // V - INT_ADC_24V_ACTUATORS 0.007106, // V - INT_ADC_BACKUP_V 0.000000, // V - INT_ADC_DUMMY