Skip to content

Commit 1bb64f9

Browse files
LeeLeahy2LeeLeahy2
committed
Handle display of logging icon
1 parent f853c47 commit 1bb64f9

File tree

2 files changed

+66
-105
lines changed

2 files changed

+66
-105
lines changed

‎Firmware/RTK_Surveyor/Display.ino‎

Lines changed: 66 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -51,43 +51,51 @@ void updateDisplay()
5151
{
5252
case (STATE_ROVER_NOT_STARTED):
5353
icons = paintWirelessIcon() //Top left
54-
| ICON_BATTERY; //Top right
54+
| ICON_BATTERY //Top right
55+
| ICON_LOGGING; //Bottom right
5556
paintRoverNoFix();
5657
break;
5758
case (STATE_ROVER_NO_FIX):
5859
icons = paintWirelessIcon() //Top left
59-
| ICON_BATTERY; //Top right
60+
| ICON_BATTERY //Top right
61+
| ICON_LOGGING; //Bottom right
6062
paintRoverNoFix();
6163
break;
6264
case (STATE_ROVER_FIX):
6365
icons = paintWirelessIcon() //Top left
64-
| ICON_BATTERY; //Top right
66+
| ICON_BATTERY //Top right
67+
| ICON_LOGGING; //Bottom right
6568
paintRoverFix();
6669
break;
6770
case (STATE_ROVER_RTK_FLOAT):
6871
icons = paintWirelessIcon() //Top left
69-
| ICON_BATTERY; //Top right
72+
| ICON_BATTERY //Top right
73+
| ICON_LOGGING; //Bottom right
7074
paintRoverRTKFloat();
7175
break;
7276
case (STATE_ROVER_RTK_FIX):
7377
icons = paintWirelessIcon() //Top left
74-
| ICON_BATTERY; //Top right
78+
| ICON_BATTERY //Top right
79+
| ICON_LOGGING; //Bottom right
7580
paintRoverRTKFix();
7681
break;
7782

7883
case (STATE_ROVER_CLIENT_WIFI_STARTED):
7984
icons = paintWirelessIcon() //Top left
80-
| ICON_BATTERY; //Top right
85+
| ICON_BATTERY //Top right
86+
| ICON_LOGGING; //Bottom right
8187
paintRoverWiFiStarted();
8288
break;
8389
case (STATE_ROVER_CLIENT_WIFI_CONNECTED):
8490
icons = paintWirelessIcon() //Top left
85-
| ICON_BATTERY; //Top right
91+
| ICON_BATTERY //Top right
92+
| ICON_LOGGING; //Bottom right
8693
paintRoverWiFiStarted();
8794
break;
8895
case (STATE_ROVER_CLIENT_STARTED):
8996
icons = paintWirelessIcon() //Top left
90-
| ICON_BATTERY; //Top right
97+
| ICON_BATTERY //Top right
98+
| ICON_LOGGING; //Bottom right
9199
paintRoverWiFiStarted();
92100
break;
93101

@@ -96,27 +104,32 @@ void updateDisplay()
96104
break;
97105
case (STATE_BASE_TEMP_SETTLE):
98106
icons = paintWirelessIcon() //Top left
99-
| ICON_BATTERY; //Top right
107+
| ICON_BATTERY //Top right
108+
| ICON_LOGGING; //Bottom right
100109
paintBaseTempSettle();
101110
break;
102111
case (STATE_BASE_TEMP_SURVEY_STARTED):
103112
icons = paintWirelessIcon() //Top left
104-
| ICON_BATTERY; //Top right
113+
| ICON_BATTERY //Top right
114+
| ICON_LOGGING; //Bottom right
105115
paintBaseTempSurveyStarted();
106116
break;
107117
case (STATE_BASE_TEMP_TRANSMITTING):
108118
icons = paintWirelessIcon() //Top left
109-
| ICON_BATTERY; //Top right
119+
| ICON_BATTERY //Top right
120+
| ICON_LOGGING; //Bottom right
110121
paintBaseTempTransmitting();
111122
break;
112123
case (STATE_BASE_TEMP_WIFI_STARTED):
113124
icons = paintWirelessIcon() //Top left
114-
| ICON_BATTERY; //Top right
125+
| ICON_BATTERY //Top right
126+
| ICON_LOGGING; //Bottom right
115127
paintBaseTempWiFiStarted();
116128
break;
117129
case (STATE_BASE_TEMP_WIFI_CONNECTED):
118130
icons = paintWirelessIcon() //Top left
119-
| ICON_BATTERY; //Top right
131+
| ICON_BATTERY //Top right
132+
| ICON_LOGGING; //Bottom right
120133
paintBaseTempWiFiConnected();
121134
break;
122135
case (STATE_BASE_TEMP_CASTER_STARTED):
@@ -126,7 +139,8 @@ void updateDisplay()
126139
break;
127140
case (STATE_BASE_TEMP_CASTER_CONNECTED):
128141
icons = paintWirelessIcon() //Top left
129-
| ICON_BATTERY; //Top right
142+
| ICON_BATTERY //Top right
143+
| ICON_LOGGING; //Bottom right
130144
paintBaseTempCasterConnected();
131145
break;
132146
case (STATE_BASE_FIXED_NOT_STARTED):
@@ -136,17 +150,20 @@ void updateDisplay()
136150
break;
137151
case (STATE_BASE_FIXED_TRANSMITTING):
138152
icons = paintWirelessIcon() //Top left
139-
| ICON_BATTERY; //Top right
153+
| ICON_BATTERY //Top right
154+
| ICON_LOGGING; //Bottom right
140155
paintBaseFixedTransmitting();
141156
break;
142157
case (STATE_BASE_FIXED_WIFI_STARTED):
143-
icons = paintWirelessIcon() //Top left
144-
| ICON_BATTERY; //Top right
145-
paintBaseFixedWiFiStarted();
158+
icons = paintWirelessIcon() //Top left
159+
| ICON_BATTERY //Top right
160+
| ICON_LOGGING; //Bottom right
161+
paintBaseFixedWiFiStarted();
146162
break;
147163
case (STATE_BASE_FIXED_WIFI_CONNECTED):
148164
icons = paintWirelessIcon() //Top left
149-
| ICON_BATTERY; //Top right
165+
| ICON_BATTERY //Top right
166+
| ICON_LOGGING; //Bottom right
150167
paintBaseFixedWiFiConnected();
151168
break;
152169
case (STATE_BASE_FIXED_CASTER_STARTED):
@@ -156,7 +173,8 @@ void updateDisplay()
156173
break;
157174
case (STATE_BASE_FIXED_CASTER_CONNECTED):
158175
icons = paintWirelessIcon() //Top left
159-
| ICON_BATTERY; //Top right
176+
| ICON_BATTERY //Top right
177+
| ICON_LOGGING; //Bottom right
160178
paintBaseFixedCasterConnected();
161179
break;
162180
case (STATE_BUBBLE_LEVEL):
@@ -273,6 +291,10 @@ void updateDisplay()
273291
if (icons & ICON_BATTERY)
274292
paintBatteryLevel();
275293

294+
//Bottom right corner
295+
if (icons & ICON_LOGGING)
296+
paintLogging();
297+
276298
oled.display(); //Push internal buffer to display
277299
}
278300
} //End display online
@@ -694,62 +716,32 @@ void paintSIV()
694716
//Turn off icon if log file fails to get bigger
695717
void paintLogging()
696718
{
697-
if (online.display == true)
719+
//Animate icon to show system running
720+
loggingIconDisplayed++; //Goto next icon
721+
loggingIconDisplayed %= 4; //Wrap
722+
if (online.logging == true && logIncreasing == true)
698723
{
699-
if (online.logging == true && logIncreasing == true)
700-
{
701-
//Animate icon to show system running
702-
if (millis() - lastLoggingIconUpdate > 500)
703-
{
704-
lastLoggingIconUpdate = millis();
705-
706-
loggingIconDisplayed++; //Goto next icon
707-
loggingIconDisplayed %= 4; //Wrap
708-
}
709-
710-
if (loggingIconDisplayed == 0)
711-
displayBitmap(64 - Logging_0_Width, 48 - Logging_0_Height, Logging_0_Width, Logging_0_Height, Logging_0);
712-
else if (loggingIconDisplayed == 1)
713-
displayBitmap(64 - Logging_1_Width, 48 - Logging_1_Height, Logging_1_Width, Logging_1_Height, Logging_1);
714-
else if (loggingIconDisplayed == 2)
715-
displayBitmap(64 - Logging_2_Width, 48 - Logging_2_Height, Logging_2_Width, Logging_2_Height, Logging_2);
716-
else if (loggingIconDisplayed == 3)
717-
displayBitmap(64 - Logging_3_Width, 48 - Logging_3_Height, Logging_3_Width, Logging_3_Height, Logging_3);
718-
}
719-
else
720-
{ //Paint pulse to show system activity
721-
//Animate icon to show system running
722-
if (millis() - lastLoggingIconUpdate > 500)
723-
{
724-
lastLoggingIconUpdate = millis();
725-
726-
loggingIconDisplayed++; //Goto next icon
727-
loggingIconDisplayed %= 4; //Wrap
728-
729-
const int pulseX = 64 - 4;
730-
const int pulseY = oled.getHeight();
731-
732-
if (loggingIconDisplayed == 0)
733-
{
734-
//Paint no line
735-
}
736-
else if (loggingIconDisplayed == 1)
737-
{
738-
oled.line(pulseX, pulseY, pulseX, pulseY - 4);
739-
oled.line(pulseX - 1, pulseY, pulseX - 1, pulseY - 4);
740-
}
741-
else if (loggingIconDisplayed == 2)
742-
{
743-
oled.line(pulseX, pulseY, pulseX, pulseY - 8);
744-
oled.line(pulseX - 1, pulseY, pulseX - 1, pulseY - 8);
745-
}
746-
else if (loggingIconDisplayed == 3)
747-
{
748-
oled.line(pulseX, pulseY, pulseX, pulseY - 12);
749-
oled.line(pulseX - 1, pulseY, pulseX - 1, pulseY - 12);
750-
}
751-
}
724+
if (loggingIconDisplayed == 0)
725+
displayBitmap(64 - Logging_0_Width, 48 - Logging_0_Height, Logging_0_Width, Logging_0_Height, Logging_0);
726+
else if (loggingIconDisplayed == 1)
727+
displayBitmap(64 - Logging_1_Width, 48 - Logging_1_Height, Logging_1_Width, Logging_1_Height, Logging_1);
728+
else if (loggingIconDisplayed == 2)
729+
displayBitmap(64 - Logging_2_Width, 48 - Logging_2_Height, Logging_2_Width, Logging_2_Height, Logging_2);
730+
else if (loggingIconDisplayed == 3)
731+
displayBitmap(64 - Logging_3_Width, 48 - Logging_3_Height, Logging_3_Width, Logging_3_Height, Logging_3);
732+
}
733+
else
734+
{
735+
const int pulseX = 64 - 4;
736+
const int pulseY = oled.getHeight();
737+
int height;
752738

739+
//Paint pulse to show system activity
740+
height = loggingIconDisplayed << 2;
741+
if (height)
742+
{
743+
oled.line(pulseX, pulseY, pulseX, pulseY - height);
744+
oled.line(pulseX - 1, pulseY, pulseX - 1, pulseY - height);
753745
}
754746
}
755747
}
@@ -765,8 +757,6 @@ void paintRoverNoFix()
765757
paintHorizontalAccuracy();
766758

767759
paintSIV();
768-
769-
paintLogging();
770760
}
771761
}
772762

@@ -780,8 +770,6 @@ void paintRoverFix()
780770
paintHorizontalAccuracy();
781771

782772
paintSIV();
783-
784-
paintLogging();
785773
}
786774
}
787775

@@ -795,8 +783,6 @@ void paintRoverRTKFloat()
795783
paintHorizontalAccuracy();
796784

797785
paintSIV();
798-
799-
paintLogging();
800786
}
801787
}
802788

@@ -809,8 +795,6 @@ void paintRoverRTKFix()
809795
paintHorizontalAccuracy();
810796

811797
paintSIV();
812-
813-
paintLogging();
814798
}
815799
}
816800

@@ -824,8 +808,6 @@ void paintRoverWiFiStarted()
824808
paintHorizontalAccuracy();
825809

826810
paintSIV();
827-
828-
paintLogging();
829811
}
830812
}
831813

@@ -841,8 +823,6 @@ void paintBaseTempSettle()
841823
paintHorizontalAccuracy(); //2nd line
842824

843825
paintSIV();
844-
845-
paintLogging();
846826
}
847827
}
848828

@@ -874,8 +854,6 @@ void paintBaseTempSurveyStarted()
874854
oled.print(svinObservationTime);
875855
else
876856
oled.print("0");
877-
878-
paintLogging();
879857
}
880858
}
881859

@@ -905,8 +883,6 @@ void paintBaseTempTransmitting()
905883
oled.print(rtcmPacketsSent); //rtcmPacketsSent is controlled in processRTCM()
906884

907885
paintResets();
908-
909-
paintLogging();
910886
}
911887
}
912888

@@ -937,8 +913,6 @@ void paintBaseTempWiFiStarted()
937913
oled.print(rtcmPacketsSent); //rtcmPacketsSent is controlled in processRTCM()
938914

939915
paintResets();
940-
941-
paintLogging();
942916
}
943917
}
944918

@@ -970,8 +944,6 @@ void paintBaseTempWiFiConnected()
970944
oled.print(rtcmPacketsSent); //rtcmPacketsSent is controlled in processRTCM()
971945

972946
paintResets();
973-
974-
paintLogging();
975947
}
976948
}
977949

@@ -1025,8 +997,6 @@ void paintBaseTempCasterConnected()
1025997
oled.print(rtcmPacketsSent); //rtcmPacketsSent is controlled in processRTCM()
1026998

1027999
paintResets();
1028-
1029-
paintLogging();
10301000
}
10311001
}
10321002

@@ -1065,8 +1035,6 @@ void paintBaseFixedTransmitting()
10651035
oled.print(rtcmPacketsSent); //rtcmPacketsSent is controlled in processRTCM()
10661036

10671037
paintResets();
1068-
1069-
paintLogging();
10701038
}
10711039
}
10721040

@@ -1097,8 +1065,6 @@ void paintBaseFixedWiFiStarted()
10971065
oled.print(rtcmPacketsSent); //rtcmPacketsSent is controlled in processRTCM()
10981066

10991067
paintResets();
1100-
1101-
paintLogging();
11021068
}
11031069
}
11041070

@@ -1130,8 +1096,6 @@ void paintBaseFixedWiFiConnected()
11301096
oled.print(rtcmPacketsSent); //rtcmPacketsSent is controlled in processRTCM()
11311097

11321098
paintResets();
1133-
1134-
paintLogging();
11351099
}
11361100
}
11371101

@@ -1185,8 +1149,6 @@ void paintBaseFixedCasterConnected()
11851149
oled.print(rtcmPacketsSent); //rtcmPacketsSent is controlled in processRTCM()
11861150

11871151
paintResets();
1188-
1189-
paintLogging();
11901152
}
11911153
}
11921154

‎Firmware/RTK_Surveyor/RTK_Surveyor.ino‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,6 @@ uint32_t lastCrosshairIconUpdate = 0;
392392
bool crosshairIconDisplayed = false; //Toggles as lastCrosshairIconUpdate goes above 1000ms
393393
uint32_t lastBaseIconUpdate = 0;
394394
bool baseIconDisplayed = false; //Toggles as lastBaseIconUpdate goes above 1000ms
395-
uint32_t lastLoggingIconUpdate = 0;
396395
int loggingIconDisplayed = 0; //Increases every 500ms while logging
397396

398397
uint64_t lastLogSize = 0;

0 commit comments

Comments
 (0)