diff --git a/ground/gcs/src/plugins/gpsdisplay/gpsconstellationwidget.cpp b/ground/gcs/src/plugins/gpsdisplay/gpsconstellationwidget.cpp
index 9fde211c0..2a9df0235 100644
--- a/ground/gcs/src/plugins/gpsdisplay/gpsconstellationwidget.cpp
+++ b/ground/gcs/src/plugins/gpsdisplay/gpsconstellationwidget.cpp
@@ -118,7 +118,7 @@ void GpsConstellationWidget::updateSat(int index, int prn, int elevation, int az
}
// TODO: add range checking
- satellites[index][0] = prn;
+ satellites[index][0] = prn; // UBX SVID
satellites[index][1] = elevation;
satellites[index][2] = azimuth;
satellites[index][3] = snr;
@@ -129,7 +129,13 @@ void GpsConstellationWidget::updateSat(int index, int prn, int elevation, int az
-satIcons[index]->boundingRect().center().y());
satIcons[index]->setTransform(QTransform::fromTranslate(opd.x(), opd.y()), false);
- // Show normal GPS, SBAS/QZSS (120-158,193-197 range), BeiDou (33-64, 159-163) or GLONASS (65-96, 255 if unidentified)
+ // Show satellite constellations in a separate color
+ // The UBX SVID numbers are defined in appendix A of u-blox8-M8_ReceiverDescrProtSpec_(UBX-13003221)_Public.pdf
+ // GPS = default
+ // SBAS 120-158, QZSS 193-197
+ // BeiDou 33-64, 159-163
+ // GLONASS 65-96, 255 if unidentified
+ // Galileo 211-246
if ((prn > 119 && prn < 159) || (prn > 192 && prn < 198)) {
if (snr) {
satIcons[index]->setElementId("satellite-sbas");
@@ -148,6 +154,12 @@ void GpsConstellationWidget::updateSat(int index, int prn, int elevation, int az
} else {
satIcons[index]->setElementId("sat-beidou-notSeen");
}
+ } else if (prn > 210 && prn < 247) {
+ if (snr) {
+ satIcons[index]->setElementId("satellite-galileo");
+ } else {
+ satIcons[index]->setElementId("sat-galileo-notSeen");
+ }
} else {
if (snr) {
satIcons[index]->setElementId("satellite");
diff --git a/ground/gcs/src/plugins/gpsdisplay/gpsdisplaywidget.ui b/ground/gcs/src/plugins/gpsdisplay/gpsdisplaywidget.ui
index f0edd26d8..6af532b91 100644
--- a/ground/gcs/src/plugins/gpsdisplay/gpsdisplaywidget.ui
+++ b/ground/gcs/src/plugins/gpsdisplay/gpsdisplaywidget.ui
@@ -127,7 +127,7 @@
- <html><head/><body><p>Displays the SNR for each detected sat. GPS satellites are shown in green, GLONASS in cyan, BeiDou in red and SBAS/QZSS in orange. Satellite number (PRN) is displayed inside the bar. Sat SNR is displayed above (in dBHz)</p></body></html>
+ <html><head/><body><p>Displays the SNR for each detected sat. GPS satellites are shown in green, GLONASS in cyan, BeiDou in red, Galileo in magenta and SBAS/QZSS in orange. Satellite number (PRN) is displayed inside the bar. Sat SNR is displayed above (in dBHz)</p></body></html>
false
diff --git a/ground/gcs/src/plugins/gpsdisplay/gpssnrwidget.cpp b/ground/gcs/src/plugins/gpsdisplay/gpssnrwidget.cpp
index 5e965b46f..23a8c4275 100644
--- a/ground/gcs/src/plugins/gpsdisplay/gpssnrwidget.cpp
+++ b/ground/gcs/src/plugins/gpsdisplay/gpssnrwidget.cpp
@@ -104,14 +104,21 @@ void GpsSnrWidget::drawSat(int index)
QRectF boxRect = boxes[index]->boundingRect();
- // Change color for SBAS & QZSS 120-158, 193-197 range
- // GLONASS range 65-96 or 255, BeiDou 33-64 or 159-163
+ // Show satellite constellations in a separate color
+ // The UBX SVID numbers are defined in appendix A of u-blox8-M8_ReceiverDescrProtSpec_(UBX-13003221)_Public.pdf
+ // GPS = default
+ // SBAS 120-158, QZSS 193-197
+ // BeiDou 33-64, 159-163
+ // GLONASS 65-96, 255 if unidentified
+ // Galileo 211-246
if ((prn > 119 && prn < 159) || (prn > 192 && prn < 198)) {
boxes[index]->setBrush(QColor("#fd700b"));
} else if ((prn > 64 && prn < 97) || 255 == prn) {
boxes[index]->setBrush(QColor("Cyan"));
} else if ((prn > 32 && prn < 65) || (prn > 158 && prn < 164)) {
boxes[index]->setBrush(QColor("Red"));
+ } else if (prn > 210 && prn < 247) {
+ boxes[index]->setBrush(QColor("#e162f3"));
} else {
boxes[index]->setBrush(QColor("Green"));
}
diff --git a/ground/gcs/src/plugins/gpsdisplay/images/gpsEarth.svg b/ground/gcs/src/plugins/gpsdisplay/images/gpsEarth.svg
index a1a9df773..200160fb1 100644
--- a/ground/gcs/src/plugins/gpsdisplay/images/gpsEarth.svg
+++ b/ground/gcs/src/plugins/gpsdisplay/images/gpsEarth.svg
@@ -14,10 +14,21 @@
height="691.54303"
id="svg2"
version="1.1"
- inkscape:version="0.48.4 r9939"
+ inkscape:version="0.91 r13725"
sodipodi:docname="gpsEarth.svg">
+
+
+
+
@@ -1003,6 +1014,46 @@
fx="559.92383"
fy="182.67093"
r="21.496641" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+