Skip to content

Commit dc74c5b

Browse files
nseidlenseidle
committed
Cosmetic display changes
1 parent 979f944 commit dc74c5b

File tree

1 file changed

+55
-17
lines changed

1 file changed

+55
-17
lines changed

‎Firmware/RTK_Surveyor/Display.ino‎

Lines changed: 55 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -505,20 +505,26 @@ void paintBaseTempSurveyStarted()
505505
int elapsedTime = i2cGNSS.getSurveyInObservationTime(100);
506506

507507
oled.setFontType(0);
508-
oled.setCursor(0, 22); //x, y
508+
oled.setCursor(0, 23); //x, y
509509
oled.print("Mean:");
510510

511511
oled.setCursor(29, 20); //x, y
512512
oled.setFontType(1);
513-
oled.print(meanAccuracy, 2);
513+
if (meanAccuracy < 10.0) //Error check
514+
oled.print(meanAccuracy, 2);
515+
else
516+
oled.print(">10");
514517

515-
oled.setCursor(0, 38); //x, y
518+
oled.setCursor(0, 39); //x, y
516519
oled.setFontType(0);
517520
oled.print("Time:");
518521

519522
oled.setCursor(30, 36); //x, y
520523
oled.setFontType(1);
521-
oled.print(elapsedTime);
524+
if (elapsedTime < 1000) //Error check
525+
oled.print(elapsedTime);
526+
else
527+
oled.print("0");
522528

523529
paintLogging();
524530
}
@@ -541,11 +547,15 @@ void paintBaseTempTransmitting()
541547
oled.setFontType(1);
542548
printTextwithKerning("Xmitting", textX, textY, textKerning);
543549

544-
oled.setCursor(0, 38); //x, y
550+
oled.setCursor(0, 39); //x, y
545551
oled.setFontType(0);
546552
oled.print("RTCM:");
547553

548-
oled.setCursor(28, 36); //x, y
554+
if (rtcmPacketsSent < 100)
555+
oled.setCursor(30, 36); //x, y - Give space for two digits
556+
else
557+
oled.setCursor(28, 36); //x, y - Push towards colon to make room for log icon
558+
549559
oled.setFontType(1); //Set font to type 1: 8x16
550560
oled.print(rtcmPacketsSent); //rtcmPacketsSent is controlled in processRTCM()
551561

@@ -575,7 +585,11 @@ void paintBaseTempWiFiStarted()
575585
oled.setFontType(0);
576586
oled.print("RTCM:");
577587

578-
oled.setCursor(28, 36); //x, y
588+
if (rtcmPacketsSent < 100)
589+
oled.setCursor(30, 36); //x, y - Give space for two digits
590+
else
591+
oled.setCursor(28, 36); //x, y - Push towards colon to make room for log icon
592+
579593
oled.setFontType(1); //Set font to type 1: 8x16
580594
oled.print(rtcmPacketsSent); //rtcmPacketsSent is controlled in processRTCM()
581595

@@ -606,7 +620,11 @@ void paintBaseTempWiFiConnected()
606620
oled.setFontType(0);
607621
oled.print("RTCM:");
608622

609-
oled.setCursor(28, 36); //x, y
623+
if (rtcmPacketsSent < 100)
624+
oled.setCursor(30, 36); //x, y - Give space for two digits
625+
else
626+
oled.setCursor(28, 36); //x, y - Push towards colon to make room for log icon
627+
610628
oled.setFontType(1); //Set font to type 1: 8x16
611629
oled.print(rtcmPacketsSent); //rtcmPacketsSent is controlled in processRTCM()
612630

@@ -663,7 +681,11 @@ void paintBaseTempCasterConnected()
663681
oled.setFontType(0);
664682
oled.print("RTCM:");
665683

666-
oled.setCursor(28, 36); //x, y
684+
if (rtcmPacketsSent < 100)
685+
oled.setCursor(30, 36); //x, y - Give space for two digits
686+
else
687+
oled.setCursor(28, 36); //x, y - Push towards colon to make room for log icon
688+
667689
oled.setFontType(1); //Set font to type 1: 8x16
668690
oled.print(rtcmPacketsSent); //rtcmPacketsSent is controlled in processRTCM()
669691

@@ -688,11 +710,15 @@ void paintBaseFixedTransmitting()
688710
oled.setFontType(1);
689711
printTextwithKerning("Xmitting", textX, textY, textKerning);
690712

691-
oled.setCursor(0, 38); //x, y
713+
oled.setCursor(0, 39); //x, y
692714
oled.setFontType(0);
693715
oled.print("RTCM:");
694716

695-
oled.setCursor(28, 36); //x, y
717+
if (rtcmPacketsSent < 100)
718+
oled.setCursor(30, 36); //x, y - Give space for two digits
719+
else
720+
oled.setCursor(28, 36); //x, y - Push towards colon to make room for log icon
721+
696722
oled.setFontType(1); //Set font to type 1: 8x16
697723
oled.print(rtcmPacketsSent); //rtcmPacketsSent is controlled in processRTCM()
698724

@@ -718,11 +744,15 @@ void paintBaseFixedWiFiStarted()
718744
oled.setFontType(1);
719745
printTextwithKerning("Xmitting", textX, textY, textKerning);
720746

721-
oled.setCursor(0, 38); //x, y
747+
oled.setCursor(0, 39); //x, y
722748
oled.setFontType(0);
723749
oled.print("RTCM:");
724750

725-
oled.setCursor(28, 36); //x, y
751+
if (rtcmPacketsSent < 100)
752+
oled.setCursor(30, 36); //x, y - Give space for two digits
753+
else
754+
oled.setCursor(28, 36); //x, y - Push towards colon to make room for log icon
755+
726756
oled.setFontType(1); //Set font to type 1: 8x16
727757
oled.print(rtcmPacketsSent); //rtcmPacketsSent is controlled in processRTCM()
728758

@@ -749,11 +779,15 @@ void paintBaseFixedWiFiConnected()
749779
oled.setFontType(1);
750780
printTextwithKerning("Xmitting", textX, textY, textKerning);
751781

752-
oled.setCursor(0, 38); //x, y
782+
oled.setCursor(0, 39); //x, y
753783
oled.setFontType(0);
754784
oled.print("RTCM:");
755785

756-
oled.setCursor(28, 36); //x, y
786+
if (rtcmPacketsSent < 100)
787+
oled.setCursor(30, 36); //x, y - Give space for two digits
788+
else
789+
oled.setCursor(28, 36); //x, y - Push towards colon to make room for log icon
790+
757791
oled.setFontType(1); //Set font to type 1: 8x16
758792
oled.print(rtcmPacketsSent); //rtcmPacketsSent is controlled in processRTCM()
759793

@@ -806,11 +840,15 @@ void paintBaseFixedCasterConnected()
806840
oled.setFontType(1);
807841
printTextwithKerning("Casting", textX, textY, textKerning);
808842

809-
oled.setCursor(0, 38); //x, y
843+
oled.setCursor(0, 39); //x, y
810844
oled.setFontType(0);
811845
oled.print("RTCM:");
812846

813-
oled.setCursor(28, 36); //x, y
847+
if (rtcmPacketsSent < 100)
848+
oled.setCursor(30, 36); //x, y - Give space for two digits
849+
else
850+
oled.setCursor(28, 36); //x, y - Push towards colon to make room for log icon
851+
814852
oled.setFontType(1); //Set font to type 1: 8x16
815853
oled.print(rtcmPacketsSent); //rtcmPacketsSent is controlled in processRTCM()
816854

0 commit comments

Comments
 (0)