Skip to content

Commit 35fca72

Browse files
esp8266 optimize + idle hooks (#1869)
1 parent e9e20ed commit 35fca72

File tree

13 files changed

+43
-206
lines changed

13 files changed

+43
-206
lines changed

.github/workflows/workflow.yaml

Lines changed: 8 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -422,36 +422,21 @@ jobs:
422422
- name: SDK checkout
423423
uses: actions/checkout@v4
424424
with:
425-
repository: espressif/ESP8266_RTOS_SDK
426-
path: sdk/ESP8266_RTOS_SDK
427-
ref: release/v3.4
428-
submodules: false
425+
repository: NonPIayerCharacter/OpenESP8266
426+
path: sdk/OpenESP8266
427+
ref: obk
429428
fetch-tags: true
430-
fetch-depth: '200'
429+
fetch-depth: '10'
430+
submodules: recursive
431431
- name: Install dependencies
432432
run: |
433-
git config --global user.name github-actions
434-
git config --global user.email [email protected]
435-
apt-get update && apt-get -y install cmake
433+
apt update && apt install -y cmake
436434
pip2 install virtualenv
437-
cd sdk/ESP8266_RTOS_SDK
438-
git checkout c965e03d2b7418b085c394dc98c6a0d3371c2abd
439-
patch -p1 -d . < ../../platforms/ESP8266/sdk.patch
440-
git revert 0325f833aac7b34d7627619499949331a98fc3ab --no-edit
441-
git submodule update --init components/coap/libcoap
442-
cd components/coap/libcoap
443-
git fetch
444-
git checkout 017528d7d96dca2318ed587b5fd3c0d57a89e49a
445-
cd ../../..
446-
git add .
447-
git commit -m "upd"
448-
git submodule update --init --recursive
449-
cd ../..
450-
python2 -m pip install --user -r sdk/ESP8266_RTOS_SDK/requirements.txt
435+
python2 -m pip install --user -r sdk/OpenESP8266/requirements.txt
451436
python3 -m pip install esptool
452437
- name: Run make
453438
run: |
454-
cd sdk/ESP8266_RTOS_SDK
439+
cd sdk/OpenESP8266
455440
./install.sh > /dev/null
456441
. ./export.sh
457442
. ./add_path.sh

.gitmodules

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,10 @@
6565
path = sdk/OpenXR806
6666
url = https://github.com/openshwprojects/OpenXR806
6767
branch = master
68-
[submodule "sdk/ESP8266_RTOS_SDK"]
69-
path = sdk/ESP8266_RTOS_SDK
70-
url = https://github.com/espressif/ESP8266_RTOS_SDK
71-
branch = release/v3.4
68+
[submodule "sdk/OpenESP8266"]
69+
path = sdk/OpenESP8266
70+
url = https://github.com/NonPIayerCharacter/OpenESP8266
71+
branch = obk
7272
[submodule "sdk/ameba-rtos"]
7373
path = sdk/ameba-rtos
7474
url = https://github.com/Ameba-AIoT/ameba-rtos

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ endif
227227
fi
228228

229229
prebuild_ESP8266: berry
230-
#git submodule update --init --recursive --depth=1 sdk/ESP8266_RTOS_SDK
230+
#git submodule update --init --recursive --depth=1 sdk/OpenESP8266
231231
-rm platforms/ESP8266/sdkconfig
232232
-rm platforms/ESP8266/partitions.csv
233233
cp platforms/ESP8266/partitions-2mb.csv platforms/ESP8266/partitions.csv
@@ -702,8 +702,6 @@ OpenRDA5981: prebuild_OpenRDA5981
702702
# clean .o files and output directory
703703
.PHONY: clean
704704
clean:
705-
-test -d ./sdk/OpenBK7231T && $(MAKE) -C sdk/OpenBK7231T/platforms/bk7231t/bk7231t_os APP_BIN_NAME=$(APP_NAME) USER_SW_VER=$(APP_VERSION) clean
706-
-test -d ./sdk/OpenBK7231N && $(MAKE) -C sdk/OpenBK7231N/platforms/bk7231n/bk7231n_os APP_BIN_NAME=$(APP_NAME) USER_SW_VER=$(APP_VERSION) clean
707705
-test -d ./sdk/OpenXR809 && $(MAKE) -C sdk/OpenXR809/src clean
708706
-test -d ./sdk/OpenXR809 && $(MAKE) -C sdk/OpenXR809/project/oxr_sharedApp/gcc clean
709707
-test -d ./sdk/OpenXR806 && $(MAKE) -C sdk/OpenXR806/src clean
@@ -734,6 +732,8 @@ clean:
734732
-test -d ./platforms/ESP-IDF/build-c61 && cmake --build ./platforms/ESP-IDF/build-c61 --target clean
735733
-test -d ./platforms/ESP8266/build && cmake --build ./platforms/ESP8266/build --target clean
736734
-test -d ./sdk/OpenECR6600 && cd sdk/OpenECR6600 && make BOARD_DIR=$(ECRDIR)/Boards/ecr6600/standalone APP_NAME=OpenBeken TOPDIR=$(ECRDIR) GCC_PATH=$(ECRDIR)/tool/nds32le-elf-mculib-v3s/bin/ clean
735+
-test -d ./sdk/OpenBK7231T && $(MAKE) -C sdk/OpenBK7231T/platforms/bk7231t/bk7231t_os APP_BIN_NAME=$(APP_NAME) USER_SW_VER=$(APP_VERSION) clean
736+
-test -d ./sdk/OpenBK7231N && $(MAKE) -C sdk/OpenBK7231N/platforms/bk7231n/bk7231n_os APP_BIN_NAME=$(APP_NAME) USER_SW_VER=$(APP_VERSION) clean
737737
-$(RM) -r $(BUILD_DIR)
738738

739739
# Example upload command - import the following snippet into Node-RED and update the IPs in the variables below

platforms/ESP-IDF/sdkconfig.defaults

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,5 @@ CONFIG_ESP_PROTOCOMM_SUPPORT_SECURITY_VERSION_2=n
2121
CONFIG_LWIP_TCP_MSL=1000
2222
CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y
2323
CONFIG_ESPTOOLPY_FLASHSIZE="16MB"
24+
25+
CONFIG_FREERTOS_USE_IDLE_HOOK=y

platforms/ESP8266/sdk.patch

Lines changed: 0 additions & 170 deletions
This file was deleted.

platforms/ESP8266/sdkconfig.defaults

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,16 @@ CONFIG_LWIP_TCPIP_TASK_STACK_SIZE=1024
3333
CONFIG_LWIP_IP4_FRAG=n
3434
CONFIG_LWIP_IP6_FRAG=n
3535
CONFIG_PTHREAD_TASK_STACK_SIZE_DEFAULT=2048
36-
CONFIG_WIFI_PPT_TASKSTACK_SIZE=4096
3736

3837
CONFIG_ESP8266_WIFI_RX_BUFFER_NUM=6
3938
CONFIG_ESP8266_WIFI_LEFT_CONTINUOUS_RX_BUFFER_NUM=6
4039
CONFIG_SUPPORT_TERMIOS=n
4140
CONFIG_ESPTOOLPY_FLASHMODE_DOUT=y
4241
CONFIG_ESPTOOLPY_FLASHMODE="dout"
4342
CONFIG_NEWLIB_NANO_FORMAT=n
43+
44+
ESP_SYSTEM_EVENT_TASK_STACK_SIZE=1024
45+
ESP_SYSTEM_EVENT_QUEUE_SIZE=16
46+
ESP_ERR_TO_NAME_LOOKUP=n
47+
ESP8266_CORE_GLOBAL_DATA_LINK_IRAM=n
48+
ESP8266_WIFI_TX_PKT_NUM=4

sdk/ESP8266_RTOS_SDK

Lines changed: 0 additions & 1 deletion
This file was deleted.

sdk/OpenESP8266

Submodule OpenESP8266 added at 57d7262

0 commit comments

Comments
 (0)