Feature/ttgo shutdown hold 6052289730513891467

.github/workflows/buil_parallel.yml

@@ -17,60 +17,9 @@ jobs:
       fail-fast: false
       matrix:
         board:
-          - { env: "m5stack-cardputer",               family: "ESP32-S3",}
-          - { env: "m5stack-sticks3",                 family: "ESP32-S3",}
-          - { env: "m5stack-cplus2",                  family: "ESP32",}
-          - { env: "m5stack-cplus1_1",                family: "ESP32",}
-          - { env: "LAUNCHER_m5stack-cplus1_1",       family: "ESP32",}
-          - { env: "m5stack-core2",                   family: "ESP32",}
-          - { env: "m5stack-core16mb",                family: "ESP32",}
-          - { env: "m5stack-core4mb",                 family: "ESP32",}
-          - { env: "m5stack-cores3",                  family: "ESP32-S3",}
-          - { env: "esp32-s3-devkitc-1",              family: "ESP32-S3",}
-          - { env: "esp32-c5",                        family: "ESP32-C5",}
-          - { env: "esp32-c5-tft",                    family: "ESP32-C5",}
-          - { env: "CYD-2432S028",                    family: "ESP32",}
-          - { env: "CYD-2USB",                        family: "ESP32",}
-          - { env: "CYD-2432W328C",                   family: "ESP32",}
-          - { env: "CYD-2432W328C_2",                 family: "ESP32",}
-          - { env: "CYD-2432W328R-or-S024R",          family: "ESP32",}
-          - { env: "CYD-3248S035R",                   family: "ESP32",}
-          - { env: "CYD-3248S035C",                   family: "ESP32",}
-          - { env: "LAUNCHER_CYD-2432W328R-or-S024R", family: "ESP32",}
-          - { env: "LAUNCHER_CYD-2432S028",           family: "ESP32",}
-          - { env: "LAUNCHER_CYD-2USB",               family: "ESP32",}
-          - { env: "LAUNCHER_CYD-2432W328C",          family: "ESP32",}
-          - { env: "LAUNCHER_CYD-3248S035R",          family: "ESP32",}
-          # - { env: "LAUNCHER_CYD-3248S035C",          family: "ESP32",}
-          - { env: "lilygo-t-embed-cc1101",           family: "ESP32-S3",}
-          - { env: "lilygo-t-embed",                  family: "ESP32-S3",}
-          - { env: "lilygo-t-deck",                   family: "ESP32-S3",}
-          - { env: "lilygo-t-watch-s3",               family: "ESP32-S3",}
-          - { env: "lilygo-t-deck-pro",               family: "ESP32-S3",}
-          - { env: "lilygo-t-display-s3",             family: "ESP32-S3",}
-          - { env: "lilygo-t-display-s3-touch",       family: "ESP32-S3",}
-          - { env: "lilygo-t-display-s3-mmc",         family: "ESP32-S3",}
-          - { env: "lilygo-t-display-s3-touch-mmc",   family: "ESP32-S3",}
-          - { env: "lilygo-t-display-S3-pro",         family: "ESP32-S3",}
-          - { env: "lilygo-t-display-ttgo",           family: "ESP32",}
-          - { env: "lilygo-t-hmi",                    family: "ESP32-S3",}
-          - { env: "lilygo-t-lora-pager",             family: "ESP32-S3",}
-          - { env: "smoochiee-board",                 family: "ESP32-S3",}
-          - { env: "reaper",                          family: "ESP32-S3",}
-          - { env: "Phantom_S024R",                   family: "ESP32",}
-          - { env: "LAUNCHER_Phantom_S024R",          family: "ESP32",}
           - { env: "Marauder-Mini",                   family: "ESP32",}
-          - { env: "LAUNCHER_Marauder-Mini",          family: "ESP32",}
-          - { env: "Awok-Mini",                       family: "ESP32",}
-          - { env: "Marauder-v7",                     family: "ESP32",}
-          - { env: "LAUNCHER_Marauder-v7",            family: "ESP32",}
-          - { env: "Marauder-V4-V6",                  family: "ESP32",}
-          - { env: "Marauder-v61",                    family: "ESP32",}
-          - { env: "LAUNCHER_Marauder-V4-V6",         family: "ESP32",}
-          - { env: "LAUNCHER_Marauder-v61",           family: "ESP32",}
-          - { env: "Awok-Touch",                      family: "ESP32",}
-          - { env: "WaveSentry-R1",                   family: "ESP32",}
-          - { env: "LAUNCHER_WaveSentry-R1",          family: "ESP32",}
+          - { env: "lilygo-t-display-ttgo",           family: "ESP32",}
+
 
     steps:
       - uses: actions/checkout@v4

boards/_boards_json/lilygo-t-display-ttgo.json

@@ -29,11 +29,11 @@
     "arduino",
     "espidf"
   ],
-  "name": "Espressif ESP32 Dev Module",
+  "name": "Espressif ESP32 Dev Module (16MB)",
   "upload": {
-    "flash_size": "4MB",
+    "flash_size": "16MB",
     "maximum_ram_size": 327680,
-    "maximum_size": 4194304,
+    "maximum_size": 16777216,
     "require_upload_port": true,
     "speed": 460800
   },

boards/lilygo-t-display-ttgo/interface.cpp

@@ -4,6 +4,8 @@
 
 #include <globals.h>
 #include <interface.h>
+#include "core/display.h"
+
 volatile bool nxtPress = false;
 volatile bool prvPress = false;
 volatile bool ecPress = false;
@@ -110,6 +112,43 @@ void InputHandler(void) {
             slPress = false;
         }
     }
+
+    // New logic for Shutdown
+    static unsigned long upBtnHoldStart = 0;
+    static bool upBtnHeldState = false;
+    static int lastShutdownCountdown = 0;
+
+    // Check UP_BTN (GPIO 35)
+    if (digitalRead(UP_BTN) == LOW) { // Pressed
+        if (menuOptionType == MENU_TYPE_MAIN) {
+             if (!upBtnHeldState) {
+                 upBtnHoldStart = millis();
+                 upBtnHeldState = true;
+             } else {
+                 unsigned long elapsed = millis() - upBtnHoldStart;
+                 int remaining = 5 - (elapsed / 1000);
+
+                 if (remaining <= 0) {
+                     powerOff();
+                 } else if (remaining != lastShutdownCountdown && elapsed > 500) {
+                     // Draw countdown
+                     tft.setTextColor(TFT_RED, bruceConfig.bgColor);
+                     String msg = "OFF: " + String(remaining);
+                     tft.drawCentreString(msg.c_str(), tftWidth / 2, tftHeight / 2, 4);
+                     lastShutdownCountdown = remaining;
+                 }
+             }
+        }
+    } else {
+        if (upBtnHeldState) {
+            upBtnHeldState = false;
+            // Clear countdown
+            if (lastShutdownCountdown > 0) {
+                 tft.fillRect(0, tftHeight / 2, tftWidth, 40, bruceConfig.bgColor);
+                 lastShutdownCountdown = 0;
+            }
+        }
+    }
 }
 
 void powerOff() {

boards/lilygo-t-display-ttgo/lilygo-t-display-s3.ini

@@ -1,6 +1,6 @@
 [env:lilygo-t-display-ttgo]
 board = lilygo-t-display-ttgo
-board_build.partitions = custom_4Mb_full.csv
+board_build.partitions = custom_16Mb.csv
 build_src_filter =${env.build_src_filter} +<../boards/lilygo-t-display-ttgo>
 build_flags =
 	${env.build_flags}

boards/lilygo-t-display-ttgo/pins_arduino.h

@@ -71,7 +71,7 @@ static const uint8_t SCL = GROVE_SCL;
 
 // Display Setup#
 #define HAS_SCREEN
-#define ROTATION 3
+#define ROTATION 1
 #define MINBRIGHT (uint8_t)1
 
 // Font Sizes#
@@ -92,8 +92,8 @@ static const uint8_t SCL = GROVE_SCL;
 // Buttons & Navigation
 #define BTN_ALIAS "\"OK\""
 #define HAS_3_BUTTONS
-#define UP_BTN 0
-#define DW_BTN 35
+#define UP_BTN 35
+#define DW_BTN 0
 #define BTN_ACT LOW
 
 // IR pins

boards/marauder-mini/pins_arduino.h

@@ -79,8 +79,8 @@ static const uint8_t ADC2 = 8;
 #define CC1101_SCK_PIN SPI_SCK_PIN
 #define CC1101_MISO_PIN SPI_MISO_PIN
 
-#define NRF24_CE_PIN -1
-#define NRF24_SS_PIN -1
+#define NRF24_CE_PIN 12
+#define NRF24_SS_PIN 27
 #define NRF24_MOSI_PIN SPI_MOSI_PIN
 #define NRF24_SCK_PIN SPI_SCK_PIN
 #define NRF24_MISO_PIN SPI_MISO_PIN

boards/smoochiee-board/pins_arduino.h

@@ -64,7 +64,7 @@ static const uint8_t SCK = 18;
 #define USER_SETUP_LOADED 1
 #define ST7789_DRIVER 1
 #define TFT_RGB_ORDER 0
-#define TFT_WIDTH 170
+#define TFT_WIDTH 172
 #define TFT_HEIGHT 320
 #define TFT_BACKLIGHT_ON 1
 #define TFT_BL 6
@@ -123,3 +123,4 @@ static const uint8_t SCK = 18;
 #define IO_EXP_CC_RX 7
 #define IO_EXP_CC_TX 12
 #endif /* Pins_Arduino_h */
+

platformio.ini

@@ -12,7 +12,7 @@
 default_envs =
 	;m5stack-cardputer
 	;m5stack-sticks3
-	m5stack-cplus2
+	;m5stack-cplus2
 	;m5stack-cplus1_1
 	;LAUNCHER_m5stack-cplus1_1
 	;m5stack-core2
@@ -43,7 +43,7 @@ default_envs =
 	;lilygo-t-display-s3-mmc
 	;lilygo-t-display-s3-touch-mmc
 	;lilygo-t-display-S3-pro
-	;lilygo-t-display-ttgo
+	lilygo-t-display-ttgo
 	;lilygo-t-hmi
 	;lilygo-t-lora-pager
 	;smoochiee-board

src/core/main_menu.cpp

@@ -6,6 +6,7 @@
 MainMenu::MainMenu() {
     _menuItems = {
         &wifiMenu,
+        &bw16Menu,
         &bleMenu,
 #if !defined(LITE_VERSION)
         &ethernetMenu,

src/core/main_menu.h

@@ -19,6 +19,8 @@
 #include "menu_items/RFMenu.h"
 #include "menu_items/ScriptsMenu.h"
 #include "menu_items/WifiMenu.h"
+#include "menu_items/BW16Menu.h"
+
 class MainMenu {
 public:
     FileMenu fileMenu;
@@ -35,6 +37,7 @@ class MainMenu {
     RFMenu rfMenu;
     ScriptsMenu scriptsMenu;
     WifiMenu wifiMenu;
+    BW16Menu bw16Menu;
 #if !defined(LITE_VERSION)
     LoRaMenu loraMenu;
     EthernetMenu ethernetMenu;