Changeset 13919

Timestamp:

05/26/12 15:02:10 (13 years ago)

Author:

tbretz

Message:

Moved stated to own header and namespace

Location:

trunk/FACT++/src

Files:

• HeadersMagicWeather.h (added)
• magicweather.cc (modified) (4 diffs)

trunk/FACT++/src/magicweather.cc

@@ -19 +19 @@
 #include "tools.h"
 
+#include "HeadersMagicWeather.h"
 
 namespace ba = boost::asio;
@@ -25 +26 @@
 
 using namespace std;
-
-// ------------------------------------------------------------------------
-
-struct DimWeather
-{
-    DimWeather() { memset(this, 0, sizeof(DimWeather)); }
-
-    uint16_t fStatus;
-
-    float    fTemp;
-    float    fDew;
-    float    fHum;
-    float    fPress;
-    float    fWind;
-    float    fGusts;
-    float    fDir;
-
-} __attribute__((__packed__));
-
+using namespace MagicWeather;
 
 // ------------------------------------------------------------------------
@@ -363 +346 @@
     S fWeather;
 
-    enum states_t
-    {
-        kStateDisconnected = 1,
-        kStateConnected,
-        kStateReceiving,
-    };
-
     bool CheckEventSize(size_t has, const char *name, size_t size)
     {
@@ -443 +419 @@
 
         // State names
-        AddStateName(kStateDisconnected, "NoConnection",
+        T::AddStateName(State::kDisconnected, "NoConnection",
                      "No connection to web-server could be established recently");
 
-        AddStateName(kStateConnected, "Invalid",
+        T::AddStateName(State::kConnected, "Invalid",
                      "Connection to webserver can be established, but received data is not recent or invalid");
 
-        AddStateName(kStateReceiving, "Valid",
+        T::AddStateName(State::kReceiving, "Valid",
                      "Connection to webserver can be established, receint data received");