Index: leahi.pro =================================================================== diff -u -r8350b02fa06da7cb6d7f085f88f55bf505ae78df -r5e5c936f26d0dd06c89e9fd32de5775a37b52493 --- leahi.pro (.../leahi.pro) (revision 8350b02fa06da7cb6d7f085f88f55bf505ae78df) +++ leahi.pro (.../leahi.pro) (revision 5e5c936f26d0dd06c89e9fd32de5775a37b52493) @@ -182,6 +182,11 @@ sources/model/td/adjustment/settings/MAdjustTDVersionsRequest.h \ sources/model/td/adjustment/settings/MAdjustTDVersionsResponse.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 \ @@ -197,6 +202,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 \ @@ -219,6 +226,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 \ @@ -266,7 +274,10 @@ sources/view/settings/VAdjustmentAdvancedInstitutionalRecord.h \ sources/view/settings/VAdvancedInstitutionalRecord.h \ sources/view/settings/VCalibrationSettings.h \ - sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresWidening.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 \ @@ -279,10 +290,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 \ @@ -303,6 +317,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 \ @@ -394,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 \ @@ -488,7 +503,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 \ @@ -557,6 +571,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 \ @@ -569,8 +588,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 \ @@ -699,7 +721,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 \ @@ -747,7 +768,10 @@ sources/view/settings/VAdjustmentAdvancedInstitutionalRecord.cpp \ sources/view/settings/VAdvancedInstitutionalRecord.cpp \ sources/view/settings/VCalibrationSettings.cpp \ - sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresWidening.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 \ @@ -760,10 +784,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 \ @@ -784,6 +811,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 \ @@ -846,7 +875,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 -rdf61c476838011a343a6930fd5b30404629379bc -r5e5c936f26d0dd06c89e9fd32de5775a37b52493 --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision df61c476838011a343a6930fd5b30404629379bc) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 5e5c936f26d0dd06c89e9fd32de5775a37b52493) @@ -1177,7 +1177,321 @@ actionTransmit(GuiActionType::ID_ResetHDInServiceModeReq, mData); } +/*! + * \brief MessageDispatcher::onAdjustment + * \details This method transmits the DD DD Calibration Pressure record request to DD. + * \param vData - + * \return void + */ +void MessageDispatcher::onAdjustment(const DDCalibrationPressureRequestData &vData) +{ + QVariantList mData; + mData += vData.mIndex; + actionTransmit(GuiActionType::ID_DDCalibrationPressureReq, mData); +} +/*! + * \brief MessageDispatcher::onAdjustment + * \details This method transmits adjusting the DD Calibration Pressure record request to DD. + * \param vData - + * \return void + */ +void MessageDispatcher::onAdjustment(const AdjustDDCalibrationPressureRequestData &vData) +{ + QVariantList mData ; + mData += vData.mIndex ; + mData += vData.mGain ; + mData += vData.mOffset ; + mData += vData.mCalibrationTime ; + + actionTransmit(GuiActionType::ID_AdjustDDCalibrationPressureReq, mData); +} + +/*! + * \brief MessageDispatcher::onAdjustment + * \details This method transmits adjusting the DD Calibration Pressure record request to DD. + * \param vData - + * \return void + */ +void MessageDispatcher::onAdjustment(const DDCalibrationTemperatureRequestData &vData) +{ + QVariantList mData ; + mData += vData.mIndex ; + + actionTransmit(GuiActionType::ID_DDCalibrationTemperatureReq, mData); +} + +/*! + * \brief MessageDispatcher::onAdjustment + * \details This method transmits adjusting the DD Calibration Pressure record request to DD. + * \param vData - + * \return void + */ +void MessageDispatcher::onAdjustment(const AdjustDDCalibrationTemperatureRequestData &vData) +{ + QVariantList mData ; + mData += vData.mIndex ; + mData += vData.mGain ; + mData += vData.mOffset ; + mData += vData.mCalibrationTime ; + + actionTransmit(GuiActionType::ID_AdjustDDCalibrationTemperatureReq, mData); +} + +/*! + * \brief MessageDispatcher::onAdjustment + * \details This method transmits adjusting the DD Calibration Pressure record request to DD. + * \param vData - + * \return void + */ +void MessageDispatcher::onAdjustment(const DDCalibrationConcentratePumpRequestData &vData) +{ + QVariantList mData ; + mData += vData.mIndex ; + + actionTransmit(GuiActionType::ID_DDCalibrationConcentratePumpReq, mData); +} + +/*! + * \brief MessageDispatcher::onAdjustment + * \details This method transmits adjusting the DD Calibration Pressure record request to DD. + * \param vData - + * \return void + */ +void MessageDispatcher::onAdjustment(const AdjustDDCalibrationConcentratePumpRequestData &vData) +{ + QVariantList mData ; + mData += vData.mIndex ; + mData += vData.mGain ; + mData += vData.mOffset ; + mData += vData.mCalibrationTime ; + + actionTransmit(GuiActionType::ID_AdjustDDCalibrationConcentratePumpReq, mData); +} + +/*! + * \brief MessageDispatcher::onAdjustment + * \details This method transmits adjusting the DD Calibration Pressure record request to DD. + * \param vData - + * \return void + */ +void MessageDispatcher::onAdjustment(const DDCalibrationD12DialysatePumpRequestData &) +{ + QVariantList mData ; + + actionTransmit(GuiActionType::ID_DDCalibrationD12DialysatePumpReq, mData); +} + +/*! + * \brief MessageDispatcher::onAdjustment + * \details This method transmits adjusting the DD Calibration Pressure record request to DD. + * \param vData - + * \return void + */ +void MessageDispatcher::onAdjustment(const AdjustDDCalibrationD12DialysatePumpRequestData &vData) +{ + QVariantList mData ; + mData += vData.mTargetPumpSpeed ; + mData += vData.mCalibrationTime ; + + actionTransmit(GuiActionType::ID_AdjustDDCalibrationD12DialysatePumpReq, mData); +} + +/*! + * \brief MessageDispatcher::onAdjustment + * \details This method transmits adjusting the DD Calibration Pressure record request to DD. + * \param vData - + * \return void + */ +void MessageDispatcher::onAdjustment(const DDCalibrationD48DialysatePumpRequestData &) +{ + QVariantList mData ; + + actionTransmit(GuiActionType::ID_DDCalibrationD48DialysatePumpReq, mData); +} + +/*! + * \brief MessageDispatcher::onAdjustment + * \details This method transmits adjusting the DD Calibration Pressure record request to DD. + * \param vData - + * \return void + */ +void MessageDispatcher::onAdjustment(const AdjustDDCalibrationD48DialysatePumpRequestData &vData) +{ + QVariantList mData ; + mData += vData.mGain ; + mData += vData.mOffset ; + mData += vData.mCalibrationTime ; + + actionTransmit(GuiActionType::ID_AdjustDDCalibrationD48DialysatePumpReq, mData); +} + +/*! + * \brief MessageDispatcher::onAdjustment + * \details This method transmits adjusting the DD Calibration Pressure record request to DD. + * \param vData - + * \return void + */ +void MessageDispatcher::onAdjustment(const DDCalibrationAcidConcentratesRequestData &vData) +{ + QVariantList mData ; + mData += vData.mIndex ; + + actionTransmit(GuiActionType::ID_DDCalibrationAcidConcentratesReq, mData); +} + +/*! + * \brief MessageDispatcher::onAdjustment + * \details This method transmits adjusting the DD Calibration Pressure record request to DD. + * \param vData - + * \return void + */ +void MessageDispatcher::onAdjustment(const AdjustDDCalibrationAcidConcentratesRequestData &vData) +{ + QVariantList mData ; + mData += vData.mIndex ; + mData += vData.mAcidConcMixRatio ; + mData += vData.mAcidFullBottleVolumeML ; + mData += vData.mAcidConductivityUSPerCM ; + mData += vData.mAcidBottleTemperature ; + mData += vData.mCalibrationTime ; + + actionTransmit(GuiActionType::ID_AdjustDDCalibrationAcidConcentratesReq, mData); +} + +/*! + * \brief MessageDispatcher::onAdjustment + * \details This method transmits adjusting the DD Calibration Pressure record request to DD. + * \param vData - + * \return void + */ +void MessageDispatcher::onAdjustment(const DDCalibrationBicarbConcentratesRequestData &vData) +{ + QVariantList mData ; + mData += vData.mIndex ; + + actionTransmit(GuiActionType::ID_DDCalibrationBicarbConcentratesReq, mData); +} + +/*! + * \brief MessageDispatcher::onAdjustment + * \details This method transmits adjusting the DD Calibration Pressure record request to DD. + * \param vData - + * \return void + */ +void MessageDispatcher::onAdjustment(const AdjustDDCalibrationBicarbConcentratesRequestData &vData) +{ + QVariantList mData ; + mData += vData.mIndex ; + mData += vData.mBicarbConcMixRatio ; + mData += vData.mBicarbStartVolumeML ; + mData += vData.mBicarbConductivityUSPerCM ; + mData += vData.mBicarbBottleTemperature ; + mData += vData.mCalibrationTime ; + + actionTransmit(GuiActionType::ID_AdjustDDCalibrationBicarbConcentratesReq, mData); +} + +/*! + * \brief MessageDispatcher::onAdjustment + * \details This method transmits adjusting the DD Calibration Pressure record request to DD. + * \param vData - + * \return void + */ +void MessageDispatcher::onAdjustment(const DDCalibrationAccelerometerSensorRequestData &) +{ + QVariantList mData ; + + actionTransmit(GuiActionType::ID_DDCalibrationAccelerometerSensorReq, mData); +} + +/*! + * \brief MessageDispatcher::onAdjustment + * \details This method transmits adjusting the DD Calibration Pressure record request to DD. + * \param vData - + * \return void + */ +void MessageDispatcher::onAdjustment(const AdjustDDCalibrationAccelerometerSensorRequestData &vData) +{ + QVariantList mData ; + mData += vData.mAccelXOffset ; + mData += vData.mAccelYOffset ; + mData += vData.mAccelZOffset ; + mData += vData.mCalibrationTime ; + + actionTransmit(GuiActionType::ID_AdjustDDCalibrationAccelerometerSensorReq, mData); +} + +/*! + * \brief MessageDispatcher::onAdjustment + * \details This method transmits adjusting the DD Calibration Pressure record request to DD. + * \param vData - + * \return void + */ +void MessageDispatcher::onAdjustment(const DDCalibrationBloodLeakSensorRequestData &) +{ + QVariantList mData ; + + actionTransmit(GuiActionType::ID_DDCalibrationBloodLeakSensorReq, mData); +} + +/*! + * \brief MessageDispatcher::onAdjustment + * \details This method transmits adjusting the DD Calibration Pressure record request to DD. + * \param vData - + * \return void + */ +void MessageDispatcher::onAdjustment(const AdjustDDCalibrationBloodLeakSensorRequestData &vData) +{ + QVariantList mData ; + mData += vData.mSetPoint ; + mData += vData.mCalibrationTime ; + + actionTransmit(GuiActionType::ID_AdjustDDCalibrationBloodLeakSensorReq, mData); +} + +/*! + * \brief MessageDispatcher::onAdjustment + * \details This method transmits adjusting the DD Calibration Pressure record request to DD. + * \param vData - + * \return void + */ +void MessageDispatcher::onAdjustment(const DDCalibrationConductivityRequestData &vData) +{ + QVariantList mData ; + mData += vData.mIndex ; + + actionTransmit(GuiActionType::ID_DDCalibrationConductivitySensorReq, mData); +} + +/*! + * \brief MessageDispatcher::onAdjustment + * \details This method transmits adjusting the DD Calibration Pressure record request to DD. + * \param vData - + * \return void + */ +void MessageDispatcher::onAdjustment(const AdjustDDCalibrationConductivityRequestData &vData) +{ + QVariantList mData ; + mData += vData.mIndex ; + mData += vData.mKHigh ; + mData += vData.mAlphaHigh ; + mData += vData.mEtaHigh ; + mData += vData.mZetahigh ; + mData += vData.mKLow ; + mData += vData.mAlphaLow ; + mData += vData.mEtaLow ; + mData += vData.mZetaLow ; + mData += vData.mBeta ; + mData += vData.mDelta ; + mData += vData.mReserved1 ; + mData += vData.mReserved2 ; + mData += vData.mCalibrationTime ; + + actionTransmit(GuiActionType::ID_AdjustDDCalibrationConductivitySensorReq, mData); +} + + // ---------------------------------------------------------------------------------------------------- /*! Index: sources/canbus/MessageDispatcher.h =================================================================== diff -u -rdf61c476838011a343a6930fd5b30404629379bc -r5e5c936f26d0dd06c89e9fd32de5775a37b52493 --- sources/canbus/MessageDispatcher.h (.../MessageDispatcher.h) (revision df61c476838011a343a6930fd5b30404629379bc) +++ sources/canbus/MessageDispatcher.h (.../MessageDispatcher.h) (revision 5e5c936f26d0dd06c89e9fd32de5775a37b52493) @@ -186,7 +186,27 @@ GuiActionType::ID_TreatmentLogAvrgeData , GuiActionType::ID_TreatmentLogAlarmData , GuiActionType::ID_TreatmentLogEventData , - + //Calibration + GuiActionType::ID_DDCalibrationPressureReq , + GuiActionType::ID_AdjustDDCalibrationPressureReq , + GuiActionType::ID_DDCalibrationTemperatureReq , + GuiActionType::ID_AdjustDDCalibrationTemperatureReq , + GuiActionType::ID_DDCalibrationConcentratePumpReq , + GuiActionType::ID_AdjustDDCalibrationConcentratePumpReq , + GuiActionType::ID_DDCalibrationD12DialysatePumpReq , + GuiActionType::ID_AdjustDDCalibrationD12DialysatePumpReq, + GuiActionType::ID_DDCalibrationD48DialysatePumpReq , + GuiActionType::ID_AdjustDDCalibrationD48DialysatePumpReq, + GuiActionType::ID_DDCalibrationAcidConcentratesReq , + GuiActionType::ID_AdjustDDCalibrationAcidConcentratesReq, + GuiActionType::ID_DDCalibrationBicarbConcentratesReq , + GuiActionType::ID_AdjustDDCalibrationBicarbConcentratesReq, + GuiActionType::ID_DDCalibrationAccelerometerSensorReq , + GuiActionType::ID_AdjustDDCalibrationAccelerometerSensorReq, + GuiActionType::ID_DDCalibrationBloodLeakSensorReq , + GuiActionType::ID_AdjustDDCalibrationBloodLeakSensorReq , + GuiActionType::ID_DDCalibrationConductivitySensorReq , + GuiActionType::ID_AdjustDDCalibrationConductivitySensorReq, // HD reset request in service mode GuiActionType::ID_ResetHDInServiceModeReq , }; Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -rdf61c476838011a343a6930fd5b30404629379bc -r5e5c936f26d0dd06c89e9fd32de5775a37b52493 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision df61c476838011a343a6930fd5b30404629379bc) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 5e5c936f26d0dd06c89e9fd32de5775a37b52493) @@ -376,6 +376,67 @@ // HD reset request in service mode {Gui::GuiActionType::ID_ResetHDInServiceModeReq , 0 * 4 }, // 0 parameters each 4bytes + + // DD calibration + {Gui::GuiActionType::ID_DDCalibrationPressureReq , 1 * 4 }, // 1 parameter each 4 bytes + {Gui::GuiActionType::ID_DDCalibrationPressureRsp , 6 * 4 }, // 6 parameters each 4 bytes + + {Gui::GuiActionType::ID_AdjustDDCalibrationPressureReq , 4 * 4 }, // 4 parameters each 4 bytes + {Gui::GuiActionType::ID_AdjustDDCalibrationPressureRsp , 6 * 4 }, // 6 parameters each 4 bytes + + {Gui::GuiActionType::ID_DDCalibrationTemperatureReq , 1 * 4 }, // 1 parameter each 4 bytes + {Gui::GuiActionType::ID_DDCalibrationTemperatureRsp , 6 * 4 }, // 6 parameters each 4 bytes + + {Gui::GuiActionType::ID_AdjustDDCalibrationTemperatureReq , 4 * 4 }, // 4 parameters each 4 bytes + {Gui::GuiActionType::ID_AdjustDDCalibrationTemperatureRsp , 6 * 4 }, // 6 parameters each 4 bytes + + {Gui::GuiActionType::ID_DDCalibrationConcentratePumpReq , 1 * 4 }, // 1 parameter each 4 bytes + {Gui::GuiActionType::ID_DDCalibrationConcentratePumpRsp , 6 * 4 }, // 6 parameters each 4 bytes + + {Gui::GuiActionType::ID_AdjustDDCalibrationConcentratePumpReq , 4 * 4 }, // 4 parameters each 4 bytes + {Gui::GuiActionType::ID_AdjustDDCalibrationConcentratePumpRsp , 6 * 4 }, // 6 parameters each 4 bytes + + {Gui::GuiActionType::ID_DDCalibrationD12DialysatePumpReq , 0 * 4 }, // 0 parameter each 4 bytes + {Gui::GuiActionType::ID_DDCalibrationD12DialysatePumpRsp , 4 * 4 }, // 4 parameters each 4 bytes + + {Gui::GuiActionType::ID_AdjustDDCalibrationD12DialysatePumpReq , 2 * 4 }, // 2 parameters each 4 bytes + {Gui::GuiActionType::ID_AdjustDDCalibrationD12DialysatePumpRsp , 4 * 4 }, // 4 parameters each 4 bytes + + {Gui::GuiActionType::ID_DDCalibrationD48DialysatePumpReq , 0 * 4 }, // 0 parameter each 4 bytes + {Gui::GuiActionType::ID_DDCalibrationD48DialysatePumpRsp , 5 * 4 }, // 5 parameters each 4 bytes + + {Gui::GuiActionType::ID_AdjustDDCalibrationD48DialysatePumpReq , 3 * 4 }, // 3 parameters each 4 bytes + {Gui::GuiActionType::ID_AdjustDDCalibrationD48DialysatePumpRsp , 5 * 4 }, // 1 parameter each 4 bytes + + {Gui::GuiActionType::ID_DDCalibrationAcidConcentratesReq , 1 * 4 }, // 1 parameter each 4 bytes + {Gui::GuiActionType::ID_DDCalibrationAcidConcentratesRsp , 8 * 4 }, // 8 parameters each 4 bytes + + {Gui::GuiActionType::ID_AdjustDDCalibrationAcidConcentratesReq , 6 * 4 }, // 6 parameters each 4 bytes + {Gui::GuiActionType::ID_AdjustDDCalibrationAcidConcentratesRsp , 8 * 4 }, // 8 parameters each 4 bytes + + {Gui::GuiActionType::ID_DDCalibrationBicarbConcentratesReq , 1 * 4 }, // 1 parameter each 4 bytes + {Gui::GuiActionType::ID_DDCalibrationBicarbConcentratesRsp , 8 * 4 }, // 8 parameters each 4 bytes + + {Gui::GuiActionType::ID_AdjustDDCalibrationBicarbConcentratesReq , 6 * 4 }, // 6 parameters each 4 bytes + {Gui::GuiActionType::ID_AdjustDDCalibrationBicarbConcentratesRsp , 8 * 4 }, // 8 parameters each 4 bytes + + {Gui::GuiActionType::ID_DDCalibrationAccelerometerSensorReq , 0 * 4 }, // 0 parameter each 4 bytes + {Gui::GuiActionType::ID_DDCalibrationAccelerometerSensorRsp , 6 * 4 }, // 6 parameters each 4 bytes + + {Gui::GuiActionType::ID_AdjustDDCalibrationAccelerometerSensorReq, 4 * 4 }, // 4 parameters each 4 bytes + {Gui::GuiActionType::ID_AdjustDDCalibrationAccelerometerSensorRsp, 6 * 4 }, // 6 parameters each 4 bytes + + {Gui::GuiActionType::ID_DDCalibrationBloodLeakSensorReq , 0 * 4 }, // 0 parameter each 4 bytes + {Gui::GuiActionType::ID_DDCalibrationBloodLeakSensorRsp , 4 * 4 }, // 4 parameters each 4 bytes + + {Gui::GuiActionType::ID_AdjustDDCalibrationBloodLeakSensorReq , 2 * 4 }, // 2 parameters each 4 bytes + {Gui::GuiActionType::ID_AdjustDDCalibrationBloodLeakSensorRsp , 4 * 4 }, // 4 parameters each 4 bytes + + {Gui::GuiActionType::ID_DDCalibrationConductivitySensorReq , 1 * 4 }, // 1 parameter each 4 bytes + {Gui::GuiActionType::ID_DDCalibrationConductivitySensorRsp , 16 * 4 }, // 16 parameters each 4 bytes + + {Gui::GuiActionType::ID_AdjustDDCalibrationConductivitySensorReq , 14 * 4 }, // 14 parameters each 4 bytes + {Gui::GuiActionType::ID_AdjustDDCalibrationConductivitySensorRsp , 16 * 4 }, // 16 parameters each 4 bytes }; /*! Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -rdf61c476838011a343a6930fd5b30404629379bc -r5e5c936f26d0dd06c89e9fd32de5775a37b52493 --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision df61c476838011a343a6930fd5b30404629379bc) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 5e5c936f26d0dd06c89e9fd32de5775a37b52493) @@ -232,6 +232,27 @@ case Gui::GuiActionType::ID_InstitutionalRecordReq : INTERPRET_TRSMT_MT_MESSAGE(InstitutionalRequestData ); break; case Gui::GuiActionType::ID_AdjustAdvancedInstitutionalRecordReq : INTERPRET_TRANSMIT_MESSAGE(AdjustAdvancedInstitutionalRequestData ); break; case Gui::GuiActionType::ID_AdvancedInstitutionalRecordReq : INTERPRET_TRSMT_MT_MESSAGE(AdvancedInstitutionalRequestData ); break; + // Calibration + case Gui::GuiActionType::ID_DDCalibrationPressureReq : INTERPRET_TRANSMIT_MESSAGE(DDCalibrationPressureRequestData ); break; + case Gui::GuiActionType::ID_AdjustDDCalibrationPressureReq : INTERPRET_TRANSMIT_MESSAGE(AdjustDDCalibrationPressureRequestData ); break; + case Gui::GuiActionType::ID_DDCalibrationTemperatureReq : INTERPRET_TRANSMIT_MESSAGE(DDCalibrationTemperatureRequestData ); break; + case Gui::GuiActionType::ID_AdjustDDCalibrationTemperatureReq : INTERPRET_TRANSMIT_MESSAGE(AdjustDDCalibrationTemperatureRequestData ); break; + case Gui::GuiActionType::ID_DDCalibrationConcentratePumpReq : INTERPRET_TRANSMIT_MESSAGE(DDCalibrationConcentratePumpRequestData ); break; + case Gui::GuiActionType::ID_AdjustDDCalibrationConcentratePumpReq : INTERPRET_TRANSMIT_MESSAGE(AdjustDDCalibrationConcentratePumpRequestData ); break; + case Gui::GuiActionType::ID_DDCalibrationD12DialysatePumpReq : INTERPRET_TRSMT_MT_MESSAGE(DDCalibrationD12DialysatePumpRequestData ); break; + case Gui::GuiActionType::ID_AdjustDDCalibrationD12DialysatePumpReq : INTERPRET_TRANSMIT_MESSAGE(AdjustDDCalibrationD12DialysatePumpRequestData ); break; + case Gui::GuiActionType::ID_DDCalibrationD48DialysatePumpReq : INTERPRET_TRSMT_MT_MESSAGE(DDCalibrationD48DialysatePumpRequestData ); break; + case Gui::GuiActionType::ID_AdjustDDCalibrationD48DialysatePumpReq : INTERPRET_TRANSMIT_MESSAGE(AdjustDDCalibrationD48DialysatePumpRequestData ); break; + case Gui::GuiActionType::ID_DDCalibrationAcidConcentratesReq : INTERPRET_TRANSMIT_MESSAGE(DDCalibrationAcidConcentratesRequestData ); break; + case Gui::GuiActionType::ID_AdjustDDCalibrationAcidConcentratesReq : INTERPRET_TRANSMIT_MESSAGE(AdjustDDCalibrationAcidConcentratesRequestData ); break; + case Gui::GuiActionType::ID_DDCalibrationBicarbConcentratesReq : INTERPRET_TRANSMIT_MESSAGE(DDCalibrationBicarbConcentratesRequestData ); break; + case Gui::GuiActionType::ID_AdjustDDCalibrationBicarbConcentratesReq: INTERPRET_TRANSMIT_MESSAGE(AdjustDDCalibrationBicarbConcentratesRequestData ); break; + case Gui::GuiActionType::ID_DDCalibrationAccelerometerSensorReq : INTERPRET_TRSMT_MT_MESSAGE(DDCalibrationAccelerometerSensorRequestData ); break; + case Gui::GuiActionType::ID_AdjustDDCalibrationAccelerometerSensorReq: INTERPRET_TRANSMIT_MESSAGE(AdjustDDCalibrationAccelerometerSensorRequestData ); break; + case Gui::GuiActionType::ID_DDCalibrationBloodLeakSensorReq : INTERPRET_TRSMT_MT_MESSAGE(DDCalibrationBloodLeakSensorRequestData ); break; + case Gui::GuiActionType::ID_AdjustDDCalibrationBloodLeakSensorReq : INTERPRET_TRANSMIT_MESSAGE(AdjustDDCalibrationBloodLeakSensorRequestData ); break; + case Gui::GuiActionType::ID_DDCalibrationConductivitySensorReq : INTERPRET_TRANSMIT_MESSAGE(DDCalibrationConductivityRequestData ); break; + case Gui::GuiActionType::ID_AdjustDDCalibrationConductivitySensorReq: INTERPRET_TRANSMIT_MESSAGE(AdjustDDCalibrationConductivityRequestData ); break; // Pre-Treatment case Gui::GuiActionType::ID_AdjustInitTreatmentReq : INTERPRET_TRANSMIT_MESSAGE(AdjustInitTreatmentRequestData ); break; case Gui::GuiActionType::ID_AdjustParametersValidationReq : INTERPRET_TRANSMIT_MESSAGE(AdjustParametersValidationRequestData ); break; @@ -488,8 +509,7 @@ case Gui::GuiActionType::ID_AdjustAdvancedInstitutionalRecordRsp: ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustAdvancedInstitutionalRecordRsp); break; case Gui::GuiActionType::ID_AdvancedInstitutionalRecordRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdvancedInstitutionalRecordRsp ); break; - - // ----- States + // ----- States case Gui::GuiActionType::ID_TDOpModeData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_TDOpModeData ); break; case Gui::GuiActionType::ID_PreTreatmentStates : ok = notify(vMessage, vData, Gui::GuiActionType::ID_PreTreatmentStates ); break; case Gui::GuiActionType::ID_TreatmentStates : ok = notify(vMessage, vData, Gui::GuiActionType::ID_TreatmentStates ); break; @@ -660,22 +680,26 @@ /// // DD data messages - case Gui::GuiActionType::ID_DDGenDialysateData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDGenDialysateData ); break; - case Gui::GuiActionType::ID_DDConductivityData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDConductivityData ); break; - case Gui::GuiActionType::ID_DDConcentratePumpData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDConcentratePumpData ); break; - case Gui::GuiActionType::ID_DDDialysatePumpData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDDialysatePumpData ); break; - case Gui::GuiActionType::ID_DDHeatersData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDHeatersData ); break; - case Gui::GuiActionType::ID_DDTemperaturesData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDTemperaturesData ); break; - case Gui::GuiActionType::ID_DDPressuresData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDPressuresData ); break; - case Gui::GuiActionType::ID_DDLevelData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDLevelData ); break; - case Gui::GuiActionType::ID_DDBloodLeakData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDBloodLeakData ); break; - case Gui::GuiActionType::ID_DDValvesStatesData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDValvesStatesData ); break; + case Gui::GuiActionType::ID_DDGenDialysateData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDGenDialysateData ); break; + case Gui::GuiActionType::ID_DDConductivityData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDConductivityData ); break; + case Gui::GuiActionType::ID_DDConcentratePumpData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDConcentratePumpData ); break; + case Gui::GuiActionType::ID_DDDialysatePumpData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDDialysatePumpData ); break; + case Gui::GuiActionType::ID_DDHeatersData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDHeatersData ); break; + case Gui::GuiActionType::ID_DDTemperaturesData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDTemperaturesData ); break; + case Gui::GuiActionType::ID_DDPressuresData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDPressuresData ); break; + case Gui::GuiActionType::ID_DDLevelData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDLevelData ); break; + case Gui::GuiActionType::ID_DDBloodLeakData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDBloodLeakData ); break; + case Gui::GuiActionType::ID_DDValvesStatesData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDValvesStatesData ); break; - case Gui::GuiActionType::ID_AdjustDDDateTimeRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDDDateTimeRsp ); break; - case Gui::GuiActionType::ID_DDOperationModeData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDOperationModeData ); break; - case Gui::GuiActionType::ID_AdjustVersionsDDRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustVersionsDDRsp ); break; - case Gui::GuiActionType::ID_AdjustSerialDDRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustSerialDDRsp ); break; + case Gui::GuiActionType::ID_AdjustDDDateTimeRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDDDateTimeRsp ); break; + case Gui::GuiActionType::ID_DDOperationModeData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDOperationModeData ); break; + case Gui::GuiActionType::ID_AdjustVersionsDDRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustVersionsDDRsp ); break; + case Gui::GuiActionType::ID_AdjustSerialDDRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustSerialDDRsp ); break; + // ----- Calibration + case Gui::GuiActionType::ID_DDCalibrationPressureRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDCalibrationPressureRsp ); break; + case Gui::GuiActionType::ID_AdjustDDCalibrationPressureRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDDCalibrationPressureRsp); break; + default: break; //FIXME later enabled } Index: sources/gui/GuiGlobals.h =================================================================== diff -u -rdf61c476838011a343a6930fd5b30404629379bc -r5e5c936f26d0dd06c89e9fd32de5775a37b52493 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision df61c476838011a343a6930fd5b30404629379bc) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 5e5c936f26d0dd06c89e9fd32de5775a37b52493) @@ -381,7 +381,59 @@ ID_AdjustAdvancedInstitutionalRecordRsp = 0x8900, // 137 TD -> UI response institutional record // HD reset request in service mode - ID_ResetHDInServiceModeReq = 0xB900, // 185 UI -> HD reset in service mode + ID_ResetHDInServiceModeReq = 0xB90F, // 185 //// ----- @CRAPIZED: had to change to avoid duplication + + // DD Calibration + ID_DDCalibrationPressureReq = 0x1801, // 280 //// ----- @LEAHIZED + ID_DDCalibrationPressureRsp = 0x1901, // 281 //// ----- @LEAHIZED + ID_AdjustDDCalibrationPressureReq = 0x1A01, // 282 //// ----- @LEAHIZED + ID_AdjustDDCalibrationPressureRsp = 0x1B01, // 283 //// ----- @LEAHIZED + + ID_DDCalibrationTemperatureReq = 0x1C01, // 284 //// ----- @LEAHIZED + ID_DDCalibrationTemperatureRsp = 0x1D01, // 285 //// ----- @LEAHIZED + ID_AdjustDDCalibrationTemperatureReq = 0x1E01, // 286 //// ----- @LEAHIZED + ID_AdjustDDCalibrationTemperatureRsp = 0x1F01, // 287 //// ----- @LEAHIZED + + ID_DDCalibrationConcentratePumpReq = 0x2001, // 288 //// ----- @LEAHIZED + ID_DDCalibrationConcentratePumpRsp = 0x2101, // 289 //// ----- @LEAHIZED + ID_AdjustDDCalibrationConcentratePumpReq = 0x2201, // 290 //// ----- @LEAHIZED + ID_AdjustDDCalibrationConcentratePumpRsp = 0x2301, // 291 //// ----- @LEAHIZED + + ID_DDCalibrationD12DialysatePumpReq = 0x2401, // 292 //// ----- @LEAHIZED + ID_DDCalibrationD12DialysatePumpRsp = 0x2501, // 293 //// ----- @LEAHIZED + ID_AdjustDDCalibrationD12DialysatePumpReq = 0x2601, // 294 //// ----- @LEAHIZED + ID_AdjustDDCalibrationD12DialysatePumpRsp = 0x2701, // 295 //// ----- @LEAHIZED + + ID_DDCalibrationD48DialysatePumpReq = 0x2801, // 296 //// ----- @LEAHIZED + ID_DDCalibrationD48DialysatePumpRsp = 0x2901, // 297 //// ----- @LEAHIZED + ID_AdjustDDCalibrationD48DialysatePumpReq = 0x2A01, // 298 //// ----- @LEAHIZED + ID_AdjustDDCalibrationD48DialysatePumpRsp = 0x2B01, // 299 //// ----- @LEAHIZED + + ID_DDCalibrationAcidConcentratesReq = 0x2C01, // 300 //// ----- @LEAHIZED + ID_DDCalibrationAcidConcentratesRsp = 0x2D01, // 301 //// ----- @LEAHIZED + ID_AdjustDDCalibrationAcidConcentratesReq = 0x2E01, // 302 //// ----- @LEAHIZED + ID_AdjustDDCalibrationAcidConcentratesRsp = 0x2F01, // 303 //// ----- @LEAHIZED + + ID_DDCalibrationBicarbConcentratesReq = 0x3001, // 304 //// ----- @LEAHIZED + ID_DDCalibrationBicarbConcentratesRsp = 0x3101, // 305 //// ----- @LEAHIZED + ID_AdjustDDCalibrationBicarbConcentratesReq = 0x3201, // 306 //// ----- @LEAHIZED + ID_AdjustDDCalibrationBicarbConcentratesRsp = 0x3301, // 307 //// ----- @LEAHIZED + + ID_DDCalibrationAccelerometerSensorReq = 0x3401, // 308 //// ----- @LEAHIZED + ID_DDCalibrationAccelerometerSensorRsp = 0x3501, // 309 //// ----- @LEAHIZED + ID_AdjustDDCalibrationAccelerometerSensorReq= 0x3601, // 310 //// ----- @LEAHIZED + ID_AdjustDDCalibrationAccelerometerSensorRsp= 0x3701, // 311 //// ----- @LEAHIZED + + ID_DDCalibrationBloodLeakSensorReq = 0x3801, // 312 //// ----- @LEAHIZED + ID_DDCalibrationBloodLeakSensorRsp = 0x3901, // 313 //// ----- @LEAHIZED + ID_AdjustDDCalibrationBloodLeakSensorReq = 0x3A01, // 314 //// ----- @LEAHIZED + ID_AdjustDDCalibrationBloodLeakSensorRsp = 0x3B01, // 315 //// ----- @LEAHIZED + + ID_DDCalibrationConductivitySensorReq = 0x3C01, // 316 //// ----- @LEAHIZED + ID_DDCalibrationConductivitySensorRsp = 0x3D01, // 317 //// ----- @LEAHIZED + ID_AdjustDDCalibrationConductivitySensorReq = 0x3E01, // 318 //// ----- @LEAHIZED + ID_AdjustDDCalibrationConductivitySensorRsp = 0x3F01, // 319 //// ----- @LEAHIZED + }; enum class GuiActionsData_Enum /*: quint8 QML does not support*/ { @@ -470,6 +522,12 @@ Q_ENUM(DD_Disinfect_States) Q_ENUM(DD_Heat_UI_States) Q_ENUM(DD_Valves) + Q_ENUM(PressureSensors) + Q_ENUM(TemperatureSensors) + Q_ENUM(ConcentratePumps) + Q_ENUM(dd_acid_types) + Q_ENUM(dd_bicarb_types) + Q_ENUM(Conductivity_Sensors) #include "FPDefs.h" }; @@ -550,6 +608,12 @@ // DD Valves typedef GuiActions::DD_Valves GuiDDValves; + typedef GuiActions::PressureSensors GuiDDCalibrationPressure; + typedef GuiActions::TemperatureSensors GuiDDCalibrationTemperature; + typedef GuiActions::ConcentratePumps GuiDDCalibrationConcentratePump; + typedef GuiActions::dd_acid_types GuiDDCalibrationAcidType; + typedef GuiActions::dd_bicarb_types GuiDDCalibrationBicarbType; + typedef GuiActions::Conductivity_Sensors GuiDDCalibrationConductivitySensor; typedef QMap GuiStringIndexMap; typedef QPair GuiStringIndexMapItem; Index: sources/gui/qml/components/HeaderBar.qml =================================================================== diff -u -r290835d1a861d8fe7a716d061f0b079d9cfff75a -r5e5c936f26d0dd06c89e9fd32de5775a37b52493 --- sources/gui/qml/components/HeaderBar.qml (.../HeaderBar.qml) (revision 290835d1a861d8fe7a716d061f0b079d9cfff75a) +++ sources/gui/qml/components/HeaderBar.qml (.../HeaderBar.qml) (revision 5e5c936f26d0dd06c89e9fd32de5775a37b52493) @@ -115,6 +115,21 @@ text : vDateTime.time font.pixelSize : Fonts.fontHeaderbarTime font.weight : Font.DemiBold + + Text { id: _timeZone // TEST : Current timezone + color : Colors.textMain + anchors { + bottom : _timeText.bottom + left : _timeText.right + } + horizontalAlignment : Text.Alignleft + verticalAlignment : Text.AlignBottom + + height : 15 + width : _root.width / 5 + text : vDateTime.timezone + font.pixelSize: Fonts.fontHeaderbarTimezone + } } Text { id: _dateText @@ -129,22 +144,6 @@ } } - Text { id: _timeZone // TEST : Current timezone - color : Colors.textMain - anchors { - top : parent.top - left : parent.left - leftMargin : parent.width / 5 - } - horizontalAlignment : Text.Alignleft - verticalAlignment : Text.AlignBottom - - height : 15 - width : _root.width / 5 - text : vDateTime.timezone - font.pixelSize: Fonts.fontHeaderbarTimezone - } - MainMenu { id: _headerMenu anchors { left : _dateTimeItem.right Index: sources/gui/qml/main.qml =================================================================== diff -u -rdf61c476838011a343a6930fd5b30404629379bc -r5e5c936f26d0dd06c89e9fd32de5775a37b52493 --- sources/gui/qml/main.qml (.../main.qml) (revision df61c476838011a343a6930fd5b30404629379bc) +++ sources/gui/qml/main.qml (.../main.qml) (revision 5e5c936f26d0dd06c89e9fd32de5775a37b52493) @@ -359,14 +359,14 @@ QtObject { id: _colorMode readonly property color modeBackgroundColor : vSettings.darkMode ? Colors.panelBackground : Colors.offWhite - readonly property color modeBackgroundDialogColor : vSettings.darkMode ? Colors.darkModeBackground : Colors.offWhite + readonly property color modeBackgroundDialogColor : vSettings.darkMode ? Colors.panelBackground : Colors.offWhite readonly property color modeSelctedColor : vSettings.darkMode ? Colors.darkModeSelect : Colors.lightModeSelect readonly property color modeAutoStepColor : vSettings.darkMode ? Colors.darkModeAutoStep : Colors.lightModeAutoStep readonly property color modeAutoStepProgressColor : vSettings.darkMode ? Colors.borderButton : Colors.statusTextPaused readonly property color modeTextColor : vSettings.darkMode ? Colors.offWhite : Colors.backgroundMainMenu readonly property color modeButtonColor : vSettings.darkMode ? Colors.borderButton : Colors.backgroundMainMenu readonly property color modeAlarmButtonColor : vSettings.darkMode ? Colors.darkModeBackground : Colors.lightModeSelect - readonly property color modeAlarmStepButtonColor : vSettings.darkMode ? Colors.darkModeBackground : Colors.offWhite + readonly property color modeAlarmStepButtonColor : vSettings.darkMode ? Colors.panelBackground : Colors.offWhite readonly property color modeAlarmButtonPressedColor : vSettings.darkMode ? Colors.offWhite : Colors.lightModeSelect readonly property color modeAlarmListColor : vSettings.darkMode ? Colors.offWhite : Colors.alarmDialogText readonly property color modeAlarmStopStateColor : vSettings.darkMode ? Colors.darkModeAlarmStopState : Colors.lightModeAlarmStopState Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreatePatientPrescription.qml =================================================================== diff -u -r0a5a643c3f4b47de461af259f6b174a9aa609f58 -r5e5c936f26d0dd06c89e9fd32de5775a37b52493 --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreatePatientPrescription.qml (.../PreTreatmentCreatePatientPrescription.qml) (revision 0a5a643c3f4b47de461af259f6b174a9aa609f58) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreatePatientPrescription.qml (.../PreTreatmentCreatePatientPrescription.qml) (revision 5e5c936f26d0dd06c89e9fd32de5775a37b52493) @@ -63,6 +63,9 @@ vTreatmentCreate.treatmentDuration = vTreatmentRanges.treatmentDurationDef vTreatmentCreate.ultrafiltrationVolume = vTreatmentRanges.ultrafiltrationVolumeDef vTreatmentCreate.dialysateTemp = vTreatmentRanges.dialysateTempDef + vTreatmentCreate.acidConcentrate = 0 + vTreatmentCreate.dryBicarbCartSize = 0 + vTreatmentCreate.dialyzerType = 0 } } Index: sources/model/MModel.h =================================================================== diff -u -rdf61c476838011a343a6930fd5b30404629379bc -r5e5c936f26d0dd06c89e9fd32de5775a37b52493 --- sources/model/MModel.h (.../MModel.h) (revision df61c476838011a343a6930fd5b30404629379bc) +++ sources/model/MModel.h (.../MModel.h) (revision 5e5c936f26d0dd06c89e9fd32de5775a37b52493) @@ -103,6 +103,8 @@ #include "MTDInstitutionalRecordResponse.h" #include "MAdjustTDAdvancedInstitutionalRecordResponse.h" #include "MTDAdvancedInstitutionalRecordResponse.h" +#include "MDDCalibrationPressureRecordResponse.h" +#include "MAdjustDDCalibrationPressureRecordResponse.h" // DD Data Messages #include "MDGDrainPumpData.h" @@ -579,6 +581,28 @@ REGISTER_METATYPE( AdjustAdvancedInstitutionalRecordResponseData ) \ REGISTER_METATYPE( AdvancedInstitutionalRequestData ) \ REGISTER_METATYPE( AdvancedInstitutionalRecordResponseData ) \ + REGISTER_METATYPE( DDCalibrationPressureRequestData ) \ + REGISTER_METATYPE( AdjustDDCalibrationPressureRequestData ) \ + REGISTER_METATYPE( DDCalibrationTemperatureRequestData ) \ + REGISTER_METATYPE( AdjustDDCalibrationTemperatureRequestData ) \ + REGISTER_METATYPE( DDCalibrationConcentratePumpRequestData ) \ + REGISTER_METATYPE( AdjustDDCalibrationConcentratePumpRequestData ) \ + REGISTER_METATYPE( DDCalibrationD12DialysatePumpRequestData ) \ + REGISTER_METATYPE( AdjustDDCalibrationD12DialysatePumpRequestData ) \ + REGISTER_METATYPE( DDCalibrationD48DialysatePumpRequestData ) \ + REGISTER_METATYPE( AdjustDDCalibrationD48DialysatePumpRequestData ) \ + REGISTER_METATYPE( DDCalibrationAcidConcentratesRequestData ) \ + REGISTER_METATYPE( AdjustDDCalibrationAcidConcentratesRequestData ) \ + REGISTER_METATYPE( DDCalibrationBicarbConcentratesRequestData ) \ + REGISTER_METATYPE( AdjustDDCalibrationBicarbConcentratesRequestData ) \ + REGISTER_METATYPE( DDCalibrationAccelerometerSensorRequestData ) \ + REGISTER_METATYPE( AdjustDDCalibrationAccelerometerSensorRequestData ) \ + REGISTER_METATYPE( DDCalibrationBloodLeakSensorRequestData ) \ + REGISTER_METATYPE( AdjustDDCalibrationBloodLeakSensorRequestData ) \ + REGISTER_METATYPE( DDCalibrationConductivityRequestData ) \ + REGISTER_METATYPE( AdjustDDCalibrationConductivityRequestData ) \ + REGISTER_METATYPE( DDCalibrationPressureResponseData ) \ + REGISTER_METATYPE( AdjustDDCalibrationPressureResponseData ) \ /* HD reset in service mode */ \ REGISTER_METATYPE( AdjustHDResetInSrvcRequestData ) \ @@ -761,6 +785,8 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, InstitutionalRecordResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustAdvancedInstitutionalRecordResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdvancedInstitutionalRecordResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DDCalibrationPressureResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDDCalibrationPressureResponseData ) \ // /* Request */ ---------------------------------------------------------// #define ADJUST_TRANSMT_MODEL_BRIDGE_CONNECTIONS(vSOURCE) \ /* CONFIRM */ \ @@ -782,6 +808,7 @@ 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 ) \ @@ -836,6 +863,26 @@ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, InstitutionalRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustAdvancedInstitutionalRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdvancedInstitutionalRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, DDCalibrationPressureRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDDCalibrationPressureRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, DDCalibrationTemperatureRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDDCalibrationTemperatureRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, DDCalibrationConcentratePumpRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDDCalibrationConcentratePumpRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, DDCalibrationD12DialysatePumpRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDDCalibrationD12DialysatePumpRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, DDCalibrationD48DialysatePumpRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDDCalibrationD48DialysatePumpRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, DDCalibrationAcidConcentratesRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDDCalibrationAcidConcentratesRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, DDCalibrationBicarbConcentratesRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDDCalibrationBicarbConcentratesRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, DDCalibrationAccelerometerSensorRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,AdjustDDCalibrationAccelerometerSensorRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, DDCalibrationBloodLeakSensorRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDDCalibrationBloodLeakSensorRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, DDCalibrationConductivityRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDDCalibrationConductivityRequestData ) \ /* HD reset in service mode */ \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustHDResetInSrvcRequestData ) \ @@ -1021,6 +1068,8 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( InstitutionalRecordResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustAdvancedInstitutionalRecordResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdvancedInstitutionalRecordResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( DDCalibrationPressureResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDDCalibrationPressureResponseData ) \ #define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS \ /* Request --------------------------------------------------------- */ \ @@ -1098,6 +1147,26 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION( InstitutionalRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustAdvancedInstitutionalRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdvancedInstitutionalRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( DDCalibrationPressureRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDDCalibrationPressureRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( DDCalibrationTemperatureRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDDCalibrationTemperatureRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( DDCalibrationConcentratePumpRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDDCalibrationConcentratePumpRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( DDCalibrationD12DialysatePumpRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDDCalibrationD12DialysatePumpRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( DDCalibrationD48DialysatePumpRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDDCalibrationD48DialysatePumpRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( DDCalibrationAcidConcentratesRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDDCalibrationAcidConcentratesRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( DDCalibrationBicarbConcentratesRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDDCalibrationBicarbConcentratesRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( DDCalibrationAccelerometerSensorRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDDCalibrationAccelerometerSensorRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( DDCalibrationBloodLeakSensorRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDDCalibrationBloodLeakSensorRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( DDCalibrationConductivityRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDDCalibrationConductivityRequestData ) \ /* HD reset in service mode */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustHDResetInSrvcRequestData ) \ @@ -1177,6 +1246,26 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( InstitutionalRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustAdvancedInstitutionalRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdvancedInstitutionalRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( DDCalibrationPressureRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDDCalibrationPressureRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( DDCalibrationTemperatureRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDDCalibrationTemperatureRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( DDCalibrationConcentratePumpRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDDCalibrationConcentratePumpRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( DDCalibrationD12DialysatePumpRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDDCalibrationD12DialysatePumpRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( DDCalibrationD48DialysatePumpRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDDCalibrationD48DialysatePumpRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( DDCalibrationAcidConcentratesRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDDCalibrationAcidConcentratesRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( DDCalibrationBicarbConcentratesRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDDCalibrationBicarbConcentratesRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( DDCalibrationAccelerometerSensorRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(AdjustDDCalibrationAccelerometerSensorRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( DDCalibrationBloodLeakSensorRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDDCalibrationBloodLeakSensorRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( DDCalibrationConductivityRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDDCalibrationConductivityRequestData ) \ /* HD reset in service mode */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustHDResetInSrvcRequestData ) \ @@ -1256,6 +1345,26 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( InstitutionalRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustAdvancedInstitutionalRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdvancedInstitutionalRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( DDCalibrationPressureRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDDCalibrationPressureRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( DDCalibrationTemperatureRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDDCalibrationTemperatureRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( DDCalibrationConcentratePumpRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDDCalibrationConcentratePumpRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( DDCalibrationD12DialysatePumpRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDDCalibrationD12DialysatePumpRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( DDCalibrationD48DialysatePumpRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDDCalibrationD48DialysatePumpRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( DDCalibrationAcidConcentratesRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDDCalibrationAcidConcentratesRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( DDCalibrationBicarbConcentratesRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDDCalibrationBicarbConcentratesRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( DDCalibrationAccelerometerSensorRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(AdjustDDCalibrationAccelerometerSensorRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( DDCalibrationBloodLeakSensorRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDDCalibrationBloodLeakSensorRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( DDCalibrationConductivityRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDDCalibrationConductivityRequestData ) \ /* HD reset in service mode */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustHDResetInSrvcRequestData ) \ @@ -1425,6 +1534,8 @@ ACTION_RECEIVE_SIGNAL( InstitutionalRecordResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustAdvancedInstitutionalRecordResponseData ) \ ACTION_RECEIVE_SIGNAL( AdvancedInstitutionalRecordResponseData ) \ + ACTION_RECEIVE_SIGNAL( DDCalibrationPressureResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustDDCalibrationPressureResponseData ) \ //--------------------------------------------------------------------------------// Index: sources/model/hd/alarm/MAlarmMapping.cpp =================================================================== diff -u -r7ba8b8d52a49a294bd1691b89369dcfaed476ce5 -r5e5c936f26d0dd06c89e9fd32de5775a37b52493 --- sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 7ba8b8d52a49a294bd1691b89369dcfaed476ce5) +++ sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 5e5c936f26d0dd06c89e9fd32de5775a37b52493) @@ -229,7 +229,7 @@ /*0193*/case GuiAlarmID::ALARM_ID_DD_CPU_RAM_ERROR : { result = QObject::tr("DD CPU RAM error." ); break; } /* 193*/ /*0194*/case GuiAlarmID::ALARM_ID_TD_INTEGRITY_POST_TEST_FAILED : { result = QObject::tr("TD integrity post test fault." ); break; } /* 194*/ /*0195*/case GuiAlarmID::ALARM_ID_DD_INTEGRITY_POST_TEST_FAILED : { result = QObject::tr("TD integrity post test fault." ); break; } /* 195*/ -/*0196*/case GuiAlarmID::ALARM_ID_TD_EMPTY_SALINE_BAG : { result = QObject::tr("TD saline bag volume low alarm." ); break; } /* 196*/ +/*0196*/case GuiAlarmID::ALARM_ID_TD_SALINE_BAG_VOLUME_LOW_ALARM : { result = QObject::tr("TD saline bag volume low alarm." ); break; } /* 196*/ /*0197*/case GuiAlarmID::ALARM_ID_DD_D92_PUMP_RPM_OUT_OF_RANGE : { result = QObject::tr("DD D92 pump rpm out of range." ); break; } /* 197*/ /*0198*/case GuiAlarmID::ALARM_ID_TD_PRIME_COMPLETED_MEDIUM : { result = QObject::tr("TD prime completed medium priority alarm." ); break; } /* 198*/ /*0199*/case GuiAlarmID::ALARM_ID_TD_REPEATED_AIR_TRAP_LOWER_EVENTS : { result = QObject::tr("TD repeated air trap lower events." ); break; } /* 199*/ @@ -238,20 +238,20 @@ /*0202*/case GuiAlarmID::ALARM_ID_FW_RESERVED_202 : { result = QObject::tr("FW reserved for use." ); break; } /* 202*/ /*0203*/case GuiAlarmID::ALARM_ID_FW_RESERVED_203 : { result = QObject::tr("FW reserved for use." ); break; } /* 203*/ /*0204*/case GuiAlarmID::ALARM_ID_FW_RESERVED_204 : { result = QObject::tr("FW reserved for use." ); break; } /* 204*/ -/*0205*/case GuiAlarmID::ALARM_ID_FW_RESERVED_205 : { result = QObject::tr("FW reserved for use." ); break; } /* 205*/ -/*0206*/case GuiAlarmID::ALARM_ID_FW_RESERVED_206 : { result = QObject::tr("FW reserved for use." ); break; } /* 206*/ -/*0207*/case GuiAlarmID::ALARM_ID_FW_RESERVED_207 : { result = QObject::tr("FW reserved for use." ); break; } /* 207*/ +/*0205*/case GuiAlarmID::ALARM_ID_TD_UI_POST_TIMEOUT : { result = QObject::tr("TD UI POST failed." ); break; } /* 205*/ +/*0206*/case GuiAlarmID::ALARM_ID_TD_UI_COMPATIBILITY_ERROR : { result = QObject::tr("TD and UI software builds are not compatible." ); break; } /* 206*/ +/*0207*/case GuiAlarmID::ALARM_ID_TD_SAFETY_SHUTDOWN_POST_TEST_FAILED : { result = QObject::tr("TD POST Safety Shutdown failure." ); break; } /* 207*/ /*0208*/case GuiAlarmID::ALARM_ID_FW_RESERVED_208 : { result = QObject::tr("FW reserved for use." ); break; } /* 208*/ /*0209*/case GuiAlarmID::ALARM_ID_FW_RESERVED_209 : { result = QObject::tr("FW reserved for use." ); break; } /* 209*/ /*0210*/case GuiAlarmID::ALARM_ID_FW_RESERVED_210 : { result = QObject::tr("FW reserved for use." ); break; } /* 210*/ /*0211*/case GuiAlarmID::ALARM_ID_FW_RESERVED_211 : { result = QObject::tr("FW reserved for use." ); break; } /* 211*/ /*0212*/case GuiAlarmID::ALARM_ID_FW_RESERVED_212 : { result = QObject::tr("FW reserved for use." ); break; } /* 212*/ -/*0213*/case GuiAlarmID::ALARM_ID_FW_RESERVED_213 : { result = QObject::tr("FW reserved for use." ); break; } /* 213*/ -/*0214*/case GuiAlarmID::ALARM_ID_FW_RESERVED_214 : { result = QObject::tr("FW reserved for use." ); break; } /* 214*/ -/*0215*/case GuiAlarmID::ALARM_ID_FW_RESERVED_215 : { result = QObject::tr("FW reserved for use." ); break; } /* 215*/ -/*0216*/case GuiAlarmID::ALARM_ID_FW_RESERVED_216 : { result = QObject::tr("FW reserved for use." ); break; } /* 216*/ -/*0217*/case GuiAlarmID::ALARM_ID_FW_RESERVED_217 : { result = QObject::tr("FW reserved for use." ); break; } /* 217*/ -/*0218*/case GuiAlarmID::ALARM_ID_FW_RESERVED_218 : { result = QObject::tr("FW reserved for use." ); break; } /* 218*/ +/*0213*/case GuiAlarmID::ALARM_ID_TD_BP_SYSTOLIC_LOW : { result = QObject::tr("TD blood pressure systolic low." ); break; } /* 213*/ +/*0214*/case GuiAlarmID::ALARM_ID_TD_BP_SYSTOLIC_LOW_TOO_MANY : { result = QObject::tr("TD blood pressure systolic high." ); break; } /* 214*/ +/*0215*/case GuiAlarmID::ALARM_ID_TD_BP_SYSTOLIC_HIGH : { result = QObject::tr("TD blood pressure systolic high." ); break; } /* 215*/ +/*0216*/case GuiAlarmID::ALARM_ID_TD_BP_HEART_RATE_LOW : { result = QObject::tr("TD blood pressure heart rate low." ); break; } /* 216*/ +/*0217*/case GuiAlarmID::ALARM_ID_TD_BP_HEART_RATE_HIGH : { result = QObject::tr("TD blood pressure heart rate high." ); break; } /* 217*/ +/*0218*/case GuiAlarmID::ALARM_ID_TD_BP_MODULE_ERROR : { result = QObject::tr("TD blood pressure module error." ); break; } /* 218*/ /*0219*/case GuiAlarmID::ALARM_ID_FW_RESERVED_219 : { result = QObject::tr("FW reserved for use." ); break; } /* 219*/ /*0220*/case GuiAlarmID::ALARM_ID_DD_NVM_INVALID_SYSTEM_RECORD_CRC : { result = QObject::tr("DD invalid NVM System record." ); break; } /* 220*/ /*0221*/case GuiAlarmID::ALARM_ID_DD_NVM_INVALID_SERVICE_RECORD_CRC : { result = QObject::tr("DD invalid NVM Service record." ); break; } /* 221*/