From a50690762548c1aba569acf3b88325c0409328d1 Mon Sep 17 00:00:00 2001 From: Just Call Me Koko Date: Thu, 26 Oct 2023 11:40:49 -0400 Subject: [PATCH 1/3] Remove version number finally --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 80b3522..3c087d0 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ -# ESP32 Marauder v0.13.2 +# ESP32 Marauder

Marauder logo

A suite of WiFi/Bluetooth offensive and defensive tools for the ESP32 From ea097190ac0380b3067c29ed6064775875bf7263 Mon Sep 17 00:00:00 2001 From: Just Call Me Koko Date: Thu, 26 Oct 2023 12:03:09 -0400 Subject: [PATCH 2/3] Fix M5Stick-C Plus display --- esp32_marauder/configs.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/esp32_marauder/configs.h b/esp32_marauder/configs.h index 53f0e7e..e866e53 100644 --- a/esp32_marauder/configs.h +++ b/esp32_marauder/configs.h @@ -9,8 +9,8 @@ //#define WRITE_PACKETS_SERIAL //// BOARD TARGETS - //#define MARAUDER_M5STICKC - #define MARAUDER_MINI + #define MARAUDER_M5STICKC + //#define MARAUDER_MINI //#define MARAUDER_V4 //#define MARAUDER_V6 //#define MARAUDER_V6_1 @@ -272,7 +272,7 @@ //#define MENU_FONT &FreeMonoBold9pt7b //#define MENU_FONT &FreeSans9pt7b //#define MENU_FONT &FreeSansBold9pt7b - #define BUTTON_SCREEN_LIMIT 12 + #define BUTTON_SCREEN_LIMIT 6 #define BUTTON_ARRAY_LEN 13 #define STATUS_BAR_WIDTH (TFT_HEIGHT/16) #define LVGL_TICK_PERIOD 6 @@ -633,7 +633,7 @@ #define KEY_TEXTSIZE 1 // Font size multiplier #define ICON_W 22 #define ICON_H 22 - #define BUTTON_PADDING 10 + #define BUTTON_PADDING 60 #endif //// END MENU DEFINITIONS From 23fa6f78d63f84ee03304dcdd2793ab723501860 Mon Sep 17 00:00:00 2001 From: Just Call Me Koko Date: Thu, 26 Oct 2023 12:10:20 -0400 Subject: [PATCH 3/3] Fix build steps --- .github/workflows/build_push.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index 8379b3a..7d40980 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -183,6 +183,7 @@ jobs: - name: Configure configs.h for Flipper Zero WiFi Dev Board run: | + sed -i 's/^ #define MARAUDER_M5STICKC/ \/\/#define MARAUDER_M5STICKC/' esp32_marauder/configs.h sed -i 's/^ #define MARAUDER_MINI/ \/\/#define MARAUDER_MINI/' esp32_marauder/configs.h sed -i 's/^ #define MARAUDER_V4/ \/\/#define MARAUDER_V4/' esp32_marauder/configs.h sed -i 's/^ #define MARAUDER_V6/ \/\/#define MARAUDER_V6/' esp32_marauder/configs.h