Index: firmware/App/Controllers/DGInterface.c =================================================================== diff -u -r3e24cbff2cbf0ce9af2e998e6a9a2ed4733bbe27 -r24a98ea92563dad552889c30604d539d266b339e --- firmware/App/Controllers/DGInterface.c (.../DGInterface.c) (revision 3e24cbff2cbf0ce9af2e998e6a9a2ed4733bbe27) +++ firmware/App/Controllers/DGInterface.c (.../DGInterface.c) (revision 24a98ea92563dad552889c30604d539d266b339e) @@ -456,7 +456,7 @@ * @param loadCellID ID of load cell to get * @return the current load cell weight in grams *************************************************************************/ -F32 getLoadCellWeightInGrams( LOAD_CELL_T loadCellID ) +F32 getLoadCellWeightInGrams( LOAD_CELL_ID_T loadCellID ) { F32 result = 0.0; Index: firmware/App/Controllers/DGInterface.h =================================================================== diff -u -r6e07046677cba738be6f78b155f4f23120a43081 -r24a98ea92563dad552889c30604d539d266b339e --- firmware/App/Controllers/DGInterface.h (.../DGInterface.h) (revision 6e07046677cba738be6f78b155f4f23120a43081) +++ firmware/App/Controllers/DGInterface.h (.../DGInterface.h) (revision 24a98ea92563dad552889c30604d539d266b339e) @@ -39,24 +39,6 @@ #define FILL_RESERVOIR_TO_VOLUME_ML 1300 ///< Fill reservoir to this volume (in mL) during treatment. #endif -/// Enumeration of load cell sensors. -typedef enum Load_Cells -{ - LOAD_CELL_RESERVOIR_1_PRIMARY = 0, ///< Primary load cell for reservoir 1. - LOAD_CELL_RESERVOIR_1_BACKUP, ///< Backup load cell for reservoir 1. - LOAD_CELL_RESERVOIR_2_PRIMARY, ///< Primary load cell for reservoir 2. - LOAD_CELL_RESERVOIR_2_BACKUP, ///< Backup load cell for reservoir 2. - NUM_OF_LOAD_CELLS ///< Number of load cell sensors. -} LOAD_CELL_T; - -/// Enumeration of DG reservoirs. -typedef enum DG_Reservoirs -{ - DG_RESERVOIR_1 = 0, ///< Reservoir #1. - DG_RESERVOIR_2, ///< Reservoir #2. - NUM_OF_DG_RESERVOIRS ///< Number of reservoirs. -} DG_RESERVOIR_ID_T; - /// Enumeration of DG pressure sensors. typedef enum DG_PressureSensors { @@ -148,7 +130,7 @@ U32 getDGROPumpPressureSetPt( void ); F32 getDGROPumpFlowRateMlMin( void ); U32 getDGDrainPumpRPMSetPt( void ); -F32 getLoadCellWeightInGrams( LOAD_CELL_T loadCellID ); +F32 getLoadCellWeightInGrams( LOAD_CELL_ID_T loadCellID ); F32 getReservoirWeightSmallFilter( DG_RESERVOIR_ID_T resID ); F32 getReservoirWeightLargeFilter( DG_RESERVOIR_ID_T resID ); Index: firmware/App/Modes/ModeTreatment.c =================================================================== diff -u -rb4114c4cd078650769bf8a0379f47989660cc6e1 -r24a98ea92563dad552889c30604d539d266b339e --- firmware/App/Modes/ModeTreatment.c (.../ModeTreatment.c) (revision b4114c4cd078650769bf8a0379f47989660cc6e1) +++ firmware/App/Modes/ModeTreatment.c (.../ModeTreatment.c) (revision 24a98ea92563dad552889c30604d539d266b339e) @@ -156,27 +156,6 @@ /*********************************************************************//** * @brief - * The userRequestEndTreatment function conveys a user request to end the - * treatment. - * @details Inputs: currentTreatmentState - * @details Outputs: response to user request sent - * @return TRUE if request accepted, FALSE if not - *************************************************************************/ -BOOL userRequestEndTreatment( void ) -{ - BOOL result = FALSE; - - if ( TREATMENT_STOP_STATE == currentTreatmentState ) - { - pendingUserEndTreatmentRequest = TRUE; - result = TRUE; - } - - return result; -} - -/*********************************************************************//** - * @brief * The signalAlarmActionToTreatmentMode function executes the given alarm action * as appropriate while in Treatment Mode. * @details Inputs: none @@ -449,7 +428,7 @@ // Check if we are in an appropriate treatment state for settings adjustment if ( ( MODE_TREA == currMode ) && - ( currentTreatmentState > TREATMENT_START_STATE ) && + ( currentTreatmentState > TREATMENT_START_STATE ) && ( currentTreatmentState < TREATMENT_END_STATE ) && ( CALC_ELAPSED_TREAT_TIME_IN_MIN() < treatmentTime ) && ( treatmentTime >= MIN_TREATMENT_TIME_MINUTES ) ) { F32 uFVolume; @@ -488,7 +467,8 @@ { rejectReason = REQUEST_REJECT_REASON_NOT_IN_TREATMENT_MODE; } - else if ( currentTreatmentState <= TREATMENT_START_STATE ) + else if ( ( currentTreatmentState <= TREATMENT_START_STATE ) || + ( currentTreatmentState >= TREATMENT_END_STATE ) ) { rejectReason = REQUEST_REJECT_REASON_INVALID_TREATMENT_STATE; } @@ -535,7 +515,7 @@ // Check if we are in an appropriate treatment state for settings adjustment if ( ( MODE_TREA == currMode ) && - ( currentTreatmentState > TREATMENT_START_STATE ) && + ( currentTreatmentState > TREATMENT_START_STATE ) && ( currentTreatmentState < TREATMENT_END_STATE ) && ( uFVolume <= MAX_UF_VOLUME_ML ) && ( CALC_TREAT_TIME_REMAINING_IN_SECS() >= PREVENT_UF_VOL_CHANGE_IF_NEARLY_DONE_SEC ) ) { @@ -593,7 +573,8 @@ { rejectReason = REQUEST_REJECT_REASON_TREATMENT_TIME_OUT_OF_RANGE; } - else if ( currentTreatmentState <= TREATMENT_START_STATE ) + else if ( ( currentTreatmentState <= TREATMENT_START_STATE ) || + ( currentTreatmentState >= TREATMENT_END_STATE ) ) { rejectReason = REQUEST_REJECT_REASON_INVALID_TREATMENT_STATE; } @@ -842,6 +823,7 @@ { stopDialysis(); elapsedTreatmentTimeInSecs = presTreatmentTimeSecs; + currentTreatmentState = TREATMENT_END_STATE; } // Broadcast treatment time and state data at interval if ( ++treatmentTimeBroadcastTimerCtr >= TREATMENT_TIME_DATA_PUB_INTERVAL ) Index: firmware/App/Services/SystemComm.c =================================================================== diff -u -rb4114c4cd078650769bf8a0379f47989660cc6e1 -r24a98ea92563dad552889c30604d539d266b339e --- firmware/App/Services/SystemComm.c (.../SystemComm.c) (revision b4114c4cd078650769bf8a0379f47989660cc6e1) +++ firmware/App/Services/SystemComm.c (.../SystemComm.c) (revision 24a98ea92563dad552889c30604d539d266b339e) @@ -1369,18 +1369,6 @@ handleTestHDAccelBroadcastIntervalOverrideRequest( message ); break; - case MSG_ID_HD_ACCEL_SET_CALIBRATION: - handleSetAccelCalibration( message ); - break; - - case MSG_ID_HD_BLOOD_FLOW_SET_CALIBRATION: - handleSetBloodFlowCalibration( message ); - break; - - case MSG_ID_HD_DIALYSATE_FLOW_SET_CALIBRATION: - handleSetDialysateFlowCalibration( message ); - break; - case MSG_ID_DIAL_OUT_FLOW_SET_PT_OVERRIDE: handleTestDialOutFlowSetPointOverrideRequest( message ); break; @@ -1447,14 +1435,6 @@ handleTestSuperClearAlarmsRequest( message ); break; - case MSG_ID_HD_REQUEST_CALIBRATION_DATA: - handleTestHDCalibrationDataRequest( message ); - break; - - case MSG_ID_HD_ERASE_CALIBRATION_DATA: - handleTestEraseHDCalibrationDataRequest( message ); - break; - default: // TODO - unrecognized message ID received - ignore break; Index: firmware/App/Services/SystemCommMessages.c =================================================================== diff -u -rb4114c4cd078650769bf8a0379f47989660cc6e1 -r24a98ea92563dad552889c30604d539d266b339e --- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision b4114c4cd078650769bf8a0379f47989660cc6e1) +++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 24a98ea92563dad552889c30604d539d266b339e) @@ -1734,27 +1734,6 @@ /*********************************************************************//** * @brief - * The handleUIUserEndTreatmentRequest function handles a treatment end - * request message from the UI. - * @details Inputs: none - * @details Outputs: message handled - * @param message a pointer to the message to handle - * @return none - *************************************************************************/ -void handleUIUserEndTreatmentRequest( MESSAGE_T *message ) -{ - BOOL result = FALSE; - - if ( message->hdr.payloadLen == 0 ) - { - result = userRequestEndTreatment(); - } - - sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, result ); -} - -/*********************************************************************//** - * @brief * The handleTreatmentParametersFromUI function handles a treatment parameters * set and validate request message from the UI. * @details Inputs: none @@ -4024,71 +4003,4 @@ sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result ); } -/*********************************************************************//** - * @brief - * The handleTestHDCalibrationDataRequest function handles a request for - * HD calibration data. - * @details - * Inputs : none - * Outputs : message handled - * @param message a pointer to the message to handle - * @return none - *************************************************************************/ -void handleTestHDCalibrationDataRequest( MESSAGE_T *message ) -{ - BOOL result = FALSE; - - if ( 0 == message->hdr.payloadLen ) - { - CALIBRATION_DATA_T cal; - MESSAGE_T msg; - U08 *payloadPtr = msg.payload; - - // Get calibration data - result = getCalibrationData( &cal ); - if ( TRUE == result ) - { - // Create a message record - blankMessage( &msg ); - msg.hdr.msgID = MSG_ID_HD_CALIBRATION_DATA; - msg.hdr.payloadLen = sizeof( CALIBRATION_DATA_T ); - - memcpy( payloadPtr, &cal, sizeof( CALIBRATION_DATA_T ) ); - - // 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_HD_BROADCAST, ACK_NOT_REQUIRED ); - } - } - - // Respond to request - sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result ); -} - -/*********************************************************************//** - * @brief - * The handleTestEraseHDCalibrationDataRequest function handles a request for - * HD calibration data erasure. - * @details - * Inputs : none - * Outputs : message handled - * @param message a pointer to the message to handle - * @return none - *************************************************************************/ -void handleTestEraseHDCalibrationDataRequest( MESSAGE_T *message ) -{ - BOOL result = FALSE; - - if ( message->hdr.payloadLen == sizeof(U32) ) - { - U32 key; - - memcpy( &key, message->payload, sizeof(U32) ); - - result = testResetCalibrationData( key ); - } - - // Respond to request - sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result ); -} - /**@}*/