Merge branch 'master' into doc_update

Author: yogpan01

main.cpp

@@ -17,6 +17,7 @@
 #include <string>
 #include <sstream>
 #include <vector>
+#include "mbed-trace/mbed_trace.h"
 
 #include "security.h"
 
@@ -48,6 +49,22 @@ LoWPANNDInterface mesh;
 ThreadInterface mesh;
 #endif
 
+#ifndef MESH
+#include "eventOS_scheduler.h"
+#include "eventOS_event.h"
+#include "nsdynmemLIB.h"
+#include "platform/arm_hal_timer.h"
+#include "ns_event_loop.h"
+
+#define HEAP_SIZE 1023
+static uint8_t app_stack_heap[HEAP_SIZE + 1];
+// This is address to mbed Device Connector
+#define MBED_SERVER_ADDRESS "coap://api.connector.mbed.com:5684"
+#else
+// This is address to mbed Device Connector
+#define MBED_SERVER_ADDRESS YOTTA_CFG_DEVICE_CONNECTOR_URI
+#endif
+
 Serial output(USBTX, USBRX);
 
 // These are example resource values for the Device Object
@@ -157,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();
@@ -178,10 +195,6 @@ class ButtonResource {
         return btn_object;
     }
 
-    void button_clicked() {
-        output.printf("\n\rButton clicked\r\n");
-    }
-
     /*
      * When you press the button, we read the current value of the click counter
      * from mbed Device Connector, then up the value with one.
@@ -204,19 +217,30 @@ class ButtonResource {
 
 private:
     M2MObject* btn_object;
-    uint16_t counter = 0;
+    uint16_t counter;
 };
 
 // Network interaction must be performed outside of interrupt context
 Semaphore updates(0);
 volatile bool registered = false;
+volatile bool clicked = false;
 osThreadId mainThread;
 
 void unregister() {
     registered = false;
     updates.release();
 }
 
+void button_clicked() {
+    clicked = true;
+    updates.release();
+}
+
+// debug printf function
+void trace_printer(const char* str) {
+    printf("%s\r\n", str);
+}
+
 // Status indication
 Ticker status_ticker;
 DigitalOut status_led(LED1);
@@ -235,6 +259,18 @@ int main() {
 
     output.printf("Starting mbed Client example...\r\n");
 
+    mbed_trace_init();
+    mbed_trace_print_function_set(trace_printer);
+
+#ifndef MESH
+    ns_dyn_mem_init(app_stack_heap, HEAP_SIZE,
+                    NULL, 0);
+    platform_timer_enable();
+    eventOS_scheduler_init();
+    ns_event_loop_thread_create();
+    ns_event_loop_thread_start();
+#endif
+
     NetworkStack *network_stack = 0;
 #if defined WIFI
     output.printf("\n\rUsing WiFi \r\n");
@@ -263,19 +299,19 @@ int main() {
     }
 
     // we create our button and LED resources
-    ButtonResource *button_resource = new ButtonResource();
-    LedResource *led_resource = new LedResource();
+    ButtonResource button_resource;
+    LedResource led_resource;
 
     // On press of SW3 button on K64F board, example application
     // will call unregister API towards mbed Device Connector
     //unreg_button.fall(&mbed_client,&MbedClient::test_unregister);
     unreg_button.fall(&unregister);
 
     // Observation Button (SW2) press will send update of endpoint resource values to connector
-    obs_button.fall(button_resource, &ButtonResource::handle_button_click);
+    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
@@ -286,8 +322,8 @@ int main() {
 
     // Add objects to list
     object_list.push_back(device_object);
-    object_list.push_back(button_resource->get_object());
-    object_list.push_back(led_resource->get_object());
+    object_list.push_back(button_resource.get_object());
+    object_list.push_back(led_resource.get_object());
 
     // Set endpoint registration object
     mbed_client.set_register_object(register_object);
@@ -298,14 +334,19 @@ int main() {
 
     while (true) {
         updates.wait(25000);
-
-        if (!registered) {
+        if(registered) {
+            if(!clicked) {
+                mbed_client.test_update_register();
+            }
+        }else {
             break;
         }
+        if(clicked) {
+           clicked = false;
+            button_resource.handle_button_click();
+        }
     }
 
     mbed_client.test_unregister();
     status_ticker.detach();
 }
-
-

mbed-os.lib

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

simpleclient.h

@@ -31,12 +31,8 @@
 //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;
+// MBED_DOMAIN and MBED_ENDPOINT_NAME come
+// from the security.h file copied from connector.mbed.com
 
 struct MbedClientDevice {
     const char* Manufacturer;
@@ -47,7 +43,7 @@ struct MbedClientDevice {
 
 /*
 * Wrapper for mbed client stack that handles all callbacks, error handling, and
-* other schenanigans to make the mbed client stack easier to use.
+* other shenanigans to make the mbed client stack easier to use.
 *
 * The end user should only have to care about configuring the parameters at the
 * top of this file and making sure they add the security.h file correctly.
@@ -91,25 +87,26 @@ 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 char *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;
 
     // create mDS interface object, this is the base object everything else attaches to
     _interface = M2MInterfaceFactory::create_interface(*this,
-                                                      ENDPOINT_NAME,            // endpoint name string
+                                                      MBED_ENDPOINT_NAME,       // endpoint name string
                                                       "test",                   // endpoint type string
                                                       100,                      // lifetime
                                                       port,                     // listen port
-                                                      MBED_USER_NAME_DOMAIN,    // domain string
+                                                      MBED_DOMAIN,              // domain string
                                                       SOCKET_MODE,              // binding mode
                                                       M2MInterface::LwIP_IPv4,  // network stack
                                                       "");                      // context address string
-    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());
+    const char *binding_mode = (SOCKET_MODE == M2MInterface::UDP) ? "UDP" : "TCP";
+    printf("\r\nSOCKET_MODE : %s\r\n", binding_mode);
+    printf("Connecting to %s\r\n", server_address);
 
     if(_interface) {
         _interface->set_platform_network_handler(handler);
@@ -143,7 +140,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));
@@ -267,6 +264,13 @@ class MbedClient: public M2MInterfaceObserver {
             case M2MInterface::NotAllowed:
                 trace_printer("[ERROR:] M2MInterface::NotAllowed");
                 break;
+            case M2MInterface::SecureConnectionFailed:
+                trace_printer("[ERROR:] M2MInterface::SecureConnectionFailed");
+                break;
+            case M2MInterface::DnsResolvingFailed:
+                trace_printer("[ERROR:] M2MInterface::DnsResolvingFailed");
+                break;
+
             default:
                 break;
         }
@@ -319,6 +323,7 @@ class MbedClient: public M2MInterfaceObserver {
     volatile bool            _unregistered;
     int                      _value;
     struct MbedClientDevice  _device;
+    String                   _server_address;
 };
 
 #endif // __SIMPLECLIENT_H__