New Marauder title screen

This commit is contained in:
Just Call Me Koko
2023-08-31 18:11:21 -04:00
parent 6a26ac2e04
commit ce8c70daf7
7 changed files with 422 additions and 43 deletions

File diff suppressed because one or more lines are too long

View File

@@ -427,7 +427,7 @@ void Display::drawJpeg(const char *filename, int xpos, int ypos) {
// the filename can be a String or character array type:
//boolean decoded = JpegDec.decodeFsFile(filename); // or pass the filename (leading / distinguishes SPIFFS files)
boolean decoded = JpegDec.decodeArray(MarauderTitle, 13578);
boolean decoded = JpegDec.decodeArray(MarauderTitle, MARAUDER_TITLE_BYTES);
if (decoded) {
// print information about the image to the serial port

View File

@@ -798,11 +798,7 @@ void WiFiScan::RunInfo()
String sta_mac = this->getStaMAC();
String ap_mac = this->getApMAC();
String free_ram = this->freeRAM();
//Serial.print("STA MAC: ");
//Serial.println(sta_mac);
//Serial.print("AP MAC: ");
//Serial.println(ap_mac);
Serial.println(free_ram);
#ifdef HAS_SCREEN

View File

@@ -771,4 +771,18 @@
#endif
//// END GPS STUFF
//// MARAUDER TITLE STUFF
#ifdef MARAUDER_V4
#define MARAUDER_TITLE_BYTES 6334
#elif defined(MARAUDER_V6)
#define MARAUDER_TITLE_BYTES 6334
#elif defined(MARAUDER_KIT)
#define MARAUDER_TITLE_BYTES 6334
#elif defined(MARAUDER_MINI)
#define MARAUDER_TITLE_BYTES 13578
#else
#define MARAUDER_TITLE_BYTES 13578
#endif
//// END MARAUDER TITLE STUFF
#endif

View File

@@ -224,7 +224,11 @@ void setup()
// Draw the title screen
#ifdef HAS_SCREEN
display_obj.drawJpeg("/marauder3L.jpg", 0 , 0); // 240 x 320 image
#ifndef MARAUDER_MINI
display_obj.drawJpeg("/marauder3L.jpg", 60 , 83); // 240 x 320 image
#else
display_obj.drawJpeg("/marauder3L.jpg", 0, 0);
#endif
#endif
#ifdef HAS_SCREEN

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.2 KiB