Add displayBaseSiv to resolve # 560

Author: PaulZC

Firmware/RTK_Everywhere/Display.ino

@@ -327,15 +327,15 @@ void displayUpdate()
                 displayFullIPAddress(&iconPropertyList);     // Bottom left - 128x64 only
                 setRadioIcons(&iconPropertyList);
                 paintBaseTempSurveyStarted(&iconPropertyList);
-                displaySivVsOpenShort(&iconPropertyList);
+                displayBaseSiv(&iconPropertyList); // 128x64 only
                 break;
             case (STATE_BASE_TEMP_TRANSMITTING):
                 paintLogging(&iconPropertyList);
                 displayBatteryVsEthernet(&iconPropertyList); // Top right
                 displayFullIPAddress(&iconPropertyList);     // Bottom left - 128x64 only
                 setRadioIcons(&iconPropertyList);
                 paintRTCM(&iconPropertyList);
-                displaySivVsOpenShort(&iconPropertyList);
+                displayBaseSiv(&iconPropertyList); // 128x64 only
                 break;
             case (STATE_BASE_FIXED_NOT_STARTED):
                 displayBatteryVsEthernet(&iconPropertyList); // Top right
@@ -348,7 +348,7 @@ void displayUpdate()
                 displayFullIPAddress(&iconPropertyList);     // Bottom left - 128x64 only
                 setRadioIcons(&iconPropertyList);
                 paintRTCM(&iconPropertyList);
-                displaySivVsOpenShort(&iconPropertyList);
+                displayBaseSiv(&iconPropertyList); // 128x64 only
                 break;
 
             case (STATE_NTPSERVER_NOT_STARTED):
@@ -1664,6 +1664,17 @@ void displaySivVsOpenShort(std::vector<iconPropertyBlinking> *iconList)
     }
 }
 
+void displayBaseSiv(std::vector<iconPropertyBlinking> *iconList)
+{
+    // Display SIV during Base - but only on 128x64 displays. 64x48 has no room.
+    // No support for short / open.
+    if (present.display_type == DISPLAY_128x64)
+    {
+        displayCoords textCoords = paintSIVIcon(iconList, &BaseSIVIconProperties, 0b11111111);
+        paintSIVText(textCoords);
+    }
+}
+
 void displayHorizontalAccuracy(std::vector<iconPropertyBlinking> *iconList, const iconProperties *icon, uint8_t duty)
 {
     iconPropertyBlinking prop;
@@ -1724,26 +1735,14 @@ displayCoords paintSIVIcon(std::vector<iconPropertyBlinking> *iconList, const ic
             if (lbandCorrectionsReceived || spartnCorrectionsReceived)
                 icon = &LBandIconProperties;
             else
-            {
-                // If in Rover mode, always use SIVIconProperties
-                if (inBaseMode() == false)
-                    icon = &SIVIconProperties;
-                // Else if in Base mode and during base settle, use SIVIconProperties
-                else if (systemState == STATE_BASE_TEMP_SETTLE)
-                    icon = &SIVIconProperties; //During base settle, SIV inline with HPA
-                // Else use BaseSIVIconProperties.
-                // On 128x64 displays, SIV will be moved down to avoid collision with 'Xmitting RTCM' text
-                else
-                    icon = &BaseSIVIconProperties;
-            }
+                icon = &SIVIconProperties;
 
             // if in base mode, don't blink
             if (inBaseMode() == true)
             {
                 // override duty - solid satellite dish icon regardless of fix state
                 duty = 0b11111111;
             }
-
             // Determine if there is a fix
             else if (gnss->isFixed() == false)
             {

Firmware/RTK_Everywhere/icons.h

@@ -1937,7 +1937,7 @@ const uint8_t SIVIconYPos64x48 = 35;
 const uint8_t SIVIconXPos128x64 = 74; // Just because we can, move SIV to the right on 128x64
 const uint8_t SIVIconYPos128x64 = 26;
 const uint8_t BaseSIVIconXPos128x64 = 74; // Move SIV info below the 'Xmitting RTCM' text on 128x64
-const uint8_t BaseSIVIconYPos128x64 = (26 + 15); // Assume font size 1;
+const uint8_t BaseSIVIconYPos128x64 = (26 + 14); // Assume font size 1;
 
 const int SIVTextStartXPosOffset[DISPLAY_MAX_NONE] = { -2, -2 }; // This is a bodge to allow the paintBaseTempSurveyStarted text to be printed in the correct place