Diff: mbed-connector-interface/Options.h

Revision:

8:f950fb1b78c0

Parent:

0:1f1f55e73248

Child:

9:faa43faea4ca

diff -r e94f0bd92545 -r f950fb1b78c0 mbed-connector-interface/Options.h
--- a/mbed-connector-interface/Options.h	Sun Feb 21 19:05:14 2016 +0000
+++ b/mbed-connector-interface/Options.h	Wed Feb 24 05:52:00 2016 +0000
@@ -99,11 +99,6 @@
     string getEndpointType();
 
     /**
-    Get the node radio channel list
-    */
-    uint32_t getRadioChannelList();
-
-    /**
     Get the mbed registration update period
     */
     int getRegUpdatePeriod();
@@ -113,10 +108,6 @@
     */
     char *getConnectorURL();
 
-    /**
-    Get the node MAC address
-    */
-    uint8_t *getMACAddress();
 
 	/**
     Get the list of device resources
@@ -149,14 +140,14 @@
     string getWiFiAuthKey();
 
     /**
-    Get the 802.15.4 Network ID
+    Get the 802.15.4 Pre Shared Key
     */
-    string getNetworkID();
-
-    /**
-    Get the 802.15.4 Radio channel
+    unsigned char *getPreSharedKey();
+    
+     /**
+    Get the 802.15.4 Pre Shared Key Identity
     */
-    uint8_t getRadioChannel();
+    unsigned char *getPreSharedKeyIdentity();
 
     /**
     Enable/Disable Immediate Observationing
@@ -213,10 +204,8 @@
     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;
+    unsigned char 		    m_psk[16];
+    unsigned char		    m_psk_identity[2];
     
     // DTLS/TLS Resources
     uint8_t 						m_server_cert[MAX_SERVER_CERT_LENGTH];
@@ -240,4 +229,3 @@
 } // namespace Connector
 
 #endif // __OPTIONS_H__
-