Revision 1:5af739d06652, committed 2018-08-09

Comitter:

Bongjun

Date:

Thu Aug 09 08:17:51 2018 +0000

Parent:

0:e8ce78953d20

Child:

2:10bfec05d9f9

Commit message:

minor changes for W5500 Ethernet component

Changed in this revision

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/easy-connect.cpp	Thu Aug 09 08:17:51 2018 +0000
@@ -0,0 +1,512 @@
+/*
+ * FILE: easy-connect.cpp
+ *
+ * Copyright (c) 2015 - 2017 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mbed.h"
+#include "easy-connect.h"
+
+/*
+ * Instantiate the configured network interface
+ */
+#if MBED_CONF_APP_NETWORK_INTERFACE == WIFI_ESP8266
+#include "ESP8266Interface.h"
+#define EASY_CONNECT_WIFI_TYPE "ESP8266"
+
+#ifdef MBED_CONF_APP_ESP8266_DEBUG
+ESP8266Interface wifi(MBED_CONF_EASY_CONNECT_WIFI_ESP8266_TX, MBED_CONF_EASY_CONNECT_WIFI_ESP8266_RX, MBED_CONF_EASY_CONNECT_WIFI_ESP8266_DEBUG);
+#else
+ESP8266Interface wifi(MBED_CONF_EASY_CONNECT_WIFI_ESP8266_TX, MBED_CONF_EASY_CONNECT_WIFI_ESP8266_RX);
+#endif
+
+#elif MBED_CONF_APP_NETWORK_INTERFACE == WIFI_ODIN
+#define EASY_CONNECT_WIFI_TYPE "Odin"
+#include "OdinWiFiInterface.h"
+OdinWiFiInterface wifi;
+
+#elif MBED_CONF_APP_NETWORK_INTERFACE == WIFI_RTW
+#define EASY_CONNECT_WIFI_TYPE "RTW"
+#include "RTWInterface.h"
+RTWInterface wifi;
+
+#elif MBED_CONF_APP_NETWORK_INTERFACE == WIFI_IDW0XX1
+#include "SpwfSAInterface.h"
+
+#if MBED_CONF_IDW0XX1_EXPANSION_BOARD == IDW01M1
+#define EASY_CONNECT_WIFI_TYPE "IDW01M1"
+SpwfSAInterface wifi(MBED_CONF_EASY_CONNECT_WIFI_IDW01M1_TX, MBED_CONF_EASY_CONNECT_WIFI_IDW01M1_RX);
+#endif //  MBED_CONF_IDW0XX1_EXPANSION_BOARD == IDW01M1
+
+#if MBED_CONF_IDW0XX1_EXPANSION_BOARD == IDW04A1
+#define EASY_CONNECT_WIFI_TYPE "IDW04A1"
+SpwfSAInterface wifi(MBED_CONF_EASY_CONNECT_WIFI_IDW04A1_TX, MBED_CONF_EASY_CONNECT_WIFI_IDW04A1_RX);
+#endif //  MBED_CONF_IDW0XX1_EXPANSION_BOARD == IDW04A1
+
+#elif MBED_CONF_APP_NETWORK_INTERFACE == WIFI_ISM43362
+#include "ISM43362Interface.h"
+#define EASY_CONNECT_WIFI_TYPE "ISM43362"
+
+#ifdef MBED_CONF_APP_ISM43362_DEBUG
+ISM43362Interface wifi(true);
+#else
+ISM43362Interface wifi;
+#endif
+
+#elif MBED_CONF_APP_NETWORK_INTERFACE == ETHERNET
+#include "EthernetInterface.h"
+EthernetInterface eth;
+
+#elif MBED_CONF_APP_NETWORK_INTERFACE == MESH_LOWPAN_ND
+#define EASY_CONNECT_MESH
+#include "NanostackInterface.h"
+LoWPANNDInterface mesh;
+
+#elif MBED_CONF_APP_NETWORK_INTERFACE == MESH_THREAD
+#define EASY_CONNECT_MESH
+#include "NanostackInterface.h"
+ThreadInterface mesh;
+
+#elif MBED_CONF_APP_NETWORK_INTERFACE == CELLULAR_ONBOARD
+#include "OnboardCellularInterface.h"
+OnboardCellularInterface cellular;
+
+#elif MBED_CONF_APP_NETWORK_INTERFACE == CELLULAR
+#include "EasyCellularConnection.h"
+EasyCellularConnection cellular;
+
+#elif MBED_CONF_APP_NETWORK_INTERFACE == WIFI_WIZFI310
+#include "WizFi310Interface.h"
+#define EASY_CONNECT_WIFI_TYPE "WizFi310"
+
+#ifdef MBED_CONF_APP_WIZFI310_DEBUG
+    WizFi310Interface wifi(MBED_CONF_EASY_CONNECT_WIFI_WIZFI310_TX, MBED_CONF_EASY_CONNECT_WIFI_WIZFI310_RX, MBED_CONF_EASY_CONNECT_WIFI_WIZFI310_DEBUG);
+#else
+    WizFi310Interface wifi(MBED_CONF_EASY_CONNECT_WIFI_WIZFI310_TX, MBED_CONF_EASY_CONNECT_WIFI_WIZFI310_RX);
+#endif
+
+#elif MBED_CONF_APP_NETWORK_INTERFACE == CELLULAR_WNC14A2A
+#include "WNC14A2AInterface.h"
+
+#if MBED_CONF_APP_WNC_DEBUG == true
+#include "WNCDebug.h"
+WNCDebug dbgout(stderr);
+WNC14A2AInterface wnc(&dbgout);
+#else
+WNC14A2AInterface wnc;
+#endif
+
+
+#elif MBED_CONF_APP_NETWORK_INTERFACE == ETHERNET_W5500
+SPI spi(PA_7,PA_6,PA_5); // mosi, miso, sclk
+#include "W5500Interface.h"
+W5500Interface eth(&spi, PB_6, NC); // mosi, miso, sclk, cs, reset
+ 
+#include "DHCPClient.h"
+DHCPClient dhcp;
+ 
+#include "DNSClient.h"
+DNSClient  dns;
+ 
+#include "nsapi_dns.h"
+#else
+#error "No connectivity method chosen. Please add 'config.network-interfaces.value' to your mbed_app.json (see README.md for more information)."
+#endif // MBED_CONF_APP_NETWORK_INTERFACE
+
+/*
+ * In case of Mesh, instantiate the configured RF PHY.
+ */
+#if defined (EASY_CONNECT_MESH)
+#if MBED_CONF_APP_MESH_RADIO_TYPE == ATMEL
+#include "NanostackRfPhyAtmel.h"
+#define EASY_CONNECT_MESH_TYPE "Atmel"
+NanostackRfPhyAtmel rf_phy(ATMEL_SPI_MOSI, ATMEL_SPI_MISO, ATMEL_SPI_SCLK, ATMEL_SPI_CS,
+                           ATMEL_SPI_RST, ATMEL_SPI_SLP, ATMEL_SPI_IRQ, ATMEL_I2C_SDA, ATMEL_I2C_SCL);
+
+#elif MBED_CONF_APP_MESH_RADIO_TYPE == MCR20
+#include "NanostackRfPhyMcr20a.h"
+#define EASY_CONNECT_MESH_TYPE "Mcr20A"
+NanostackRfPhyMcr20a rf_phy(MCR20A_SPI_MOSI, MCR20A_SPI_MISO, MCR20A_SPI_SCLK, MCR20A_SPI_CS, MCR20A_SPI_RST, MCR20A_SPI_IRQ);
+
+#elif MBED_CONF_APP_MESH_RADIO_TYPE == SPIRIT1
+#include "NanostackRfPhySpirit1.h"
+#define EASY_CONNECT_MESH_TYPE "Spirit1"
+NanostackRfPhySpirit1 rf_phy(SPIRIT1_SPI_MOSI, SPIRIT1_SPI_MISO, SPIRIT1_SPI_SCLK,
+                             SPIRIT1_DEV_IRQ, SPIRIT1_DEV_CS, SPIRIT1_DEV_SDN, SPIRIT1_BRD_LED);
+
+#elif MBED_CONF_APP_MESH_RADIO_TYPE == EFR32
+#include "NanostackRfPhyEfr32.h"
+#define EASY_CONNECT_MESH_TYPE "EFR32"
+NanostackRfPhyEfr32 rf_phy;
+
+#endif // MBED_CONF_APP_RADIO_TYPE
+#endif // EASY_CONNECT_MESH
+
+#if defined (EASY_CONNECT_WIFI)
+#define WIFI_SSID_MAX_LEN      32    // As per IEEE 802.11 chapter 7.3.2.1 (SSID element)
+#define WIFI_PASSWORD_MAX_LEN  64    // 
+
+char* _ssid = NULL;
+char* _password = NULL;
+#endif // EASY_CONNECT_WIFI
+
+/* \brief print_MAC - print_MAC  - helper function to print out MAC address
+ * in: network_interface - pointer to network i/f
+ *     bool log-messages   print out logs or not
+ * MAC address is printed, if it can be acquired & log_messages is true.
+ *
+ */
+void print_MAC(NetworkInterface* network_interface, bool log_messages) {
+#if MBED_CONF_APP_NETWORK_INTERFACE != CELLULAR_ONBOARD && MBED_CONF_APP_NETWORK_INTERFACE != CELLULAR
+    const char *mac_addr = network_interface->get_mac_address();
+    if (mac_addr == NULL) {
+        if (log_messages) {
+            printf("[EasyConnect] ERROR - No MAC address\n");
+        }
+        return;
+    }
+    if (log_messages) {
+        printf("[EasyConnect] MAC address %s\n", mac_addr);
+    }
+#endif
+}
+
+
+
+/* \brief easy_connect     easy_connect() function to connect the pre-defined network bearer,
+ *                         config done via mbed_app.json (see README.md for details).
+ *
+ * IN: bool  log_messages  print out diagnostics or not.
+ */
+NetworkInterface* easy_connect(bool log_messages) {
+    NetworkInterface* network_interface = NULL;
+    int connect_success = -1;
+
+#if defined (EASY_CONNECT_WIFI)
+    // We check if the _ssid and _password have already been set (via the easy_connect()
+    // that takes thoses parameters or not.
+    // If they have not been set, use the ones we can gain from mbed_app.json.
+    if (_ssid == NULL) { 
+        if(strlen(MBED_CONF_APP_WIFI_SSID) > WIFI_SSID_MAX_LEN) {
+            printf("ERROR - MBED_CONF_APP_WIFI_SSID is too long %d vs. %d\n", 
+                    strlen(MBED_CONF_APP_WIFI_SSID),
+                    WIFI_SSID_MAX_LEN);
+            return NULL;
+        }
+    }
+
+    if (_password == NULL) {
+        if(strlen(MBED_CONF_APP_WIFI_PASSWORD) > WIFI_PASSWORD_MAX_LEN) {
+            printf("ERROR - MBED_CONF_APP_WIFI_PASSWORD is too long %d vs. %d\n", 
+                    strlen(MBED_CONF_APP_WIFI_PASSWORD),
+                    WIFI_PASSWORD_MAX_LEN);
+            return NULL;
+        }
+    }
+#endif // EASY_CONNECT_WIFI
+
+    /// This should be removed once mbedOS supports proper dual-stack
+    if (log_messages) {
+#if defined (EASY_CONNECT_MESH) || (MBED_CONF_LWIP_IPV6_ENABLED==true)
+        printf("[EasyConnect] IPv6 mode\n");
+#else
+        printf("[EasyConnect] IPv4 mode\n");
+#endif
+    }
+
+#if defined (EASY_CONNECT_WIFI)
+    if (log_messages) {
+        printf("[EasyConnect] Using WiFi (%s) \n", EASY_CONNECT_WIFI_TYPE);
+        printf("[EasyConnect] Connecting to WiFi %s\n", 
+                ((_ssid == NULL) ? MBED_CONF_APP_WIFI_SSID : _ssid) );
+    }
+    network_interface = &wifi;
+    if (_ssid == NULL) {
+        connect_success = wifi.connect(MBED_CONF_APP_WIFI_SSID, MBED_CONF_APP_WIFI_PASSWORD,
+                          (strlen(MBED_CONF_APP_WIFI_PASSWORD) > 1) ? NSAPI_SECURITY_WPA_WPA2 : NSAPI_SECURITY_NONE);
+    }
+    else {
+        connect_success = wifi.connect(_ssid, _password, (strlen(_password) > 1) ? NSAPI_SECURITY_WPA_WPA2 : NSAPI_SECURITY_NONE);
+    }
+#elif MBED_CONF_APP_NETWORK_INTERFACE == CELLULAR_ONBOARD || MBED_CONF_APP_NETWORK_INTERFACE == CELLULAR
+#  ifdef MBED_CONF_APP_CELLULAR_SIM_PIN
+    cellular.set_sim_pin(MBED_CONF_APP_CELLULAR_SIM_PIN);
+#  endif
+#  ifdef MBED_CONF_APP_CELLULAR_APN
+#    ifndef MBED_CONF_APP_CELLULAR_USERNAME
+#      define MBED_CONF_APP_CELLULAR_USERNAME 0
+#    endif
+#    ifndef MBED_CONF_APP_CELLULAR_PASSWORD
+#      define MBED_CONF_APP_CELLULAR_PASSWORD 0
+#    endif
+    cellular.set_credentials(MBED_CONF_APP_CELLULAR_APN, MBED_CONF_APP_CELLULAR_USERNAME, MBED_CONF_APP_CELLULAR_PASSWORD);
+    if (log_messages) {
+        printf("[EasyConnect] Connecting using Cellular interface and APN %s\n", MBED_CONF_APP_CELLULAR_APN);
+    }
+#  else
+    if (log_messages) {
+        printf("[EasyConnect] Connecting using Cellular interface and default APN\n");
+    }
+#  endif
+    connect_success = cellular.connect();
+    network_interface = &cellular;
+
+#elif MBED_CONF_APP_NETWORK_INTERFACE == CELLULAR_WNC14A2A
+    if (log_messages) {
+        printf("[EasyConnect] Using WNC14A2A\n");
+    }
+#   if MBED_CONF_APP_WNC_DEBUG == true
+    printf("[EasyConnect] With WNC14A2A debug output set to 0x%02X\n",MBED_CONF_APP_WNC_DEBUG_SETTING);
+    wnc.doDebug(MBED_CONF_APP_WNC_DEBUG_SETTING);
+#   endif
+    network_interface = &wnc;
+    connect_success = wnc.connect();
+
+#elif MBED_CONF_APP_NETWORK_INTERFACE == ETHERNET
+    if (log_messages) {
+        printf("[EasyConnect] Using Ethernet\n");
+    }
+    network_interface = ð
+#if MBED_CONF_EVENTS_SHARED_DISPATCH_FROM_APPLICATION
+    eth.set_blocking(false);
+#endif
+    connect_success = eth.connect();
+
+#elif MBED_CONF_APP_NETWORK_INTERFACE == ETHERNET_W5500
+ 
+    if (log_messages) {
+        printf("[EasyConnect] Using Ethernet W5500\n");
+    }
+
+    spi.format(32, 0);
+    spi.frequency(100000);
+ 
+    if (log_messages) {
+		printf("[EasyConnect] Wait for SPI\n");
+    }
+    wait(1);
+    
+    if (log_messages) {
+		printf("[EasyConnect] Init with MAC address\n");
+    }
+    uint8_t mac_addr[6] = {0x00, 0x08, 0xdc, 0x45, 0x56, 0x67};
+    eth.init(mac_addr);
+    
+
+
+//	이부분은 W5500Interface 의 connect 함수로 옮기는 게 맞을 듯 하다...
+    if (log_messages) {
+		printf("[EasyConnect] DHCP start\n");
+	}
+    int timeout_ms = 15*1000;
+    int err = dhcp.setup(&eth, mac_addr, timeout_ms);
+    if (err == (-1)) {
+		if (log_messages) {
+			printf("[EasyConnect] Timeout.\n");
+		}
+        return NULL;
+    }
+    if (log_messages) {
+		printf("[EasyConnect] DHCP completed\n");
+		printf("[EasyConnect] Connected, IP: %d.%d.%d.%d\r\n", dhcp.yiaddr[0], dhcp.yiaddr[1], dhcp.yiaddr[2], dhcp.yiaddr[3]);
+	}
+    char ip[24], gateway[24], netmask[24], dnsaddr[24];
+    sprintf(ip,      "%d.%d.%d.%d", dhcp.yiaddr[0],  dhcp.yiaddr[1],  dhcp.yiaddr[2],  dhcp.yiaddr[3]);
+    sprintf(gateway, "%d.%d.%d.%d", dhcp.gateway[0], dhcp.gateway[1], dhcp.gateway[2], dhcp.gateway[3]);
+    sprintf(netmask, "%d.%d.%d.%d", dhcp.netmask[0], dhcp.netmask[1], dhcp.netmask[2], dhcp.netmask[3]);
+    sprintf(dnsaddr, "%d.%d.%d.%d", dhcp.dnsaddr[0], dhcp.dnsaddr[1], dhcp.dnsaddr[2], dhcp.dnsaddr[3]);
+    eth.init(ip, netmask, gateway);
+
+    network_interface = ð
+#if MBED_CONF_EVENTS_SHARED_DISPATCH_FROM_APPLICATION
+    eth.set_blocking(false);
+#endif
+    connect_success = eth.connect();
+	
+#endif
+
+#ifdef EASY_CONNECT_MESH
+    if (log_messages) {
+        printf("[EasyConnect] Using Mesh (%s)\n", EASY_CONNECT_MESH_TYPE);
+        printf("[EasyConnect] Connecting to Mesh...\n");
+    }
+    network_interface = &mesh;
+#if MBED_CONF_EVENTS_SHARED_DISPATCH_FROM_APPLICATION
+    mesh.set_blocking(false);
+#endif
+    mesh.initialize(&rf_phy);
+    connect_success = mesh.connect();
+#endif
+
+    if(connect_success == 0
+#if (MBED_CONF_EVENTS_SHARED_DISPATCH_FROM_APPLICATION && (MBED_CONF_APP_NETWORK_INTERFACE == ETHERNET || defined(EASY_CONNECT_MESH)))
+            || connect_success == NSAPI_ERROR_IS_CONNECTED || connect_success == NSAPI_ERROR_ALREADY
+#endif
+            ) {
+#if (MBED_CONF_EVENTS_SHARED_DISPATCH_FROM_APPLICATION && (MBED_CONF_APP_NETWORK_INTERFACE == ETHERNET || defined(EASY_CONNECT_MESH)))
+        nsapi_connection_status_t connection_status;
+
+        for (;;) {
+
+            // Check current connection status.
+            connection_status = network_interface->get_connection_status();
+
+            if (connection_status == NSAPI_STATUS_GLOBAL_UP) {
+
+                // Connection ready.
+                break;
+
+            } else if (connection_status == NSAPI_STATUS_ERROR_UNSUPPORTED) {
+
+                if (log_messages) {
+                    print_MAC(network_interface, log_messages);
+                    printf("[EasyConnect] Connection to Network Failed %d!\n", connection_status);
+                }
+                return NULL;
+
+            }
+
+            // Not ready yet, give some runtime to the network stack.
+            mbed::mbed_event_queue()->dispatch(100);
+
+        }
+#endif
+
+        if (log_messages) {
+            printf("[EasyConnect] Connected to Network successfully\n");
+            print_MAC(network_interface, log_messages);
+        }
+    } else {
+        if (log_messages) {
+            print_MAC(network_interface, log_messages);
+            printf("[EasyConnect] Connection to Network Failed %d!\n", connect_success);
+        }
+        return NULL;
+    }
+    const char *ip_addr  = network_interface->get_ip_address();
+    if (ip_addr == NULL) {
+        if (log_messages) {
+            printf("[EasyConnect] ERROR - No IP address\n");
+        }
+        return NULL;
+    }
+
+    if (log_messages) {
+        printf("[EasyConnect] IP address %s\n", ip_addr);
+    }
+    return network_interface;
+}
+
+/* \brief easy_connect - easy_connect function to connect the pre-defined network bearer,
+ *                       config done via mbed_app.json (see README.md for details).
+ *                       This version is just a helper version and uses the easy_connect() with
+ *                       one parameters to do it's job.
+ * IN: bool  log_messages  print out diagnostics or not.
+ *     char* WiFiSSID      WiFi SSID - pointer to WiFi SSID, but if it is NULL  
+ *                         then MBED_CONF_APP_WIFI_SSID will be used
+ *     char* WiFiPassword  WiFi Password - pointer to WiFI password, but if it's NULL
+ *                         then MBED_CONF_APP_WIFI_PASSWORD will be used
+ */
+
+NetworkInterface* easy_connect(bool log_messages,
+                               char* WiFiSSID,
+                               char* WiFiPassword ) {
+
+// This functionality only makes sense when using WiFi
+#if defined (EASY_CONNECT_WIFI) 
+    // We essentially want to populate the _ssid and _password and then call easy_connect() again. 
+    if (WiFiSSID != NULL) {
+        if(strlen(WiFiSSID) > WIFI_SSID_MAX_LEN) {
+            printf("ERROR - WiFi SSID is too long - %d vs %d.\n", strlen(WiFiSSID), WIFI_SSID_MAX_LEN);
+            return NULL;
+        }
+        _ssid = WiFiSSID;
+    }
+
+    if (WiFiPassword != NULL) {
+        if(strlen(WiFiPassword) > WIFI_PASSWORD_MAX_LEN) {
+            printf("ERROR - WiFi Password is too long - %d vs %d\n", strlen(WiFiPassword), WIFI_PASSWORD_MAX_LEN);
+            return NULL;
+        }
+        _password = WiFiPassword;
+    }
+#endif // EASY_CONNECT_WIFI
+    return easy_connect(log_messages);
+}
+
+/* \brief easy_get_netif - easy_connect function to get pointer to network interface
+ *                        without connecting to it.
+ *
+ * IN: bool  log_messages  print out diagnostics or not.
+ */
+NetworkInterface* easy_get_netif(bool log_messages) {
+#if defined (EASY_CONNECT_WIFI)
+    if (log_messages) {
+        printf("[EasyConnect] WiFi: %s\n", EASY_CONNECT_WIFI_TYPE);
+    }
+    return &wifi;
+
+#elif MBED_CONF_APP_NETWORK_INTERFACE == ETHERNET
+    if (log_messages) {
+        printf("[EasyConnect] Ethernet\n");
+    }
+    return ð
+
+#elif defined (EASY_CONNECT_MESH)
+    if (log_messages) {
+        printf("[EasyConnect] Mesh : %s\n", EASY_CONNECT_MESH_TYPE);
+    }
+    return &mesh;
+
+#elif MBED_CONF_APP_NETWORK_INTERFACE == CELLULAR_ONBOARD || MBED_CONF_APP_NETWORK_INTERFACE == CELLULAR
+    if (log_messages) {
+        printf("[EasyConnect] Cellular\n");
+    }
+    return  &cellular;
+
+#elif MBED_CONF_APP_NETWORK_INTERFACE == CELLULAR_WNC14A2A
+    if (log_messages) {
+        printf("[EasyConnect] WNC14A2A\n");
+    }
+    return  &wnc;
+
+#elif MBED_CONF_APP_NETWORK_INTERFACE == ETHERNET_W5500
+    if (log_messages) {
+        printf("[EasyConnect] Ethernet W5500\n");
+    }
+    return ð
+
+#endif
+}
+
+/* \brief easy_get_wifi - easy_connect function to get pointer to Wifi interface 
+ *                        without connecting to it. You would want this 1st so that
+ *                        you can scan the APNs, choose the right one and then connect.
+ *
+ * IN: bool  log_messages  print out diagnostics or not.
+ */
+WiFiInterface* easy_get_wifi(bool log_messages) {
+#if defined (EASY_CONNECT_WIFI)
+    if (log_messages) {
+        printf("[EasyConnect] WiFi: %s\n", EASY_CONNECT_WIFI_TYPE);
+    }
+    return &wifi;
+#else
+    if (log_messages) {
+        printf("[EasyConnect] ERROR - Wifi not in use, can not return WifiInterface.\n");
+    }
+    return NULL;
+#endif
+}

--- a/easy-connect.h	Thu Jul 06 06:54:08 2017 +0000
+++ b/easy-connect.h	Thu Aug 09 08:17:51 2018 +0000
@@ -1,243 +1,123 @@
-#ifndef __EASY_CONNECT_H__
-#define __EASY_CONNECT_H__
-
-#include "mbed.h"
-
-#define ETHERNET        1
-#define WIFI_ESP8266    0
-#define MESH_LOWPAN_ND  0
-#define MESH_THREAD     0
-#define WIFI_ODIN       0
-#define WIFI_REALTEK    0
-
-#if MBED_CONF_APP_NETWORK_INTERFACE == WIFI_ESP8266
-#include "ESP8266Interface.h"
-
-#ifdef MBED_CONF_APP_ESP8266_DEBUG
-ESP8266Interface wifi(MBED_CONF_APP_ESP8266_TX, MBED_CONF_APP_ESP8266_RX, MBED_CONF_APP_ESP8266_DEBUG);
-#else
-ESP8266Interface wifi(MBED_CONF_APP_ESP8266_TX, MBED_CONF_APP_ESP8266_RX);
-#endif
-
-#elif MBED_CONF_APP_NETWORK_INTERFACE == WIFI_ODIN
-#include "OdinWiFiInterface.h"
-
-OdinWiFiInterface wifi;
-#elif MBED_CONF_APP_NETWORK_INTERFACE == WIFI_REALTEK
-#include "RTWInterface.h"
-RTWInterface wifi;
-#elif MBED_CONF_APP_NETWORK_INTERFACE == ETHERNET
-//#include "EthernetInterface.h"
-//EthernetInterface eth;
-
-SPI spi(PA_7,PA_6,PA_5); // mosi, miso, sclk
-#include "W5500Interface.h"
-W5500Interface eth(&spi, PB_6, NC); // mosi, miso, sclk, cs, reset
-
-#include "DHCPClient.h"
-DHCPClient dhcp;
-
-#include "DNSClient.h"
-DNSClient  dns;
-
-#include "nsapi_dns.h"
-
-#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;
-#else
-#error "No connectivity method chosen. Please add 'config.network-interfaces.value' to your mbed_app.json (see README.md for more information)."
-#endif
-
-#if defined(MESH)
-#if MBED_CONF_APP_MESH_RADIO_TYPE == ATMEL
-#include "NanostackRfPhyAtmel.h"
-NanostackRfPhyAtmel rf_phy(ATMEL_SPI_MOSI, ATMEL_SPI_MISO, ATMEL_SPI_SCLK, ATMEL_SPI_CS,
-                           ATMEL_SPI_RST, ATMEL_SPI_SLP, ATMEL_SPI_IRQ, ATMEL_I2C_SDA, ATMEL_I2C_SCL);
-#elif MBED_CONF_APP_MESH_RADIO_TYPE == MCR20
-#include "NanostackRfPhyMcr20a.h"
-NanostackRfPhyMcr20a rf_phy(MCR20A_SPI_MOSI, MCR20A_SPI_MISO, MCR20A_SPI_SCLK, MCR20A_SPI_CS, MCR20A_SPI_RST, MCR20A_SPI_IRQ);
-#elif MBED_CONF_APP_MESH_RADIO_TYPE == SPIRIT1
-#include "NanostackRfPhySpirit1.h"
-NanostackRfPhySpirit1 rf_phy(SPIRIT1_SPI_MOSI, SPIRIT1_SPI_MISO, SPIRIT1_SPI_SCLK,
-			     SPIRIT1_DEV_IRQ, SPIRIT1_DEV_CS, SPIRIT1_DEV_SDN, SPIRIT1_BRD_LED);
-#endif //MBED_CONF_APP_RADIO_TYPE
-#endif //MESH
-
-#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
-
-#ifdef MBED_CONF_APP_ESP8266_SSID
-#define MBED_CONF_APP_WIFI_SSID MBED_CONF_APP_ESP8266_SSID
-#endif
-
-#ifdef MBED_CONF_APP_ESP8266_PASSWORD
-#define MBED_CONF_APP_WIFI_PASSWORD MBED_CONF_APP_ESP8266_PASSWORD
-#endif
-
-/* \brief print_MAC - print_MAC  - helper function to print out MAC address
- * in: network_interface - pointer to network i/f
- *     bool log-messages   print out logs or not
- * MAC address is print, if it can be acquired & log_messages is true.
- *
- */
-void print_MAC(NetworkInterface* network_interface, bool log_messages) {
-    const char *mac_addr = network_interface->get_mac_address();
-    if (mac_addr == NULL) {
-        if (log_messages) {
-            printf("[EasyConnect] ERROR - No MAC address\n");
-        }
-        return;
-    }
-    if (log_messages) {
-        printf("[EasyConnect] MAC address %s\n", mac_addr);
-    }
-}
-
-
-/* \brief easy_connect - easy_connect function to connect the pre-defined network bearer,
- *                       config done via mbed_app.json (see README.md for details).
- * IN: bool log_messages  print out diagnostics or not.
- *
- */
-NetworkInterface* easy_connect(bool log_messages = false) {
-    NetworkInterface* network_interface = 0;
-    int connect_success = -1;
-    /// This should be removed once mbedOS supports proper dual-stack
-#if defined (MESH) || (MBED_CONF_LWIP_IPV6_ENABLED==true)
-    printf("[EasyConnect] IPv6 mode\n");
-#else
-    printf("[EasyConnect] IPv4 mode\n");
-#endif
-
- #if MBED_CONF_APP_NETWORK_INTERFACE == WIFI_ESP8266
-    if (log_messages) {
-        printf("[EasyConnect] Using WiFi (ESP8266) \n");
-        printf("[EasyConnect] Connecting to WiFi %s\n", MBED_CONF_APP_WIFI_SSID);
-    }
-    network_interface = &wifi;
-    connect_success = wifi.connect(MBED_CONF_APP_WIFI_SSID, MBED_CONF_APP_WIFI_PASSWORD, NSAPI_SECURITY_WPA_WPA2);
-#elif MBED_CONF_APP_NETWORK_INTERFACE == WIFI_ODIN
-    if (log_messages) {
-        printf("[EasyConnect] Using WiFi (ODIN) \n");
-        printf("[EasyConnect] Connecting to WiFi %s\n", MBED_CONF_APP_WIFI_SSID);
-    }
-    network_interface = &wifi;
-    connect_success = wifi.connect(MBED_CONF_APP_WIFI_SSID, MBED_CONF_APP_WIFI_PASSWORD, NSAPI_SECURITY_WPA_WPA2);
-#elif MBED_CONF_APP_NETWORK_INTERFACE == WIFI_REALTEK
-    if (log_messages) {
-        printf("[EasyConnect] Using WiFi (REALTEK)\n");
-        printf("[EasyConnect] Connecting to WiFi %s\n", MBED_CONF_APP_WIFI_SSID);
-    }
-    network_interface = &wifi;
-    connect_success = wifi.connect(MBED_CONF_APP_WIFI_SSID, MBED_CONF_APP_WIFI_PASSWORD, NSAPI_SECURITY_WPA_WPA2);
-#elif MBED_CONF_APP_NETWORK_INTERFACE == ETHERNET
-
-    if (log_messages) {
-        printf("[EasyConnect] Ethernet...\n");
-    }
-
-    spi.format(32, 0);
-    spi.frequency(100000);
-
-    printf("Wait for SPI...\r\n");
-    wait(1);
-    
-    printf("Network Setting DHCP\r\n");
-	uint8_t mac_addr[6] = {0x00, 0x08, 0xdc, 0x45, 0x56, 0x67};
-	
-    printf("Init with MAC address\n");
-    eth.init(mac_addr);
-    
-    int timeout_ms = 15*1000;
-    int err = dhcp.setup(&eth, mac_addr, timeout_ms);
-    if (err == (-1)) {
-        printf("Timeout.\n");
-        return NULL;
-    }
-    printf("DHCP completed\n");
-    printf("Connected, IP: %d.%d.%d.%d\r\n", dhcp.yiaddr[0], dhcp.yiaddr[1], dhcp.yiaddr[2], dhcp.yiaddr[3]);
-    char ip[24], gateway[24], netmask[24], dnsaddr[24];
-    sprintf(ip,      "%d.%d.%d.%d", dhcp.yiaddr[0],  dhcp.yiaddr[1],  dhcp.yiaddr[2],  dhcp.yiaddr[3]);
-    sprintf(gateway, "%d.%d.%d.%d", dhcp.gateway[0], dhcp.gateway[1], dhcp.gateway[2], dhcp.gateway[3]);
-    sprintf(netmask, "%d.%d.%d.%d", dhcp.netmask[0], dhcp.netmask[1], dhcp.netmask[2], dhcp.netmask[3]);
-    sprintf(dnsaddr, "%d.%d.%d.%d", dhcp.dnsaddr[0], dhcp.dnsaddr[1], dhcp.dnsaddr[2], dhcp.dnsaddr[3]);
-    eth.init(ip, netmask, gateway);
-
-    dns.setup(&eth);
-    dns.set_server(dnsaddr);
-    bool isOK = dns.lookup("coap.me");
-    if (isOK) {
-        printf("is ok\n");
-        uint32_t hIP = dns.get_ip();
-        printf("coap.me IP: %u\n", hIP);
-    } else {
-        printf("coap.me IP is not ok\n");
-    }
-
-    
-    const SocketAddress dns_sa = SocketAddress((const void *)&dhcp.dnsaddr[0], NSAPI_IPv4, 53);
-    nsapi_error_t nsErr = nsapi_dns_add_server(dns_sa);
-    if (nsErr) {
-    	printf("[EasyConnect] error adding DNS entry: %d\n", nsErr);
-    }
-    printf("[EasyConnect] DNS IP: %s\n", dns_sa.get_ip_address());
-    
-    SocketAddress coap_sa;
-    nsErr = nsapi_dns_query(&eth, "coap.me", &coap_sa, NSAPI_IPv4);
-    if (nsErr) {
-    	printf("[EasyConnect] error resolving coap.me: %d\n", nsErr);
-    }
-
-    if (log_messages) {
-        printf("[EasyConnect] Using Ethernet\n");
-    }
-    network_interface = ð
-    connect_success = eth.connect();
-#endif
-
-#ifdef MESH
-    if (log_messages) {
-        printf("[EasyConnect] Using Mesh\n");
-        printf("[EasyConnect] Connecting to Mesh..\n");
-    }
-    network_interface = &mesh;
-    mesh.initialize(&rf_phy);
-    connect_success = mesh.connect();
-#endif
-    if(connect_success == 0) {
-        if (log_messages) {
-            printf("[EasyConnect] Connected to Network successfully\n");
-            print_MAC(network_interface, log_messages);
-        }
-    } else {
-        if (log_messages) {
-            print_MAC(network_interface, log_messages);
-            printf("[EasyConnect] Connection to Network Failed %d!\n", connect_success);
-        }
-        return NULL;
-    }
-    const char *ip_addr  = network_interface->get_ip_address();
-    if (ip_addr == NULL) {
-        if (log_messages) {
-            printf("[EasyConnect] ERROR - No IP address\n");
-        }
-        return NULL;
-    }
-    if (log_messages) {
-        printf("[EasyConnect] IP address %s\n", ip_addr);
-    }
-    return network_interface;
-}
-
-#endif // __EASY_CONNECT_H__
+/*
+ * FILE: easy-connect.h
+ *
+ * Copyright (c) 2015 - 2017 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef __EASY_CONNECT_H__
+#define __EASY_CONNECT_H__
+
+#include "mbed.h"
+
+#define ETHERNET          1
+#define ETHERNET_W5500    2
+#define WIFI_ESP8266      11
+#define WIFI_ODIN         12
+#define WIFI_RTW          13
+#define WIFI_IDW0XX1      14
+#define WIFI_WIZFI310     15
+#define WIFI_ISM43362     16
+#define MESH_LOWPAN_ND    101
+#define MESH_THREAD       102
+#define CELLULAR_ONBOARD  201
+#define CELLULAR          202
+#define CELLULAR_WNC14A2A 203
+
+/* Define supersets for WiFi and Mesh */
+
+#if MBED_CONF_APP_NETWORK_INTERFACE == WIFI_ESP8266
+#define EASY_CONNECT_WIFI
+
+#elif MBED_CONF_APP_NETWORK_INTERFACE == WIFI_ODIN
+#define EASY_CONNECT_WIFI
+
+#elif MBED_CONF_APP_NETWORK_INTERFACE == WIFI_RTW
+#define EASY_CONNECT_WIFI
+
+#elif MBED_CONF_APP_NETWORK_INTERFACE == WIFI_IDW0XX1
+#define EASY_CONNECT_WIFI
+
+#elif MBED_CONF_APP_NETWORK_INTERFACE == WIFI_WIZFI310
+#define EASY_CONNECT_WIFI
+
+#elif MBED_CONF_APP_NETWORK_INTERFACE == WIFI_ISM43362
+#define EASY_CONNECT_WIFI
+
+#elif MBED_CONF_APP_NETWORK_INTERFACE == MESH_LOWPAN_ND
+#define EASY_CONNECT_MESH
+
+#elif MBED_CONF_APP_NETWORK_INTERFACE == MESH_THREAD
+#define EASY_CONNECT_MESH
+#endif // MBED_CONF_APP_NETWORK_INTERFACE
+
+#if defined(EASY_CONNECT_MESH)
+
+// Define macros for radio type
+#define ATMEL   1
+#define MCR20   2
+#define SPIRIT1 3
+#define EFR32   4
+
+// This is address to mbed Device Connector (hard-coded IP due to DNS might not be there)
+#define MBED_SERVER_ADDRESS "coaps://[2607:f0d0:2601:52::20]:5684"
+
+#else
+// This is address to mbed Device Connector
+#define MBED_SERVER_ADDRESS "coap://api.connector.mbed.com:5684"
+
+#endif // (EASY_CONNECT_MESH)
+
+/* \brief print_MAC - print_MAC  - helper function to print out MAC address
+ * in: network_interface - pointer to network i/f
+ *     bool log-messages   print out logs or not
+ * MAC address is print, if it can be acquired & log_messages is true.
+ *
+ */
+void print_MAC(NetworkInterface* network_interface, bool log_messages);
+
+
+/* \brief easy_connect - easy_connect function to connect the pre-defined network bearer,
+ *                       config done via mbed_app.json (see README.md for details).
+ * IN: bool  log_messages  print out diagnostics or not.
+ */
+NetworkInterface* easy_connect(bool log_messages = false);
+
+/* \brief easy_connect - easy_connect function to connect the pre-defined network bearer,
+ *                       config done via mbed_app.json (see README.md for details).
+ * IN: bool  log_messages  print out diagnostics or not.
+ *     char* WiFiSSID      WiFi SSID - by default NULL, but if it's NULL
+ *                         then MBED_CONF_APP_WIFI_SSID will be used
+ *     char* WiFiPassword  WiFi Password - by default NULL, but if it's NULL
+ *                         then MBED_CONF_APP_WIFI_PASSWORD will be used
+ */
+NetworkInterface* easy_connect(bool log_messages,
+                               char* WiFiSSID,
+                               char* WiFiPassword);
+
+/* \brief easy_get_netif - easy_connect function to get pointer to network interface w/o connect it.
+                           You might need this for example getting the WiFi interface, then doing a scan
+                           and then connecting to one of the SSIDs found with a password end user supplies.
+ * IN: bool  log_messages  print out diagnostics or not.
+ */
+
+NetworkInterface* easy_get_netif(bool log_messages);
+/* \brief easy_get_wifi - easy_connect function to get pointer to Wifi interface 
+ *                        without connecting to it. You would want this 1st so that
+ *                        you can scan the APNs, choose the right one and then connect.
+ *
+ * IN: bool  log_messages  print out diagnostics or not.
+ */
+WiFiInterface* easy_get_wifi(bool log_messages);
+
+#endif // __EASY_CONNECT_H__

--- a/mbed_lib.json	Thu Jul 06 06:54:08 2017 +0000
+++ b/mbed_lib.json	Thu Aug 09 08:17:51 2018 +0000
@@ -1,9 +1,40 @@
 {
     "name": "easy-connect",
+    "config": {
+        "network-interface":{
+            "help": "options are ETHERNET, ETHERNET_W5500, WIFI_ESP8266, WIFI_ODIN, MESH_LOWPAN_ND, MESH_THREAD",
+            "value": "ETHERNET_W5500"
+        },
+        "mesh_radio_type": {
+            "help": "options are ATMEL, MCR20, SPIRIT1, EFR32",
+            "value": "ATMEL"
+        },
+        "esp8266-tx": {
+            "help": "Pin used as TX (connects to ESP8266 RX)",
+            "value": "D1"
+        },
+        "esp8266-rx": {
+            "help": "Pin used as RX (connects to ESP8266 TX)",
+            "value": "D0"
+        },
+        "esp8266-debug": {
+            "value": true
+        },
+        "wifi-ssid": {
+            "value": "\"SSID\""
+        },
+        "wifi-password": {
+            "value": "\"Password\""
+        }
+    },
     "target_overrides": {
         "*": {
-            "target.features_add": ["COMMON_PAL"]
+            "target.features_add": ["NANOSTACK", "LOWPAN_ROUTER", "COMMON_PAL"],
+            "platform.stdio-baud-rate": 115200,
+            "platform.stdio-convert-newlines": true,
+            "mbed-mesh-api.6lowpan-nd-channel-page": 0,
+            "mbed-mesh-api.6lowpan-nd-channel": 12,
+            "mbed-trace.enable": 0
         }
     }
 }
-