Skip to content

Commit 683462d

Browse files
nseidlenseidle
committed
Display.ino formatting
1 parent c821722 commit 683462d

File tree

1 file changed

+48
-48
lines changed

1 file changed

+48
-48
lines changed

‎Firmware/RTK_Surveyor/Display.ino

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -157,48 +157,48 @@ void updateDisplay()
157157

158158
case (STATE_ROVER_NOT_STARTED):
159159
icons = paintWirelessIcon() //Top left
160-
| ICON_BATTERY //Top right
161-
| ICON_CROSS_HAIR //Center left
162-
| ICON_HORIZONTAL_ACCURACY //Center right
163-
| paintSIV() //Bottom left
164-
| ICON_LOGGING; //Bottom right
160+
| ICON_BATTERY //Top right
161+
| ICON_CROSS_HAIR //Center left
162+
| ICON_HORIZONTAL_ACCURACY //Center right
163+
| paintSIV() //Bottom left
164+
| ICON_LOGGING; //Bottom right
165165
break;
166166
case (STATE_ROVER_NO_FIX):
167167
icons = paintWirelessIcon() //Top left
168-
| ICON_DYNAMIC_MODEL //Top center
169-
| ICON_BATTERY //Top right
170-
| ICON_CROSS_HAIR //Center left
171-
| ICON_HORIZONTAL_ACCURACY //Center right
172-
| paintSIV() //Bottom left
173-
| ICON_LOGGING; //Bottom right
168+
| ICON_DYNAMIC_MODEL //Top center
169+
| ICON_BATTERY //Top right
170+
| ICON_CROSS_HAIR //Center left
171+
| ICON_HORIZONTAL_ACCURACY //Center right
172+
| paintSIV() //Bottom left
173+
| ICON_LOGGING; //Bottom right
174174
break;
175175
case (STATE_ROVER_FIX):
176176
icons = paintWirelessIcon() //Top left
177-
| ICON_DYNAMIC_MODEL //Top center
178-
| ICON_BATTERY //Top right
179-
| ICON_CROSS_HAIR //Center left
180-
| ICON_HORIZONTAL_ACCURACY //Center right
181-
| paintSIV() //Bottom left
182-
| ICON_LOGGING; //Bottom right
177+
| ICON_DYNAMIC_MODEL //Top center
178+
| ICON_BATTERY //Top right
179+
| ICON_CROSS_HAIR //Center left
180+
| ICON_HORIZONTAL_ACCURACY //Center right
181+
| paintSIV() //Bottom left
182+
| ICON_LOGGING; //Bottom right
183183
break;
184184
case (STATE_ROVER_RTK_FLOAT):
185185
blinking_icons ^= ICON_CROSS_HAIR_DUAL;
186186
icons = paintWirelessIcon() //Top left
187-
| ICON_DYNAMIC_MODEL //Top center
188-
| ICON_BATTERY //Top right
189-
| (blinking_icons & ICON_CROSS_HAIR_DUAL) //Center left
190-
| ICON_HORIZONTAL_ACCURACY //Center right
191-
| paintSIV() //Bottom left
192-
| ICON_LOGGING; //Bottom right
187+
| ICON_DYNAMIC_MODEL //Top center
188+
| ICON_BATTERY //Top right
189+
| (blinking_icons & ICON_CROSS_HAIR_DUAL) //Center left
190+
| ICON_HORIZONTAL_ACCURACY //Center right
191+
| paintSIV() //Bottom left
192+
| ICON_LOGGING; //Bottom right
193193
break;
194194
case (STATE_ROVER_RTK_FIX):
195195
icons = paintWirelessIcon() //Top left
196-
| ICON_DYNAMIC_MODEL //Top center
197-
| ICON_BATTERY //Top right
198-
| ICON_CROSS_HAIR_DUAL//Center left
199-
| ICON_HORIZONTAL_ACCURACY //Center right
200-
| paintSIV() //Bottom left
201-
| ICON_LOGGING; //Bottom right
196+
| ICON_DYNAMIC_MODEL //Top center
197+
| ICON_BATTERY //Top right
198+
| ICON_CROSS_HAIR_DUAL//Center left
199+
| ICON_HORIZONTAL_ACCURACY //Center right
200+
| paintSIV() //Bottom left
201+
| ICON_LOGGING; //Bottom right
202202
break;
203203

204204
case (STATE_BASE_NOT_STARTED):
@@ -211,37 +211,37 @@ void updateDisplay()
211211
case (STATE_BASE_TEMP_SETTLE):
212212
blinking_icons ^= ICON_BASE_TEMPORARY | ICON_CROSS_HAIR;
213213
icons = paintWirelessIcon() //Top left
214-
| (blinking_icons & ICON_BASE_TEMPORARY) //Top center
215-
| ICON_BATTERY //Top right
216-
| (blinking_icons & ICON_CROSS_HAIR) //Center left
217-
| ICON_HORIZONTAL_ACCURACY //Center right
218-
| paintSIV() //Bottom left
219-
| ICON_LOGGING; //Bottom right
214+
| (blinking_icons & ICON_BASE_TEMPORARY) //Top center
215+
| ICON_BATTERY //Top right
216+
| (blinking_icons & ICON_CROSS_HAIR) //Center left
217+
| ICON_HORIZONTAL_ACCURACY //Center right
218+
| paintSIV() //Bottom left
219+
| ICON_LOGGING; //Bottom right
220220
break;
221221
case (STATE_BASE_TEMP_SURVEY_STARTED):
222222
blinking_icons ^= ICON_BASE_TEMPORARY;
223223
icons = paintWirelessIcon() //Top left
224-
| (blinking_icons & ICON_BASE_TEMPORARY) //Top center
225-
| ICON_BATTERY //Top right
226-
| ICON_LOGGING; //Bottom right
224+
| (blinking_icons & ICON_BASE_TEMPORARY) //Top center
225+
| ICON_BATTERY //Top right
226+
| ICON_LOGGING; //Bottom right
227227
paintBaseTempSurveyStarted();
228228
break;
229229
case (STATE_BASE_TEMP_TRANSMITTING):
230230
icons = paintWirelessIcon() //Top left
231-
| ICON_BASE_TEMPORARY //Top center
232-
| ICON_BATTERY //Top right
233-
| ICON_LOGGING; //Bottom right
231+
| ICON_BASE_TEMPORARY //Top center
232+
| ICON_BATTERY //Top right
233+
| ICON_LOGGING; //Bottom right
234234
paintRTCM();
235235
break;
236236
case (STATE_BASE_FIXED_NOT_STARTED):
237237
icons = paintWirelessIcon() //Top left
238-
| ICON_BATTERY; //Top right
238+
| ICON_BATTERY; //Top right
239239
break;
240240
case (STATE_BASE_FIXED_TRANSMITTING):
241241
icons = paintWirelessIcon() //Top left
242-
| ICON_BASE_FIXED //Top center
243-
| ICON_BATTERY //Top right
244-
| ICON_LOGGING; //Bottom right
242+
| ICON_BASE_FIXED //Top center
243+
| ICON_BATTERY //Top right
244+
| ICON_LOGGING; //Bottom right
245245
paintRTCM();
246246
break;
247247
case (STATE_BUBBLE_LEVEL):
@@ -533,7 +533,7 @@ void paintBatteryLevel()
533533
10|
534534
11|
535535
536-
or
536+
or
537537
538538
111111111122222222223333333333444444444455555555556666
539539
0123456789012345678901234567890123456789012345678901234567890123
@@ -553,7 +553,7 @@ or
553553
12| **
554554
13| *
555555
556-
or
556+
or
557557
558558
111111111122222222223333333333444444444455555555556666
559559
0123456789012345678901234567890123456789012345678901234567890123
@@ -585,7 +585,7 @@ uint32_t paintWirelessIcon()
585585
if (systemState <= STATE_BASE_NOT_STARTED)
586586
{
587587
if (online.rxRtcmCorrectionData)
588-
icons |= ICON_DOWN_ARROW;
588+
icons |= ICON_DOWN_ARROW;
589589
}
590590
else if (systemState <= STATE_BUBBLE_LEVEL)
591591
icons |= ICON_UP_ARROW;

0 commit comments

Comments
 (0)