Skip to content

Commit db00da7

Browse files
Jens KasselJens Kassel
authored andcommitted
Show AntennaGain and JammingLevel in about page
1 parent dae9abc commit db00da7

File tree

3 files changed

+17
-1
lines changed

3 files changed

+17
-1
lines changed

src/configServer.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1070,6 +1070,8 @@ static void handleAbout(HTTPRequest *req, HTTPResponse * res) {
10701070
page += keyValue("GPS satellites", gps.getValidSatellites());
10711071
page += keyValue("GPS uptime", gps.getUptime(), "ms");
10721072
page += keyValue("GPS noise level", gps.getLastNoiseLevel());
1073+
page += keyValue("GPS Antenna Gain", gps.getLastAntennaGain());
1074+
page += keyValue("GPS Jamming Level", gps.getLastJamInd());
10731075
page += keyValue("GPS baud rate", gps.getBaudRate());
10741076
page += keyValue("GPS ALP bytes", gps.getNumberOfAlpBytesSent());
10751077
page += keyValue("GPS messages", gps.getMessagesHtml());

src/gps.cpp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1128,6 +1128,7 @@ void Gps::parseUbxMessage() {
11281128
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);
11291129
mLastNoiseLevel = mGpsBuffer.monHw.noisePerMs;
11301130
mLastGain = mGpsBuffer.monHw.agcCnt;
1131+
mLastJamInd = mGpsBuffer.monHw.jamInd;
11311132
}
11321133
break;
11331134
case (uint16_t) UBX_MSG::NAV_STATUS: {
@@ -1435,6 +1436,14 @@ uint16_t Gps::getLastNoiseLevel() const {
14351436
return mLastNoiseLevel;
14361437
}
14371438

1439+
uint16_t Gps::getLastAntennaGain() const {
1440+
return mLastGain;
1441+
}
1442+
1443+
uint8_t Gps::getLastJamInd() const {
1444+
return mLastJamInd;
1445+
}
1446+
14381447
uint32_t Gps::getBaudRate() {
14391448
return mSerial.baudRate();
14401449
}

src/gps.h

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,10 @@ class Gps {
7070

7171
uint16_t getLastNoiseLevel() const;
7272

73+
uint16_t getLastAntennaGain() const;
74+
75+
uint8_t getLastJamInd() const;
76+
7377
/* Collected informational messages as String. */
7478
String getMessages() const;
7579

@@ -306,7 +310,7 @@ class Gps {
306310
uint8_t flags;
307311
uint8_t reserved1;
308312
uint32_t usedMask;
309-
uint8_t vp[25]; //M8 only 17bytes?
313+
uint8_t vp[17]; //M6 25bytes, M8 only 17bytes?
310314
uint8_t jamInd; //cwSuppression / CW interference suppression level, scaled (0 = no CW jamming, 255 = strong CW jamming)
311315
uint16_t reserved3;
312316
uint32_t pinIrq;
@@ -554,6 +558,7 @@ class Gps {
554558
uint8_t mNmeaChk;
555559
uint16_t mLastNoiseLevel;
556560
uint16_t mLastGain;
561+
uint8_t mLastJamInd;
557562
AlpData mAlpData;
558563
bool mAidIniSent = false;
559564
/* record that was last received */

0 commit comments

Comments
 (0)