diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json new file mode 100644 index 00000000..505ce0d9 --- /dev/null +++ b/.devcontainer/devcontainer.json @@ -0,0 +1,35 @@ +// For format details, see https://aka.ms/devcontainer.json. For config options, see the +// README at: https://github.com/devcontainers/templates/tree/main/src/ubuntu +{ + "name": "Ubuntu", + // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile + "image": "mcr.microsoft.com/devcontainers/base:jammy", + + // Features to add to the dev container. More info: https://containers.dev/features. + "features": { + "ghcr.io/devcontainers/features/python:1": {} + }, + + // Use 'forwardPorts' to make a list of ports inside the container available locally. + // "forwardPorts": [], + + // Use 'postCreateCommand' to run commands after the container is created. + // "postCreateCommand": "uname -a", + + // Configure tool-specific properties. + "customizations": { + "vscode": { + "extensions": [ + "ms-vscode.cpptools", + "platformio.platformio-ide" + ] + } + }, + + // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root. + // "remoteUser": "root" + + // Allow uploading to device + "mounts": ["type=bind,source=/dev/bus/usb,target=/dev/bus/usb"], + "runArgs": ["--privileged"] +} diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000..f33a02cd --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,12 @@ +# To get started with Dependabot version updates, you'll need to specify which +# package ecosystems to update and where the package manifests are located. +# Please see the documentation for more information: +# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates +# https://containers.dev/guide/dependabot + +version: 2 +updates: + - package-ecosystem: "devcontainers" + directory: "/" + schedule: + interval: weekly diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index d4104b2e..1f1e0e4a 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -2,7 +2,7 @@ name: Build branch on: release: - types: [created] + types: [published] push: branches: - master @@ -15,6 +15,7 @@ on: jobs: build_esp32: runs-on: ubuntu-latest + #runs-on: ubuntu-24.04 strategy: fail-fast: false @@ -31,13 +32,13 @@ jobs: - out: dustinwatts env: "freetouchdeck_4MB -e freetouchdeck_8MB -e esp32-touchdown" - out: elecrow - env: "esp32-terminal-rgb_16MB -e esp32-terminal-spi_16MB -e elecrow-s3-8048c070_4MB" + env: "esp32-terminal-rgb_16MB -e esp32-terminal-spi_16MB -e elecrow-s3-8048c050_4MB -e elecrow-s3-8048c070_4MB" - out: globalsecurity env: gs-t3e_16MB - out: guition - env: esp32-s3-4848s040_16MB + env: esp32-s3-4848s040_16MB -e guition-jc4827w543c_4MB - out: lanbon - env: lanbon_l8 + env: lanbon_l8 -e lanbon_l9 - out: lilygo-ttgo env: "lilygo-lily-pi_st7796 -e lilygo-lily-pi_ili9481 -e ttgo-t7-v1_5_ili9341_4MB -e ttgo-t7-v1_5_ili9341_16MB" - out: lolin @@ -51,9 +52,9 @@ jobs: - out: seeed-studios env: "sensecap-indicator-d1_8MB" - out: sunton - env: "esp32-2432s028r_4MB -e esp32-2432s028r-ili9342_4MB -e esp32-2432s032c_4MB -e esp32-3248s035c_4MB -e esp32-3248s035r_4MB -e sunton-4827s043c_16MB -e sunton-8048s043c_16MB -e sunton-8048s050c_16MB -e sunton-8048s070c_16MB" + env: "esp32-2432s028r_4MB -e esp32-2432s028r-ili9342_4MB -e esp32-2432s028r_v2_4MB -e esp32-2432s032c_4MB -e esp32-3248s035c_4MB -e esp32-3248s035r_4MB -e sunton-4827s043c_16MB -e sunton-8048s043c_16MB -e sunton-8048s050c_16MB -e sunton-8048s070c_16MB" - out: waveshare - env: "esp32-one_ili9486 -e esp32-one_st7796" + env: "esp32-one_ili9486 -e esp32-one_st7796 -e ws_esp32_s3_touch_lcd_4p3" - out: wireless-tag env: "wt32-sc01_4MB -e wt32-sc01_16MB -e wt-86-32-3zw1 -e wt32-sc01-plus_8MB -e wt32-sc01-plus_16MB" - out: yeacreate @@ -101,30 +102,20 @@ jobs: uses: actions/upload-artifact@v4 with: name: ${{ matrix.environment.out }} - path: build_output/firmware/*.bin - - name: Create release and upload firmware + path: build_output/firmware/*.*n + ## Release only: + - name: Zip artifact for deployment if: github.ref != 'refs/heads/master' run: | - set -x - assets=() - for asset in build_output/firmware/*.bin; do - assets+=("-a" "$asset") - done - tag_name="${GITHUB_REF##*/}" - hub release edit "${assets[@]}" -m "$tag_name" "$tag_name" - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - #- name: Create release and upload firmware - # run: | - # set -x - # assets=() - # for asset in build_output/firmware/*.bin; do - # assets+=("-a" "$asset") - # done - # tag_name="${GITHUB_REF##*/}" - # hub release create "${assets[@]}" -m "$tag_name" "$tag_name" - # env: - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + zip ${{ matrix.environment.out }}.zip build_output/firmware/*.bin -r + - name: On Release, upload assets to that Release + if: github.ref != 'refs/heads/master' + uses: AButler/upload-release-assets@v3.0 + with: + files: ${{ matrix.environment.out }}.zip + repo-token: ${{ secrets.GITHUB_TOKEN }} + + linux_build: runs-on: ubuntu-latest steps: diff --git a/.github/workflows/build_linux.yaml b/.github/workflows/build_linux.yaml index cd92d6be..5d081c18 100644 --- a/.github/workflows/build_linux.yaml +++ b/.github/workflows/build_linux.yaml @@ -1,4 +1,4 @@ -name: Build branch +name: Build Linux (Obsolete) on: workflow_dispatch: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ed1ce258..7464a8e3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,7 +3,7 @@ on: # types: [created] workflow_dispatch: -name: Create Release +name: Create Release (Obsolete) jobs: build: diff --git a/boards/esp32s3_flash_16MB.json b/boards/esp32s3_flash_16MB.json new file mode 100644 index 00000000..2f4ff022 --- /dev/null +++ b/boards/esp32s3_flash_16MB.json @@ -0,0 +1,43 @@ +{ + "build": { + "arduino": { + "ldscript": "esp32s3_out.ld" + }, + "core": "esp32", + "extra_flags": [ + "-DARDUINO_ESP32S3_DEV", + "-DARDUINO_USB_MODE=1", + "-DARDUINO_RUNNING_CORE=1", + "-DARDUINO_EVENT_RUNNING_CORE=1" + ], + "f_cpu": "240000000L", + "f_flash": "80000000L", + "flash_mode": "qio", + "mcu": "esp32s3", + "variant": "esp32s3" + }, + "connectivity": [ + "wifi" + ], + "debug": { + "default_tool": "esp-builtin", + "onboard_tools": [ + "esp-builtin" + ], + "openocd_target": "esp32s3.cfg" + }, + "frameworks": [ + "arduino", + "espidf" + ], + "name": "ESP32-S3-FLASH-16MB", + "upload": { + "flash_size": "16MB", + "maximum_ram_size": 327680, + "maximum_size": 16777216, + "require_upload_port": true, + "speed": 921600 + }, + "url": "null", + "vendor": "null" +} \ No newline at end of file diff --git a/data/edit.htm b/data/edit.htm index 0b6c6d5a..f3dbb9ba 100644 --- a/data/edit.htm +++ b/data/edit.htm @@ -58,4 +58,4 @@