Correct ws_pb_helpers includes + CompareVersion for Airlift FW + RSSI label

Author: tyeth

src/Wippersnapper.cpp

@@ -185,7 +185,7 @@ void Wippersnapper::getMacAddr() {
 /****************************************************************************/
 /*!
     @brief    Gets the network's RSSI.
-    @return   int32_t RSSI value
+    @return   int32_t RSSI value, 0 to 255, in dB
 */
 /****************************************************************************/
 int32_t Wippersnapper::getRSSI() {

src/nanopb/ws_pb_helpers.cpp

@@ -1,5 +1,5 @@
 /*!
- * @file ws_pb_helpers.h
+ * @file ws_pb_helpers.cpp
  *
  * Protobuf encode/decode helpers with error logging for Wippersnapper.
  *
@@ -12,12 +12,9 @@
  * BSD license, all text here must be included in any redistribution.
  *
  */
-#include "pb.h"
-#include "pb_decode.h"
-#include "pb_encode.h"
-#include "ws_pb_helpers.h"
-#include <Wippersnapper.h>
 
+#include "ws_pb_helpers.h"
+#include "../Wippersnapper.h"
 
 // *****************************************************************************
 /*!
@@ -32,7 +29,7 @@
 !*/
 // *****************************************************************************
 bool ws_pb_decode(pb_istream_t *stream, const pb_msgdesc_t *fields,
-                         void *dest_struct) {
+                  void *dest_struct) {
   bool status = pb_decode(stream, fields, dest_struct);
   if (!status) {
     WS_DEBUG_PRINT("Protobuf decode error: ");
@@ -54,7 +51,7 @@ bool ws_pb_decode(pb_istream_t *stream, const pb_msgdesc_t *fields,
 !*/
 // *****************************************************************************
 bool ws_pb_encode(pb_ostream_t *stream, const pb_msgdesc_t *fields,
-                         const void *src_struct) {
+                  const void *src_struct) {
   bool status = pb_encode(stream, fields, src_struct);
   if (!status) {
     WS_DEBUG_PRINT("Protobuf encode error: ");

src/nanopb/ws_pb_helpers.h

@@ -16,6 +16,8 @@
 #define WS_PB_ENCODE_H
 
 #include "pb.h"
+#include "pb_decode.h"
+#include "pb_encode.h"
 
 bool ws_pb_decode(pb_istream_t *stream, const pb_msgdesc_t *fields,
                          void *dest_struct);

src/network_interfaces/Wippersnapper_AIRLIFT.h

@@ -193,14 +193,23 @@ class Wippersnapper_AIRLIFT : public Wippersnapper {
           equal to the required version, False otherwise.
   */
   /********************************************************/
-  bool compareVersions(const String &currentVersion,
-                       const String &requiredVersion) {
-    int curMajor, curMinor, curPatch;
-    int reqMajor, reqMinor, reqPatch;
-
-    sscanf(currentVersion.c_str(), "%d.%d.%d", &curMajor, &curMinor, &curPatch);
-    sscanf(requiredVersion.c_str(), "%d.%d.%d", &reqMajor, &reqMinor,
-           &reqPatch);
+  bool compareVersions(const char *currentVersion,
+                       const char *requiredVersion) {
+    int curMajor, curMinor, curPatch = 0;
+    int reqMajor, reqMinor, reqPatch = 0;
+
+    if (!sscanf(currentVersion, "%d.%d.%d", &curMajor, &curMinor, &curPatch) ||
+        !sscanf(requiredVersion, "%d.%d.%d", &reqMajor, &reqMinor, &reqPatch)) {
+      WS_DEBUG_PRINTLN("Error parsing firmware version strings");
+      WS_PRINTER.flush();
+      WS_DEBUG_PRINT("Required version: ");
+      WS_DEBUG_PRINTLN(requiredVersion);
+      WS_PRINTER.flush();
+      WS_DEBUG_PRINT("Current version: ");
+      WS_DEBUG_PRINTLN(currentVersion);
+      WS_PRINTER.flush();
+      return false;
+    }
 
     if (curMajor != reqMajor)
       return curMajor > reqMajor;
@@ -272,7 +281,7 @@ class Wippersnapper_AIRLIFT : public Wippersnapper {
 protected:
   const char *_ssid;           /*!< Network SSID. */
   const char *_pass;           /*!< Network password. */
-  String _fv;                  /*!< nina-fw firmware version. */
+  const char *_fv;             /*!< nina-fw firmware version. */
   int _ssPin = -1;             /*!< SPI S.S. pin. */
   int _ackPin = -1;            /*!< SPI ACK pin. */
   int _rstPin = -1;            /*!< SPI RST pin. */
@@ -326,7 +335,7 @@ class Wippersnapper_AIRLIFT : public Wippersnapper {
       RETRY_FUNCTION_UNTIL_TIMEOUT(
           []() -> int { return WiFi.status(); }, // Function call each cycle
           int,                                   // return type
-          lastResult, // return variable (unused here)
+          lastResult,                            // return variable
           [](int status) { return status == WL_CONNECTED; }, // check
           20000, // timeout interval (ms)
           200);  // interval between retries