Diff: api/Options.h

Revision:

19:e2cbaeeea509

Parent:

15:8ada80242804

Child:

42:20c375e74e8e

diff -r 95c2f95a75fe -r e2cbaeeea509 api/Options.h
--- a/api/Options.h	Wed Feb 18 19:40:13 2015 +0000
+++ b/api/Options.h	Tue Feb 24 02:05:06 2015 +0000
@@ -138,24 +138,41 @@
     Get the WiFi Auth Key
     */
     string getWiFiAuthKey();
+    
+    /**
+    Get the 802.15.4 Network ID
+    */
+    string getNetworkID();
+    
+    /**
+    Get the 802.15.4 Radio channel
+    */
+    uint8_t getRadioChannel();
 
 protected:
+    // mDS Resources
     char                *m_lifetime;
     string               m_domain;
     string               m_node_name;
     string               m_endpoint_type;
-    uint32_t             m_channel_list;
     int                  m_rd_update_period;
     int                  m_nsp_port;
     uint8_t              m_nsp_address[NSP_IP_ADDRESS_LENGTH];
-    uint8_t              m_mac_address[NODE_MAC_ADDRESS_LENGTH];
-    StaticResourcesList  m_static_resources;
-    DynamicResourcesList m_dynamic_resources;
     
     // WiFi Resources
     string               m_wifi_ssid;
     string               m_wifi_auth_key;
     WiFiAuthTypes        m_wifi_auth_type;
+    
+    // 802.15.4 Resources
+    string               m_network_id;
+    uint32_t             m_channel_list;
+    uint8_t              m_mac_address[NODE_MAC_ADDRESS_LENGTH];
+    uint8_t              m_channel;
+    
+    // Endpoint Resources
+    StaticResourcesList  m_static_resources;
+    DynamicResourcesList m_dynamic_resources;
 };
 
 } // namespace Connector