Skip to content

Commit 2b17de4

Browse files
committed
Consolidate graphics to firmware repo. Add first draft dynamic model icons.
1 parent 296ca5e commit 2b17de4

36 files changed

+87
-9
lines changed

Firmware/RTK_Surveyor/Display.ino

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ void paintSIV()
412412
if (i2cGNSS.getFixType() == 3 || i2cGNSS.getFixType() == 4 || i2cGNSS.getFixType() == 5) //3D, 3D+DR, or Time
413413
{
414414
//Fix, turn on icon
415-
oled.drawIcon(2, 35, Antenna_Width, Antenna_Height, Antenna, sizeof(Antenna), true);
415+
oled.drawIcon(2, 35, SIV_Antenna_Width, SIV_Antenna_Height, SIV_Antenna, sizeof(SIV_Antenna), true);
416416
}
417417
else
418418
{
@@ -425,7 +425,7 @@ void paintSIV()
425425
satelliteDishIconDisplayed = true;
426426

427427
//Draw the icon
428-
oled.drawIcon(2, 35, Antenna_Width, Antenna_Height, Antenna, sizeof(Antenna), true);
428+
oled.drawIcon(2, 35, SIV_Antenna_Width, SIV_Antenna_Height, SIV_Antenna, sizeof(SIV_Antenna), true);
429429
}
430430
else
431431
satelliteDishIconDisplayed = false;

Firmware/RTK_Surveyor/Tasks.ino

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,6 @@ void F9PSerialReadTask(void *e)
9696
}
9797
} //End maxLogTime
9898
} //End logging
99-
100-
delay(1); //Poor man's way of feeding WDT. Required to prevent Priority 1 tasks from causing WDT reset
101-
taskYIELD();
102-
10399
} //End Serial.available()
104100

105101
delay(1); //Poor man's way of feeding WDT. Required to prevent Priority 1 tasks from causing WDT reset

Firmware/RTK_Surveyor/icons.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ uint8_t CrossHairDual [] = {
3535
int CrossHairDual_Height = 15;
3636
int CrossHairDual_Width = 15;
3737

38-
uint8_t Antenna [] = {
38+
uint8_t SIV_Antenna [] = {
3939
0x00, 0x1E, 0x62, 0x84, 0x08, 0x10, 0x20, 0x50, 0x88, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x1F,
4040
0x1F, 0x12, 0x12, 0x04, 0x04, 0x05, 0x06, 0x00,
4141
};
42-
int Antenna_Height = 13;
43-
int Antenna_Width = 12;
42+
int SIV_Antenna_Height = 13;
43+
int SIV_Antenna_Width = 12;
4444

4545
uint8_t Rover [] = {
4646
0x1E, 0x61, 0x91, 0x91, 0x61, 0x21, 0x21, 0x21, 0x21, 0x21, 0x62, 0x94, 0x94, 0x64, 0x1C,

Graphics/Base-Fixed.bmp

190 Bytes
Binary file not shown.

Graphics/Base-Temporary.bmp

190 Bytes
Binary file not shown.

Graphics/Battery-0.bmp

1014 Bytes
Binary file not shown.

Graphics/Battery-1.bmp

1014 Bytes
Binary file not shown.

Graphics/Battery-2.bmp

1014 Bytes
Binary file not shown.

Graphics/Battery-3.bmp

1014 Bytes
Binary file not shown.

Graphics/Bluetooth Symbol.bmp

126 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)