Index: leahi.pro =================================================================== diff -u -rb110ee732fe1306669f71d9c17ed4714e1f03ee2 -r9b81b18319ff46f1e48d5637a6a8938d2f7735c9 --- leahi.pro (.../leahi.pro) (revision b110ee732fe1306669f71d9c17ed4714e1f03ee2) +++ leahi.pro (.../leahi.pro) (revision 9b81b18319ff46f1e48d5637a6a8938d2f7735c9) @@ -183,6 +183,11 @@ sources/model/td/adjustment/settings/MAdjustTDVersionsResponse.h \ sources/model/td/adjustment/settings/MAdjustTDAlarmVolumeResponse.h \ sources/model/td/adjustment/settings/MTDAdvancedInstitutionalRecordResponse.h \ + sources/model/td/adjustment/treatment/MTreatmentAdjustAutoSubResponse.h \ + sources/model/td/adjustment/treatment/MTreatmentAdjustHDFResponse.h \ + sources/model/td/adjustment/treatment/MTreatmentAdjustHDFStateResponse.h \ + sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFStateResponse.h \ + sources/model/td/adjustment/treatment/MTreatmentAdjustDryBicartDisconnectResponse.h \ sources/model/td/adjustment/treatment/MTreatmentAdjustPressuresWideningResponse.h \ sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsAlarmLimitsResponse.h \ sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsResponse.h \ @@ -198,6 +203,8 @@ sources/model/td/data/MWaterSampleData.h \ sources/model/td/data/treatment/MTreatmentBloodFlowData.h \ sources/model/td/data/treatment/MTreatmentBloodPrimeData.h \ + sources/model/td/data/treatment/MTreatmentHDFData.h \ + sources/model/td/data/treatment/MTreatmentDryBicartDisconnectData.h \ sources/model/td/data/treatment/MTreatmentIsolatedUFData.h \ sources/model/td/data/treatment/MTreatmentParametersSetPointData.h \ sources/model/td/data/treatment/MTreatmentPressureOcclusionData.h \ @@ -220,6 +227,7 @@ \ # ---------- Models - TD - Data //// ----- @LEAHIZED sources/model/td/data/MTDOpModeData.h \ sources/model/td/data/MTDPowerOffWarning.h \ + sources/model/td/data/MTDSyringePumpData.h \ \ # ---------- Models - TD - Data - Treatment Log sources/model/td/data/treatmentlog/MTreatmentLogAlarmData.h \ sources/model/td/data/treatmentlog/MTreatmentLogEventData.h \ @@ -268,7 +276,11 @@ sources/view/settings/VAdjustmentAdvancedInstitutionalRecord.h \ sources/view/settings/VAdvancedInstitutionalRecord.h \ sources/view/settings/VRoWaterMode.h \ - sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresWidening.h \ + sources/view/settings/VCalibrationSettings.h \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentAutoSub.h \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentHDF.h \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentHDFState.h \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentDryBicartDisconnect.h \ sources/view/td/data/VTDAirBubbleData.h \ sources/view/td/data/VTDAirPumpData.h \ sources/view/td/data/VTDAirTrapData.h \ @@ -281,10 +293,13 @@ sources/view/td/data/VTDVoltageData.h \ sources/view/td/data/VTreatmentRanges.h \ sources/view/td/data/VWaterSampleData.h \ + sources/view/td/data/VTDSyringePumpData.h \ \ # ---------- Views - TD - Data - In-Treatment sources/view/td/data/treatment/VTDTreatmentStatesData.h \ sources/view/td/data/treatment/VTreatmentBloodFlow.h \ sources/view/td/data/treatment/VTreatmentBloodPrimeData.h \ + sources/view/td/data/treatment/VTreatmentHDFData.h \ + sources/view/td/data/treatment/VTreatmentDryBicartDisconnect.h \ sources/view/td/data/treatment/VTreatmentIsolatedUFData.h \ sources/view/td/data/treatment/VTreatmentParametersSetPointData.h \ sources/view/td/data/treatment/VTreatmentPressureOcclusion.h \ @@ -305,6 +320,8 @@ sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFDurationEdit.h \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFVolumeEdit.h \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFConfirm.h \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFState.h \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresWidening.h \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.h \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentSaline.h \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentSetPoints.h \ @@ -393,7 +410,6 @@ sources/model/hd/data/MHDDebugText.h \ sources/model/hd/data/MHDGeneralEvent.h \ sources/model/hd/data/MHDAccelerometerData.h \ - sources/model/hd/data/MHDSyringePumpData.h \ sources/model/hd/data/MHDBloodLeakData.h \ sources/model/hd/data/MTreatmentRangesData.h \ sources/model/hd/data/treatment/MTreatmentDialysateFlowData.h \ @@ -486,7 +502,6 @@ \ # ---------- Views - HD - Data sources/view/hd/data/post/VHDPOSTData.h \ sources/view/hd/data/VHDAccelerometerData.h \ - sources/view/hd/data/VHDSyringePumpData.h \ sources/view/hd/data/VHDBloodLeakData.h \ sources/view/hd/data/treatment/VTreatmentDialysateFlow.h \ sources/view/hd/data/treatment/VTreatmentHeparinData.h \ @@ -555,6 +570,11 @@ sources/model/td/adjustment/settings/MAdjustTDVersionsRequest.cpp \ sources/model/td/adjustment/settings/MAdjustTDVersionsResponse.cpp \ sources/model/td/adjustment/settings/MTDAdvancedInstitutionalRecordResponse.cpp \ + sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFStateResponse.cpp \ + sources/model/td/adjustment/treatment/MTreatmentAdjustAutoSubResponse.cpp \ + sources/model/td/adjustment/treatment/MTreatmentAdjustHDFResponse.cpp \ + sources/model/td/adjustment/treatment/MTreatmentAdjustHDFStateResponse.cpp \ + sources/model/td/adjustment/treatment/MTreatmentAdjustDryBicartDisconnectResponse.cpp \ sources/model/td/adjustment/treatment/MTreatmentAdjustPressuresWideningResponse.cpp \ sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsAlarmLimitsResponse.cpp \ sources/model/td/data/MTDAirBubbleData.cpp \ @@ -567,8 +587,11 @@ sources/model/td/data/MTDValvesData.cpp \ sources/model/td/data/MTDVoltageData.cpp \ sources/model/td/data/MWaterSampleData.cpp \ + sources/model/td/data/MTDSyringePumpData.cpp \ sources/model/td/data/treatment/MTreatmentBloodFlowData.cpp \ sources/model/td/data/treatment/MTreatmentBloodPrimeData.cpp \ + sources/model/td/data/treatment/MTreatmentHDFData.cpp \ + sources/model/td/data/treatment/MTreatmentDryBicartDisconnectData.cpp \ sources/model/td/data/treatment/MTreatmentIsolatedUFData.cpp \ sources/model/td/data/treatment/MTreatmentParametersSetPointData.cpp \ sources/model/td/data/treatment/MTreatmentPressureOcclusionData.cpp \ @@ -695,7 +718,6 @@ sources/model/hd/data/MHDDebugText.cpp \ sources/model/hd/data/MHDGeneralEvent.cpp \ sources/model/hd/data/MHDAccelerometerData.cpp \ - sources/model/hd/data/MHDSyringePumpData.cpp \ sources/model/hd/data/MHDBloodLeakData.cpp \ sources/model/hd/data/MTreatmentRangesData.cpp \ sources/model/hd/data/treatment/MTreatmentDialysateFlowData.cpp \ @@ -744,7 +766,11 @@ sources/view/settings/VAdjustmentAdvancedInstitutionalRecord.cpp \ sources/view/settings/VAdvancedInstitutionalRecord.cpp \ sources/view/settings/VRoWaterMode.cpp \ - sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresWidening.cpp \ + sources/view/settings/VCalibrationSettings.cpp \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentAutoSub.cpp \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentHDF.cpp \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentHDFState.cpp \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentDryBicartDisconnect.cpp \ sources/view/td/data/VTDAirBubbleData.cpp \ sources/view/td/data/VTDAirPumpData.cpp \ sources/view/td/data/VTDAirTrapData.cpp \ @@ -757,10 +783,13 @@ sources/view/td/data/VTDVoltageData.cpp \ sources/view/td/data/VTreatmentRanges.cpp \ sources/view/td/data/VWaterSampleData.cpp \ + sources/view/td/data/VTDSyringePumpData.cpp \ \ # ---------- Views - TD - Data - In-Treatment sources/view/td/data/treatment/VTDTreatmentStatesData.cpp \ sources/view/td/data/treatment/VTreatmentBloodFlow.cpp \ sources/view/td/data/treatment/VTreatmentBloodPrimeData.cpp \ + sources/view/td/data/treatment/VTreatmentHDFData.cpp \ + sources/view/td/data/treatment/VTreatmentDryBicartDisconnect.cpp \ sources/view/td/data/treatment/VTreatmentIsolatedUFData.cpp \ sources/view/td/data/treatment/VTreatmentParametersSetPointData.cpp \ sources/view/td/data/treatment/VTreatmentPressureOcclusion.cpp \ @@ -781,6 +810,8 @@ sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFDurationEdit.cpp \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFVolumeEdit.cpp \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFConfirm.cpp \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFState.cpp \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresWidening.cpp \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.cpp \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentSaline.cpp \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentSetPoints.cpp \ @@ -842,7 +873,6 @@ sources/view/hd/data/posttreatment/VPostTreatmentStatesData.cpp \ \ # ---------- Views - HD - Data sources/view/hd/data/VHDAccelerometerData.cpp \ - sources/view/hd/data/VHDSyringePumpData.cpp \ sources/view/hd/data/VHDBloodLeakData.cpp \ \ # ---------- Views - HD - Data - Pre-Treatment sources/view/hd/data/pretreatment/VPreTreatmentSelfTestNoCartridgeData.cpp \ Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -rb110ee732fe1306669f71d9c17ed4714e1f03ee2 -r9b81b18319ff46f1e48d5637a6a8938d2f7735c9 --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision b110ee732fe1306669f71d9c17ed4714e1f03ee2) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 9b81b18319ff46f1e48d5637a6a8938d2f7735c9) @@ -222,8 +222,22 @@ // ---------------------------------------------------------------------------------------------------- + /*! * \brief MessageDispatcher::onAdjustment + * \details This method transmits the Dry Bicart DisconnectCommand message. + * \param vData - Data model contains Dry Bicart Disconnect Command + * \return void + */ +void MessageDispatcher::onAdjustment(const AdjustDryBicartDisconnectRequestData &vData) +{ + QVariantList mData; + mData += vData.command; + actionTransmit(GuiActionType::ID_AdjustDryBicartDisconnectReq, mData); +} + +/*! + * \brief MessageDispatcher::onAdjustment * \details This method transmits the Blood Prime Command message. * \param vData - Data model contains Blood Prime Command * \return void @@ -371,6 +385,19 @@ /*! * \brief MessageDispatcher::onAdjustment + * \details This method transmits the Isolated Ultrafiltration State Adjustment Denali message. + * \param vData - Data model contains treatment ultrafiltration state adjustment + * \return void + */ +void MessageDispatcher::onAdjustment(const AdjustIsolatedUFStateRequestData &vData) +{ + QVariantList mData; + mData += vData.requestedState; + actionTransmit(GuiActionType::ID_AdjustIsoUFStateReq, mData); +} + +/*! + * \brief MessageDispatcher::onAdjustment * \details This method transmits the Ultrafiltration Adjustment Denali message. * \param vData - Data model contains treatment ultrafiltration adjustment volume * \return void @@ -657,6 +684,46 @@ /*! * \brief MessageDispatcher::onAdjustment + * \details This method transmits the HDF state + * \param vData - Data model contains hdf state adjustment. + * \return void + */ + void MessageDispatcher::onAdjustment(const AdjustHDFStateRequestData &vData) +{ + QVariantList mData; + mData += vData.state ; + actionTransmit(GuiActionType::ID_AdjustHDFStateReq, mData); +} + +/*! + * \brief MessageDispatcher::onAdjustment + * \details This method transmits the HDF auto sub state + * \param vData - Data model contains hdf auto sub state adjustment. + * \return void + */ + void MessageDispatcher::onAdjustment(const AdjustAutoSubRequestData &vData) +{ + QVariantList mData; + mData += vData.state ; + actionTransmit(GuiActionType::ID_AdjustAutoSubReq, mData); +} + +/*! + * \brief MessageDispatcher::onAdjustment + * \details This method transmits the HDF adjustment + * \param vData - Data model contains hdf adjustment. + * \return void + */ + void MessageDispatcher::onAdjustment(const AdjustHDFRequestData &vData) +{ + QVariantList mData; + mData += vData.treatmentMode ; + mData += vData.subFluidVolume ; + actionTransmit(GuiActionType::ID_AdjustHDFReq, mData); +} + +/*! + * \brief MessageDispatcher::onAdjustment * \details This method transmits the InitTreatment request message. * \param vData - Data model contains the init treatment request information. * \return void @@ -1121,6 +1188,8 @@ QVariantList mData; actionTransmit(GuiActionType::ID_ResetHDInServiceModeReq, mData); } + + // ---------------------------------------------------------------------------------------------------- /*! Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -rb110ee732fe1306669f71d9c17ed4714e1f03ee2 -r9b81b18319ff46f1e48d5637a6a8938d2f7735c9 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision b110ee732fe1306669f71d9c17ed4714e1f03ee2) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 9b81b18319ff46f1e48d5637a6a8938d2f7735c9) @@ -78,10 +78,10 @@ {Gui::GuiActionType::ID_Saline , 4 * 4 }, // 4 parameters each 4bytes {Gui::GuiActionType::ID_Vitals , 3 * 4 }, // 3 parameters each 4bytes {Gui::GuiActionType::ID_Ultrafiltration , 4 * 4 }, // 4 parameters each 4bytes - {Gui::GuiActionType::ID_IsolatedUF , 4 * 4 }, // 4 parameters each 4bytes + {Gui::GuiActionType::ID_IsolatedUF , 6 * 4 }, // 6 parameters each 4bytes {Gui::GuiActionType::ID_Heparin , 3 * 4 }, // 2 parameters each 4bytes - {Gui::GuiActionType::ID_Rinseback , 6 * 4 }, // 6 parameters each 4bytes - {Gui::GuiActionType::ID_Recirculate , 2 * 4 }, // 2 parameters each 4bytes + {Gui::GuiActionType::ID_Rinseback , 7 * 4 }, // 6 parameters each 4bytes + {Gui::GuiActionType::ID_Recirculate , 1 * 4 }, // 1 parameters each 4bytes {Gui::GuiActionType::ID_BloodPrime , 4 * 4 }, // 4 parameters each 4bytes {Gui::GuiActionType::ID_TreatmentStop , 2 * 4 }, // 2 parameters each 4bytes {Gui::GuiActionType::ID_TDAirBubbleData , 2 * 4 }, // 2 parameters each 4bytes @@ -124,7 +124,7 @@ {Gui::GuiActionType::ID_FPRORejectionPercentageData , 5 * 4 }, // 5 parameters each 4bytes // HD Data Messages {Gui::GuiActionType::ID_HDAccelerometerData , 9 * 4 }, // 9 parameters each 4bytes - {Gui::GuiActionType::ID_HDSyringePumpData , 9 * 4 }, // 9 parameters each 4bytes + {Gui::GuiActionType::ID_TDSyringePumpData , 10 * 4 }, //10 parameters each 4bytes {Gui::GuiActionType::ID_HDUsageInfoReq , 0 * 4 }, // 0 parameters each 4bytes {Gui::GuiActionType::ID_HDUsageInfoRsp , 4 * 4 + 2 }, // 4 parameters each 4bytes + 1 parameter 2 bytes //TD Data Messages @@ -192,6 +192,10 @@ {Gui::GuiActionType::ID_AdjustUltrafiltrationStateRsp , 2 * 4 }, // 2 parameter each 4bytes // ---- + {Gui::GuiActionType::ID_AdjustIsoUFStateReq , 1 * 4 }, // 1 parameter each 4bytes + {Gui::GuiActionType::ID_AdjustIsoUFStateRsp , 2 * 4 }, // 2 parameter each 4bytes + + // ---- {Gui::GuiActionType::ID_AdjustUltrafiltrationEditReq , 1 * 4 }, // 1 parameter each 4bytes {Gui::GuiActionType::ID_AdjustUltrafiltrationEditRsp , 4 * 4 }, // 4 parameters each 4bytes @@ -270,6 +274,11 @@ {Gui::GuiActionType::ID_AdjustHeparinReq , 1 * 4 }, // 1 parameter each 4bytes {Gui::GuiActionType::ID_AdjustHeparinRsp , 2 * 4 }, // 3 parameters each 4bytes + // ---- Dry Bicarb Disconnect + {Gui::GuiActionType::ID_DryBicartDisconnectData , 5 * 4 }, // 5 parameter each 4bytes + {Gui::GuiActionType::ID_AdjustDryBicartDisconnectReq , 1 * 4 }, // 1 parameter each 4bytes + {Gui::GuiActionType::ID_AdjustDryBicartDisconnectRsp , 2 * 4 }, // 2 parameter each 4bytes + // ---- Rinseback {Gui::GuiActionType::ID_AdjustRinsebackReq , 1 * 4 }, // 1 parameter each 4bytes {Gui::GuiActionType::ID_AdjustRinsebackRsp , 2 * 4 }, // 2 parameters each 4bytes @@ -278,6 +287,15 @@ {Gui::GuiActionType::ID_AdjustRecirculateReq , 1 * 4 }, // 1 parameter each 4bytes {Gui::GuiActionType::ID_AdjustRecirculateRsp , 2 * 4 }, // 2 parameters each 4bytes + // ---- HDF + {Gui::GuiActionType::ID_HDF , 9 * 4 }, // 9 parameter each 4bytes + {Gui::GuiActionType::ID_AdjustHDFStateReq , 1 * 4 }, // 1 parameter each 4bytes + {Gui::GuiActionType::ID_AdjsutHDFStateRsp , 2 * 4 }, // 2 parameter each 4bytes + {Gui::GuiActionType::ID_AdjustAutoSubReq , 1 * 4 }, // 1 parameter each 4bytes + {Gui::GuiActionType::ID_AdjustAutoSubRsp , 2 * 4 }, // 2 parameter each 4bytes + {Gui::GuiActionType::ID_AdjustHDFReq , 2 * 4 }, // 2 parameter each 4bytes + {Gui::GuiActionType::ID_AdjustHDFRsp , 3 * 4 }, // 3 parameter each 4bytes + // ---- Treatment End {Gui::GuiActionType::ID_AdjustTreatmentEndReq , 0 * 4 }, // 1 parameter each 4bytes {Gui::GuiActionType::ID_AdjustTreatmentEndRsp , 2 * 4 }, // 2 parameters each 4bytes Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -rb110ee732fe1306669f71d9c17ed4714e1f03ee2 -r9b81b18319ff46f1e48d5637a6a8938d2f7735c9 --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision b110ee732fe1306669f71d9c17ed4714e1f03ee2) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 9b81b18319ff46f1e48d5637a6a8938d2f7735c9) @@ -261,13 +261,19 @@ case Gui::GuiActionType::ID_AdjustSalineReq : INTERPRET_TRANSMIT_MESSAGE(AdjustSalineRequestData ); break; case Gui::GuiActionType::ID_AdjustVitalsReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustVitalsRequestData ); break; case Gui::GuiActionType::ID_AdjustHeparinReq : INTERPRET_TRANSMIT_MESSAGE(AdjustHeparinRequestData ); break; + case Gui::GuiActionType::ID_AdjustHDFStateReq : INTERPRET_TRANSMIT_MESSAGE(AdjustHDFStateRequestData ); break; + case Gui::GuiActionType::ID_AdjustAutoSubReq : INTERPRET_TRANSMIT_MESSAGE(AdjustAutoSubRequestData ); break; + case Gui::GuiActionType::ID_AdjustHDFReq : INTERPRET_TRANSMIT_MESSAGE(AdjustHDFRequestData ); break; + + case Gui::GuiActionType::ID_AdjustDryBicartDisconnectReq : INTERPRET_TRANSMIT_MESSAGE(AdjustDryBicartDisconnectRequestData ); break; // in-treatment - ultrafiltration case Gui::GuiActionType::ID_AdjustUltrafiltrationStateReq : INTERPRET_TRANSMIT_MESSAGE(AdjustUltrafiltrationStateRequestData ); break; case Gui::GuiActionType::ID_AdjustUltrafiltrationEditReq : INTERPRET_TRANSMIT_MESSAGE(AdjustUltrafiltrationEditRequestData ); break; case Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmReq : INTERPRET_TRANSMIT_MESSAGE(AdjustUltrafiltrationConfirmRequestData ); break; case Gui::GuiActionType::ID_AdjustIsolatedUFDurationEditReq : INTERPRET_TRANSMIT_MESSAGE(AdjustIsolatedUFDurationEditRequestData ); break; case Gui::GuiActionType::ID_AdjustIsolatedUFVolumeEditReq : INTERPRET_TRANSMIT_MESSAGE(AdjustIsolatedUFVolumeEditRequestData ); break; case Gui::GuiActionType::ID_AdjustIsolatedUFConfirmReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustIsolatedUFConfirmRequestData ); break; + case Gui::GuiActionType::ID_AdjustIsoUFStateReq : INTERPRET_TRANSMIT_MESSAGE(AdjustIsolatedUFStateRequestData ); break; // End-Treatment case Gui::GuiActionType::ID_AdjustRinsebackReq : INTERPRET_TRANSMIT_MESSAGE(AdjustRinsebackRequestData ); break; case Gui::GuiActionType::ID_AdjustRecirculateReq : INTERPRET_TRANSMIT_MESSAGE(AdjustRecirculateRequestData ); break; @@ -492,7 +498,7 @@ // ----- Datum case Gui::GuiActionType::ID_HDAccelerometerData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_HDAccelerometerData ); break; - case Gui::GuiActionType::ID_HDSyringePumpData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_HDSyringePumpData ); break; + case Gui::GuiActionType::ID_TDSyringePumpData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_TDSyringePumpData ); break; case Gui::GuiActionType::ID_TDVoltageData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_TDVoltageData ); break; case Gui::GuiActionType::ID_TDAirBubbleData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_TDAirBubbleData ); break; case Gui::GuiActionType::ID_TDAirPumpData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_TDAirPumpData ); break; @@ -531,6 +537,7 @@ case Gui::GuiActionType::ID_DialysateOutletFlow : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DialysateOutletFlow ); break; case Gui::GuiActionType::ID_PressureOcclusion : ok = notify(vMessage, vData, Gui::GuiActionType::ID_PressureOcclusion ); break; case Gui::GuiActionType::ID_Saline : ok = notify(vMessage, vData, Gui::GuiActionType::ID_Saline ); break; + case Gui::GuiActionType::ID_HDF : ok = notify(vMessage, vData, Gui::GuiActionType::ID_HDF ); break; case Gui::GuiActionType::ID_Vitals : ok = notify(vMessage, vData, Gui::GuiActionType::ID_Vitals ); break; case Gui::GuiActionType::ID_Heparin : ok = notify(vMessage, vData, Gui::GuiActionType::ID_Heparin ); break; case Gui::GuiActionType::ID_Rinseback : ok = notify(vMessage, vData, Gui::GuiActionType::ID_Rinseback ); break; @@ -540,6 +547,7 @@ case Gui::GuiActionType::ID_Ultrafiltration : ok = notify(vMessage, vData, Gui::GuiActionType::ID_Ultrafiltration ); break; case Gui::GuiActionType::ID_IsolatedUF : ok = notify(vMessage, vData, Gui::GuiActionType::ID_IsolatedUF ); break; case Gui::GuiActionType::ID_TreatmentParametersSetPointData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_TreatmentParametersSetPointData ); break; + case Gui::GuiActionType::ID_DryBicartDisconnectData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DryBicartDisconnectData ); break; // ----- In-Treatment Adjust case Gui::GuiActionType::ID_AdjustBloodPrimeRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustBloodPrimeRsp ); break; case Gui::GuiActionType::ID_AdjustDurationEditRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDurationEditRsp ); break; @@ -556,13 +564,18 @@ case Gui::GuiActionType::ID_AdjustSalineRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustSalineRsp ); break; case Gui::GuiActionType::ID_AdjustVitalsRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustVitalsRsp ); break; case Gui::GuiActionType::ID_AdjustUltrafiltrationStateRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustUltrafiltrationStateRsp ); break; + case Gui::GuiActionType::ID_AdjustIsoUFStateRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustIsoUFStateRsp ); break; case Gui::GuiActionType::ID_AdjustHeparinRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustHeparinRsp ); break; case Gui::GuiActionType::ID_AdjustRinsebackRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustRinsebackRsp ); break; case Gui::GuiActionType::ID_AdjustRecirculateRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustRecirculateRsp ); break; case Gui::GuiActionType::ID_AdjustTreatmentEndRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustTreatmentEndRsp ); break; case Gui::GuiActionType::ID_AdjustIsolatedUFDurationEditRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustIsolatedUFDurationEditRsp ); break; case Gui::GuiActionType::ID_AdjustIsolatedUFVolumeEditRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustIsolatedUFVolumeEditRsp ); break; case Gui::GuiActionType::ID_AdjustIsolatedUFConfirmRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustIsolatedUFConfirmRsp ); break; + case Gui::GuiActionType::ID_AdjsutHDFStateRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjsutHDFStateRsp ); break; + case Gui::GuiActionType::ID_AdjustAutoSubRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustAutoSubRsp ); break; + case Gui::GuiActionType::ID_AdjustHDFRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustHDFRsp ); break; + case Gui::GuiActionType::ID_AdjustDryBicartDisconnectRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDryBicartDisconnectRsp ); break; // ----- Post-Treatment Adjust case Gui::GuiActionType::ID_AdjustPatientDisconnectConfirmRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustPatientDisconnectConfirmRsp ); break; Index: sources/gui/GuiGlobals.cpp =================================================================== diff -u -rb110ee732fe1306669f71d9c17ed4714e1f03ee2 -r9b81b18319ff46f1e48d5637a6a8938d2f7735c9 --- sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision b110ee732fe1306669f71d9c17ed4714e1f03ee2) +++ sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision 9b81b18319ff46f1e48d5637a6a8938d2f7735c9) @@ -57,6 +57,7 @@ #include "VInstitutionalRecord.h" #include "VAdjustmentAdvancedInstitutionalRecord.h" #include "VAdvancedInstitutionalRecord.h" +#include "VCalibrationSettings.h" // states data #include "VTDOpModeData.h" #include "VPreTreatmentStatesData.h" @@ -93,7 +94,7 @@ #include "VTreatmentBloodPrimeData.h" #include "VTreatmentStopData.h" #include "VHDAccelerometerData.h" -#include "VHDSyringePumpData.h" +#include "VTDSyringePumpData.h" #include "VHDBloodLeakData.h" #include "VTDAirBubbleData.h" #include "VTDAirPumpData.h" @@ -105,7 +106,9 @@ #include "VTDEjectorData.h" #include "VTDTemperatureData.h" #include "VTreatmentTrends.h" +#include "VTreatmentDryBicartDisconnect.h" #include "VWaterSampleData.h" +#include "VTreatmentHDFData.h" // DG data #include "VDGDrainPumpData.h" #include "VDDHeatersData.h" @@ -159,8 +162,13 @@ #include "VTreatmentAdjustmentIsolatedUFConfirm.h" #include "VTreatmentAdjustmentIsolatedUFDurationEdit.h" #include "VTreatmentAdjustmentIsolatedUFVolumeEdit.h" +#include "VTreatmentAdjustmentIsolatedUFState.h" #include "VTreatmentAdjustmentSetPoints.h" #include "VTreatmentAdjustmentVitalsAlarmLimits.h" +#include "VTreatmentAdjustmentAutoSub.h" +#include "VTreatmentAdjustmentHDFState.h" +#include "VTreatmentAdjustmentHDF.h" +#include "VTreatmentAdjustmentDryBicartDisconnect.h" // ----- Post-Treatment Adjustments #include "VPostTreatmentAdjustPatientDisconnectionConfirm.h" #include "VPostTreatmentAdjustDisposablesRemovalConfirm.h" Index: sources/gui/GuiGlobals.h =================================================================== diff -u -rb110ee732fe1306669f71d9c17ed4714e1f03ee2 -r9b81b18319ff46f1e48d5637a6a8938d2f7735c9 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision b110ee732fe1306669f71d9c17ed4714e1f03ee2) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 9b81b18319ff46f1e48d5637a6a8938d2f7735c9) @@ -91,7 +91,7 @@ // ----- Settings // Service Mode ID_AdjustServiceModeReq = 0xB000, // 176 - ID_AdjustServiceModeRsp = 0xB100, // 177 + ID_AdjustServiceModeRsp = 0xB10F, // 177 //// ----- @CRAPIZED: had to change to avoid duplication // Version ID_AdjustVersionsUIReq = 0x0D00, // 13 //// ----- @LEAHIZED @@ -224,7 +224,7 @@ // HD Data Messages ID_HDAccelerometerData = 0x3300, // 51 - ID_HDSyringePumpData = 0x6900, // 105 + ID_TDSyringePumpData = 0xB100, // 177 ID_HDBloodLeakData = 0x6C0F, // 108 //// ----- @CRAPIZED: had to change to avoid duplication ID_TDAirBubbleData = 0x1E00, // 30 //// ----- @LEAHIZED ID_TDAirPumpData = 0x2000, // 32 //// ----- @LEAHIZED @@ -280,6 +280,10 @@ ID_AdjustHeparinReq = 0x8A00, // 138 ID_AdjustHeparinRsp = 0x8B00, // 139 + ID_DryBicartDisconnectData = 0xC400, // 196 + ID_AdjustDryBicartDisconnectReq = 0xC500, // 197 + ID_AdjustDryBicartDisconnectRsp = 0xC600, // 198 + ID_AdjustPressuresWideningReq = 0xA400, // 114 //// ----- @LEAHIZED ID_AdjustPressuresWideningRsp = 0xA500, // 115 //// ----- @LEAHIZED @@ -302,6 +306,21 @@ ID_AdjustIsolatedUFConfirmReq = 0x9F00, // 159 //// ----- @LEAHIZED ID_AdjustIsolatedUFConfirmRsp = 0xA000, // 160 //// ----- @LEAHIZED + ID_AdjustIsoUFStateReq = 0xBA00, // 186 //// ----- @LEAHIZED + ID_AdjustIsoUFStateRsp = 0xBB00, // 187 //// ----- @LEAHIZED + + // HDF + ID_HDF = 0xBC00, // 188 //// ----- @LEAHIZED + + ID_AdjustHDFStateReq = 0xBD00, // 189 //// ----- @LEAHIZED + ID_AdjsutHDFStateRsp = 0xBE00, // 190 //// ----- @LEAHIZED + + ID_AdjustAutoSubReq = 0xBF00, // 191 //// ----- @LEAHIZED + ID_AdjustAutoSubRsp = 0xC000, // 192 //// ----- @LEAHIZED + + ID_AdjustHDFReq = 0xC100, // 193 //// ----- @LEAHIZED + ID_AdjustHDFRsp = 0xC200, // 194 //// ----- @LEAHIZED + // End-Treatment // Rinseback ID_AdjustRinsebackReq = 0x9000, // 144 //// ----- @LEAHIZED @@ -349,6 +368,7 @@ ID_AdjustRoWaterModeReq = 0xED00, // 237 ID_AdjustRoWaterModeRsp = 0xEE00, // 238 + // Institutional record request and response ID_InstitutionalRecordReq = 0x8200, // 130 UI -> TD request institutional record ID_InstitutionalRecordRsp = 0x8300, // 131 TD -> UI response institutional record @@ -483,6 +503,9 @@ // Ultrafiltration typedef GuiActions::UF_Commands GuiUFCommands; typedef GuiActions::UF_Adjustments GuiUFAdjustment; + // Isolated UF + typedef GuiActions::ISO_UF_Commands GuiIsoUFCommands; + typedef GuiActions::Isolated_UF_States GuiIsoUfState; // Saline typedef GuiActions::Fluid_Bolus_States GuiSalineStates; typedef GuiActions::Fluid_Bolus_Commands GuiSalineCommands; Index: sources/gui/qml/main.qml =================================================================== diff -u -rb110ee732fe1306669f71d9c17ed4714e1f03ee2 -r9b81b18319ff46f1e48d5637a6a8938d2f7735c9 --- sources/gui/qml/main.qml (.../main.qml) (revision b110ee732fe1306669f71d9c17ed4714e1f03ee2) +++ sources/gui/qml/main.qml (.../main.qml) (revision 9b81b18319ff46f1e48d5637a6a8938d2f7735c9) @@ -24,7 +24,7 @@ // View classes import VGeneralEvent 0.1 import VHDAccelerometer 0.1 -import VHDSyringePump 0.1 +import VTDSyringePump 0.1 import VHDBloodLeak 0.1 import VTDAirBubble 0.1 import VTDAirPump 0.1 @@ -59,6 +59,7 @@ import VCloudSync 0.1 import VHDUsageInfo 0.1 import VInstitutionalRecord 0.1 +import VCalibrationSettings 0.1 import VAdjustmentInstitutionalRecord 0.1 import VAdvancedInstitutionalRecord 0.1 import VAdjustmentAdvancedInstitutionalRecord 0.1 @@ -87,6 +88,8 @@ import VTreatmentRanges 0.1 import VTreatmentHeparin 0.1 import VTreatmentTrends 0.1 +import VTreatmentHDF 0.1 +import VTreatmentDryBicartDisconnect 0.1 // Pre-Treatment import VPreTreatmentAdjustmentInitTreatment 0.1 @@ -144,6 +147,7 @@ import VTreatmentAdjustmentIsolatedUFVolumeEdit 0.1 import VTreatmentAdjustmentIsolatedUFConfirm 0.1 import VTreatmentAdjustmentUltrafiltrationState 0.1 +import VTreatmentAdjustmentIsolatedUFState 0.1 import VTreatmentAdjustmentUltrafiltrationEdit 0.1 import VTreatmentAdjustmentUltrafiltrationConfirm 0.1 import VTreatmentAdjustmentPressuresLimits 0.1 @@ -154,6 +158,10 @@ import VTreatmentAdjustmentRinseback 0.1 import VTreatmentAdjustmentRecirculate 0.1 import VTreatmentAdjustmentEnd 0.1 +import VTreatmentAdjustmentAutoSub 0.1 +import VTreatmentAdjustmentHDFState 0.1 +import VTreatmentAdjustmentHDF 0.1 +import VTreatmentAdjustmentDryBicartDisconnect 0.1 // Post-Treatmnt import VPostTreatmentAdjustmentPatientDisconnectionConfirm 0.1 import VPostTreatmentAdjustmentDisposablesRemovalConfirm 0.1 @@ -205,6 +213,8 @@ VInstitutionalRecord { id: vInstitutionalRecord } VAdjustmentAdvancedInstitutionalRecord { id: vAdjustmentAdvancedInstitutionalRecord } VAdvancedInstitutionalRecord { id: vAdvancedInstitutionalRecord } + VCalibrationSettings { id: vCalibrationSettings } + //VAdjustIn // ---- States VTDOpMode { id: vTDOpMode @@ -233,7 +243,7 @@ VGeneralEvent { id: vGeneralEvent } VHDAccelerometer { id: vHDAccelerometer } - VHDSyringePump { id: vHDSyringePump } + VTDSyringePump { id: vTDSyringePump } VTDAirBubble { id: vTDAirBubble } VTDAirPump { id: vTDAirPump } VHDBloodLeak { id: vHDBloodLeak } @@ -260,6 +270,8 @@ VTreatmentRecirculate { id: vTreatmentRecirculate } VTreatmentStop { id: vTreatmentStop } VTreatmentHeparin { id: vTreatmentHeparin } + VTreatmentHDF { id: vTreatmentHDF } + VTreatmentDryBicartDisconnect { id: vTreatmentDryBicartDisconnect } // ---- DD VDGDrainPump { id: vDGDrainPump } @@ -321,6 +333,7 @@ VTreatmentAdjustmentIsolatedUFDurationEdit { id: vTreatmentAdjustmentIsolatedUFDurationEdit } VTreatmentAdjustmentIsolatedUFVolumeEdit { id: vTreatmentAdjustmentIsolatedUFVolumeEdit } VTreatmentAdjustmentIsolatedUFConfirm { id: vTreatmentAdjustmentIsolatedUFConfirm } + VTreatmentAdjustmentIsolatedUFState { id: vTreatmentAdjustmentIsolatedUFState } VTreatmentAdjustmentSaline { id: vTreatmentAdjustmentSaline } VTreatmentAdjustmentVitals { id: vTreatmentAdjustmentVitals } VTreatmentAdjustmentUltrafiltrationState { id: vTreatmentAdjustmentUltrafiltrationState } @@ -332,6 +345,10 @@ VTreatmentAdjustmentRinseback { id: vTreatmentAdjustmentRinseback } VTreatmentAdjustmentRecirculate { id: vTreatmentAdjustmentRecirculate } VTreatmentAdjustmentEnd { id: vTreatmentAdjustmentEnd } + VTreatmentAdjustmentAutoSub { id: vTreatmentAdjustmentAutoSub } + VTreatmentAdjustmentHDFState { id: vTreatmentAdjustmentHDFState } + VTreatmentAdjustmentHDF { id: vTreatmentAdjustmentHDF } + VTreatmentAdjustmentDryBicartDisconnect { id: vTreatmentAdjustmentDryBicartDisconnect } // --- Post Treatment VPostTreatmentAdjustmentPatientDisconnectionConfirm { id: vPostTreatmentAdjustmentPatientDisconnectionConfirm } @@ -430,6 +447,7 @@ HeaderbarSettings { id: _headerbarSettings } HeaderbarInformation { id: _headerbarInformation } WaterSampleDialog { id: _headerbarWaterSampleDialysate } + DryBicartDisconnectDialog { id: _dryBicartDisconnectDialog } TreatmentAdjustmentVitals { id: _treatmentAdjustmentVitals } EndTreatmentDialog { id: _endTreatmentDialog } RinsebackCompleteDialog { id: _rinsebackCompleteDialog } Index: sources/gui/qml/pages/settings/SettingsStack.qml =================================================================== diff -u -r7bde5ac0646170a584dd5410fcf89fd9bc8b251c -r9b81b18319ff46f1e48d5637a6a8938d2f7735c9 --- sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision 7bde5ac0646170a584dd5410fcf89fd9bc8b251c) +++ sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision 9b81b18319ff46f1e48d5637a6a8938d2f7735c9) @@ -74,6 +74,7 @@ readonly property bool visibleAdvancedInstitutional : loggedIn readonly property bool visibleLocalization : loggedIn readonly property bool visibleAdvancedModes : loggedIn + readonly property bool visibleCalibrationSettings : loggedIn readonly property string settingsTitle : _GuiView.manufactSetup ? qsTr("Manufacturing Setup") : _GuiView.updateSetup ? qsTr("Software Update") : qsTr("Device Settings") @@ -100,6 +101,7 @@ AdvancedInstitutional , FeatureConfigurations , AdvancedMode , + CalibrationSettings , Home } property var itemsText : [ @@ -124,6 +126,7 @@ qsTr("Advanced Institutional Settings" ), // AdvancedInstitutional qsTr("Feature Configurations" ), // FeatureConfigurations qsTr("Advanced Mode" ), // Advanced Modes + qsTr("Calibration Settings" ), // Calibration Settings settingsTitle , // settings home ] @@ -149,6 +152,7 @@ visibleAdvancedInstitutional , // AdvancedInstitutional visibleFeatureConfigurations , // FeatureConfigurations visibleAdvancedModes , // Advanced Modes + visibleCalibrationSettings , // Calibration Settings false , // leave last and false align with settings home ] @@ -260,6 +264,10 @@ push( _settingAdvancedMode ) break + case SettingsStack.CalibrationSettings: + push( _settingCalibrationSettings ) + break + default: console.debug("Unknown Index", vIndex) break @@ -286,6 +294,7 @@ SettingsLocalization { id: _settingLocalization } SettingsFeatureConfigurations { id: _settingsFeatureConfigurations} SettingsAdvancedMode { id: _settingAdvancedMode } + SettingsCalibrationSettings { id: _settingCalibrationSettings } function gotoServiceMode( vservice ) { //DEBUG console.log (" 0 ---------- ", _GuiView.manufactMode, _GuiView.manufactSetup, vservice, stackView.initialItem, stackView.currentItem, stackView.depth) Index: sources/model/MModel.h =================================================================== diff -u -rb110ee732fe1306669f71d9c17ed4714e1f03ee2 -r9b81b18319ff46f1e48d5637a6a8938d2f7735c9 --- sources/model/MModel.h (.../MModel.h) (revision b110ee732fe1306669f71d9c17ed4714e1f03ee2) +++ sources/model/MModel.h (.../MModel.h) (revision 9b81b18319ff46f1e48d5637a6a8938d2f7735c9) @@ -52,6 +52,8 @@ #include "MTreatmentRangesData.h" #include "MTreatmentSalineData.h" #include "MTreatmentVitalsData.h" +#include "MTreatmentHDFData.h" +#include "MTreatmentDryBicartDisconnectData.h" #include "MTreatmentHeparinData.h" #include "MTreatmentRinsebackData.h" #include "MTreatmentRecirculateData.h" @@ -61,7 +63,7 @@ #include "MTreatmentIsolatedUFData.h" #include "MTreatmentParametersSetPointData.h" #include "MHDAccelerometerData.h" -#include "MHDSyringePumpData.h" +#include "MTDSyringePumpData.h" #include "MHDBloodLeakData.h" #include "MHDRTCEpochData.h" #include "MHDUsageInfoResponse.h" @@ -165,6 +167,7 @@ #include "MTreatmentAdjustIsolatedUFDurationEditResponse.h" #include "MTreatmentAdjustIsolatedUFVolumeEditResponse.h" #include "MTreatmentAdjustIsolatedUFConfirmResponse.h" +#include "MTreatmentAdjustIsolatedUFStateResponse.h" #include "MTreatmentAdjustSalineResponse.h" #include "MTreatmentAdjustVitalsResponse.h" #include "MTreatmentAdjustHeparinResponse.h" @@ -173,6 +176,10 @@ #include "MTreatmentAdjustEndResponse.h" #include "MTreatmentAdjustPressuresLimitsResponse.h" #include "MTreatmentAdjustPressuresWideningResponse.h" +#include "MTreatmentAdjustAutoSubResponse.h" +#include "MTreatmentAdjustHDFResponse.h" +#include "MTreatmentAdjustHDFStateResponse.h" +#include "MTreatmentAdjustDryBicartDisconnectResponse.h" // Post-Treatment #include "MPostTreatmentAdjustRequests.h" @@ -371,15 +378,17 @@ REGISTER_METATYPE( TreatmentRangesData ) \ REGISTER_METATYPE( TreatmentSalineData ) \ REGISTER_METATYPE( TreatmentVitalsData ) \ + REGISTER_METATYPE( TreatmentHDFData ) \ REGISTER_METATYPE( TreatmentHeparinData ) \ + REGISTER_METATYPE( TreatmentDryBicartDisconnectData ) \ REGISTER_METATYPE( TreatmentRinsebackData ) \ REGISTER_METATYPE( TreatmentRecirculateData ) \ REGISTER_METATYPE( TreatmentBloodPrimeData ) \ REGISTER_METATYPE( TreatmentStopData ) \ REGISTER_METATYPE( TreatmentUltrafiltrationData ) \ REGISTER_METATYPE( TreatmentIsolatedUFData ) \ REGISTER_METATYPE( TreatmentParametersSetPointData ) \ - REGISTER_METATYPE( HDSyringePumpData ) \ + REGISTER_METATYPE( TDSyringePumpData ) \ REGISTER_METATYPE( HDAccelerometerData ) \ REGISTER_METATYPE( HDBloodLeakData ) \ REGISTER_METATYPE( TDAirTrapData ) \ @@ -467,6 +476,9 @@ REGISTER_METATYPE( AdjustBloodPrimeRequestData ) \ REGISTER_METATYPE( AdjustBloodDialysateRequestData ) \ REGISTER_METATYPE( AdjustBolusVolumeRequestData ) \ + REGISTER_METATYPE( AdjustHDFStateRequestData ) \ + REGISTER_METATYPE( AdjustAutoSubRequestData ) \ + REGISTER_METATYPE( AdjustHDFRequestData ) \ REGISTER_METATYPE( AdjustDurationEditRequestData ) \ REGISTER_METATYPE( AdjustDurationConfirmRequestData ) \ REGISTER_METATYPE( AdjustSetPointsRequestData ) \ @@ -475,6 +487,7 @@ REGISTER_METATYPE( AdjustDialysateFlowRateRequestData ) \ REGISTER_METATYPE( AdjustDialysateTemperatureRequestData ) \ REGISTER_METATYPE( AdjustUltrafiltrationStateRequestData ) \ + REGISTER_METATYPE( AdjustIsolatedUFStateRequestData ) \ REGISTER_METATYPE( AdjustUltrafiltrationEditRequestData ) \ REGISTER_METATYPE( AdjustUltrafiltrationConfirmRequestData ) \ REGISTER_METATYPE( AdjustIsolatedUFDurationEditRequestData ) \ @@ -487,6 +500,7 @@ REGISTER_METATYPE( AdjustRecirculateRequestData ) \ REGISTER_METATYPE( AdjustTreatmentEndRequestData ) \ REGISTER_METATYPE( AdjustPressuresLimitsRequestData ) \ + REGISTER_METATYPE( AdjustDryBicartDisconnectRequestData ) \ REGISTER_METATYPE( AdjustPressuresWideningRequestData ) \ REGISTER_METATYPE( AdjustVersionsResponseData ) \ REGISTER_METATYPE( AdjustVersionsRequestData ) \ @@ -527,6 +541,7 @@ REGISTER_METATYPE( AdjustDialysateFlowRateResponseData ) \ REGISTER_METATYPE( AdjustDialysateTemperatureResponseData ) \ REGISTER_METATYPE( AdjustUltrafiltrationStateResponseData ) \ + REGISTER_METATYPE( AdjustIsolatedUFStateResponseData ) \ REGISTER_METATYPE( AdjustUltrafiltrationEditResponseData ) \ REGISTER_METATYPE( AdjustUltrafiltrationConfirmResponseData ) \ REGISTER_METATYPE( AdjustIsolatedUFDurationEditResponseData ) \ @@ -535,11 +550,15 @@ REGISTER_METATYPE( AdjustSalineResponseData ) \ REGISTER_METATYPE( AdjustVitalsResponseData ) \ REGISTER_METATYPE( AdjustHeparinResponseData ) \ + REGISTER_METATYPE( AdjustDryBicartDisconnectResponseData ) \ REGISTER_METATYPE( AdjustRinsebackResponseData ) \ REGISTER_METATYPE( AdjustRecirculateResponseData ) \ REGISTER_METATYPE( AdjustTreatmentEndResponseData ) \ REGISTER_METATYPE( AdjustPressuresLimitsResponseData ) \ REGISTER_METATYPE( AdjustPressuresWideningResponseData ) \ + REGISTER_METATYPE( AdjustHDFResponseData ) \ + REGISTER_METATYPE( AdjustHDFStateResponseData ) \ + REGISTER_METATYPE( AdjustAutoSubResponseData ) \ REGISTER_METATYPE( AdjustVersionsTDRequestData ) \ REGISTER_METATYPE( AdjustVersionsTDResponseData ) \ REGISTER_METATYPE( AdjustVersionsDDResponseData ) \ @@ -609,15 +628,17 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentRangesData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentSalineData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentVitalsData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentHDFData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentHeparinData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentDryBicartDisconnectData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentRinsebackData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentRecirculateData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentBloodPrimeData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentStopData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentUltrafiltrationData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentIsolatedUFData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentParametersSetPointData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDSyringePumpData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TDSyringePumpData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDAccelerometerData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDBloodLeakData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TDAirBubbleData ) \ @@ -704,6 +725,7 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDialysateFlowRateResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDialysateTemperatureResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationStateResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustIsolatedUFStateResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationEditResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationConfirmResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustIsolatedUFDurationEditResponseData ) \ @@ -712,11 +734,15 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustSalineResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustVitalsResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustHeparinResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDryBicartDisconnectResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustRinsebackResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustRecirculateResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustTreatmentEndResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustPressuresLimitsResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustPressuresWideningResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustHDFResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustHDFStateResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustAutoSubResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsTDRequestData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsTDResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsDDResponseData ) \ @@ -750,13 +776,16 @@ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustBloodPrimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustBloodDialysateRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustBolusVolumeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustHDFStateRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustAutoSubRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustHDFRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDurationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDurationConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustSetPointsRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustVitalsAlarmLimitsRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustBloodFlowRateRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDialysateFlowRateRequestData ) \ - ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDialysateTemperatureRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustIsolatedUFStateRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationStateRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationConfirmRequestData ) \ @@ -770,6 +799,7 @@ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustRecirculateRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustTreatmentEndRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustPressuresLimitsRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDryBicartDisconnectRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustPressuresWideningRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsResponseData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsRequestData ) \ @@ -859,15 +889,17 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentRangesData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentSalineData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentVitalsData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentHDFData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentHeparinData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentDryBicartDisconnectData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentRinsebackData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentRecirculateData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentBloodPrimeData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentStopData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentUltrafiltrationData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentIsolatedUFData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentParametersSetPointData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( HDSyringePumpData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( TDSyringePumpData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( HDAccelerometerData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( HDBloodLeakData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TDAirBubbleData ) \ @@ -954,6 +986,7 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDialysateFlowRateResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDialysateTemperatureResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustUltrafiltrationStateResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustIsolatedUFStateResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustUltrafiltrationEditResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustUltrafiltrationConfirmResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustIsolatedUFDurationEditResponseData ) \ @@ -962,11 +995,15 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustSalineResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustVitalsResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustHeparinResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDryBicartDisconnectResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustRinsebackResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustRecirculateResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustTreatmentEndResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustPressuresLimitsResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustPressuresWideningResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustHDFResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustHDFStateResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustAutoSubResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustVersionsTDRequestData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustVersionsTDResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustVersionsDDResponseData ) \ @@ -1022,6 +1059,9 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustBloodPrimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustBloodDialysateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustBolusVolumeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustHDFStateRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustAutoSubRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustHDFRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDurationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDurationConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustSetPointsRequestData ) \ @@ -1030,6 +1070,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDialysateFlowRateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDialysateTemperatureRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustUltrafiltrationStateRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustIsolatedUFStateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustUltrafiltrationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustUltrafiltrationConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustIsolatedUFDurationEditRequestData ) \ @@ -1042,6 +1083,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustRecirculateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustTreatmentEndRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustPressuresLimitsRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDryBicartDisconnectRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustPressuresWideningRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustVersionsResponseData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustVersionsRequestData ) \ @@ -1097,6 +1139,9 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustBloodPrimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustBloodDialysateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustBolusVolumeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustHDFStateRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustAutoSubRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustHDFRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDurationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDurationConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustSetPointsRequestData ) \ @@ -1105,6 +1150,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDialysateFlowRateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDialysateTemperatureRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustUltrafiltrationStateRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustIsolatedUFStateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustUltrafiltrationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustUltrafiltrationConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustIsolatedUFDurationEditRequestData ) \ @@ -1117,6 +1163,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustRecirculateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustTreatmentEndRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustPressuresLimitsRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDryBicartDisconnectRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustPressuresWideningRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustVersionsResponseData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustVersionsRequestData ) \ @@ -1172,6 +1219,9 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustBloodPrimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustBloodDialysateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustBolusVolumeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustHDFStateRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustAutoSubRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustHDFRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDurationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDurationConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustSetPointsRequestData ) \ @@ -1180,12 +1230,14 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDialysateFlowRateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDialysateTemperatureRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustUltrafiltrationStateRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustIsolatedUFStateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustUltrafiltrationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustUltrafiltrationConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustIsolatedUFDurationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustIsolatedUFVolumeEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustIsolatedUFConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustPressuresLimitsRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDryBicartDisconnectRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustPressuresWideningRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustSalineRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustVitalsRequestData ) \ @@ -1243,15 +1295,17 @@ ACTION_RECEIVE_SIGNAL( TreatmentRangesData ) \ ACTION_RECEIVE_SIGNAL( TreatmentSalineData ) \ ACTION_RECEIVE_SIGNAL( TreatmentVitalsData ) \ + ACTION_RECEIVE_SIGNAL( TreatmentHDFData ) \ ACTION_RECEIVE_SIGNAL( TreatmentHeparinData ) \ + ACTION_RECEIVE_SIGNAL( TreatmentDryBicartDisconnectData ) \ ACTION_RECEIVE_SIGNAL( TreatmentRinsebackData ) \ ACTION_RECEIVE_SIGNAL( TreatmentRecirculateData ) \ ACTION_RECEIVE_SIGNAL( TreatmentBloodPrimeData ) \ ACTION_RECEIVE_SIGNAL( TreatmentStopData ) \ ACTION_RECEIVE_SIGNAL( TreatmentUltrafiltrationData ) \ ACTION_RECEIVE_SIGNAL( TreatmentIsolatedUFData ) \ ACTION_RECEIVE_SIGNAL( TreatmentParametersSetPointData ) \ - ACTION_RECEIVE_SIGNAL( HDSyringePumpData ) \ + ACTION_RECEIVE_SIGNAL( TDSyringePumpData ) \ ACTION_RECEIVE_SIGNAL( HDAccelerometerData ) \ ACTION_RECEIVE_SIGNAL( HDBloodLeakData ) \ ACTION_RECEIVE_SIGNAL( TDAirTrapData ) \ @@ -1339,6 +1393,7 @@ ACTION_RECEIVE_SIGNAL( AdjustDialysateFlowRateResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustDialysateTemperatureResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustUltrafiltrationStateResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustIsolatedUFStateResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustUltrafiltrationEditResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustUltrafiltrationConfirmResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustIsolatedUFDurationEditResponseData ) \ @@ -1347,11 +1402,15 @@ ACTION_RECEIVE_SIGNAL( AdjustSalineResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustVitalsResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustHeparinResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustDryBicartDisconnectResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustRinsebackResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustRecirculateResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustTreatmentEndResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustPressuresLimitsResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustPressuresWideningResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustHDFResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustHDFStateResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustAutoSubResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustVersionsTDRequestData ) \ ACTION_RECEIVE_SIGNAL( AdjustVersionsTDResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustVersionsDDResponseData ) \ Index: sources/view/VView.h =================================================================== diff -u -rb110ee732fe1306669f71d9c17ed4714e1f03ee2 -r9b81b18319ff46f1e48d5637a6a8938d2f7735c9 --- sources/view/VView.h (.../VView.h) (revision b110ee732fe1306669f71d9c17ed4714e1f03ee2) +++ sources/view/VView.h (.../VView.h) (revision 9b81b18319ff46f1e48d5637a6a8938d2f7735c9) @@ -147,6 +147,7 @@ REGISTER_TYPE( VInstitutionalRecord ) \ REGISTER_TYPE( VAdjustmentAdvancedInstitutionalRecord ) \ REGISTER_TYPE( VAdvancedInstitutionalRecord ) \ + REGISTER_TYPE( VCalibrationSettings ) \ /* Alarm */ \ REGISTER_TYPE( VAlarmStatus ) \ REGISTER_TYPE( VAlarmActiveList ) \ @@ -168,14 +169,15 @@ REGISTER_TYPE( VTreatmentRanges ) \ REGISTER_TYPE( VTreatmentSaline ) \ REGISTER_TYPE( VTreatmentHeparin ) \ + REGISTER_TYPE( VTreatmentDryBicartDisconnect ) \ /* End-Treatment */ \ REGISTER_TYPE( VTreatmentRinseback ) \ REGISTER_TYPE( VTreatmentRecirculate ) \ REGISTER_TYPE( VTreatmentBloodPrime ) \ REGISTER_TYPE( VTreatmentStop ) \ /* Device - Data */ \ REGISTER_TYPE( VHDAccelerometer ) \ - REGISTER_TYPE( VHDSyringePump ) \ + REGISTER_TYPE( VTDSyringePump ) \ REGISTER_TYPE( VHDBloodLeak ) \ REGISTER_TYPE( VTDAirBubble ) \ REGISTER_TYPE( VTDAirPump ) \ @@ -249,8 +251,14 @@ REGISTER_TYPE( VTreatmentAdjustmentIsolatedUFConfirm ) \ REGISTER_TYPE( VTreatmentAdjustmentIsolatedUFDurationEdit ) \ REGISTER_TYPE( VTreatmentAdjustmentIsolatedUFVolumeEdit ) \ + REGISTER_TYPE( VTreatmentAdjustmentIsolatedUFState ) \ REGISTER_TYPE( VTreatmentAdjustmentSetPoints ) \ REGISTER_TYPE( VTreatmentAdjustmentVitalsAlarmLimits ) \ + REGISTER_TYPE( VTreatmentHDF ) \ + REGISTER_TYPE( VTreatmentAdjustmentAutoSub ) \ + REGISTER_TYPE( VTreatmentAdjustmentHDFState ) \ + REGISTER_TYPE( VTreatmentAdjustmentHDF ) \ + REGISTER_TYPE( VTreatmentAdjustmentDryBicartDisconnect ) \ REGISTER_TYPE( VTreatmentCreate ) \ REGISTER_TYPE( VTreatmentIsolatedUF ) \ REGISTER_TYPE( VTreatmentTrends ) \