Index: sources/view/dd/data/VDDValvesStatesData.h =================================================================== diff -u -r3d13050e0319cf30a1686b58c8f2328f6860910a -r47b25a76644ca44b81b5a4a728346f8e72e1dc3b --- sources/view/dd/data/VDDValvesStatesData.h (.../VDDValvesStatesData.h) (revision 3d13050e0319cf30a1686b58c8f2328f6860910a) +++ sources/view/dd/data/VDDValvesStatesData.h (.../VDDValvesStatesData.h) (revision 47b25a76644ca44b81b5a4a728346f8e72e1dc3b) @@ -36,36 +36,66 @@ { Q_OBJECT - TRIGGER ( bool , refresh , false) +// TRIGGER ( bool , refresh , false) - PROPERTY( quint8 , valveStates_VRF , 0 ) - PROPERTY( quint8 , valveStates_VRI , 0 ) - PROPERTY( quint8 , valveStates_RES , 0 ) - PROPERTY( quint8 , valveStates_VRO , 0 ) - PROPERTY( quint8 , valveStates_VPO , 0 ) - PROPERTY( quint8 , valveStates_VBF , 0 ) - PROPERTY( quint8 , valveStates_VRC , 0 ) - PROPERTY( quint8 , valveStates_VDR , 0 ) - PROPERTY( quint8 , valveStates_VPI , 0 ) - PROPERTY( quint8 , valveStates_VSP , 0 ) - PROPERTY( quint8 , valveStates_VR1 , 0 ) - PROPERTY( quint8 , valveStates_VR2 , 0 ) - PROPERTY( quint8 , valveStates_VPD , 0 ) + PROPERTY( bool , hydraulicsOutletValve , 0 ) + PROPERTY( bool , thermalDisinfectValve , 0 ) + PROPERTY( bool , HydraulicsBypassValve , 0 ) + PROPERTY( bool , rinsePortValve , 0 ) + PROPERTY( bool , drainValve , 0 ) + PROPERTY( bool , dialyzerBypassValve , 0 ) + PROPERTY( bool , purgeValve1 , 0 ) + PROPERTY( bool , pressureTestValve , 0 ) + PROPERTY( bool , dryBicarbInletValve , 0 ) + PROPERTY( bool , dialyzerInletValve , 0 ) + PROPERTY( bool , dialyzerOutletValve , 0 ) + PROPERTY( bool , purgeValve2 , 0 ) + PROPERTY( bool , hydraulicsInletValve , 0 ) + PROPERTY( bool , waterInletValve , 0 ) - 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 ) + PROPERTY( bool , balancingChamberValve1 , 0 ) + PROPERTY( bool , balancingChamberValve2 , 0 ) + PROPERTY( bool , balancingChamberValve3 , 0 ) + PROPERTY( bool , balancingChamberValve7 , 0 ) + PROPERTY( bool , balancingChamberValve5 , 0 ) + PROPERTY( bool , balancingChamberValve6 , 0 ) + PROPERTY( bool , balancingChamberValve4 , 0 ) + PROPERTY( bool , balancingChamberValve8 , 0 ) + PROPERTY( bool , ultrafiltrationInletValve1 , 0 ) + PROPERTY( bool , ultrafiltrationInletValve2 , 0 ) + PROPERTY( bool , ultrafiltrationOutletValve1 , 0 ) + PROPERTY( bool , ultrafiltrationOutletValve2 , 0 ) + + PROPERTY( quint8 , valvesSensedState1 , 0 ) + PROPERTY( quint8 , valvesSensedState2 , 0 ) + PROPERTY( quint8 , valvesSensedState3 , 0 ) + PROPERTY( quint8 , valvesSensedState4 , 0 ) + PROPERTY( quint8 , valvesSensedState5 , 0 ) + PROPERTY( quint8 , valvesSensedState6 , 0 ) + PROPERTY( quint8 , valvesSensedState7 , 0 ) + PROPERTY( quint8 , valvesSensedState8 , 0 ) + PROPERTY( quint8 , valvesSensedState9 , 0 ) + PROPERTY( quint8 , valvesSensedState10 , 0 ) + PROPERTY( quint8 , valvesSensedState11 , 0 ) + PROPERTY( quint8 , valvesSensedState12 , 0 ) + PROPERTY( quint8 , valvesSensedState13 , 0 ) + PROPERTY( quint8 , valvesSensedState14 , 0 ) + PROPERTY( quint8 , valvesSensedState15 , 0 ) + PROPERTY( quint8 , valvesSensedState16 , 0 ) + PROPERTY( quint8 , valvesSensedState17 , 0 ) + PROPERTY( quint8 , valvesSensedState18 , 0 ) + PROPERTY( quint8 , valvesSensedState19 , 0 ) + PROPERTY( quint8 , valvesSensedState20 , 0 ) + PROPERTY( quint8 , valvesSensedState21 , 0 ) + PROPERTY( quint8 , valvesSensedState22 , 0 ) + PROPERTY( quint8 , valvesSensedState23 , 0 ) + PROPERTY( quint8 , valvesSensedState24 , 0 ) + PROPERTY( quint8 , valvesSensedState25 , 0 ) + PROPERTY( quint8 , valvesSensedState26 , 0 ) + PROPERTY( quint8 , valvesSensedState27 , 0 ) + PROPERTY( quint8 , valvesSensedState28 , 0 ) + VIEW_DEC(VDDValvesStates, DDValvesStatesData) }; }