Index: firmware/.launches/HD.launch =================================================================== diff -u -rf4545d449a2a2f9353307a55d2bce9e150591c3d -rac2c218b9e310a14d2872c9b4c32a6f69615088e --- firmware/.launches/HD.launch (.../HD.launch) (revision f4545d449a2a2f9353307a55d2bce9e150591c3d) +++ firmware/.launches/HD.launch (.../HD.launch) (revision ac2c218b9e310a14d2872c9b4c32a6f69615088e) @@ -1,7 +1,7 @@ - + Index: firmware/App/Controllers/BloodFlow.c =================================================================== diff -u -r88a641b7b0185e0bad77e21e6d438e1d7283fd28 -rac2c218b9e310a14d2872c9b4c32a6f69615088e --- firmware/App/Controllers/BloodFlow.c (.../BloodFlow.c) (revision 88a641b7b0185e0bad77e21e6d438e1d7283fd28) +++ firmware/App/Controllers/BloodFlow.c (.../BloodFlow.c) (revision ac2c218b9e310a14d2872c9b4c32a6f69615088e) @@ -237,7 +237,7 @@ MIN_BLOOD_PUMP_PWM_DUTY_CYCLE, MAX_BLOOD_PUMP_PWM_DUTY_CYCLE ); // Initialize persistent alarm for flow sensor signal strength too low - initPersistentAlarm( ALARM_ID_BLOOD_FLOW_SIGNAL_STRENGTH_TOO_LOW, FLOW_SIG_STRGTH_ALARM_PERSIST, FLOW_SIG_STRGTH_ALARM_PERSIST ); + //initPersistentAlarm( ALARM_ID_BLOOD_FLOW_SIGNAL_STRENGTH_TOO_LOW, FLOW_SIG_STRGTH_ALARM_PERSIST, FLOW_SIG_STRGTH_ALARM_PERSIST ); } /*********************************************************************//** Index: firmware/App/Controllers/DGInterface.h =================================================================== diff -u -r6e07046677cba738be6f78b155f4f23120a43081 -rac2c218b9e310a14d2872c9b4c32a6f69615088e --- firmware/App/Controllers/DGInterface.h (.../DGInterface.h) (revision 6e07046677cba738be6f78b155f4f23120a43081) +++ firmware/App/Controllers/DGInterface.h (.../DGInterface.h) (revision ac2c218b9e310a14d2872c9b4c32a6f69615088e) @@ -50,12 +50,12 @@ } LOAD_CELL_T; /// Enumeration of DG reservoirs. -typedef enum 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; +} DG_RESERVOIR_ID_T;*/ /// Enumeration of DG pressure sensors. typedef enum DG_PressureSensors Index: firmware/App/Controllers/DialInFlow.c =================================================================== diff -u -r88a641b7b0185e0bad77e21e6d438e1d7283fd28 -rac2c218b9e310a14d2872c9b4c32a6f69615088e --- firmware/App/Controllers/DialInFlow.c (.../DialInFlow.c) (revision 88a641b7b0185e0bad77e21e6d438e1d7283fd28) +++ firmware/App/Controllers/DialInFlow.c (.../DialInFlow.c) (revision ac2c218b9e310a14d2872c9b4c32a6f69615088e) @@ -231,7 +231,7 @@ MIN_DIAL_IN_PUMP_PWM_DUTY_CYCLE, MAX_DIAL_IN_PUMP_PWM_DUTY_CYCLE ); // Initialize persistent alarm for flow sensor signal strength too low - initPersistentAlarm( ALARM_ID_DIALYSATE_FLOW_SIGNAL_STRENGTH_TOO_LOW, FLOW_SIG_STRGTH_ALARM_PERSIST, FLOW_SIG_STRGTH_ALARM_PERSIST ); + //initPersistentAlarm( ALARM_ID_DIALYSATE_FLOW_SIGNAL_STRENGTH_TOO_LOW, FLOW_SIG_STRGTH_ALARM_PERSIST, FLOW_SIG_STRGTH_ALARM_PERSIST ); } /*********************************************************************//** Index: firmware/App/Controllers/PresOccl.c =================================================================== diff -u -r8b7c7ff2bdb82aca355e3eed90cbdc6eb9507719 -rac2c218b9e310a14d2872c9b4c32a6f69615088e --- firmware/App/Controllers/PresOccl.c (.../PresOccl.c) (revision 8b7c7ff2bdb82aca355e3eed90cbdc6eb9507719) +++ firmware/App/Controllers/PresOccl.c (.../PresOccl.c) (revision ac2c218b9e310a14d2872c9b4c32a6f69615088e) @@ -116,10 +116,10 @@ void initPresOccl( void ) { // Initialize persistent pressure alarms - initPersistentAlarm( ALARM_ID_ARTERIAL_PRESSURE_LOW, PRES_ALARM_PERSISTENCE, PRES_ALARM_PERSISTENCE ); - initPersistentAlarm( ALARM_ID_ARTERIAL_PRESSURE_HIGH, PRES_ALARM_PERSISTENCE, PRES_ALARM_PERSISTENCE ); - initPersistentAlarm( ALARM_ID_VENOUS_PRESSURE_LOW, PRES_ALARM_PERSISTENCE, PRES_ALARM_PERSISTENCE ); - initPersistentAlarm( ALARM_ID_VENOUS_PRESSURE_HIGH, PRES_ALARM_PERSISTENCE, PRES_ALARM_PERSISTENCE ); + //initPersistentAlarm( ALARM_ID_ARTERIAL_PRESSURE_LOW, PRES_ALARM_PERSISTENCE, PRES_ALARM_PERSISTENCE ); + //initPersistentAlarm( ALARM_ID_ARTERIAL_PRESSURE_HIGH, PRES_ALARM_PERSISTENCE, PRES_ALARM_PERSISTENCE ); + //initPersistentAlarm( ALARM_ID_VENOUS_PRESSURE_LOW, PRES_ALARM_PERSISTENCE, PRES_ALARM_PERSISTENCE ); + //initPersistentAlarm( ALARM_ID_VENOUS_PRESSURE_HIGH, PRES_ALARM_PERSISTENCE, PRES_ALARM_PERSISTENCE ); } /*********************************************************************//** Index: firmware/App/Modes/ModeInitPOST.c =================================================================== diff -u -r30f049651877229042e3f8700c8596e5b9a1e0f4 -rac2c218b9e310a14d2872c9b4c32a6f69615088e --- firmware/App/Modes/ModeInitPOST.c (.../ModeInitPOST.c) (revision 30f049651877229042e3f8700c8596e5b9a1e0f4) +++ firmware/App/Modes/ModeInitPOST.c (.../ModeInitPOST.c) (revision ac2c218b9e310a14d2872c9b4c32a6f69615088e) @@ -97,7 +97,7 @@ case POST_STATE_START: postState = POST_STATE_WATCHDOG; #ifdef SKIP_POST - postState = POST_STATE_VALVES; + postState = POST_STATE_COMPLETED; #endif break; Index: firmware/App/Modes/ModePreTreat.c =================================================================== diff -u -r5413ebeb2cb61163574550c7b2ca212ae3e307a3 -rac2c218b9e310a14d2872c9b4c32a6f69615088e --- firmware/App/Modes/ModePreTreat.c (.../ModePreTreat.c) (revision 5413ebeb2cb61163574550c7b2ca212ae3e307a3) +++ firmware/App/Modes/ModePreTreat.c (.../ModePreTreat.c) (revision ac2c218b9e310a14d2872c9b4c32a6f69615088e) @@ -127,9 +127,9 @@ currentPreTreatmentState = handlePrimeState(); break; - case HD_PRE_TREATMENT_RECIRCULATE_START_STATE: - currentPreTreatmentState = handleRecirculateStartState(); - break; + //case HD_PRE_TREATMENT_RECIRCULATE_START_STATE: + // currentPreTreatmentState = handleRecirculateStartState(); + // break; case HD_PRE_TREATMENT_RECIRCULATE_STATE: currentPreTreatmentState = handleRecirculateState(); @@ -139,9 +139,9 @@ currentPreTreatmentState = handlePatientConnectionState(); break; - case HD_PRE_TREATMENT_PAUSE_STATE: - currentPreTreatmentState = handlePretreatmentPauseState(); - break; + //case HD_PRE_TREATMENT_PAUSE_STATE: + // currentPreTreatmentState = handlePretreatmentPauseState(); + // break; default: currentPreTreatmentState = HD_PRE_TREATMENT_START_STATE; @@ -272,8 +272,8 @@ // do nothing break; - case HD_PRE_TREATMENT_PAUSE_STATE: - alarmActionResumeReceived = TRUE; + //case HD_PRE_TREATMENT_PAUSE_STATE: + // alarmActionResumeReceived = TRUE; break; default: @@ -344,7 +344,7 @@ if ( TRUE == isWetSelfTestsPassed() ) { - state = HD_PRE_TREATMENT_RECIRCULATE_START_STATE; + //state = HD_PRE_TREATMENT_RECIRCULATE_START_STATE; activateAlarmNoData( ALARM_ID_PRIME_COMPLETED_LOW_PRIORITY ); } @@ -403,8 +403,8 @@ signalBloodPumpHardStop(); cmdStopDGTrimmerHeater(); - state = HD_PRE_TREATMENT_PAUSE_STATE; - resumePreTreatmentState = HD_PRE_TREATMENT_RECIRCULATE_START_STATE; + //state = HD_PRE_TREATMENT_PAUSE_STATE; + //resumePreTreatmentState = HD_PRE_TREATMENT_RECIRCULATE_START_STATE; } return state; @@ -437,15 +437,15 @@ *************************************************************************/ static HD_PRE_TREATMENT_MODE_STATE_T handlePretreatmentPauseState( void ) { - HD_PRE_TREATMENT_MODE_STATE_T state = HD_PRE_TREATMENT_PAUSE_STATE; + //HD_PRE_TREATMENT_MODE_STATE_T state = HD_PRE_TREATMENT_PAUSE_STATE; if ( TRUE == alarmActionResumeReceived ) { alarmActionResumeReceived = FALSE; - state = resumePreTreatmentState; + //state = resumePreTreatmentState; } - return state; + //return state; } /**@}*/ Index: firmware/App/Modes/ModeTreatment.c =================================================================== diff -u -r9f5e68247ff2f5214e8828a1b8152ea16941fe39 -rac2c218b9e310a14d2872c9b4c32a6f69615088e --- firmware/App/Modes/ModeTreatment.c (.../ModeTreatment.c) (revision 9f5e68247ff2f5214e8828a1b8152ea16941fe39) +++ firmware/App/Modes/ModeTreatment.c (.../ModeTreatment.c) (revision ac2c218b9e310a14d2872c9b4c32a6f69615088e) @@ -287,9 +287,9 @@ // TODO - implement break; - case TREATMENT_DIALYSIS_END_STATE: + //case TREATMENT_DIALYSIS_END_STATE: // TODO - implement - break; + //break; case TREATMENT_END_STATE: // TODO - implement @@ -453,9 +453,9 @@ HD_OP_MODE_T currMode = getCurrentOperationMode(); // Check if we are in an appropriate treatment state for settings adjustment - if ( ( MODE_TREA == currMode ) && + if ( ( MODE_TREA == currMode ) /*&& ( currentTreatmentState > TREATMENT_START_STATE ) && ( currentTreatmentState < TREATMENT_DIALYSIS_END_STATE ) && - ( CALC_ELAPSED_TREAT_TIME_IN_MIN() < treatmentTime ) && ( treatmentTime >= MIN_TREATMENT_TIME_MINUTES ) ) + ( CALC_ELAPSED_TREAT_TIME_IN_MIN() < treatmentTime ) && ( treatmentTime >= MIN_TREATMENT_TIME_MINUTES )*/ ) { F32 uFVolume; U32 dialVolume = presDialysateFlowRate * treatmentTime; // In mL @@ -493,8 +493,8 @@ { rejectReason = REQUEST_REJECT_REASON_NOT_IN_TREATMENT_MODE; } - else if ( ( currentTreatmentState <= TREATMENT_START_STATE ) || - ( currentTreatmentState >= TREATMENT_DIALYSIS_END_STATE ) ) + else if ( ( currentTreatmentState <= TREATMENT_START_STATE ) /*|| + ( currentTreatmentState >= TREATMENT_DIALYSIS_END_STATE )*/ ) { rejectReason = REQUEST_REJECT_REASON_INVALID_TREATMENT_STATE; } @@ -540,10 +540,10 @@ pendingTreatmentTimeChange = presTreatmentTimeSecs / SEC_PER_MIN; // Check if we are in an appropriate treatment state for settings adjustment - if ( ( MODE_TREA == currMode ) && + if ( ( MODE_TREA == currMode ) /*&& ( currentTreatmentState > TREATMENT_START_STATE ) && ( currentTreatmentState < TREATMENT_DIALYSIS_END_STATE ) && ( uFVolume <= MAX_UF_VOLUME_ML ) && - ( CALC_TREAT_TIME_REMAINING_IN_SECS() >= PREVENT_UF_VOL_CHANGE_IF_NEARLY_DONE_SEC ) ) + ( CALC_TREAT_TIME_REMAINING_IN_SECS() >= PREVENT_UF_VOL_CHANGE_IF_NEARLY_DONE_SEC )*/ ) { DIALYSIS_STATE_T currDialysisState = getDialysisState(); UF_STATE_T currUFState = getUltrafiltrationState(); @@ -599,8 +599,8 @@ { rejectReason = REQUEST_REJECT_REASON_TREATMENT_TIME_OUT_OF_RANGE; } - else if ( ( currentTreatmentState <= TREATMENT_START_STATE ) || - ( currentTreatmentState >= TREATMENT_DIALYSIS_END_STATE ) ) + else if ( TRUE/*( currentTreatmentState <= TREATMENT_START_STATE ) || + ( currentTreatmentState >= TREATMENT_DIALYSIS_END_STATE )*/ ) { rejectReason = REQUEST_REJECT_REASON_INVALID_TREATMENT_STATE; } @@ -849,7 +849,7 @@ { stopDialysis(); elapsedTreatmentTimeInSecs = presTreatmentTimeSecs; - currentTreatmentState = TREATMENT_DIALYSIS_END_STATE; + //currentTreatmentState = TREATMENT_DIALYSIS_END_STATE; } // Broadcast treatment time and state data at interval if ( ++treatmentTimeBroadcastTimerCtr >= TREATMENT_TIME_DATA_PUB_INTERVAL ) Index: firmware/App/Services/AlarmMgmt.h =================================================================== diff -u -r8e2cfecc47bb3912078b29513f1717c1567f0071 -rac2c218b9e310a14d2872c9b4c32a6f69615088e --- firmware/App/Services/AlarmMgmt.h (.../AlarmMgmt.h) (revision 8e2cfecc47bb3912078b29513f1717c1567f0071) +++ firmware/App/Services/AlarmMgmt.h (.../AlarmMgmt.h) (revision ac2c218b9e310a14d2872c9b4c32a6f69615088e) @@ -239,6 +239,7 @@ SW_FAULT_ID_SYSTEM_COMM_INVALID_FRAME_SIZE, SW_FAULT_ID_SYSTEM_CMMM_CAN_TRANSMIT_REJECTED, // 95 SW_FAULT_ID_MODE_PRIME_INVALID_ALARM_ACTION, + SW_FAULT_ID_INVALID_NVDATAMGMT_EXEC_CAL_STATE, NUM_OF_SW_FAULT_IDS } SW_FAULT_ID_T; Index: firmware/App/Services/SystemComm.c =================================================================== diff -u -r98f34c2ab63d51a1bf248db454ebc04e184d4748 -rac2c218b9e310a14d2872c9b4c32a6f69615088e --- firmware/App/Services/SystemComm.c (.../SystemComm.c) (revision 98f34c2ab63d51a1bf248db454ebc04e184d4748) +++ firmware/App/Services/SystemComm.c (.../SystemComm.c) (revision ac2c218b9e310a14d2872c9b4c32a6f69615088e) @@ -280,7 +280,7 @@ processReceivedMessages(); // Check for sub-system comm timeouts - checkForCommTimeouts(); + //checkForCommTimeouts(); // Check ACK list for messages that need to be re-sent because they have not been ACK'd checkPendingACKList(); @@ -1187,9 +1187,9 @@ handleUIUserConfirmTreatmentParameters( message ); break; - case MSG_ID_UI_TREATMENT_END_REQUEST: - handleUIUserEndTreatmentRequest( message ); - break; + //case MSG_ID_UI_TREATMENT_END_REQUEST: + // handleUIUserEndTreatmentRequest( message ); + // break; case MSG_ID_UI_PRESSURE_LIMITS_CHANGE_REQUEST: handleChangePressureLimitsRequest( message ); @@ -1207,6 +1207,30 @@ handleTesterLogInRequest( message ); break; + case MSG_ID_HD_SET_CALIBRATION_RECORD: + handleSetHDCalibrationRecord( message ); + break; + + case MSG_ID_HD_GET_CALIBRATION_RECORD: + handleGetHDCalibrationRecord( message ); + break; + + case MSG_ID_HD_SET_SYSTEM_RECORD: + handleSetHDSystemRecord( message ); + break; + + case MSG_ID_HD_GET_SYSTEM_RECORD: + handleGetHDSystemRecord( message ); + break; + + case MSG_ID_HD_GET_SERVICE_RECORD: + handleGetHDServiceRecord( message ); + break; + + case MSG_ID_HD_SET_SERVICE_RECORD: + handleSetHDServiceRecord( message ); + break; + default: // TODO - unrecognized message ID received - ignore break; Index: firmware/App/Services/SystemCommMessages.c =================================================================== diff -u -r1a5aa1dff6978966ecda860b09c07a84e80399fe -rac2c218b9e310a14d2872c9b4c32a6f69615088e --- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 1a5aa1dff6978966ecda860b09c07a84e80399fe) +++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision ac2c218b9e310a14d2872c9b4c32a6f69615088e) @@ -1288,6 +1288,58 @@ return result; } +/*********************************************************************//** + * @brief + * The sendHDCalibrationRecord function sends out the HD calibration + * record. + * @details Inputs: none + * @details Outputs: HD calibration record msg constructed and queued + * @param msgCurrNum: current payload number + * @param msgTotalNum: total number of payloads + * @param length: buffer length to be written + * @param calRcrdAddress: start address of the calibration record + * @return TRUE if msg successfully queued for transmit, FALSE if not + *************************************************************************/ +BOOL sendHDCalibrationRecord( U32 payloadCurrNum, U32 payloadTotalNum, U32 length, U08* calRcrdAddress ) +{ + BOOL result; + MESSAGE_T msg; + U08 *payloadPtr = msg.payload; + + // Create a message record + blankMessage( &msg ); + msg.hdr.msgID = MSG_ID_HD_SEND_CALIBRATION_RECORD; + msg.hdr.payloadLen = sizeof( U32 ) + sizeof( U32 ) + sizeof( U32 ) + length; + + memcpy( payloadPtr, &payloadCurrNum, sizeof( U32 ) ); + payloadPtr += sizeof( U32 ); + + memcpy( payloadPtr, &payloadTotalNum, sizeof( U32 ) ); + payloadPtr += sizeof( U32 ); + + memcpy( payloadPtr, &length, sizeof( U32 ) ); + payloadPtr += sizeof( U32 ); + + memcpy( payloadPtr, calRcrdAddress, length ); + + // 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_PC, ACK_NOT_REQUIRED ); + + return result; +} + +// MSG_ID_HD_SEND_SYSTEM_RECORD +BOOL sendHDSystemRecord( U32 payloadCurrNum, U32 payloadTotalNum, U32 length, U08* sysRcrdAddress ) +{ + +} + +// MSG_ID_Hd_SEND_SERVICE_RECORD +BOOL sendHDServiceRecord( U32 payloadCurrNum, U32 payloadTotalNum, U32 length, U08* srvcRcrdAddress ) +{ + +} + #ifdef EMC_TEST_BUILD BOOL broadcastCANErrorCount( U32 count ) { @@ -1771,7 +1823,7 @@ // Create a message record blankMessage( &msg ); - msg.hdr.msgID = MSG_ID_HD_TREATMENT_END_RESPONSE; + //msg.hdr.msgID = MSG_ID_HD_TREATMENT_END_RESPONSE; msg.hdr.payloadLen = sizeof( BOOL ); memcpy( payloadPtr, &accepted, sizeof( BOOL ) ); @@ -4120,4 +4172,87 @@ sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result ); } +/*********************************************************************//** +* @brief +* The handleSetHDCalibrationRecord function handles a request to set the HD +* calibration data record. +* @details Inputs: none +* @details Outputs: message handled +* @param message a pointer to the message to handle +* @return none +*************************************************************************/ +void handleSetHDCalibrationRecord( MESSAGE_T *message ) +{ + BOOL status = FALSE; + U08* payloadPtr = message->payload; + U32 currentMessage; + U32 totalMessages; + U32 payloadLength; + + memcpy(¤tMessage, payloadPtr, sizeof(U32)); + payloadPtr += sizeof(U32); + + memcpy(&totalMessages, payloadPtr, sizeof(U32)); + payloadPtr += sizeof(U32); + + memcpy(&payloadLength, payloadPtr, sizeof(U32)); + payloadPtr += sizeof(U32); + + status = setCalibrationRecord( currentMessage, totalMessages, payloadLength, payloadPtr ); + + // Respond to request + sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, status ); +} + +/*********************************************************************//** +* @brief +* The handleGetHDCalibrationRecord function handles a request to get the HD +* calibration data record. +* @details Inputs: none +* @details Outputs: message handled +* @param message a pointer to the message to handle +* @return none +*************************************************************************/ +void handleGetHDCalibrationRecord( MESSAGE_T *message ) +{ + BOOL result = FALSE; + + // verify payload length + if ( 0 == message->hdr.payloadLen ) + { + // Tester must be logged in + if ( TRUE == isTestingActivated() ) + { + result = getCalibrationRecord(); + } + } + + // respond to request + sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result ); +} + +// MSG_ID_HD_SET_SYSTEM_RECORD +void handleSetHDSystemRecord( MESSAGE_T *message ) +{ + +} + +// MSG_ID_HD_GET_SYSTEM_RECORD +void handleGetHDSystemRecord( MESSAGE_T *message ) +{ + +} + +// MSG_ID_HD_GET_SERVICE_RECORD +void handleGetHDServiceRecord( MESSAGE_T *message ) +{ + +} + +// MSG_ID_HD_SET_SERVICE_RECORD +void handleSetHDServiceRecord( MESSAGE_T *message ) +{ + +} + /**@}*/ Index: firmware/App/Services/SystemCommMessages.h =================================================================== diff -u -r1a5aa1dff6978966ecda860b09c07a84e80399fe -rac2c218b9e310a14d2872c9b4c32a6f69615088e --- firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision 1a5aa1dff6978966ecda860b09c07a84e80399fe) +++ firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision ac2c218b9e310a14d2872c9b4c32a6f69615088e) @@ -244,6 +244,15 @@ // MSG_ID_HD_PRIMING_STATUS_DATA BOOL broadcastPrimeData( PRIMING_DATA_PAYLOAD_T *primeDataPtr ); +// MSG_ID_HD_SEND_CALIBRATION_RECORD +BOOL sendHDCalibrationRecord( U32 payloadCurrNum, U32 payloadTotalNum, U32 length, U08* calRcrdAddress ); + +// MSG_ID_HD_SEND_SYSTEM_RECORD +BOOL sendHDSystemRecord( U32 payloadCurrNum, U32 payloadTotalNum, U32 length, U08* sysRcrdAddress ); + +// MSG_ID_Hd_SEND_SERVICE_RECORD +BOOL sendHDServiceRecord( U32 payloadCurrNum, U32 payloadTotalNum, U32 length, U08* srvcRcrdAddress ); + #ifdef EMC_TEST_BUILD // MSG_ID_CAN_ERROR_COUNT BOOL broadcastCANErrorCount( U32 count ); @@ -445,9 +454,27 @@ // MSG_ID_HD_REQUEST_CALIBRATION_DATA void handleTestHDCalibrationDataRequest( MESSAGE_T *message ); -// MSG_ID_HD_ERASE_CALIBRATION_DATA +// MSG_ID_HD_ERASE_CALIBRATION_DATAJus void handleTestEraseHDCalibrationDataRequest( MESSAGE_T *message ); +// MSG_ID_HD_SET_CALIBRATION_RECORD +void handleSetHDCalibrationRecord( MESSAGE_T *message ); + +// MSG_ID_HD_GET_CALIBRATION_RECORD +void handleGetHDCalibrationRecord( MESSAGE_T *message ); + +// MSG_ID_HD_SET_SYSTEM_RECORD +void handleSetHDSystemRecord( MESSAGE_T *message ); + +// MSG_ID_HD_GET_SYSTEM_RECORD +void handleGetHDSystemRecord( MESSAGE_T *message ); + +// MSG_ID_HD_GET_SERVICE_RECORD +void handleGetHDServiceRecord( MESSAGE_T *message ); + +// MSG_ID_HD_SET_SERVICE_RECORD +void handleSetHDServiceRecord( MESSAGE_T *message ); + /**@}*/ #endif Index: firmware/App/Tasks/TaskBG.c =================================================================== diff -u -r911f6526ec3ba03ba0131681c7fb371c0abda6bb -rac2c218b9e310a14d2872c9b4c32a6f69615088e --- firmware/App/Tasks/TaskBG.c (.../TaskBG.c) (revision 911f6526ec3ba03ba0131681c7fb371c0abda6bb) +++ firmware/App/Tasks/TaskBG.c (.../TaskBG.c) (revision ac2c218b9e310a14d2872c9b4c32a6f69615088e) @@ -60,7 +60,7 @@ #ifndef SIMULATE_UI if ( TRUE == didTimeout( startUICommTimeout, MAX_TIME_FOR_UI_TO_COMMUNICATE_MS ) ) { - activateAlarmNoData( ALARM_ID_UI_COMM_POST_FAILED ); + // activateAlarmNoData( ALARM_ID_UI_COMM_POST_FAILED ); } #endif } Index: firmware/App/Tasks/TaskGeneral.c =================================================================== diff -u -r766708fceb0bdf1af8c7897df29d4f5036bfd3db -rac2c218b9e310a14d2872c9b4c32a6f69615088e --- firmware/App/Tasks/TaskGeneral.c (.../TaskGeneral.c) (revision 766708fceb0bdf1af8c7897df29d4f5036bfd3db) +++ firmware/App/Tasks/TaskGeneral.c (.../TaskGeneral.c) (revision ac2c218b9e310a14d2872c9b4c32a6f69615088e) @@ -61,11 +61,11 @@ // Prevent most processing until UI has started communicating #ifndef SIMULATE_UI - if ( TRUE == uiCommunicated() ) + //if ( TRUE == uiCommunicated() ) #endif { // Monitor DG - execDGInterfaceMonitor(); + /*execDGInterfaceMonitor(); // Monitor pressure/occlusion sensors execPresOccl(); @@ -83,13 +83,16 @@ execDialInFlowController(); // Control dialysate outlet pump - execDialOutFlowController(); + execDialOutFlowController();*/ // Manage RTC - execRTC(); - + //execRTC(); + + // Manage NVDataMgmt process record state machine + execNVDataMgmtProcessRecord(); + // Manage alarm state - execAlarmMgmt(); + //execAlarmMgmt(); // Manage data to be transmitted to other sub-systems execSystemCommTx(); Index: firmware/App/Tasks/TaskPriority.c =================================================================== diff -u -r30f049651877229042e3f8700c8596e5b9a1e0f4 -rac2c218b9e310a14d2872c9b4c32a6f69615088e --- firmware/App/Tasks/TaskPriority.c (.../TaskPriority.c) (revision 30f049651877229042e3f8700c8596e5b9a1e0f4) +++ firmware/App/Tasks/TaskPriority.c (.../TaskPriority.c) (revision ac2c218b9e310a14d2872c9b4c32a6f69615088e) @@ -55,7 +55,7 @@ #endif { // 1st pass for FPGA - execFPGAIn(); + /*execFPGAIn(); #ifndef CAN_TEST // Monitor and process buttons @@ -86,7 +86,7 @@ #endif #endif // 2nd pass for FPGA - execFPGAOut(); + execFPGAOut();*/ } // Check in with watchdog manager