Index: firmware/App/Drivers/BoostPump.c =================================================================== diff -u -red8321235c296b3c2e431692cc4f3e3db8a41a81 -r51d83f99e63d9cb52951097996641cc5b3ddffd7 --- firmware/App/Drivers/BoostPump.c (.../BoostPump.c) (revision ed8321235c296b3c2e431692cc4f3e3db8a41a81) +++ firmware/App/Drivers/BoostPump.c (.../BoostPump.c) (revision 51d83f99e63d9cb52951097996641cc5b3ddffd7) @@ -124,6 +124,15 @@ if ( pumpID < NUM_OF_BOOST_PUMPS ) { + // enable/disable pump per given PWM + if ( 0 == pwm ) + { + setROPumpEnable( FALSE ); + } + else + { + setROPumpEnable( TRUE ); + } // constrain given pwm magnitude to valid range pwm = MIN( pwm, MAX_BOOST_PUMP_PWM_DUTY_CYCLE ); // set commanded duty cycle for given boost pump to given pwm magnitude Index: firmware/App/Drivers/InternalADC.c =================================================================== diff -u -r129a1c2f4343bc85efdb4767c2dec35e4ba8ce98 -r51d83f99e63d9cb52951097996641cc5b3ddffd7 --- firmware/App/Drivers/InternalADC.c (.../InternalADC.c) (revision 129a1c2f4343bc85efdb4767c2dec35e4ba8ce98) +++ firmware/App/Drivers/InternalADC.c (.../InternalADC.c) (revision 51d83f99e63d9cb52951097996641cc5b3ddffd7) @@ -49,7 +49,7 @@ 0.001465, // V - INT_ADC_5V_LOGIC 0.007106, // V - INT_ADC_24V_ACTUATORS 0.007106, // V - INT_ADC_BACKUP_V - 0.000000, // V - INT_ADC_DUMMY +// 0.000000, // V - INT_ADC_DUMMY }; // ********** private data ********** Index: firmware/App/Drivers/InternalADC.h =================================================================== diff -u -r129a1c2f4343bc85efdb4767c2dec35e4ba8ce98 -r51d83f99e63d9cb52951097996641cc5b3ddffd7 --- firmware/App/Drivers/InternalADC.h (.../InternalADC.h) (revision 129a1c2f4343bc85efdb4767c2dec35e4ba8ce98) +++ firmware/App/Drivers/InternalADC.h (.../InternalADC.h) (revision 51d83f99e63d9cb52951097996641cc5b3ddffd7) @@ -33,7 +33,7 @@ INT_ADC_5V_LOGIC, ///< Internal ADC channel for 5V to logic INT_ADC_24V_ACTUATORS, ///< Internal ADC channel for 24V to actuators INT_ADC_BACKUP_V, ///< Internal ADC channel for VBackup - INT_ADC_DUMMY, ///< Internal ADC channel - not used, needed to get even number of channels +// 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/Drivers/PressureSensor.c =================================================================== diff -u -r3edf8084a5028ee0d00a3fba496284e593e4254d -r51d83f99e63d9cb52951097996641cc5b3ddffd7 --- firmware/App/Drivers/PressureSensor.c (.../PressureSensor.c) (revision 3edf8084a5028ee0d00a3fba496284e593e4254d) +++ firmware/App/Drivers/PressureSensor.c (.../PressureSensor.c) (revision 51d83f99e63d9cb52951097996641cc5b3ddffd7) @@ -34,6 +34,9 @@ #define BAR_TO_MMHG ( 750.062F ) ///< Conversion factor for converting bar to mmHg. #define PRES_SENSORS_READ_ERR_MAX_CNT 0xFF ///< Pressure sensor read and error max count value +#define PRES_MIN_PSI 0.0F ///< Minimum range of pressure sensors (in PSI) +#define PRES_MAX_PSI 145.038F ///< Maximum range of pressure sensors (in PSI) + // ********** private data ********** static OVERRIDE_F32_T currentPressureReadings[ NUM_OF_PRESSURE_SENSORS ]; ///< Current pressure sensor pressure readings (overrideable). @@ -100,11 +103,11 @@ void readPressureSensors( void ) { // Update and convert raw pressures to mmHg - currentPressureReadings[ PRESSURE_SENSOR_WATER_INLET_PRE_REG ].data = convertPressureReading2mmHg( getFPGAPRiRawPressure() ); - currentPressureReadings[ PRESSURE_SENSOR_WATER_INLET_POST_REG ].data = convertPressureReading2mmHg( getFPGAPRoRawPressure() ); - currentPressureReadings[ PRESSURE_SENSOR_WATER_INLET_PRE_COND ].data = convertPressureReading2mmHg( getFPGAPC2oRawPressure() ); - currentPressureReadings[ PRESSURE_SENSOR_PRE_RO_FILTER ].data = convertPressureReading2mmHg( getFPGAPPoRawPressure() ); - currentPressureReadings[ PRESSURE_SENSOR_POST_RO_FILTER ].data = convertPressureReading2mmHg( getFPGAPMpRawPressure() ); + currentPressureReadings[ PRESSURE_SENSOR_WATER_INLET_PRE_REG ].data = convertPressureReading( getFPGAPRiRawPressure(), PRES_MIN_PSI, PRES_MAX_PSI ); + currentPressureReadings[ PRESSURE_SENSOR_WATER_INLET_POST_REG ].data = convertPressureReading( getFPGAPRoRawPressure(), PRES_MIN_PSI, PRES_MAX_PSI ); + currentPressureReadings[ PRESSURE_SENSOR_WATER_INLET_PRE_COND ].data = convertPressureReading( getFPGAPC2oRawPressure(), PRES_MIN_PSI, PRES_MAX_PSI ); + currentPressureReadings[ PRESSURE_SENSOR_PRE_RO_FILTER ].data = convertPressureReading( getFPGAPPoRawPressure(), PRES_MIN_PSI, PRES_MAX_PSI ); + currentPressureReadings[ PRESSURE_SENSOR_POST_RO_FILTER ].data = convertPressureReading( getFPGAPMpRawPressure(), PRES_MIN_PSI, PRES_MAX_PSI ); // Update and convert raw pressure sensor temperatures to deg C currentPresTempReadings[ PRESSURE_SENSOR_WATER_INLET_PRE_REG ].data = convertPressureTempReading2DegC( getFPGAPRiRawTemperature() ); Index: firmware/App/Monitors/Pressure.c =================================================================== diff -u -r3edf8084a5028ee0d00a3fba496284e593e4254d -r51d83f99e63d9cb52951097996641cc5b3ddffd7 --- firmware/App/Monitors/Pressure.c (.../Pressure.c) (revision 3edf8084a5028ee0d00a3fba496284e593e4254d) +++ firmware/App/Monitors/Pressure.c (.../Pressure.c) (revision 51d83f99e63d9cb52951097996641cc5b3ddffd7) @@ -35,7 +35,6 @@ #define PRESSURE_TEMP_SAMPLE_FILTER_MS ( 200 ) ///< Filter temperature data for given time #define SIZE_OF_PRESSURE_ROLLING_AVG ( PRESSURE_SAMPLE_FILTER_MS / TASK_PRIORITY_INTERVAL ) ///< Filtered pressure moving average. #define SIZE_OF_PRESSURETEMP_ROLLING_AVG ( PRESSURE_TEMP_SAMPLE_FILTER_MS / TASK_PRIORITY_INTERVAL ) ///< Filtered pressure temprature w/ 1 second moving average. -#define MMHG_TO_PSI_CONVERSION 0.0193368F ///< MMHG to PSI conversion. #define MIN_INLET_WATER_PRESSURE_WARNING_LOW_PSIG 20.0F ///< Minimum allowed Input low pressure value in psig. #define MAX_INLET_WATER_PRESSURE_WARNING_HIGH_PSIG 80.0F ///< Maximum allowed Input high pressure value in psig. @@ -406,12 +405,10 @@ *************************************************************************/ static F32 getConvertedPressure( PRESSURE_SENSORS_T sensor, F32 pressure ) { - F32 pressurePSI = pressure * MMHG_TO_PSI_CONVERSION; - // calibrate pressure - //F32 calPressure = getCalibrationAppliedPressure( sensor, pressurePSI ); // TODO + //F32 calPressure = getCalibrationAppliedPressure( sensor, pressure ); // TODO - return pressurePSI; // calPressure; + return pressure; // calPressure; } /*********************************************************************//** Index: firmware/App/Services/FpgaRO.c =================================================================== diff -u -rf47296145b6a0adb78df0e325587629171909fd6 -r51d83f99e63d9cb52951097996641cc5b3ddffd7 --- firmware/App/Services/FpgaRO.c (.../FpgaRO.c) (revision f47296145b6a0adb78df0e325587629171909fd6) +++ firmware/App/Services/FpgaRO.c (.../FpgaRO.c) (revision 51d83f99e63d9cb52951097996641cc5b3ddffd7) @@ -146,7 +146,7 @@ U16 fpgaGenWrRd; ///< Reg 20. FPGA general write/read-back register (mirrored to a general read register in read page at addr 256). U16 descalePumpSpeed; ///< Reg 22. Descaler pump speed register. U08 descalePumpControl; ///< Reg 24. Descaler pump control register. - U08 reserved1; ///< Reg 25. Reserved. + U08 roPumpControl; ///< Reg 25. RO pump control register.. U16 valveVwiPWMLow; ///< Reg 26. Valve VWi PWM low pulse period in 0.1 uSec. U16 valveVwiPWMPeriod; ///< Reg 28. Valve VWi PWM full period in 0.1 uSec. U16 valvePWMPullIn; ///< Reg 30. Valve PWM high pulse period when valve is on in 0.1 uSec. @@ -382,6 +382,19 @@ /*********************************************************************//** * @brief + * The setROPumpEnable function enables or disables the RO pump. + * @details \b Inputs: none + * @details \b Outputs: fpgaActuatorSetPoints.roPumpControl + * @param enable flag indicating whether to enable or disable the RO pump. + * @return none + *************************************************************************/ +void setROPumpEnable( BOOL enable ) +{ + fpgaActuatorSetPoints.roPumpControl = ( TRUE == enable ? 0x1 : 0x0 ); +} + +/*********************************************************************//** + * @brief * The setROPumpPWMPct function sets the RO pump PWM duty cycle. * The higher the PWM duty cycle (0..500), the faster the pump will go. * @details \b Inputs: none Index: firmware/App/Services/FpgaRO.h =================================================================== diff -u -rf47296145b6a0adb78df0e325587629171909fd6 -r51d83f99e63d9cb52951097996641cc5b3ddffd7 --- firmware/App/Services/FpgaRO.h (.../FpgaRO.h) (revision f47296145b6a0adb78df0e325587629171909fd6) +++ firmware/App/Services/FpgaRO.h (.../FpgaRO.h) (revision 51d83f99e63d9cb52951097996641cc5b3ddffd7) @@ -44,6 +44,7 @@ void setFPGAValveStates( U16 valveStates ); U08 getFPGAValveStates( void ); +void setROPumpEnable( BOOL enable ); void setROPumpPWMPct( U16 pwm ); U16 getROPumpPWMPct( void ); U16 getROPumpTachCount( void ); Index: firmware/App/Services/Messaging.c =================================================================== diff -u -re7528bc3938f0ef6e05960045e24dc91ac87f344 -r51d83f99e63d9cb52951097996641cc5b3ddffd7 --- firmware/App/Services/Messaging.c (.../Messaging.c) (revision e7528bc3938f0ef6e05960045e24dc91ac87f344) +++ firmware/App/Services/Messaging.c (.../Messaging.c) (revision 51d83f99e63d9cb52951097996641cc5b3ddffd7) @@ -325,7 +325,7 @@ } } // ACK/NAK request - if ( message->hdr.msgID < MSG_ID_FIRST_DD_TESTER_MESSAGE ) + if ( message->hdr.msgID < MSG_ID_FIRST_TD_TESTER_MESSAGE ) { if ( respBuffer != COMM_BUFFER_NOT_USED ) { Index: firmware/RO.dil =================================================================== diff -u -re7528bc3938f0ef6e05960045e24dc91ac87f344 -r51d83f99e63d9cb52951097996641cc5b3ddffd7 --- firmware/RO.dil (.../RO.dil) (revision e7528bc3938f0ef6e05960045e24dc91ac87f344) +++ firmware/RO.dil (.../RO.dil) (revision 51d83f99e63d9cb52951097996641cc5b3ddffd7) @@ -1,4 +1,4 @@ -# RM46L852PGE 11/30/24 08:57:58 +# RM46L852PGE 12/03/24 09:11:13 # 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=0x00200000 -DRIVER.ADC.VAR.ADC1_GROUP1_PIN13_ENABLE.VALUE=0x00002000 +DRIVER.ADC.VAR.ADC1_GROUP1_PIN21_ENABLE.VALUE=0x00000000 +DRIVER.ADC.VAR.ADC1_GROUP1_PIN13_ENABLE.VALUE=0x00000000 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 @@ -5553,7 +5553,7 @@ 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=24 +DRIVER.ADC.VAR.ADC1_GROUP1_FIFO_SIZE.VALUE=10 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=24 @@ -5575,9 +5575,9 @@ DRIVER.ADC.VAR.ADC2_GROUP2_ACTUAL_SAMPLE_TIME.VALUE=384.60 DRIVER.ADC.VAR.ADC2_GROUP2_SAMPLE_PRESCALER.VALUE=2 DRIVER.ADC.VAR.ADC2_GROUP2_PIN12_ENABLE.VALUE=0x00000000 -DRIVER.ADC.VAR.ADC1_GROUP1_PIN18_ENABLE.VALUE=0x00040000 +DRIVER.ADC.VAR.ADC1_GROUP1_PIN18_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC2_GROUP0_PIN8_ENABLE.VALUE=0x00000000 -DRIVER.ADC.VAR.ADC1_GROUP1_PIN11_ENABLE.VALUE=0x00000800 +DRIVER.ADC.VAR.ADC1_GROUP1_PIN11_ENABLE.VALUE=0x00000000 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 @@ -5588,7 +5588,7 @@ DRIVER.ADC.VAR.ADC2_GROUP2_PIN5_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_GROUP1_EXTENDED_SAMPLE_TIME.VALUE=500.00 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=0x00000002 @@ -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=0x00000040 +DRIVER.ADC.VAR.ADC1_GROUP1_PIN6_ENABLE.VALUE=0x00000000 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=1112.885 +DRIVER.ADC.VAR.ADC1_GROUP1_SCAN_TIME.VALUE=432.692 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,16 +5665,16 @@ 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_PIN14_ENABLE.VALUE=0x00004000 +DRIVER.ADC.VAR.ADC1_GROUP1_PIN22_ENABLE.VALUE=0x00000000 +DRIVER.ADC.VAR.ADC1_GROUP1_PIN14_ENABLE.VALUE=0x00000000 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 DRIVER.ADC.VAR.ADC2_GROUP2_TRIGGER_EDGE_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC1_GROUP2_PIN11_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC2_GROUP2_PIN1_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC1_GROUP2_FIFO_SIZE.VALUE=32 -DRIVER.ADC.VAR.ADC1_GROUP1_PIN4_ENABLE.VALUE=0x00000010 +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=0 @@ -5703,14 +5703,14 @@ DRIVER.ADC.VAR.ADC1_GROUP0_PIN15_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC1_GROUP1_BND.VALUE=12 DRIVER.ADC.VAR.ADC2_GROUP2_PIN13_ENABLE.VALUE=0x00000000 -DRIVER.ADC.VAR.ADC1_GROUP1_PIN19_ENABLE.VALUE=0x00080000 +DRIVER.ADC.VAR.ADC1_GROUP1_PIN19_ENABLE.VALUE=0x00000000 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 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=0x00100000 +DRIVER.ADC.VAR.ADC1_GROUP1_PIN20_ENABLE.VALUE=0x00000000 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 @@ -5726,7 +5726,7 @@ 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=0x00000004 -DRIVER.ADC.VAR.ADC1_GROUP1_CONVERSION_TIME.VALUE=3.271 +DRIVER.ADC.VAR.ADC1_GROUP1_CONVERSION_TIME.VALUE=3.250 DRIVER.ADC.VAR.ADC1_GROUP0_FIFO_SIZE.VALUE=0 DRIVER.ADC.VAR.ADC1_PORT_BIT0_PULL.VALUE=2 DRIVER.ADC.VAR.ADC1_GROUP0_LENGTH.VALUE=0 @@ -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=91.694165 +DRIVER.ADC.VAR.ADC1_GROUP1_CHANNEL_TOTAL_TIME.VALUE=37.932692 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 @@ -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 @@ -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=24 +DRIVER.ADC.VAR.ADC1_GROUP1_PINS.VALUE=10 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 @@ -5791,8 +5791,8 @@ DRIVER.ADC.VAR.ADC1_GROUP2_PIN1_ENABLE.VALUE=0x00000000 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=0x00800000 -DRIVER.ADC.VAR.ADC1_GROUP1_PIN15_ENABLE.VALUE=0x00008000 +DRIVER.ADC.VAR.ADC1_GROUP1_PIN23_ENABLE.VALUE=0x00000000 +DRIVER.ADC.VAR.ADC1_GROUP1_PIN15_ENABLE.VALUE=0x00000000 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=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/source/adc.c =================================================================== diff -u -r533272e6ef2873fcfe7a41338a6c88c7a601605d -r51d83f99e63d9cb52951097996641cc5b3ddffd7 --- firmware/source/adc.c (.../adc.c) (revision 533272e6ef2873fcfe7a41338a6c88c7a601605d) +++ firmware/source/adc.c (.../adc.c) (revision 51d83f99e63d9cb52951097996641cc5b3ddffd7) @@ -236,32 +236,26 @@ 0x00000002U | 0x00000004U | 0x00000008U | - 0x00000010U | - 0x00000020U | - 0x00000040U | + 0x00000000U | + 0x00000000U | + 0x00000000U | 0x00000080U | 0x00000100U | 0x00000200U | 0x00000400U | - 0x00000800U | + 0x00000000U | 0x00001000U | - 0x00002000U | - 0x00004000U | - 0x00008000U | + 0x00000000U | + 0x00000000U | + 0x00000000U | 0x00010000U | - 0x00020000U | - 0x00040000U | - 0x00080000U | - 0x00100000U | - 0x00200000U | - 0x00400000U | - 0x00800000U, 0x00000000U | 0x00000000U | 0x00000000U | 0x00000000U | 0x00000000U | 0x00000000U | + 0x00000000U, 0x00000000U | 0x00000000U | 0x00000000U | @@ -279,6 +273,12 @@ 0x00000000U | 0x00000000U | 0x00000000U | + 0x00000000U | + 0x00000000U | + 0x00000000U | + 0x00000000U | + 0x00000000U | + 0x00000000U | 0x00000000U}, {0x00000000U | 0x00000000U | @@ -334,7 +334,7 @@ static const uint32 s_adcFiFoSize[2U][3U] = { {0U, - 24U, + 10U, 32U}, {16U, 16U,