Index: firmware/App/Drivers/InternalADC.c =================================================================== diff -u -r25824b289643df0560feea73f5529a0f30b7de6d -r9a5d1dfc238d1b6f62779cceac0d820d91362d85 --- firmware/App/Drivers/InternalADC.c (.../InternalADC.c) (revision 25824b289643df0560feea73f5529a0f30b7de6d) +++ firmware/App/Drivers/InternalADC.c (.../InternalADC.c) (revision 9a5d1dfc238d1b6f62779cceac0d820d91362d85) @@ -44,6 +44,7 @@ INT_ADC_PRIMARY_ALARM_CURRENT_HG, // 8 INT_ADC_NOT_USED, // 9 INT_ADC_BOARD_THERMISTOR, // 10 + INT_ADC_1_8V_XADC, // 11 INT_ADC_3_3V, // 12 INT_ADC_5V_LOGIC, // 13 INT_ADC_PRIMARY_ALARM_CURRENT_LG, // 14 @@ -66,12 +67,12 @@ 0.001465, // V - Internal ADC channel for 5V to logic 0.001465, // V - Internal ADC channel for 3.3V 0.000733, // V - Internal ADC channel for 1.2V to processor - 0.000000, // V - Internal ADC channel for 1.8V external ADC - 0.000000, // V - Internal ADC channel for 1.0V FPGA - 0.000000, // V - Internal ADC channel for 1.8V FPGA + 0.000733, // V - Internal ADC channel for 1.8V external ADC + 0.000733, // V - Internal ADC channel for 1.0V FPGA + 0.000733, // V - Internal ADC channel for 1.8V FPGA 0.001221, // V - Internal ADC channel for PCB temperature - 0.000000, // V - Internal ADC channel for ADC reference voltage - 0.007106, // mA - Internal ADC channel for VBackup + 0.001465, // V - Internal ADC channel for ADC reference voltage + 0.009420, // V - Internal ADC channel for VBackup 0.007106, // V - Internal ADC channel for 24V to actuators (1) 0.007106, // V - Internal ADC channel for 24V to actuators (2) 0.000000, // - Not used Index: firmware/App/Drivers/InternalADC.h =================================================================== diff -u -r25824b289643df0560feea73f5529a0f30b7de6d -r9a5d1dfc238d1b6f62779cceac0d820d91362d85 --- firmware/App/Drivers/InternalADC.h (.../InternalADC.h) (revision 25824b289643df0560feea73f5529a0f30b7de6d) +++ firmware/App/Drivers/InternalADC.h (.../InternalADC.h) (revision 9a5d1dfc238d1b6f62779cceac0d820d91362d85) @@ -33,7 +33,6 @@ #define INT_ADC_BITS_PER_CHANNEL 12 ///< Internal ADC channels are 12-bit. #define INT_ADC_FULL_SCALE_BITS 4096 ///< Internal ADC has 4096 full scale counts per channel. -#define INT_ADC_ZERO 1998 ///< For signed 2's compliment data, zero is here. #define INT_ADC_REF_V 3.0F ///< Internal ADC reference voltage is 3.0V. /// Enumeration of internal ADC channels that are used. Index: firmware/App/Monitors/Voltages.c =================================================================== diff -u -r25824b289643df0560feea73f5529a0f30b7de6d -r9a5d1dfc238d1b6f62779cceac0d820d91362d85 --- firmware/App/Monitors/Voltages.c (.../Voltages.c) (revision 25824b289643df0560feea73f5529a0f30b7de6d) +++ firmware/App/Monitors/Voltages.c (.../Voltages.c) (revision 9a5d1dfc238d1b6f62779cceac0d820d91362d85) @@ -55,7 +55,7 @@ 3.63, // MONITORED_VOLTAGE_3_3V 5.5, // MONITORED_VOLTAGE_5V_LOGIC 26.4, // MONITORED_VOLTAGE_24V_1 - 28.25, // MONITORED_VOLTAGE_24V_2 + 26.4, // MONITORED_VOLTAGE_24V_2 1.1, // MONITORED_VOLTAGE_FPGA_VCC_V 1.98, // MONITORED_VOLTAGE_FPGA_AUX_V 0.1 // MONITORED_VOLTAGE_FPGA_PVN_V @@ -67,7 +67,7 @@ 2.97, // MONITORED_VOLTAGE_3_3V 4.5, // MONITORED_VOLTAGE_5V_LOGIC 21.6, // MONITORED_VOLTAGE_24V_1 - 22.0, // MONITORED_VOLTAGE_24V_2 + 21.6, // MONITORED_VOLTAGE_24V_2 0.9, // MONITORED_VOLTAGE_FPGA_VCC_V 1.62, // MONITORED_VOLTAGE_FPGA_AUX_V -0.1 // MONITORED_VOLTAGE_FPGA_PVN_V