@@ -180,7 +180,7 @@ void updateDisplay()
180
180
| ICON_BASE_TEMPORARY // Top center
181
181
| ICON_BATTERY // Top right
182
182
| ICON_LOGGING; // Bottom right
183
- paintBaseTempCasterConnected ();
183
+ paintCastingRTCM ();
184
184
break ;
185
185
case (STATE_BASE_FIXED_NOT_STARTED):
186
186
icons = paintWirelessIcon () // Top left
@@ -218,7 +218,7 @@ void updateDisplay()
218
218
| ICON_BASE_FIXED // Top center
219
219
| ICON_BATTERY // Top right
220
220
| ICON_LOGGING; // Bottom right
221
- paintBaseFixedCasterConnected ();
221
+ paintCastingRTCM ();
222
222
break ;
223
223
case (STATE_BUBBLE_LEVEL):
224
224
paintBubbleLevel ();
@@ -730,27 +730,8 @@ void paintXmittingRTCM()
730
730
paintResets ();
731
731
}
732
732
733
- // Show connecting to caster service
734
- // Solid WiFi icon
735
- void paintBaseTempCasterStarted ()
736
- {
737
- int textX = 11 ;
738
- int textY = 17 ;
739
- int textKerning = 8 ;
740
-
741
- printTextwithKerning (" Caster" , textX, textY, textKerning);
742
-
743
- textX = 3 ;
744
- textY = 33 ;
745
- textKerning = 6 ;
746
- oled.setFont (QW_FONT_8X16);
747
-
748
- printTextwithKerning (" Connecting" , textX, textY, textKerning);
749
- }
750
-
751
733
// Show transmission of RTCM packets to caster service
752
- // Solid WiFi icon
753
- void paintBaseTempCasterConnected ()
734
+ void paintCastingRTCM ()
754
735
{
755
736
int textX = 4 ;
756
737
int textY = 17 ;
@@ -775,10 +756,10 @@ void paintBaseTempCasterConnected()
775
756
776
757
// Show connecting to caster service
777
758
// Solid WiFi icon
778
- void paintBaseFixedCasterStarted ()
759
+ void paintBaseTempCasterStarted ()
779
760
{
780
761
int textX = 11 ;
781
- int textY = 18 ;
762
+ int textY = 17 ;
782
763
int textKerning = 8 ;
783
764
784
765
printTextwithKerning (" Caster" , textX, textY, textKerning);
@@ -791,29 +772,22 @@ void paintBaseFixedCasterStarted()
791
772
printTextwithKerning (" Connecting" , textX, textY, textKerning);
792
773
}
793
774
794
- // Show transmission of RTCM packets to caster service
775
+ // Show connecting to caster service
795
776
// Solid WiFi icon
796
- void paintBaseFixedCasterConnected ()
777
+ void paintBaseFixedCasterStarted ()
797
778
{
798
- int textX = 4 ;
799
- int textY = 17 ;
779
+ int textX = 11 ;
780
+ int textY = 18 ;
800
781
int textKerning = 8 ;
801
- oled.setFont (QW_FONT_8X16);
802
- printTextwithKerning (" Casting" , textX, textY, textKerning);
803
-
804
- oled.setCursor (0 , 39 ); // x, y
805
- oled.setFont (QW_FONT_5X7);
806
- oled.print (" RTCM:" );
807
782
808
- if (rtcmPacketsSent < 100 )
809
- oled.setCursor (30 , 36 ); // x, y - Give space for two digits
810
- else
811
- oled.setCursor (28 , 36 ); // x, y - Push towards colon to make room for log icon
783
+ printTextwithKerning (" Caster" , textX, textY, textKerning);
812
784
813
- oled.setFont (QW_FONT_8X16); // Set font to type 1: 8x16
814
- oled.print (rtcmPacketsSent); // rtcmPacketsSent is controlled in processRTCM()
785
+ textX = 3 ;
786
+ textY = 33 ;
787
+ textKerning = 6 ;
788
+ oled.setFont (QW_FONT_8X16);
815
789
816
- paintResets ( );
790
+ printTextwithKerning ( " Connecting " , textX, textY, textKerning );
817
791
}
818
792
819
793
void displayBaseStart (uint16_t displayTime)
0 commit comments