differentiate between Neo6m and newer dialects for MON_HW

Author: gluap

src/gps.cpp

@@ -1181,18 +1181,33 @@ void Gps::parseUbxMessage() {
       break;
     case (uint16_t) UBX_MSG::MON_HW: {
       const char* aStatus;
-      switch (mGpsBuffer.monHw.aStatus) {
-        case mGpsBuffer.monHw.INIT: aStatus = "init"; break;
-        case mGpsBuffer.monHw.DONTKNOW: aStatus = "?"; break;
-        case mGpsBuffer.monHw.OK: aStatus = "ok"; break;
-        case mGpsBuffer.monHw.SHORT: aStatus = "short"; break;
-        case mGpsBuffer.monHw.OPEN: aStatus = "open"; break;
-        default: aStatus = "invalid";
+      if (is_neo6()) {
+        switch (mGpsBuffer.monHw.aStatus) {
+          case mGpsBuffer.monHw.INIT: aStatus = "init"; break;
+          case mGpsBuffer.monHw.DONTKNOW: aStatus = "?"; break;
+          case mGpsBuffer.monHw.OK: aStatus = "ok"; break;
+          case mGpsBuffer.monHw.SHORT: aStatus = "short"; break;
+          case mGpsBuffer.monHw.OPEN: aStatus = "open"; break;
+          default: aStatus = "invalid";
+        }
+        log_d("MON-HW Antenna Status %d %s, Antenna Power %d, Gain (0-8191) %d, noise level %d", mGpsBuffer.monHw.aStatus, aStatus, mGpsBuffer.monHw.aPower, mGpsBuffer.monHw.agcCnt, mGpsBuffer.monHw.noisePerMs);
+        mLastNoiseLevel = mGpsBuffer.monHw.noisePerMs;
+        mLastGain = mGpsBuffer.monHw.agcCnt;
+        mLastJamInd = mGpsBuffer.monHw.jamInd;
+      } else {
+        switch (mGpsBuffer.monHwNew.aStatus) {
+          case mGpsBuffer.monHwNew.INIT: aStatus = "init"; break;
+          case mGpsBuffer.monHwNew.DONTKNOW: aStatus = "?"; break;
+          case mGpsBuffer.monHwNew.OK: aStatus = "ok"; break;
+          case mGpsBuffer.monHwNew.SHORT: aStatus = "short"; break;
+          case mGpsBuffer.monHwNew.OPEN: aStatus = "open"; break;
+          default: aStatus = "invalid";
+        }
+        log_d("MON-HW Antenna Status %d %s, Antenna Power %d, Gain (0-8191) %d, noise level %d", mGpsBuffer.monHwNew.aStatus, aStatus, mGpsBuffer.monHwNew.aPower, mGpsBuffer.monHwNew.agcCnt, mGpsBuffer.monHwNew.noisePerMs);
+        mLastNoiseLevel = mGpsBuffer.monHwNew.noisePerMs;
+        mLastGain = mGpsBuffer.monHwNew.agcCnt;
+        mLastJamInd = mGpsBuffer.monHwNew.jamInd;
       }
-      log_d("MON-HW Antenna Status %d %s, Antenna Power %d, Gain (0-8191) %d, noise level %d", mGpsBuffer.monHw.aStatus, aStatus, mGpsBuffer.monHw.aPower, mGpsBuffer.monHw.agcCnt, mGpsBuffer.monHw.noisePerMs);
-      mLastNoiseLevel = mGpsBuffer.monHw.noisePerMs;
-      mLastGain = mGpsBuffer.monHw.agcCnt;
-      mLastJamInd = mGpsBuffer.monHw.jamInd;
     }
       break;
     case (uint16_t) UBX_MSG::NAV_STATUS: {

src/gps.h

@@ -320,6 +320,36 @@ class Gps {
         uint32_t pinIrq;
         uint32_t pullH;
         uint32_t pullL;
+      } monHwNew;
+      struct __attribute__((__packed__)) {
+        UBX_HEADER ubxHeader;
+        uint32_t pinSel;
+        uint32_t pinBank;
+        uint32_t pinDir;
+        uint32_t pinVal;
+        uint16_t noisePerMs;
+        uint16_t agcCnt; // AGC (Automatic Gain Control) Monitor, as percentage of maximum gain,range 0 to 8191 (100%)
+        enum ANT_STATUS : uint8_t {
+          INIT = 0,
+          DONTKNOW = 1,
+          OK = 2,
+          SHORT = 3,
+          OPEN = 4,
+        } aStatus;
+        enum ANT_POWER : uint8_t {
+          OFF = 0,
+          ON = 1,
+          POWER_DONTKNOW = 2,
+        } aPower;
+        uint8_t flags;
+        uint8_t reserved1;
+        uint32_t usedMask;
+        uint8_t vp[25];
+        uint8_t jamInd;
+        uint16_t reserved3;
+        uint32_t pinIrq;
+        uint32_t pullH;
+        uint32_t pullL;
       } monHw;
       struct __attribute__((__packed__)) {
         UBX_HEADER ubxHeader;