Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop #551

Merged
merged 7 commits into from
Jun 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
164,462 changes: 0 additions & 164,462 deletions esp32_marauder/build/esp32.esp32.d32/esp32_marauder.ino.map

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
120,502 changes: 0 additions & 120,502 deletions esp32_marauder/build/esp32.esp32.esp32s2/esp32_marauder.ino.map

This file was deleted.

Binary file not shown.
4 changes: 2 additions & 2 deletions esp32_marauder/configs.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

//// BOARD TARGETS
//#define MARAUDER_M5STICKC
#define MARAUDER_MINI
//#define MARAUDER_MINI
//#define MARAUDER_V4
//#define MARAUDER_V6
//#define MARAUDER_V6_1
Expand All @@ -21,7 +21,7 @@
//#define MARAUDER_REV_FEATHER
//// END BOARD TARGETS

#define MARAUDER_VERSION "v0.13.11"
#define MARAUDER_VERSION "v1.0.0"

//// HARDWARE NAMES
#ifdef MARAUDER_M5STICKC
Expand Down
10 changes: 3 additions & 7 deletions esp32_marauder/esp32_marauder.ino
Original file line number Diff line number Diff line change
Expand Up @@ -203,13 +203,9 @@ void setup()
*/

#ifdef HAS_SCREEN
#ifndef MARAUDER_MINI
display_obj.tft.drawCentreString(display_obj.version_number, 120, 250, 2);
#endif

#ifdef MARAUDER_MINI
display_obj.tft.drawCentreString(display_obj.version_number, TFT_WIDTH/2, TFT_HEIGHT, 1);
#endif
display_obj.tft.drawCentreString("ESP32 Marauder", TFT_WIDTH/2, TFT_HEIGHT * 0.33, 1);
display_obj.tft.drawCentreString("JustCallMeKoko", TFT_WIDTH/2, TFT_HEIGHT * 0.5, 1);
display_obj.tft.drawCentreString(display_obj.version_number, TFT_WIDTH/2, TFT_HEIGHT * 0.66, 1);
#endif


Expand Down
Loading