Okundu Omeni / Mbed OS wifi-https-ble-sm-uart-atcmd-5-13-1

Dependencies:   mbed-http

Diff: source/main-https.cpp

Branch:
PassingRegression
Revision:
116:2296cf274661
Parent:
115:8054dbadfaa0
Child:
117:8fd05113efc1
diff -r 8054dbadfaa0 -r 2296cf274661 source/main-https.cpp
--- a/source/main-https.cpp	Sun May 19 11:25:28 2019 +0000
+++ b/source/main-https.cpp	Sun May 19 13:09:27 2019 +0000
@@ -30,8 +30,9 @@
 main_states_t mainLoop;
 static RawSerial *device; // tx, rx
 
+static app_config_t app_config;
 // wifi configuration
-static wifi_config_t wifi_config;
+//static wifi_config_t wifi_config;
 // wifi interface pointer
 static WiFiInterface *network;
 // wifi manager pointer
@@ -42,7 +43,11 @@
 BLE& _ble = BLE::Instance();
 
 // BLE configuration
-static ble_config_t ble_config;
+//static ble_config_t ble_config;
+
+// internet/cloud configuration
+//internet_config_t internet_config;
+
 const uint8_t pairingPassword[6] = "1101";
 // BLE peripheral pointer
 static SMDevicePeripheral *peripheral;
@@ -164,20 +169,28 @@
 
 void setupDefaultBleConfig()
 {
-    strcpy(ble_config.deviceName, DEVICE_NAME_MAIN);// set BLE device name
-    ble_config.advInterval = 1000;             // set advertising interval to 1 second default
-    ble_config.advTimeout = 0;                 // set advertising timeout to disabled by default
+    strcpy(app_config.ble_config.deviceName, DEVICE_NAME_MAIN);// set BLE device name
+    app_config.ble_config.advInterval = 1000;             // set advertising interval to 1 second default
+    app_config.ble_config.advTimeout = 0;                 // set advertising timeout to disabled by default
     // This works in C and C++
-    memcpy(ble_config.pairingKey, pairingPassword, 6); // 
+    memcpy(app_config.ble_config.pairingKey, pairingPassword, 6); // 
 
     //ble_config.pairingKey = pairingPassword;
 }
 
 void setupDefaultWiFiConfig()
 {
-    strcpy(wifi_config.ssid, MBED_CONF_APP_WIFI_SSID);
-    strcpy(wifi_config.pass, MBED_CONF_APP_WIFI_PASSWORD);
-    wifi_config.security = NSAPI_SECURITY_WPA_WPA2;
+    strcpy(app_config.wifi_config.ssid, MBED_CONF_APP_WIFI_SSID);
+    strcpy(app_config.wifi_config.pass, MBED_CONF_APP_WIFI_PASSWORD);
+    app_config.wifi_config.security = NSAPI_SECURITY_WPA_WPA2;
+}
+
+void setupDefaultCloudConfig()
+{
+    strcpy(app_config.internet_config.url, "tcp://https://dev2.dnanudge.io");
+    app_config.internet_config.peer_id = 0;
+    app_config.internet_config.remote_port = 443; // default HTTPS port
+    app_config.internet_config.connectionScheme = ALWAYS_CONNECTED;
 }
 
 static int reset_counter = 0;
@@ -233,7 +246,8 @@
     }
 #endif
     dbg_printf(LOG, "\r\n PERIPHERAL \r\n\r\n");
-    peripheral = new SMDevicePeripheral(_ble, eventQueue_ble, peer_address, ble_config);
+    peripheral = new SMDevicePeripheral(_ble, eventQueue_ble, peer_address, 
+                                        &app_config.ble_config);
 
     peripheral->run();
     btle_thread.start(callback(&eventQueue_ble, &EventQueue::dispatch_forever));
@@ -246,7 +260,8 @@
 
 void start_WiFi()
 {
-    wiFiManager = new WiFiManager(wifi_config, network, 
+    wiFiManager = new WiFiManager(&app_config.wifi_config, network, 
+                                  &app_config.internet_config,
                                   eventQueue_wifi,
                                   &aT2WiFimPool, &aT2WiFiCmdQueue,
                                   &wiFi2ATmPool, &wiFi2ATCmdQueue,