Diff: main.cpp

Revision:

2:6ec5c1c1d41c

Parent:

0:eb73febb2bba

Child:

6:ea24d9271ff1

diff -r 5d3134f9efae -r 6ec5c1c1d41c main.cpp
--- a/main.cpp	Wed Oct 19 15:58:43 2016 +0900
+++ b/main.cpp	Tue Mar 28 11:02:34 2017 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 ARM Limited. All rights reserved.
+ * Copyright (c) 2015, 2016 ARM Limited. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  * Licensed under the Apache License, Version 2.0 (the License); you may
  * not use this file except in compliance with the License.
@@ -13,55 +13,49 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "simpleclient.h"
+#include "mbed-trace/mbed_trace.h"
+#include "mbed.h"
+#include "zxing_main.h"
+
+// Network interaction must be performed outside of interrupt context
+osThreadId mainThread;
+
+#define NO_CONNECT         (-1)
+
+#if MBED_CONF_APP_NETWORK_INTERFACE == NO_CONNECT
+
+static void callback_zxing(char * addr, int size) {
+    printf("%s\r\n", addr);
+}
+
+// Entry point to the program
+int main() {
+    // Keep track of the main thread
+    mainThread = osThreadGetId();
+    printf("no connect\n");
+    mbed_trace_init();
+    zxing_init(&callback_zxing);
+
+    while (1) {
+        zxing_loop();
+        Thread::wait(5);
+    }
+}
+
+#else // MBED_CONF_APP_NETWORK_INTERFACE != NO_CONNECT
+
+#define __STDC_FORMAT_MACROS
 #include <string>
 #include <sstream>
 #include <vector>
-#include "mbed-trace/mbed_trace.h"
-
 #include "security.h"
-
-#include "mbed.h"
-#include "rtos.h"
-
-#define ETHERNET        1
-#define WIFI            2
-#define MESH_LOWPAN_ND  3
-#define MESH_THREAD     4
-
-#define STRINGIFY(s) #s
+#include "simpleclient.h"
+#include "mbedtls/entropy_poll.h"
 
-#if MBED_CONF_APP_NETWORK_INTERFACE == WIFI
-#if(1) //bp3595
-#include "LWIPBP3595Interface.h"
-LWIPBP3595Interface esp;
-DigitalOut usb1en(P3_8);
-#else
-#include "ESP8266Interface.h"
-ESP8266Interface esp(MBED_CONF_APP_WIFI_TX, MBED_CONF_APP_WIFI_RX);
-#endif
-#elif MBED_CONF_APP_NETWORK_INTERFACE == ETHERNET
-#include "EthernetInterface.h"
-EthernetInterface eth;
-#elif MBED_CONF_APP_NETWORK_INTERFACE == MESH_LOWPAN_ND
-#define MESH
-#include "NanostackInterface.h"
-LoWPANNDInterface mesh;
-#elif MBED_CONF_APP_NETWORK_INTERFACE == MESH_THREAD
-#define MESH
-#include "NanostackInterface.h"
-ThreadInterface mesh;
-#endif
-
-#ifndef MESH
-// 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 "coaps://[2607:f0d0:2601:52::20]:5684"
-#endif
-
-Serial output(USBTX, USBRX);
+// easy-connect compliancy, it has 2 sets of wifi pins we have only one
+#define MBED_CONF_APP_ESP8266_TX MBED_CONF_APP_WIFI_TX
+#define MBED_CONF_APP_ESP8266_RX MBED_CONF_APP_WIFI_RX
+#include "easy-connect.h"
 
 // These are example resource values for the Device Object
 struct MbedClientDevice device = {
@@ -74,28 +68,10 @@
 // Instantiate the class which implements LWM2M Client API (from simpleclient.h)
 MbedClient mbed_client(device);
 
-
-#if(1)  //for zxing with camera
-InterruptIn unreg_button(USER_BUTTON0);
-#else
-// In case of K64F board , there is button resource available
-// to change resource value and unregister
-#ifdef TARGET_K64F
-// Set up Hardware interrupt button.
-InterruptIn obs_button(SW2);
-InterruptIn unreg_button(SW3);
-#else
-//In non K64F boards , set up a timer to simulate updating resource,
-// there is no functionality to unregister.
-Ticker timer;
-#endif
-#endif
-
 // LED Output
 DigitalOut led1(LED1);
 DigitalOut led2(LED2);
 DigitalOut led3(LED3);
-
 /*
  * The Led contains one property (pattern) and a function (blink).
  * When the function blink is executed, the pattern is read, and the LED
@@ -131,13 +107,16 @@
         led_res->set_operation(M2MBase::POST_ALLOWED);
         // when a POST comes in, we want to execute the led_execute_callback
         led_res->set_execute_function(execute_callback(this, &LedResource::blink));
+
     }
 
     M2MObject* get_object() {
         return led_object;
     }
 
-    void blink(void *) {
+    void blink(void *argument) {
+
+
         // read the value of 'Pattern'
         M2MObjectInstance* inst = led_object->object_instance();
         M2MResource* res = inst->resource("5853");
@@ -158,7 +137,7 @@
         std::string s((char*)buffIn, sizeIn);
         std::vector<uint32_t>* v = new std::vector<uint32_t>;
 
-        output.printf("led_execute_callback pattern=%s\r\n", s.c_str());
+        printf("led_execute_callback pattern=%s\r\n", s.c_str());
 
         // our pattern is something like 500:200:500, so parse that
         std::size_t found = s.find_first_of(":");
@@ -171,16 +150,24 @@
                 v->push_back(atoi((const char*)s.c_str()));
             }
         }
-
-
-        // do_blink is called with the vector, and starting at -1
-        do_blink(v, cbuffIn, 0);
+        int position = 0;
+        while (1) {
+            do_blink(cbuffIn);
+            if (position >= v->size()) {
+                break;
+            }
+            // how long do we need to wait before the next blink?
+            Thread::wait(v->at(position));
+            position++;
+        }
+        free(buffIn);
+        free(cbuffIn);
+        delete v;
     }
 
 private:
     M2MObject* led_object;
-
-    void do_blink(std::vector<uint32_t>* pattern, uint8_t* color,  uint16_t position) {
+    void do_blink(uint8_t* color) {
         
         if (!strcmp((char *)color, "red")) {
             // blink the LED in red color
@@ -218,24 +205,9 @@
         else {
             // no operation
         }
-
-        // up the position, if we reached the end of the vector
-        if (position >= pattern->size()) {
-            // free memory, and exit this function
-            delete pattern;
-            return;
-        }
-
-        // how long do we need to wait before the next blink?
-        uint32_t delay_ms = pattern->at(position);
-
-        // Invoke same function after `delay_ms` (upping position)
-        Thread::wait(delay_ms);
-        do_blink(pattern, color, ++position);
     }
 };
 
-#if(1)  //for zxing with camera
 /*
  * The Zxing contains a function (send string).
  * When `handle_string_send` is executed, the string after decoding is sent.
@@ -253,7 +225,7 @@
         zxing_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
-        zxing_res->set_value((uint8_t*)"0", 1);        
+        zxing_res->set_value((uint8_t*)"0", 1);
     }
 
     ~ZxingResource() {
@@ -279,202 +251,73 @@
 private:
     M2MObject* zxing_object;
 };
-#else
-/*
- * The button contains one property (click count).
- * When `handle_button_click` is executed, the counter updates.
- */
-class ButtonResource {
-public:
-    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();
-        // create resource with ID '5501', which is digital input counter
-        M2MResource* btn_res = btn_inst->create_dynamic_resource("5501", "Button",
-            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);        
-    }
 
-    ~ButtonResource() {
-    }
-
-    M2MObject* get_object() {
-        return btn_object;
-    }
-
-    /*
-     * When you press the button, we read the current value of the click counter
-     * from mbed Device Connector, then up the value with one.
-     */
-    void handle_button_click() {
-        M2MObjectInstance* inst = btn_object->object_instance();
-        M2MResource* res = inst->resource("5501");
-
-        // up counter
-        counter++;
-#ifdef TARGET_K64F
-        printf("handle_button_click, new value of counter is %d\r\n", counter);
-#else
-        printf("simulate button_click, new value of counter is %d\r\n", counter);
-#endif
-        // 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);
-    }
-
-private:
-    M2MObject* btn_object;
-    uint16_t counter;
-};
-#endif
-
-
-// Network interaction must be performed outside of interrupt context
-#if(1)  //for zxing with camera
 ZxingResource zxing_resource;
-#else
-Semaphore updates(0);
-#endif
-volatile bool registered = false;
-volatile bool clicked = false;
-osThreadId mainThread;
-
-void unregister() {
-    registered = false;
-#if(1)  //for zxing with camera
-#else
-    updates.release();
-#endif
-}
-
-#if(1)  //for zxing with camera
-#else
-void button_clicked() {
-    clicked = true;
-    updates.release();
-}
-#endif
-
-// debug printf function
-void trace_printer(const char* str) {
-    printf("%s\r\n", str);
-}
-
-// Status indication
-Ticker status_ticker;
-DigitalOut status_led(LED4);
-void blinky() { status_led = !status_led; }
-
-#if(1)  //for zxing with camera
-extern void zxing_init(void (*pfunc)(char * addr, int size));
-extern int zxing_loop();
 
 static void callback_zxing(char * addr, int size) {
     zxing_resource.handle_string_send(addr, size);
 }
-#endif
+
+static volatile bool registered;
+
+void unregister() {
+    registered = false;
+}
 
 // Entry point to the program
 int main() {
 
-#ifndef MBEDTLS_ENTROPY_HARDWARE_ALT
+    unsigned int seed;
+    size_t len;
 
-#ifdef MBEDTLS_TEST_NULL_ENTROPY
+#ifdef MBEDTLS_ENTROPY_HARDWARE_ALT
+    // Used to randomize source port
+    mbedtls_hardware_poll(NULL, (unsigned char *) &seed, sizeof seed, &len);
+
+#elif defined MBEDTLS_TEST_NULL_ENTROPY
+
 #warning "mbedTLS security feature is disabled. Connection will not be secure !! Implement proper hardware entropy for your selected hardware."
+    // Used to randomize source port
+    mbedtls_null_entropy_poll( NULL,(unsigned char *) &seed, sizeof seed, &len);
 
 #else
 
 #error "This hardware does not have entropy, endpoint will not register to Connector.\
 You need to enable NULL ENTROPY for your application, but if this configuration change is made then no security is offered by mbed TLS.\
 Add MBEDTLS_NO_DEFAULT_ENTROPY_SOURCES and MBEDTLS_TEST_NULL_ENTROPY in mbed_app.json macros to register your endpoint."
-#endif
 
 #endif
-    status_ticker.attach_us(blinky, 250000);
 
+    srand(seed);
     // Keep track of the main thread
     mainThread = osThreadGetId();
+    printf("\nStarting mbed Client example in ");
 
-    // Sets the console baud-rate
-    output.baud(115200);
-
-    output.printf("Starting mbed Client example...\r\n");
+#if defined (MESH) || (MBED_CONF_LWIP_IPV6_ENABLED==true)
+    printf("IPv6 mode\n");
+#else
+    printf("IPv4 mode\n");
+#endif
 
     mbed_trace_init();
-    mbed_trace_print_function_set(trace_printer);
 
-    NetworkInterface *network_interface = 0;
-    int connect_success = -1;
-#if MBED_CONF_APP_NETWORK_INTERFACE == WIFI
-    output.printf("\n\rUsing WiFi \r\n");
-    output.printf("\n\rConnecting to WiFi..\r\n");
-#if(1) //bp3595
+#if MBED_CONF_APP_NETWORK_INTERFACE == WIFI_BP3595
+    DigitalOut usb1en(P3_8);
     usb1en = 1;
     Thread::wait(5);
     usb1en = 0;
     Thread::wait(5);
-    connect_success = esp.connect(MBED_CONF_APP_WIFI_SSID, MBED_CONF_APP_WIFI_PASSWORD, MBED_CONF_APP_WIFI_SECURITY);
-#else
-    connect_success = esp.connect(MBED_CONF_APP_WIFI_SSID, MBED_CONF_APP_WIFI_PASSWORD);
 #endif
-    network_interface = &esp;
-#elif MBED_CONF_APP_NETWORK_INTERFACE == ETHERNET
-    output.printf("Using Ethernet\r\n");
-    connect_success = eth.connect();
-    network_interface = &eth;
-#endif
-#ifdef MESH
-    output.printf("Using Mesh\r\n");
-    output.printf("\n\rConnecting to Mesh..\r\n");
-    connect_success = mesh.connect();
-    network_interface = &mesh;
-#endif
-    if(connect_success == 0) {
-    output.printf("\n\rConnected to Network successfully\r\n");
-    } else {
-        output.printf("\n\rConnection to Network Failed %d! Exiting application....\r\n", connect_success);
-        return 0;
+
+    NetworkInterface* network = easy_connect(true);
+    if(network == NULL) {
+        printf("\nConnection to Network Failed - exiting application...\n");
+        return -1;
     }
-    const char *ip_addr = network_interface->get_ip_address();
-    if (ip_addr) {
-        output.printf("IP address %s\r\n", ip_addr);
-    } else {
-        output.printf("No IP address\r\n");
-    }
-
-#if(1)  //for zxing with camera
     LedResource led_resource;
 
-    // On press of USER_BUTTON0 button on GR-PEACH board, example application
-    // will call unregister API towards mbed Device Connector
-    unreg_button.fall(&unregister);
-#else
-    // we create our button and LED resources
-    ButtonResource button_resource;
-    LedResource led_resource;
-
-#ifdef TARGET_K64F
-    // 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_clicked);
-#else
-    // Send update of endpoint resource values to connector every 15 seconds periodically
-    timer.attach(&button_clicked, 15.0);
-#endif
-#endif
-
     // Create endpoint interface to manage register and unregister
-    mbed_client.create_interface(MBED_SERVER_ADDRESS, network_interface);
+    mbed_client.create_interface(MBED_SERVER_ADDRESS, network);
 
     // 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
@@ -485,26 +328,25 @@
 
     // Add objects to list
     object_list.push_back(device_object);
-#if(1)  //for zxing with camera
+    object_list.push_back(led_resource.get_object());
     object_list.push_back(zxing_resource.get_object());
-#else
-    object_list.push_back(button_resource.get_object());
-#endif
-    object_list.push_back(led_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);
-    registered = true;
 
-#if(1)  //for zxing with camera
     zxing_init(&callback_zxing);
+
     Timer update_timer;
     update_timer.reset();
     update_timer.start();
 
+    registered = true;
+    InterruptIn unreg_button(USER_BUTTON0);
+    unreg_button.fall(&unregister);
+
     while (registered) {
         if (zxing_loop() == 0) {
             update_timer.reset();
@@ -516,23 +358,10 @@
         }
         Thread::wait(5);
     }
-#else
-    while (true) {
-        updates.wait(25000);
-        if(registered) {
-            if(!clicked) {
-                mbed_client.test_update_register();
-            }
-        }else {
-            break;
-        }
-        if(clicked) {
-           clicked = false;
-            button_resource.handle_button_click();
-        }
-    }
-#endif
 
     mbed_client.test_unregister();
-    status_ticker.detach();
 }
+
+#endif // MBED_CONF_APP_NETWORK_INTERFACE != NO_CONNECT
+
+