Index: sources/view/VVitals.h
===================================================================
diff -u -rfdb48ba3fba8e95027ebf573325c8f25db74c070 -ra47e7059c91c50cee3e05972fe5d96c053cdfb31
--- sources/view/VVitals.h	(.../VVitals.h)	(revision fdb48ba3fba8e95027ebf573325c8f25db74c070)
+++ sources/view/VVitals.h	(.../VVitals.h)	(revision a47e7059c91c50cee3e05972fe5d96c053cdfb31)
@@ -1,17 +1,16 @@
-#ifndef VVITALS_H
-#define VVITALS_H
 
+#pragma once
+
 // Qt
 #include <QObject>
 #include <QDateTime>
 
 // Project
+#include "VView.h"
 #include "BLEScanner.h"
 #include "main.h"
 #include "GuiController.h"
 
-#define UNSET 9999
-
 // forward declarations
 class tst_views;
 
@@ -30,32 +29,34 @@
     // friends
     friend class ::tst_views;
 
-public:
-    explicit VVitals(QObject *parent = nullptr);
+    bool _inTreatmentMode = false;
+    bool _enterManually = false;
+    QDateTime _lastNotification;
+    int _timerInterval = 1000; // ms
+    int _timerID = -1;
 
+    void timerEvent(QTimerEvent *event);
+    void notifyTakeMeasurement();
+
+VIEW_DEC_CLASS(VVitals)
+
 protected:
     // coco begin validated: Has been validated manually
-    PROPERTY(quint32, bloodPressureSystolic,               UNSET)
-    PROPERTY(quint32, bloodPressureDiastolic,              UNSET)
-    PROPERTY(quint32, pulseBPM,                            UNSET)
-    PROPERTY(quint32, bloodPressureMeasureIntervalMinutes, UNSET)
+    PROPERTY(quint32, bloodPressureSystolic,               0)
+    PROPERTY(quint32, bloodPressureDiastolic,              0)
+    PROPERTY(quint32, pulseBPM,                            0)
+    PROPERTY(quint32, bloodPressureMeasureIntervalMinutes, 0)
     // coco end
 public slots:
-    void doUpdateBPMeasureInterval(const quint32 &intervalMinutes);
-    void doManualBPMeasureEntry(const quint32 &systolic, const quint32 &diastolic, const quint32 &pulse_rate);
+    void doUpdateBPMeasureInterval(const quint32 &vIntervalMinutes);
+    void doManualBPMeasureEntry(const quint32 &vSystolic, const quint32 &vDiastolic, const quint32 &vPulseRate);
 signals:
-    void didRequestShowAlert(GuiAlertRequestData);
+    void didRequestShowAlert(const GuiAlertRequestData &alert);
+    void didManualEntryRequest();
 private slots:
-    void onReceiveBPMeasurement(BLEMeasurementData measurement);
-    void onReceiveAlertResponse(GuiAlertResponseData response);
-    void onActionReceive(const TreatmentStartResponseData &response);
-    void onHDOperationModeUpdate(HDOperationModeData hdOpMode);
-    void onTimeout();
-
-private:
-    bool _inTreatmentMode = false;
-    bool _enterManually = false;
-    QDateTime _lastNotification;
+    void onReceiveBPMeasurement(const BLEMeasurementData &vMeasurement);
+    void onReceiveAlertResponse(const GuiAlertResponseData &vResponse);
+    void onActionReceive(const TreatmentStartResponseData &vResponse);
+    void onHDOperationModeUpdate(const HDOperationModeData &vHDOpMode);
 };
 }
-#endif // VVITALS_H