Skip to content

Commit b779cf9

Browse files
G4lile0G4lile0
committed
added worldmap :)
1 parent e6ea040 commit b779cf9

File tree

2 files changed

+106
-6
lines changed

2 files changed

+106
-6
lines changed

‎Fossa_GroundStation/Fossa_GroundStation/Fossa_GroundStation.ino‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -296,16 +296,24 @@ void drawFrame5(OLEDDisplay *display, OLEDDisplayUiState* state, int16_t x, int1
296296
}
297297

298298

299-
//void drawFrame4(OLEDDisplay *display, OLEDDisplayUiState* state, int16_t x, int16_t y) {
300-
//
301-
//}
299+
void drawFrame6(OLEDDisplay *display, OLEDDisplayUiState* state, int16_t x, int16_t y) {
300+
display->drawXbm(x , y , earth_width, earth_height, earth_bits);
301+
display->setColor(BLACK);
302+
display->setTextAlignment(TEXT_ALIGN_CENTER);
303+
display->fillRect(90,0,128,11);
304+
display->drawString( 65+x, 51+y, "Waiting for FossaSat Pos" );
305+
display->setColor(WHITE);
306+
display->setFont(ArialMT_Plain_10);
307+
display->drawString( 64+x, 50+y, "Waiting for FossaSat Pos" );
308+
309+
}
302310

303311
// This array keeps function pointers to all frames
304312
// frames are the single views that slide in
305-
FrameCallback frames[] = { drawFrame1, drawFrame2, drawFrame3, drawFrame4, drawFrame5 };
313+
FrameCallback frames[] = { drawFrame1, drawFrame2, drawFrame3, drawFrame4, drawFrame5, drawFrame6 };
306314

307315
// how many frames are there?
308-
int frameCount = 5;
316+
int frameCount = 6;
309317

310318
// Overlays are statically drawn on top of a frame eg. a clock
311319
OverlayCallback overlays[] = { msOverlay };

‎Fossa_GroundStation/Fossa_GroundStation/graphics.h‎

Lines changed: 93 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#define Fossa_Logo_width 128
22
#define Fossa_Logo_height 32
33

4+
// XMB using https://www.online-utility.org/image/convert/to/XBM
45

56
const uint8_t Fossa_Logo_bits[] PROGMEM={
67
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -83,7 +84,7 @@ const uint8_t WiFi_Logo_bits[] PROGMEM = {
8384

8485
#define bat_width 46
8586
#define bat_height 32
86-
static uint8_t bat_bits[] = {
87+
static uint8_t bat_bits[] PROGMEM = {
8788
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7C, 0xC0, 0x07, 0x00,
8889
0x00, 0x00, 0x44, 0x40, 0x04, 0x00, 0x00, 0x00, 0x44, 0x40, 0x04, 0x00,
8990
0x00, 0xC0, 0xFF, 0xFF, 0x7F, 0x00, 0x00, 0x20, 0x00, 0x00, 0x80, 0x00,
@@ -103,6 +104,97 @@ static uint8_t bat_bits[] = {
103104
};
104105

105106

107+
//Earth logo from https://www.instructables.com/id/NODEMCU-LUA-ESP8266-With-I2C-LCD-128-X-64-OLED-Dis/
108+
109+
#define earth_width 128
110+
#define earth_height 64
111+
static uint8_t earth_bits[] PROGMEM = {
112+
0x00, 0x00, 0x00, 0x00, 0xC0, 0xE3, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00,
113+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0xFF, 0x3F, 0x00,
114+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8C,
115+
0x0E, 0xFC, 0x3F, 0x00, 0x00, 0x00, 0xC0, 0x07, 0x00, 0x00, 0x00, 0x00,
116+
0x00, 0x00, 0x80, 0x43, 0x1D, 0xF8, 0x1F, 0x00, 0x00, 0x00, 0xF8, 0x9F,
117+
0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x4F, 0x3E, 0xF8, 0x0F, 0x00,
118+
0x0C, 0x80, 0xFF, 0xFF, 0xFF, 0x07, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xF7,
119+
0x73, 0xFC, 0x01, 0x80, 0x7F, 0xFC, 0xFD, 0xFF, 0xFF, 0xFF, 0x07, 0x00,
120+
0xC0, 0xFF, 0xFF, 0xFF, 0x78, 0x7C, 0x38, 0x80, 0x3F, 0xFF, 0xFF, 0xFF,
121+
0xFF, 0xFF, 0x7F, 0x00, 0xC0, 0xFF, 0xFF, 0x1F, 0x30, 0x1C, 0x00, 0xE0,
122+
0xFD, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x1F, 0x00, 0xF0, 0xFF, 0xFF, 0x0F,
123+
0x06, 0x18, 0x00, 0xF0, 0xFD, 0xFF, 0xFF, 0xFF, 0xFF, 0x7F, 0x0E, 0x00,
124+
0x30, 0xF0, 0xFF, 0x07, 0x1F, 0x00, 0x00, 0xE0, 0xF9, 0xFF, 0xFF, 0xFF,
125+
0xFF, 0x07, 0x02, 0x00, 0x08, 0xF0, 0xFF, 0x0F, 0x1F, 0x00, 0x00, 0xE3,
126+
0xFC, 0xFF, 0xFF, 0xFF, 0xFF, 0x03, 0x06, 0x00, 0x00, 0xF0, 0xFF, 0x9F,
127+
0x3F, 0x00, 0x80, 0xE2, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x07, 0x04, 0x00,
128+
0x00, 0xF0, 0xFF, 0xDF, 0x3F, 0x00, 0x80, 0xF6, 0xFF, 0xFF, 0xFF, 0xFF,
129+
0xFF, 0x1F, 0x00, 0x00, 0x00, 0xF0, 0xFF, 0xFF, 0x23, 0x00, 0x00, 0xFC,
130+
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x3F, 0x00, 0x00, 0x00, 0xF0, 0xFF, 0xFF,
131+
0x63, 0x00, 0x00, 0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x3F, 0x00, 0x00,
132+
0x00, 0xF0, 0xFF, 0xFF, 0x07, 0x00, 0x00, 0xFC, 0x9F, 0xCF, 0xFF, 0xFF,
133+
0xFF, 0x3F, 0x00, 0x00, 0x00, 0xF8, 0xFF, 0xFF, 0x00, 0x00, 0x80, 0x4F,
134+
0x1F, 0xCC, 0xFF, 0xFF, 0xFF, 0x1F, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0x7F,
135+
0x00, 0x00, 0x80, 0x87, 0xFD, 0x9D, 0xFF, 0xFF, 0xFF, 0x0F, 0x00, 0x00,
136+
0x00, 0xFC, 0xFF, 0x1F, 0x00, 0x00, 0xC0, 0x03, 0xE5, 0x9F, 0xFF, 0xFF,
137+
0xFF, 0x08, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0x0F, 0x00, 0x00, 0x80, 0x31,
138+
0xE0, 0xBF, 0xFF, 0xFF, 0xFF, 0x13, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0x0F,
139+
0x00, 0x00, 0x00, 0x3F, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x13, 0x00, 0x00,
140+
0x00, 0xF8, 0xFF, 0x03, 0x00, 0x00, 0xC0, 0x7F, 0x04, 0xFF, 0xFF, 0xFF,
141+
0xFF, 0x03, 0x00, 0x00, 0x00, 0xF8, 0xFF, 0x01, 0x00, 0x00, 0xC0, 0xFF,
142+
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x07, 0x00, 0x00, 0x00, 0xE8, 0x07, 0x01,
143+
0x00, 0x00, 0xE0, 0xFF, 0xFF, 0xBF, 0xFF, 0xFF, 0xFF, 0x07, 0x00, 0x00,
144+
0x00, 0xE0, 0x03, 0x01, 0x00, 0x00, 0xF0, 0xFF, 0xFF, 0x3E, 0xFE, 0xFF,
145+
0xFF, 0x07, 0x00, 0x00, 0x00, 0xD0, 0x03, 0x00, 0x00, 0x00, 0xF0, 0xFF,
146+
0xFF, 0xFE, 0xC1, 0xFF, 0xFF, 0x0B, 0x00, 0x00, 0x00, 0x80, 0x03, 0x02,
147+
0x00, 0x00, 0xF8, 0xFF, 0xFF, 0xFD, 0xC3, 0xFF, 0xFF, 0x01, 0x00, 0x00,
148+
0x00, 0xC0, 0x33, 0x14, 0x00, 0x00, 0xF8, 0xFF, 0xFF, 0xF9, 0x03, 0x1F,
149+
0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1F, 0x10, 0x00, 0x00, 0xF8, 0xFF,
150+
0xFF, 0xFB, 0x01, 0x0F, 0x3E, 0x10, 0x00, 0x00, 0x00, 0x00, 0x78, 0x00,
151+
0x00, 0x00, 0xF8, 0xFF, 0xFF, 0x73, 0x00, 0x07, 0x7C, 0x10, 0x00, 0x00,
152+
0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0xF8, 0xFF, 0xFF, 0x1F, 0x00, 0x06,
153+
0x78, 0x10, 0x00, 0x00, 0x00, 0x00, 0x40, 0x08, 0x00, 0x00, 0xF8, 0xFF,
154+
0xFF, 0x4F, 0x00, 0x06, 0x60, 0x20, 0x00, 0x00, 0x00, 0x00, 0xC0, 0xFC,
155+
0x00, 0x00, 0xF0, 0xFF, 0xFF, 0x7F, 0x00, 0x04, 0x08, 0x60, 0x00, 0x00,
156+
0x00, 0x00, 0x00, 0xFE, 0x01, 0x00, 0xE0, 0xFF, 0xFF, 0x7F, 0x00, 0x08,
157+
0x08, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFE, 0x0F, 0x00, 0xC0, 0xF3,
158+
0xFF, 0x3F, 0x00, 0x00, 0x10, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFE,
159+
0x0F, 0x00, 0x00, 0xC0, 0xFF, 0x1F, 0x00, 0x00, 0x18, 0x06, 0x00, 0x00,
160+
0x00, 0x00, 0x00, 0xFF, 0x1F, 0x00, 0x00, 0xC0, 0xFF, 0x0F, 0x00, 0x00,
161+
0x18, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x7F, 0x00, 0x00, 0xC0,
162+
0xFF, 0x07, 0x00, 0x00, 0x30, 0x17, 0x02, 0x00, 0x00, 0x00, 0x00, 0xFF,
163+
0xFF, 0x01, 0x00, 0xC0, 0xFF, 0x07, 0x00, 0x00, 0x30, 0x17, 0x3C, 0x00,
164+
0x00, 0x00, 0x00, 0xFF, 0xFF, 0x07, 0x00, 0x80, 0xFF, 0x03, 0x00, 0x00,
165+
0x20, 0x00, 0x70, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x07, 0x00, 0x80,
166+
0xFF, 0x03, 0x00, 0x00, 0x80, 0x03, 0xF0, 0x00, 0x00, 0x00, 0x00, 0xFE,
167+
0xFF, 0x07, 0x00, 0x80, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
168+
0x00, 0x00, 0x00, 0xFC, 0xFF, 0x03, 0x00, 0x80, 0xFF, 0x07, 0x00, 0x00,
169+
0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0x03, 0x00, 0x80,
170+
0xFF, 0x47, 0x00, 0x00, 0x00, 0x00, 0x27, 0x00, 0x00, 0x00, 0x00, 0xF8,
171+
0xFF, 0x03, 0x00, 0x80, 0xFF, 0x67, 0x00, 0x00, 0x00, 0xE0, 0x27, 0x00,
172+
0x00, 0x00, 0x00, 0xF0, 0xFF, 0x03, 0x00, 0x80, 0xFF, 0x31, 0x00, 0x00,
173+
0x00, 0xF0, 0x7F, 0x00, 0x00, 0x00, 0x00, 0xE0, 0xFF, 0x01, 0x00, 0x80,
174+
0xFF, 0x30, 0x00, 0x00, 0x00, 0xF8, 0x7F, 0x00, 0x00, 0x00, 0x00, 0xE0,
175+
0xFF, 0x01, 0x00, 0x00, 0xFF, 0x31, 0x00, 0x00, 0x00, 0xFE, 0xFF, 0x00,
176+
0x00, 0x00, 0x00, 0xE0, 0x7F, 0x00, 0x00, 0x00, 0xFF, 0x10, 0x00, 0x00,
177+
0x00, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0xE0, 0x3F, 0x00, 0x00, 0x00,
178+
0x7F, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0xE0,
179+
0x3F, 0x00, 0x00, 0x00, 0x7E, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00,
180+
0x00, 0x00, 0x00, 0xE0, 0x1F, 0x00, 0x00, 0x00, 0x3E, 0x00, 0x00, 0x00,
181+
0x00, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0xE0, 0x1F, 0x00, 0x00, 0x00,
182+
0x1E, 0x00, 0x00, 0x00, 0x00, 0x8F, 0x7F, 0x00, 0x00, 0x00, 0x00, 0xE0,
183+
0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x3E, 0x00,
184+
0x00, 0x00, 0x00, 0xE0, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
185+
0x00, 0x00, 0x1E, 0x40, 0x00, 0x00, 0x00, 0xC0, 0x03, 0x00, 0x00, 0x00,
186+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0xC0,
187+
0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x10,
188+
0x00, 0x00, 0x00, 0xC0, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
189+
0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0xC0, 0x01, 0x00, 0x00, 0x00,
190+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0xC0,
191+
0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
192+
0x00, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
193+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
194+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
195+
0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
196+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
197+
0x00, 0x00, 0x00, 0x00, };
106198

107199

108200

0 commit comments

Comments
 (0)