From aa99c56eb360391d1ff0c80c7c66f08cac76b884 Mon Sep 17 00:00:00 2001
From: Erik Gustavsson <cyrano@area26.se>
Date: Sun, 22 Feb 2015 14:20:16 +0100
Subject: [PATCH] OP-1739 Add separate color for GLONASS sats. Fix sat PNR >
 127.

---
 ground/openpilotgcs/src/plugins/gpsdisplay/gpsdisplaywidget.ui | 2 +-
 ground/openpilotgcs/src/plugins/gpsdisplay/gpssnrwidget.cpp    | 3 +++
 shared/uavobjectdefinition/gpssatellites.xml                   | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ground/openpilotgcs/src/plugins/gpsdisplay/gpsdisplaywidget.ui b/ground/openpilotgcs/src/plugins/gpsdisplay/gpsdisplaywidget.ui
index 8feab151b..b0d2adebd 100644
--- a/ground/openpilotgcs/src/plugins/gpsdisplay/gpsdisplaywidget.ui
+++ b/ground/openpilotgcs/src/plugins/gpsdisplay/gpsdisplaywidget.ui
@@ -127,7 +127,7 @@
           </palette>
          </property>
          <property name="toolTip">
-          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;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)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Displays the SNR for each detected sat. GPS satellites are shown in green, GLONASS in cyan and SBAS in orange. Satellite number (PRN) is displayed inside the bar. Sat SNR is displayed above (in dBHz)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
          </property>
          <property name="autoFillBackground">
           <bool>false</bool>
diff --git a/ground/openpilotgcs/src/plugins/gpsdisplay/gpssnrwidget.cpp b/ground/openpilotgcs/src/plugins/gpsdisplay/gpssnrwidget.cpp
index 16b04951f..c1bf63015 100644
--- a/ground/openpilotgcs/src/plugins/gpsdisplay/gpssnrwidget.cpp
+++ b/ground/openpilotgcs/src/plugins/gpsdisplay/gpssnrwidget.cpp
@@ -105,8 +105,11 @@ void GpsSnrWidget::drawSat(int index)
         QRectF boxRect = boxes[index]->boundingRect();
 
         // Change color for SBAS sat (Egnos, etc..) 120 - 158 range
+        // GLONASS range 65-96 or 255
         if (prn > 119 && prn < 159) {
             boxes[index]->setBrush(QColor("#fd700b"));
+        } else if ((prn > 64 && prn < 97) || 255 == prn) {
+            boxes[index]->setBrush(QColor("Cyan"));
         } else {
             boxes[index]->setBrush(QColor("Green"));
         }
diff --git a/shared/uavobjectdefinition/gpssatellites.xml b/shared/uavobjectdefinition/gpssatellites.xml
index 9c5b87453..5ad5fc7de 100644
--- a/shared/uavobjectdefinition/gpssatellites.xml
+++ b/shared/uavobjectdefinition/gpssatellites.xml
@@ -2,7 +2,7 @@
     <object name="GPSSatellites" singleinstance="true" settings="false" category="Sensors">
         <description>Contains information about the GPS satellites in view from @ref GPSModule.</description>
         <field name="SatsInView" units="" type="int8" elements="1"/>
-        <field name="PRN" units="" type="int8" elements="16"/>
+        <field name="PRN" units="" type="uint8" elements="16"/>
         <field name="Elevation" units="degrees" type="int8" elements="16"/>
         <field name="Azimuth" units="degrees" type="int16" elements="16"/>
         <field name="SNR" units="" type="int8" elements="16"/>