added separate resource for timer

Author: JuhaYlipekkala

main.cpp

@@ -93,17 +93,18 @@ class InteractionProvider {
 
 	    // Use the counter button handler to send an update of endpoint resource values
 		// to connector every 15 seconds periodically.
-	    timer.attach(this, &InteractionProvider::counter_button_handler, 15.0);
+	    timer.attach(this, &InteractionProvider::timer_handler, 15.0);
 	}
 
 	// flags for interaction, these are read from outside interrupt context
-	volatile bool registered = false;
+	volatile bool timer_ticked = false;
 	volatile bool clicked = false;
 
+
 private:
 
-	void unreg_button_handler() {
-	    registered = false;
+	void timer_handler() {
+	    timer_ticked = true;
 	    updates.release();
 	}
 
@@ -307,6 +308,61 @@ class ButtonResource {
     uint16_t counter;
 };
 
+/*
+ * The timer contains one property: counter.
+ * When `handle_timer_tick` is executed, the counter updates.
+ */
+class TimerResource {
+public:
+    TimerResource(): 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();
+        // create resource with ID '5502', which is digital input counter
+        M2MResource* btn_res = btn_inst->create_dynamic_resource("5502", "Timer",
+            M2MResourceInstance::INTEGER, true /* observable */);
+        // we can read this value
+        btn_res->set_operation(M2MBase::GET_ALLOWED);
+        // set initial value (all values in mbed Client are buffers)
+        // to be able to read this data easily in the Connector console, we'll use a string
+        btn_res->set_value((uint8_t*)"0", 1);
+    }
+
+    ~TimerResource() {
+    }
+
+    M2MObject* get_object() {
+        return btn_object;
+    }
+
+    /*
+     * When the timer ticks, we read the current value of the click counter
+     * from mbed Device Connector, then up the value with one.l
+     */
+    void handle_timer_tick() {
+        if (mbed_client.register_successful()) {
+            M2MObjectInstance* inst = btn_object->object_instance();
+            M2MResource* res = inst->resource("5502");
+
+            // up counter
+            counter++;
+            printf("handle_timer_click, new value of counter is %d\n", counter);
+            // serialize the value of counter as a string, and tell connector
+            char buffer[20];
+            int size = sprintf(buffer,"%d",counter);
+            res->set_value((uint8_t*)buffer, size);
+        } else {
+            printf("handle_timer_tick, device not registered\n");
+        }
+    }
+
+private:
+    M2MObject* btn_object;
+    uint16_t counter;
+};
+
+
+
 class BigPayloadResource {
 public:
     BigPayloadResource() {
@@ -408,10 +464,11 @@ Add MBEDTLS_NO_DEFAULT_ENTROPY_SOURCES and MBEDTLS_TEST_NULL_ENTROPY in mbed_app
         return -1;
     }
 
-    // we create our button and LED resources
+    // we create our button, timer and LED resources
     ButtonResource button_resource;
     LedResource led_resource;
     BigPayloadResource big_payload_resource;
+    TimerResource timer_resource;
 
     // Network interaction must be performed outside of interrupt context
     Semaphore updates(0);
@@ -434,17 +491,18 @@ Add MBEDTLS_NO_DEFAULT_ENTROPY_SOURCES and MBEDTLS_TEST_NULL_ENTROPY in mbed_app
     object_list.push_back(button_resource.get_object());
     object_list.push_back(led_resource.get_object());
     object_list.push_back(big_payload_resource.get_object());
+    object_list.push_back(timer_resource.get_object());
 
     // Set endpoint registration object
     mbed_client.set_register_object(register_object);
 
     // Register with mbed Device Connector
     mbed_client.test_register(register_object, object_list);
-    interaction_provider.registered = true;
+    volatile bool registered = true;
 
     while (true) {
         updates.wait(25000);
-        if(interaction_provider.registered) {
+        if(registered) {
             if(!interaction_provider.clicked) {
                 mbed_client.test_update_register();
             }
@@ -455,6 +513,10 @@ Add MBEDTLS_NO_DEFAULT_ENTROPY_SOURCES and MBEDTLS_TEST_NULL_ENTROPY in mbed_app
             interaction_provider.clicked = false;
             button_resource.handle_button_click();
         }
+        if(interaction_provider.timer_ticked) {
+            interaction_provider.timer_ticked = false;
+            timer_resource.handle_timer_tick();
+        }
     }
 
     mbed_client.test_unregister();