diff --git a/ground/openpilotgcs/src/plugins/gpsdisplay/gpsconstellationwidget.cpp b/ground/openpilotgcs/src/plugins/gpsdisplay/gpsconstellationwidget.cpp
index 2bf058844..555681dce 100644
--- a/ground/openpilotgcs/src/plugins/gpsdisplay/gpsconstellationwidget.cpp
+++ b/ground/openpilotgcs/src/plugins/gpsdisplay/gpsconstellationwidget.cpp
@@ -76,7 +76,7 @@ GpsConstellationWidget::GpsConstellationWidget(QWidget *parent) : QGraphicsView(
satTexts[i] = new QGraphicsSimpleTextItem("##", satIcons[i]);
satTexts[i]->setBrush(QColor("Black"));
- satTexts[i]->setFont(QFont("Courier"));
+ satTexts[i]->setFont(QFont("Mono"));
}
}
@@ -126,10 +126,20 @@ void GpsConstellationWidget::updateSat(int index, int prn, int elevation, int az
opd += QPointF(-satIcons[index]->boundingRect().center().x(),
-satIcons[index]->boundingRect().center().y());
satIcons[index]->setTransform(QTransform::fromTranslate(opd.x(), opd.y()), false);
- if (snr) {
- satIcons[index]->setElementId("satellite");
+
+ //Show normal GPS or SBAS
+ if (prn > 120 && prn < 158) {
+ if (snr) {
+ satIcons[index]->setElementId("satellite-sbas");
+ } else {
+ satIcons[index]->setElementId("sat-sbas-notSeen");
+ }
} else {
- satIcons[index]->setElementId("sat-notSeen");
+ if (snr) {
+ satIcons[index]->setElementId("satellite");
+ } else {
+ satIcons[index]->setElementId("sat-notSeen");
+ }
}
satIcons[index]->show();
diff --git a/ground/openpilotgcs/src/plugins/gpsdisplay/gpsdisplaywidget.ui b/ground/openpilotgcs/src/plugins/gpsdisplay/gpsdisplaywidget.ui
index 28f1a1a3d..1b8428329 100644
--- a/ground/openpilotgcs/src/plugins/gpsdisplay/gpsdisplaywidget.ui
+++ b/ground/openpilotgcs/src/plugins/gpsdisplay/gpsdisplaywidget.ui
@@ -6,8 +6,8 @@
0
0
- 579
- 379
+ 768
+ 600
@@ -20,7 +20,16 @@
0
-
+
+ 6
+
+
+ 6
+
+
+ 6
+
+
6
-
@@ -583,14 +592,19 @@
- 250
+ 400
95
- Displays the SNR for each detected sat.
-Satellite number (PRN) is displayed inside the green bar.
-Sat SNR is displayed above (in dBHz)
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Displays the SNR for each detected sat. Satellite number (PRN) is displayed inside the green bar (GPS) or orange bar (SBAS). Sat SNR is displayed above (in dBHz)</p></body></html>
+
+
+ false
Qt::ScrollBarAlwaysOff
@@ -607,18 +621,36 @@ Sat SNR is displayed above (in dBHz)
-
+
+ true
+
- 250
- 250
+ 400
+ 400
+
+ background-color: rgba(255, 255, 255, 0);
+
+
+ QFrame::Panel
+
Qt::ScrollBarAlwaysOff
Qt::ScrollBarAlwaysOff
+
+
+
+ 0
+ 0
+ 0
+
+
+
-
@@ -627,7 +659,7 @@ Sat SNR is displayed above (in dBHz)
Qt::Vertical
- QSizePolicy::Ignored
+ QSizePolicy::Expanding
@@ -646,7 +678,16 @@ Sat SNR is displayed above (in dBHz)
GPS Data Stream
-
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
0
-
diff --git a/ground/openpilotgcs/src/plugins/gpsdisplay/gpssnrwidget.cpp b/ground/openpilotgcs/src/plugins/gpsdisplay/gpssnrwidget.cpp
index 157a461d5..c6ba78bb8 100644
--- a/ground/openpilotgcs/src/plugins/gpsdisplay/gpssnrwidget.cpp
+++ b/ground/openpilotgcs/src/plugins/gpsdisplay/gpssnrwidget.cpp
@@ -103,6 +103,13 @@ void GpsSnrWidget::drawSat(int index)
boxes[index]->setPos(x, y);
QRectF boxRect = boxes[index]->boundingRect();
+
+ //Change color for SBAS sat (Egnos, etc..)
+ if (prn > 120 && prn < 158) {
+ boxes[index]->setBrush(QColor("#fd700b"));
+ } else {
+ boxes[index]->setBrush(QColor("Green"));
+ }
QString prnString = QString().number(prn);
if (prnString.length() == 1) {
prnString = "0" + prnString;
diff --git a/ground/openpilotgcs/src/plugins/gpsdisplay/images/gpsEarth.svg b/ground/openpilotgcs/src/plugins/gpsdisplay/images/gpsEarth.svg
index 8121f1aba..457bad737 100644
--- a/ground/openpilotgcs/src/plugins/gpsdisplay/images/gpsEarth.svg
+++ b/ground/openpilotgcs/src/plugins/gpsdisplay/images/gpsEarth.svg
@@ -14,10 +14,68 @@
height="495.57877"
id="svg2"
version="1.1"
- inkscape:version="0.47 r22583"
+ inkscape:version="0.48.5 r10040"
sodipodi:docname="gpsEarth.svg">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -140,6 +534,16 @@
+
+ style="fill:none;stroke:#f1f4fc;stroke-width:3.96454072000000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;opacity:1" />
-
-
N
E
S
W
+ id="g3035">
+ sodipodi:type="arc"
+ style="fill:none;stroke:url(#linearGradient3831);stroke-width:2.39174904000000010;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path3608"
+ sodipodi:cx="392.44427"
+ sodipodi:cy="410.41025"
+ sodipodi:rx="89.398499"
+ sodipodi:ry="89.398499"
+ d="m 451.71402,343.4835 c 36.96262,32.73378 40.39077,89.23387 7.657,126.19649 -32.73378,36.96262 -89.23387,40.39078 -126.19649,7.657 -36.96262,-32.73377 -40.39077,-89.23386 -7.657,-126.19648 28.33719,-31.99805 75.3601,-39.46142 112.2124,-17.8101"
+ transform="matrix(1.2543122,0,0,1.2543122,-121.52166,-109.92818)"
+ sodipodi:start="5.4371862"
+ sodipodi:end="11.526764"
+ sodipodi:open="true" />
-
-
-
-
-
-
+ transform="matrix(1.9716104,0,0,1.9716104,-399.86707,-407.46887)"
+ d="m 451.12161,342.96352 c 37.2498,32.4066 41.17599,88.87427 8.76939,126.12407 -32.4066,37.2498 -88.87426,41.17599 -126.12407,8.76939 -37.2498,-32.4066 -41.17598,-88.87427 -8.76938,-126.12407 29.53979,-33.95454 79.71538,-40.65585 117.1306,-15.64362"
+ sodipodi:ry="89.398499"
+ sodipodi:rx="89.398499"
+ sodipodi:cy="410.41025"
+ sodipodi:cx="392.44427"
+ id="path3610"
+ style="fill:none;stroke:url(#linearGradient3823);stroke-width:1.52159879000000009;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.44600001000000000;stroke-dasharray:none;stroke-dashoffset:0"
+ sodipodi:type="arc"
+ sodipodi:start="5.428369"
+ sodipodi:end="11.584848"
+ sodipodi:open="true" />
+
+
+
+
+
+
+
+
+
+
-
-
+ d="M 589.99999,195.93361 A 20.714285,20.714285 0 1 1 548.57142,195.93361 A 20.714285,20.714285 0 1 1 589.99999,195.93361 z"
+ transform="translate(0.08444218,-2.2540689e-8)" />
+
+
+
+
+
+ id="rect3895"
+ style="fill:url(#linearGradient3905);fill-opacity:1;stroke:#fcaa21;stroke-width:1.56471384;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+