Index: firmware/App/Controllers/DGInterface.c =================================================================== diff -u -r758497628fa5839a2b6661a9d7c32fd3b11db2bd -re5d24f913e4f29d61c813cd1446ac22a368815f2 --- firmware/App/Controllers/DGInterface.c (.../DGInterface.c) (revision 758497628fa5839a2b6661a9d7c32fd3b11db2bd) +++ firmware/App/Controllers/DGInterface.c (.../DGInterface.c) (revision e5d24f913e4f29d61c813cd1446ac22a368815f2) @@ -235,7 +235,7 @@ void execDGInterfaceMonitor( void ) { // Trigger alarm if not receiving new load cell data message in timely manner - checkDGDataFreshness( ALARM_ID_HD_NEW_LOAD_CELL_DATA_MESSAGE_NOT_RECEIVE, &dgLoadCellDataFreshFlag ); + /*checkDGDataFreshness( ALARM_ID_HD_NEW_LOAD_CELL_DATA_MESSAGE_NOT_RECEIVE, &dgLoadCellDataFreshFlag ); // Trigger alarm if not receiving new dialysate temperature data message in timely manner checkDGDataFreshness( ALARM_ID_HD_NEW_DIALYSATE_TEMPERATURE_DATA_MESSAGE_NOT_RECEIVE, &dgDialysateTemperatureDataFreshFlag ); @@ -246,7 +246,7 @@ // Trigger alarm if not receiving new DG op mode message in timely manner checkDGDataFreshness( ALARM_ID_HD_NEW_DG_OPERATION_MODE_MESSAGE_NOT_RECEIVE, &dgOpModeDataFreshFlag ); - // Check to see if DG has restarted + // Check to see if DG has restarted*/ checkDGRestart(); // Check the status of the trimmer heater @@ -452,14 +452,14 @@ /*********************************************************************//** * @brief - * The getDialysateTemperature function gets the latest dialysate temperature. - * @details Inputs: dgDialysateTemp + * The getDGDisinfectsStates function returns the DG disinfects readings. + * @details Inputs: none * @details Outputs: none - * @return the current dialysate temperature + * @return the current DG disinfects readings *************************************************************************/ -F32 getDialysateTemperature( void ) +DG_DISINFECT_UI_STATES_T getDGDisinfectsStates( void ) { - return dgDialysateTemp; + return disinfectsStatus; } /*********************************************************************//** @@ -480,11 +480,11 @@ * The getDGDisinfectsStates function returns the DG disinfects readings. * @details Inputs: none * @details Outputs: none - * @return the current DG disinfects readings + * @return the current dialysate temperature *************************************************************************/ -DG_DISINFECT_UI_STATES_T getDGDisinfectsStates( void ) +F32 getDialysateTemperature( void ) { - return disinfectsStatus; + return dgDialysateTemp; } /*********************************************************************//** Index: firmware/App/Controllers/DGInterface.h =================================================================== diff -u -r758497628fa5839a2b6661a9d7c32fd3b11db2bd -re5d24f913e4f29d61c813cd1446ac22a368815f2 --- firmware/App/Controllers/DGInterface.h (.../DGInterface.h) (revision 758497628fa5839a2b6661a9d7c32fd3b11db2bd) +++ firmware/App/Controllers/DGInterface.h (.../DGInterface.h) (revision e5d24f913e4f29d61c813cd1446ac22a368815f2) @@ -131,6 +131,7 @@ F32 getDialysateTemperature( void ); F32 getHeatDisinfectTemperatureSensorValue( void ); DG_DISINFECT_UI_STATES_T getDGDisinfectsStates( void ); +F32 getDialysateTemperature( void ); DG_MIXING_RATIOS_T getDGMixingRatios( void ); void getHDVersionDGServiceAndUsageData( DG_SERVICE_AND_USAGE_DATA_T* data ); Index: firmware/App/Controllers/DialInFlow.c =================================================================== diff -u -r758497628fa5839a2b6661a9d7c32fd3b11db2bd -re5d24f913e4f29d61c813cd1446ac22a368815f2 --- firmware/App/Controllers/DialInFlow.c (.../DialInFlow.c) (revision 758497628fa5839a2b6661a9d7c32fd3b11db2bd) +++ firmware/App/Controllers/DialInFlow.c (.../DialInFlow.c) (revision e5d24f913e4f29d61c813cd1446ac22a368815f2) @@ -75,6 +75,7 @@ /// Persist time (task intervals) for flow vs. motor speed error condition. static const U32 DIP_FLOW_VS_SPEED_PERSIST = ((5 * MS_PER_SECOND) / TASK_PRIORITY_INTERVAL); +//static const U32 DIP_FLOW_VS_SPEED_PERSIST = ((60 * MS_PER_SECOND) / TASK_PRIORITY_INTERVAL); //DN-03NOV2022 - Make it 1 minutes for testing /// Persist time (task intervals) for motor off error condition. static const U32 DIP_OFF_ERROR_PERSIST = ((5 * MS_PER_SECOND) / TASK_PRIORITY_INTERVAL); /// Persist time (task intervals) motor speed error condition. Index: firmware/App/Drivers/Battery.c =================================================================== diff -u -r758497628fa5839a2b6661a9d7c32fd3b11db2bd -re5d24f913e4f29d61c813cd1446ac22a368815f2 --- firmware/App/Drivers/Battery.c (.../Battery.c) (revision 758497628fa5839a2b6661a9d7c32fd3b11db2bd) +++ firmware/App/Drivers/Battery.c (.../Battery.c) (revision e5d24f913e4f29d61c813cd1446ac22a368815f2) @@ -194,6 +194,7 @@ if ( TRUE == didTimeout( lastBatteryMonitorTime, BATTERY_MONITOR_INTERVAL_MS ) ) { lastBatteryMonitorTime = getMSTimerCount(); + getBatteryManagementData(); } } Index: firmware/App/HDCommon.h =================================================================== diff -u -r83ec5882c7491e903ea71e37f2d8dc2ebe1eded3 -re5d24f913e4f29d61c813cd1446ac22a368815f2 --- firmware/App/HDCommon.h (.../HDCommon.h) (revision 83ec5882c7491e903ea71e37f2d8dc2ebe1eded3) +++ firmware/App/HDCommon.h (.../HDCommon.h) (revision e5d24f913e4f29d61c813cd1446ac22a368815f2) @@ -10,8 +10,8 @@ * @author (last) Sean Nash * @date (last) 21-Dec-2022 * -* @author (original) Sean -* @date (original) 27-Feb-2020 +* @author (original) Sean +* @date (original) 27-Feb-2020 * ***************************************************************************/ @@ -25,7 +25,7 @@ #define HD_VERSION_MAJOR 0 #define HD_VERSION_MINOR 6 #define HD_VERSION_MICRO 0 -#define HD_VERSION_BUILD 72 +#define HD_VERSION_BUILD 410 // ********** development build switches ********** Index: firmware/App/Modes/ModeStandby.c =================================================================== diff -u -r758497628fa5839a2b6661a9d7c32fd3b11db2bd -re5d24f913e4f29d61c813cd1446ac22a368815f2 --- firmware/App/Modes/ModeStandby.c (.../ModeStandby.c) (revision 758497628fa5839a2b6661a9d7c32fd3b11db2bd) +++ firmware/App/Modes/ModeStandby.c (.../ModeStandby.c) (revision e5d24f913e4f29d61c813cd1446ac22a368815f2) @@ -68,6 +68,7 @@ static OVERRIDE_U32_T standbyModePublishInterval = { DISINFECTS_DATA_PUB_INTERVAL, DISINFECTS_DATA_PUB_INTERVAL, DISINFECTS_DATA_PUB_INTERVAL, 0 }; static const U32 SERVICE_TIME_INTERVAL_S = (U32)( 365 * 0.5 * SECONDS_IN_A_DAY ); ///< HD/DG 6-month service interval in seconds. +static BOOL homingInitiated; ///< Flag indicates actuator homing has been initiated from standby mode. // ********** private function prototypes ********** @@ -111,6 +112,7 @@ heatDisinfectStartReqReceived = FALSE; chemDisinfectStartReqReceived = FALSE; disinfectCancelReqID = GENERIC_CONFIRM_ID_NONE; + homingInitiated = FALSE; dgDisinfectState = DG_DISINFECT_NOT_RUNNING_STATE; homingInitiated = FALSE; } @@ -1071,7 +1073,7 @@ *************************************************************************/ static void publishDisinfectData( void ) { - if ( ++dataPublishCounter > DISINFECTS_DATA_PUB_INTERVAL ) + if ( ++dataPublishCounter >= DISINFECTS_DATA_PUB_INTERVAL ) { DG_DISINFECT_UI_STATES_T state = getDGDisinfectsStates(); DISINFECTS_DATA_T data; Index: firmware/App/Services/AlarmMgmtSWFaults.h =================================================================== diff -u -rbb0566d9d186ea1379fbba7233c6b7ebf95bc50c -re5d24f913e4f29d61c813cd1446ac22a368815f2 --- firmware/App/Services/AlarmMgmtSWFaults.h (.../AlarmMgmtSWFaults.h) (revision bb0566d9d186ea1379fbba7233c6b7ebf95bc50c) +++ firmware/App/Services/AlarmMgmtSWFaults.h (.../AlarmMgmtSWFaults.h) (revision e5d24f913e4f29d61c813cd1446ac22a368815f2) @@ -176,10 +176,10 @@ SW_FAULT_ID_BLOOD_LEAK_INVALID_EMB_MODE_CMD_SELECTED, // 145 SW_FAULT_ID_INVALID_FPGA_ERROR_GROUP_SELECTED, SW_FAULT_ID_HD_SYRINGE_NOT_PRELOADED, - SW_FAULT_ID_HD_AIR_PUMP_INVALID_STATE, - SW_FAULT_ID_HD_AIR_PUMP_INVALID_MOTOR_STATE_SELECTED, SW_FAULT_ID_NVDATA_MANAGEMENT_OPS_TIMEOUT, SW_FAULT_ID_NVDATA_RTC_RAM_OPS_FAILURE, + SW_FAULT_ID_HD_AIR_PUMP_INVALID_STATE, + SW_FAULT_ID_HD_AIR_PUMP_INVALID_MOTOR_STATE_SELECTED, NUM_OF_SW_FAULT_IDS } SW_FAULT_ID_T; Index: firmware/App/Services/SystemCommMessages.c =================================================================== diff -u -rbb0566d9d186ea1379fbba7233c6b7ebf95bc50c -re5d24f913e4f29d61c813cd1446ac22a368815f2 --- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision bb0566d9d186ea1379fbba7233c6b7ebf95bc50c) +++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision e5d24f913e4f29d61c813cd1446ac22a368815f2) @@ -5251,6 +5251,7 @@ if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen ) { memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) ); + if ( FALSE == payload.reset ) { result = testSetBatteryRemainingPercentOverride( payload.state.f32 ); Index: firmware/App/Services/SystemCommMessages.h =================================================================== diff -u -rbb0566d9d186ea1379fbba7233c6b7ebf95bc50c -re5d24f913e4f29d61c813cd1446ac22a368815f2 --- firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision bb0566d9d186ea1379fbba7233c6b7ebf95bc50c) +++ firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision e5d24f913e4f29d61c813cd1446ac22a368815f2) @@ -840,9 +840,6 @@ // MSG_ID_HD_SEND_BLOOD_LEAK_EMB_MODE_RESPONSE BOOL sendBloodLeakEmbeddedModeCommandResponse( U32 responseLen, U08* response ); -// MSG_ID_HD_SEND_ALARMS_COMMAND -void handleResendAllAlarmsCommand( MESSAGE_T* message ); - // MSG_ID_HD_BLOOD_PUMP_SET_PWM void handleTestBloodPumpSetPWM( MESSAGE_T* message ); Index: firmware/App/Services/WatchdogMgmt.c =================================================================== diff -u -r758497628fa5839a2b6661a9d7c32fd3b11db2bd -re5d24f913e4f29d61c813cd1446ac22a368815f2 --- firmware/App/Services/WatchdogMgmt.c (.../WatchdogMgmt.c) (revision 758497628fa5839a2b6661a9d7c32fd3b11db2bd) +++ firmware/App/Services/WatchdogMgmt.c (.../WatchdogMgmt.c) (revision e5d24f913e4f29d61c813cd1446ac22a368815f2) @@ -174,7 +174,7 @@ { F32 v24 = getIntADCVoltageConverted( INT_ADC_24V_ACTUATORS ); F32 audioCurrent = getFPGABackupAlarmAudioCurrent(); - + // Verify 24V is down when w.d. expired if ( v24 > MAX_24V_LEVEL_ON_WATCHDOG_EXPIRED ) {