Index: firmware/App/Controllers/DGInterface.c =================================================================== diff -u -r2a60f0eba906f0641e22a5d7f5c7ba1750911dcd -r58e95c2fa3d72e6a9e11efea6a7529c36f23b895 --- firmware/App/Controllers/DGInterface.c (.../DGInterface.c) (revision 2a60f0eba906f0641e22a5d7f5c7ba1750911dcd) +++ firmware/App/Controllers/DGInterface.c (.../DGInterface.c) (revision 58e95c2fa3d72e6a9e11efea6a7529c36f23b895) @@ -554,18 +554,6 @@ /*********************************************************************//** * @brief - * The getDialysateTemperature function gets the latest dialysate temperature. - * @details Inputs: dgDialysateTemp - * @details Outputs: none - * @return the current dialysate temperature - *************************************************************************/ -F32 getDialysateTemperature( void ) -{ - return dgDialysateTemp; -} - -/*********************************************************************//** - * @brief * The getDGDisinfectsStates function returns the DG disinfects readings. * @details Inputs: none * @details Outputs: disinfectsStatus @@ -578,6 +566,18 @@ /*********************************************************************//** * @brief + * The getDialysateTemperature function gets the latest dialysate temperature. + * @details Inputs: dgDialysateTemp + * @details Outputs: none + * @return the current dialysate temperature + *************************************************************************/ +F32 getDialysateTemperature( void ) +{ + return dgDialysateTemp; +} + +/*********************************************************************//** + * @brief * The getReservoirWeight function gets the load cell weight of a given reservoir. * @details Inputs: loadCellWeightInGrams[] * @details Outputs: none Index: firmware/App/Modes/ModeInitPOST.c =================================================================== diff -u -rfbec5d240350b320e0e15df4623b2ba36ce73aac -r58e95c2fa3d72e6a9e11efea6a7529c36f23b895 --- firmware/App/Modes/ModeInitPOST.c (.../ModeInitPOST.c) (revision fbec5d240350b320e0e15df4623b2ba36ce73aac) +++ firmware/App/Modes/ModeInitPOST.c (.../ModeInitPOST.c) (revision 58e95c2fa3d72e6a9e11efea6a7529c36f23b895) @@ -139,6 +139,10 @@ postState = handlePOSTStatus( testStatus ); break; + case POST_STATE_AC: + postState = POST_STATE_WATCHDOG; + break; + case POST_STATE_WATCHDOG: testStatus = execWatchdogTest(); postState = handlePOSTStatus( testStatus ); Index: firmware/App/Modes/ModeTreatment.c =================================================================== diff -u -r2b868e4bea2ebb95d2562230778f3613031e9282 -r58e95c2fa3d72e6a9e11efea6a7529c36f23b895 --- firmware/App/Modes/ModeTreatment.c (.../ModeTreatment.c) (revision 2b868e4bea2ebb95d2562230778f3613031e9282) +++ firmware/App/Modes/ModeTreatment.c (.../ModeTreatment.c) (revision 58e95c2fa3d72e6a9e11efea6a7529c36f23b895) @@ -846,10 +846,10 @@ { TREATMENT_STATE_T result = TREATMENT_RINSEBACK_STATE; - // Execute treatment re-circ sub-mode + // Execute treatment rinseback sub-mode execRinseback(); - // Handle signals from treatment end sub-mode + // Handle signals from rinseback sub-mode if ( TRUE == rinsebackToRecircRequest ) { transitionToTreatmentRecirc(); @@ -883,7 +883,7 @@ // Execute treatment re-circ sub-mode execTreatmentRecirc(); - // Handle signals from treatment end sub-mode + // Handle signals from treatment re-circ sub-mode if ( TRUE == rinsebackToStoppedRequest ) { transitionToTreatmentStop(); @@ -1466,8 +1466,8 @@ if ( timeElapsedSinceLastCollect_ms >= TREATMENT_PERIODIC_DATA_LOG_INTERVAL ) { - F32 const arterialPres = getMeasuredArterialPressure(); - F32 const venousPres = getMeasuredArterialPressure(); + F32 const arterialPres = getFilteredArterialPressure(); + F32 const venousPres = getFilteredVenousPressure(); lastTreatmentPeriodicDataCollectTimeStamp = treatmentTimeMS; bloodFlowRateSum_mL_min += getMeasuredBloodFlowRate(); Index: firmware/App/Modes/Rinseback.c =================================================================== diff -u -r2637b1aada1cd724952d1b80de139804bb7b675b -r58e95c2fa3d72e6a9e11efea6a7529c36f23b895 --- firmware/App/Modes/Rinseback.c (.../Rinseback.c) (revision 2637b1aada1cd724952d1b80de139804bb7b675b) +++ firmware/App/Modes/Rinseback.c (.../Rinseback.c) (revision 58e95c2fa3d72e6a9e11efea6a7529c36f23b895) @@ -868,7 +868,7 @@ } else { - *rejReason = REQUEST_REJECT_REASON_RINSEBACK_MAX_VOLUME_REACHED; + *rejReason = REQUEST_REJECT_REASON_ADDL_RINSEBACK_MAX_VOLUME_REACHED; } } else