Index: sources/view/dg/data/VDGValvesStatesData.h =================================================================== diff -u -r4a67c01045f365be38f1a12a8572c0070d343e1e -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 --- sources/view/dg/data/VDGValvesStatesData.h (.../VDGValvesStatesData.h) (revision 4a67c01045f365be38f1a12a8572c0070d343e1e) +++ sources/view/dg/data/VDGValvesStatesData.h (.../VDGValvesStatesData.h) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) @@ -1,13 +1,13 @@ /*! * - * Copyright (c) 2020-2022 Diality Inc. - All Rights Reserved. + * Copyright (c) 2020-2024 Diality Inc. - All Rights Reserved. * \copyright * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * \file VDGValvesStatesData.h - * \author (last) Michael Garthwaite - * \date (last) 24-Feb-2022 + * \author (last) Behrouz NematiPour + * \date (last) 28-Mar-2023 * \author (original) Behrouz NemaiPour * \date (original) 02-Jul-2020 * @@ -36,13 +36,11 @@ { Q_OBJECT - // disabled coco begin validated: Has been tested manually. This is a general messages received trigger, but is not used yet. TRIGGER ( bool , refresh , false) - // disabled coco end PROPERTY( quint8 , valveStates_VRF , 0 ) PROPERTY( quint8 , valveStates_VRI , 0 ) - PROPERTY( quint8 , valveStates_VRD , 0 ) + PROPERTY( quint8 , valveStates_RES , 0 ) PROPERTY( quint8 , valveStates_VRO , 0 ) PROPERTY( quint8 , valveStates_VPO , 0 ) PROPERTY( quint8 , valveStates_VBF , 0 ) @@ -54,11 +52,20 @@ PROPERTY( quint8 , valveStates_VR2 , 0 ) PROPERTY( quint8 , valveStates_VPD , 0 ) - Q_PROPERTY(QString text READ text NOTIFY refreshTriggered) + PROPERTY( quint8 , valveStatus_VRF , 0 ) + PROPERTY( quint8 , valveStatus_VRI , 0 ) + PROPERTY( quint8 , valveStatus_RES , 0 ) + PROPERTY( quint8 , valveStatus_VRO , 0 ) + PROPERTY( quint8 , valveStatus_VPO , 0 ) + PROPERTY( quint8 , valveStatus_VBF , 0 ) + PROPERTY( quint8 , valveStatus_VRC , 0 ) + PROPERTY( quint8 , valveStatus_VDR , 0 ) + PROPERTY( quint8 , valveStatus_VPI , 0 ) + PROPERTY( quint8 , valveStatus_VSP , 0 ) + PROPERTY( quint8 , valveStatus_VR1 , 0 ) + PROPERTY( quint8 , valveStatus_VR2 , 0 ) + PROPERTY( quint8 , valveStatus_VPD , 0 ) VIEW_DEC(VDGValvesStates, DGValvesStatesData) - -public slots: - QString text(); }; }