Merge branch 'release/v0.1.3-release'

Author: windowsair

.github/workflows/main.yml

@@ -10,18 +10,18 @@ jobs:
     runs-on: ubuntu-18.04
     steps:
     - uses: actions/checkout@v2
+      with:
+        submodules: recursive
 
     - name: before_install
       run: |
         sudo apt update
-        sudo apt install -y gcc git wget make libncurses-dev flex bison python python-serial ninja-build
+        sudo apt install -y gcc git wget make libncurses-dev flex bison python python-setuptools python-serial ninja-build
         wget https://dl.espressif.com/dl/xtensa-lx106-elf-linux64-1.22.0-100-ge567ec7-5.2.0.tar.gz
 
     - name: install
       run: |
         tar -xzf ./xtensa-lx106-elf-linux64-1.22.0-100-ge567ec7-5.2.0.tar.gz
-        wget https://github.com/espressif/ESP8266_RTOS_SDK/releases/download/v3.3-rc1/ESP8266_RTOS_SDK-v3.3-rc1.zip
-        unzip ESP8266_RTOS_SDK-v3.3-rc1.zip
         python -m pip install --user -r ./ESP8266_RTOS_SDK/requirements.txt
 
     - name: script
@@ -41,12 +41,23 @@ jobs:
         echo "::set-output name=release_tag::UserBuild_$(date +"%Y.%m.%d_%H-%M")"
         echo "::set-output name=status::success"
 
+    - name: Merge bin files
+      if: steps.tag.outputs.status == 'success' && !cancelled()
+      run: |
+        git clone https://github.com/espressif/esptool.git
+        ./esptool/esptool.py --chip esp8266 merge_bin  -o build/esp8266_dap_full.bin 0x0 build/bootloader/bootloader.bin 0x8000 build/partition_table/partition-table.bin 0x10000 build/esp8266_dap.bin
+        mv build/esp8266_dap.bin build/esp8266_dap_app.bin
+
     - name: Release user firmware
       uses: softprops/action-gh-release@v1
       if: steps.tag.outputs.status == 'success' && !cancelled()
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         tag_name: ${{ steps.tag.outputs.release_tag }}
-        files: ${{ env.FIRMWARE }}/esp8266_dap.bin
+        files: |
+          ${{ env.FIRMWARE }}/esp8266_dap_full.bin
+          ${{ env.FIRMWARE }}/esp8266_dap_app.bin
+          ${{ env.FIRMWARE }}/bootloader/bootloader.bin
+          ${{ env.FIRMWARE }}/partition_table/partition-table.bin
 

.gitignore

@@ -1,3 +1,4 @@
 .vscode/
 build/
-tmp/
+tmp/
+.history/

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "ESP8266_RTOS_SDK"]
+	path = ESP8266_RTOS_SDK
+	url = https://github.com/espressif/ESP8266_RTOS_SDK

.travis.yml renamed to .travis.yml.backup

@@ -1,9 +1,6 @@
-# The following five lines of boilerplate have to be in your project's
-# CMakeLists in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
-#set(COMPONENT_DIRS "${IDF_PATH}/components ${PROJECT_PATH}/components")
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/main)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(esp8266_dap)

CMakeLists.txt

@@ -1,4 +1,4 @@
-<p align="center"><img src="https://user-images.githubusercontent.com/17078589/107881245-7d7d5580-6f1e-11eb-9f66-6ac589e5f95c.png"/></p>
+<p align="center"><img src="https://user-images.githubusercontent.com/17078589/120061980-49274280-c092-11eb-9916-4965f6c48388.png"/></p>
 
 ![image](https://user-images.githubusercontent.com/17078589/107857220-05ecef00-6e68-11eb-9fa0-506b32052dba.png)
 
@@ -17,7 +17,7 @@ Realized by USBIP and CMSIS-DAP protocol stack.
 
 > 👉 5m distance, 100kb size firmware(Hex) flash test:
 
-<p align="center"><img src="https://user-images.githubusercontent.com/17078589/107896674-e5a95700-6f71-11eb-90f7-bf7362045537.gif"/></p>
+<p align="center"><img src="https://user-images.githubusercontent.com/17078589/120925694-4bca0d80-c70c-11eb-91b7-ffa54770faea.gif"/></p>
 
 ## Feature
 
@@ -49,6 +49,10 @@ The default connected WIFI SSID is `DAP` , password `12345678`
 
 You can change `WIFI_SSID` and ` WIFI_PASS` in [wifi_configuration.h](main/wifi_configuration.h)
 
+You can also specify your IP in the above file (We recommend using the static address binding feature of the router).
+
+![WIFI](https://user-images.githubusercontent.com/17078589/118365659-517e7880-b5d0-11eb-9a5b-afe43348c2ba.png)
+
 ### Debugger
 
 
@@ -57,8 +61,7 @@ You can change `WIFI_SSID` and ` WIFI_PASS` in [wifi_configuration.h](main/wifi_
 | SWD            |        |
 |----------------|--------|
 | SWCLK          | GPIO14 |
-| SWDIO          | GPIO12 |
-| SWDIO_MOSI     | GPIO13 |
+| SWDIO          | GPIO13 |
 | LED\_CONNECTED | GPIO2  |
 | LED\_RUNNING   | GPIO15 |
 | TVCC           | 3V3    |
@@ -184,7 +187,7 @@ When you select max clock, we will take the following actions:
 
 1. Use WinUSB Mode(enabled by default):
 
-    change `USE_WINUSB` macor in [USBd_config.h](components/USBIP/USBd_config.h)
+    change `USE_WINUSB` macor in [dap_configuration.h](main/dap_configuration.h)
 
 
 
@@ -234,9 +237,9 @@ Credits to the following project, people and organizations:
 > - https://github.com/cezanne/usbip-win for usbip windows
 
 
-- @HeavenSpree
-- @Zy19930907
-- @caiguang1997
+- [@HeavenSpree](https://www.github.com/HeavenSpree)
+- [@Zy19930907](https://www.github.com/Zy19930907)
+- [@caiguang1997](https://www.github.com/caiguang1997)
 
 
 ## License

ESP8266_RTOS_SDK

@@ -1,4 +1,4 @@
-set(COMPONENT_ADD_INCLUDEDIRS "config include $ENV{IDF_PATH}/components/esp8266/include/esp8266/ $ENV{IDF_PATH}//components/esp_ringbuf/include/")
+set(COMPONENT_ADD_INCLUDEDIRS "config include $ENV{IDF_PATH}/components/esp8266/include/esp8266/ $ENV{IDF_PATH}/components/esp_ringbuf/include/")
 set(COMPONENT_SRCS "./source/DAP.c ./source/DAP_vendor.c ./source/JTAG_DP.c ./source/SW_DP.c ./source/SWO.c ./source/uart_modify.c ./source/spi_op.c ./source/spi_switch.c ./source/dap_utility.c")