Index: leahi.pro =================================================================== diff -u -r2f5eb769ab37dc3c9c02e9746458c52a35af00d9 -rdbe55daa5838b4b8ee07037e78b393c296423cb3 --- leahi.pro (.../leahi.pro) (revision 2f5eb769ab37dc3c9c02e9746458c52a35af00d9) +++ leahi.pro (.../leahi.pro) (revision dbe55daa5838b4b8ee07037e78b393c296423cb3) @@ -60,7 +60,9 @@ sources/model/td \ sources/model/td/data \ sources/model/td/data/treatment \ + sources/model/td/data/pretreatment \ sources/model/td/data/treatmentlog \ + sources/model/td/data/pretreatment \ sources/model/td/alarm \ sources/model/td/adjustment \ sources/model/td/adjustment/settings \ @@ -79,6 +81,7 @@ sources/view/td \ sources/view/td/data \ sources/view/td/data/treatment \ + sources/view/td/data/pretreatment \ sources/view/td/adjustment/treatment \ sources/view/td/adjustment/pretreatment \ sources/view/td/adjustment/posttreatment \ @@ -165,6 +168,8 @@ sources/model/dd/adjustment/settings/MAdjustDDCalibrationTemperatureRecordResponse.h \ sources/model/dd/adjustment/settings/MAdjustDDSerialNumberResponse.h \ sources/model/dd/adjustment/settings/MAdjustDDVersionsResponse.h \ + sources/model/dd/adjustment/settings/MAdjustRoWaterModeResponse.h \ + sources/model/dd/adjustment/settings/MRoWaterModeResponse.h \ sources/model/dd/adjustment/settings/MDDCalibrationAccelerometerSensorRecordResponse.h \ sources/model/dd/adjustment/settings/MDDCalibrationAcidConcentratesRecordResponse.h \ sources/model/dd/adjustment/settings/MDDCalibrationBicarbConcentratesRecordResponse.h \ @@ -199,6 +204,7 @@ sources/model/td/adjustment/settings/MAdjustTDSerialNumberResponse.h \ sources/model/td/adjustment/settings/MAdjustTDVersionsRequest.h \ 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 \ @@ -249,6 +255,9 @@ sources/model/td/data/treatmentlog/MTreatmentLogAlarmData.h \ sources/model/td/data/treatmentlog/MTreatmentLogEventData.h \ sources/model/td/data/treatmentlog/MTreatmentLogAvrgeData.h \ + \ # ---------- Models - TD - Data - Pre-Treatment + sources/model/td/data/pretreatment/MPreTreatmentStatesData.h \ + sources/model/td/data/pretreatment/MPreTreatmentDisposablesPrimeData.h \ \ # ---------- Models - TD - Adjustment - In-Treatment //// ----- @LEAHIZED sources/model/td/adjustment/treatment/MTreatmentAdjustBloodPrimeResponse.h \ sources/model/td/adjustment/treatment/MTreatmentAdjustBloodFlowRateResponse.h \ @@ -291,6 +300,7 @@ sources/view/fp/data/VFPTemperatureData.h \ sources/view/settings/VAdjustmentAdvancedInstitutionalRecord.h \ sources/view/settings/VAdvancedInstitutionalRecord.h \ + sources/view/settings/VRoWaterMode.h \ sources/view/settings/VCalibrationSettings.h \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentAutoSub.h \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentHDF.h \ @@ -309,6 +319,9 @@ sources/view/td/data/VTreatmentRanges.h \ sources/view/td/data/VWaterSampleData.h \ sources/view/td/data/VTDSyringePumpData.h \ + \ # ---------- Views - TD - Data - Pre-Treatment + sources/view/td/data/pretreatment/VPreTreatmentStatesData.h \ + sources/view/td/data/pretreatment/VPreTreatmentDisposablesPrimeData.h \ \ # ---------- Views - TD - Data - In-Treatment sources/view/td/data/treatment/VTDTreatmentStatesData.h \ sources/view/td/data/treatment/VTreatmentBloodFlow.h \ @@ -348,7 +361,7 @@ \ # ---------- Views - TD - Adjustment - Pre-Treatment sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.h \ sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.h \ - sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.h \ + sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.h \ \ # ---------- Views - TD - Adjustment - Post-Treatment sources/view/td/adjustment/posttreatment/VPostTreatmentAdjustPatientDisconnectionConfirm.h \ sources/view/td/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.h \ @@ -389,20 +402,16 @@ sources/model/hd/adjustment/settings/MAdjustHDServiceModeResponse.h \ sources/model/dg/adjustment/settings/MAdjustDGServiceDatesResponse.h \ sources/model/hd/adjustment/settings/MAdjustHDServiceDatesResponse.h \ - sources/model/dg/adjustment/settings/MDuetRoWaterDG.h \ \ # ---------- Models - Alarm sources/model/hd/alarm/MAlarmStatusData.h \ sources/model/hd/alarm/MAlarmTriggered.h \ sources/model/hd/alarm/MAlarmCleared.h \ sources/model/hd/alarm/MAlarmActiveList.h \ \ # ---------- Models - States Data - sources/model/hd/data/pretreatment/MPreTreatmentStatesData.h \ sources/model/hd/data/posttreatment/MPostTreatmentStatesData.h \ \ # ---------- Models - HD - Adjustment sources/model/hd/adjustment/MAdjustRequestsBase.h \ sources/model/hd/adjustment/settings/MAdjustHDRequests.h \ - \ # ---------- Models - HD - Adjustment - Settings - sources/model/hd/adjustment/settings/MAdjustHDAlarmVolumeResponse.h \ \ # ---------- Models - HD - Adjustment - Pre-Treatment sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustInitTreatmentResponse.h \ @@ -423,7 +432,6 @@ \ # ---------- Models - HD - Data - Pre-Treatment - Progress sources/model/hd/data/pretreatment/MPreTreatmentSelfTestNoCartridgeData.h \ sources/model/hd/data/pretreatment/MPreTreatmentSelfTestDryData.h \ - sources/model/hd/data/pretreatment/MPreTreatmentDisposablesPrimeData.h \ \ # ---------- Models - HD - Data sources/model/hd/data/MHDDebugText.h \ sources/model/hd/data/MHDGeneralEvent.h \ @@ -484,7 +492,6 @@ sources/view/settings/VAdjustmentServiceMode.h \ sources/view/settings/VAdjustmentServiceDates.h \ sources/view/settings/VAdjustmentDGCleaningUsage.h \ - sources/view/settings/VDuetRoWaterDG.h \ sources/view/settings/VCloudSync.h \ sources/view/settings/VHDUsageInfo.h \ sources/view/settings/VAdjustmentInstitutionalRecord.h \ @@ -512,12 +519,10 @@ \ # ---------- Views - HD - Adjustment - Disinfection sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.h \ \ # ---------- Views - HD - Data - States - sources/view/hd/data/pretreatment/VPreTreatmentStatesData.h \ sources/view/hd/data/posttreatment/VPostTreatmentStatesData.h \ \ # ---------- Views - HD - Data - Pre-Treatment - Progress sources/view/hd/data/pretreatment/VPreTreatmentSelfTestNoCartridgeData.h \ sources/view/hd/data/pretreatment/VPreTreatmentSelfTestDryData.h \ - sources/view/hd/data/pretreatment/VPreTreatmentDisposablesPrimeData.h \ \ # ---------- Views - HD - Data sources/view/hd/data/post/VHDPOSTData.h \ sources/view/hd/data/VHDAccelerometerData.h \ @@ -572,6 +577,8 @@ sources/model/dd/adjustment/settings/MAdjustDDCalibrationTemperatureRecordResponse.cpp \ sources/model/dd/adjustment/settings/MAdjustDDSerialNumberResponse.cpp \ sources/model/dd/adjustment/settings/MAdjustDDVersionsResponse.cpp \ + sources/model/dd/adjustment/settings/MAdjustRoWaterModeResponse.cpp \ + sources/model/dd/adjustment/settings/MRoWaterModeResponse.cpp \ sources/model/dd/adjustment/settings/MDDCalibrationAccelerometerSensorRecordResponse.cpp \ sources/model/dd/adjustment/settings/MDDCalibrationAcidConcentratesRecordResponse.cpp \ sources/model/dd/adjustment/settings/MDDCalibrationBicarbConcentratesRecordResponse.cpp \ @@ -678,6 +685,9 @@ sources/model/td/data/treatmentlog/MTreatmentLogAlarmData.cpp \ sources/model/td/data/treatmentlog/MTreatmentLogEventData.cpp \ sources/model/td/data/treatmentlog/MTreatmentLogAvrgeData.cpp \ + \ # ---------- Models - Data - States + sources/model/td/data/pretreatment/MPreTreatmentStatesData.cpp \ + sources/model/td/data/pretreatment/MPreTreatmentDisposablesPrimeData.cpp \ \ # ---------- Models - TD - Adjustment - In-Treatment sources/model/td/adjustment/treatment/MTreatmentAdjustBloodPrimeResponse.cpp \ sources/model/td/adjustment/treatment/MTreatmentAdjustBloodFlowRateResponse.cpp \ @@ -712,20 +722,19 @@ sources/model/hd/adjustment/settings/MAdjustHDServiceModeResponse.cpp \ sources/model/dg/adjustment/settings/MAdjustDGServiceDatesResponse.cpp \ sources/model/hd/adjustment/settings/MAdjustHDServiceDatesResponse.cpp \ - sources/model/dg/adjustment/settings/MDuetRoWaterDG.cpp \ \ # ---------- Models - Alarm sources/model/hd/alarm/MAlarmStatusData.cpp \ sources/model/hd/alarm/MAlarmMapping.cpp \ sources/model/hd/alarm/MAlarmTriggered.cpp \ sources/model/hd/alarm/MAlarmCleared.cpp \ sources/model/hd/alarm/MAlarmActiveList.cpp \ \ # ---------- Models - Data - States - sources/model/hd/data/pretreatment/MPreTreatmentStatesData.cpp \ sources/model/hd/data/posttreatment/MPostTreatmentStatesData.cpp \ \ # ---------- Models - TD - Adjustment - Settings sources/model/td/adjustment/settings/MAdjustTDDateTimeResponse.cpp \ sources/model/td/adjustment/settings/MTDInstitutionalRecordResponse.cpp \ sources/model/td/adjustment/settings/MAdjustTDInstitutionalRecordResponse.cpp \ + sources/model/td/adjustment/settings/MAdjustTDAlarmVolumeResponse.cpp \ \ # ---------- Models - TD - Adjustment - Pre-Treatment sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustDisposablesConfirmResponse.cpp \ sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustStartTreatmentResponse.cpp \ @@ -738,8 +747,6 @@ sources/model/td/adjustment/treatment/MTreatmentAdjustRecirculateResponse.cpp \ \ # ---------- Models - DD - Adjustment - Settings sources/model/dd/adjustment/settings/MAdjustDDDateTimeResponse.cpp \ - \ # ---------- Models - HD - Adjustment - Settings - sources/model/hd/adjustment/settings/MAdjustHDAlarmVolumeResponse.cpp \ \ # ---------- Models - HD - Adjustment - Pre-Treatment sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustInitTreatmentResponse.cpp \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.cpp \ @@ -767,7 +774,6 @@ sources/model/hd/data/post/MHDRTCEpochData.cpp \ sources/model/hd/data/MHDUsageInfoResponse.cpp \ \ # ---------- Models - HD - Data - Pre-Treatment - sources/model/hd/data/pretreatment/MPreTreatmentDisposablesPrimeData.cpp \ sources/model/hd/data/pretreatment/MPreTreatmentSelfTestNoCartridgeData.cpp \ sources/model/hd/data/pretreatment/MPreTreatmentSelfTestDryData.cpp \ \ # ---------- Models - DG - Adjustment - Settings @@ -803,6 +809,7 @@ \ # ---------- Views - TD - States Data sources/view/settings/VAdjustmentAdvancedInstitutionalRecord.cpp \ sources/view/settings/VAdvancedInstitutionalRecord.cpp \ + sources/view/settings/VRoWaterMode.cpp \ sources/view/settings/VCalibrationSettings.cpp \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentAutoSub.cpp \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentHDF.cpp \ @@ -821,6 +828,9 @@ sources/view/td/data/VTreatmentRanges.cpp \ sources/view/td/data/VWaterSampleData.cpp \ sources/view/td/data/VTDSyringePumpData.cpp \ + \ # ---------- Views - TD - Data - Pre-Treatment + sources/view/td/data/pretreatment/VPreTreatmentStatesData.cpp \ + sources/view/td/data/pretreatment/VPreTreatmentDisposablesPrimeData.cpp \ \ # ---------- Views - TD - Data - In-Treatment sources/view/td/data/treatment/VTDTreatmentStatesData.cpp \ sources/view/td/data/treatment/VTreatmentBloodFlow.cpp \ @@ -860,7 +870,7 @@ \ # ---------- Views - TD - Adjustment - Pre-Treatment sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.cpp \ sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.cpp \ - sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.cpp \ + sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.cpp \ \ # ---------- Views - TD - Adjustment - Post-Treatment sources/view/td/adjustment/posttreatment/VPostTreatmentAdjustDisposablesRemovalConfirm.cpp \ sources/view/td/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.cpp \ @@ -881,7 +891,6 @@ sources/view/settings/VAdjustmentAlarmVolume.cpp \ sources/view/settings/VAdjustmentServiceMode.cpp \ sources/view/settings/VAdjustmentServiceDates.cpp \ - sources/view/settings/VDuetRoWaterDG.cpp \ sources/view/settings/VCloudSync.cpp \ sources/view/settings/VAdjustmentDGCleaningUsage.cpp \ sources/view/settings/VHDUsageInfo.cpp \ @@ -907,15 +916,13 @@ \ # ---------- Views - HD - Adjustment - Disinfection sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp \ \ # ---------- Views - HD - States Data - sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp \ sources/view/hd/data/posttreatment/VPostTreatmentStatesData.cpp \ \ # ---------- Views - HD - Data sources/view/hd/data/VHDAccelerometerData.cpp \ sources/view/hd/data/VHDBloodLeakData.cpp \ \ # ---------- Views - HD - Data - Pre-Treatment sources/view/hd/data/pretreatment/VPreTreatmentSelfTestNoCartridgeData.cpp \ sources/view/hd/data/pretreatment/VPreTreatmentSelfTestDryData.cpp \ - sources/view/hd/data/pretreatment/VPreTreatmentDisposablesPrimeData.cpp \ \ # ---------- Views - HD - Data - In-Treatment sources/view/hd/data/treatment/VTreatmentDialysateFlow.cpp \ sources/view/hd/data/treatment/VTreatmentHeparinData.cpp \ Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -r9b81b18319ff46f1e48d5637a6a8938d2f7735c9 -rdbe55daa5838b4b8ee07037e78b393c296423cb3 --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 9b81b18319ff46f1e48d5637a6a8938d2f7735c9) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision dbe55daa5838b4b8ee07037e78b393c296423cb3) @@ -1189,7 +1189,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/MessageGlobals.h =================================================================== diff -u -r5e5c936f26d0dd06c89e9fd32de5775a37b52493 -rdbe55daa5838b4b8ee07037e78b393c296423cb3 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 5e5c936f26d0dd06c89e9fd32de5775a37b52493) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision dbe55daa5838b4b8ee07037e78b393c296423cb3) @@ -79,7 +79,7 @@ {Gui::GuiActionType::ID_Vitals , 3 * 4 }, // 3 parameters each 4bytes {Gui::GuiActionType::ID_Ultrafiltration , 4 * 4 }, // 4 parameters each 4bytes {Gui::GuiActionType::ID_IsolatedUF , 6 * 4 }, // 6 parameters each 4bytes - {Gui::GuiActionType::ID_Heparin , 2 * 4 }, // 2 parameters each 4bytes + {Gui::GuiActionType::ID_Heparin , 3 * 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 @@ -90,7 +90,7 @@ {Gui::GuiActionType::ID_HDBloodLeakData , 4 * 4 }, // 4 parameters each 4bytes // ---- {Gui::GuiActionType::ID_TDOpModeData , 2 * 4 }, // 2 parameter each 4bytes - {Gui::GuiActionType::ID_PreTreatmentStates , 11 * 4 }, //11 parameters each 4bytes + {Gui::GuiActionType::ID_PreTreatmentStates , 8 * 4 }, // 8 parameters each 4bytes {Gui::GuiActionType::ID_TreatmentStates , 10 * 4 }, //10 parameters each 4bytes {Gui::GuiActionType::ID_PostTreatmentStates , 2 * 4 }, // 2 parameter each 4bytes @@ -129,7 +129,7 @@ {Gui::GuiActionType::ID_HDUsageInfoRsp , 4 * 4 + 2 }, // 4 parameters each 4bytes + 1 parameter 2 bytes //TD Data Messages {Gui::GuiActionType::ID_TDVoltageData , 8 * 4 }, // 8 parameters each 4bytes - {Gui::GuiActionType::ID_TDValvesData , 3 * 4 + 7*2 }, // 5 parameters each 4bytes + 2 parametres 2 bytes + {Gui::GuiActionType::ID_TDValvesData , 3 * 4 + 5*2 }, // 5 parameters each 4bytes + 2 parametres 2 bytes {Gui::GuiActionType::ID_TDEjectorData , 4 * 4 }, // 4 parameters each 4bytes {Gui::GuiActionType::ID_TDSwitchesData , 1 * 4 }, // 3 parameters each 4bytes {Gui::GuiActionType::ID_TDBatteryData , 2 * 4 }, // 2 parameters each 4bytes @@ -248,7 +248,7 @@ // Pre-Treatment Disposable Priming {Gui::GuiActionType::ID_AdjustDisposablesPrimeReq , 0 * 4 }, // 0 parameter {Gui::GuiActionType::ID_AdjustDisposablesPrimeRsp , 2 * 4 }, // 2 parameters each 4bytes - {Gui::GuiActionType::ID_DisposablesPrimeData , 2 * 4 }, // 2 parameters each 4bytes + {Gui::GuiActionType::ID_DisposablesPrimeData , 4 * 4 }, // 2 parameters each 4bytes // Pre-Treatment Patient Connection Begin {Gui::GuiActionType::ID_AdjustPatientConnectionBeginReq , 0 * 4 }, // 0 parameter {Gui::GuiActionType::ID_AdjustPatientConnectionBeginRsp , 2 * 4 }, // 2 parameters each 4bytes @@ -348,9 +348,10 @@ {Gui::GuiActionType::ID_AdjustDGCleaningUsageReq , 0 * 4 }, // 0 parameter {Gui::GuiActionType::ID_AdjustDGCleaningUsageRsp , 10 * 4 }, //10 parameters each 4bytes // ---- RO Water - {Gui::GuiActionType::ID_DuetRoWaterStatDGq , 0 * 4 }, // 0 parameter each 4bytes - {Gui::GuiActionType::ID_DuetRoWaterModeUIi , 1 * 4 }, // 1 parameter each 4bytes - {Gui::GuiActionType::ID_DuetRoWaterModeDGr , 3 * 4 }, // 3 parameters each 4bytes + {Gui::GuiActionType::ID_RoWaterModeReq , 0 * 4 }, // 1 parameter each 4bytes + {Gui::GuiActionType::ID_RoWaterModeRsp , 3 * 4 }, // 3 parameter each 4bytes + {Gui::GuiActionType::ID_AdjustRoWaterModeReq , 1 * 4 }, // 1 parameter each 4bytes + {Gui::GuiActionType::ID_AdjustRoWaterModeRsp , 2 * 4 }, // 2 parameter each 4bytes // ---- {Gui::GuiActionType::ID_RawData , 255 }, {Gui::GuiActionType::ID_Acknow , 0 }, Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -r9b81b18319ff46f1e48d5637a6a8938d2f7735c9 -rdbe55daa5838b4b8ee07037e78b393c296423cb3 --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 9b81b18319ff46f1e48d5637a6a8938d2f7735c9) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision dbe55daa5838b4b8ee07037e78b393c296423cb3) @@ -233,6 +233,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; @@ -489,8 +510,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; @@ -658,24 +678,45 @@ /// // 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_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_RoWaterModeRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_RoWaterModeRsp ); break; case Gui::GuiActionType::ID_AdjustRoWaterModeRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustRoWaterModeRsp ); 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; + case Gui::GuiActionType::ID_DDCalibrationTemperatureRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDCalibrationTemperatureRsp ); break; + case Gui::GuiActionType::ID_AdjustDDCalibrationTemperatureRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDDCalibrationTemperatureRsp ); break; + case Gui::GuiActionType::ID_DDCalibrationConcentratePumpRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDCalibrationConcentratePumpRsp ); break; + case Gui::GuiActionType::ID_AdjustDDCalibrationConcentratePumpRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDDCalibrationConcentratePumpRsp ); break; + case Gui::GuiActionType::ID_DDCalibrationD12DialysatePumpRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDCalibrationD12DialysatePumpRsp ); break; + case Gui::GuiActionType::ID_AdjustDDCalibrationD12DialysatePumpRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDDCalibrationD12DialysatePumpRsp ); break; + case Gui::GuiActionType::ID_DDCalibrationD48DialysatePumpRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDCalibrationD48DialysatePumpRsp ); break; + case Gui::GuiActionType::ID_AdjustDDCalibrationD48DialysatePumpRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDDCalibrationD48DialysatePumpRsp ); break; + case Gui::GuiActionType::ID_DDCalibrationAcidConcentratesRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDCalibrationAcidConcentratesRsp ); break; + case Gui::GuiActionType::ID_AdjustDDCalibrationAcidConcentratesRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDDCalibrationAcidConcentratesRsp ); break; + case Gui::GuiActionType::ID_DDCalibrationBicarbConcentratesRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDCalibrationBicarbConcentratesRsp ); break; + case Gui::GuiActionType::ID_AdjustDDCalibrationBicarbConcentratesRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDDCalibrationBicarbConcentratesRsp ); break; + case Gui::GuiActionType::ID_DDCalibrationAccelerometerSensorRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDCalibrationAccelerometerSensorRsp ); break; + case Gui::GuiActionType::ID_AdjustDDCalibrationAccelerometerSensorRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDDCalibrationAccelerometerSensorRsp ); break; + case Gui::GuiActionType::ID_DDCalibrationBloodLeakSensorRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDCalibrationBloodLeakSensorRsp ); break; + case Gui::GuiActionType::ID_AdjustDDCalibrationBloodLeakSensorRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDDCalibrationBloodLeakSensorRsp ); break; + case Gui::GuiActionType::ID_DDCalibrationConductivitySensorRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDCalibrationConductivitySensorRsp ); break; + case Gui::GuiActionType::ID_AdjustDDCalibrationConductivitySensorRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDDCalibrationConductivitySensorRsp ); break; default: break; //FIXME later enabled } Index: sources/gui/GuiGlobals.h =================================================================== diff -u -r5e5c936f26d0dd06c89e9fd32de5775a37b52493 -rdbe55daa5838b4b8ee07037e78b393c296423cb3 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 5e5c936f26d0dd06c89e9fd32de5775a37b52493) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision dbe55daa5838b4b8ee07037e78b393c296423cb3) @@ -90,8 +90,8 @@ // ----- Settings // Service Mode - ID_AdjustServiceModeReq = 0xB000, // 176 - ID_AdjustServiceModeRsp = 0xB10F, // 177 //// ----- @CRAPIZED: had to change to avoid duplication + ID_AdjustServiceModeReq = 0xD000, // 208 + ID_AdjustServiceModeRsp = 0xD100, // 209 // Version ID_AdjustVersionsUIReq = 0x0D00, // 13 //// ----- @LEAHIZED @@ -121,7 +121,7 @@ // State Messages ID_TDOpModeData = 0x1200, // 18 //// ----- @LEAHIZED - ID_PreTreatmentStates = 0x5C00, // 92 + ID_PreTreatmentStates = 0xB700, // 183 //// ----- @LEAHIZED ID_TreatmentStates = 0x3C00, // 60 //// ----- @LEAHIZED ID_PostTreatmentStates = 0x770F, // 119 //// ----- @CRAPIZED: had to change to avoid duplication @@ -130,7 +130,7 @@ ID_TreatmentTime = 0x3B00, // 59 //// ----- @LEAHIZED ID_BloodFlow = 0x1100, // 17 //// ----- @LEAHIZED ID_DialysateInletFlow = 0x0800, - ID_DialysateOutletFlow = 0x0B00, + ID_DialysateOutletFlow = 0x0B0F, //// ----- @CRAPIZED ID_PressureOcclusion = 0x2400, // 36 //// ----- @LEAHIZED ID_Saline = 0x3D00, // 61 //// ----- @LEAHIZED ID_Ultrafiltration = 0x3E00, // 62 //// ----- @LEAHIZED @@ -179,7 +179,7 @@ // Pre-Treatment Disposable Priming ID_AdjustDisposablesPrimeReq = 0x3C0F, // 60 //// ----- @CRAPIZED: had to change to avoid duplication ID_AdjustDisposablesPrimeRsp = 0x3D0F, // 61 //// ----- @CRAPIZED: had to change to avoid duplication - ID_DisposablesPrimeData = 0x43FF, // ?? //// ----- @CRAPIZED - FFed + ID_DisposablesPrimeData = 0xC700, // 199 //// ----- @LEAHIZED // Pre-Treatment Patient Connection Begin ID_AdjustPatientConnectionBeginReq = 0x640F, // 100 //// ----- @CRAPIZED: had to change to avoid duplication ID_AdjustPatientConnectionBeginRsp = 0x650F, // 101 //// ----- @CRAPIZED: had to change to avoid duplication @@ -198,7 +198,7 @@ ID_DGDrainPumpData = 0x240F, // ?? //// ----- @CRAPIZED: had to change to avoid duplication ID_DDOperationModeData = 0x1300, ID_DGReservoirData = 0x280F, // ?? //// ----- @CRAPIZED: had to change to avoid duplication - ID_DGLoadCellReadingsData = 0x0C00, // 12 + ID_DGLoadCellReadingsData = 0x0C0F, // 12 ID_DGAccelerometerData = 0x340F, // 52 //// ----- @CRAPIZED: had to change to avoid duplication ID_DDValvesStatesData = 0x1B00, // 27 //// ----- @LEAHIZED ID_DDPressuresData = 0x1C00, // 28 //// ----- @LEAHIZED @@ -363,9 +363,10 @@ ID_AdjustDGCleaningUsageRsp = 0x8D0F, // 141 //// ----- @CRAPIZED: had to change to avoid duplication // RO Water Input Mode - ID_DuetRoWaterStatDGq = 0xC300, // 195 DG -> UI // DG initiates Status query - ID_DuetRoWaterModeUIi = 0xBC0F, // 188 UI -> DG // UI initiates Mode Set || responses to status query - ID_DuetRoWaterModeDGr = 0xC40F, // 196 //// ----- @CRAPIZED: had to change to avoid duplication + ID_RoWaterModeReq = 0xEB00, // 235 + ID_RoWaterModeRsp = 0xEC00, // 236 + ID_AdjustRoWaterModeReq = 0xED00, // 237 + ID_AdjustRoWaterModeRsp = 0xEE00, // 238 // Institutional record request and response @@ -509,7 +510,7 @@ // Pre-Treatment Self Test Dry Q_ENUM(TD_Pre_Treatment_Dry_Self_Tests_States) // Pre-Treatment Prime - Q_ENUM(TD_Pre_Treatment_Prime_States) + Q_ENUM(TD_Prime_States) // Pre-Treatment Recirculate Q_ENUM(TD_Pre_Treatment_Recirc_States) // Post-Treatment SubMode @@ -595,7 +596,7 @@ // Pre-Treatment Self Test Dry typedef GuiActions::TD_Pre_Treatment_Dry_Self_Tests_States GuiPreTreatmentSelfTestDryStates; // Pre-Treatment Prime - typedef GuiActions::TD_Pre_Treatment_Prime_States GuiPreTreatmentPrimeStates; + typedef GuiActions::TD_Prime_States GuiPreTreatmentPrimeStates; // Pre-Treatment Recirculate typedef GuiActions::TD_Pre_Treatment_Recirc_States GuiPreTreatmentRecirculateStates; Index: sources/gui/qml/components/HeaderBar.qml =================================================================== diff -u -r5e5c936f26d0dd06c89e9fd32de5775a37b52493 -rdbe55daa5838b4b8ee07037e78b393c296423cb3 --- sources/gui/qml/components/HeaderBar.qml (.../HeaderBar.qml) (revision 5e5c936f26d0dd06c89e9fd32de5775a37b52493) +++ sources/gui/qml/components/HeaderBar.qml (.../HeaderBar.qml) (revision dbe55daa5838b4b8ee07037e78b393c296423cb3) @@ -6,7 +6,6 @@ Rectangle { id: _root - property alias menuHidden : _headerMenu.hidden property alias headerMenuIndex : _headerMenu.index property alias userMode : _loggedInUser.text readonly property int currentScreen : _headerMenu.currentScreen @@ -59,7 +58,7 @@ _dryDemoDialog.open() } else { - _diagnosticsDialog.open() + // _diagnosticsDialog.open() } lastClickTime = 0 } @@ -152,7 +151,10 @@ } height : parent.height width : parent.width / 2 // gives the width of the headerbar menu - hidden : true + hidden : _root.activeStack && + _root.activeStack.currentItem && + _root.activeStack.currentItem.showHeaderMenu ? ! _root.activeStack.currentItem.showHeaderMenu : true + visible : ! hidden titlePixelSize : 32 backgroundColor : Colors.transparent highlightHeight : 15 @@ -180,6 +182,7 @@ extraSpace : _headerButtonRow.spacing visible : vTDTreatmentStates.txEnd + onPressed : _endTreatmentDialog.open() } IconButton { id : _waterSample Index: sources/gui/qml/dialogs/NotificationDialog.qml =================================================================== diff -u -re04d9a7a152b35b7623e0ca54dc77f0593459ad4 -rdbe55daa5838b4b8ee07037e78b393c296423cb3 --- sources/gui/qml/dialogs/NotificationDialog.qml (.../NotificationDialog.qml) (revision e04d9a7a152b35b7623e0ca54dc77f0593459ad4) +++ sources/gui/qml/dialogs/NotificationDialog.qml (.../NotificationDialog.qml) (revision dbe55daa5838b4b8ee07037e78b393c296423cb3) @@ -15,7 +15,7 @@ // Qt import QtQuick 2.12 -import QtGraphicalEffects 1.12 +// import QtGraphicalEffects 1.12 // Project // Qml imports Index: sources/gui/qml/main.qml =================================================================== diff -u -r5e5c936f26d0dd06c89e9fd32de5775a37b52493 -rdbe55daa5838b4b8ee07037e78b393c296423cb3 --- sources/gui/qml/main.qml (.../main.qml) (revision 5e5c936f26d0dd06c89e9fd32de5775a37b52493) +++ sources/gui/qml/main.qml (.../main.qml) (revision dbe55daa5838b4b8ee07037e78b393c296423cb3) @@ -15,6 +15,8 @@ // Qt import QtQuick 2.12 +import QtQml 2.15 +import QtQml.Models 2.15 // Project // C++ imports @@ -54,7 +56,7 @@ import VDateTime 0.1 import VAdjustmentAlarmVolume 0.1 import VBluetooth 0.1 -import VDuetRoWaterDG 0.1 +import VRoWaterMode 0.1 import VCloudSync 0.1 import VHDUsageInfo 0.1 import VInstitutionalRecord 0.1 @@ -204,7 +206,7 @@ VDateTime { id: vDateTime } VAdjustmentAlarmVolume { id: vAdjustmentAlarmVolume } VBluetooth { id: vBluetooth } - VDuetRoWaterDG { id: vDuetRoWaterDG } + VRoWaterMode { id: vRoWaterMode } VCloudSync { id: vCloudSync } VHDUsageInfo { id: vHDUsageInfo } VAdjustmentInstitutionalRecord { id: vAdjustmentInstitutionalRecord } @@ -365,9 +367,9 @@ 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.panelBackground : Colors.offWhite - readonly property color modeAlarmButtonPressedColor : vSettings.darkMode ? Colors.offWhite : Colors.lightModeSelect + readonly property color modeAlarmButtonColor : vSettings.darkMode ? Colors.darkModeBackground : Colors.offWhite + readonly property color modeAlarmStepButtonColor : vSettings.darkMode ? Colors.darkModeBackground : Colors.offWhite + readonly property color modeAlarmButtonPressedColor : vSettings.darkMode ? Colors.offWhite : Colors.offWhite readonly property color modeAlarmListColor : vSettings.darkMode ? Colors.offWhite : Colors.alarmDialogText readonly property color modeAlarmStopStateColor : vSettings.darkMode ? Colors.darkModeAlarmStopState : Colors.lightModeAlarmStopState } @@ -456,7 +458,7 @@ PowerItem { id: _powerItem ; z: 997 } ConfirmDialog { id: _confirmDialog ; z: 998 } DryDemoDialog { id: _dryDemoDialog ; z: 999 } - DiagnosticsDialog { id: _diagnosticsDialog; z: 999 } + //DiagnosticsDialog { id: _diagnosticsDialog; z: 999 } // Note: NotificationBar has to be anchored to the main menu and if it is moved into the AlarmItem // then cannot be anchored. Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreatePatientPrescription.qml =================================================================== diff -u -r555ee09fefaaeff952a24b735f1e40e67ada7cec -rdbe55daa5838b4b8ee07037e78b393c296423cb3 --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreatePatientPrescription.qml (.../PreTreatmentCreatePatientPrescription.qml) (revision 555ee09fefaaeff952a24b735f1e40e67ada7cec) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreatePatientPrescription.qml (.../PreTreatmentCreatePatientPrescription.qml) (revision dbe55daa5838b4b8ee07037e78b393c296423cb3) @@ -65,6 +65,9 @@ vTreatmentCreate.treatmentDuration = vTreatmentRanges.treatmentDurationDef vTreatmentCreate.ultrafiltrationVolume = vTreatmentRanges.ultrafiltrationVolumeDef vTreatmentCreate.dialysateTemp = vTreatmentRanges.dialysateTempDef + vTreatmentCreate.acidConcentrate = 0 + vTreatmentCreate.dryBicarbCartSize = 0 + vTreatmentCreate.dialyzerType = 0 } } Index: sources/gui/qml/pages/settings/SettingsCalibrationSettings.qml =================================================================== diff -u -rd560d600cc99ff145bee8a14ce5be183e14450da -rdbe55daa5838b4b8ee07037e78b393c296423cb3 --- sources/gui/qml/pages/settings/SettingsCalibrationSettings.qml (.../SettingsCalibrationSettings.qml) (revision d560d600cc99ff145bee8a14ce5be183e14450da) +++ sources/gui/qml/pages/settings/SettingsCalibrationSettings.qml (.../SettingsCalibrationSettings.qml) (revision dbe55daa5838b4b8ee07037e78b393c296423cb3) @@ -1,6 +1,6 @@ // Qt import QtQuick 2.15 -import QtGraphicalEffects 1.12 +// import QtGraphicalEffects 1.12 // Qml imports import "qrc:/globals" @@ -97,17 +97,17 @@ } } - layer.enabled : true - layer.effect: DropShadow { - id: _dropShadow - horizontalOffset: 0 - verticalOffset : 3 - radius : 3.0 - samples : 7 - color : "#50000000" - source : _header - anchors.fill : _header - } + // layer.enabled : true + // layer.effect: DropShadow { + // id: _dropShadow + // horizontalOffset: 0 + // verticalOffset : 3 + // radius : 3.0 + // samples : 7 + // color : "#50000000" + // source : _header + // anchors.fill : _header + // } } ListView { id: _listView Index: sources/gui/qml/pages/settings/SettingsStack.qml =================================================================== diff -u -r8350b02fa06da7cb6d7f085f88f55bf505ae78df -rdbe55daa5838b4b8ee07037e78b393c296423cb3 --- sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision 8350b02fa06da7cb6d7f085f88f55bf505ae78df) +++ sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision dbe55daa5838b4b8ee07037e78b393c296423cb3) @@ -114,7 +114,7 @@ qsTr("Date and Time" ), // SetDateTime qsTr("Export Logs" ), // ExportLogs qsTr("Language" ), // Localization - qsTr("Water Input Mode" ), // RoInput + qsTr("RO Water Mode" ), // RoInput qsTr("Calibration" ), // Calibration qsTr("Device Configuration" ), // Device Configuration qsTr("Device Registration" ), // DeviceRegistration Index: sources/model/MModel.h =================================================================== diff -u -rc63c041f361045518ede1c8df212517159a662a5 -rdbe55daa5838b4b8ee07037e78b393c296423cb3 --- sources/model/MModel.h (.../MModel.h) (revision c63c041f361045518ede1c8df212517159a662a5) +++ sources/model/MModel.h (.../MModel.h) (revision dbe55daa5838b4b8ee07037e78b393c296423cb3) @@ -104,6 +104,26 @@ #include "MTDInstitutionalRecordResponse.h" #include "MAdjustTDAdvancedInstitutionalRecordResponse.h" #include "MTDAdvancedInstitutionalRecordResponse.h" +#include "MDDCalibrationAccelerometerSensorRecordResponse.h" +#include "MDDCalibrationAcidConcentratesRecordResponse.h" +#include "MDDCalibrationBicarbConcentratesRecordResponse.h" +#include "MDDCalibrationBloodLeakSensorRecordResponse.h" +#include "MDDCalibrationConcentratePumpRecordResponse.h" +#include "MDDCalibrationConductivitySensorRecordResponse.h" +#include "MDDCalibrationD12DialysatePumpRecordResponse.h" +#include "MDDCalibrationD48DialysatePumpRecordResponse.h" +#include "MDDCalibrationPressureRecordResponse.h" +#include "MDDCalibrationTemperatureRecordResponse.h" +#include "MAdjustDDCalibrationAccelerometerSensorRecordResponse.h" +#include "MAdjustDDCalibrationAcidConcentratesRecordResponse.h" +#include "MAdjustDDCalibrationBicarbConcentratesRecordResponse.h" +#include "MAdjustDDCalibrationBloodLeakSensorRecordResponse.h" +#include "MAdjustDDCalibrationConcentratePumpRecordResponse.h" +#include "MAdjustDDCalibrationConductivitySensorRecordResponse.h" +#include "MAdjustDDCalibrationD12DialysatePumpRecordResponse.h" +#include "MAdjustDDCalibrationD48DialysatePumpRecordResponse.h" +#include "MAdjustDDCalibrationPressureRecordResponse.h" +#include "MAdjustDDCalibrationTemperatureRecordResponse.h" // DD Data Messages #include "MDGDrainPumpData.h" @@ -581,6 +601,46 @@ 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( DDCalibrationAccelerometerSensorResponseData ) \ + REGISTER_METATYPE( DDCalibrationAcidConcentratesResponseData ) \ + REGISTER_METATYPE( DDCalibrationBicarbConcentratesResponseData ) \ + REGISTER_METATYPE( DDCalibrationBloodLeakSensorResponseData ) \ + REGISTER_METATYPE( DDCalibrationConcentratePumpResponseData ) \ + REGISTER_METATYPE( DDCalibrationConductivitySensorResponseData ) \ + REGISTER_METATYPE( DDCalibrationD12DialysatePumpResponseData ) \ + REGISTER_METATYPE( DDCalibrationD48DialysatePumpResponseData ) \ + REGISTER_METATYPE( DDCalibrationPressureResponseData ) \ + REGISTER_METATYPE( DDCalibrationTemperatureResponseData ) \ + REGISTER_METATYPE( AdjustDDCalibrationAccelerometerSensorResponseData ) \ + REGISTER_METATYPE( AdjustDDCalibrationAcidConcentratesResponseData ) \ + REGISTER_METATYPE( AdjustDDCalibrationBicarbConcentratesResponseData ) \ + REGISTER_METATYPE( AdjustDDCalibrationBloodLeakSensorResponseData ) \ + REGISTER_METATYPE( AdjustDDCalibrationConcentratePumpResponseData ) \ + REGISTER_METATYPE( AdjustDDCalibrationConductivitySensorResponseData ) \ + REGISTER_METATYPE( AdjustDDCalibrationD12DialysatePumpResponseData ) \ + REGISTER_METATYPE( AdjustDDCalibrationD48DialysatePumpResponseData ) \ + REGISTER_METATYPE( AdjustDDCalibrationPressureResponseData ) \ + REGISTER_METATYPE( AdjustDDCalibrationTemperatureResponseData ) \ /* HD reset in service mode */ \ REGISTER_METATYPE( AdjustHDResetInSrvcRequestData ) \ @@ -763,6 +823,26 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, InstitutionalRecordResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustAdvancedInstitutionalRecordResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdvancedInstitutionalRecordResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DDCalibrationAccelerometerSensorResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DDCalibrationAcidConcentratesResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DDCalibrationBicarbConcentratesResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DDCalibrationBloodLeakSensorResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DDCalibrationConcentratePumpResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DDCalibrationConductivitySensorResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DDCalibrationD12DialysatePumpResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DDCalibrationD48DialysatePumpResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DDCalibrationPressureResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DDCalibrationTemperatureResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,AdjustDDCalibrationAccelerometerSensorResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDDCalibrationAcidConcentratesResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDDCalibrationBicarbConcentratesResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDDCalibrationBloodLeakSensorResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDDCalibrationConcentratePumpResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDDCalibrationConductivitySensorResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDDCalibrationD12DialysatePumpResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDDCalibrationD48DialysatePumpResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDDCalibrationPressureResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDDCalibrationTemperatureResponseData ) \ // /* Request */ ---------------------------------------------------------// #define ADJUST_TRANSMT_MODEL_BRIDGE_CONNECTIONS(vSOURCE) \ /* CONFIRM */ \ @@ -840,6 +920,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 ) \ @@ -1025,6 +1125,26 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( InstitutionalRecordResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustAdvancedInstitutionalRecordResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdvancedInstitutionalRecordResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( DDCalibrationAccelerometerSensorResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( DDCalibrationAcidConcentratesResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( DDCalibrationBicarbConcentratesResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( DDCalibrationBloodLeakSensorResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( DDCalibrationConcentratePumpResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( DDCalibrationConductivitySensorResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( DDCalibrationD12DialysatePumpResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( DDCalibrationD48DialysatePumpResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( DDCalibrationPressureResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( DDCalibrationTemperatureResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDDCalibrationAccelerometerSensorResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDDCalibrationAcidConcentratesResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDDCalibrationBicarbConcentratesResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDDCalibrationBloodLeakSensorResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDDCalibrationConcentratePumpResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDDCalibrationConductivitySensorResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDDCalibrationD12DialysatePumpResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDDCalibrationD48DialysatePumpResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDDCalibrationPressureResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDDCalibrationTemperatureResponseData ) \ #define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS \ /* Request --------------------------------------------------------- */ \ @@ -1103,6 +1223,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 ) \ @@ -1183,6 +1323,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 ) \ @@ -1263,6 +1423,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 ) \ @@ -1432,6 +1612,26 @@ ACTION_RECEIVE_SIGNAL( InstitutionalRecordResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustAdvancedInstitutionalRecordResponseData ) \ ACTION_RECEIVE_SIGNAL( AdvancedInstitutionalRecordResponseData ) \ + ACTION_RECEIVE_SIGNAL( DDCalibrationAccelerometerSensorResponseData ) \ + ACTION_RECEIVE_SIGNAL( DDCalibrationAcidConcentratesResponseData ) \ + ACTION_RECEIVE_SIGNAL( DDCalibrationBicarbConcentratesResponseData ) \ + ACTION_RECEIVE_SIGNAL( DDCalibrationBloodLeakSensorResponseData ) \ + ACTION_RECEIVE_SIGNAL( DDCalibrationConcentratePumpResponseData ) \ + ACTION_RECEIVE_SIGNAL( DDCalibrationConductivitySensorResponseData ) \ + ACTION_RECEIVE_SIGNAL( DDCalibrationD12DialysatePumpResponseData ) \ + ACTION_RECEIVE_SIGNAL( DDCalibrationD48DialysatePumpResponseData ) \ + ACTION_RECEIVE_SIGNAL( DDCalibrationPressureResponseData ) \ + ACTION_RECEIVE_SIGNAL( DDCalibrationTemperatureResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustDDCalibrationAccelerometerSensorResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustDDCalibrationAcidConcentratesResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustDDCalibrationBicarbConcentratesResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustDDCalibrationBloodLeakSensorResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustDDCalibrationConcentratePumpResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustDDCalibrationConductivitySensorResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustDDCalibrationD12DialysatePumpResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustDDCalibrationD48DialysatePumpResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustDDCalibrationPressureResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustDDCalibrationTemperatureResponseData ) \ //--------------------------------------------------------------------------------// Index: sources/model/dg/adjustment/settings/MAdjustDGRequests.h =================================================================== diff -u -rb110ee732fe1306669f71d9c17ed4714e1f03ee2 -rdbe55daa5838b4b8ee07037e78b393c296423cb3 --- sources/model/dg/adjustment/settings/MAdjustDGRequests.h (.../MAdjustDGRequests.h) (revision b110ee732fe1306669f71d9c17ed4714e1f03ee2) +++ sources/model/dg/adjustment/settings/MAdjustDGRequests.h (.../MAdjustDGRequests.h) (revision dbe55daa5838b4b8ee07037e78b393c296423cb3) @@ -119,9 +119,730 @@ static Can::Can_Id canid () { return Can::Can_Id::eChlid_UI_DD; } }; + +/*! + * \brief The MDDCalibrationPressureReq class + * \details The model to request DD Calibration Pressure + * + * | MSG | Type | Ack | Src | Dest | Description | + * |:----:|:----:|:---:|:---:|:----:|:-----------: | + * | 0x118 | Req | Y | UI | DD | DDCalibrationPressure | + * + * | Payload || + * | || + * | #1: (U32) | \ref Data::mIndex | + * + */ +class MDDCalibrationPressureReq : public MModel { +public: + quint32 mIndex = 0; + + QString toString() { + return toString({ mIndex }); + } + + static QString toString(const QVariantList &vParameters) { + return MModel::toString("DDCalPressureReq", vParameters); + } + + static Can::Can_Id canid () { return Can::Can_Id::eChlid_UI_DD; } +}; + +/*! + * \brief The MAdjustDDCalibrationPressureReq class + * \details The model to request Adjust DD Calibration Pressure + * + * | MSG | Type | Ack | Src | Dest | Description | + * |:----:|:----:|:---:|:---:|:----:|:-----------: | + * | 0x11A | Req | Y | UI | DD | AdjustDDCalibrationPressure | + * + * | Payload || + * | || + * | #1: (U32) | \ref Data::mIndex | + * | #2: (F32) | \ref Data::mGain | + * | #3: (F32) | \ref Data::mOffset | + * | #4: (U32) | \ref Data::mCalibrationTime | + * + */ +class MAdjustDDCalibrationPressureReq : public MModel { +public: + quint32 mIndex = 0; + float mGain = 0; + float mOffset = 0; + quint32 mCalibrationTime = 0; + + QString toString() { + return toString({ + mIndex , + mGain , + mOffset , + mCalibrationTime , + }); + } + + static QString toString(const QVariantList &vParameters) { + return MModel::toString("AdjustDDCalPressureReq", vParameters); + } + + static Can::Can_Id canid () { return Can::Can_Id::eChlid_UI_DD; } +}; + +/*! + * \brief The MDDCalibrationTemperatureReq class + * \details The model to request DD Calibration Temperature + * + * | MSG | Type | Ack | Src | Dest | Description | + * |:----:|:----:|:---:|:---:|:----:|:-----------: | + * | 0x11C | Req | Y | UI | DD | DDCalibrationTemperature | + * + * | Payload || + * | || + * | #1: (U32) | \ref Data::mIndex | + * + */ +class MDDCalibrationTemperatureReq : public MModel { +public: + quint32 mIndex = 0; + + QString toString() { + return toString({ mIndex }); + } + + static QString toString(const QVariantList &vParameters) { + return MModel::toString("DDCalTemperatureReq", vParameters); + } + + static Can::Can_Id canid () { return Can::Can_Id::eChlid_UI_DD; } +}; + +/*! + * \brief The MAdjustDDCalibrationTemperatureReq class + * \details The model to request Adjust DD Calibration Temperature + * + * | MSG | Type | Ack | Src | Dest | Description | + * |:----:|:----:|:---:|:---:|:----:|:-----------: | + * | 0x11E | Req | Y | UI | DD | AdjustDDCalibrationTemperature | + * + * | Payload || + * | || + * | #1: (U32) | \ref Data::mIndex | + * | #2: (F32) | \ref Data::mGain | + * | #3: (F32) | \ref Data::mOffset | + * | #4: (U32) | \ref Data::mCalibrationTime | + * + */ +class MAdjustDDCalibrationTemperatureReq : public MModel { +public: + quint32 mIndex = 0; + float mGain = 0; + float mOffset = 0; + quint32 mCalibrationTime = 0; + + QString toString() { + return toString({ + mIndex , + mGain , + mOffset , + mCalibrationTime , + }); + } + + static QString toString(const QVariantList &vParameters) { + return MModel::toString("AdjustDDCalTemperatureReq", vParameters); + } + + static Can::Can_Id canid () { return Can::Can_Id::eChlid_UI_DD; } +}; + +/*! + * \brief The MDDCalibrationConcentratePumpReq class + * \details The model to request DD Calibration Concentrate Pump + * + * | MSG | Type | Ack | Src | Dest | Description | + * |:----:|:----:|:---:|:---:|:----:|:-----------: | + * | 0x120 | Req | Y | UI | DD | DDCalibrationConcentratePump | + * + * | Payload || + * | || + * | #1: (U32) | \ref Data::mIndex | + * + */ +class MDDCalibrationConcentratePumpReq : public MModel { +public: + quint32 mIndex = 0; + + QString toString() { + return toString({ mIndex }); + } + + static QString toString(const QVariantList &vParameters) { + return MModel::toString("DDCalConcentratePumpReq", vParameters); + } + + static Can::Can_Id canid () { return Can::Can_Id::eChlid_UI_DD; } +}; + +/*! + * \brief The MAdjustDDCalibrationConcentratePumpReq class + * \details The model to request Adjust DD Calibration ConcentratePump + * + * | MSG | Type | Ack | Src | Dest | Description | + * |:----:|:----:|:---:|:---:|:----:|:-----------: | + * | 0x122 | Req | Y | UI | DD | AdjustDDCalibrationConcentratePump | + * + * | Payload || + * | || + * | #1: (U32) | \ref Data::mIndex | + * | #2: (F32) | \ref Data::mGain | + * | #3: (F32) | \ref Data::mOffset | + * | #4: (U32) | \ref Data::mCalibrationTime | + * + */ +class MAdjustDDCalibrationConcentratePumpReq : public MModel { +public: + quint32 mIndex = 0; + float mGain = 0; + float mOffset = 0; + quint32 mCalibrationTime = 0; + + QString toString() { + return toString({ + mIndex , + mGain , + mOffset , + mCalibrationTime , + }); + } + + static QString toString(const QVariantList &vParameters) { + return MModel::toString("AdjustDDCalConcentratePumpReq", vParameters); + } + + static Can::Can_Id canid () { return Can::Can_Id::eChlid_UI_DD; } +}; + +/*! + * \brief The MDDCalibrationD12DialysatePumpReq class + * \details The model to request DD Calibration D12 Dialysate Pump + * + * | MSG | Type | Ack | Src | Dest | Description | + * |:----:|:----:|:---:|:---:|:----:|:-----------: | + * | 0x124 | Req | Y | UI | DD | DDCalibrationD12DialysatePump | + * + * | Payload || + * | || + * | N/A | + * + */ +class MDDCalibrationD12DialysatePumpReq : public MModel { +public: + + QString toString() { + return toString(); + } + + static QString toString(const QVariantList &vParameters) { + return MModel::toString("DDCalD12DialysatePumpReq", vParameters); + } + + static Can::Can_Id canid () { return Can::Can_Id::eChlid_UI_DD; } +}; + +/*! + * \brief The MAdjustDDCalibrationD12DialysatePumpReq class + * \details The model to request Adjust DD Calibration D12 Dialysate Pump + * + * | MSG | Type | Ack | Src | Dest | Description | + * |:----:|:----:|:---:|:---:|:----:|:-----------: | + * | 0x126 | Req | Y | UI | DD | AdjustDDCalibrationD12DialysatePump | + * + * | Payload || + * | || + * | #1: (F32) | \ref Data::mTargetPumpSpeed | + * | #2: (U32) | \ref Data::mCalibrationTime | + * + */ +class MAdjustDDCalibrationD12DialysatePumpReq : public MModel { +public: + float mTargetPumpSpeed = 0; + quint32 mCalibrationTime = 0; + + QString toString() { + return toString({ + mTargetPumpSpeed , + mCalibrationTime , + }); + } + + static QString toString(const QVariantList &vParameters) { + return MModel::toString("AdjustDDCalD12DialysatePumpReq", vParameters); + } + + static Can::Can_Id canid () { return Can::Can_Id::eChlid_UI_DD; } +}; + +/*! + * \brief The MDDCalibrationD48DialysatePumpReq class + * \details The model to request DD Calibration D48 Dialysate Pump + * + * | MSG | Type | Ack | Src | Dest | Description | + * |:----:|:----:|:---:|:---:|:----:|:-----------: | + * | 0x128 | Req | Y | UI | DD | DDCalibrationD48DialysatePump | + * + * | Payload || + * | || + * | N/A | + * + */ +class MDDCalibrationD48DialysatePumpReq : public MModel { +public: + + QString toString() { + return toString(); + } + + static QString toString(const QVariantList &vParameters) { + return MModel::toString("DDCalD48DialysatePumpReq", vParameters); + } + + static Can::Can_Id canid () { return Can::Can_Id::eChlid_UI_DD; } +}; + +/*! + * \brief The MAdjustDDCalibrationD48DialysatePumpReq class + * \details The model to request Adjust DD Calibration D48 Dialysate Pump + * + * | MSG | Type | Ack | Src | Dest | Description | + * |:----:|:----:|:---:|:---:|:----:|:-----------: | + * | 0x12A | Req | Y | UI | DD | AdjustDDCalibrationD48DialysatePump | + * + * | Payload || + * | || + * | #1: (F32) | \ref Data::mGain | + * | #2: (F32) | \ref Data::mOffset | + * | #3: (U32) | \ref Data::mCalibrationTime | + * + */ +class MAdjustDDCalibrationD48DialysatePumpReq : public MModel { +public: + float mGain = 0; + float mOffset = 0; + quint32 mCalibrationTime = 0; + + QString toString() { + return toString({ + mGain , + mOffset , + mCalibrationTime , + }); + } + + static QString toString(const QVariantList &vParameters) { + return MModel::toString("AdjustDDCalD48DialysatePumpReq", vParameters); + } + + static Can::Can_Id canid () { return Can::Can_Id::eChlid_UI_DD; } +}; + +/*! + * \brief The MDDCalibrationAcidConcentratesReq class + * \details The model to request DD Calibration Acid Concentrates + * + * | MSG | Type | Ack | Src | Dest | Description | + * |:----:|:----:|:---:|:---:|:----:|:-----------: | + * | 0x12C | Req | Y | UI | DD | DDCalibrationAcidConcentrates| + * + * | Payload || + * | || + * | #1: (U32) | \ref Data::mIndex | + + * + */ +class MDDCalibrationAcidConcentratesReq : public MModel { +public: + + quint32 mIndex = 0; + + QString toString() { + return toString({ mIndex }); + } + static QString toString(const QVariantList &vParameters) { + return MModel::toString("DDCalDAcidConcentratesReq", vParameters); + } + + static Can::Can_Id canid () { return Can::Can_Id::eChlid_UI_DD; } +}; + +/*! + * \brief The MAdjustDDCalibrationAcidConcentratesReq class + * \details The model to request Adjust DD Calibration Acid Concentrates + * + * | MSG | Type | Ack | Src | Dest | Description | + * |:----:|:----:|:---:|:---:|:----:|:-----------: | + * | 0x12E | Req | Y | UI | DD | AdjustDDCalibrationAcidConcentrates | + * + * | Payload || + * | || + * | #1: (U32) | \ref Data::mIndex | + * | #2: (F32) | \ref Data::mAcidConcMixRatio | + * | #3: (F32) | \ref Data::mAcidFullBottleVolumeML | + * | #4: (F32) | \ref Data::mAcidConductivityUSPerCM| + * | #5: (F32) | \ref Data::mAcidBottleTemperature | + * | #6: (U32) | \ref Data::mCalibrationTime | + * + */ +class MAdjustDDCalibrationAcidConcentratesReq : public MModel { +public: + quint32 mIndex = 0; + float mAcidConcMixRatio = 0; + float mAcidFullBottleVolumeML = 0; + float mAcidConductivityUSPerCM= 0; + float mAcidBottleTemperature = 0; + quint32 mCalibrationTime = 0; + + QString toString() { + return toString({ + mIndex , + mAcidConcMixRatio , + mAcidFullBottleVolumeML , + mAcidConductivityUSPerCM, + mAcidBottleTemperature , + mCalibrationTime , + }); + } + + static QString toString(const QVariantList &vParameters) { + return MModel::toString("AdjustDDCalAcidConcentratesReq", vParameters); + } + + static Can::Can_Id canid () { return Can::Can_Id::eChlid_UI_DD; } +}; + +/*! + * \brief The MDDCalibrationBicarbConcentratesReq class + * \details The model to request DD Calibration Bicarb Concentrates + * + * | MSG | Type | Ack | Src | Dest | Description | + * |:----:|:----:|:---:|:---:|:----:|:-----------: | + * | 0x130 | Req | Y | UI | DD | DDCalibrationBicarbConcentratesReq| + * + * | Payload || + * | || + * | #1: (U32) | \ref Data::mIndex | + + * + */ +class MDDCalibrationBicarbConcentratesReq : public MModel { +public: + + quint32 mIndex = 0; + + QString toString() { + return toString({ mIndex }); + } + static QString toString(const QVariantList &vParameters) { + return MModel::toString("DDCalBicarbConcentratesReq", vParameters); + } + + static Can::Can_Id canid () { return Can::Can_Id::eChlid_UI_DD; } +}; + +/*! + * \brief The MAdjustDDCalibrationBicarbConcentratesReq class + * \details The model to request Adjust DD Calibration Bicarb Concentrates + * + * | MSG | Type | Ack | Src | Dest | Description | + * |:----:|:----:|:---:|:---:|:----:|:-----------: | + * | 0x132 | Req | Y | UI | DD | AdjustDDCalibrationBicarbConcentrates | + * + * | Payload || + * | || + * | #1: (U32) | \ref Data::mIndex | + * | #2: (F32) | \ref Data::mBicarbConcMixRatio | + * | #3: (F32) | \ref Data::mBicarbStartVolumeML | + * | #4: (F32) | \ref Data::mBicarbConductivityUSPerCM | + * | #5: (F32) | \ref Data::mBicarbBottleTemperature | + * | #6: (U32) | \ref Data::mCalibrationTime | + * + */ +class MAdjustDDCalibrationBicarbConcentratesReq : public MModel { +public: + quint32 mIndex = 0; + float mBicarbConcMixRatio = 0; + float mBicarbStartVolumeML = 0; + float mBicarbConductivityUSPerCM = 0; + float mBicarbBottleTemperature = 0; + quint32 mCalibrationTime = 0; + + QString toString() { + return toString({ + mIndex , + mBicarbConcMixRatio , + mBicarbStartVolumeML , + mBicarbConductivityUSPerCM , + mBicarbBottleTemperature , + mCalibrationTime , + }); + } + + static QString toString(const QVariantList &vParameters) { + return MModel::toString("AdjustDDCalBicarbConcentratesReq", vParameters); + } + + static Can::Can_Id canid () { return Can::Can_Id::eChlid_UI_DD; } +}; + +/*! + * \brief The MDDCalibrationAccelerometerSensorReq class + * \details The model to request DD Calibration Accelerometer Sensor + * + * | MSG | Type | Ack | Src | Dest | Description | + * |:----:|:----:|:---:|:---:|:----:|:-----------: | + * | 0x134 | Req | Y | UI | DD | DDCalibrationAccelerometerSensorReq | + * + * | Payload || + * | || + * | N/A | + * + */ +class MDDCalibrationAccelerometerSensorReq : public MModel { +public: + + QString toString() { + return toString(); + } + + static QString toString(const QVariantList &vParameters) { + return MModel::toString("DDCalAccelerometerSensorReq", vParameters); + } + + static Can::Can_Id canid () { return Can::Can_Id::eChlid_UI_DD; } +}; + +/*! + * \brief The MAdjustDDCalibrationAccelerometerSensorReq class + * \details The model to request Adjust DD Calibration Accelerometer Sensor + * + * | MSG | Type | Ack | Src | Dest | Description | + * |:----:|:----:|:---:|:---:|:----:|:-----------: | + * | 0x136 | Req | Y | UI | DD | AdjustDDCalibrationAccelerometerSensorReq | + * + * | Payload || + * | || + * | #1: (F32) | \ref Data::mAccelXOffset | + * | #2: (F32) | \ref Data::mAccelYOffset | + * | #3: (F32) | \ref Data::mAccelZOffset | + * | #4: (U32) | \ref Data::mCalibrationTime | + * + */ +class MAdjustDDCalibrationAccelerometerSensorReq : public MModel { +public: + float mAccelXOffset = 0; + float mAccelYOffset = 0; + float mAccelZOffset = 0; + quint32 mCalibrationTime = 0; + + QString toString() { + return toString({ + mAccelXOffset , + mAccelYOffset , + mAccelZOffset , + mCalibrationTime , + }); + } + + static QString toString(const QVariantList &vParameters) { + return MModel::toString("AdjustDDCalAccelerometerSensorReq", vParameters); + } + + static Can::Can_Id canid () { return Can::Can_Id::eChlid_UI_DD; } +}; + +/*! + * \brief The MDDCalibrationBloodLeakSensorReq class + * \details The model to request DD Calibration Blood Leak Sensor + * + * | MSG | Type | Ack | Src | Dest | Description | + * |:----:|:----:|:---:|:---:|:----:|:-----------: | + * | 0x138 | Req | Y | UI | DD | MDDCalibrationBloodLeakSensorReq | + * + * | Payload || + * | || + * | N/A | + * + */ +class MDDCalibrationBloodLeakSensorReq : public MModel { +public: + + QString toString() { + return toString(); + } + + static QString toString(const QVariantList &vParameters) { + return MModel::toString("DDCalinBloodLeakSensorReq", vParameters); + } + + static Can::Can_Id canid () { return Can::Can_Id::eChlid_UI_DD; } +}; + +/*! + * \brief The MAdjustDDCalibrationBloodLeakSensorReq class + * \details The model to request Adjust DD Calibration Blood Leak Sensor + * + * | MSG | Type | Ack | Src | Dest | Description | + * |:----:|:----:|:---:|:---:|:----:|:-----------: | + * | 0x13A | Req | Y | UI | DD | MAdjustDDCalibrationBloodLeakSensorReq | + * + * | Payload || + * | || + * | #1: (U32) | \ref Data::mSetPoint | + * | #2: (U32) | \ref Data::mCalibrationTime | + * + */ +class MAdjustDDCalibrationBloodLeakSensorReq : public MModel { +public: + quint32 mSetPoint = 0; + quint32 mCalibrationTime = 0; + + QString toString() { + return toString({ + mSetPoint , + mCalibrationTime , + }); + } + + static QString toString(const QVariantList &vParameters) { + return MModel::toString("AdjustDDCalBloodLeakSensorReq", vParameters); + } + + static Can::Can_Id canid () { return Can::Can_Id::eChlid_UI_DD; } +}; + +/*! + * \brief The MDDCalibrationConductivitySensorReq class + * \details The model to request DD Calibration Conductivity Sensor + * + * | MSG | Type | Ack | Src | Dest | Description | + * |:----:|:----:|:---:|:---:|:----:|:-----------: | + * | 0x13C | Req | Y | UI | DD | MDDCalibrationConductivitySensorReq| + * + * | Payload || + * | || + * | #1: (U32) | \ref Data::mIndex | + + * + */ +class MDDCalibrationConductivitySensorReq : public MModel { +public: + + quint32 mIndex = 0; + + QString toString() { + return toString({ mIndex }); + } + static QString toString(const QVariantList &vParameters) { + return MModel::toString("DDCalConductivitySensorReq", vParameters); + } + + static Can::Can_Id canid () { return Can::Can_Id::eChlid_UI_DD; } +}; + +/*! + * \brief The MAdjustDDCalibrationConductivitySensorReq class + * \details The model to request Adjust DD Calibration Conductivity Sensor + * + * | MSG | Type | Ack | Src | Dest | Description | + * |:----:|:----:|:---:|:---:|:----:|:-----------: | + * | 0x13A | Req | Y | UI | DD | MAdjustDDCalibrationConductivitySensorReq | + * + * | Payload || + * | || + * | #1: (U32) | \ref Data::mIndex | + * | #2: (F32) | \ref Data::mKHigh | + * | #3: (F32) | \ref Data::mAlphaHigh | + * | #4: (F32) | \ref Data::mEtaHigh | + * | #5: (F32) | \ref Data::mZetahigh | + * | #6: (F32) | \ref Data::mKLow | + * | #7: (F32) | \ref Data::mAlphaLow | + * | #8: (F32) | \ref Data::mEtaLow | + * | #9: (F32) | \ref Data::mZetaLow | + * | #10: F32) | \ref Data::mBeta | + * | #11:(F32) | \ref Data::mDelta | + * | #12:(F32) | \ref Data::mReserved1 | + * | #13:(F32) | \ref Data::mReserved2 | + * | #14:(U32) | \ref Data::mCalibrationTime | + * + */ +class MAdjustDDCalibrationConductivitySensorReq : public MModel { +public: + quint32 mIndex = 0; + float mKHigh = 0; + float mAlphaHigh = 0; + float mEtaHigh = 0; + float mZetahigh = 0; + float mKLow = 0; + float mAlphaLow = 0; + float mEtaLow = 0; + float mZetaLow = 0; + float mBeta = 0; + float mDelta = 0; + float mReserved1 = 0; + float mReserved2 = 0; + quint32 mCalibrationTime = 0; + + QString toString() { + return toString({ + mIndex , + mKHigh , + mAlphaHigh , + mEtaHigh , + mZetahigh , + mKLow , + mAlphaLow , + mEtaLow , + mZetaLow , + mBeta , + mDelta , + mReserved1 , + mReserved2 , + mCalibrationTime, + }); + } + + static QString toString(const QVariantList &vParameters) { + return MModel::toString("AdjustDDCalConductivitySensorReq", vParameters); + } + + static Can::Can_Id canid () { return Can::Can_Id::eChlid_UI_DD; } +}; + + } typedef Model::MAdjustDDDateTimeReq AdjustDDDateTimeRequestData; typedef Model::MAdjustDGCleaningUsageReq AdjustDGCleaningUsageRequestData; typedef Model::MRoWaterModeReq RoWaterModeRequestData; typedef Model::MAdjustRoWaterModeReq AdjustRoWaterModeRequestData; + +typedef Model::MDDCalibrationPressureReq DDCalibrationPressureRequestData; +typedef Model::MAdjustDDCalibrationPressureReq AdjustDDCalibrationPressureRequestData; +typedef Model::MDDCalibrationTemperatureReq DDCalibrationTemperatureRequestData; +typedef Model::MAdjustDDCalibrationTemperatureReq AdjustDDCalibrationTemperatureRequestData; +typedef Model::MDDCalibrationConcentratePumpReq DDCalibrationConcentratePumpRequestData; +typedef Model::MAdjustDDCalibrationConcentratePumpReq AdjustDDCalibrationConcentratePumpRequestData; +typedef Model::MDDCalibrationD12DialysatePumpReq DDCalibrationD12DialysatePumpRequestData; +typedef Model::MAdjustDDCalibrationD12DialysatePumpReq AdjustDDCalibrationD12DialysatePumpRequestData; +typedef Model::MDDCalibrationD48DialysatePumpReq DDCalibrationD48DialysatePumpRequestData; +typedef Model::MAdjustDDCalibrationD48DialysatePumpReq AdjustDDCalibrationD48DialysatePumpRequestData; +typedef Model::MDDCalibrationAcidConcentratesReq DDCalibrationAcidConcentratesRequestData; +typedef Model::MAdjustDDCalibrationAcidConcentratesReq AdjustDDCalibrationAcidConcentratesRequestData; +typedef Model::MDDCalibrationBicarbConcentratesReq DDCalibrationBicarbConcentratesRequestData; +typedef Model::MAdjustDDCalibrationBicarbConcentratesReq AdjustDDCalibrationBicarbConcentratesRequestData; +typedef Model::MDDCalibrationAccelerometerSensorReq DDCalibrationAccelerometerSensorRequestData; +typedef Model::MAdjustDDCalibrationAccelerometerSensorReq AdjustDDCalibrationAccelerometerSensorRequestData; +typedef Model::MDDCalibrationBloodLeakSensorReq DDCalibrationBloodLeakSensorRequestData; +typedef Model::MAdjustDDCalibrationBloodLeakSensorReq AdjustDDCalibrationBloodLeakSensorRequestData; +typedef Model::MDDCalibrationConductivitySensorReq DDCalibrationConductivityRequestData; +typedef Model::MAdjustDDCalibrationConductivitySensorReq AdjustDDCalibrationConductivityRequestData; + +