[ESP32-S2] WebTop USB firmware Release 1.2

lyusupov · Nov 25, 2024 · b673cc5 · b673cc5
1 parent f8b2757
commit b673cc5
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 9 deletions.
diff --git a/documents/images/Card-10.jpg b/documents/images/Card-10.jpg
diff --git a/documents/images/Card-11.jpg b/documents/images/Card-11.jpg
diff --git a/documents/images/Card-9.jpg b/documents/images/Card-9.jpg
diff --git a/software/firmware/binaries/ESP32S2/WebTop/WebTop-firmware-v1.2-ESP32S2.zip b/software/firmware/binaries/ESP32S2/WebTop/WebTop-firmware-v1.2-ESP32S2.zip
diff --git a/software/firmware/source/SkyWatch/GNSSHelper.cpp b/software/firmware/source/SkyWatch/GNSSHelper.cpp
@@ -127,7 +127,7 @@ bool nmea_handshake(const char *req, const char *resp, bool skipline)
 
       /* skip first line when expected response contains 2 of them */
       if (skipline) {
-        // start_time = millis();
+        start_time = millis();
         while (Serial_GNSS_In.read() != '\n' && (millis() - start_time) < timeout_ms) { yield(); }
       }
 
@@ -1152,7 +1152,7 @@ const gnss_chip_ops_t uc65_ops = {
 static gnss_id_t ag33_probe()
 {
   /* Firmware version request */
-  return nmea_handshake("$PAIR021*39\r\n", "$PAIR021,", true) ?
+  return nmea_handshake("$PAIR021*39\r\n", "$PAIR001,021", false) ?
                         GNSS_MODULE_AG33 : GNSS_MODULE_NMEA;
 }
 
@@ -1161,21 +1161,30 @@ extern gnss_chip_ops_t ag33_ops;
 static bool ag33_setup()
 {
 #if !defined(EXCLUDE_LOG_GNSS_VERSION)
+  int i=0;
+  char c;
+  unsigned long timeout_ms = 2000 ;
+
   while (Serial_GNSS_In.available() > 0) { Serial_GNSS_In.read(); }
 
+  unsigned long start_time = millis();
+
+  while ((millis() - start_time) < timeout_ms) {
+    c = Serial_GNSS_In.read();
+    if (c == '\n') break;
+  }
+
   Serial_GNSS_Out.write("$PAIR021*39\r\n");
 
-  int i=0;
-  char c;
-  unsigned long start_time = millis();
+  start_time = millis();
 
-  while ((millis() - start_time) < 2000) {
+  while ((millis() - start_time) < timeout_ms) {
     c = Serial_GNSS_In.read();
     if (c == '\n') break;
   }
 
   /* take response into buffer */
-  while ((millis() - start_time) < 2000) {
+  while ((millis() - start_time) < timeout_ms) {
 
     c = Serial_GNSS_In.read();
 

diff --git a/software/firmware/source/SkyWatch/SkyWatch.h b/software/firmware/source/SkyWatch/SkyWatch.h
@@ -23,8 +23,8 @@
 #include <Arduino.h>
 #endif /* ARDUINO */
 
-#define SKYWATCH_FIRMWARE_VERSION  "1.1"
-#define SKYWATCH_USB_FW_VERSION    0x0101
+#define SKYWATCH_FIRMWARE_VERSION  "1.2"
+#define SKYWATCH_USB_FW_VERSION    0x0102
 #define SKYWATCH_IDENT    "SkyWatch"
 #define WEBTOP_IDENT      "WebTop"
 #define SOFTRF_IDENT      "SoftRF"