Index: sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h =================================================================== diff -u -rca67f7413160dfba507856222bd9aa95c5fa6200 -rcbfda5b02abeec60eb45b49da4bfbe07283a037f --- sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h (.../MPreTreatmentAdjustRequests.h) (revision ca67f7413160dfba507856222bd9aa95c5fa6200) +++ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h (.../MPreTreatmentAdjustRequests.h) (revision cbfda5b02abeec60eb45b49da4bfbe07283a037f) @@ -189,35 +189,6 @@ }; /*! - * \brief The MAdjustWaterSampleReq class - * \details The model to request start/stop water sample - * - * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | - * |:----:|:------:|:-----:|:----:|:---:|:---:|:----:|:--------------------:| - * |0x5D00| 0x100 | 9 | Req | Y | UI | HD | Water Sample Request | - * - * | Payload || - * | || - * | #1:(U32) | \ref requestedState | - * - */ -class MAdjustWaterSampleReq : public MModel { -public: - enum Options { - eStop = 0, - eStart = 1, - }; - Options requestedState = eStop; - QString toString() { - return toString({requestedState}); - } - - static QString toString(const QVariantList &vParameters) { - return MModel::toString("WaterSample", vParameters); - } -}; - -/*! * \brief The MAdjustWaterSampleResultReq class * \details The model to provide water sample result * @@ -369,11 +340,10 @@ * * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | * |:----:|:------:|:-----:|:----:|:---:|:---:|:----:|:-------------------------:| - * |0x7100| 0x100 | 9 | Req | Y | UI | TD | Start Treatment Request | + * |0xA100| 0x100 | 9 | Req | Y | UI | TD | Start Treatment Request | * * | Payload || * | || - * | #1:(U32) | \ref request | * */ class MAdjustStartTreatmentReq : public MModel { @@ -388,7 +358,6 @@ typedef Model:: MAdjustInitTreatmentReq AdjustInitTreatmentRequestData; typedef Model:: MAdjustParametersValidationReq AdjustParametersValidationRequestData; typedef Model:: MAdjustParametersConfirmReq AdjustParametersConfirmRequestData; -typedef Model:: MAdjustWaterSampleReq AdjustWaterSampleRequestData; typedef Model:: MAdjustWaterSampleResultReq AdjustWaterSampleResultRequestData; typedef Model:: MAdjustConsumablesConfirmReq AdjustConsumablesConfirmRequestData; typedef Model:: MAdjustDisposablesConfirmReq AdjustDisposablesConfirmRequestData;