Fix for Connector URI and update mbed-os.lib

Author: Yogesh Pande

main.cpp

@@ -58,9 +58,13 @@ ThreadInterface mesh;
 
 #define HEAP_SIZE 1023
 static uint8_t app_stack_heap[HEAP_SIZE + 1];
+// This is address to mbed Device Connector
+const String &MBED_SERVER_ADDRESS = "coap://api.connector.mbed.com:5684";
+#else
+// This is address to mbed Device Connector
+const String &MBED_SERVER_ADDRESS = YOTTA_CFG_DEVICE_CONNECTOR_URI;
 #endif
 
-
 Serial output(USBTX, USBRX);
 
 // These are example resource values for the Device Object
@@ -170,7 +174,7 @@ class LedResource {
  */
 class ButtonResource {
 public:
-    ButtonResource(){      
+    ButtonResource(): counter(0) {
         // create ObjectID with metadata tag of '3200', which is 'digital input'
         btn_object = M2MInterfaceFactory::create_object("3200");
         M2MObjectInstance* btn_inst = btn_object->create_object_instance();
@@ -213,7 +217,7 @@ class ButtonResource {
 
 private:
     M2MObject* btn_object;
-    uint16_t counter = 0;
+    uint16_t counter;
 };
 
 // Network interaction must be performed outside of interrupt context
@@ -307,7 +311,7 @@ int main() {
     obs_button.fall(&button_clicked);
 
     // Create endpoint interface to manage register and unregister
-    mbed_client.create_interface(network_stack);
+    mbed_client.create_interface(MBED_SERVER_ADDRESS, network_stack);
 
     // Create Objects of varying types, see simpleclient.h for more details on implementation.
     M2MSecurity* register_object = mbed_client.create_register_object(); // server object specifying connector info

mbed-os.lib

@@ -1 +1 @@
-https://github.com/ARMmbed/mbed-os.git/#c4986eed9f42cbb3352c793d7a16d512d978d102
+https://github.com/ARMmbed/mbed-os/#77c8e885e91f3b2504335f7221dcc551547b76d3

simpleclient.h

@@ -31,9 +31,6 @@
 //Select binding mode: UDP or TCP
 M2MInterface::BindingMode SOCKET_MODE = M2MInterface::UDP;
 
-// This is address to mbed Device Connector
-const String &MBED_SERVER_ADDRESS = YOTTA_CFG_DEVICE_CONNECTOR_URI;
-
 // These come from the security.h file copied from connector.mbed.com
 const String &MBED_USER_NAME_DOMAIN = MBED_DOMAIN;
 const String &ENDPOINT_NAME = MBED_ENDPOINT_NAME;
@@ -91,8 +88,10 @@ class MbedClient: public M2MInterfaceObserver {
     *  setup its name, resource type, life time, connection mode,
     *  Currently only LwIPv4 is supported.
     */
-    void create_interface(void *handler=NULL) {
+    void create_interface(const String &server_address,
+                          void *handler=NULL) {
 	// Randomizing listening port for Certificate mode connectivity
+    _server_address = server_address;
 	srand(time(NULL));
 	uint16_t port = rand() % 65535 + 12345;
 
@@ -109,7 +108,7 @@ class MbedClient: public M2MInterfaceObserver {
     String binding_mode;
     (SOCKET_MODE == M2MInterface::UDP) ? binding_mode = "UDP" : binding_mode = "TCP";
     printf("\r\nSOCKET_MODE : %s\r\n", binding_mode.c_str());
-    printf("Connecting to %s\r\n", MBED_SERVER_ADDRESS.c_str());
+    printf("Connecting to %s\r\n", _server_address.c_str());
 
     if(_interface) {
         _interface->set_platform_network_handler(handler);
@@ -143,7 +142,7 @@ class MbedClient: public M2MInterfaceObserver {
         // make sure security ObjectID/ObjectInstance was created successfully
         if(security) {
             // Add ResourceID's and values to the security ObjectID/ObjectInstance
-            security->set_resource_value(M2MSecurity::M2MServerUri, MBED_SERVER_ADDRESS);
+            security->set_resource_value(M2MSecurity::M2MServerUri, _server_address);
             security->set_resource_value(M2MSecurity::SecurityMode, M2MSecurity::Certificate);
             security->set_resource_value(M2MSecurity::ServerPublicKey, SERVER_CERT, sizeof(SERVER_CERT));
             security->set_resource_value(M2MSecurity::PublicKey, CERT, sizeof(CERT));
@@ -326,6 +325,7 @@ class MbedClient: public M2MInterfaceObserver {
     volatile bool            _unregistered;
     int                      _value;
     struct MbedClientDevice  _device;
+    String                   _server_address;
 };
 
 #endif // __SIMPLECLIENT_H__