From 53cef7f44fe0cc6b6333ce2b4748e55df92aeb24 Mon Sep 17 00:00:00 2001 From: Just Call Me Koko <25190487+justcallmekoko@users.noreply.github.com> Date: Sat, 29 Aug 2020 01:46:00 -0400 Subject: [PATCH] Add icons --- esp32_marauder/Assets.h | 20 +++++++++++++++++++- esp32_marauder/MenuFunctions.cpp | 6 +++--- esp32_marauder/MenuFunctions.h | 3 +++ pictures/icons/beacon_list_22.bmp | Bin 0 -> 150 bytes pictures/icons/clear_22.bmp | Bin 0 -> 382 bytes pictures/icons/generate_22.bmp | Bin 0 -> 150 bytes pictures/xbm/beacon_list_22.XBM | 9 +++++++++ 7 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 pictures/icons/beacon_list_22.bmp create mode 100644 pictures/icons/clear_22.bmp create mode 100644 pictures/icons/generate_22.bmp create mode 100644 pictures/xbm/beacon_list_22.XBM diff --git a/esp32_marauder/Assets.h b/esp32_marauder/Assets.h index ba067ce..ff8c716 100644 --- a/esp32_marauder/Assets.h +++ b/esp32_marauder/Assets.h @@ -211,7 +211,25 @@ PROGMEM static const unsigned char menu_icons[][66] = { 0xF8, 0xE1, 0x07, 0xF8, 0xE1, 0x07, 0xF8, 0xE1, 0x07, 0xF8, 0xF3, 0x07, 0xF8, 0xFF, 0x07, 0xF9, 0xFF, 0x27, 0xF1, 0xFF, 0x23, 0xF1, 0xFF, 0x23, 0xE1, 0xFF, 0x21, 0xC3, 0xFF, 0x30, 0x07, 0x3F, 0x38, 0x0F, 0x00, 0x3C, - 0x1F, 0x00, 0x3E, 0xFF, 0xC1, 0x3F} + 0x1F, 0x00, 0x3E, 0xFF, 0xC1, 0x3F}, + {0xFF, 0xFF, 0x3F, 0xFF, 0xFF, 0x3F, 0xFF, 0xF3, 0x3F, 0xFF, 0xE1, 0x3F, // BEACON_LIST: 27 + 0xFF, 0xDE, 0x3F, 0x1F, 0x12, 0x3E, 0xEF, 0xF3, 0x3D, 0xE7, 0xF3, 0x39, + 0x37, 0x1E, 0x3B, 0x37, 0x1E, 0x3B, 0xEF, 0xF3, 0x3D, 0xEF, 0xF3, 0x3D, + 0x37, 0x1E, 0x3B, 0x37, 0x1E, 0x3B, 0xE7, 0xF3, 0x39, 0xEF, 0xF3, 0x3D, + 0x1F, 0x12, 0x3E, 0xFF, 0xDE, 0x3F, 0xFF, 0xE1, 0x3F, 0xFF, 0xF3, 0x3F, + 0xFF, 0xFF, 0x3F, 0xFF, 0xFF, 0x3F}, + {0xFF, 0xFF, 0x3F, 0x77, 0x77, 0x37, 0x2B, 0xAB, 0x32, 0x6B, 0xAB, 0x36, // GENERATE: 28 + 0x6B, 0xAB, 0x36, 0x6B, 0xAB, 0x36, 0x77, 0x77, 0x37, 0xFF, 0xFF, 0x3F, + 0x77, 0x77, 0x37, 0xB3, 0x2A, 0x2B, 0xB7, 0x6A, 0x2B, 0xB7, 0x6A, 0x2B, + 0xB7, 0x6A, 0x2B, 0x77, 0x77, 0x37, 0xFF, 0xFF, 0x3F, 0x77, 0x77, 0x37, + 0x33, 0x2B, 0x33, 0x77, 0x6B, 0x37, 0x77, 0x6B, 0x37, 0x77, 0x6B, 0x37, + 0x77, 0x77, 0x37, 0xFF, 0xFF, 0x3F}, + {0xFF, 0xFF, 0x3F, 0xFF, 0xFF, 0x3F, 0xFF, 0xFF, 0x3F, 0x1F, 0x00, 0x3E, // CLEAR_ICO: 29 + 0xEF, 0xFF, 0x3D, 0xEF, 0xFF, 0x3D, 0x1F, 0x1E, 0x3E, 0xFF, 0xE1, 0x3F, + 0x7F, 0x9E, 0x3F, 0xFF, 0xED, 0x3F, 0x07, 0x00, 0x38, 0x0B, 0x00, 0x34, + 0xE3, 0xDE, 0x31, 0xEB, 0xDE, 0x35, 0xA5, 0x52, 0x29, 0x0D, 0x00, 0x2C, + 0xFD, 0xFF, 0x2F, 0xF3, 0xFF, 0x33, 0x0F, 0x1E, 0x3C, 0xF3, 0xE1, 0x33, + 0xFF, 0xFF, 0x3F, 0xFF, 0xFF, 0x3F} }; diff --git a/esp32_marauder/MenuFunctions.cpp b/esp32_marauder/MenuFunctions.cpp index 0ba42de..b502533 100644 --- a/esp32_marauder/MenuFunctions.cpp +++ b/esp32_marauder/MenuFunctions.cpp @@ -741,7 +741,7 @@ void MenuFunctions::RunSetup() addNodes(&wifiAttackMenu, "Back", TFT_LIGHTGREY, NULL, 0, [this]() { changeMenu(wifiAttackMenu.parentMenu); }); - addNodes(&wifiAttackMenu, "Beacon Spam List", TFT_RED, NULL, BEACON_SPAM, [this]() { + addNodes(&wifiAttackMenu, "Beacon Spam List", TFT_RED, NULL, BEACON_LIST, [this]() { display_obj.clearScreen(); this->drawStatusBar(); wifi_scan_obj.StartScan(WIFI_ATTACK_BEACON_LIST, TFT_RED); @@ -772,11 +772,11 @@ void MenuFunctions::RunSetup() changeMenu(&shutdownWiFiMenu); wifi_scan_obj.RunShutdownWiFi(); }); - addNodes(&wifiGeneralMenu, "Generate SSIDs", TFT_SKYBLUE, NULL, GENERAL_APPS, [this]() { + addNodes(&wifiGeneralMenu, "Generate SSIDs", TFT_SKYBLUE, NULL, GENERATE, [this]() { changeMenu(&generateSSIDsMenu); wifi_scan_obj.RunGenerateSSIDs(); }); - addNodes(&wifiGeneralMenu, "Clear SSIDs", TFT_SILVER, NULL, GENERAL_APPS, [this]() { + addNodes(&wifiGeneralMenu, "Clear SSIDs", TFT_SILVER, NULL, CLEAR_ICO, [this]() { changeMenu(&clearSSIDsMenu); wifi_scan_obj.RunClearSSIDs(); }); diff --git a/esp32_marauder/MenuFunctions.h b/esp32_marauder/MenuFunctions.h index 0ff8b33..9ae5320 100644 --- a/esp32_marauder/MenuFunctions.h +++ b/esp32_marauder/MenuFunctions.h @@ -65,6 +65,9 @@ extern BatteryInterface battery_obj; #define PWNAGOTCHI 24 #define ESPRESSIF 25 #define SHUTDOWN 26 +#define BEACON_LIST 27 +#define GENERATE 28 +#define CLEAR_ICO 29 PROGMEM void my_disp_flush(lv_disp_drv_t *disp, const lv_area_t *area, lv_color_t *color_p); PROGMEM bool my_touchpad_read(lv_indev_drv_t * indev_driver, lv_indev_data_t * data); diff --git a/pictures/icons/beacon_list_22.bmp b/pictures/icons/beacon_list_22.bmp new file mode 100644 index 0000000000000000000000000000000000000000..7e6611386409e3d2be1fc8bfb1e65ab11e2801a3 GIT binary patch literal 150 zcmZ?royGtGc0fu4h{d3ok%18`5dkER@If$G080G-{~y6M05U6pxP^g%eR~4~hk*lw fgh2v>aJvE+gZLl}IV2hPY`gX?hab{u+Cno6Pr?k(v232r66yD&VS@68G?{2jY3+w4;P z>*A~UbHj{pV|2iiV#DT~5Lw?cm0>)!9uesZW|&x) pm@SoSN3=ZEXLSL&;HVZH{kPCP1zlFxQFX6x`OSOjF|h_u!wv_XSJ?mn literal 0 HcmV?d00001 diff --git a/pictures/icons/generate_22.bmp b/pictures/icons/generate_22.bmp new file mode 100644 index 0000000000000000000000000000000000000000..7e49c8d48fd4f966216b68793e9372f0a9896920 GIT binary patch literal 150 zcmZ?royGtGc0fu4h{d3ok%18`5dkJKiU0rqg9QZz1sDW15!hJUfB_^10w7vwr3M@u Tt=2%1)6|;40K?i^8{l#PtkVwz literal 0 HcmV?d00001 diff --git a/pictures/xbm/beacon_list_22.XBM b/pictures/xbm/beacon_list_22.XBM new file mode 100644 index 0000000..35e8d59 --- /dev/null +++ b/pictures/xbm/beacon_list_22.XBM @@ -0,0 +1,9 @@ +#define 1598678411119_width 22 +#define 1598678411119_height 22 +static char 1598678411119_bits[] = { + 0xFF, 0xFF, 0x3F, 0xFF, 0xFF, 0x3F, 0xFF, 0xF3, 0x3F, 0xFF, 0xE1, 0x3F, + 0xFF, 0xDE, 0x3F, 0x1F, 0x12, 0x3E, 0xEF, 0xF3, 0x3D, 0xE7, 0xF3, 0x39, + 0x37, 0x1E, 0x3B, 0x37, 0x1E, 0x3B, 0xEF, 0xF3, 0x3D, 0xEF, 0xF3, 0x3D, + 0x37, 0x1E, 0x3B, 0x37, 0x1E, 0x3B, 0xE7, 0xF3, 0x39, 0xEF, 0xF3, 0x3D, + 0x1F, 0x12, 0x3E, 0xFF, 0xDE, 0x3F, 0xFF, 0xE1, 0x3F, 0xFF, 0xF3, 0x3F, + 0xFF, 0xFF, 0x3F, 0xFF, 0xFF, 0x3F, };