Orefatoi / Mbed 2 deprecated afero_node_suntory_171018

Dependencies:   mbed MMA8451Q USBDevice WakeUp vt100

Fork of afero_node_suntory_2017_06_15 by Orefatoi

Revision:
21:d03c7bbb9f37
Parent:
1:b2a9a6f2c30e
--- a/sensors/LiquidPressure/LiquidPressure.hpp	Mon Jun 05 07:59:10 2017 +0000
+++ b/sensors/LiquidPressure/LiquidPressure.hpp	Fri Jun 09 01:49:53 2017 +0000
@@ -2,28 +2,30 @@
 #define _LIQUID_PERSSURE_H_
 
 #if defined (__MBED__)
-    #include "mbed.h"
+#include "mbed.h"
 #endif
 #include "ToDoQ.h"
 #include "Preferences.hpp"
 #include "TimeEventHandler.hpp"
+#include "Singletoned.hpp"
 #include "RTC_Handler.h"
 
-namespace MaruSolSensorManager
+class LiquidPressure :
+    public ToDo,
+    public TimeEventHandler<LiquidPressure>,
+    public Singletoned<LiquidPressure>
 {
-    class LiquidPressure : public ToDo, public TimeEventHandler<LiquidPressure>
-    {
-        LiquidPressure();
-        ~LiquidPressure();
-        float calc();
-        float val;
-        AnalogIn *ain;
-        void go();
-    public:
-        friend class TimeEventHandler;
-        virtual void toJSON(char*);
-        virtual void getBytes(uint8_t*);
-    };
-}; //MaruSolSensorManager
+    LiquidPressure();
+    ~LiquidPressure();
+    float calc();
+    float val;
+    AnalogIn *ain;
+    void go();
+public:
+    friend class TimeEventHandler;
+    friend class Singletoned;
+    virtual void toJSON(char*);
+    virtual void getBytes(uint8_t*);
+};
 
 #endif //_LIQUID_PERSSURE_H_
\ No newline at end of file