Skip to content

Commit ab95979

Browse files
committed
feat & ci: Update esp32c3 sdkconfig
1 parent f5b83e6 commit ab95979

File tree

4 files changed

+253
-99
lines changed

4 files changed

+253
-99
lines changed

.github/workflows/main.yml

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414
jobs:
1515
build:
1616
runs-on: ubuntu-18.04
17-
continue-on-error: true
17+
continue-on-error: false
1818
strategy:
1919
matrix:
2020
target-hardware: [esp8266, esp32, esp32c3]
@@ -66,18 +66,30 @@ jobs:
6666
path: './'
6767

6868

69-
- name: Merge bin files
70-
id: merge
71-
if: matrix.target-hardware != 'esp8266' || matrix.target-hardware == 'esp8266' && steps.script.outputs.status == 'success' && !cancelled()
69+
- name: Merge bin files (esp8266)
70+
if: matrix.target-hardware == 'esp8266'
7271
run: |
7372
git clone https://github.com/espressif/esptool.git
7473
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
7574
sudo mv build/wireless_esp_dap.bin build/wireless_esp_dap_app.bin
76-
echo "::set-output name=status::success"
75+
76+
- name: Merge bin files (esp32)
77+
if: matrix.target-hardware == 'esp32'
78+
run: |
79+
git clone https://github.com/espressif/esptool.git
80+
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
81+
sudo mv build/wireless_esp_dap.bin build/wireless_esp_dap_app.bin
82+
83+
- name: Merge bin files (esp32c3)
84+
if: matrix.target-hardware == 'esp32c3'
85+
run: |
86+
git clone https://github.com/espressif/esptool.git
87+
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
88+
sudo mv build/wireless_esp_dap.bin build/wireless_esp_dap_app.bin
89+
7790
7891
- name: Upload firmware
7992
uses: actions/upload-artifact@v2
80-
if: matrix.target-hardware != 'esp8266' || matrix.target-hardware == 'esp8266' && steps.merge.outputs.status == 'success' && !cancelled()
8193
with:
8294
name: firmware_${{ matrix.target-hardware }}.zip
8395
path: |

README.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,9 @@ You can also specify your IP in the above file (We recommend using the static ad
6262
![WIFI](https://user-images.githubusercontent.com/17078589/118365659-517e7880-b5d0-11eb-9a5b-afe43348c2ba.png)
6363

6464

65-
There is built-in ipv4 only mDNS server. You can access the device using `dap.local` .
65+
There is built-in ipv4 only mDNS server. You can access the device using `dap.local`.
66+
67+
> The mDNS in ESP8266 only supports ipv4.
6668
6769
![mDNS](https://user-images.githubusercontent.com/17078589/149659052-7b29533f-9660-4811-8125-f8f50490d762.png)
6870

@@ -127,8 +129,8 @@ There is built-in ipv4 only mDNS server. You can access the device using `dap.lo
127129
|--------------------|---------|
128130
| TCK | GPIO14 |
129131
| TMS | GPIO13 |
130-
| TDI | GPIO19 |
131-
| TDO | GPIO18 |
132+
| TDI | GPIO18 |
133+
| TDO | GPIO19 |
132134
| nTRST \(optional\) | GPIO25 |
133135
| nRESET | GPIO26 |
134136
| TVCC | 3V3 |
@@ -225,7 +227,7 @@ See: [Build with Github Action](https://github.com/windowsair/wireless-esp8266-d
225227

226228
1. Get ESP8266 RTOS Software Development Kit
227229

228-
The SDK is already included in the project, please use it for subsequent operations.
230+
The SDK is already included in the project. Please don't use other versions of the SDK.
229231

230232
2. Build & Flash
231233

@@ -270,7 +272,7 @@ idf.py -p /dev/ttyS5 flash
270272
</details>
271273

272274

273-
> We also provided sample firmware quick evaluation. See [Releases](https://github.com/windowsair/wireless-esp8266-dap/releases)
275+
> We also provided sample firmware for quick evaluation. See [Releases](https://github.com/windowsair/wireless-esp8266-dap/releases)
274276
275277

276278
## Usage

0 commit comments

Comments
 (0)