Index: firmware/App/Controllers/DrainPump.c =================================================================== diff -u -r4e11c80367b5ae522aa34fb137079e516c98831b -r2e21405574597474db0ebae86cdd7fa2d517f71c --- firmware/App/Controllers/DrainPump.c (.../DrainPump.c) (revision 4e11c80367b5ae522aa34fb137079e516c98831b) +++ firmware/App/Controllers/DrainPump.c (.../DrainPump.c) (revision 2e21405574597474db0ebae86cdd7fa2d517f71c) @@ -7,8 +7,8 @@ * * @file DrainPump.c * -* @author (last) Bill Bracken -* @date (last) 22-Aug-2022 +* @author (last) Dara Navaei +* @date (last) 28-Aug-2022 * * @author (original) Sean * @date (original) 08-Apr-2020 Index: firmware/App/Controllers/Fans.c =================================================================== diff -u -r4e11c80367b5ae522aa34fb137079e516c98831b -r2e21405574597474db0ebae86cdd7fa2d517f71c --- firmware/App/Controllers/Fans.c (.../Fans.c) (revision 4e11c80367b5ae522aa34fb137079e516c98831b) +++ firmware/App/Controllers/Fans.c (.../Fans.c) (revision 2e21405574597474db0ebae86cdd7fa2d517f71c) @@ -7,8 +7,8 @@ * * @file Fans.c * -* @author (last) Sean Nash -* @date (last) 15-Jul-2022 +* @author (last) Dara Navaei +* @date (last) 04-Aug-2022 * * @author (original) Dara Navaei * @date (original) 25-Nov-2020 Index: firmware/App/Controllers/FlowSensors.c =================================================================== diff -u -r256d5cb05f1ef09e19e2f2733a111f600c73a7ee -r2e21405574597474db0ebae86cdd7fa2d517f71c --- firmware/App/Controllers/FlowSensors.c (.../FlowSensors.c) (revision 256d5cb05f1ef09e19e2f2733a111f600c73a7ee) +++ firmware/App/Controllers/FlowSensors.c (.../FlowSensors.c) (revision 2e21405574597474db0ebae86cdd7fa2d517f71c) @@ -33,30 +33,30 @@ // ********** private definitions ********** -#define FLOW_SENSORS_DATA_PUB_INTERVAL ( MS_PER_SECOND / TASK_PRIORITY_INTERVAL ) ///< Interval (ms/task time) at which the Dialysate flow data is published on the CAN bus. -#define FLOW_SENSORS_EDGES_BUFFER_LENGTH 100 -#define FLOW_SENSORS_PULSES_PER_LITER 110000 // TODO calibration record +#define FLOW_SENSORS_DATA_PUB_INTERVAL ( MS_PER_SECOND / TASK_PRIORITY_INTERVAL ) ///< Interval (ms/task time) at which the Dialysate flow data is published on the CAN bus. +#define FLOW_SENSORS_EDGES_BUFFER_LENGTH 100 ///< Flow sensors edges buffer length. +#define FLOW_SENSORS_PULSES_PER_LITER 110000 ///< Flow sensors pulses per liter +#define FLOW_OUT_OF_RANGE_PERSISTENT_INTERVAL ( 12 * MS_PER_SECOND ) ///< Flow out of range time out in counts. +#define DATA_PUBLISH_COUNTER_START_COUNT 20 ///< Data publish counter start count. -#define FLOW_OUT_OF_RANGE_PERSISTENT_INTERVAL ( 12 * MS_PER_SECOND ) // Why is this so long? ///< Flow out of range time out in counts. -#define DATA_PUBLISH_COUNTER_START_COUNT 20 ///< Data publish counter start count. +static const F32 FLOW_SENSORS_LITERS_PER_PULSES = ( 1.0 / (F32)FLOW_SENSORS_PULSES_PER_LITER ); ///< Flow sensors liters/pulses coefficient. -static const F32 FLOW_SENSORS_LITERS_PER_PULSES = ( 1.0 / (F32)FLOW_SENSORS_PULSES_PER_LITER ); - // ********** private data ********** +/// Flow sensors data structure typedef struct { - U08 edgeCountsIndex; - U16 edgeCountsBuffer[ FLOW_SENSORS_EDGES_BUFFER_LENGTH ]; - OVERRIDE_F32_T measuredFlowLPM; - OVERRIDE_F32_T measuredROFlowWithCPsLPM; + U08 edgeCountsIndex; ///< Edge counts index. + U16 edgeCountsBuffer[ FLOW_SENSORS_EDGES_BUFFER_LENGTH ]; ///< Edge counts buffer array. + OVERRIDE_F32_T measuredFlowLPM; ///< Measured flow in L/min. + OVERRIDE_F32_T measuredROFlowWithCPsLPM; ///< Measured RO flow with concentrate pumps in L/min. } FLOW_SENSOR_STATUS_T; -static U32 dataPublicationCounter; ///< Used to schedule Dialysate flow data publication to CAN bus. +static U32 dataPublicationCounter; ///< Used to schedule Dialysate flow data publication to CAN bus. static OVERRIDE_U32_T flowSensorsDataPublishInterval = { FLOW_SENSORS_DATA_PUB_INTERVAL, FLOW_SENSORS_DATA_PUB_INTERVAL, - 0, 0 }; ///< Interval (in ms) at which to publish Dialysate flow data to CAN bus. -static FLOW_SENSOR_STATUS_T flowSensorStatus[ NUM_OF_FLOW_SENSORS ]; + 0, 0 }; ///< Interval (in ms) at which to publish Dialysate flow data to CAN bus. +static FLOW_SENSOR_STATUS_T flowSensorStatus[ NUM_OF_FLOW_SENSORS ]; ///< Flow sensors status. static DG_FLOW_SENSORS_CAL_RECORD_T flowSensorsCalRecord; ///< Flow sensors calibration record. // ********** private function prototypes ********** @@ -97,20 +97,21 @@ { SELF_TEST_STATUS_T result = SELF_TEST_STATUS_IN_PROGRESS; BOOL calStatus = getNVRecord2Driver( GET_CAL_FLOW_SENSORS, (U08*)&flowSensorsCalRecord, sizeof( DG_FLOW_SENSORS_CAL_RECORD_T ), - NUM_OF_CAL_DATA_FLOW_SENSORS, ALARM_ID_DG_DIALYSATE_FLOW_SENSOR_INVALID_CAL_RECORD ); - result = ( TRUE == calStatus ? SELF_TEST_STATUS_PASSED : SELF_TEST_STATUS_FAILED ); + NUM_OF_CAL_DATA_FLOW_SENSORS, ALARM_ID_DG_FLOW_SENSORS_INVALID_CAL_RECORD ); + result = ( TRUE == calStatus ? SELF_TEST_STATUS_PASSED : SELF_TEST_STATUS_FAILED ); + return result; } /*********************************************************************//** * @brief - * The execFlowSesnorsMonitor function executes the flow sensors monitor. + * The execFlowSensorsMonitor function executes the flow sensors monitor. * @details Inputs: none * @details Outputs: flowSensorStatus, flowSensorsCalRecord * @return none *************************************************************************/ -void execFlowSesnorsMonitor( void ) +void execFlowSensorsMonitor( void ) { U08 i; U08 countsIndex; @@ -122,7 +123,7 @@ if ( TRUE == isNewCalibrationRecordAvailable() ) { getNVRecord2Driver( GET_CAL_FLOW_SENSORS, (U08*)&flowSensorsCalRecord, sizeof( DG_FLOW_SENSORS_CAL_RECORD_T ), - NUM_OF_CAL_DATA_FLOW_SENSORS, ALARM_ID_DG_DIALYSATE_FLOW_SENSOR_INVALID_CAL_RECORD ); + NUM_OF_CAL_DATA_FLOW_SENSORS, ALARM_ID_DG_FLOW_SENSORS_INVALID_CAL_RECORD ); } for ( i = 0; i < NUM_OF_FLOW_SENSORS; i++ ) @@ -153,17 +154,16 @@ #ifndef _VECTORCAST_ default: - // TODO software fault + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_FLOW_SENSOR_SELECTED, i ); break; #endif } - flowSensorStatus[ i ].edgeCountsIndex = INC_WRAP( countsIndex, 0, FLOW_SENSORS_EDGES_BUFFER_LENGTH ); + flowSensorStatus[ i ].edgeCountsIndex = INC_WRAP( countsIndex, 0, ( FLOW_SENSORS_EDGES_BUFFER_LENGTH - 1 ) ); } - // TODO dialysate flow alarm. Is it needed? - //currentFlow = getMeasuredDialysateFlowRate(); + //currentFlow = getMeasuredFlowRateLPM( DIALYSATE_FLOW_SENSOR ); //isFlowOutOfUpperRange = ( currentFlow > MAX_DIALYSATE_FLOWRATE_LPM ? TRUE : FALSE ); //checkPersistentAlarm( ALARM_ID_DIALYSATE_FLOW_RATE_OUT_OF_RANGE, isFlowOutOfUpperRange, currentFlow, MAX_DIALYSATE_FLOWRATE_LPM ); @@ -180,11 +180,28 @@ *************************************************************************/ F32 getMeasuredFlowRateLPM( FLOW_SENSORS_T sensorId ) { - return getF32OverrideValue( &flowSensorStatus[ sensorId ].measuredFlowLPM ); + F32 flow = getF32OverrideValue( &flowSensorStatus[ sensorId ].measuredFlowLPM ); + + return flow; } /*********************************************************************//** * @brief + * The getMeasuredROFlowRateWithConcPumpsLPM function gets the measured flow + * rate of a flow sensor in L/min. + * @details Inputs: flowSensorStatus + * @details Outputs: flowSensorStatus + * @return the current flow rate (in L/min). + *************************************************************************/ +F32 getMeasuredROFlowRateWithConcPumpsLPM( void ) +{ + F32 flow = getF32OverrideValue( &flowSensorStatus[ RO_FLOW_SENSOR ].measuredROFlowWithCPsLPM ); + + return flow; +} + +/*********************************************************************//** + * @brief * The publishFlowSensorsData function publishes flow sensors data at * the set interval. * @details Inputs: flowSensorsDataPublicationCounter, @@ -198,13 +215,13 @@ if ( ++dataPublicationCounter >= getU32OverrideValue( &flowSensorsDataPublishInterval ) ) { FLOW_SENSORS_DATA_T data; + data.ROFlowRateLPM = getMeasuredFlowRateLPM( RO_FLOW_SENSOR ); data.dialysateFlowRateLPM = getMeasuredFlowRateLPM( DIALYSATE_FLOW_SENSOR ); - data.ROFlowRateWithCPsLPM = getF32OverrideValue( &flowSensorStatus[ RO_FLOW_SENSOR ].measuredROFlowWithCPsLPM ); + data.ROFlowRateWithCPsLPM = getMeasuredROFlowRateWithConcPumpsLPM(); dataPublicationCounter = 0; broadcastData( MSG_ID_DG_FLOW_SENSORS_DATA, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&data, sizeof( FLOW_SENSORS_DATA_T ) ); - } } Index: firmware/App/Controllers/FlowSensors.h =================================================================== diff -u -r256d5cb05f1ef09e19e2f2733a111f600c73a7ee -r2e21405574597474db0ebae86cdd7fa2d517f71c --- firmware/App/Controllers/FlowSensors.h (.../FlowSensors.h) (revision 256d5cb05f1ef09e19e2f2733a111f600c73a7ee) +++ firmware/App/Controllers/FlowSensors.h (.../FlowSensors.h) (revision 2e21405574597474db0ebae86cdd7fa2d517f71c) @@ -42,23 +42,16 @@ NUM_OF_FLOW_SENSORS, ///< Number of flow sensors. } FLOW_SENSORS_T; -/// Flow meters data struct. -typedef struct -{ - F32 ROFlowRateLPM; ///< RO flow rate in L/min. - F32 ROFlowRateWithCPsLPM; ///< RO flow rate with concentrate pumps in L/min. - F32 dialysateFlowRateLPM; ///< Dialysate flow rate L/min. -} FLOW_SENSORS_DATA_T; - // ********** public function prototypes ********** void initFlowSensors( void ); SELF_TEST_STATUS_T execFlowSensorsSelfTest( void ); -void execFlowSesnorsMonitor( void ); +void execFlowSensorsMonitor( void ); -F32 getMeasuredFlowRateLPM( FLOW_SENSORS_T sensorId ); +F32 getMeasuredFlowRateLPM( FLOW_SENSORS_T sensorId ); +F32 getMeasuredROFlowRateWithConcPumpsLPM( void ); BOOL testSetFlowDataPublishIntervalOverride( U32 value ); BOOL testResetFlowDataPublishIntervalOverride( void ); Index: firmware/App/Controllers/Heaters.c =================================================================== diff -u -r256d5cb05f1ef09e19e2f2733a111f600c73a7ee -r2e21405574597474db0ebae86cdd7fa2d517f71c --- firmware/App/Controllers/Heaters.c (.../Heaters.c) (revision 256d5cb05f1ef09e19e2f2733a111f600c73a7ee) +++ firmware/App/Controllers/Heaters.c (.../Heaters.c) (revision 2e21405574597474db0ebae86cdd7fa2d517f71c) @@ -23,6 +23,7 @@ #include "AlarmMgmt.h" #include "DGDefs.h" #include "FlowSensors.h" +#include "FPGA.h" #include "Heaters.h" #include "MessageSupport.h" #include "ModeFill.h" @@ -69,10 +70,13 @@ #define PRIMARY_HEATER_DUTY_CYCLE_PER_TEMPERATURE_C 0.015F ///< Primary heaters duty cycle per temperature in C. #define DATA_PUBLISH_COUNTER_START_COUNT 70 ///< Data publish counter start count. #define MIN_RO_HEATER_FLOWRATE_LPM 0.2F ///< Minimum target RO heater flow rate in L/min. +#define PRIMARY_HEATER_POWER_TOL 0.1F ///< Primary heater power tolerance. +#define MAIN_PIMARY_HEATER_VOLTAGE_ADC_FPGA_ERROR_TIMEOUT_MS ( 2 * MS_PER_SECOND ) ///< Main primary heater voltage ADC FPGA error. static const F32 WATER_SPECIFIC_HEAT_DIVIDED_BY_MINUTES = 4184 / SEC_PER_MIN; ///< Water specific heat in J/KgC / 60. static const F32 PRIMARY_HEATERS_MAXIMUM_POWER_WATTS = 475 + 237.5F; ///< Primary heaters maximum power (main primary = 475W and small primary = 237.5W). static const F32 HEATERS_VOLTAGE_TOLERANCE_V = HEATERS_MAX_OPERATING_VOLTAGE_V * HEATERS_MAX_VOLTAGE_OUT_OF_RANGE_TOL; ///< Heaters voltage tolerance in volts. +static const F32 PRIMARY_HEATER_VOLTAGE_TOLERANCE_V = HEATERS_MAX_OPERATING_VOLTAGE_V * PRIMARY_HEATER_POWER_TOL; ///< Primary heater power voltage tolerance in volts. /// Heaters data structure typedef struct @@ -147,8 +151,13 @@ initPersistentAlarm( ALARM_ID_DG_MAIN_PRIMARY_HEATER_VOLTAGE_OUT_OF_RANGE, HEATERS_VOLTAGE_OUT_OF_RANGE_TIMEOUT_MS, HEATERS_VOLTAGE_OUT_OF_RANGE_TIMEOUT_MS ); initPersistentAlarm( ALARM_ID_DG_SMALL_PRIMARY_HEATER_VOLTAGE_OUT_OF_RANGE, HEATERS_VOLTAGE_OUT_OF_RANGE_TIMEOUT_MS, HEATERS_VOLTAGE_OUT_OF_RANGE_TIMEOUT_MS ); initPersistentAlarm( ALARM_ID_DG_TRIMMER_HEATER_VOLTAGE_OUT_OF_RANGE, HEATERS_VOLTAGE_OUT_OF_RANGE_TIMEOUT_MS, HEATERS_VOLTAGE_OUT_OF_RANGE_TIMEOUT_MS ); + initPersistentAlarm( ALARM_ID_DG_PRIMARY_HEATER_POWER_VOLTAGE_OUT_OF_RANGE, HEATERS_VOLTAGE_OUT_OF_RANGE_TIMEOUT_MS, HEATERS_VOLTAGE_OUT_OF_RANGE_TIMEOUT_MS ); initPersistentAlarm( ALARM_ID_RO_FLOW_TOO_LOW_WHILE_PRIMARY_HEATER_IS_ON, HEATERS_ON_NO_FLOW_TIMEOUT_MS, HEATERS_ON_NO_FLOW_TIMEOUT_MS ); initPersistentAlarm( ALARM_ID_DIALYSATE_FLOW_TOO_LOW_WHILE_TRIMMER_HEATER_IS_ON, HEATERS_ON_NO_FLOW_TIMEOUT_MS, HEATERS_ON_NO_FLOW_TIMEOUT_MS ); + + // Initialize the FPGA persistent alarm + initFPGAPersistentAlarm( MAIN_PRIMARY_HEATER_VOLTAGE_ADC, ALARM_ID_DG_MAIN_PRIMARY_HEATER_FPGA_FAULT, + MAIN_PIMARY_HEATER_VOLTAGE_ADC_FPGA_ERROR_TIMEOUT_MS, MAIN_PIMARY_HEATER_VOLTAGE_ADC_FPGA_ERROR_TIMEOUT_MS ); } /*********************************************************************//** @@ -326,7 +335,7 @@ { alarm = ALARM_ID_RO_FLOW_TOO_LOW_WHILE_PRIMARY_HEATER_IS_ON; measFlow = getMeasuredFlowRateLPM( RO_FLOW_SENSOR ); - minFlow = MIN_RO_FLOWRATE_LPM; + minFlow = MIN_RO_HEATER_FLOWRATE_LPM; } else { @@ -341,8 +350,14 @@ } else { - checkPersistentAlarm( ALARM_ID_RO_FLOW_TOO_LOW_WHILE_PRIMARY_HEATER_IS_ON, FALSE, 0.0, 0.0 ); - checkPersistentAlarm( ALARM_ID_DIALYSATE_FLOW_TOO_LOW_WHILE_TRIMMER_HEATER_IS_ON, FALSE, 0.0, 0.0 ); + if ( DG_PRIMARY_HEATER == heater ) + { + checkPersistentAlarm( ALARM_ID_RO_FLOW_TOO_LOW_WHILE_PRIMARY_HEATER_IS_ON, FALSE, 0.0, 0.0 ); + } + else + { + checkPersistentAlarm( ALARM_ID_DIALYSATE_FLOW_TOO_LOW_WHILE_TRIMMER_HEATER_IS_ON, FALSE, 0.0, 0.0 ); + } } } @@ -430,7 +445,7 @@ heatersStatus[ heater ].startHeaterSignal = FALSE; // Depending on which heater is called, go to different states - state = ( heater == DG_PRIMARY_HEATER ? HEATER_EXEC_STATE_PRIMARY_RAMP_TO_TARGET : HEATER_EXEC_STATE_TRIMMER_RAMP_TO_TARGET ); + state = ( DG_PRIMARY_HEATER == heater ? HEATER_EXEC_STATE_PRIMARY_RAMP_TO_TARGET : HEATER_EXEC_STATE_TRIMMER_RAMP_TO_TARGET ); } return state; @@ -457,7 +472,7 @@ if ( DG_MODE_FILL == opMode ) { // If the previous average fill flow rate is 0, use the nominal target RO flow from the RO pump - targetFlow = ( getAvgFillFlowRateLPM() - 0.0 > NEARLY_ZERO ? getAvgFillFlowRateLPM() : getTargetROPumpFlowRateLPM() ); + targetFlow = ( getAvgFillFlowRateLPM() - 0.0F > NEARLY_ZERO ? getAvgFillFlowRateLPM() : getTargetROPumpFlowRateLPM() ); dutyCycle = calculatePrimaryHeaterDutyCycle( targetTemperature, inletTemperature, targetFlow, TRUE ); state = HEATER_EXEC_STATE_PRIMARY_CONTROL_TO_TARGET; } @@ -478,8 +493,7 @@ } else { - // No other modes are using the heaters - // TODO software fault + // Do nothing the mode that DG is in right now, does not need heaters to be on } // Update the calculated target temperature @@ -522,8 +536,7 @@ *************************************************************************/ static HEATERS_STATE_T handleHeaterStateControlToDisinfectTarget( DG_HEATERS_T heater ) { - HEATERS_STATE_T state = HEATER_EXEC_STATE_CONTROL_TO_DISINFECT_TARGET; - + HEATERS_STATE_T state = HEATER_EXEC_STATE_CONTROL_TO_DISINFECT_TARGET; F32 heatDisinfectSensorTemp = getTemperatureValue( TEMPSENSORS_HEAT_DISINFECT ); // Check if the heaters control conditions have changed, if yes, switch back to ramp to target @@ -593,7 +606,6 @@ heatersStatus[ heater ].calculatedTemperature = currentTemperature; heatersStatus[ heater ].inactiveRsrvr = getInactiveReservoir(); heatersStatus[ heater ].targetFlow = targetFlowLPM; - heatersStatus[ heater ].dutyCycle = 0.0F; trimmerHeaterControlCounter = 0; // Cap the minimum duty cycle. So if it is calculated to negative, set it to 0 @@ -653,10 +665,7 @@ *************************************************************************/ static void setHeaterDutyCycle( DG_HEATERS_T heater, F32 pwm ) { - // Check if the requested duty cycle is different from what the heater's duty cycle is. - // If the same duty cycle is requested, then it is not needed to send it again. This is to make sure - // the same duty cycle is not sent to the hardware all the time. - if ( fabs( heatersStatus[ heater ].dutyCycle - pwm ) > NEARLY_ZERO ) + if ( heater < NUM_OF_DG_HEATERS ) { if ( DG_PRIMARY_HEATER == heater ) { @@ -668,9 +677,12 @@ setTrimmerHeaterPWM( pwm ); } - // Updated the heater's information heatersStatus[ heater ].dutyCycle = pwm; } + else + { + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_HEATERS_INVALID_HEATER_ID_SELECTED, heater ); + } } /*********************************************************************//** @@ -721,7 +733,7 @@ { if ( TRUE == checkEfficiency ) { - // TODO Do we need efficiency for the trimmer heater? + // Do nothing right now. Efficiency will be implemented later if needed } } @@ -770,7 +782,15 @@ *************************************************************************/ static void setMainPrimaryHeaterPWM( F32 pwm ) { - etpwmSetCmpA( etpwmREG1, (U32)( (S32)( ( pwm * (F32)(etpwmREG1->TBPRD) ) + FLOAT_TO_INT_ROUNDUP_OFFSET ) ) ); + etpwm_config_reg_t mainPriConfig; + U32 pwmValue = (U32)( (S32)( ( pwm * (F32)(etpwmREG1->TBPRD) ) + FLOAT_TO_INT_ROUNDUP_OFFSET ) ); + + etpwm1GetConfigValue( &mainPriConfig, CurrentValue ); + + if ( mainPriConfig.CONFIG_CMPA != pwmValue ) + { + etpwmSetCmpA( etpwmREG1, pwmValue ); + } } /*********************************************************************//** @@ -783,7 +803,15 @@ *************************************************************************/ static void setSmallPrimaryHeaterPWM( F32 pwm ) { - etpwmSetCmpB( etpwmREG1, (U32)( (S32)( ( pwm * (F32)(etpwmREG1->TBPRD) ) + FLOAT_TO_INT_ROUNDUP_OFFSET ) ) ); + etpwm_config_reg_t smallPriConfig; + U32 pwmValue = (U32)( (S32)( ( pwm * (F32)(etpwmREG1->TBPRD) ) + FLOAT_TO_INT_ROUNDUP_OFFSET ) ); + + etpwm1GetConfigValue( &smallPriConfig, CurrentValue ); + + if ( smallPriConfig.CONFIG_CMPB != pwmValue ) + { + etpwmSetCmpB( etpwmREG1, pwmValue ); + } } /*********************************************************************//** @@ -796,7 +824,15 @@ *************************************************************************/ static void setTrimmerHeaterPWM( F32 pwm ) { - etpwmSetCmpA( etpwmREG3, (U32)( (S32)( ( pwm * (F32)(etpwmREG3->TBPRD) ) + FLOAT_TO_INT_ROUNDUP_OFFSET ) ) ); + etpwm_config_reg_t trimmerConfig; + U32 pwmValue = (U32)( (S32)( ( pwm * (F32)(etpwmREG3->TBPRD) ) + FLOAT_TO_INT_ROUNDUP_OFFSET ) ); + + etpwm3GetConfigValue( &trimmerConfig, CurrentValue ); + + if ( trimmerConfig.CONFIG_CMPA != pwmValue ) + { + etpwmSetCmpA( etpwmREG3, pwmValue ); + } } /*********************************************************************//** @@ -813,9 +849,9 @@ { HEATERS_DATA_T data; - data.mainPrimayHeaterDC = heatersStatus[ DG_PRIMARY_HEATER ].dutyCycle * 100.0; // The duty cycle of the primary heater is divided into 2 parts and is applied to main // and small primary heaters. So they are always the same. + data.mainPrimayHeaterDC = heatersStatus[ DG_PRIMARY_HEATER ].dutyCycle * 100.0; data.smallPrimaryHeaterDC = heatersStatus[ DG_PRIMARY_HEATER ].dutyCycle * 100.0; data.trimmerHeaterDC = heatersStatus[ DG_TRIMMER_HEATER ].dutyCycle * 100.0; data.primaryTargetTemp = heatersStatus[ DG_PRIMARY_HEATER ].targetTemp; @@ -840,18 +876,24 @@ *************************************************************************/ static void monitorHeatersVoltage( void ) { - // NOTE: Default to using Primary heater voltage from FPGA - F32 mainPriVoltage = getMonitoredLineLevel( MONITORED_LINE_24V_PRIM_HTR_GND_V ); + F32 mainPriVoltage = getMonitoredLineLevel( MONITORED_LINE_24V_GND_MAIN_PRIM_HTR_V ); + #ifndef _RELEASE_ if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_ENABLE_V3_SYSTEM ) ) { // V3 use CPU based value for Primary, same as Secondary - mainPriVoltage = getMonitoredLineLevel( MONITORED_LINE_24V_SEC_HTR_V ); + mainPriVoltage = getMonitoredLineLevel( MONITORED_LINE_24V_GND_SMALL_PRIM_HTR_V ); } + else #endif - F32 smallPriVoltage = getMonitoredLineLevel( MONITORED_LINE_24V_SEC_HTR_V ); - F32 trimmerVoltage = getMonitoredLineLevel( MONITORED_LINE_24V_TRIM_HTR_V ); + { + // If the system is DVT, check the FPGA persistent alarm of the main primary heater's voltage ADC + checkFPGAPersistentAlarms( MAIN_PRIMARY_HEATER_VOLTAGE_ADC, getFPGAHeaterGateADCErrorCount(), getFPGAHeaterGateADCReadCount() ); + } + F32 smallPriVoltage = getMonitoredLineLevel( MONITORED_LINE_24V_GND_SMALL_PRIM_HTR_V ); + F32 trimmerVoltage = getMonitoredLineLevel( MONITORED_LINE_24V_GND_TRIM_HTR_V ); + // Voltage to PWM is reverse. If PWM = 0 -> V = 24V F32 mainPriDC = heatersStatus[ DG_PRIMARY_HEATER ].dutyCycle; F32 smallPriDC = heatersStatus[ DG_PRIMARY_HEATER ].dutyCycle; @@ -870,6 +912,17 @@ checkPersistentAlarm( ALARM_ID_DG_MAIN_PRIMARY_HEATER_VOLTAGE_OUT_OF_RANGE, isMainPriOut, mainPriDC, HEATERS_VOLTAGE_TOLERANCE_V ); checkPersistentAlarm( ALARM_ID_DG_SMALL_PRIMARY_HEATER_VOLTAGE_OUT_OF_RANGE, isSmallPriOut, smallPriDC, HEATERS_VOLTAGE_TOLERANCE_V ); checkPersistentAlarm( ALARM_ID_DG_TRIMMER_HEATER_VOLTAGE_OUT_OF_RANGE, isTrimmerOut, trimmerDC, HEATERS_VOLTAGE_TOLERANCE_V ); + +#ifndef _RELEASE_ + if ( SW_CONFIG_ENABLE_VALUE != getSoftwareConfigStatus( SW_CONFIG_ENABLE_V3_SYSTEM ) ) +#endif + { + // If the system is DVT, check the primary heater's power line voltage + F32 powerMainPriVoltage = getMonitoredLineLevel( MONITORED_LINE_24V_POWER_PRIM_HTR_V ); + BOOL isPriPowerOut = ( fabs( powerMainPriVoltage - HEATERS_MAX_OPERATING_VOLTAGE_V ) > PRIMARY_HEATER_VOLTAGE_TOLERANCE_V ? TRUE : FALSE ); + + checkPersistentAlarm( ALARM_ID_DG_PRIMARY_HEATER_POWER_VOLTAGE_OUT_OF_RANGE, isPriPowerOut, powerMainPriVoltage, PRIMARY_HEATER_VOLTAGE_TOLERANCE_V ); + } } } Index: firmware/App/Controllers/LoadCell.c =================================================================== diff -u -rb3e53e10da033307b084161e6008fa5ed7710ccf -r2e21405574597474db0ebae86cdd7fa2d517f71c --- firmware/App/Controllers/LoadCell.c (.../LoadCell.c) (revision b3e53e10da033307b084161e6008fa5ed7710ccf) +++ firmware/App/Controllers/LoadCell.c (.../LoadCell.c) (revision 2e21405574597474db0ebae86cdd7fa2d517f71c) @@ -53,6 +53,7 @@ #define MAX_ALLOWED_EXTRA_WEIGHT_BEFORE_TARE_GRAMS 60.0F ///< Max allowed extra weight before tare in grams. #define LOAD_CELL_PRIMARY_BACKUP_MAX_ALLOWED_DRIFT_GRAMS 60.0F ///< Load cell primary and backup maximum allowed weight drift in grams. #define DATA_PUBLISH_COUNTER_START_COUNT 0 ///< Data publish counter start count. +#define LOAD_CELL_FPGA_ERROR_TIMEOUT_MS ( 2 * MS_PER_SECOND ) ///< Load cell FPGA error timeout in milliseconds. /// Load cell data structure. typedef struct @@ -111,40 +112,40 @@ { benignPolynomialCalRecord( &loadCellsCalRecord.loadCells[ i ] ); - hasLoadCellBeenTared[ i ] = FALSE; - loadcells[ i ].rawReading = 0; - loadcells[ i ].weight = 0.0; - loadcells[ i ].autoCalOffset = 0.0; - loadcells[ i ].largeFilterTotal = 0.0; - loadcells[ i ].largeFilteredWeight = 0.0; - loadcells[ i ].smallFilterTotal = 0.0; - loadcells[ i ].smallFilteredWeight.data = 0.0; - loadcells[ i ].smallFilteredWeight.ovData = 0.0; - loadcells[ i ].smallFilteredWeight.ovInitData = 0.0; - loadcells[ i ].smallFilteredWeight.override = OVERRIDE_RESET; + hasLoadCellBeenTared[ i ] = FALSE; + loadcells[ i ].rawReading = 0; + loadcells[ i ].weight = 0.0F; + loadcells[ i ].autoCalOffset = 0.0F; + loadcells[ i ].largeFilterTotal = 0.0F; + loadcells[ i ].largeFilteredWeight = 0.0F; + loadcells[ i ].smallFilterTotal = 0.0F; + loadcells[ i ].smallFilteredWeight.data = 0.0F; + loadcells[ i ].smallFilteredWeight.ovData = 0.0F; + loadcells[ i ].smallFilteredWeight.ovInitData = 0.0F; + loadcells[ i ].smallFilteredWeight.override = OVERRIDE_RESET; - for ( j = 0; j < SIZE_OF_SMALL_LOAD_CELL_AVG; j++ ) { - loadcells[ i ].smallFilterReadings[ j ] = 0.0; + loadcells[ i ].smallFilterReadings[ j ] = 0.0F; } for ( j = 0; j < SIZE_OF_LARGE_LOAD_CELL_AVG; j++ ) { - loadcells[ i ].largeFilterReadings[ j ] = 0.0; + loadcells[ i ].largeFilterReadings[ j ] = 0.0F; } - loadcells[ i ].loadCellVelocity_g_min = 0.0; + loadcells[ i ].loadCellVelocity_g_min = 0.0F; } // Initialize persistent alarm(s) - initPersistentAlarm( ALARM_ID_DG_LOAD_CELL_ADC_ERROR, 0, LOAD_CELL_ADC_ERROR_PERSISTENCE ); - initPersistentAlarm( ALARM_ID_DG_LOAD_CELL_WEIGHT_OUT_OF_RANGE, LOAD_CELL_WEIGHT_OUT_RANGE_PERSISTENT_PERIOD_MS, LOAD_CELL_WEIGHT_OUT_RANGE_PERSISTENT_PERIOD_MS ); - initPersistentAlarm( ALARM_ID_DG_LOAD_CELL_PRIMARY_BACKUP_DRIFT_OUT_OF_RANGE, LOAD_CELL_PRIMARY_BACKUP_MAX_DRIFT_PERSISTENT_PERIOD_MS, LOAD_CELL_PRIMARY_BACKUP_MAX_DRIFT_PERSISTENT_PERIOD_MS ); + + // Initialize the FPGA persistent alarms + initFPGAPersistentAlarm( LOAD_CELL_A1_B1_SENSORS, ALARM_ID_DG_LOAD_CELL_A1_B1_FPGA_FAULT, LOAD_CELL_FPGA_ERROR_TIMEOUT_MS, LOAD_CELL_FPGA_ERROR_TIMEOUT_MS ); + initFPGAPersistentAlarm( LOAD_CELL_A2_B2_SENSORS, ALARM_ID_DG_LOAD_CELL_A2_B2_FPGA_FAULT, LOAD_CELL_FPGA_ERROR_TIMEOUT_MS, LOAD_CELL_FPGA_ERROR_TIMEOUT_MS ); } /*********************************************************************//** @@ -158,29 +159,35 @@ void execLoadCell( void ) { U32 ii; - U32 a1 = getFPGALoadCellA1(); U32 a2 = getFPGALoadCellA2(); U32 b1 = getFPGALoadCellB1(); U32 b2 = getFPGALoadCellB2(); - // update sums for load cell average calculations - loadcells[ LOAD_CELL_RESERVOIR_1_PRIMARY ].rawReading = a1 & MASK_OFF_U32_MSB; + // Check error bits from new readings + U32 a1Err = ( a1 >> SHIFT_BITS_BY_31 ) << SHIFT_24_BITS; + U32 a2Err = ( a2 >> SHIFT_BITS_BY_31 ) << SHIFT_16_BITS_FOR_WORD_SHIFT; + U32 b1Err = ( b1 >> SHIFT_BITS_BY_31 ) << SHIFT_8_BITS_FOR_BYTE_SHIFT; + U32 b2Err = ( b2 >> SHIFT_BITS_BY_31 ); + + loadcells[ LOAD_CELL_RESERVOIR_1_PRIMARY ].rawReading = ( 0 == a1Err ? a1 & MASK_OFF_U32_MSB : loadcells[ LOAD_CELL_RESERVOIR_1_PRIMARY ].rawReading ); + loadcells[ LOAD_CELL_RESERVOIR_1_BACKUP ].rawReading = ( 0 == a2Err ? a2 & MASK_OFF_U32_MSB : loadcells[ LOAD_CELL_RESERVOIR_1_BACKUP ].rawReading ); + loadcells[ LOAD_CELL_RESERVOIR_2_PRIMARY ].rawReading = ( 0 == b1Err ? b1 & MASK_OFF_U32_MSB : loadcells[ LOAD_CELL_RESERVOIR_2_PRIMARY ].rawReading ); + loadcells[ LOAD_CELL_RESERVOIR_2_BACKUP ].rawReading = ( 0 == b2Err ? b2 & MASK_OFF_U32_MSB : loadcells[ LOAD_CELL_RESERVOIR_2_BACKUP ].rawReading ); + + + /*loadcells[ LOAD_CELL_RESERVOIR_1_PRIMARY ].rawReading = a1 & MASK_OFF_U32_MSB; loadcells[ LOAD_CELL_RESERVOIR_1_BACKUP ].rawReading = a2 & MASK_OFF_U32_MSB; loadcells[ LOAD_CELL_RESERVOIR_2_PRIMARY ].rawReading = b1 & MASK_OFF_U32_MSB; loadcells[ LOAD_CELL_RESERVOIR_2_BACKUP ].rawReading = b2 & MASK_OFF_U32_MSB; - // Check error bits from new readings - a1 = ( a1 >> SHIFT_BITS_BY_31 ) << SHIFT_24_BITS; - a2 = ( a2 >> SHIFT_BITS_BY_31 ) << SHIFT_16_BITS_FOR_WORD_SHIFT; - b1 = ( b1 >> SHIFT_BITS_BY_31 ) << SHIFT_8_BITS_FOR_BYTE_SHIFT; - b2 = ( b2 >> SHIFT_BITS_BY_31 ); - if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_DG_LOAD_CELL_ADC_ERROR, ( ( a1 > 0 ) || ( a2 > 0 ) || ( b1 > 0 ) || ( b2 > 0 ) ) ) ) + if ( TRUE == isPersistentAlarmTriggered( ALARM_ID__AVAILABLE_13, ( ( a1 > 0 ) || ( a2 > 0 ) || ( b1 > 0 ) || ( b2 > 0 ) ) ) ) { - SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DG_LOAD_CELL_ADC_ERROR, ( a1 | a2 | b1 | b2 ) ) - } + SET_ALARM_WITH_1_U32_DATA( ALARM_ID__AVAILABLE_13, ( a1 | a2 | b1 | b2 ) ) + }*/ - // TODO use ALARM_ID_DG_LOAD_CELL_FPGA_READ_ERROR for read error + checkFPGAPersistentAlarms( LOAD_CELL_A1_B1_SENSORS, getFPGAADC1ErrorCount(), getFPGAADC1ReadCount() ); + checkFPGAPersistentAlarms( LOAD_CELL_A2_B2_SENSORS, getFPGAADC2ErrorCount(), getFPGAADC2ReadCount() ); // Check if a new calibration is available if ( TRUE == isNewCalibrationRecordAvailable() ) @@ -189,10 +196,10 @@ NUM_OF_CAL_DATA_LOAD_CELLS, ALARM_ID_DG_LOAD_CELLS_INVALID_CAL_RECORD ); // Zero the current tare values when new calibration data is available - loadcells[ LOAD_CELL_RESERVOIR_1_PRIMARY ].autoCalOffset = 0.0; - loadcells[ LOAD_CELL_RESERVOIR_1_BACKUP ].autoCalOffset = 0.0; - loadcells[ LOAD_CELL_RESERVOIR_2_PRIMARY ].autoCalOffset = 0.0; - loadcells[ LOAD_CELL_RESERVOIR_2_BACKUP ].autoCalOffset = 0.0; + loadcells[ LOAD_CELL_RESERVOIR_1_PRIMARY ].autoCalOffset = 0.0F; + loadcells[ LOAD_CELL_RESERVOIR_1_BACKUP ].autoCalOffset = 0.0F; + loadcells[ LOAD_CELL_RESERVOIR_2_PRIMARY ].autoCalOffset = 0.0F; + loadcells[ LOAD_CELL_RESERVOIR_2_BACKUP ].autoCalOffset = 0.0F; } // Rolling average of last 100 raw samples in small filter @@ -212,9 +219,9 @@ loadcells[ ii ].smallFilterReadings[ smallReadingsIdx ] ) * (F32)SEC_PER_MIN; // Update small filter with new weight sample - loadcells[ ii ].smallFilterTotal -= loadcells[ ii ].smallFilterReadings[ smallReadingsIdx ]; - loadcells[ ii ].smallFilterReadings[ smallReadingsIdx ] = getLoadCellWeight( (LOAD_CELL_ID_T)ii ); - loadcells[ ii ].smallFilterTotal += getLoadCellWeight( (LOAD_CELL_ID_T)ii ); + loadcells[ ii ].smallFilterTotal -= loadcells[ ii ].smallFilterReadings[ smallReadingsIdx ]; + loadcells[ ii ].smallFilterReadings[ smallReadingsIdx ] = getLoadCellWeight( (LOAD_CELL_ID_T)ii ); + loadcells[ ii ].smallFilterTotal += getLoadCellWeight( (LOAD_CELL_ID_T)ii ); // Calculate the load cell value before applying calibration to it loadcells[ ii ].smallFilteredWeight.data = (F32)( loadcells[ ii ].smallFilterTotal / (F64)SIZE_OF_SMALL_LOAD_CELL_AVG ); @@ -234,6 +241,7 @@ for ( ii = 0; ii < NUM_OF_LOAD_CELLS; ++ii ) { // Update large filter with new small filter weight sample + loadcells[ ii ].largeFilterTotal -= loadcells[ ii ].largeFilterReadings[ largeReadingsIdx ]; loadcells[ ii ].largeFilterReadings[ largeReadingsIdx ] = getLoadCellSmallFilteredWeight((LOAD_CELL_ID_T) ii); loadcells[ ii ].largeFilterTotal += getLoadCellSmallFilteredWeight((LOAD_CELL_ID_T) ii); Index: firmware/App/Controllers/LoadCell.h =================================================================== diff -u -r4e11c80367b5ae522aa34fb137079e516c98831b -r2e21405574597474db0ebae86cdd7fa2d517f71c --- firmware/App/Controllers/LoadCell.h (.../LoadCell.h) (revision 4e11c80367b5ae522aa34fb137079e516c98831b) +++ firmware/App/Controllers/LoadCell.h (.../LoadCell.h) (revision 2e21405574597474db0ebae86cdd7fa2d517f71c) @@ -7,8 +7,8 @@ * * @file LoadCell.h * -* @author (last) Sean Nash -* @date (last) 04-May-2021 +* @author (last) Dong Nguyen +* @date (last) 27-Sep-2022 * * @author (original) Saeed Nejatali * @date (original) 25-Feb-2020 Index: firmware/App/Controllers/Pressures.c =================================================================== diff -u -r256d5cb05f1ef09e19e2f2733a111f600c73a7ee -r2e21405574597474db0ebae86cdd7fa2d517f71c --- firmware/App/Controllers/Pressures.c (.../Pressures.c) (revision 256d5cb05f1ef09e19e2f2733a111f600c73a7ee) +++ firmware/App/Controllers/Pressures.c (.../Pressures.c) (revision 2e21405574597474db0ebae86cdd7fa2d517f71c) @@ -39,7 +39,7 @@ #define PUMP_PRESSURE_ZERO 777 ///< ADC counts equivalent to 0 PSI for pump in/out pressure sensors. #define PUMP_PRESSURE_PSIA_PER_COUNT 0.06434F ///< PSIA per ADC count conversion factor for pump in/out pressure sensors. -#define PUMP_PRESSURE_PSIA_TO_PSI_OFFSET 14.7F ///< Subtract this offset to convert PSIA to PSI. TODO - use barometric sensor when available. +#define PUMP_PRESSURE_PSIA_TO_PSI_OFFSET 14.7F ///< Subtract this offset to convert PSIA to PSI. #define ONE_BAR_TO_PSI_CONVERSION 14.5F ///< 1 bar to PSI conversion. #define ONE_BAR_TO_MILLI_BAR 1000 ///< 1 bar to milli bar conversion. #define COUNTS_TO_MILLI_BAR 100 ///< Counts to milli bar conversion. @@ -375,11 +375,13 @@ // publish pressure/occlusion data on interval if ( ++pressuresDataPublicationTimerCounter >= getU32OverrideValue( &pressuresDataPublishInterval ) ) { - PRESSURES_DATA_T data; + PRESSURES_DATA_T data; + data.roPumpInletPressure = getMeasuredDGPressure( PRESSURE_SENSOR_RO_PUMP_INLET ); data.roPumpOutletPressure = getMeasuredDGPressure( PRESSURE_SENSOR_RO_PUMP_OUTLET ); data.drainPumpInletPressure = getMeasuredDGPressure( PRESSURE_SENSOR_DRAIN_PUMP_INLET ); - data.drainPumpOutletPressure = getMeasuredDGPressure( PRESSURE_SENSOR_DRAIN_PUMP_OUTLET ); + data.drainPumpOutletPressure = getMeasuredDGPressure( PRESSURE_SENSOR_DRAIN_PUMP_OUTLET ); + data.barometricPressure = getMeasuredDGPressure( PRESSURE_SENSOR_BAROMETRIC ); broadcastData( MSG_ID_DG_PRESSURES_DATA, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&data, sizeof( PRESSURES_DATA_T ) ); pressuresDataPublicationTimerCounter = 0; Index: firmware/App/Controllers/Pressures.h =================================================================== diff -u -r256d5cb05f1ef09e19e2f2733a111f600c73a7ee -r2e21405574597474db0ebae86cdd7fa2d517f71c --- firmware/App/Controllers/Pressures.h (.../Pressures.h) (revision 256d5cb05f1ef09e19e2f2733a111f600c73a7ee) +++ firmware/App/Controllers/Pressures.h (.../Pressures.h) (revision 2e21405574597474db0ebae86cdd7fa2d517f71c) @@ -35,10 +35,11 @@ /// Pressure data struct. typedef struct { - F32 roPumpInletPressure; ///< RO pump inlet pressure - F32 roPumpOutletPressure; ///< RO pump outlet pressure - F32 drainPumpInletPressure; ///< Drain pump inlet pressure - F32 drainPumpOutletPressure; ///< Drain pump outlet pressure + F32 roPumpInletPressure; ///< RO pump inlet pressure + F32 roPumpOutletPressure; ///< RO pump outlet pressure + F32 drainPumpInletPressure; ///< Drain pump inlet pressure + F32 drainPumpOutletPressure; ///< Drain pump outlet pressure + F32 barometricPressure; ///< Barometric pressure } PRESSURES_DATA_T; #pragma pack(pop) Index: firmware/App/Controllers/ROPump.c =================================================================== diff -u -r256d5cb05f1ef09e19e2f2733a111f600c73a7ee -r2e21405574597474db0ebae86cdd7fa2d517f71c --- firmware/App/Controllers/ROPump.c (.../ROPump.c) (revision 256d5cb05f1ef09e19e2f2733a111f600c73a7ee) +++ firmware/App/Controllers/ROPump.c (.../ROPump.c) (revision 2e21405574597474db0ebae86cdd7fa2d517f71c) @@ -63,7 +63,6 @@ #define FLOW_SENSOR_ZERO_READING 0xFFFF ///< Flow sensor reading indicates zero flow (or flow lower than can be detected by sensor). -#define FLOW_SAMPLES_TO_AVERAGE ( 250 / TASK_PRIORITY_INTERVAL ) ///< Averaging flow data over 250 ms intervals. #define FLOW_AVERAGE_MULTIPLIER ( 1.0F / (F32)FLOW_SAMPLES_TO_AVERAGE ) ///< Optimization - multiplying is faster than dividing. // The ADC to LPM factor is calculated using the following steps: @@ -76,7 +75,6 @@ /// Initial conversion factor from target flow rate to PWM duty cycle estimate. #define ROP_FLOW_TO_PWM_DC(flow) ( ROP_FLOW_TO_PWM_SLOPE * flow + ROP_FLOW_TO_PWM_INTERCEPT ) - #define MAX_ALLOWED_FLOW_DEVIATION 0.1F ///< Max allowed deviation from target flow. #define FLOW_OUT_OF_RANGE_PERSISTENT_INTERVAL ( 12 * MS_PER_SECOND ) ///< Flow out of range time out in counts. #define MAX_PRESSURE_TARGET_TOLERANCE 5 ///< Pressure tolerance from maximum set pressure by user in psi. @@ -90,7 +88,6 @@ #define ROP_FEEDBACK_0_PCT_DUTY_CYCLE_VOLTAGE 2.51F ///< RO pump 0% duty cycle feedback voltage. #define ROP_DUTY_CYCLE_OUT_OF_RANGE_TOLERANCE 0.05F ///< RO pump duty cycle out of range tolerance. - #define DATA_PUBLISH_COUNTER_START_COUNT 50 ///< Data publish counter start count. /// Enumeration of RO pump states. @@ -129,14 +126,8 @@ static F32 targetROPumpMaxPressure; ///< Target RO max allowed pressure (in PSI). static OVERRIDE_U32_T roPumpDataPublishInterval = { RO_PUMP_DATA_PUB_INTERVAL, RO_PUMP_DATA_PUB_INTERVAL, 0, 0 }; ///< Interval (in ms) at which to publish RO flow data to CAN bus. -static OVERRIDE_F32_T measuredROFlowRateLPM = { 0.0, 0.0, 0.0, 0 }; ///< Measured RO flow rate (in L/min). static U32 roControlTimerCounter; ///< Determines when to perform control on RO pump. static F32 roPumpOpenLoopTargetDutyCycle; ///< Target RO pump open loop PWM. -static S32 measuredFlowReadingsSum; ///< Raw flow reading sums for averaging. -static U32 flowFilterCounter; ///< Flow filtering counter. -static DG_FLOW_SENSORS_CAL_RECORD_T flowSensorsCalRecord; ///< Flow sensors calibration record. -static OVERRIDE_F32_T measuredROFlowRateWithConcPumpsLPM = { 0.0, 0.0, 0.0, 0 }; ///< Measure RO flow rate with concentrate pumps (L/min). -static DG_RO_PUMP_CAL_RECORD_T roPumpCalRecord; ///< RO pump calibration record. static F32 roVolumeL; ///< RO water generated in liters. // ********** private function prototypes ********** @@ -156,11 +147,10 @@ * @brief * The initROPump function initializes the RO Pump module. * @details Inputs: roControlTimerCounter,roPumpOpenLoopTargetDutyCycle, - * roPumpFlowRateRunningSum, roPumpPressureRunningSum, measuredFlowReadingsSum, - * flowFilterCounter, flowVerificationCounter, roPumpState, roPumpControlMode - * roPumpDataPublicationTimerCounter, rawFlowLP, targetROPumpFlowRateLPM, + * roPumpPressureRunningSum, flowFilterCounter, flowVerificationCounter, + * roPumpState, roPumpControlMode, roPumpDataPublicationTimerCounter, rawFlowLP, * roPumpPWMDutyCyclePct, roPumpDutyCyclePctSet, pendingROPumpCmdMaxPressure, - * pendingROPumpCmdTargetFlow, pendingROPumpCmdCountDown, targetROPumpMaxPressure + * pendingROPumpCmdTargetFlow, pendingROPumpCmdCountDown, targetROPumpMaxPressure, * @details Outputs: none * @return none *************************************************************************/ @@ -190,8 +180,6 @@ // Initialize the variables roControlTimerCounter = 0; roPumpOpenLoopTargetDutyCycle = 0; - measuredFlowReadingsSum = 0; - flowFilterCounter = 0; roPumpDataPublicationTimerCounter = DATA_PUBLISH_COUNTER_START_COUNT; roPumpState = RO_PUMP_OFF_STATE; roPumpControlMode = NUM_OF_PUMP_CONTROL_MODES; @@ -345,53 +333,19 @@ F32 roFeedbackVoltage = getIntADCVoltageConverted( INT_ADC_RO_PUMP_FEEDBACK_DUTY_CYCLE ); // Read the pressure at the sensor. The pump cannot be more that the maximum allowed pressure // to make sure the hardware (especially the ROF) is not damaged. If it is the case, we need to stop immediately - F32 actualPressure = getMeasuredDGPressure( PRESSURE_SENSOR_RO_PUMP_OUTLET ); - BOOL isPressureMax = ( actualPressure >= MAX_ALLOWED_MEASURED_PRESSURE_PSI ? TRUE : FALSE ); + F32 actualPressure = getMeasuredDGPressure( PRESSURE_SENSOR_RO_PUMP_OUTLET ); + BOOL isPressureMax = ( actualPressure >= MAX_ALLOWED_MEASURED_PRESSURE_PSI ? TRUE : FALSE ); BOOL isDutyCylceOutOfRange = FALSE; - // Update sum for flow average calculation - measuredFlowReadingsSum += (S32)roFlowReading; - checkPersistentAlarm( ALARM_ID_RO_PUMP_PRESSURE_OUT_OF_RANGE, isPressureMax, actualPressure, MAX_ALLOWED_MEASURED_PRESSURE_PSI ); - // Check if a new calibration is available - if ( TRUE == isNewCalibrationRecordAvailable() ) + if ( ( getMeasuredFlowRateLPM( RO_FLOW_SENSOR ) > NEARLY_ZERO ) && ( VALVE_STATE_CLOSED == getValveStateName( VBF ) ) ) { - getNVRecord2Driver( GET_CAL_FLOW_SENSORS, (U08*)&flowSensorsCalRecord, sizeof( DG_FLOW_SENSORS_CAL_RECORD_T ), - NUM_OF_CAL_DATA_FLOW_SENSORS, ALARM_ID_DG_RO_FLOW_SENSOR_INVALID_CAL_RECORD ); + // If the RO pump's flow is greater than zero, and the VBf valve is not open (like heat disinfect) it means RO water is being generated + // Add that water to the variable + roVolumeL += ( getMeasuredFlowRateLPM( RO_FLOW_SENSOR ) / ( SEC_PER_MIN * MS_PER_SECOND ) ) * TASK_PRIORITY_INTERVAL; } - // Read flow at the control set - if ( ++flowFilterCounter >= FLOW_SAMPLES_TO_AVERAGE ) - { - F32 flow = RO_FLOW_ADC_TO_LPM_FACTOR / ( (F32)measuredFlowReadingsSum * FLOW_AVERAGE_MULTIPLIER ); - - flow = pow(flow, 4) * flowSensorsCalRecord.flowSensors[ CAL_DATA_RO_PUMP_FLOW_SENSOR ].fourthOrderCoeff + - pow(flow, 3) * flowSensorsCalRecord.flowSensors[ CAL_DATA_RO_PUMP_FLOW_SENSOR ].thirdOrderCoeff + - pow(flow, 2) * flowSensorsCalRecord.flowSensors[ CAL_DATA_RO_PUMP_FLOW_SENSOR ].secondOrderCoeff + - flow * flowSensorsCalRecord.flowSensors[ CAL_DATA_RO_PUMP_FLOW_SENSOR ].gain + - flowSensorsCalRecord.flowSensors[ CAL_DATA_RO_PUMP_FLOW_SENSOR ].offset; - - measuredROFlowRateWithConcPumpsLPM.data = flow; - measuredROFlowRateLPM.data = flow - ( getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP1_ACID ) / ML_PER_LITER ) - - ( getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP2_BICARB ) / ML_PER_LITER ); - - // If the flow is less than a certain value, FPGA will return 0xFFFF meaning that - // the flow is 0. - if ( FLOW_SENSOR_ZERO_READING == roFlowReading ) - { - measuredROFlowRateLPM.data = 0.0; - } - - measuredFlowReadingsSum = 0; - flowFilterCounter = 0; - } - - if ( ( measuredROFlowRateLPM.data > NEARLY_ZERO ) && ( (U32)VALVE_STATE_CLOSED == getValveState( (U32)VBF ) ) ) - { - roVolumeL += ( measuredROFlowRateLPM.data * SEC_PER_MIN ); - } - #ifndef _RELEASE_ if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_RO_PUMP_MONITOR ) != SW_CONFIG_ENABLE_VALUE ) #endif @@ -401,7 +355,7 @@ // but the pump is not able to achieve the flow. if ( ( PUMP_CONTROL_MODE_CLOSED_LOOP == roPumpControlMode ) && ( RO_PUMP_CONTROL_TO_TARGET_FLOW_STATE == roPumpState ) ) { - F32 currentFlow = getMeasuredROFlowRateLPM(); + F32 currentFlow = getMeasuredFlowRateLPM( RO_FLOW_SENSOR ); F32 targetFlow = getTargetROPumpFlowRateLPM(); // The flow cannot be out of range for than 10% of the target flow BOOL isFlowOutOfRange = ( fabs( 1.0F - ( currentFlow / targetFlow ) ) > MAX_ALLOWED_FLOW_DEVIATION ? TRUE : FALSE ); @@ -504,23 +458,9 @@ SELF_TEST_STATUS_T execROPumpSelfTest( void ) { SELF_TEST_STATUS_T result = SELF_TEST_STATUS_IN_PROGRESS; - BOOL calStatus = FALSE; - calStatus |= getNVRecord2Driver( GET_CAL_FLOW_SENSORS, (U08*)&flowSensorsCalRecord, sizeof( DG_FLOW_SENSORS_CAL_RECORD_T ), - NUM_OF_CAL_DATA_FLOW_SENSORS, ALARM_ID_DG_RO_FLOW_SENSOR_INVALID_CAL_RECORD ); + // TODO is there anything else needed in POST for the RO pump? - calStatus |= getNVRecord2Driver( GET_CAL_RO_PUMP_RECORD, (U08*)&roPumpCalRecord, sizeof( DG_RO_PUMP_CAL_RECORD_T ), - NUM_OF_CAL_DATA_FLOW_SENSORS, ALARM_ID_NO_ALARM ); - - if ( TRUE == calStatus ) - { - result = SELF_TEST_STATUS_PASSED; - } - else - { - result = SELF_TEST_STATUS_FAILED; - } - return result; } @@ -552,31 +492,6 @@ /*********************************************************************//** * @brief - * The getMeasuredROFlowRateLPM function gets the measured RO pump flow rate. - * @details Inputs: measuredROFlowRateLPM - * @details Outputs: measuredROFlowRateLPM - * @return the current RO pump flow rate (in L/min). - *************************************************************************/ -F32 getMeasuredROFlowRateLPM( void ) -{ - return getF32OverrideValue( &measuredROFlowRateLPM ); -} - -/*********************************************************************//** - * @brief - * The getMeasuredROFlowRateWithConcPumpsLPM function gets the measured RO - * pump flow rate with the concentrate pumps. - * @details Inputs: measuredROFlowRateWithConcPumpsLPM - * @details Outputs: measuredROFlowRateWithConcPumpsLPM - * @return the current RO pump flow rate with the concentrate pumps (in L/min). - *************************************************************************/ -F32 getMeasuredROFlowRateWithConcPumpsLPM( void ) -{ - return getF32OverrideValue( &measuredROFlowRateWithConcPumpsLPM ); -} - -/*********************************************************************//** - * @brief * The getTargetROPumpPressure function gets the current target RO pump * pressure. * @details Inputs: targetROPumpPressure @@ -592,7 +507,7 @@ * @brief * The getROGeneratedVolumeL function returns the RO generated volume in liters. * @details Inputs: none - * @details Outputs: none + * @details Outputs: roVolumeL * @return the RO generated volume in liters *************************************************************************/ F32 getROGeneratedVolumeL( void ) @@ -860,14 +775,13 @@ if ( ++roPumpDataPublicationTimerCounter >= getU32OverrideValue( &roPumpDataPublishInterval ) ) { RO_PUMP_DATA_T pumpData; - pumpData.roPumpTgtFlowRateLM = getTargetROPumpFlowRateLPM(); - pumpData.roPumpTgtPressure = getTargetROPumpPressure(); - pumpData.measROFlowRate = getMeasuredFlowRateLPM( RO_FLOW_SENSOR ); //getMeasuredROFlowRateLPM(); - pumpData.roPumpDutyCycle = roPumpDutyCyclePctSet * FRACTION_TO_PERCENT_FACTOR; - pumpData.roPumpState = (U32)roPumpState; - pumpData.roPumpFBDutyCycle = roPumpFeedbackDutyCyclePct * FRACTION_TO_PERCENT_FACTOR; - pumpData.roPumpMeasFlowWithConcPumps = getMeasuredROFlowRateWithConcPumpsLPM(); + pumpData.roPumpTgtFlowRateLM = getTargetROPumpFlowRateLPM(); + pumpData.roPumpTgtPressure = getTargetROPumpPressure(); + pumpData.roPumpDutyCycle = roPumpDutyCyclePctSet * FRACTION_TO_PERCENT_FACTOR; + pumpData.roPumpState = (U32)roPumpState; + pumpData.roPumpFBDutyCycle = roPumpFeedbackDutyCyclePct * FRACTION_TO_PERCENT_FACTOR; + broadcastData( MSG_ID_RO_PUMP_DATA, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&pumpData, sizeof( RO_PUMP_DATA_T ) ); roPumpDataPublicationTimerCounter = 0; } @@ -985,54 +899,6 @@ /*********************************************************************//** * @brief - * The testSetMeasuredROFlowRateOverride function overrides the measured - * RO flow rate. - * @details Inputs: measuredROFlowRateLPM - * @details Outputs: measuredROFlowRateLPM - * @param: value : override measured RO pump motor speed (in L/min) - * @return TRUE if override successful, FALSE if not - *************************************************************************/ -BOOL testSetMeasuredROFlowRateOverride( F32 value ) -{ - BOOL result = FALSE; - - if ( TRUE == isTestingActivated() ) - { - measuredROFlowRateLPM.ovInitData = measuredROFlowRateLPM.data; - measuredROFlowRateLPM.ovData = value; - measuredROFlowRateLPM.override = OVERRIDE_KEY; - result = TRUE; - } - - return result; -} - -/*********************************************************************//** - * @brief - * The testResetMeasuredROFlowRateOverride function resets the override - * of the measured RO flow rate. - * @details Inputs: measuredROFlowRateLPM - * @details Outputs: measuredROFlowRateLPM - * @return TRUE if override successful, FALSE if not - *************************************************************************/ -BOOL testResetMeasuredROFlowRateOverride( void ) -{ - BOOL result = FALSE; - - if ( TRUE == isTestingActivated() ) - { - measuredROFlowRateLPM.data = measuredROFlowRateLPM.ovInitData; - measuredROFlowRateLPM.override = OVERRIDE_RESET; - measuredROFlowRateLPM.ovInitData = 0.0; - measuredROFlowRateLPM.ovData = 0.0; - result = TRUE; - } - - return result; -} - -/*********************************************************************//** - * @brief * The testSetTargetDutyCycleOverride function overrides the target duty * cycle of the RO pump. * @details Inputs: none Index: firmware/App/Controllers/ROPump.h =================================================================== diff -u -r256d5cb05f1ef09e19e2f2733a111f600c73a7ee -r2e21405574597474db0ebae86cdd7fa2d517f71c --- firmware/App/Controllers/ROPump.h (.../ROPump.h) (revision 256d5cb05f1ef09e19e2f2733a111f600c73a7ee) +++ firmware/App/Controllers/ROPump.h (.../ROPump.h) (revision 2e21405574597474db0ebae86cdd7fa2d517f71c) @@ -38,7 +38,6 @@ typedef struct { F32 roPumpTgtPressure; ///< RO pump target pressure. - F32 measROFlowRate; ///< RO flow rate measurement. F32 roPumpDutyCycle; ///< RO pump duty cycle. U32 roPumpState; ///< RO pump current state. F32 roPumpTgtFlowRateLM; ///< RO pump target flow rate in L/min @@ -62,9 +61,6 @@ BOOL isROPumpRunning( void ); F32 getTargetROPumpFlowRateLPM( void ); -F32 getMeasuredROFlowRateLPM( void ); -F32 getMeasuredROFlowRateWithConcPumpsLPM( void ); - F32 getTargetROPumpPressure( void ); F32 getROGeneratedVolumeL( void ); @@ -73,9 +69,6 @@ BOOL testSetROPumpDataPublishIntervalOverride( U32 value ); BOOL testResetROPumpDataPublishIntervalOverride( void ); -BOOL testSetMeasuredROFlowRateOverride( F32 value ); -BOOL testResetMeasuredROFlowRateOverride( void ); - BOOL testSetTargetROPumpFlow( F32 flow ); BOOL testSetTargetROPumpPressure( U32 value ); Index: firmware/App/Controllers/TemperatureSensors.c =================================================================== diff -u -rb3e53e10da033307b084161e6008fa5ed7710ccf -r2e21405574597474db0ebae86cdd7fa2d517f71c --- firmware/App/Controllers/TemperatureSensors.c (.../TemperatureSensors.c) (revision b3e53e10da033307b084161e6008fa5ed7710ccf) +++ firmware/App/Controllers/TemperatureSensors.c (.../TemperatureSensors.c) (revision 2e21405574597474db0ebae86cdd7fa2d517f71c) @@ -83,7 +83,6 @@ #define TEMP_SENSORS_DATA_PUBLISH_INTERVAL ( MS_PER_SECOND / TASK_PRIORITY_INTERVAL ) ///< Temperature sensors publish data time interval. #define TEMP_SENSORS_FPGA_ERROR_TIMEOUT_MS ( 2 * MS_PER_SECOND ) ///< Temperature sensors FPGA error timeout in milliseconds. -#define TEMP_SENSORS_ERROR_BIT_TIMEOUT_MS ( 2 * MS_PER_SECOND ) ///< Temperature sensors error bit timeout in milliseconds. #define TEMP_SENSORS_MIN_ALLOWED_DEGREE_C 0.0F ///< Temperature sensors minimum allowed temperature in C. #define TEMP_SENSORS_MAX_ALLOWED_DEGREE_C 120.0F ///< Temperature sensors maximum allowed temperature in C. @@ -330,9 +329,6 @@ // Persistent alarm for the temperature sensors range check initPersistentAlarm( ALARM_ID_DG_TEMPERATURE_SENSORS_ADC_FAULT, TEMP_SENSORS_OUT_OF_RANGE_TIME_OUT_MS, TEMP_SENSORS_OUT_OF_RANGE_TIME_OUT_MS ); - // Persistent alarm for the temperature sensors error bit fault check - initPersistentAlarm( ALARM_ID_DG_TEMPERATURE_SENSOR_ERROR_BIT_FAULT, TEMP_SENSORS_ERROR_BIT_TIMEOUT_MS, TEMP_SENSORS_ERROR_BIT_TIMEOUT_MS ); - // Initialize the FPGA persistent alarms initFPGAPersistentAlarm( TWO_WIRE_ADC_TEMP_SENSORS, ALARM_ID_DG_TWO_WIRE_SENSORS_FPGA_FAULT, TEMP_SENSORS_FPGA_ERROR_TIMEOUT_MS, TEMP_SENSORS_FPGA_ERROR_TIMEOUT_MS); initFPGAPersistentAlarm( THD_ADC_TEMP_SENSORS, ALARM_ID_DG_THD_SENSORS_FPGA_FAULT, TEMP_SENSORS_FPGA_ERROR_TIMEOUT_MS, TEMP_SENSORS_FPGA_ERROR_TIMEOUT_MS); @@ -614,7 +610,9 @@ *************************************************************************/ static void processTempSnsrsADCRead( U32 sensorIndex, U32 adc ) { - S32 convertedADC = (S32)( adc & MASK_OFF_U32_MSB ); + // Some of the temperature sensors have an MSB bit that is used as an error flag. This flag will be a TRUE by default. + BOOL isErrorBitNotValid = FALSE; + S32 convertedADC = (S32)( adc & MASK_OFF_U32_MSB ); switch( sensorIndex ) { @@ -633,10 +631,6 @@ case TEMPSENSORS_INTERNAL_THD_RTD: { U08 i; - // Some of the temperature sensors have an MSB bit that is used as an - // error flag. This flag will be a TRUE by default. - BOOL isErrorBitNotValid = FALSE; - U32 faultySensorIndex = 0; // Shift bits by 31 to right to check the error bit status tempSensors[ sensorIndex ].sensorErrorBitStatus = adc >> SHIFT_BITS_BY_31; @@ -651,11 +645,8 @@ if ( tempSensors[ i ].sensorErrorBitStatus > 0 ) { isErrorBitNotValid = TRUE; - faultySensorIndex = i; } } - - checkPersistentAlarm( ALARM_ID_DG_TEMPERATURE_SENSOR_ERROR_BIT_FAULT, isErrorBitNotValid, faultySensorIndex, TEMP_SENSORS_ERROR_BIT_TIMEOUT_MS ); } break; @@ -666,7 +657,11 @@ break; } - processADCRead( sensorIndex, convertedADC ); + if ( FALSE == isErrorBitNotValid ) + { + // Make sure the error bit is not true before + processADCRead( sensorIndex, convertedADC ); + } } /*********************************************************************//** @@ -930,6 +925,8 @@ data.internalTDIRTD = getTemperatureValue( TEMPSENSORS_INTERNAL_TDI_RTD ); data.interalTHDRTD = getTemperatureValue( TEMPSENSORS_INTERNAL_THD_RTD ); data.internalCondSnsrTemp = getTemperatureValue( TEMPSENSORS_INTERNAL_COND_TEMP_SENSOR ); + data.baroTempSensor = getTemperatureValue( TEMPSENSORS_BAROMETRIC_TEMP_SENSOR ); + broadcastData( MSG_ID_DG_TEMPERATURE_DATA, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&data, sizeof( TEMPERATURE_SENSORS_DATA_T ) ); dataPublicationTimerCounter = 0; } Index: firmware/App/Controllers/Voltages.c =================================================================== diff -u -r4e11c80367b5ae522aa34fb137079e516c98831b -r2e21405574597474db0ebae86cdd7fa2d517f71c --- firmware/App/Controllers/Voltages.c (.../Voltages.c) (revision 4e11c80367b5ae522aa34fb137079e516c98831b) +++ firmware/App/Controllers/Voltages.c (.../Voltages.c) (revision 2e21405574597474db0ebae86cdd7fa2d517f71c) @@ -8,7 +8,7 @@ * @file Voltages.c * * @author (last) Dara Navaei -* @date (last) 02-May-2022 +* @date (last) 21-Sep-2022 * * @author (original) Sean Nash * @date (original) 21-Apr-2021 @@ -275,9 +275,11 @@ adcReadings[ ch ][ adcReadingsIdx[ ch ] ] = getFPGAHeaterGndADC(); break; +#ifndef _VECTORCAST_ default: SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_INT_ADC_CHANNEL_NUMBER, ch ) break; +#endif } adcReadingsTotals[ ch ] += adcReadings[ ch ][ adcReadingsIdx[ ch ] ]; Index: firmware/App/Controllers/Voltages.h =================================================================== diff -u -r4e11c80367b5ae522aa34fb137079e516c98831b -r2e21405574597474db0ebae86cdd7fa2d517f71c --- firmware/App/Controllers/Voltages.h (.../Voltages.h) (revision 4e11c80367b5ae522aa34fb137079e516c98831b) +++ firmware/App/Controllers/Voltages.h (.../Voltages.h) (revision 2e21405574597474db0ebae86cdd7fa2d517f71c) @@ -7,8 +7,8 @@ * * @file Voltages.h * -* @author (last) Quang Nguyen -* @date (last) 19-Aug-2021 +* @author (last) Darren Cox +* @date (last) 11-Aug-2022 * * @author (original) Sean Nash * @date (original) 21-Apr-2021 Index: firmware/App/DGCommon.h =================================================================== diff -u -rcb4d35cc50df2d3cc9e828cd92e53cf456ca9b9d -r2e21405574597474db0ebae86cdd7fa2d517f71c --- firmware/App/DGCommon.h (.../DGCommon.h) (revision cb4d35cc50df2d3cc9e828cd92e53cf456ca9b9d) +++ firmware/App/DGCommon.h (.../DGCommon.h) (revision 2e21405574597474db0ebae86cdd7fa2d517f71c) @@ -8,7 +8,7 @@ * @file DGCommon.h * * @author (last) Dara Navaei -* @date (last) 03-Aug-2022 +* @date (last) 21-Sep-2022 * * @author (original) Sean * @date (original) 27-Feb-2020 @@ -25,7 +25,7 @@ #define DG_VERSION_MAJOR 0 #define DG_VERSION_MINOR 6 #define DG_VERSION_MICRO 0 -#define DG_VERSION_BUILD 30 +#define DG_VERSION_BUILD 33 // ********** build switches ********** Index: firmware/App/Modes/ModeChemicalDisinfect.c =================================================================== diff -u -r8074ecece0b11532c173ad951a98036f0c54ca52 -r2e21405574597474db0ebae86cdd7fa2d517f71c --- firmware/App/Modes/ModeChemicalDisinfect.c (.../ModeChemicalDisinfect.c) (revision 8074ecece0b11532c173ad951a98036f0c54ca52) +++ firmware/App/Modes/ModeChemicalDisinfect.c (.../ModeChemicalDisinfect.c) (revision 2e21405574597474db0ebae86cdd7fa2d517f71c) @@ -7,8 +7,8 @@ * * @file ModeChemicalDisinfect.c * -* @author (last) Bill Bracken -* @date (last) 22-Aug-2022 +* @author (last) Sean Nash +* @date (last) 29-Aug-2022 * * @author (original) Sean * @date (original) 04-Apr-2020 Index: firmware/App/Modes/ModeFault.c =================================================================== diff -u -rcb4d35cc50df2d3cc9e828cd92e53cf456ca9b9d -r2e21405574597474db0ebae86cdd7fa2d517f71c --- firmware/App/Modes/ModeFault.c (.../ModeFault.c) (revision cb4d35cc50df2d3cc9e828cd92e53cf456ca9b9d) +++ firmware/App/Modes/ModeFault.c (.../ModeFault.c) (revision 2e21405574597474db0ebae86cdd7fa2d517f71c) @@ -8,7 +8,7 @@ * @file ModeFault.c * * @author (last) Dara Navaei -* @date (last) 12-Jul-2022 +* @date (last) 12-Aug-2022 * * @author (original) Dara Navaei * @date (original) 05-Nov-2019 Index: firmware/App/Modes/ModeFill.c =================================================================== diff -u -r256d5cb05f1ef09e19e2f2733a111f600c73a7ee -r2e21405574597474db0ebae86cdd7fa2d517f71c --- firmware/App/Modes/ModeFill.c (.../ModeFill.c) (revision 256d5cb05f1ef09e19e2f2733a111f600c73a7ee) +++ firmware/App/Modes/ModeFill.c (.../ModeFill.c) (revision 2e21405574597474db0ebae86cdd7fa2d517f71c) @@ -19,6 +19,7 @@ #include "ConcentratePumps.h" #include "ConductivitySensors.h" +#include "FlowSensors.h" #include "FPGA.h" #include "CPLD.h" #include "Heaters.h" @@ -59,7 +60,7 @@ #define FILL_MODE_DATA_PUB_INTERVAL ( MS_PER_SECOND / TASK_GENERAL_INTERVAL ) ///< Interval (ms/task time) at which the fill mode data is published on the CAN bus. #define DIALYSATE_FILL_TIME_OUT ( 5 * SEC_PER_MIN * MS_PER_SECOND ) ///< Time out period when reservoir is not filled with correct dialysate. -#define CONCENTRATE_PUMP_PRIME_INTERVAL ( 3 * MS_PER_SECOND / TASK_GENERAL_INTERVAL ) ///< Persistent time interval for concentrate pumps prime. +#define CONCENTRATE_PUMP_PRIME_INTERVAL ( 10 * MS_PER_SECOND / TASK_GENERAL_INTERVAL ) ///< Persistent time interval for concentrate pumps prime. #define FLOW_INTEGRATED_VOLUME_CHECK_TOLERANCE 0.1F ///< Flow integrated volume has 10% tolerance compare to load cell reading. @@ -471,7 +472,7 @@ bicarbMix = bicarb.bicarbConcentrate[ CAL_DATA_BICARB_CONCENTRATE_1 ].bicarbConcMixRatio; setROPumpTargetFlowRateLPM( getTargetFillFlowRateLPM(), TARGET_RO_PRESSURE_PSI ); - handleDialysateMixing( getMeasuredROFlowRateLPM() * ML_PER_LITER, acidMix, bicarbMix ); + handleDialysateMixing( getMeasuredFlowRateLPM( RO_FLOW_SENSOR ) * ML_PER_LITER, acidMix, bicarbMix ); requestConcentratePumpOn( CONCENTRATEPUMPS_CP1_ACID ); requestConcentratePumpOn( CONCENTRATEPUMPS_CP2_BICARB ); result = DG_FILL_MODE_STATE_PRODUCE_DIALYSATE; @@ -670,7 +671,7 @@ bicarbMix = bicarb.bicarbConcentrate[ CAL_DATA_BICARB_CONCENTRATE_1 ].bicarbConcMixRatio; setROPumpTargetFlowRateLPM( getTargetFillFlowRateLPM(), TARGET_RO_PRESSURE_PSI ); - handleDialysateMixing( getMeasuredROFlowRateLPM() * ML_PER_LITER, acidMix, bicarbMix ); + handleDialysateMixing( getMeasuredFlowRateLPM( RO_FLOW_SENSOR ) * ML_PER_LITER, acidMix, bicarbMix ); requestConcentratePumpOn( CONCENTRATEPUMPS_CP2_BICARB ); // Do the necessary setup here before transition to Produce Dialysate State @@ -710,7 +711,7 @@ bicarbMix = bicarb.bicarbConcentrate[ CAL_DATA_BICARB_CONCENTRATE_1 ].bicarbConcMixRatio; // Prime mixing before deliver result to reservoir - handleDialysateMixing( getMeasuredROFlowRateLPM() * ML_PER_LITER, acidMix, bicarbMix ); + handleDialysateMixing( getMeasuredFlowRateLPM( RO_FLOW_SENSOR ) * ML_PER_LITER, acidMix, bicarbMix ); if ( concentratePumpPrimeCount++ > CONCENTRATE_PUMP_PRIME_INTERVAL ) { @@ -750,19 +751,18 @@ bicarbMix = bicarb.bicarbConcentrate[ CAL_DATA_BICARB_CONCENTRATE_1 ].bicarbConcMixRatio; // Set concentrate pumps speed based on the RO pump flow rate - handleDialysateMixing( getMeasuredROFlowRateLPM() * ML_PER_LITER, acidMix, bicarbMix ); + handleDialysateMixing( getMeasuredFlowRateLPM( RO_FLOW_SENSOR ) * ML_PER_LITER, acidMix, bicarbMix ); integratedVolumeML += getMeasuredROFlowRateWithConcPumpsLPM() * ( (F32)TASK_GENERAL_INTERVAL / (F32)( SEC_PER_MIN ) ); usedAcidVolumeML.data += getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP1_ACID ) * FLOW_INTEGRATOR; usedBicarbVolumeML.data += getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP2_BICARB ) * FLOW_INTEGRATOR; - acidConductivityTotal += acidConductivity; bicarbConductivityTotal += bicarbConductivity; conductivitySampleCount++; // DG is delivering dialysate keep collecting the sample counter and the measured flow fillStatus.fillSampleCounter += 1; - fillStatus.fillFlowRateRunningSum += getMeasuredROFlowRateLPM(); + fillStatus.fillFlowRateRunningSum += getMeasuredFlowRateLPM( RO_FLOW_SENSOR ); fillStatus.fillTemperatureRunningSum += getTemperatureValue( (U32)TEMPSENSORS_OUTLET_PRIMARY_HEATER ); // TODO: Check for open straw door status and alarm if closed @@ -827,10 +827,6 @@ fillStatus.fillLastTemperature = getTemperatureValue( (U32)TEMPSENSORS_OUTLET_PRIMARY_HEATER ); calculateHeaterEstimationGain( DG_PRIMARY_HEATER ); - - // Write the latest fill data into the RTC RAM for heaters control - // setFillInfoToRTCRAM(); // TODO we do not need to write to NV memory for now - requestNewOperationMode( DG_MODE_GENE ); } @@ -908,16 +904,19 @@ *************************************************************************/ static void checkDialysateTemperatureSensors( void ) { -#ifndef THD_USING_TRO_CONNECTOR // Do not use until TRo is back in line F32 TDi = getTemperatureValue( TEMPSENSORS_INLET_DIALYSATE ); F32 TRo = getTemperatureValue( TEMPSENSORS_OUTLET_REDUNDANT ); BOOL isDriftOut = ( fabs( TDi - TRo ) >= DIALYSATE_TEMPERATURE_SENSORS_MAX_DRIFT_C ? TRUE : FALSE ); - if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_DG_DIALYSATE_TEMPERATURE_SENSORS_OUT_OF_RANGE, isDriftOut ) ) +#ifndef _RELEASE_ + if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_TEMPERATURE_SENSORS_ALARM ) != SW_CONFIG_ENABLE_VALUE ) +#endif { - activateAlarmNoData( ALARM_ID_DG_DIALYSATE_TEMPERATURE_SENSORS_OUT_OF_RANGE ); + if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_DG_DIALYSATE_TEMPERATURE_SENSORS_OUT_OF_RANGE, isDriftOut ) ) + { + activateAlarmNoData( ALARM_ID_DG_DIALYSATE_TEMPERATURE_SENSORS_OUT_OF_RANGE ); + } } -#endif } /*********************************************************************//** Index: firmware/App/Modes/ModeFlush.c =================================================================== diff -u -r8074ecece0b11532c173ad951a98036f0c54ca52 -r2e21405574597474db0ebae86cdd7fa2d517f71c --- firmware/App/Modes/ModeFlush.c (.../ModeFlush.c) (revision 8074ecece0b11532c173ad951a98036f0c54ca52) +++ firmware/App/Modes/ModeFlush.c (.../ModeFlush.c) (revision 2e21405574597474db0ebae86cdd7fa2d517f71c) @@ -7,8 +7,8 @@ * * @file ModeFlush.c * -* @author (last) Bill Bracken -* @date (last) 22-Aug-2022 +* @author (last) Dara Navaei +* @date (last) 31-Aug-2022 * * @author (original) Leonardo Baloa * @date (original) 20-Dec-2019 Index: firmware/App/Modes/ModeHeatDisinfect.c =================================================================== diff -u -rcb4d35cc50df2d3cc9e828cd92e53cf456ca9b9d -r2e21405574597474db0ebae86cdd7fa2d517f71c --- firmware/App/Modes/ModeHeatDisinfect.c (.../ModeHeatDisinfect.c) (revision cb4d35cc50df2d3cc9e828cd92e53cf456ca9b9d) +++ firmware/App/Modes/ModeHeatDisinfect.c (.../ModeHeatDisinfect.c) (revision 2e21405574597474db0ebae86cdd7fa2d517f71c) @@ -7,8 +7,8 @@ * * @file ModeHeatDisinfect.c * -* @author (last) Bill Bracken -* @date (last) 22-Aug-2022 +* @author (last) Sean Nash +* @date (last) 29-Aug-2022 * * @author (original) Sean * @date (original) 20-Apr-2020 Index: firmware/App/Modes/ModeInitPOST.c =================================================================== diff -u -r851ee579efc2add1f16a5012bdaac93658e760ea -r2e21405574597474db0ebae86cdd7fa2d517f71c --- firmware/App/Modes/ModeInitPOST.c (.../ModeInitPOST.c) (revision 851ee579efc2add1f16a5012bdaac93658e760ea) +++ firmware/App/Modes/ModeInitPOST.c (.../ModeInitPOST.c) (revision 2e21405574597474db0ebae86cdd7fa2d517f71c) @@ -8,7 +8,7 @@ * @file ModeInitPOST.c * * @author (last) Dara Navaei -* @date (last) 06-Jul-2022 +* @date (last) 12-Aug-2022 * * @author (original) Dara Navaei * @date (original) 05-Nov-2019 Index: firmware/App/Modes/ModeStandby.c =================================================================== diff -u -rcb4d35cc50df2d3cc9e828cd92e53cf456ca9b9d -r2e21405574597474db0ebae86cdd7fa2d517f71c --- firmware/App/Modes/ModeStandby.c (.../ModeStandby.c) (revision cb4d35cc50df2d3cc9e828cd92e53cf456ca9b9d) +++ firmware/App/Modes/ModeStandby.c (.../ModeStandby.c) (revision 2e21405574597474db0ebae86cdd7fa2d517f71c) @@ -8,7 +8,7 @@ * @file ModeStandby.c * * @author (last) Dara Navaei -* @date (last) 31-May-2022 +* @date (last) 21-Sep-2022 * * @author (original) Dara Navaei * @date (original) 05-Nov-2019 Index: firmware/App/Modes/OperationModes.c =================================================================== diff -u -r4e11c80367b5ae522aa34fb137079e516c98831b -r2e21405574597474db0ebae86cdd7fa2d517f71c --- firmware/App/Modes/OperationModes.c (.../OperationModes.c) (revision 4e11c80367b5ae522aa34fb137079e516c98831b) +++ firmware/App/Modes/OperationModes.c (.../OperationModes.c) (revision 2e21405574597474db0ebae86cdd7fa2d517f71c) @@ -8,7 +8,7 @@ * @file OperationModes.c * * @author (last) Dara Navaei -* @date (last) 15-Jul-2022 +* @date (last) 21-Sep-2022 * * @author (original) Dara Navaei * @date (original) 05-Nov-2019 @@ -416,6 +416,34 @@ /*********************************************************************//** * @brief + * The testSetOperationMode function will transition to a given operation + * mode if the transition is legal. + * @details Inputs: none + * @details Outputs: modeRequest[] + * @param newMode ID of requested mode to transition to + * @return TRUE if request successful, FALSE if not + *************************************************************************/ +BOOL testSetOperationMode( DG_OP_MODE_T newMode ) +{ + BOOL result = FALSE; + + if ( TRUE == isTestingActivated() ) + { + DG_OP_MODE_T check = MODE_TRANSITION_TABLE[ currentMode ][ newMode ]; + + // Is mode transition legal? + if ( check == newMode ) + { + requestNewOperationMode( newMode ); + result = TRUE; + } + } + + return result; +} + +/*********************************************************************//** + * @brief * The testSetDGOpModePublishIntervalOverride function overrides the * DG operation mode publish interval. * @details Inputs: none Index: firmware/App/Services/AlarmMgmtSWFaults.h =================================================================== diff -u -rcb4d35cc50df2d3cc9e828cd92e53cf456ca9b9d -r2e21405574597474db0ebae86cdd7fa2d517f71c --- firmware/App/Services/AlarmMgmtSWFaults.h (.../AlarmMgmtSWFaults.h) (revision cb4d35cc50df2d3cc9e828cd92e53cf456ca9b9d) +++ firmware/App/Services/AlarmMgmtSWFaults.h (.../AlarmMgmtSWFaults.h) (revision 2e21405574597474db0ebae86cdd7fa2d517f71c) @@ -8,7 +8,7 @@ * @file AlarmMgmtSWFaults.h * * @author (last) Dara Navaei -* @date (last) 03-Aug-2022 +* @date (last) 21-Sep-2022 * * @author (original) Quang Nguyen * @date (original) 20-May-2021 @@ -86,6 +86,7 @@ SW_FAULT_ID_CONCENTRATE_PUMP_EXEC_INVALID_STATE, // 55 SW_FAULT_ID_CONCENTRATE_PUMP_INVALID_PUMP_ID, SW_FAULT_ID_SEMAPHORE_IN_USE_TIMEOUT, + SW_FAULT_ID_SERVICE_MODE_INVALID_EXEC_STATE, SW_FAULT_ID_UV_REACTORS_INVALID_EXEC_STATE, SW_FAULT_ID_UV_REACTORS_INVALID_SELF_TEST_STATE, SW_FAULT_ID_THERMISTORS_INVALID_EXEC_STATE, // 60 @@ -132,10 +133,12 @@ SW_FAULT_ID_ILLEGAL_MEM_ACCESS, SW_FAULT_ID_INVALID_CHEMICAL_BOTTLE_SELECTED, SW_FAULT_ID_INVALID_FPGA_SENSOR_GROUP_SELECTED, - SW_FAULT_ID_INVALID_FLOW_SENSOR_SELECTED, - SW_FAULT_ID_INVALID_SERVICE_STATE_SELECTED, // 105 + SW_FAULT_ID_INVALID_FLOW_SENSOR_SELECTED, // 106 + SW_FAULT_ID_INVALID_SERVICE_STATE_SELECTED, SW_FAULT_ID_INVALID_NV_RECORD_SELECTED, SW_FAULT_ID_WRITE_USAGE_INFO_TO_NV_FAILURE, + SW_FAULT_ID_INVALID_FPGA_ERROR_GROUP_SELECTED, + SW_FAULT_ID_INVALID_LED_COLOR_SELECTED, // 110 NUM_OF_SW_FAULT_IDS } SW_FAULT_ID_T; Index: firmware/App/Services/FPGA.c =================================================================== diff -u -rb3e53e10da033307b084161e6008fa5ed7710ccf -r2e21405574597474db0ebae86cdd7fa2d517f71c --- firmware/App/Services/FPGA.c (.../FPGA.c) (revision b3e53e10da033307b084161e6008fa5ed7710ccf) +++ firmware/App/Services/FPGA.c (.../FPGA.c) (revision 2e21405574597474db0ebae86cdd7fa2d517f71c) @@ -167,10 +167,10 @@ U08 fpgaTRoErrorCnt; ///< Reg 361. Redundant outlet temperature sensor error count U08 fpgaTDiReadCnt; ///< Reg 362. Dialysate inlet temperature sensor read count U08 fpgaTDiErrorCnt; ///< Reg 363. Dialysate inlet temperature sensor error count - U08 fpgaPrimaryHeaterFlags; ///< Reg 364. Primary heater flags - U08 fpgaPrimaryHeaterReadCnt; ///< Reg 365. Primary heater read count - U08 fpgaTrimmerHeaterFlags; ///< Reg 366. Trimmer heater flags - U08 fpgaTrimmerHeaterReadCnt; ///< Reg 367. Trimmer heater read count + U08 fpgaPrimaryHeaterFlags; ///< Reg 364. Primary heater flags (thermo-couple) + U08 fpgaPrimaryHeaterReadCnt; ///< Reg 365. Primary heater read count (thermo-couple) + U08 fpgaTrimmerHeaterFlags; ///< Reg 366. Trimmer heater flags (thermo-couple) + U08 fpgaTrimmerHeaterReadCnt; ///< Reg 367. Trimmer heater read count (thermo-couple) U08 fpgaCPoFault; ///< Reg 368. CPo conductivity sensor fault U08 fpgaCPoReadCnt; ///< Reg 369. CPo conductivity sensor read count @@ -2404,4 +2404,14 @@ return fpgaSensorReadings.fpgaHeaterGNDADC; } +U08 getFPGAHeaterGateADCReadCount( void ) +{ + return fpgaSensorReadings.fpgaHeater1ADCReadCount; +} + +U08 getFPGAHeaterGateADCErrorCount( void ) +{ + return fpgaSensorReadings.fpgaHeater1ADCErrorCount; +} + /**@}*/ Index: firmware/App/Services/FPGA.h =================================================================== diff -u -rb3e53e10da033307b084161e6008fa5ed7710ccf -r2e21405574597474db0ebae86cdd7fa2d517f71c --- firmware/App/Services/FPGA.h (.../FPGA.h) (revision b3e53e10da033307b084161e6008fa5ed7710ccf) +++ firmware/App/Services/FPGA.h (.../FPGA.h) (revision 2e21405574597474db0ebae86cdd7fa2d517f71c) @@ -170,6 +170,8 @@ U16 getFPGAHeaterGateADC( void ); U16 getFPGAHeaterGndADC( void ); +U08 getFPGAHeaterGateADCReadCount( void ); +U08 getFPGAHeaterGateADCErrorCount( void ); /**@}*/ Index: firmware/App/Services/Reservoirs.c =================================================================== diff -u -rcb4d35cc50df2d3cc9e828cd92e53cf456ca9b9d -r2e21405574597474db0ebae86cdd7fa2d517f71c --- firmware/App/Services/Reservoirs.c (.../Reservoirs.c) (revision cb4d35cc50df2d3cc9e828cd92e53cf456ca9b9d) +++ firmware/App/Services/Reservoirs.c (.../Reservoirs.c) (revision 2e21405574597474db0ebae86cdd7fa2d517f71c) @@ -8,7 +8,7 @@ * @file Reservoirs.c * * @author (last) Dara Navaei -* @date (last) 03-Aug-2022 +* @date (last) 21-Sep-2022 * * @author (original) Sean * @date (original) 18-Mar-2020 @@ -1061,4 +1061,32 @@ return result; } +/*********************************************************************//** + * @brief + * The testTareReservoir function tares a given reservoir. It is assumed + * that the given reservoir has already been drained. + * @details Inputs: drainVolumeTargetMl + * @details Outputs: drainVolumeTargetMl + * @param value ID of reservoir to tare + * @return TRUE if tare successful, FALSE if not + *************************************************************************/ +BOOL testTareReservoir( U32 value ) +{ + BOOL result = FALSE; + + if ( TRUE == isTestingActivated() ) + { + if ( value < NUM_OF_DG_RESERVOIRS ) + { + result = TRUE; + tareLoadCellRequest = TRUE; + testSetReservoirDrainVolumeMlOverride( 0 ); + tareLoadCellsAtEmpty( (DG_RESERVOIR_ID_T)value ); + testResetReservoirDrainVolumeMlOverride(); + } + } + + return result; +} + /**@}*/ Index: firmware/App/Services/SystemComm.c =================================================================== diff -u -r8074ecece0b11532c173ad951a98036f0c54ca52 -r2e21405574597474db0ebae86cdd7fa2d517f71c --- firmware/App/Services/SystemComm.c (.../SystemComm.c) (revision 8074ecece0b11532c173ad951a98036f0c54ca52) +++ firmware/App/Services/SystemComm.c (.../SystemComm.c) (revision 2e21405574597474db0ebae86cdd7fa2d517f71c) @@ -7,8 +7,8 @@ * * @file SystemComm.c * -* @author (last) Dara Navaei -* @date (last) 12-Jul-2022 +* @author (last) Dong Nguyen +* @date (last) 27-Sep-2022 * * @author (original) Dara Navaei * @date (original) 05-Nov-2019 @@ -52,6 +52,9 @@ #define MSG_NOT_ACKED_MAX_RETRIES 3 ///< maximum number of times a message that requires ACK that was not ACK'd can be re-sent before alarm #define PENDING_ACK_LIST_SIZE 25 ///< maximum number of Delanli messages that can be pending ACK at any given time +#define MAX_FPGA_CLOCK_SPEED_ERRORS 3 ///< maximum number of FPGA clock speed errors within window period before alarm +#define MAX_FPGA_CLOCK_SPEED_ERROR_WINDOW_MS (10 * SEC_PER_MIN * MS_PER_SECOND) ///< FPGA clock speed error window + #pragma pack(push, 1) /// Record for transmitted message that is pending acknowledgement from receiver. @@ -136,6 +139,9 @@ // initialize bad message CRC time windowed count initTimeWindowedCount( TIME_WINDOWED_COUNT_BAD_MSG_CRC, MAX_COMM_CRC_FAILURES, MAX_COMM_CRC_FAILURE_WINDOW_MS ); + // initialize FPGA clock speed error time windowed count + initTimeWindowedCount( TIME_WINDOWED_COUNT_FPGA_CLOCK_SPEED_ERROR, MAX_FPGA_CLOCK_SPEED_ERRORS, MAX_FPGA_CLOCK_SPEED_ERROR_WINDOW_MS); + // initialize pending ACK list for ( i = 0; i < PENDING_ACK_LIST_SIZE; i++ ) { @@ -892,6 +898,10 @@ handleHDRequestDGUsageInfo( message ); break; + case MSG_ID_HD_REQUEST_DG_SERVICE_MODE: + handleServiceModeRequest( message ); + break; + // NOTE: This case must be last case MSG_ID_DG_TESTER_LOGIN_REQUEST: handleTesterLogInRequest( message ); @@ -1192,6 +1202,14 @@ handleResendAllAlarmsCommand( message ); break; + case MSG_ID_DG_SET_OP_MODE_REQUEST: + handleTestSetOpModeRequest( message ); + break; + + case MSG_ID_DG_RESERVOIR_TARE_REQUEST: + handleTestTareReservoirRequest( message ); + break; + default: // TODO - unrecognized message ID received - ignore break; Index: firmware/App/Services/SystemCommMessages.c =================================================================== diff -u -r364c00d074d23989f2d714189a8c89964e32b458 -r2e21405574597474db0ebae86cdd7fa2d517f71c --- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 364c00d074d23989f2d714189a8c89964e32b458) +++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 2e21405574597474db0ebae86cdd7fa2d517f71c) @@ -8,7 +8,7 @@ * @file SystemCommMessages.c * * @author (last) Dara Navaei -* @date (last) 21-Jun-2022 +* @date (last) 21-Sep-2022 * * @author (original) Dara Navaei * @date (original) 05-Nov-2019 @@ -454,6 +454,7 @@ if ( message->hdr.payloadLen == sizeof( DG_CMD_DIALYSATE_HEATING_PARAMS_T ) ) { DG_CMD_DIALYSATE_HEATING_PARAMS_T payload; + result = TRUE; memcpy( &payload, message->payload, sizeof( DG_CMD_DIALYSATE_HEATING_PARAMS_T ) ); setDialysateHeatingParameters( payload ); @@ -1390,6 +1391,56 @@ /*********************************************************************//** * @brief + * The handleTestSetOpModeRequest function handles a request to set the + * DG operation mode. + * @details Inputs: none + * @details Outputs: message handled + * @param message a pointer to the message to handle + * @return none + *************************************************************************/ +void handleTestSetOpModeRequest( MESSAGE_T *message ) +{ + BOOL result = FALSE; + + if ( message->hdr.payloadLen == sizeof(U32) ) + { + U32 mode; + + memcpy( &mode, message->payload, sizeof(U32) ); + result = testSetOperationMode( (DG_OP_MODE_T)mode ); + } + + // Respond to request + sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result ); +} + +/*********************************************************************//** + * @brief + * The handleTestTareReservoirRequest function handles a request to tare a + * given reservoir's weight. + * @details Inputs: none + * @details Outputs: message handled + * @param message a pointer to the message to handle + * @return none + *************************************************************************/ +void handleTestTareReservoirRequest( MESSAGE_T *message ) +{ + BOOL result = FALSE; + + if ( message->hdr.payloadLen == sizeof(U32) ) + { + U32 res; + + memcpy( &res, message->payload, sizeof(U32) ); + result = testTareReservoir( res ); + } + + // Respond to request + sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result ); +} + +/*********************************************************************//** + * @brief * The handleSetHDOperationMode function receives the HD operation modes data * publish message. * @details Inputs: none @@ -3692,4 +3743,73 @@ sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result ); } +/*********************************************************************//** +* @brief +* The handleServiceModeRequest function handles a request to enter service +* mode. +* @details Inputs: none +* @details Outputs: message handled +* @param message a pointer to the message to handle +* @return none +*************************************************************************/ +void handleServiceModeRequest( MESSAGE_T *message ) +{ + BOOL status = FALSE; + DG_OP_MODE_T currentMode = getCurrentOperationMode(); + REQUEST_REJECT_REASON_CODE_T reject; + + if ( 0 == message->hdr.payloadLen ) + { + if ( ( DG_MODE_STAN == currentMode ) || ( DG_MODE_FAUL == currentMode ) ) + { + status = TRUE; + requestNewOperationMode( DG_MODE_SERV ); + reject = REQUEST_REJECT_REASON_NONE; + } + else + { + reject = REQUEST_REJECT_REASON_DG_NOT_IN_STANDBY_IDLE_STATE; + } + } + else + { + reject = REQUEST_REJECT_REASON_INVALID_REQUEST_FORMAT; + } + + // Respond to request + sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, status ); + sendServiceModeResponse( status, (U32)reject ); +} + +/*********************************************************************//** + * @brief + * The sendServiceModeResponse function sends out the DG response to a + * UI request to go to service mode. + * @details Inputs: none + * @details Outputs: Service mode request response msg constructed and queued + * @param accepted TRUE if request was accepted, FALSE if not + * @param rejCode Reject reason code explaining why request was rejected + * @return none + *************************************************************************/ +BOOL sendServiceModeResponse( BOOL accepted, U32 rejCode ) +{ + BOOL result; + MESSAGE_T msg; + U08 *payloadPtr = msg.payload; + + // Create a message record + blankMessage( &msg ); + msg.hdr.msgID = MSG_ID_DG_RESPONSE_SERVICE_MODE_REQUEST; + msg.hdr.payloadLen = sizeof( BOOL ) + sizeof( U32 ); + + memcpy( payloadPtr, &accepted, sizeof( BOOL ) ); + payloadPtr += sizeof( BOOL ); + memcpy( payloadPtr, &rejCode, sizeof( U32 ) ); + + // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer + result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_DG_2_HD, ACK_REQUIRED ); + + return result; +} + /**@}*/ Index: firmware/App/Services/SystemCommMessages.h =================================================================== diff -u -r364c00d074d23989f2d714189a8c89964e32b458 -r2e21405574597474db0ebae86cdd7fa2d517f71c --- firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision 364c00d074d23989f2d714189a8c89964e32b458) +++ firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision 2e21405574597474db0ebae86cdd7fa2d517f71c) @@ -8,7 +8,7 @@ * @file SystemCommMessages.h * * @author (last) Dara Navaei -* @date (last) 25-May-2022 +* @date (last) 21-Sep-2022 * * @author (original) Dara Navaei * @date (original) 05-Nov-2019 @@ -160,6 +160,12 @@ // MSG_ID_HD_REQUEST_DG_USAGE_INFO void handleHDRequestDGUsageInfo( MESSAGE_T * message ); +// MSG_ID_UI_REQUEST_SERVICE_MODE +void handleServiceModeRequest( MESSAGE_T *message ); + +// MSG_ID_DG_RESPONSE_SERVICE_MODE_REQUEST +BOOL sendServiceModeResponse( BOOL accepted, U32 rejCode ); + // *********** public test support message functions ********** // MSG_TESTER_LOG_IN @@ -394,6 +400,15 @@ // MSG_ID_HD_REQUEST_DG_ALARMS void handleResendAllAlarmsCommand( MESSAGE_T *message ); +// MSG_ID_DG_SET_OP_MODE_REQUEST +void handleTestSetOpModeRequest( MESSAGE_T *message ); + +// MSG_ID_DG_RESERVOIR_TARE_REQUEST +void handleTestTareReservoirRequest( MESSAGE_T *message ); + +// MSG_ID_HD_OP_MODE +BOOL handleSetHDOperationMode( MESSAGE_T *message ); + /**@}*/ #endif Index: firmware/App/Tasks/TaskPriority.c =================================================================== diff -u -r35fe6a299d68fe65dbb318134b2e0a8eb2806a24 -r2e21405574597474db0ebae86cdd7fa2d517f71c --- firmware/App/Tasks/TaskPriority.c (.../TaskPriority.c) (revision 35fe6a299d68fe65dbb318134b2e0a8eb2806a24) +++ firmware/App/Tasks/TaskPriority.c (.../TaskPriority.c) (revision 2e21405574597474db0ebae86cdd7fa2d517f71c) @@ -7,8 +7,8 @@ * * @file TaskPriority.c * -* @author (last) Dara Navaei -* @date (last) 06-Jul-2022 +* @author (last) Dong Nguyen +* @date (last) 27-Sep-2022 * * @author (original) Dara Navaei * @date (original) 05-Nov-2019 @@ -74,6 +74,9 @@ // Temperature sensors read execTemperatureSensors(); + // Verify the processor clock speed against the FPGA clock + execFPGAClockSpeedTest(); + // Conductivity sensors read execConductivitySensors();