Index: firmware/App/Drivers/InternalADC.c =================================================================== diff -u -r51f42cd88bd9c50ed9096a2d1d8ff859a95aff95 -r25824b289643df0560feea73f5529a0f30b7de6d --- firmware/App/Drivers/InternalADC.c (.../InternalADC.c) (revision 51f42cd88bd9c50ed9096a2d1d8ff859a95aff95) +++ firmware/App/Drivers/InternalADC.c (.../InternalADC.c) (revision 25824b289643df0560feea73f5529a0f30b7de6d) @@ -33,50 +33,48 @@ /// 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_NOT_USED, // 0 - INT_ADC_PS_THERMISTOR, // 1 - INT_ADC_PBA_ADC_REF, // 2 - INT_ADC_24V_ACTUATORS_REG, // 3 + INT_ADC_24V_ACTUATORS_1, // 0 + INT_ADC_NOT_USED, // 1 + INT_ADC_1_8V_FPGA, // 2 + INT_ADC_1V_FPGA, // 3 INT_ADC_1_2V_PROCESSOR, // 4 - INT_ADC_5V_SENSORS, // 5 + INT_ADC_NOT_USED, // 5 INT_ADC_NOT_USED, // 6 - INT_ADC_NOT_USED, // 7 + INT_ADC_24V_ACTUATORS_2, // 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_NOT_USED, // 15 - INT_ADC_BLOOD_PUMP_SPEED, // 16 - INT_ADC_BLOOD_PUMP_MOTOR_CURRENT, // 17 + INT_ADC_NOT_USED, // 16 + INT_ADC_NOT_USED, // 17 INT_ADC_BACKUP_V, // 18 - INT_ADC_NOT_USED, // 19 + INT_ADC_ADC_REF, // 19 INT_ADC_NOT_USED, // 20 INT_ADC_NOT_USED, // 21 - INT_ADC_24V_ACTUATORS, // 22 + INT_ADC_NOT_USED, // 22 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 - 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, // - Not used + 0.014650, // mA - Internal ADC channel for primary alarm audio current high gain + 0.073240, // mA - Internal ADC channel for primary alarm audio current low gain + 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.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.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 }; // ********** private data ********** Index: firmware/App/Drivers/InternalADC.h =================================================================== diff -u -r0afeba28589108c3f742079a87bac313c4983b0c -r25824b289643df0560feea73f5529a0f30b7de6d --- firmware/App/Drivers/InternalADC.h (.../InternalADC.h) (revision 0afeba28589108c3f742079a87bac313c4983b0c) +++ firmware/App/Drivers/InternalADC.h (.../InternalADC.h) (revision 25824b289643df0560feea73f5529a0f30b7de6d) @@ -40,21 +40,19 @@ typedef enum Int_ADC_Channels { INT_ADC_NOT_USED = 0, ///< Not used - INT_ADC_BLOOD_PUMP_SPEED, ///< Internal ADC channel for blood pump speed - INT_ADC_BLOOD_PUMP_MOTOR_CURRENT, ///< Internal ADC channel for blood pump current - INT_ADC_PS_THERMISTOR, ///< Internal ADC channel for power supply temperature - INT_ADC_PBA_ADC_REF, ///< Internal ADC channel for reference voltage to PBA ADC channel) - INT_ADC_24V_ACTUATORS_REG, ///< Internal ADC channel for 24V regen (diode drop) to actuators - INT_ADC_1_2V_PROCESSOR, ///< Internal ADC channel for 1.2V to processor - INT_ADC_5V_SENSORS, ///< Internal ADC channel for 5V to sensors INT_ADC_PRIMARY_ALARM_CURRENT_HG, ///< Internal ADC channel for primary alarm audio current high gain - INT_ADC_BOARD_THERMISTOR, ///< Internal ADC channel for PCB temperature - INT_ADC_1_25_FPGA_ADC_REF, ///< Internal ADC channel for FPGA ADC reference voltage - INT_ADC_3_3V, ///< Internal ADC channel for 3.3V - INT_ADC_5V_LOGIC, ///< Internal ADC channel for 5V to logic INT_ADC_PRIMARY_ALARM_CURRENT_LG, ///< Internal ADC channel for primary alarm audio current low gain - INT_ADC_24V_ACTUATORS, ///< Internal ADC channel for 24V to actuators + INT_ADC_5V_LOGIC, ///< Internal ADC channel for 5V to logic + INT_ADC_3_3V, ///< Internal ADC channel for 3.3V + INT_ADC_1_2V_PROCESSOR, ///< Internal ADC channel for 1.2V to processor + INT_ADC_1_8V_XADC, ///< Internal ADC channel for 1.8V external ADC + INT_ADC_1V_FPGA, ///< Internal ADC channel for 1.0V FPGA + INT_ADC_1_8V_FPGA, ///< Internal ADC channel for 1.8V FPGA + INT_ADC_BOARD_THERMISTOR, ///< Internal ADC channel for PCB temperature + INT_ADC_ADC_REF, ///< Internal ADC channel for ADC reference voltage INT_ADC_BACKUP_V, ///< Internal ADC channel for VBackup + INT_ADC_24V_ACTUATORS_1, ///< Internal ADC channel for 24V to actuators (1) + INT_ADC_24V_ACTUATORS_2, ///< Internal ADC channel for 24V to actuators (2) INT_ADC_DUMMY, ///< Internal ADC channel - not used, needed to get even number of channels NUM_OF_INT_ADC_CHANNELS ///< Number of used internal ADC channels. } INT_ADC_CHANNEL_T; Index: firmware/App/Monitors/Voltages.c =================================================================== diff -u -r51f42cd88bd9c50ed9096a2d1d8ff859a95aff95 -r25824b289643df0560feea73f5529a0f30b7de6d --- firmware/App/Monitors/Voltages.c (.../Voltages.c) (revision 51f42cd88bd9c50ed9096a2d1d8ff859a95aff95) +++ firmware/App/Monitors/Voltages.c (.../Voltages.c) (revision 25824b289643df0560feea73f5529a0f30b7de6d) @@ -54,11 +54,8 @@ 1.32, // MONITORED_VOLTAGE_1_2V 3.63, // MONITORED_VOLTAGE_3_3V 5.5, // MONITORED_VOLTAGE_5V_LOGIC - 5.5, // MONITORED_VOLTAGE_5V_SENSORS - 26.4, // MONITORED_VOLTAGE_24V - 28.25, // MONITORED_VOLTAGE_24V_REGEN - 1.3125, // MONITORED_VOLTAGE_FPGA_REF_V - 3.3, // MONITORED_VOLTAGE_PBA_REF_V + 26.4, // MONITORED_VOLTAGE_24V_1 + 28.25, // 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 @@ -69,11 +66,8 @@ 1.08, // MONITORED_VOLTAGE_1_2V 2.97, // MONITORED_VOLTAGE_3_3V 4.5, // MONITORED_VOLTAGE_5V_LOGIC - 4.5, // MONITORED_VOLTAGE_5V_SENSORS - 21.6, // MONITORED_VOLTAGE_24V - 22.0, // MONITORED_VOLTAGE_24V_REGEN - 1.1875, // MONITORED_VOLTAGE_FPGA_REF_V - 2.7, // MONITORED_VOLTAGE_PBA_REF_V + 21.6, // MONITORED_VOLTAGE_24V_1 + 22.0, // 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 @@ -184,11 +178,8 @@ voltages[ MONITORED_VOLTAGE_1_2V ].data = getIntADCVoltageConverted( INT_ADC_1_2V_PROCESSOR ); voltages[ MONITORED_VOLTAGE_3_3V ].data = getIntADCVoltageConverted( INT_ADC_3_3V ); voltages[ MONITORED_VOLTAGE_5V_LOGIC ].data = getIntADCVoltageConverted( INT_ADC_5V_LOGIC ); - voltages[ MONITORED_VOLTAGE_5V_SENSORS ].data = getIntADCVoltageConverted( INT_ADC_5V_SENSORS ); - voltages[ MONITORED_VOLTAGE_24V ].data = getIntADCVoltageConverted( INT_ADC_24V_ACTUATORS ); - voltages[ MONITORED_VOLTAGE_24V_REGEN ].data = getIntADCVoltageConverted( INT_ADC_24V_ACTUATORS_REG ); - voltages[ MONITORED_VOLTAGE_FPGA_REF_V ].data = getIntADCVoltageConverted( INT_ADC_1_25_FPGA_ADC_REF ); - voltages[ MONITORED_VOLTAGE_PBA_REF_V ].data = getIntADCVoltageConverted( INT_ADC_PBA_ADC_REF ); + voltages[ MONITORED_VOLTAGE_24V_1 ].data = getIntADCVoltageConverted( INT_ADC_24V_ACTUATORS_1 ); + voltages[ MONITORED_VOLTAGE_24V_2 ].data = getIntADCVoltageConverted( INT_ADC_24V_ACTUATORS_2 ); voltages[ MONITORED_VOLTAGE_FPGA_VCC_V ].data = getFPGAVcc(); voltages[ MONITORED_VOLTAGE_FPGA_AUX_V ].data = getFPGAVccAux(); voltages[ MONITORED_VOLTAGE_FPGA_PVN_V ].data = getFPGAVpvn(); @@ -223,7 +214,7 @@ for ( channel = MONITORED_VOLTAGE_FIRST_VOLTAGE; channel < NUM_OF_MONITORED_VOLTAGES; channel++ ) { if ( ( ( isSafetyShutdownActivated() != TRUE ) && ( hasPowerBeenLost != TRUE ) ) || - ( ( channel != MONITORED_VOLTAGE_24V ) && ( channel != MONITORED_VOLTAGE_24V_REGEN ) ) ) + ( ( channel != MONITORED_VOLTAGE_24V_1 ) && ( channel != MONITORED_VOLTAGE_24V_2 ) ) ) { #ifndef _RELEASE_ // if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_VOLTAGES_ALARMS ) != SW_CONFIG_ENABLE_VALUE ) @@ -251,11 +242,11 @@ // Pre-Treatment, Treatment, or Post-Treatment mode if ( ( MODE_PRET == opMode ) || ( MODE_TREA == opMode ) || ( MODE_POST == opMode ) ) { - SET_ALARM_WITH_2_F32_DATA( ALARM_ID_TD_AC_POWER_LOST_IN_TREATMENT, getMonitoredLineLevel( MONITORED_VOLTAGE_24V ), getMonitoredLineLevel( MONITORED_VOLTAGE_24V_REGEN ) ); + SET_ALARM_WITH_2_F32_DATA( ALARM_ID_TD_AC_POWER_LOST_IN_TREATMENT, getMonitoredLineLevel( MONITORED_VOLTAGE_24V_1 ), getMonitoredLineLevel( MONITORED_VOLTAGE_24V_2 ) ); } else { - SET_ALARM_WITH_2_F32_DATA( ALARM_ID_TD_AC_POWER_LOST, getMonitoredLineLevel( MONITORED_VOLTAGE_24V ), getMonitoredLineLevel( MONITORED_VOLTAGE_24V_REGEN ) ); + SET_ALARM_WITH_2_F32_DATA( ALARM_ID_TD_AC_POWER_LOST, getMonitoredLineLevel( MONITORED_VOLTAGE_24V_1 ), getMonitoredLineLevel( MONITORED_VOLTAGE_24V_2 ) ); } // Reset the alarm clearance counter @@ -321,11 +312,8 @@ data.adc1_2VProc = getMonitoredLineLevel( MONITORED_VOLTAGE_1_2V ); data.adc3_3V = getMonitoredLineLevel( MONITORED_VOLTAGE_3_3V ); data.adc5VLogic = getMonitoredLineLevel( MONITORED_VOLTAGE_5V_LOGIC ); - data.adc5VSensors = getMonitoredLineLevel( MONITORED_VOLTAGE_5V_SENSORS ); - data.adc24V = getMonitoredLineLevel( MONITORED_VOLTAGE_24V ); - data.adc24VRegen = getMonitoredLineLevel( MONITORED_VOLTAGE_24V_REGEN ); - data.adcFpgaAdcRef = getMonitoredLineLevel( MONITORED_VOLTAGE_FPGA_REF_V ); - data.adcPbaRef = getMonitoredLineLevel( MONITORED_VOLTAGE_PBA_REF_V ); + data.adc24V_1 = getMonitoredLineLevel( MONITORED_VOLTAGE_24V_1 ); + data.adc24V_2 = getMonitoredLineLevel( MONITORED_VOLTAGE_24V_2 ); data.fpgaVcc = getMonitoredLineLevel( MONITORED_VOLTAGE_FPGA_VCC_V ); data.fpgaVaux = getMonitoredLineLevel( MONITORED_VOLTAGE_FPGA_AUX_V ); data.fpgaVpvn = getMonitoredLineLevel( MONITORED_VOLTAGE_FPGA_PVN_V ); Index: firmware/App/Monitors/Voltages.h =================================================================== diff -u -r2f00c73cb1a67b9206c64a29a4d45d21b0f129f2 -r25824b289643df0560feea73f5529a0f30b7de6d --- firmware/App/Monitors/Voltages.h (.../Voltages.h) (revision 2f00c73cb1a67b9206c64a29a4d45d21b0f129f2) +++ firmware/App/Monitors/Voltages.h (.../Voltages.h) (revision 25824b289643df0560feea73f5529a0f30b7de6d) @@ -40,11 +40,8 @@ MONITORED_VOLTAGE_FIRST_VOLTAGE = MONITORED_VOLTAGE_1_2V, ///< First voltage in list MONITORED_VOLTAGE_3_3V, ///< Logic voltage (3.3V) MONITORED_VOLTAGE_5V_LOGIC, ///< Logic voltage (5V) - MONITORED_VOLTAGE_5V_SENSORS, ///< Sensors voltage (5V) - MONITORED_VOLTAGE_24V, ///< Actuators voltage (24V) - MONITORED_VOLTAGE_24V_REGEN, ///< Actuators regen voltage (24V) - MONITORED_VOLTAGE_FPGA_REF_V, ///< FPGA ADC reference voltage (1V) - MONITORED_VOLTAGE_PBA_REF_V, ///< PBA ADC reference voltage (3V) + MONITORED_VOLTAGE_24V_1, ///< Actuators voltage (24V) + MONITORED_VOLTAGE_24V_2, ///< Actuators regen voltage (24V) MONITORED_VOLTAGE_FPGA_VCC_V, ///< FPGA input voltage (3V) MONITORED_VOLTAGE_FPGA_AUX_V, ///< FPGA aux. voltage (3V) MONITORED_VOLTAGE_FPGA_PVN_V, ///< FPGA pvn voltage (1V) @@ -57,11 +54,8 @@ F32 adc1_2VProc; ///< Internal ADC channel for 1.2V to processor F32 adc3_3V; ///< Internal ADC channel for 3.3V F32 adc5VLogic; ///< Internal ADC channel for 5V to logic - F32 adc5VSensors; ///< Internal ADC channel for 5V to sensors - F32 adc24V; ///< Internal ADC channel for 24V to actuators - F32 adc24VRegen; ///< Internal ADC channel for 24V regen (diode drop) to actuators - F32 adcFpgaAdcRef; ///< Internal ADC channel for FPGA ADC reference voltage - F32 adcPbaRef; ///< Internal ADC channel for reference voltage to PBA ADC channel) + F32 adc24V_1; ///< Internal ADC channel for 24V to actuators + F32 adc24V_2; ///< Internal ADC channel for 24V regen (diode drop) to actuators F32 fpgaVcc; ///< FPGA source voltage F32 fpgaVaux; ///< FPGA aux. voltage F32 fpgaVpvn; ///< FPGA pvn voltage Index: firmware/TD.dil =================================================================== diff -u -r794a0f21a465227d432a91d7b7fd7d513cfe3ecb -r25824b289643df0560feea73f5529a0f30b7de6d --- firmware/TD.dil (.../TD.dil) (revision 794a0f21a465227d432a91d7b7fd7d513cfe3ecb) +++ firmware/TD.dil (.../TD.dil) (revision 25824b289643df0560feea73f5529a0f30b7de6d) @@ -1,4 +1,4 @@ -# RM46L852PGE 05/22/25 11:16:18 +# RM46L852PGE 09/05/25 09:54:54 # ARCH=RM46L852PGE # @@ -5553,10 +5553,10 @@ DRIVER.ADC.VAR.ADC2_GROUP2_RAM_PARITY_ENA.VALUE=0 DRIVER.ADC.VAR.ADC1_GROUP1_PIN3_ENABLE.VALUE=0x00000008 DRIVER.ADC.VAR.ADC1_GROUP0_CHANNEL_TOTAL_TIME.VALUE=0.000000 -DRIVER.ADC.VAR.ADC1_GROUP1_FIFO_SIZE.VALUE=16 +DRIVER.ADC.VAR.ADC1_GROUP1_FIFO_SIZE.VALUE=13 DRIVER.ADC.VAR.ADC1_GROUP2_DISCHARGE_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC1_GROUP2_SAMPLE_PRESCALER.VALUE=0 -DRIVER.ADC.VAR.ADC1_GROUP1_LENGTH.VALUE=20 +DRIVER.ADC.VAR.ADC1_GROUP1_LENGTH.VALUE=14 DRIVER.ADC.VAR.ADC2_GROUP1_ID_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC1_GROUP2_CONVERSION_TIME.VALUE=3.271 DRIVER.ADC.VAR.ADC2_PORT_BIT0_DIR.VALUE=0 @@ -5591,7 +5591,7 @@ DRIVER.ADC.VAR.ADC1_GROUP1_EXTENDED_SAMPLE_TIME.VALUE=500.00 DRIVER.ADC.VAR.ADC1_GROUP0_CONVERSION_TIME.VALUE=3.250 DRIVER.ADC.VAR.ADC2_GROUP0_RESOLUTION.VALUE=12_BIT -DRIVER.ADC.VAR.ADC1_GROUP1_PIN1_ENABLE.VALUE=0x00000002 +DRIVER.ADC.VAR.ADC1_GROUP1_PIN1_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC1_GROUP1_RESOLUTION.VALUE=12_BIT DRIVER.ADC.VAR.ADC2_GROUP1_TRIGGER_EDGE_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC2_GROUP0_CONVERSION_TIME.VALUE=1.300 @@ -5622,7 +5622,7 @@ DRIVER.ADC.VAR.ADC1_GROUP0_PIN12_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC2_GROUP2_PIN10_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC1_GROUP1_PIN24_ENABLE.VALUE=0x00000000 -DRIVER.ADC.VAR.ADC1_GROUP1_PIN16_ENABLE.VALUE=0x00010000 +DRIVER.ADC.VAR.ADC1_GROUP1_PIN16_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC1_GROUP1_ACTUAL_SAMPLE_TIME.VALUE=500.00 DRIVER.ADC.VAR.ADC2_GROUP0_PIN6_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC1_GROUP2_TRIGGER_MODE.VALUE=0x00000000 @@ -5642,7 +5642,7 @@ DRIVER.ADC.VAR.ADC2_RAMBASE.VALUE=0xFF3A0000 DRIVER.ADC.VAR.ADC2_GROUP0_BND.VALUE=8 DRIVER.ADC.VAR.ADC1_PORT_BIT0_DOUT.VALUE=0 -DRIVER.ADC.VAR.ADC1_GROUP1_SCAN_TIME.VALUE=721.154 +DRIVER.ADC.VAR.ADC1_GROUP1_SCAN_TIME.VALUE=576.923 DRIVER.ADC.VAR.ADC1_GROUP0_RESOLUTION.VALUE=12_BIT DRIVER.ADC.VAR.ADC2_GROUP2_FIFO_SIZE.VALUE=16 DRIVER.ADC.VAR.ADC2_GROUP1_PIN7_ENABLE.VALUE=0x00000000 @@ -5665,7 +5665,7 @@ DRIVER.ADC.VAR.ADC1_GROUP2_CONTINUOUS_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC1_GROUP0_PIN10_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC2_GROUP1_PINS.VALUE=0 -DRIVER.ADC.VAR.ADC1_GROUP1_PIN22_ENABLE.VALUE=0x00400000 +DRIVER.ADC.VAR.ADC1_GROUP1_PIN22_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC1_GROUP1_PIN14_ENABLE.VALUE=0x00004000 DRIVER.ADC.VAR.ADC2_GROUP0_PIN4_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC1_GROUP2_PIN18_ENABLE.VALUE=0x00000000 @@ -5682,7 +5682,7 @@ DRIVER.ADC.VAR.ADC2_GROUP2_HW_TRIGGER_SOURCE.VALUE=EVENT DRIVER.ADC.VAR.ADC2_GROUP2_ID_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC2_GROUP1_ACTUAL_SAMPLE_TIME.VALUE=384.60 -DRIVER.ADC.VAR.ADC1_GROUP2_LENGTH.VALUE=44 +DRIVER.ADC.VAR.ADC1_GROUP2_LENGTH.VALUE=50 DRIVER.ADC.VAR.ADC1_GROUP0_BND.VALUE=0 DRIVER.ADC.VAR.ADC2_GROUP2_CHANNEL_TOTAL_TIME.VALUE=0.000000 DRIVER.ADC.VAR.ADC2_GROUP2_CONTINUOUS_ENABLE.VALUE=0x00000000 @@ -5701,9 +5701,9 @@ DRIVER.ADC.VAR.ADC1_GROUP2_PIN5_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC1_GROUP0_PIN23_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC1_GROUP0_PIN15_ENABLE.VALUE=0x00000000 -DRIVER.ADC.VAR.ADC1_GROUP1_BND.VALUE=10 +DRIVER.ADC.VAR.ADC1_GROUP1_BND.VALUE=7 DRIVER.ADC.VAR.ADC2_GROUP2_PIN13_ENABLE.VALUE=0x00000000 -DRIVER.ADC.VAR.ADC1_GROUP1_PIN19_ENABLE.VALUE=0x00000000 +DRIVER.ADC.VAR.ADC1_GROUP1_PIN19_ENABLE.VALUE=0x00080000 DRIVER.ADC.VAR.ADC2_PORT_BIT0_DOUT.VALUE=0 DRIVER.ADC.VAR.ADC2_CYCLE_TIME.VALUE=100.00 DRIVER.ADC.VAR.ADC1_GROUP1_HW_TRIGGER_SOURCE.VALUE=EVENT @@ -5739,7 +5739,7 @@ DRIVER.ADC.VAR.ADC1_GROUP0_PIN6_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC2_GROUP2_SCAN_TIME.VALUE=0.000 DRIVER.ADC.VAR.ADC2_GROUP1_HW_TRIGGER_SOURCE.VALUE=EVENT -DRIVER.ADC.VAR.ADC1_GROUP1_CHANNEL_TOTAL_TIME.VALUE=60.721154 +DRIVER.ADC.VAR.ADC1_GROUP1_CHANNEL_TOTAL_TIME.VALUE=49.326923 DRIVER.ADC.VAR.ADC1_GROUP0_EXTENDED_SAMPLE_TIME.VALUE=500.00 DRIVER.ADC.VAR.ADC1_GROUP0_HW_TRIGGER_SOURCE_ALT.VALUE=EVENT DRIVER.ADC.VAR.ADC2_GROUP1_PIN14_ENABLE.VALUE=0x00000000 @@ -5754,7 +5754,7 @@ DRIVER.ADC.VAR.ADC1_GROUP2_HW_TRIGGER_SOURCE_ALT.VALUE=EVENT DRIVER.ADC.VAR.ADC2_GROUP2_PIN11_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC2_GROUP1_CONTINUOUS_ENABLE.VALUE=0x00000000 -DRIVER.ADC.VAR.ADC1_GROUP1_PIN17_ENABLE.VALUE=0x00020000 +DRIVER.ADC.VAR.ADC1_GROUP1_PIN17_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC2_GROUP1_ACTUAL_DISCHARGE_TIME.VALUE=0.00 DRIVER.ADC.VAR.ADC2_GROUP0_PIN7_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC1_GROUP1_PIN10_ENABLE.VALUE=0x00000400 @@ -5765,14 +5765,14 @@ DRIVER.ADC.VAR.ADC1_CYCLE_TIME.VALUE=250 DRIVER.ADC.VAR.ADC2_GROUP0_DISCHARGE_PRESCALER.VALUE=0 DRIVER.ADC.VAR.ADC2_GROUP2_PIN4_ENABLE.VALUE=0x00000000 -DRIVER.ADC.VAR.ADC1_GROUP1_PIN7_ENABLE.VALUE=0x00000000 +DRIVER.ADC.VAR.ADC1_GROUP1_PIN7_ENABLE.VALUE=0x00000080 DRIVER.ADC.VAR.ADC1_GROUP2_DISCHARGE_TIME.VALUE=0.00 DRIVER.ADC.VAR.ADC1_GROUP0_HW_TRIGGER_SOURCE.VALUE=EVENT DRIVER.ADC.VAR.ADC1_GROUP1_PIN0_ENABLE.VALUE=0x00000001 DRIVER.ADC.VAR.ADC1_GROUP0_ID_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC2_GROUP2_DISCHARGE_TIME.VALUE=0.00 DRIVER.ADC.VAR.ADC1_GROUP2_SCAN_TIME.VALUE=0.000 -DRIVER.ADC.VAR.ADC1_GROUP1_PINS.VALUE=16 +DRIVER.ADC.VAR.ADC1_GROUP1_PINS.VALUE=13 DRIVER.ADC.VAR.ADC1_GROUP1_TRIGGER_EDGE_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC1_ALT_TRIG_COMP.VALUE=1 DRIVER.ADC.VAR.ADC1_GROUP0_CONTINUOUS_ENABLE.VALUE=0x00000000 @@ -5808,7 +5808,7 @@ DRIVER.ADC.VAR.ADC2_GROUP1_CHANNEL_TOTAL_TIME.VALUE=0.000000 DRIVER.ADC.VAR.ADC2_GROUP2_PIN2_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC2_GROUP0_CONTINUOUS_ENABLE.VALUE=0x00000000 -DRIVER.ADC.VAR.ADC1_GROUP1_PIN5_ENABLE.VALUE=0x00000020 +DRIVER.ADC.VAR.ADC1_GROUP1_PIN5_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC1_GROUP2_ACTUAL_SAMPLE_TIME.VALUE=500.00 DRIVER.ADC.VAR.ADC1_GROUP0_SCAN_TIME.VALUE=0.000 DRIVER.ADC.VAR.ADC2_GROUP1_PIN6_ENABLE.VALUE=0x00000000 Index: firmware/include/adc.h =================================================================== diff -u -r73d8423edc56daed591bc0b3f7baee5540aea423 -r25824b289643df0560feea73f5529a0f30b7de6d --- firmware/include/adc.h (.../adc.h) (revision 73d8423edc56daed591bc0b3f7baee5540aea423) +++ firmware/include/adc.h (.../adc.h) (revision 25824b289643df0560feea73f5529a0f30b7de6d) @@ -240,7 +240,7 @@ #define ADC1_G1SRC_CONFIGVALUE ((uint32)0x00000000U | (uint32)ADC1_EVENT) #define ADC1_G2SRC_CONFIGVALUE ((uint32)0x00000000U | (uint32)ADC1_EVENT) -#define ADC1_BNDCR_CONFIGVALUE ((uint32)((uint32)0U << 16U)|(0U + 10U)) +#define ADC1_BNDCR_CONFIGVALUE ((uint32)((uint32)0U << 16U)|(0U + 7U)) #define ADC1_BNDEND_CONFIGVALUE (2U) #define ADC1_G0SAMP_CONFIGVALUE (0U) Index: firmware/source/adc.c =================================================================== diff -u -r56100135135bb715d316b5fd002a4a4951b9334a -r25824b289643df0560feea73f5529a0f30b7de6d --- firmware/source/adc.c (.../adc.c) (revision 56100135135bb715d316b5fd002a4a4951b9334a) +++ firmware/source/adc.c (.../adc.c) (revision 25824b289643df0560feea73f5529a0f30b7de6d) @@ -86,7 +86,7 @@ adcREG1->CLOCKCR = 25U; /** - Setup memory boundaries */ - adcREG1->BNDCR = (uint32)((uint32)0U << 16U) | (0U + 10U); + adcREG1->BNDCR = (uint32)((uint32)0U << 16U) | (0U + 7U); adcREG1->BNDEND = (adcREG1->BNDEND & 0xFFFF0000U) | (2U); /** - Setup event group conversion mode @@ -233,13 +233,13 @@ 0x00000000U | 0x00000000U, 0x00000001U | - 0x00000002U | + 0x00000000U | 0x00000004U | 0x00000008U | 0x00000010U | - 0x00000020U | 0x00000000U | 0x00000000U | + 0x00000080U | 0x00000100U | 0x00000000U | 0x00000400U | @@ -248,13 +248,13 @@ 0x00002000U | 0x00004000U | 0x00000000U | - 0x00010000U | - 0x00020000U | + 0x00000000U | + 0x00000000U | 0x00040000U | + 0x00080000U | 0x00000000U | 0x00000000U | 0x00000000U | - 0x00400000U | 0x00000000U, 0x00000000U | 0x00000000U | @@ -334,7 +334,7 @@ static const uint32 s_adcFiFoSize[2U][3U] = { {0U, - 16U, + 13U, 32U}, {16U, 16U,