[Global] Minor All-Around Cleanup

.github/workflows/PR_All_envs.yml

@@ -0,0 +1,206 @@
+---
+    name: PR Check All envs on Dispatch
+
+    on:
+      workflow_dispatch:
+        inputs:
+          pr_number:
+            description: 'Pull Request Number'
+            type: string
+            required: true
+
+    jobs:
+      compile_sketch:
+        name: Build ${{ matrix.board.name }}
+        runs-on: ubuntu-latest
+        strategy:
+          fail-fast: false
+          matrix:
+            board:
+              - {
+                  name: "M5Cardputer",
+                  env: "m5stack-cardputer",
+                  partitions: {
+                    bootloader_addr: "0x0000",
+                  },
+                }
+              - {
+                  name: "M5StickCPlus2",
+                  env: "m5stack-cplus2",
+                  partitions: {
+                    bootloader_addr: "0x1000",
+                  },
+                }
+              - {
+                  name: "M5StickCPlus",
+                  env: "m5stack-cplus1_1",
+                  partitions: {
+                    bootloader_addr: "0x1000",
+                  },
+                }
+              - {
+                  name: "M5StickCPlus_Launcher",
+                  env: "LAUNCHER_m5stack-cplus1_1",
+                  partitions: {
+                    bootloader_addr: "0x1000",
+                  },
+                }
+              - {
+                  name: "Core2",
+                  env: "m5stack-core2",
+                  partitions: {
+                    bootloader_addr: "0x1000",
+                  },
+                }                
+              - {
+                  name: "Core16mb",
+                  env: "m5stack-core16mb",
+                  partitions: {
+                    bootloader_addr: "0x1000",
+                  },
+                }        
+              - {
+                  name: "Core4mb",
+                  env: "m5stack-core4mb",
+                  partitions: {
+                    bootloader_addr: "0x1000",
+                  },
+                }
+              - {
+                  name: "CoreS3",
+                  env: "m5stack-cores3",
+                  partitions: {
+                    bootloader_addr: "0x0",
+                  },
+                } 
+              - {
+                  name: "ESP32-S3",
+                  env: "esp32-s3-devkitc-1",
+                  partitions: {
+                    bootloader_addr: "0x0",
+                  },
+                }
+              - {
+                  name: "CYD-2432S028",
+                  env: "CYD-2432S028",
+                  partitions: {
+                    bootloader_addr: "0x1000",
+                  },
+                } 
+              - {
+                  name: "CYD-2USB",
+                  env: "CYD-2USB",
+                  partitions: {
+                    bootloader_addr: "0x1000",
+                  },
+                }
+              - {
+                  name: "CYD-2432W328C",
+                  env: "CYD-2432W328C",
+                  partitions: { 
+                    bootloader_addr: "0x1000" 
+                  },
+                }
+              - {
+                  name: "CYD-2432W328C(inv_colors)_and_CYD-2432S024C",
+                  env: "CYD-2432W328C_2",
+                  partitions: { 
+                    bootloader_addr: "0x1000" 
+                  },
+                }                    
+              - {
+                  name: "CYD-2432S028_Launcher",
+                  env: "LAUNCHER_CYD-2432S028",
+                  partitions: {
+                    bootloader_addr: "0x1000",
+                  },
+                } 
+              - {
+                  name: "CYD-2USB_Launcher",
+                  env: "LAUNCHER_CYD-2USB",
+                  partitions: {
+                    bootloader_addr: "0x1000",
+                  },
+                }
+              - {
+                  name: "CYD-2432W328C_Launcher",
+                  env: "LAUNCHER_CYD-2432W328C",
+                  partitions: { 
+                    bootloader_addr: "0x1000" 
+                  },
+                }                
+              - {
+                  name: "Lilygo_T-Embed_CC1101",
+                  env: "lilygo-t-embed-cc1101",
+                  partitions: {
+                    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
+              with:
+                ref: refs/pull/${{ github.event.inputs.pr_number }}/merge
+
+            - id: build
+              name: Setup Python
+              uses: actions/setup-python@v2
+              with:
+                python-version: "3.x"
+
+            - name: Install Dependencies
+              run: |
+                pip install requests esptool
+
+            - name: Install PlatformIO Core
+              run: |
+                pip install platformio
+                if [[ "${{ github.ref_type }}" == "tag" ]]; then
+                version=${{ github.ref_name }}
+                else
+                version="${GITHUB_SHA::7}"
+                fi
+
+                sed -i "s/-DBRUCE_VERSION=/-DBRUCE_VERSION='\"$version\"' ; /g" ./platformio.ini
+                sed -i "s/-DGIT_COMMIT_HASH='\"Homebrew\"'/\!echo '-DGIT_COMMIT_HASH=\\\\\\\\\"'\$\(git describe --always --dirty)'\\\\\\\\\"'/g" ./platformio.ini
+
+                cat ./platformio.ini
+
+            - name: Run Compile
+              run: |
+                platformio run -e ${{ matrix.board.env }}
+
+            - name: Merge Files
+              run: |
+                esptool.py --chip esp32s3 merge_bin -o Bruce-${{ matrix.board.env }}.bin \
+                ${{ matrix.board.partitions.bootloader_addr }} .pio/build/${{ matrix.board.env }}/bootloader.bin \
+                0x8000 .pio/build/${{ matrix.board.env }}/partitions.bin \
+                0x10000 .pio/build/${{ matrix.board.env }}/firmware.bin
+
+            - name: Upload ${{ matrix.board.name }}
+              uses: actions/upload-artifact@v4
+              with:
+                name: Bruce-${{ matrix.board.env }}
+                path: Bruce-*.bin
+                retention-days: 5
+                if-no-files-found: error

.github/workflows/PR_check.yml

@@ -23,35 +23,42 @@
           matrix:
             board:
               - {
-                  name: "ESP32-S3 - M5Cardputer",
+                  name: "M5 - Cardputer",
                   env: "m5stack-cardputer",
                   partitions: {
                     bootloader_addr: "0x0000",
                   },
                 }
               - {
-                  name: "ESP32 - M5StickCPlus2",
+                  name: "Lilygo - T-EMBED-CC1101",
+                  env: "lilygo-t-embed-cc1101",
+                  partitions: {
+                    bootloader_addr: "0x0000",
+                  },
+                }
+              - {
+                  name: "M5 - M5StickC PLUS2",
                   env: "m5stack-cplus2",
                   partitions: {
                     bootloader_addr: "0x1000",
                   },
                 }
               - {
-                  name: "Headless: ESP32-S3",
+                  name: "ESP32-S3 - Generic",
                   env: "esp32-s3-devkitc-1",
                   partitions: {
                     bootloader_addr: "0x0",
                   },
                 }           
               - {
-                  name: "CoreS3",
+                  name: "M5 - CoreS3",
                   env: "m5stack-cores3",
                   partitions: {
                     bootloader_addr: "0x0",
                   },
                 }
               - {
-                  name: "Launcher based environment: CYD",
+                  name: "Launcher | CYD-2432S028",
                   env: "LAUNCHER_CYD-2432S028",
                   partitions: {
                     bootloader_addr: "0x1000",

.github/workflows/buil_parallel.yml

@@ -207,6 +207,45 @@
             - name: Install PlatformIO Core
               run: |
                 pip install platformio
+                platformio update
+
+                pio pkg install -p espressif32 -t toolchain-xtensa32
+
+                esp32_file="$HOME/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/lib/libnet80211.a"
+                esp32s3_file="$HOME/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32s3/lib/libnet80211.a"
+
+                esp32_file_temp="$HOME/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/lib/libnet80211_temp.a"
+                esp32s3_file_temp="$HOME/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32s3/lib/libnet80211_temp.a"
+
+                # Definir caminhos para as ferramentas objcopy
+                toolchain_esp32="$HOME/.platformio/packages/toolchain-xtensa-esp32/xtensa-esp32-elf/bin/objcopy"
+                toolchain_esp32s3="$HOME/.platformio/packages/toolchain-xtensa-esp32s3/xtensa-esp32s3-elf/bin/objcopy"
+
+                # Verificar se os arquivos existem antes de executar os comandos
+                if [[ -f "$esp32_file" && -f "$esp32s3_file" ]]; then
+                    # Execute objcopy commands for ESP32
+                    $toolchain_esp32 --weaken-symbol=ieee80211_raw_frame_sanity_check "$esp32_file" "$esp32_file_temp"
+
+                    # Rename the original file to .old
+                    mv "$esp32_file" "${esp32_file}.old"
+
+                    # Rename the _temp to original
+                    mv "$esp32_file_temp" "$esp32_file"
+
+                    # Execute objcopy commands for ESP32-S3
+                    $toolchain_esp32s3 --weaken-symbol=ieee80211_raw_frame_sanity_check "$esp32s3_file" "$esp32s3_file_temp"
+
+                    # Rename the original file to .old
+                    mv "$esp32s3_file" "${esp32s3_file}.old"
+
+                    # Rename the _temp to original
+                    mv "$esp32s3_file_temp" "$esp32s3_file"
+
+                    echo "Done."
+                else
+                    echo "One or more specified files were not found."
+                    exit 1
+                fi
 
                 if [[ "${{ github.ref_type }}" == "tag" ]]; then
                   version=${{ github.ref_name }}

README.md

@@ -204,18 +204,18 @@ 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:¹     | :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:       |
+| 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:     | MAX98357A | :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)