Diff: DeviceInfo.h

Revision:

108:f1ee3e1eb126

Parent:

97:ea056f6be2e8

Child:

117:5de54f09f754

diff -r fc5f25f0e0d5 -r f1ee3e1eb126 DeviceInfo.h
--- a/DeviceInfo.h	Wed May 13 12:12:55 2015 +0000
+++ b/DeviceInfo.h	Wed May 13 13:03:20 2015 +0000
@@ -1,27 +1,28 @@
 #ifndef DEVICEINFO_H
 #define DEVICEINFO_H
-
 #include "MDM.h"
 
 class DeviceInfo
 {
 public:
-    DeviceInfo(MDMParser::DevStatus& devStatus);
-    
     typedef struct {
-        int rssi;  // RSSI in dBm
-        int ber; // BER in %
+        int rssi;  // RSSI [dBm]
+        int ber;   // BER [%]
     } SignalQuality;
+
+    DeviceInfo(MDMParser::DevStatus& devStatus) {
+        *_cellId = 0;
+        memcpy(&_devStatus, &devStatus, sizeof(MDMParser::DevStatus));
+        memset(&_netStatus, 0, sizeof(MDMParser::NetStatus));
+        memset(&_signalQuality, 0, sizeof(DeviceInfo::SignalQuality));
+    }
     
-    const char * imsi();
-    const char * imei();
-    const char * cellId();
-    const char * iccid();
+    const char* imsi() const { return _devStatus.imsi; }
+    const char* imei() const { return _devStatus.imei; }
+    const char* cellId();
+    const char* iccid() const { return _devStatus.ccid; }
     SignalQuality * signalQuality(bool realTime=true);
 
-protected:
-    bool refreshNetStatus();
-
 private:
     MDMParser::DevStatus _devStatus;
     MDMParser::NetStatus _netStatus;