Index: firmware/App/Controllers/DGInterface.c =================================================================== diff -u -rffaf9f13166d7a9beb4252fad804c488f870aaaa -r1281328075355359a89df86bb3f31a2e2e580b8b --- firmware/App/Controllers/DGInterface.c (.../DGInterface.c) (revision ffaf9f13166d7a9beb4252fad804c488f870aaaa) +++ firmware/App/Controllers/DGInterface.c (.../DGInterface.c) (revision 1281328075355359a89df86bb3f31a2e2e580b8b) @@ -99,11 +99,6 @@ static DG_RESERVOIR_ID_T dgActiveReservoir = DG_RESERVOIR_2; ///< Latest active reservoir reported by the DG. static DG_RESERVOIR_ID_T dgActiveReservoirSet = DG_RESERVOIR_2; ///< Active reservoir commanded. -static U32 dgReservoirFillVolumeTarget = 0; ///< Latest fill-to volume reported by the DG. -static U32 dgReservoirFillVolumeTargetSet = 0; ///< Fill-to volume commanded. -static U32 dgReservoirDrainVolumeTarget = 0; ///< Latest drain-to volume reported by the DG. -static U32 dgReservoirDrainVolumeTargetSet = 0; ///< Drain-to volume commanded. - static DG_DISINFECT_UI_STATES_T disinfectsStatus; ///< DG disinfects status. static DG_MIXING_RATIOS_T dgMixingRatios; ///< DG mixing ratios. static HEATERS_DATA_T dgHeatersData; ///< DG heaters data. @@ -135,8 +130,6 @@ dgTrimmerTempCheckTimerCtr = 0; dgActiveReservoirSet = DG_RESERVOIR_2; dgActiveReservoir = DG_RESERVOIR_2; - dgReservoirFillVolumeTargetSet = 0; - dgReservoirDrainVolumeTargetSet = 0; dgDialysateTemp = 0.0F; dgCurrentOpMode = DG_MODE_INIT; dgSubMode = 0; @@ -468,7 +461,7 @@ * The getDialysateTemperature function gets the latest dialysate temperature. * @details Inputs: dgDialysateTemp * @details Outputs: none - * @return the current dialysate temperature + * @return the latest dialysate temperature *************************************************************************/ F32 getDialysateTemperature( void ) { @@ -477,6 +470,19 @@ /*********************************************************************//** * @brief + * The getRedundantDialysateTemperature function gets the latest redundant + * dialysate temperature. + * @details Inputs: dgRedundantDialysateTemp + * @details Outputs: none + * @return the latest redundant dialysate temperature + *************************************************************************/ +F32 getRedundantDialysateTemperature( void ) +{ + return dgRedundantDialysateTemp; +} + +/*********************************************************************//** + * @brief * The getHeatDisinfectTemperatureSensorValue function gets the latest * heat disinfect temperature sensor value. * @details Inputs: dgDialysateTemp @@ -597,8 +603,7 @@ * The setDGReservoirsData function sets the latest reservoir data * reported by the DG. * @details Inputs: none - * @details Outputs: dgActiveReservoir, dgReservoirFillVolumeTarget, - * dgReservoirDrainVolumeTarget, dgReservoirsDataFreshFlag + * @details Outputs: dgActiveReservoir, dgReservoirsDataFreshFlag * @param resID ID of active reservoir * @param fillVol Reservoir fill to volume reported by DG * @param drainVol Reservoir drain to volume reported by DG @@ -609,8 +614,6 @@ if ( resID < NUM_OF_DG_RESERVOIRS ) { dgActiveReservoir = resID; - dgReservoirFillVolumeTarget = fillVol; - dgReservoirDrainVolumeTarget = drainVol; } else { @@ -908,7 +911,6 @@ void cmdStartDGFill( U32 fillToVolMl, F32 targetFlowLPM ) { dgCmdResp[ DG_CMD_START_FILL ].commandID = DG_CMD_NONE; - dgReservoirFillVolumeTargetSet = fillToVolMl; sendDGFillCommand( DG_CMD_START, fillToVolMl, targetFlowLPM ); } @@ -923,7 +925,6 @@ void cmdStopDGFill( void ) { dgCmdResp[ DG_CMD_STOP_FILL ].commandID = DG_CMD_NONE; - dgReservoirFillVolumeTargetSet = 0; sendDGFillCommand( DG_CMD_STOP, 0, 0 ); } @@ -947,7 +948,6 @@ payload.tareLoadCells = tareLoadCell; payload.rinseConcentrateLines = rinse; payload.cmd = start; - dgReservoirDrainVolumeTargetSet = drainToVolMl; sendDGDrainCommand( &payload ); } Index: firmware/App/Controllers/DGInterface.h =================================================================== diff -u -rf1157c760b320bf088921a25eb78e973d6341578 -r1281328075355359a89df86bb3f31a2e2e580b8b --- firmware/App/Controllers/DGInterface.h (.../DGInterface.h) (revision f1157c760b320bf088921a25eb78e973d6341578) +++ firmware/App/Controllers/DGInterface.h (.../DGInterface.h) (revision 1281328075355359a89df86bb3f31a2e2e580b8b) @@ -118,6 +118,7 @@ F32 getReservoirWeightLargeFilter( DG_RESERVOIR_ID_T resID ); F32 getReservoirBackupWeightLargeFilter( DG_RESERVOIR_ID_T resID ); F32 getDialysateTemperature( void ); +F32 getRedundantDialysateTemperature( void ); F32 getHeatDisinfectTemperatureSensorValue( void ); BOOL getTrimmerHeaterCommandedOn( void ); DG_DISINFECT_UI_STATES_T getDGDisinfectsStates( void ); Index: firmware/App/Modes/ModeInitPOST.c =================================================================== diff -u -rffaf9f13166d7a9beb4252fad804c488f870aaaa -r1281328075355359a89df86bb3f31a2e2e580b8b --- firmware/App/Modes/ModeInitPOST.c (.../ModeInitPOST.c) (revision ffaf9f13166d7a9beb4252fad804c488f870aaaa) +++ firmware/App/Modes/ModeInitPOST.c (.../ModeInitPOST.c) (revision 1281328075355359a89df86bb3f31a2e2e580b8b) @@ -383,6 +383,20 @@ /*********************************************************************//** * @brief + * The getDGPOSTPassed function gets the POST passed status of the DG sub-system. + * @details Inputs: dgPOSTPassed, dgPOSTResultReceived + * @details Outputs: none + * @return TRUE if DG POST result received and passed, FALSE if not + *************************************************************************/ +BOOL getDGPOSTPassed( void ) +{ + BOOL result = ( TRUE == dgPOSTResultReceived && TRUE == dgPOSTPassed ? TRUE : FALSE ); + + return result; +} + +/*********************************************************************//** + * @brief * The signalUIVersion function records the reported UI version information. * @details Inputs: none * @details Outputs: uiVersion Index: firmware/App/Modes/ModeInitPOST.h =================================================================== diff -u -rc1b9ac0dbf2196280895d2e440dd7ac288ac8424 -r1281328075355359a89df86bb3f31a2e2e580b8b --- firmware/App/Modes/ModeInitPOST.h (.../ModeInitPOST.h) (revision c1b9ac0dbf2196280895d2e440dd7ac288ac8424) +++ firmware/App/Modes/ModeInitPOST.h (.../ModeInitPOST.h) (revision 1281328075355359a89df86bb3f31a2e2e580b8b) @@ -44,6 +44,7 @@ void signalUIVersion( UI_VERSIONS_T version ); // Record UI version info void signalDGVersion( DG_VERSIONS_T version ); // Record DG version info DG_VERSIONS_T getDGVersion( void ); // Get DG version info +BOOL getDGPOSTPassed( void ); // Get DG POST pass/fail status /**@}*/ Index: firmware/App/Services/SystemCommMessages.c =================================================================== diff -u -r0244adf04ccc6b154d5c81ecd9b0473584b97509 -r1281328075355359a89df86bb3f31a2e2e580b8b --- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 0244adf04ccc6b154d5c81ecd9b0473584b97509) +++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 1281328075355359a89df86bb3f31a2e2e580b8b) @@ -8279,11 +8279,8 @@ *************************************************************************/ void handleTestHDDialinCheckIn( MESSAGE_T* message ) { - BOOL status = FALSE; - if ( 0 == message->hdr.payloadLen ) { - status = TRUE; setDialinCheckInTimeStamp(); } }