Przeglądaj źródła

Add icons for shutdown

Just Call Me Koko 5 lat temu
rodzic
commit
c8cddedd2b

+ 7 - 1
esp32_marauder/Assets.h

@@ -205,7 +205,13 @@ PROGMEM static const unsigned char menu_icons[][66] = {
     0x03, 0x18, 0x32, 0x01, 0x20, 0x32, 0xF1, 0x21, 0x34, 0x01, 0x46, 0x34, 
     0x03, 0x84, 0x38, 0x7B, 0x88, 0x38, 0x93, 0x88, 0x38, 0x17, 0x89, 0x3C, 
     0x07, 0x89, 0x3F, 0xCF, 0x89, 0x3D, 0x9F, 0x49, 0x3C, 0x7F, 0x00, 0x3F, 
-    0xFF, 0xE3, 0x3F, 0xFF, 0xFF, 0x3F}
+    0xFF, 0xE3, 0x3F, 0xFF, 0xFF, 0x3F},
+    {0xFF, 0xF3, 0x3F, 0xFF, 0xE1, 0x3F, 0xCF, 0xE1, 0x3C, 0x87, 0x61, 0x38, // SHUTDOWN: 26
+    0xC3, 0xE1, 0x30, 0xE1, 0xE1, 0x21, 0xF1, 0xE1, 0x23, 0xF1, 0xE1, 0x23, 
+    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}
     };
 
 

+ 2 - 2
esp32_marauder/MenuFunctions.cpp

@@ -755,7 +755,7 @@ void MenuFunctions::RunSetup()
     wifi_scan_obj.StartScan(LV_JOIN_WIFI, TFT_YELLOW); 
     joinWiFiGFX();
   });
-  addNodes(&wifiGeneralMenu, "Shutdown WiFi", TFT_ORANGE, NULL, SCANNERS, [this]() {
+  addNodes(&wifiGeneralMenu, "Shutdown WiFi", TFT_ORANGE, NULL, SHUTDOWN, [this]() {
     changeMenu(&shutdownWiFiMenu);
     wifi_scan_obj.RunShutdownWiFi();
   });
@@ -809,7 +809,7 @@ void MenuFunctions::RunSetup()
   addNodes(&bluetoothGeneralMenu, "Back", TFT_LIGHTGREY, NULL, 0, [this]() {
     changeMenu(bluetoothGeneralMenu.parentMenu);
   });
-  addNodes(&bluetoothGeneralMenu, "Shutdown BLE", TFT_ORANGE, NULL, SCANNERS, [this]() {
+  addNodes(&bluetoothGeneralMenu, "Shutdown BLE", TFT_ORANGE, NULL, SHUTDOWN, [this]() {
     changeMenu(&shutdownBLEMenu);
     wifi_scan_obj.RunShutdownBLE();
   });

+ 1 - 0
esp32_marauder/MenuFunctions.h

@@ -64,6 +64,7 @@ extern BatteryInterface battery_obj;
 #define STATUS_SD 23
 #define PWNAGOTCHI 24
 #define ESPRESSIF 25
+#define SHUTDOWN 26
 
 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);

BIN
pictures/icons/shutdown_22.bmp


+ 9 - 0
pictures/xbm/shutdown_22.XBM

@@ -0,0 +1,9 @@
+#define 1598662153627_width 22
+#define 1598662153627_height 22
+static char 1598662153627_bits[] = {
+  0xFF, 0xF3, 0x3F, 0xFF, 0xE1, 0x3F, 0xCF, 0xE1, 0x3C, 0x87, 0x61, 0x38, 
+  0xC3, 0xE1, 0x30, 0xE1, 0xE1, 0x21, 0xF1, 0xE1, 0x23, 0xF1, 0xE1, 0x23, 
+  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, };