Skip to content

Commit cc807df

Browse files
committed
Move beginDisplay into Display.ino
1 parent 68bdf21 commit cc807df

File tree

2 files changed

+25
-25
lines changed

2 files changed

+25
-25
lines changed

Firmware/RTK_Surveyor/Begin.ino

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -351,30 +351,6 @@ void beginFS()
351351
}
352352
}
353353

354-
void beginDisplay()
355-
{
356-
blinking_icons = 0;
357-
if (oled.begin() == true)
358-
{
359-
online.display = true;
360-
361-
Serial.println(F("Display started"));
362-
displaySplash();
363-
splashStart = millis();
364-
}
365-
else
366-
{
367-
if (productVariant == RTK_SURVEYOR)
368-
{
369-
Serial.println(F("Display not detected"));
370-
}
371-
else if (productVariant == RTK_EXPRESS || productVariant == RTK_EXPRESS_PLUS || productVariant == RTK_FACET || productVariant == RTK_FACET_LBAND)
372-
{
373-
Serial.println(F("Display Error: Not detected."));
374-
}
375-
}
376-
}
377-
378354
//Connect to ZED module and identify particulars
379355
void beginGNSS()
380356
{
@@ -437,7 +413,7 @@ void beginGNSS()
437413
Serial.printf("Unknown ZED module: %s\n\r", i2cGNSS.minfo.extension[3]);
438414
zedModuleType = PLATFORM_F9P;
439415
}
440-
416+
441417
printModuleInfo(); //Print module type and firmware version
442418
}
443419

Firmware/RTK_Surveyor/Display.ino

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,30 @@
3131

3232
static uint32_t icons;
3333

34+
void beginDisplay()
35+
{
36+
blinking_icons = 0;
37+
if (oled.begin() == true)
38+
{
39+
online.display = true;
40+
41+
Serial.println(F("Display started"));
42+
displaySplash();
43+
splashStart = millis();
44+
}
45+
else
46+
{
47+
if (productVariant == RTK_SURVEYOR)
48+
{
49+
Serial.println(F("Display not detected"));
50+
}
51+
else if (productVariant == RTK_EXPRESS || productVariant == RTK_EXPRESS_PLUS || productVariant == RTK_FACET || productVariant == RTK_FACET_LBAND)
52+
{
53+
Serial.println(F("Display Error: Not detected."));
54+
}
55+
}
56+
}
57+
3458
//Given the system state, display the appropriate information
3559
void updateDisplay()
3660
{

0 commit comments

Comments
 (0)