Merge branch 'master' into showscroller-q3

Author: gfwilliams

ChangeLog

@@ -39,6 +39,8 @@
             jsvObjectIterator is now safe even if not called on something iterable
             X.on now always allocates an array - tidies up code (fix #2559)
             Bangle.js: E.showMenu no longer sends the internal `l` menu object as argument when running the callback function.
+            Bangle.js2: GPS request RMC packet automatically (so GPS speed/time work even without AGPS) (fix #2354)
+            Bangle.js2: GPS now detects binary CASIC packets and splits them into their own GPS-raw event
             Bangle.js2: Pass the modified touch event on through both E.showScroller and E.showMenu (to enable more complex interaction with menus).
 
      2v24 : Bangle.js2: Add 'Bangle.touchRd()', 'Bangle.touchWr()'

libs/banglejs/jswrap_bangle.c

@@ -587,6 +587,7 @@ JshI2CInfo i2cHRM;
 #define PRESSURE_I2C &i2cPressure
 #define HRM_I2C &i2cHRM
 #define GPS_UART EV_SERIAL1
+#define GPS_CASIC 1 // handle decoding of 'CASIC' packets from the GPS
 #define HEARTRATE 1
 
 bool pressureBMP280Enabled = false;
@@ -4658,7 +4659,7 @@ bool jswrap_banglejs_idle() {
 bool jswrap_banglejs_gps_character(char ch) {
 #ifdef GPS_PIN_RX
   // if too many chars, roll over since it's probably because we skipped a newline
-  // or messed the message length
+  // or messed up the message length
   if (gpsLineLength >= sizeof(gpsLine)) {
 #ifdef GPS_UBLOX
     if (inComingUbloxProtocol == UBLOX_PROTOCOL_UBX &&
@@ -4689,6 +4690,21 @@ bool jswrap_banglejs_gps_character(char ch) {
   }
 #endif // GPS_UBLOX
   gpsLine[gpsLineLength++] = ch;
+#ifdef GPS_CASIC
+  if (gpsLineLength>2 && gpsLine[0]==0xBA && gpsLine[1]==0xCE) {
+    if (gpsLineLength<4) return true; // not enough data for length
+    int len = gpsLine[2] | (gpsLine[3] << 8);
+    // 4 class, 5 = msg
+    // 4 byte checksum on end
+    if (gpsLineLength>=len+10) { // packet end!
+      memcpy(gpsLastLine, gpsLine, gpsLineLength);
+      gpsLastLineLength = gpsLineLength;
+      bangleTasks |= JSBT_GPS_DATA_LINE;
+      gpsClearLine();
+    }
+    return true;
+  }
+#endif
   if (
 #ifdef GPS_UBLOX
       inComingUbloxProtocol == UBLOX_PROTOCOL_NMEA &&
@@ -4707,8 +4723,20 @@ bool jswrap_banglejs_gps_character(char ch) {
     if (gpsLineLength > 2 && gpsLineLength <= NMEA_MAX_SIZE && gpsLine[gpsLineLength - 2] =='\r') {
       gpsLine[gpsLineLength - 2] = 0; // just overwriting \r\n
       gpsLine[gpsLineLength - 1] = 0;
-      if (nmea_decode(&gpsFix, (char *)gpsLine))
+      if (nmea_decode(&gpsFix, (char *)gpsLine)) {
         bangleTasks |= JSBT_GPS_DATA;
+#ifdef BANGLEJS_Q3
+        if (gpsFix.packetCount == 1) { // first packet
+          // https://github.com/espruino/Espruino/issues/2354 - on newer Bangle.js, speed/time may not be reported
+          // as there's no RMC packet by default. If we detect this in 1st packet send a command to fix it
+          if ((gpsFix.packetsParsed & NMEA_RMC)==0) {
+            jshTransmitPrintf(GPS_UART,"$PCAS03,1,0,0,1,1,0,0,0*03\r\n");
+          }
+        }
+#endif
+        // reset what packets we think we got
+        gpsFix.packetsParsed = NMEA_NONE;
+      }
       if (bangleTasks & (JSBT_GPS_DATA_PARTIAL|JSBT_GPS_DATA_LINE)) {
         // we were already waiting to post data, so lets not overwrite it
         bangleTasks |= JSBT_GPS_DATA_OVERFLOW;

libs/misc/nmea.c

@@ -51,6 +51,7 @@ bool nmea_decode(NMEAFixInfo *gpsFix, const char *nmeaLine) {
   if (nmea[0]=='$' && nmea[1]=='G') {
     if (nmea[3]=='R' && nmea[4]=='M' && nmea[5]=='C') {
       // $GNRMC,161945.00,A,5139.11397,N,00116.07202,W,1.530,,190919,,,A*7E
+      gpsFix->packetsParsed |= NMEA_RMC;
       nmea = nmea_next_comma(nmea)+1;
       nextComma = nmea_next_comma(nmea);
       // time
@@ -87,6 +88,7 @@ bool nmea_decode(NMEAFixInfo *gpsFix, const char *nmeaLine) {
     }
     if (nmea[3]=='G' && nmea[4]=='G' && nmea[5]=='A') {
       // $GNGGA,161945.00,5139.11397,N,00116.07202,W,1,06,1.29,71.1,M,47.0,M,,*64
+      gpsFix->packetsParsed |= NMEA_GGA;
       nmea = nmea_next_comma(nmea)+1;
       nextComma = nmea_next_comma(nmea);
       // time
@@ -118,6 +120,7 @@ bool nmea_decode(NMEAFixInfo *gpsFix, const char *nmeaLine) {
     }
     if (nmea[3]=='G' && nmea[4]=='S' && nmea[5]=='V') {
       // loads of cool data about what satellites we have and signal strength...
+      gpsFix->packetsParsed |= NMEA_GSV;
       thisIsGSV = true;
     }
   }
@@ -159,13 +162,17 @@ bool nmea_decode(NMEAFixInfo *gpsFix, const char *nmeaLine) {
     // Complete set of data received
     createGPSEvent = true;
   }
-  if (gpsFix->lastWasGGA && thisIsGGA) { // We got two GGAs - we can do this if 
+  if (gpsFix->lastWasGGA && thisIsGGA) { // We got two GGAs - we can do this if
     // Complete set of data received
     createGPSEvent = true;
   }
   // update info we had last
   gpsFix->lastWasGSV = thisIsGSV;
   gpsFix->lastWasGGA = thisIsGGA;
+  if (createGPSEvent) {
+    if (gpsFix->packetCount < 255)
+      gpsFix->packetCount++;
+  }
   return createGPSEvent;
 }
 

libs/misc/nmea.h

@@ -14,7 +14,16 @@
 
 #include "jsvar.h"
 
+typedef enum {
+  NMEA_NONE = 0,
+  NMEA_RMC = 1,
+  NMEA_GGA = 2,
+  NMEA_GSV = 4,
+} NMEAFixPackets;
+
 typedef struct {
+  NMEAFixPackets packetsParsed; // which types of packet have been received?
+  uint8_t packetCount; // number of packets received
   double lat,lon,alt;
   double speed; // speed in km/h
   double course; // angle of travel in degrees