Index: firmware/App/Drivers/InternalADC.c =================================================================== diff -u -r8b56b0c617ac49536b8d53852b9621be873bade6 -ra49bd0780d97bb4ce04a9d7b128a6e3c2df044e1 --- firmware/App/Drivers/InternalADC.c (.../InternalADC.c) (revision 8b56b0c617ac49536b8d53852b9621be873bade6) +++ firmware/App/Drivers/InternalADC.c (.../InternalADC.c) (revision a49bd0780d97bb4ce04a9d7b128a6e3c2df044e1) @@ -26,28 +26,28 @@ const INT_ADC_CHANNEL_T adcChannelNum2ChannelId[ MAX_ADC_CHANNELS ] = { - INT_ADC_DIAL_IN_PUMP_SPEED, // 0 - INT_ADC_NOT_USED, // 1 - INT_ADC_NOT_USED, // 2 - INT_ADC_NOT_USED, // 3 + INT_ADC_RO_PUMP_INLET_PRESSURE, // 0 + INT_ADC_RO_PUMP_OUTLET_PRESSURE, // 1 + INT_ADC_DRAIN_PUMP_OUTLET_PRESSURE, // 2 + INT_ADC_DRAIN_PUMP_INLET_PRESSURE, // 3 INT_ADC_NOT_USED, // 4 - INT_ADC_NOT_USED, // 5 - INT_ADC_NOT_USED, // 6 - INT_ADC_DIAL_IN_PUMP_MOTOR_CURRENT, // 7 - INT_ADC_NOT_USED, // 8 - INT_ADC_NOT_USED, // 9 - INT_ADC_NOT_USED, // 10 - INT_ADC_NOT_USED, // 11 - INT_ADC_NOT_USED, // 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_DIAL_OUT_PUMP_SPEED, // 18 - INT_ADC_DIAL_OUT_PUMP_MOTOR_CURRENT,// 19 - INT_ADC_NOT_USED, // 20 - INT_ADC_NOT_USED, // 21 + INT_ADC_FPGA_1_8_VOLTS, // 5 + INT_ADC_FPGA_1_VOLT, // 6 + INT_ADC_SENSORS_3_3_VOLTS, // 7 + INT_ADC_PROCESSOR_1_8_VOLTS, // 8 + INT_ADC_SENSORS_6_VOLTS, // 9 + INT_ADC_SENSORS_5_VOLTS, // 10 + INT_ADC_LOGIC_5_VOLTS, // 11 + INT_ADC_3_3_VOLTS, // 12 + INT_ADC_CONCENTRATE_PUMP_1, // 13 + INT_ADC_CONCENTRATE_PUMP_2, // 14 + INT_ADC_PROCESSOR_1_2_VOLTS, // 15 + INT_ADC_REFERENCE_VOLTAGE, // 16 + INT_ADC_PRIMARY_HEATER_24_VOLTS, // 17 + INT_ADC_TRIMMER_HEATER_24_VOLTS, // 18 + INT_ADC_REF_IN1, // 19 + INT_ADC_REF_IN2, // 20 + INT_ADC_BOARD_THERMISTOR, // 21 INT_ADC_NOT_USED, // 22 INT_ADC_NOT_USED // 23 }; Index: firmware/App/Drivers/InternalADC.h =================================================================== diff -u -r8b56b0c617ac49536b8d53852b9621be873bade6 -ra49bd0780d97bb4ce04a9d7b128a6e3c2df044e1 --- firmware/App/Drivers/InternalADC.h (.../InternalADC.h) (revision 8b56b0c617ac49536b8d53852b9621be873bade6) +++ firmware/App/Drivers/InternalADC.h (.../InternalADC.h) (revision a49bd0780d97bb4ce04a9d7b128a6e3c2df044e1) @@ -31,13 +31,28 @@ typedef enum Int_ADC_Channels { - INT_ADC_NOT_USED = 0, // TODO - replace with DG channels - INT_ADC_BLOOD_PUMP_SPEED, - INT_ADC_BLOOD_PUMP_MOTOR_CURRENT, - INT_ADC_DIAL_IN_PUMP_SPEED, - INT_ADC_DIAL_IN_PUMP_MOTOR_CURRENT, - INT_ADC_DIAL_OUT_PUMP_SPEED, - INT_ADC_DIAL_OUT_PUMP_MOTOR_CURRENT, + INT_ADC_NOT_USED = 0, + INT_ADC_RO_PUMP_INLET_PRESSURE, + INT_ADC_RO_PUMP_OUTLET_PRESSURE, + INT_ADC_DRAIN_PUMP_OUTLET_PRESSURE, + INT_ADC_DRAIN_PUMP_INLET_PRESSURE, + INT_ADC_CONCENTRATE_PUMP_1, + INT_ADC_CONCENTRATE_PUMP_2, + INT_ADC_PRIMARY_HEATER_24_VOLTS, + INT_ADC_TRIMMER_HEATER_24_VOLTS, + INT_ADC_BOARD_THERMISTOR, + INT_ADC_FPGA_1_8_VOLTS, + INT_ADC_FPGA_1_VOLT, + INT_ADC_PROCESSOR_1_8_VOLTS, + INT_ADC_PROCESSOR_1_2_VOLTS, + INT_ADC_SENSORS_3_3_VOLTS, + INT_ADC_SENSORS_5_VOLTS, + INT_ADC_SENSORS_6_VOLTS, + INT_ADC_LOGIC_5_VOLTS, + INT_ADC_3_3_VOLTS, + INT_ADC_REFERENCE_VOLTAGE, + INT_ADC_REF_IN1, + INT_ADC_REF_IN2, NUM_OF_INT_ADC_CHANNELS } INT_ADC_CHANNEL_T; Index: firmware/DG.dil =================================================================== diff -u -r0774a37971585dacdc8398362393920c13d48426 -ra49bd0780d97bb4ce04a9d7b128a6e3c2df044e1 --- firmware/DG.dil (.../DG.dil) (revision 0774a37971585dacdc8398362393920c13d48426) +++ firmware/DG.dil (.../DG.dil) (revision a49bd0780d97bb4ce04a9d7b128a6e3c2df044e1) @@ -1,4 +1,4 @@ -# RM46L852PGE 03/04/20 18:29:39 +# RM46L852PGE 03/23/20 11:42:59 # ARCH=RM46L852PGE # @@ -5535,8 +5535,8 @@ DRIVER.CAN.VAR.CAN_2_MESSAGE_13_ID.VALUE=13 DRIVER.CAN.VAR.CAN_2_MESSAGE_8_ID.VALUE=8 DRIVER.ADC.VAR.ADC2_GROUP1_DISCHARGE_PRESCALER.VALUE=0 -DRIVER.ADC.VAR.ADC1_GROUP1_PIN21_ENABLE.VALUE=0x00000000 -DRIVER.ADC.VAR.ADC1_GROUP1_PIN13_ENABLE.VALUE=0x00000000 +DRIVER.ADC.VAR.ADC1_GROUP1_PIN21_ENABLE.VALUE=0x00200000 +DRIVER.ADC.VAR.ADC1_GROUP1_PIN13_ENABLE.VALUE=0x00002000 DRIVER.ADC.VAR.ADC1_GROUP1_ACTUAL_DISCHARGE_TIME.VALUE=0.00 DRIVER.ADC.VAR.ADC2_GROUP1_RESOLUTION.VALUE=12_BIT DRIVER.ADC.VAR.ADC2_GROUP0_PIN3_ENABLE.VALUE=0x00000000 @@ -5551,12 +5551,12 @@ DRIVER.ADC.VAR.ADC2_GROUP1_EXTENDED_SAMPLE_TIME.VALUE=300.00 DRIVER.ADC.VAR.ADC2_GROUP2_PIN0_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC2_GROUP2_RAM_PARITY_ENA.VALUE=0 -DRIVER.ADC.VAR.ADC1_GROUP1_PIN3_ENABLE.VALUE=0x00000000 +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=6 +DRIVER.ADC.VAR.ADC1_GROUP1_FIFO_SIZE.VALUE=21 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=6 +DRIVER.ADC.VAR.ADC1_GROUP1_LENGTH.VALUE=22 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 @@ -5577,7 +5577,7 @@ DRIVER.ADC.VAR.ADC2_GROUP2_PIN12_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC1_GROUP1_PIN18_ENABLE.VALUE=0x00040000 DRIVER.ADC.VAR.ADC2_GROUP0_PIN8_ENABLE.VALUE=0x00000000 -DRIVER.ADC.VAR.ADC1_GROUP1_PIN11_ENABLE.VALUE=0x00000000 +DRIVER.ADC.VAR.ADC1_GROUP1_PIN11_ENABLE.VALUE=0x00000800 DRIVER.ADC.VAR.ADC1_BND.VALUE=2 DRIVER.ADC.VAR.ADC2_GROUP0_PIN1_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC1_GROUP2_PIN23_ENABLE.VALUE=0x00000000 @@ -5586,12 +5586,12 @@ DRIVER.ADC.VAR.ADC1_GROUP1_SAMPLE_PRESCALER.VALUE=0 DRIVER.ADC.VAR.ADC2_PORT_BIT0_PULDIS.VALUE=0 DRIVER.ADC.VAR.ADC2_GROUP2_PIN5_ENABLE.VALUE=0x00000000 -DRIVER.ADC.VAR.ADC1_GROUP1_PIN8_ENABLE.VALUE=0x00000000 +DRIVER.ADC.VAR.ADC1_GROUP1_PIN8_ENABLE.VALUE=0x00000100 DRIVER.ADC.VAR.ADC1_GROUP1_ID_ENABLE.VALUE=0x00000020 DRIVER.ADC.VAR.ADC1_GROUP1_EXTENDED_SAMPLE_TIME.VALUE=503.22 DRIVER.ADC.VAR.ADC1_GROUP0_CONVERSION_TIME.VALUE=3.271 DRIVER.ADC.VAR.ADC2_GROUP0_RESOLUTION.VALUE=12_BIT -DRIVER.ADC.VAR.ADC1_GROUP1_PIN1_ENABLE.VALUE=0x00000000 +DRIVER.ADC.VAR.ADC1_GROUP1_PIN1_ENABLE.VALUE=0x00000002 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 @@ -5638,11 +5638,11 @@ DRIVER.ADC.VAR.ADC2_GROUP0_SAMPLE_PRESCALER.VALUE=2 DRIVER.ADC.VAR.ADC1_GROUP0_DISCHARGE_PRESCALER.VALUE=0 DRIVER.ADC.VAR.ADC2_GROUP2_PIN3_ENABLE.VALUE=0x00000000 -DRIVER.ADC.VAR.ADC1_GROUP1_PIN6_ENABLE.VALUE=0x00000000 +DRIVER.ADC.VAR.ADC1_GROUP1_PIN6_ENABLE.VALUE=0x00000040 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=241.932 +DRIVER.ADC.VAR.ADC1_GROUP1_SCAN_TIME.VALUE=967.726 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 @@ -5666,7 +5666,7 @@ 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=0x00000000 -DRIVER.ADC.VAR.ADC1_GROUP1_PIN14_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 DRIVER.ADC.VAR.ADC2_GROUP2_PIN8_ENABLE.VALUE=0x00000000 @@ -5677,12 +5677,12 @@ DRIVER.ADC.VAR.ADC1_GROUP1_PIN4_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC1_RAMBASE.VALUE=0xFF3E0000 DRIVER.ADC.VAR.ADC1_BASE.VALUE=0xFFF7C000 -DRIVER.ADC.VAR.ADC1_PORT_BIT0_DIR.VALUE=1 +DRIVER.ADC.VAR.ADC1_PORT_BIT0_DIR.VALUE=0 DRIVER.ADC.VAR.ADC2_RAM_PARITY_ENA.VALUE=0x00000005 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=387.08 -DRIVER.ADC.VAR.ADC1_GROUP2_LENGTH.VALUE=58 +DRIVER.ADC.VAR.ADC1_GROUP2_LENGTH.VALUE=42 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,7 +5701,7 @@ 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=3 +DRIVER.ADC.VAR.ADC1_GROUP1_BND.VALUE=11 DRIVER.ADC.VAR.ADC2_GROUP2_PIN13_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC1_GROUP1_PIN19_ENABLE.VALUE=0x00080000 DRIVER.ADC.VAR.ADC2_PORT_BIT0_DOUT.VALUE=0 @@ -5710,8 +5710,8 @@ DRIVER.ADC.VAR.ADC1_GROUP1_DISCHARGE_PRESCALER.VALUE=0 DRIVER.ADC.VAR.ADC2_GROUP0_PIN9_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC2_PRESCALE.VALUE=9 -DRIVER.ADC.VAR.ADC1_GROUP1_PIN20_ENABLE.VALUE=0x00000000 -DRIVER.ADC.VAR.ADC1_GROUP1_PIN12_ENABLE.VALUE=0x00000000 +DRIVER.ADC.VAR.ADC1_GROUP1_PIN20_ENABLE.VALUE=0x00100000 +DRIVER.ADC.VAR.ADC1_GROUP1_PIN12_ENABLE.VALUE=0x00001000 DRIVER.ADC.VAR.ADC1_GROUP0_RAM_PARITY_ENA.VALUE=0 DRIVER.ADC.VAR.ADC2_GROUP0_SAMPLE_TIME.VALUE=300.00 DRIVER.ADC.VAR.ADC2_BASE.VALUE=0xFFF7C200 @@ -5721,14 +5721,14 @@ DRIVER.ADC.VAR.ADC1_GROUP2_PIN16_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC1_GROUP2_ID_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC2_GROUP2_PIN6_ENABLE.VALUE=0x00000000 -DRIVER.ADC.VAR.ADC1_GROUP1_PIN9_ENABLE.VALUE=0x00000000 +DRIVER.ADC.VAR.ADC1_GROUP1_PIN9_ENABLE.VALUE=0x00000200 DRIVER.ADC.VAR.ADC1_GROUP1_CONTINUOUS_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC1_PORT_BIT0_PDR.VALUE=0 DRIVER.ADC.VAR.ADC1_GROUP1_SAMPLE_TIME.VALUE=300.00 -DRIVER.ADC.VAR.ADC1_GROUP1_PIN2_ENABLE.VALUE=0x00000000 +DRIVER.ADC.VAR.ADC1_GROUP1_PIN2_ENABLE.VALUE=0x00000004 DRIVER.ADC.VAR.ADC1_GROUP1_CONVERSION_TIME.VALUE=3.271 DRIVER.ADC.VAR.ADC1_GROUP0_FIFO_SIZE.VALUE=0 -DRIVER.ADC.VAR.ADC1_PORT_BIT0_PULL.VALUE=1 +DRIVER.ADC.VAR.ADC1_PORT_BIT0_PULL.VALUE=2 DRIVER.ADC.VAR.ADC1_GROUP0_LENGTH.VALUE=0 DRIVER.ADC.VAR.ADC2_GROUP1_CONVERSION_TIME.VALUE=1.300 DRIVER.ADC.VAR.ADC1_GROUP0_PINS.VALUE=0 @@ -5739,11 +5739,11 @@ 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=22.887252 +DRIVER.ADC.VAR.ADC1_GROUP1_CHANNEL_TOTAL_TIME.VALUE=80.226346 DRIVER.ADC.VAR.ADC1_GROUP0_EXTENDED_SAMPLE_TIME.VALUE=503.22 DRIVER.ADC.VAR.ADC1_GROUP0_HW_TRIGGER_SOURCE_ALT.VALUE=EVENT DRIVER.ADC.VAR.ADC2_GROUP1_PIN14_ENABLE.VALUE=0x00000000 -DRIVER.ADC.VAR.ADC1_PORT_BIT0_PSL.VALUE=0 +DRIVER.ADC.VAR.ADC1_PORT_BIT0_PSL.VALUE=1 DRIVER.ADC.VAR.ADC1_GROUP2_EXTENDED_SAMPLE_TIME.VALUE=503.22 DRIVER.ADC.VAR.ADC2_GROUP1_LENGTH.VALUE=16 DRIVER.ADC.VAR.ADC1_GROUP1_HW_TRIGGER_SOURCE_ALT.VALUE=EVENT @@ -5757,7 +5757,7 @@ DRIVER.ADC.VAR.ADC1_GROUP1_PIN17_ENABLE.VALUE=0x00020000 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=0x00000000 +DRIVER.ADC.VAR.ADC1_GROUP1_PIN10_ENABLE.VALUE=0x00000400 DRIVER.ADC.VAR.ADC2_GROUP2_ACTUAL_DISCHARGE_TIME.VALUE=0.00 DRIVER.ADC.VAR.ADC2_GROUP0_PIN0_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC1_GROUP2_PIN22_ENABLE.VALUE=0x00000000 @@ -5772,7 +5772,7 @@ 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=6 +DRIVER.ADC.VAR.ADC1_GROUP1_PINS.VALUE=21 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 @@ -5792,7 +5792,7 @@ DRIVER.ADC.VAR.ADC1_GROUP0_PIN11_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC2_GROUP0_SCAN_TIME.VALUE=0.000 DRIVER.ADC.VAR.ADC1_GROUP1_PIN23_ENABLE.VALUE=0x00000000 -DRIVER.ADC.VAR.ADC1_GROUP1_PIN15_ENABLE.VALUE=0x00000000 +DRIVER.ADC.VAR.ADC1_GROUP1_PIN15_ENABLE.VALUE=0x00008000 DRIVER.ADC.VAR.ADC2_GROUP0_HW_TRIGGER_SOURCE.VALUE=EVENT DRIVER.ADC.VAR.ADC2_GROUP0_PIN5_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC1_GROUP2_PIN19_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=0x00000000 +DRIVER.ADC.VAR.ADC1_GROUP1_PIN5_ENABLE.VALUE=0x00000020 DRIVER.ADC.VAR.ADC1_GROUP2_ACTUAL_SAMPLE_TIME.VALUE=503.22 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 -rf068446fdb7889d320ddb6ffbd58f347ce0501e7 -ra49bd0780d97bb4ce04a9d7b128a6e3c2df044e1 --- firmware/include/adc.h (.../adc.h) (revision f068446fdb7889d320ddb6ffbd58f347ce0501e7) +++ firmware/include/adc.h (.../adc.h) (revision a49bd0780d97bb4ce04a9d7b128a6e3c2df044e1) @@ -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 + 3U)) +#define ADC1_BNDCR_CONFIGVALUE ((uint32)((uint32)0U << 16U)|(0U + 11U)) #define ADC1_BNDEND_CONFIGVALUE (2U) #define ADC1_G0SAMP_CONFIGVALUE (0U) Index: firmware/source/adc.c =================================================================== diff -u -r6d2d8f0267c57135554e5a1acaca9aef37f27949 -ra49bd0780d97bb4ce04a9d7b128a6e3c2df044e1 --- firmware/source/adc.c (.../adc.c) (revision 6d2d8f0267c57135554e5a1acaca9aef37f27949) +++ firmware/source/adc.c (.../adc.c) (revision a49bd0780d97bb4ce04a9d7b128a6e3c2df044e1) @@ -86,7 +86,7 @@ adcREG1->CLOCKCR = 25U; /** - Setup memory boundaries */ - adcREG1->BNDCR = (uint32)((uint32)0U << 16U) | (0U + 3U); + adcREG1->BNDCR = (uint32)((uint32)0U << 16U) | (0U + 11U); adcREG1->BNDEND = (adcREG1->BNDEND & 0xFFFF0000U) | (2U); /** - Setup event group conversion mode @@ -173,13 +173,13 @@ adcREG1->EVTOUT = 0U; /** - ADC1 EVT pin direction */ - adcREG1->EVTDIR = 1U; + adcREG1->EVTDIR = 0U; /** - ADC1 EVT pin open drain enable */ adcREG1->EVTPDR = 0U; /** - ADC1 EVT pin pullup / pulldown selection */ - adcREG1->EVTPSEL = 0U; + adcREG1->EVTPSEL = 1U; /** - ADC1 EVT pin pullup / pulldown enable*/ adcREG1->EVTDIS = 0U; @@ -233,28 +233,28 @@ 0x00000000U | 0x00000000U, 0x00000001U | + 0x00000002U | + 0x00000004U | + 0x00000008U | 0x00000000U | - 0x00000000U | - 0x00000000U | - 0x00000000U | - 0x00000000U | - 0x00000000U | + 0x00000020U | + 0x00000040U | 0x00000080U | - 0x00000000U | - 0x00000000U | - 0x00000000U | - 0x00000000U | - 0x00000000U | - 0x00000000U | - 0x00000000U | - 0x00000000U | + 0x00000100U | + 0x00000200U | + 0x00000400U | + 0x00000800U | + 0x00001000U | + 0x00002000U | + 0x00004000U | + 0x00008000U | 0x00010000U | 0x00020000U | 0x00040000U | 0x00080000U | + 0x00100000U | + 0x00200000U | 0x00000000U | - 0x00000000U | - 0x00000000U | 0x00000000U, 0x00000000U | 0x00000000U | @@ -334,7 +334,7 @@ static const uint32 s_adcFiFoSize[2U][3U] = { {0U, - 6U, + 21U, 32U}, {16U, 16U,