Merge pull request #419 from bmorcelli/main

Interface structure, code cleanup and NEW PORTS!!
pr3y · Nov 14, 2024 · e25dbea · e25dbea
2 parents de50cff + 01777ab
commit e25dbea
Show file tree

Hide file tree

Showing 141 changed files with 8,212 additions and 22,045 deletions.
diff --git a/.github/workflows/buil_parallel.yml b/.github/workflows/buil_parallel.yml
@@ -1,5 +1,5 @@
 ---
-    name: Build and Push OR check-PR
+    name: Build and Push Releases
 
     on:
       push:
@@ -8,13 +8,6 @@
         tags:
           - "*"
       workflow_dispatch:
-        inputs:
-          board:
-            description: 'Board to Compile'
-            type: choice
-            required: true
-            default: 'M5Cardputer'
-            options: ['M5Cardputer', 'M5StickCPlus2', 'M5StickCPlus', 'Core2', 'Core16mb', 'Core4mb', 'CoreS3', 'ESP32-S3','M5StickCPlus_Full', 'CYD-2USB', 'CYD-2432S028']
 
     jobs:
       compile_sketch:
@@ -122,6 +115,27 @@
                     bootloader_addr: "0x0",
                   },
                 } 
+              - {
+                  name: "Lilygo_T-Embed",
+                  env: "lilygo-t-embed",
+                  partitions: {
+                    bootloader_addr: "0x0",
+                  },
+                }
+              - {
+                  name: "Lilygo_T-Deck",
+                  env: "lilygo-t-deck",
+                  partitions: {
+                    bootloader_addr: "0x0",
+                  },
+                }
+              - {
+                  name: "Lilygo_T-Deck-Pro",
+                  env: "lilygo-t-deck-pro",
+                  partitions: {
+                    bootloader_addr: "0x0",
+                  },
+                }
         steps:
             - uses: actions/checkout@v4
 

diff --git a/README.md b/README.md
@@ -67,7 +67,7 @@ Also, [read our FAQ](https://github.com/pr3y/Bruce/wiki/FAQ)
 
 - [X] [BLE Scan](https://github.com/pr3y/Bruce/wiki/BLE#ble-scan)
 - [X] Bad BLE - Run Ducky scripts, similar to [BadUsb](https://github.com/pr3y/Bruce/wiki/Others#badusb)
-- [X] BLE Keyboard - Cardputer Only (for now)
+- [X] BLE Keyboard - Cardputer and T-Deck Only
 - [X] iOS Spam
 - [X] Windows Spam
 - [X] Samsung Spam
@@ -170,7 +170,7 @@ Also, [read our FAQ](https://github.com/pr3y/Bruce/wiki/FAQ)
     - [x] Spiffs Mngr
 - [x] Megalodon
 - [x] [BADUsb (New features, LittleFS and SDCard)](https://github.com/pr3y/Bruce/wiki/Others#badusb)
-- [x] USB Keyboard
+- [x] USB Keyboard - Cardputer and T-Deck Only
 - [x] [Openhaystack](https://github.com/pr3y/Bruce/wiki/Others#openhaystack)
 - [x] [LED Control](https://github.com/pr3y/Bruce/wiki/Others#led-control)
 </details>
@@ -204,20 +204,24 @@ Also, [read our FAQ](https://github.com/pr3y/Bruce/wiki/FAQ)
 </details>
 
 ## Specific functions per Device, the ones not mentioned here are available to all.
-| Device     | CC1101   | NRF24     | Interpreter   | FMRadio   | PN532    | Mic_SPM1423   | BadUSB    | RGB Led | Speaker | LITE_MODE |
-| ---        | ---      |  ---      | ---           | ---       | ---      | ---            | ---       | ---     | ---     | ---   |
-| Cardputer  | :ok:     | :ok:      | :ok:          | :ok:      | :ok:     | :ok:           | :ok:      | :ok:    | NS4168  | :x: |
-| StickCPlus2 | :ok:    | :ok:      | :ok:          | :ok:      | :ok:     | :ok:           | :ok:[here](https://github.com/pr3y/Bruce/wiki/Others#badusb)       | :x:     | Tone    | :x: |
-| StickCPlus 1.1 | :ok: | :ok:      | :x:           | :ok:      | :ok:     | :ok:           | :ok:[here](https://github.com/pr3y/Bruce/wiki/Others#badusb)       | :x:     | Tone    | :ok:  |
-| Core       | :x:      | :x:       | :x:           | :x:       | :x:      | :ok:           | :x:       | :x:     | Tone    | :x: |
-| Core2      | :x:      | :x:       | :x:           | :x:       | :x:      | :ok:           | :x:       | :x:     | :x:     | :x: |
-| CoreSe/SE  | :x:      | :x:       | :ok:          | :x:       | :x:      | :x:            | :ok:      | :x:     | :x:     | :x: |
-| CYD-2432S028  | :ok:      | :ok:       | :ok:          | :x:       | :ok:      | :x:            | :ok:      | :x:     | :x:     | :x: |
-| Lilygo T-Embed CC1101  | :ok:      | :x:       | :x:          | :x:       | :ok:      | :x:            | :x:      | :x:     | :x:     | :x: |
-
+| Device                  | CC1101    | NRF24     | Interpreter   | FMRadio   | PN532     | Mic_SPM1423     | BadUSB    | RGB Led | Speaker | LITE_MODE |
+| ---                     | ---       |  ---      | ---           | ---       | ---       | ---             | ---       | ---     | ---     | ---       |
+| Cardputer               | :ok:      | :ok:      | :ok:          | :ok:      | :ok:      | :ok:            | :ok:      | :ok:    | NS4168  | :x:       |
+| StickCPlus2             | :ok:      | :ok:      | :ok:          | :ok:      | :ok:      | :ok:            | :ok:¹     | :x:     | Tone    | :x:       |
+| StickCPlus 1.1          | :ok:      | :ok:      | :x:           | :ok:      | :ok:      | :ok:            | :ok:¹     | :x:     | Tone    | :x:²      |
+| Core                    | :x:       | :x:       | :x:           | :x:       | :x:       | :ok:            | :ok:¹     | :x:     | Tone    | :x:       |
+| Core2                   | :x:       | :x:       | :x:           | :x:       | :x:       | :ok:            | :ok:¹     | :x:     | :x:     | :x:       |
+| CoreSe/SE               | :x:       | :x:       | :ok:          | :x:       | :x:       | :x:             | :ok:      | :x:     | :x:     | :x:       |
+| CYD-2432S028            | :ok:      | :ok:      | :ok:          | :x:       | :ok:      | :x:             | :ok:¹     | :x:     | :x:     | :x:²      |
+| Lilygo T-Embed CC1101   | :ok:      | :x:       | :ok:          | :x:       | :ok:      | :ok:            | :ok:      | :x:     | :x:     | :x:       |
+| Lilygo T-Embed          | :x:       | :x:       | :ok:          | :x:       | :ok:      | :ok:            | :ok:      | :x:     | :x:     | :x:       |
+| Lilygo T-Deck (and pro) | :x:       | :x:       | :ok:          | :x:       | :x:       | :x:             | :ok:      | :x:     | :x:     | :x:       |
+
+² CYD and StickCPlus 1.1 have a LITE_VERSION version for Launcher Compatibility
+¹ Core, CYD and StickCs Bad-USB: [here](https://github.com/pr3y/Bruce/wiki/Others#badusb)
 
 *LITE_MODE*: TelNet, SSH, DPWO, WireGuard, ScanHosts, RawSniffer, Brucegotchi, BLEBacon, BLEScan, Interpreter and OpenHaystack are NOT available for M5Launcher Compatibility
-* CYD has a LITE_MODE version for Launcher Compatibility
+
 
 ## :sparkles: Why and how does it look?
 

diff --git a/html/AsyncWebServer/evil_portal.cpp b/html/AsyncWebServer/evil_portal.cpp
@@ -140,11 +140,9 @@ void startEvilPortal(String tssid, uint8_t channel, bool deauth) {
     log_d("Total PSRAM: %d", ESP.getPsramSize());
     log_d("Free PSRAM: %d", ESP.getFreePsram());
 
-    #if defined(STICK_C_PLUS2)
-    ep = (AsyncWebServer*)ps_malloc(sizeof(AsyncWebServer));
-    #else
-    ep = (AsyncWebServer*)malloc(sizeof(AsyncWebServer));
-    #endif
+    if(psramFound()) ep = (AsyncWebServer*)ps_malloc(sizeof(AsyncWebServer));
+    else ep = (AsyncWebServer*)malloc(sizeof(AsyncWebServer));
+
     new (ep) AsyncWebServer(80);
 
     ep->begin();

diff --git a/html/AsyncWebServer/webInterface.cpp b/html/AsyncWebServer/webInterface.cpp
@@ -398,11 +398,7 @@ file_size = 0;
 
   // configure web server
   Serial.println("Configuring Webserver ...");
-  #if defined(CARDPUTER) || defined(STICK_C_PLUS2)
   server = (AsyncWebServer*)malloc(sizeof(AsyncWebServer));
-  #else
-  server = (AsyncWebServer*)malloc(sizeof(AsyncWebServer));
-  #endif
   new (server) AsyncWebServer(config.webserverporthttp);
   configureWebServer();
   server->begin();

diff --git a/lib/M5Core2/readme.md b/lib/M5Core2/readme.md