mirror of
https://github.com/justcallmekoko/ESP32Marauder.git
synced 2025-12-12 07:40:58 -08:00
New Marauder title screen
This commit is contained in:
File diff suppressed because one or more lines are too long
@@ -427,7 +427,7 @@ void Display::drawJpeg(const char *filename, int xpos, int ypos) {
|
|||||||
// the filename can be a String or character array type:
|
// 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.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) {
|
if (decoded) {
|
||||||
// print information about the image to the serial port
|
// print information about the image to the serial port
|
||||||
|
|||||||
@@ -798,11 +798,7 @@ void WiFiScan::RunInfo()
|
|||||||
String sta_mac = this->getStaMAC();
|
String sta_mac = this->getStaMAC();
|
||||||
String ap_mac = this->getApMAC();
|
String ap_mac = this->getApMAC();
|
||||||
String free_ram = this->freeRAM();
|
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);
|
Serial.println(free_ram);
|
||||||
|
|
||||||
#ifdef HAS_SCREEN
|
#ifdef HAS_SCREEN
|
||||||
|
|||||||
@@ -771,4 +771,18 @@
|
|||||||
#endif
|
#endif
|
||||||
//// END GPS STUFF
|
//// 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
|
#endif
|
||||||
@@ -224,7 +224,11 @@ void setup()
|
|||||||
|
|
||||||
// Draw the title screen
|
// Draw the title screen
|
||||||
#ifdef HAS_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
|
#endif
|
||||||
|
|
||||||
#ifdef HAS_SCREEN
|
#ifdef HAS_SCREEN
|
||||||
|
|||||||
BIN
pictures/jcmk_icon_white.bmp
Normal file
BIN
pictures/jcmk_icon_white.bmp
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 19 KiB |
BIN
pictures/jcmk_icon_white.jpg
Normal file
BIN
pictures/jcmk_icon_white.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 6.2 KiB |
Reference in New Issue
Block a user