ESP8266: Exposes country code config API

Author: Veijo Pesonen

components/wifi/esp8266-driver/ESP8266Interface.cpp

@@ -69,6 +69,7 @@ ESP8266Interface::ESP8266Interface()
     memset(ap_ssid, 0, sizeof(ap_ssid));
     memset(ap_pass, 0, sizeof(ap_pass));
     memset(_country_code, 0, sizeof(_country_code));
+    strncpy(_country_code, MBED_CONF_ESP8266_COUNTRY_CODE, sizeof(_country_code));
 
     _esp.sigio(this, &ESP8266Interface::event);
     _esp.set_timeout();
@@ -99,6 +100,7 @@ ESP8266Interface::ESP8266Interface(PinName tx, PinName rx, bool debug, PinName r
     memset(ap_ssid, 0, sizeof(ap_ssid));
     memset(ap_pass, 0, sizeof(ap_pass));
     memset(_country_code, 0, sizeof(_country_code));
+    strncpy(_country_code, MBED_CONF_ESP8266_COUNTRY_CODE, sizeof(_country_code));
 
     _esp.sigio(this, &ESP8266Interface::event);
     _esp.set_timeout();
@@ -393,15 +395,7 @@ bool ESP8266Interface::_get_firmware_ok()
 
 nsapi_error_t ESP8266Interface::_init(void)
 {
-
-
     if (!_initialized) {
-
-        if (!_country_code[0] || !_country_code[1] ) {
-            strncpy(_country_code, MBED_CONF_ESP8266_COUNTRY_CODE, 2);
-            _country_code[2] = '\0';
-        }
-
         if (_reset() != NSAPI_ERROR_OK) {
             return NSAPI_ERROR_DEVICE_ERROR;
         }
@@ -868,5 +862,21 @@ nsapi_error_t ESP8266Interface::set_blocking(bool blocking)
     return NSAPI_ERROR_OK;
 }
 
+nsapi_error_t ESP8266Interface::set_country_code(const char *country_code, int len)
+{
+    for (int i = 0; i < len; i++) {
+        // Validation done by firmware
+        if (!country_code[i]) {
+            tr_warning("invalid country code");
+            return NSAPI_ERROR_PARAMETER;
+        }
+    }
+
+    // Firmware takes only first three characters
+    strncpy(_country_code, country_code, sizeof(_country_code));
+    _country_code[sizeof(_country_code)-1] = '\0';
+
+    return NSAPI_ERROR_OK;
+}
 
 #endif

components/wifi/esp8266-driver/ESP8266Interface.h

@@ -337,6 +337,14 @@ class ESP8266Interface : public NetworkStack, public WiFiInterface {
      */
     virtual nsapi_error_t set_blocking(bool blocking);
 
+    /** Set country code
+     *
+     *  @param country_code 2-3 character country code
+     *  @param len          Length of the country code
+     *  @return             NSAPI_ERROR_OK on success, negative error code on failure.
+     */
+    nsapi_error_t set_country_code(const char *country_code, int len)
+
 private:
     // AT layer
     ESP8266 _esp;
@@ -363,7 +371,7 @@ class ESP8266Interface : public NetworkStack, public WiFiInterface {
     nsapi_security_t _ap_sec;
 
     // Country code
-    char _country_code[3]; /* ISO 3166-1 Alpha-2 coded country code plus, +1 for the \0 */
+    char _country_code[4]; /* ISO 3166-1 coded country code - +1 for the '\0' - assumed. Documentation doesn't tell */
 
     bool _if_blocking; // NetworkInterface, blocking or not
     rtos::ConditionVariable _if_connected;