Skip to content

Commit 7a35d6b

Browse files
committed
Moved display variables into Display.ino
1 parent cc807df commit 7a35d6b

File tree

2 files changed

+22
-9
lines changed

2 files changed

+22
-9
lines changed

Firmware/RTK_Surveyor/Display.ino

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
//----------------------------------------
2+
// Constants
3+
//----------------------------------------
4+
15
//Left top
26
#define ICON_WIFI_SYMBOL_LEFT 1 // 0, 0
37
#define ICON_DOWN_ARROW 2 // 16, 0
@@ -29,8 +33,26 @@
2933
//Right bottom
3034
#define ICON_LOGGING 0x10000 // right, bottom
3135

36+
//----------------------------------------
37+
// Locals
38+
//----------------------------------------
39+
40+
static QwiicMicroOLED oled;
41+
static uint32_t blinking_icons;
3242
static uint32_t icons;
3343

44+
// Fonts
45+
#include <res/qw_fnt_5x7.h>
46+
#include <res/qw_fnt_8x16.h>
47+
#include <res/qw_fnt_largenum.h>
48+
49+
// Icons
50+
#include "icons.h"
51+
52+
//----------------------------------------
53+
// Routines
54+
//----------------------------------------
55+
3456
void beginDisplay()
3557
{
3658
blinking_icons = 0;

Firmware/RTK_Surveyor/RTK_Surveyor.ino

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -270,15 +270,6 @@ bool zedUartPassed = false; //Goes true during testing if ESP can communicate wi
270270
//External Display
271271
//=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
272272
#include <SparkFun_Qwiic_OLED.h> //http://librarymanager/All#SparkFun_Qwiic_Graphic_OLED
273-
QwiicMicroOLED oled;
274-
uint32_t blinking_icons;
275-
276-
// Fonts
277-
#include <res/qw_fnt_5x7.h>
278-
#include <res/qw_fnt_8x16.h>
279-
#include <res/qw_fnt_largenum.h>
280-
281-
#include "icons.h"
282273
//=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
283274

284275
//Firmware binaries loaded from SD

0 commit comments

Comments
 (0)