Get firmware version occurs after reset

Firmware version pinned to macro. Check for compatibility occurs at
Interface level.

Author: sarahmarshy

ESP8266/ESP8266.cpp

@@ -24,12 +24,17 @@ ESP8266::ESP8266(PinName tx, PinName rx, bool debug)
     _parser.debugOn(debug);
 }
 
-bool ESP8266::check_firmware_version()
+int ESP8266::get_firmware_version()
 {
     _parser.send("AT+GMR");
-    int8_t version = 0;
-    bool success = _parser.recv("SDK version: %d", &version) && _parser.recv("OK");
-    return success && (version == 2);
+    int version;
+    if(_parser.recv("SDK version:%d", &version) && _parser.recv("OK")) {
+        return version;
+    } else { 
+        // Older firmware versions do not prefix the version with "SDK version: "
+        return -1;
+    }
+    
 }
 
 bool ESP8266::startup(int mode)
@@ -39,8 +44,7 @@ bool ESP8266::startup(int mode)
         return false;
     }
 
-    bool success = reset()
-        && _parser.send("AT+CWMODE_CUR=%d", mode)
+    bool success = _parser.send("AT+CWMODE_CUR=%d", mode)
         && _parser.recv("OK")
         && _parser.send("AT+CIPMUX=1")
         && _parser.recv("OK");

ESP8266/ESP8266.h

@@ -30,9 +30,9 @@ class ESP8266
     /**
     * Check firmware version of ESP8266
     *
-    * @return true only if ESP8266 firmware > v2
+    * @return integer firmware version or -1 if firmware query command gives outdated response
     */
-    bool check_firmware_version(void);
+    int get_firmware_version(void);
 
     /**
     * Startup the ESP8266

ESP8266Interface.cpp

@@ -16,13 +16,17 @@
 
 #include <string.h>
 #include "ESP8266Interface.h"
+#include "mbed_debug.h"
 
 // Various timeouts for different ESP8266 operations
 #define ESP8266_CONNECT_TIMEOUT 15000
 #define ESP8266_SEND_TIMEOUT    500
 #define ESP8266_RECV_TIMEOUT    0
 #define ESP8266_MISC_TIMEOUT    500
 
+// Firmware version
+#define ESP8266_VERSION 2
+
 // ESP8266Interface implementation
 ESP8266Interface::ESP8266Interface(PinName tx, PinName rx, bool debug)
     : _esp(tx, rx, debug)
@@ -46,20 +50,26 @@ int ESP8266Interface::connect(const char *ssid, const char *pass, nsapi_security
 
 int ESP8266Interface::connect()
 {
+    _esp.setTimeout(ESP8266_CONNECT_TIMEOUT);
+    
+    if(!_esp.reset()) {
+        return NSAPI_ERROR_DEVICE_ERROR;
+    }   
+ 
     _esp.setTimeout(ESP8266_MISC_TIMEOUT);
 
-    if(!_esp.check_firmware_version()) {
-        debug("ERROR: Firmware incompatible with this driver.\
-               \r\nUpdate to v2.0.0 - https://developer.mbed.org/teams/ESP8266/wiki/Firmware-Update\r\n"); 
+    if(_esp.get_firmware_version() != ESP8266_VERSION) {
+        debug("ESP8266: ERROR: Firmware incompatible with this driver.\
+               \r\nUpdate to v%d - https://developer.mbed.org/teams/ESP8266/wiki/Firmware-Update\r\n",ESP8266_VERSION); 
         return NSAPI_ERROR_DEVICE_ERROR;
     }
 
     _esp.setTimeout(ESP8266_CONNECT_TIMEOUT);
-  
+
     if (!_esp.startup(3)) {
         return NSAPI_ERROR_DEVICE_ERROR;
     }
-
+    
     if (!_esp.dhcp(true, 1)) {
         return NSAPI_ERROR_DHCP_FAILURE;
     }

ESP8266Interface.h

@@ -18,7 +18,6 @@
 #define ESP8266_INTERFACE_H
 
 #include "mbed.h"
-#include "mbed_debug.h"
 #include "ESP8266.h"