Diff: btNode.h

Revision:

7:7039646b7083

Parent:

6:c1bd3fadce09

--- a/btNode.h	Mon Feb 03 12:07:53 2014 +0000
+++ b/btNode.h	Wed Jun 18 17:44:49 2014 +0000
@@ -1,18 +1,25 @@
 #ifndef BT_DEVICE
 #define BT_DEVICE
-
+#include "MbedJSONValue.h"
 #include <string>
 #include "xbee.h"
 #include "xbeeFrame.h"
  
 class btNode {
 public:
-    btNode(int D_ID);
+    btNode(int D_ID, std::string D_NAME, std::string H_ID);
     std::string SendMessage(std::string msg);
     int getID(){return ID;};
+    MbedJSONValue GetAsJSON();
+    std::string getName();
+    std::string getDisplayString();
+    void setName(std::string newname);
   
 private:  
     int ID;
+    std::string DisplayString;
+    std::string DeviceName;
+    std::string HubID;
     static const char ADDRESS[8];
     //const char dest_address[8] ={0x00, 0x13, 0xA2, 0x00, 0x40, 0x9B, 0x6D, 0xB0};
 };