kerms
/
wireless-proxy-esp32
0
0
Fork 0
Code

bump esp-idf version to v5.2.1 and update workflows

This commit is contained in:
kerms 2024-03-17 19:50:29 +08:00
parent 45e7b6d90c
commit 070abcfeee
6 changed files with 438 additions and 322 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.github/workflows/codeql-analysis.yml vendored
View File

@ -63,11 +63,11 @@ jobs:
name: Build name: Build
run: | run: |
sudo apt-get install git wget flex bison gperf python3 python3-pip python3-venv cmake ninja-build ccache libffi-dev libssl-dev dfu-util libusb-1.0-0 sudo apt-get install git wget flex bison gperf python3 python3-pip python3-venv cmake ninja-build ccache libffi-dev libssl-dev dfu-util libusb-1.0-0
wget https://github.com/espressif/esp-idf/releases/download/v5.2.0/esp-idf-v5.2.0.zip wget https://github.com/espressif/esp-idf/releases/download/v5.2.1/esp-idf-v5.2.1.zip
unzip esp-idf-v5.2.0.zip unzip esp-idf-v5.2.1.zip
./esp-idf-v5.2.0/install.sh esp32 ./esp-idf-v5.2.1/install.sh esp32c3
. ./esp-idf-v5.2.0/export.sh . ./esp-idf-v5.2.1/export.sh
idf.py set-target esp32 idf.py set-target esp32c3
idf.py build idf.py build
- name: Perform CodeQL Analysis - name: Perform CodeQL Analysis

76
.github/workflows/main.yml vendored
View File

@ -17,7 +17,7 @@ jobs:
continue-on-error: false continue-on-error: false
strategy: strategy:
matrix: matrix:
target-hardware: [esp8266, esp32, esp32c3] target-hardware: [esp32c3]
steps: steps:
@ -25,32 +25,6 @@ jobs:
with: with:
submodules: recursive submodules: recursive
- name: before_install
if: matrix.target-hardware == 'esp8266'
run: |
sudo apt update
sudo apt install -y gcc git wget make libncurses-dev flex bison python python-setuptools python3-serial ninja-build
wget https://dl.espressif.com/dl/xtensa-lx106-elf-linux64-1.22.0-100-ge567ec7-5.2.0.tar.gz
curl https://bootstrap.pypa.io/pip/2.7/get-pip.py -o get-pip.py
python get-pip.py
- name: install
if: matrix.target-hardware == 'esp8266'
run: |
tar -xzf ./xtensa-lx106-elf-linux64-1.22.0-100-ge567ec7-5.2.0.tar.gz
python -m pip install --user -r ./ESP8266_RTOS_SDK/requirements.txt
- name: script
id: script
if: matrix.target-hardware == 'esp8266'
run: |
export IDF_PATH=$PWD/ESP8266_RTOS_SDK
export PATH="$PATH:$PWD/xtensa-lx106-elf/bin"
echo "FIRMWARE=$PWD/build" >> $GITHUB_ENV
python ./idf.py fullclean
python ./idf.py build
echo "::set-output name=status::success"
# - name: Generate release tag # - name: Generate release tag
# id: tag # id: tag
# if: env.UPLOAD_USER_FIRMWARE == 'true' && steps.script.outputs.status == 'success' && !cancelled() # if: env.UPLOAD_USER_FIRMWARE == 'true' && steps.script.outputs.status == 'success' && !cancelled()
@ -63,34 +37,34 @@ jobs:
if: matrix.target-hardware != 'esp8266' if: matrix.target-hardware != 'esp8266'
uses: espressif/esp-idf-ci-action@v1 uses: espressif/esp-idf-ci-action@v1
with: with:
esp_idf_version: v4.4.2 esp_idf_version: v5.2.1
target: ${{ matrix.target-hardware }} target: ${{ matrix.target-hardware }}
path: './' path: './'
# - name: Merge bin files (esp32)
# if: matrix.target-hardware == 'esp32'
# run: |
# git clone https://github.com/espressif/esptool.git
# git -C ./esptool/ checkout tags/v4.7.0 -b merge_wirless_bin
# sudo python3 ./esptool/esptool.py --chip ${{ matrix.target-hardware }} merge_bin -o build/wireless_esp_dap_full.bin 0x1000 build/bootloader/bootloader.bin 0x8000 build/partition_table/partition-table.bin 0x10000 build/wireless_tools_esp32.bin
# sudo mv build/wireless_tools_esp32.bin build/wireless_esp_dap_app.bin
- name: Merge bin files (esp8266) # - name: Merge bin files (esp32c3)
if: matrix.target-hardware == 'esp8266' # if: matrix.target-hardware == 'esp32c3'
run: | # run: |
git clone https://github.com/espressif/esptool.git # git clone https://github.com/espressif/esptool.git
git -C ./esptool/ checkout tags/v4.6.2 -b merge_wirless_bin # git -C ./esptool/ checkout tags/v4.7.0 -b merge_wirless_bin
sudo python3 ./esptool/esptool.py --chip ${{ matrix.target-hardware }} merge_bin -o build/wireless_esp_dap_full.bin 0x0 build/bootloader/bootloader.bin 0x8000 build/partition_table/partition-table.bin 0x10000 build/wireless_esp_dap.bin # sudo python3 ./esptool/esptool.py --chip ${{ matrix.target-hardware }} merge_bin -o build/wireless_esp_dap_full.bin 0x0 build/bootloader/bootloader.bin 0x8000 build/partition_table/partition-table.bin 0x10000 build/wireless_tools_esp32.bin
sudo mv build/wireless_esp_dap.bin build/wireless_esp_dap_app.bin # sudo mv build/wireless_tools_esp32.bin build/wireless_esp_dap_app.bin
- name: Merge bin files (esp32) - name: merge bin files (esp32c3)
if: matrix.target-hardware == 'esp32'
run: |
git clone https://github.com/espressif/esptool.git
git -C ./esptool/ checkout tags/v4.6.2 -b merge_wirless_bin
sudo python3 ./esptool/esptool.py --chip ${{ matrix.target-hardware }} merge_bin -o build/wireless_esp_dap_full.bin 0x1000 build/bootloader/bootloader.bin 0x8000 build/partition_table/partition-table.bin 0x10000 build/wireless_esp_dap.bin
sudo mv build/wireless_esp_dap.bin build/wireless_esp_dap_app.bin
- name: Merge bin files (esp32c3)
if: matrix.target-hardware == 'esp32c3' if: matrix.target-hardware == 'esp32c3'
run: | uses: espressif/esp-idf-ci-action@v1
git clone https://github.com/espressif/esptool.git with:
git -C ./esptool/ checkout tags/v4.6.2 -b merge_wirless_bin esp_idf_version: v5.2.1
sudo python3 ./esptool/esptool.py --chip ${{ matrix.target-hardware }} merge_bin -o build/wireless_esp_dap_full.bin 0x0 build/bootloader/bootloader.bin 0x8000 build/partition_table/partition-table.bin 0x10000 build/wireless_esp_dap.bin target: ${{ matrix.target-hardware }}
sudo mv build/wireless_esp_dap.bin build/wireless_esp_dap_app.bin path: './'
command: esptool.py --chip ${{ matrix.target-hardware }} merge_bin -o build/wireless_tools_esp32_full.bin 0x0 build/bootloader/bootloader.bin 0xF000 build/partition_table/partition-table.bin 0x20000 build/wireless_tools_esp32.bin
- name: Upload firmware - name: Upload firmware
@ -98,7 +72,7 @@ jobs:
with: with:
name: firmware_${{ matrix.target-hardware }}.zip name: firmware_${{ matrix.target-hardware }}.zip
path: | path: |
build/wireless_esp_dap_full.bin build/wireless_tools_esp32_full.bin
build/wireless_esp_dap_app.bin build/wireless_tools_esp32.bin
build/bootloader/bootloader.bin build/bootloader/bootloader.bin
build/partition_table/partition-table.bin build/partition_table/partition-table.bin

10
partitions.csv Executable file
View File

@ -0,0 +1,10 @@
# Name , Type , SubType , Offset , Size , Flags
# 1st stage ROM ,data, ,
# 2nd stage boot ,data,0x1000,
# partition table,data,0xF000,4K(0x1000),
begin ,0x40,0x00 , ,0k ,
nvs ,data,nvs ,0x10000,16K ,
phy_init ,data,phy , ,4K ,
none0 ,0x40,0x00 , ,0k ,
ota_0 ,app ,ota_0 ,0x20000,0x1B0000,
wt_nvs ,data,nvs , ,64K ,
1 # Name , Type , SubType , Offset , Size , Flags
2 # 1st stage ROM ,data, ,
3 # 2nd stage boot ,data,0x1000,
4 # partition table,data,0xF000,4K(0x1000),
5 begin ,0x40,0x00 , ,0k ,
6 nvs ,data,nvs ,0x10000,16K ,
7 phy_init ,data,phy , ,4K ,
8 none0 ,0x40,0x00 , ,0k ,
9 ota_0 ,app ,ota_0 ,0x20000,0x1B0000,
10 wt_nvs ,data,nvs , ,64K ,

2
project_components/web_server/uri_modules/uri_ws.c
View File

@ -157,7 +157,7 @@ static const httpd_uri_t uri_api = {
static int WS_REQ_INIT(const httpd_uri_t **uri_conf) { static int WS_REQ_INIT(const httpd_uri_t **uri_conf) {
*uri_conf = &uri_api; *uri_conf = &uri_api;
xTaskCreate(heartbeat_task, "hb task", 1024, NULL, 3, &ws_ctx.task_heartbeat); xTaskCreate(heartbeat_task, "hb task", 2048, NULL, 3, &ws_ctx.task_heartbeat);
return 0; return 0;
} }

14
sdkconfig.defaults.esp32
View File

@ -108,12 +108,13 @@ CONFIG_ESPTOOLPY_MONITOR_BAUD=921600
# #
# Partition Table # Partition Table
# #
CONFIG_PARTITION_TABLE_SINGLE_APP=y # CONFIG_PARTITION_TABLE_SINGLE_APP is not set
# CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE is not set
# CONFIG_PARTITION_TABLE_TWO_OTA is not set # CONFIG_PARTITION_TABLE_TWO_OTA is not set
# CONFIG_PARTITION_TABLE_CUSTOM is not set CONFIG_PARTITION_TABLE_CUSTOM=y
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv" CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
CONFIG_PARTITION_TABLE_FILENAME="partitions_singleapp.csv" CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
CONFIG_PARTITION_TABLE_OFFSET=0x8000 CONFIG_PARTITION_TABLE_OFFSET=0xF000
CONFIG_PARTITION_TABLE_MD5=y CONFIG_PARTITION_TABLE_MD5=y
# end of Partition Table # end of Partition Table
@ -338,11 +339,12 @@ CONFIG_ESP_EVENT_POST_FROM_IRAM_ISR=y
# HTTP Server # HTTP Server
# #
CONFIG_HTTPD_MAX_REQ_HDR_LEN=512 CONFIG_HTTPD_MAX_REQ_HDR_LEN=512
CONFIG_HTTPD_MAX_URI_LEN=512 CONFIG_HTTPD_MAX_URI_LEN=256
CONFIG_HTTPD_ERR_RESP_NO_DELAY=y CONFIG_HTTPD_ERR_RESP_NO_DELAY=y
CONFIG_HTTPD_PURGE_BUF_LEN=32 CONFIG_HTTPD_PURGE_BUF_LEN=32
# CONFIG_HTTPD_LOG_PURGE_DATA is not set # CONFIG_HTTPD_LOG_PURGE_DATA is not set
# CONFIG_HTTPD_WS_SUPPORT is not set CONFIG_HTTPD_WS_SUPPORT=y
# CONFIG_HTTPD_QUEUE_WORK_BLOCKING is not set
# end of HTTP Server # end of HTTP Server
# #

646
sdkconfig.defaults.esp32c3
View File

File diff suppressed because it is too large Load Diff