Skip to content

Commit 383f145

Browse files
committed
Nudge SIV to make room for corrections icon
1 parent cfbd696 commit 383f145

File tree

2 files changed

+14
-3
lines changed

2 files changed

+14
-3
lines changed

Firmware/RTK_Everywhere/Display.ino

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1708,6 +1708,15 @@ displayCoords paintSIVIcon(std::vector<iconPropertyBlinking> *iconList, const ic
17081708

17091709
return textCoords;
17101710
}
1711+
1712+
void nudgeAndPrintSIV(displayCoords textCoords, uint8_t siv)
1713+
{
1714+
oled->setCursor(textCoords.x - 1, textCoords.y); // x, y
1715+
oled->print(siv / 10);
1716+
oled->setCursor(textCoords.x + 7, textCoords.y); // x, y
1717+
oled->print(siv % 10);
1718+
}
1719+
17111720
void paintSIVText(displayCoords textCoords)
17121721
{
17131722
oled->setFont(QW_FONT_8X16); // Set font to type 1: 8x16
@@ -1722,14 +1731,16 @@ void paintSIVText(displayCoords textCoords)
17221731
else
17231732
oled->print(":");
17241733

1734+
textCoords.x += 8;
1735+
17251736
if (online.gnss)
17261737
{
17271738
if (inBaseMode() == true)
1728-
oled->print(siv);
1739+
nudgeAndPrintSIV(textCoords, siv);
17291740
else if (gnss->isFixed() == false)
17301741
oled->print("0");
17311742
else
1732-
oled->print(siv);
1743+
nudgeAndPrintSIV(textCoords, siv);
17331744

17341745
paintResets();
17351746
} // End gnss online

Firmware/RTK_Everywhere/icons.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1797,7 +1797,7 @@ correctionIconAttribute correctionIconAttributes[CORR_NUM] = {
17971797
{ 4, 0, BT_Symbol_Width, BT_Symbol_Height, BT_Symbol },
17981798
{ 0, 0, 15, 14, Corr_USB_Icon },
17991799
{ 0, 0, 15, 14, Corr_TCP_Icon },
1800-
{ 1, 0, SIV_Antenna_LBand_Width, SIV_Antenna_LBand_Height, SIV_Antenna_LBand },
1800+
{ 1, 1, SIV_Antenna_LBand_Width, SIV_Antenna_LBand_Height, SIV_Antenna_LBand },
18011801
{ 0, 0, 15, 14, Corr_IP_Icon },
18021802
};
18031803

0 commit comments

Comments
 (0)