Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -rb2a0a682b4f9bcf52352e6cb6206ba10f09c7847 -r57fdcc6fcd4d91311544c2085cee41108293b6f6 --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision b2a0a682b4f9bcf52352e6cb6206ba10f09c7847) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 57fdcc6fcd4d91311544c2085cee41108293b6f6) @@ -1140,7 +1140,293 @@ 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 -r8350b02fa06da7cb6d7f085f88f55bf505ae78df -r57fdcc6fcd4d91311544c2085cee41108293b6f6 --- sources/canbus/MessageDispatcher.h (.../MessageDispatcher.h) (revision 8350b02fa06da7cb6d7f085f88f55bf505ae78df) +++ sources/canbus/MessageDispatcher.h (.../MessageDispatcher.h) (revision 57fdcc6fcd4d91311544c2085cee41108293b6f6) @@ -184,6 +184,24 @@ //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 -rcaf45633324f0abb5ced699731f8d6f1c4de4510 -r57fdcc6fcd4d91311544c2085cee41108293b6f6 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision caf45633324f0abb5ced699731f8d6f1c4de4510) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 57fdcc6fcd4d91311544c2085cee41108293b6f6) @@ -416,6 +416,7 @@ {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 -r8350b02fa06da7cb6d7f085f88f55bf505ae78df -r57fdcc6fcd4d91311544c2085cee41108293b6f6 --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 8350b02fa06da7cb6d7f085f88f55bf505ae78df) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 57fdcc6fcd4d91311544c2085cee41108293b6f6) @@ -232,8 +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; - case Gui::GuiActionType::ID_DDCalibrationPressureReq : INTERPRET_TRANSMIT_MESSAGE(DDCalibrationPressureRequestData ); break; - case Gui::GuiActionType::ID_AdjustDDCalibrationPressureReq : INTERPRET_TRANSMIT_MESSAGE(AdjustDDCalibrationPressureRequestData ); 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; Index: sources/model/MModel.h =================================================================== diff -u -r8350b02fa06da7cb6d7f085f88f55bf505ae78df -r57fdcc6fcd4d91311544c2085cee41108293b6f6 --- sources/model/MModel.h (.../MModel.h) (revision 8350b02fa06da7cb6d7f085f88f55bf505ae78df) +++ sources/model/MModel.h (.../MModel.h) (revision 57fdcc6fcd4d91311544c2085cee41108293b6f6) @@ -564,6 +564,24 @@ 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 */ \ @@ -816,6 +834,24 @@ 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 ) \ @@ -1070,6 +1106,24 @@ 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 ) \ @@ -1146,6 +1200,24 @@ 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 ) \ @@ -1222,6 +1294,24 @@ 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 ) \ Index: sources/model/dg/adjustment/settings/MAdjustDGRequests.h =================================================================== diff -u -r59232da2f238a4510c47e32407399bc0e8105c16 -r57fdcc6fcd4d91311544c2085cee41108293b6f6 --- sources/model/dg/adjustment/settings/MAdjustDGRequests.h (.../MAdjustDGRequests.h) (revision 59232da2f238a4510c47e32407399bc0e8105c16) +++ sources/model/dg/adjustment/settings/MAdjustDGRequests.h (.../MAdjustDGRequests.h) (revision 57fdcc6fcd4d91311544c2085cee41108293b6f6) @@ -342,7 +342,7 @@ * * | MSG | Type | Ack | Src | Dest | Description | * |:----:|:----:|:---:|:---:|:----:|:-----------: | - * | 0x128 | Req | Y | UI | DG | DDCalibrationD48DialysatePump | + * | 0x128 | Req | Y | UI | DD | DDCalibrationD48DialysatePump | * * | Payload || * | || @@ -473,9 +473,305 @@ 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; @@ -491,7 +787,15 @@ 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; + Index: sources/view/settings/VCalibrationSettings.cpp =================================================================== diff -u -rcaf45633324f0abb5ced699731f8d6f1c4de4510 -r57fdcc6fcd4d91311544c2085cee41108293b6f6 --- sources/view/settings/VCalibrationSettings.cpp (.../VCalibrationSettings.cpp) (revision caf45633324f0abb5ced699731f8d6f1c4de4510) +++ sources/view/settings/VCalibrationSettings.cpp (.../VCalibrationSettings.cpp) (revision 57fdcc6fcd4d91311544c2085cee41108293b6f6) @@ -10,8 +10,29 @@ void View::VCalibrationSettings::initConnections() { - ADJUST_VIEW_CONNECTION(DDCalibrationPressureRequestData) - ADJUST_VIEW_CONNECTION(AdjustDDCalibrationPressureRequestData) + ADJUST_VIEW_CONNECTION( DDCalibrationPressureRequestData) + ADJUST_VIEW_CONNECTION( AdjustDDCalibrationPressureRequestData) + ADJUST_VIEW_CONNECTION( DDCalibrationTemperatureRequestData) + ADJUST_VIEW_CONNECTION( AdjustDDCalibrationTemperatureRequestData) + ADJUST_VIEW_CONNECTION( DDCalibrationConcentratePumpRequestData) + ADJUST_VIEW_CONNECTION( AdjustDDCalibrationConcentratePumpRequestData) + ADJUST_VIEW_CONNECTION( DDCalibrationD12DialysatePumpRequestData) + ADJUST_VIEW_CONNECTION( AdjustDDCalibrationD12DialysatePumpRequestData) + ADJUST_VIEW_CONNECTION( DDCalibrationD48DialysatePumpRequestData) + ADJUST_VIEW_CONNECTION( AdjustDDCalibrationD48DialysatePumpRequestData) + ADJUST_VIEW_CONNECTION( DDCalibrationAcidConcentratesRequestData) + ADJUST_VIEW_CONNECTION( AdjustDDCalibrationAcidConcentratesRequestData) + ADJUST_VIEW_CONNECTION( DDCalibrationBicarbConcentratesRequestData) + ADJUST_VIEW_CONNECTION( AdjustDDCalibrationBicarbConcentratesRequestData) + ADJUST_VIEW_CONNECTION( DDCalibrationAccelerometerSensorRequestData) + ADJUST_VIEW_CONNECTION(AdjustDDCalibrationAccelerometerSensorRequestData) + ADJUST_VIEW_CONNECTION( DDCalibrationBloodLeakSensorRequestData) + ADJUST_VIEW_CONNECTION( AdjustDDCalibrationBloodLeakSensorRequestData) + ADJUST_VIEW_CONNECTION( DDCalibrationConductivityRequestData) + ADJUST_VIEW_CONNECTION( AdjustDDCalibrationConductivityRequestData) + + + ACTION_VIEW_CONNECTION(DDCalibrationPressureResponseData) ACTION_VIEW_CONNECTION(AdjustDDCalibrationPressureResponseData) Index: sources/view/settings/VCalibrationSettings.h =================================================================== diff -u -rcaf45633324f0abb5ced699731f8d6f1c4de4510 -r57fdcc6fcd4d91311544c2085cee41108293b6f6 --- sources/view/settings/VCalibrationSettings.h (.../VCalibrationSettings.h) (revision caf45633324f0abb5ced699731f8d6f1c4de4510) +++ sources/view/settings/VCalibrationSettings.h (.../VCalibrationSettings.h) (revision 57fdcc6fcd4d91311544c2085cee41108293b6f6) @@ -75,8 +75,26 @@ signals: void didModelChange(); - void didAdjustment(const DDCalibrationPressureRequestData &vData); - void didAdjustment(const AdjustDDCalibrationPressureRequestData &vData); + void didAdjustment(const DDCalibrationPressureRequestData &vData); + void didAdjustment(const AdjustDDCalibrationPressureRequestData &vData); + void didAdjustment(const DDCalibrationTemperatureRequestData &vData); + void didAdjustment(const AdjustDDCalibrationTemperatureRequestData &vData); + void didAdjustment(const DDCalibrationConcentratePumpRequestData &vData); + void didAdjustment(const AdjustDDCalibrationConcentratePumpRequestData &vData); + void didAdjustment(const DDCalibrationD12DialysatePumpRequestData &vData); + void didAdjustment(const AdjustDDCalibrationD12DialysatePumpRequestData &vData); + void didAdjustment(const DDCalibrationD48DialysatePumpRequestData &vData); + void didAdjustment(const AdjustDDCalibrationD48DialysatePumpRequestData &vData); + void didAdjustment(const DDCalibrationAcidConcentratesRequestData &vData); + void didAdjustment(const AdjustDDCalibrationAcidConcentratesRequestData &vData); + void didAdjustment(const DDCalibrationBicarbConcentratesRequestData &vData); + void didAdjustment(const AdjustDDCalibrationBicarbConcentratesRequestData &vData); + void didAdjustment(const DDCalibrationAccelerometerSensorRequestData &vData); + void didAdjustment(const AdjustDDCalibrationAccelerometerSensorRequestData &vData); + void didAdjustment(const DDCalibrationBloodLeakSensorRequestData &vData); + void didAdjustment(const AdjustDDCalibrationBloodLeakSensorRequestData &vData); + void didAdjustment(const DDCalibrationConductivityRequestData &vData); + void didAdjustment(const AdjustDDCalibrationConductivityRequestData &vData); }; }