Index: sources/view/VView.h =================================================================== diff -u -r13d6a4fae2f910ab6e289ac9280258a94f734405 -r13e65c3d271d503c2e2e2f1f20736652c470f8cc --- sources/view/VView.h (.../VView.h) (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) +++ sources/view/VView.h (.../VView.h) (revision 13e65c3d271d503c2e2e2f1f20736652c470f8cc) @@ -1,16 +1,16 @@ /*! - * - * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * + * Copyright (c) 2020-2022 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 vview.h + * + * \file VView.h * \author (last) Behrouz NematiPour - * \date (last) 01-Mar-2021 + * \date (last) 10-Mar-2022 * \author (original) Behrouz NematiPour - * \date (original) 10-Mar-2020 - * + * \date (original) 26-Aug-2020 + * */ #pragma once @@ -101,20 +101,28 @@ //--------------------------------------------------------------------------------// #define REGISTER_VIEW_TYPES \ using namespace View; \ + REGISTER_TYPE( VGeneralEvent ) \ + /* CONFIRM */ \ + REGISTER_TYPE( VConfirm ) \ + /* POST */ \ + REGISTER_TYPE( VHDPOSTData ) \ + REGISTER_TYPE( VDGPOSTData ) \ /* Device */ \ REGISTER_TYPE( VDevice ) \ /* Settings */ \ REGISTER_TYPE( VSettings ) \ REGISTER_TYPE( VAdjustmentVersions ) \ - REGISTER_TYPE( VAdjustmentService ) \ + REGISTER_TYPE( VAdjustmentServiceMode ) \ + REGISTER_TYPE( VAdjustmentServiceDates ) \ REGISTER_TYPE( VDateTime ) \ REGISTER_TYPE( VNetworkModel ) \ REGISTER_TYPE( VAdjustmentAlarmVolume ) \ + REGISTER_TYPE( VBluetooth ) \ /* Alarm */ \ REGISTER_TYPE( VAlarmStatus ) \ REGISTER_TYPE( VAlarmActiveList ) \ - /* Power off */ \ - REGISTER_TYPE( VPowerOff ) \ + /* Treatment Common */ \ + REGISTER_TYPE( VTreatmentVitals ) \ /* Data - States */ \ REGISTER_TYPE( VHDOperationMode ) \ REGISTER_TYPE( VPreTreatmentStates ) \ @@ -134,8 +142,13 @@ REGISTER_TYPE( VTreatmentRinseback ) \ REGISTER_TYPE( VTreatmentRecirculate ) \ REGISTER_TYPE( VTreatmentBloodPrime ) \ + REGISTER_TYPE( VTreatmentStop ) \ /* Device - Data */ \ REGISTER_TYPE( VHDAccelerometer ) \ + REGISTER_TYPE( VHDSyringePump ) \ + REGISTER_TYPE( VHDBloodLeak ) \ + REGISTER_TYPE( VHDAirBubble ) \ + REGISTER_TYPE( VHDAirTrap ) \ /* DG - Data */ \ REGISTER_TYPE( VDGDrainPump ) \ REGISTER_TYPE( VDGHeaters ) \ @@ -147,6 +160,7 @@ REGISTER_TYPE( VDGTemperatures ) \ REGISTER_TYPE( VDGValvesStates ) \ REGISTER_TYPE( VDGAccelerometer ) \ + REGISTER_TYPE( VDGConductivity ) \ /* Pre-Treatment */ \ REGISTER_TYPE( VPreTreatmentAdjustmentInitTreatment ) \ REGISTER_TYPE( VDGFilterFlush ) \