diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9095bc7d1..650127a6c 100755 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,21 +30,21 @@ check_lib_reversion: - GIT_COMMIT_ID=`git log --pretty="%s" -1 | grep -o '([0-9a-f]*)' | tail -1 | cut -c 2-8` - echo "GIT_COMMIT_ID is "$GIT_COMMIT_ID - test $(echo -n $GIT_COMMIT_ID | wc -c) -eq 7 - - for dir in esp32 esp32s2 esp32s3 esp32c3; do grep $GIT_COMMIT_ID $dir/libcoexist.a; done; - - for dir in esp32 esp32s2 esp32s3 esp32c3; do grep $GIT_COMMIT_ID $dir/libcore.a; done; - - for dir in esp32 esp32s2 esp32s3 esp32c3; do grep $GIT_COMMIT_ID $dir/libespnow.a; done; + - for dir in esp32 esp32s2 esp32s3 esp32c3 esp32c2; do grep $GIT_COMMIT_ID $dir/libcoexist.a; done; + - for dir in esp32 esp32s2 esp32s3 esp32c3 esp32c2; do grep $GIT_COMMIT_ID $dir/libcore.a; done; + - for dir in esp32 esp32s2 esp32s3 esp32c3 esp32c2; do grep $GIT_COMMIT_ID $dir/libespnow.a; done; - for dir in esp32 esp32s2 esp32s3 esp32c3; do grep $GIT_COMMIT_ID $dir/libmesh.a; done; - - for dir in esp32 esp32s2 esp32s3 esp32c3; do grep $GIT_COMMIT_ID $dir/libnet80211.a; done; - - for dir in esp32 esp32s2 esp32s3 esp32c3; do grep $GIT_COMMIT_ID $dir/libpp.a; done; - - for dir in esp32 esp32s2 esp32s3 esp32c3; do grep $GIT_COMMIT_ID $dir/libsmartconfig.a; done; + - for dir in esp32 esp32s2 esp32s3 esp32c3 esp32c2; do grep $GIT_COMMIT_ID $dir/libnet80211.a; done; + - for dir in esp32 esp32s2 esp32s3 esp32c3 esp32c2; do grep $GIT_COMMIT_ID $dir/libpp.a; done; + - for dir in esp32 esp32s2 esp32s3 esp32c3 esp32c2; do grep $GIT_COMMIT_ID $dir/libsmartconfig.a; done; - for dir in esp32 esp32s2 esp32s3 esp32c3; do grep $GIT_COMMIT_ID $dir/libwapi.a; done; - - for dir in esp32 esp32s2 esp32s3 esp32c3; do grep $GIT_COMMIT_ID-remote $dir/libnet80211.a; done; - - for dir in esp32 esp32s2 esp32s3 esp32c3; do test $(grep $GIT_COMMIT_ID-dirty $dir/*.a | wc -l) -eq 0; done; + - for dir in esp32 esp32s2 esp32s3 esp32c3 esp32c2; do grep $GIT_COMMIT_ID-remote $dir/libnet80211.a; done; + - for dir in esp32 esp32s2 esp32s3 esp32c3 esp32c2; do test $(grep $GIT_COMMIT_ID-dirty $dir/*.a | wc -l) -eq 0; done; - for dir in esp32 esp32s2 esp32s3; do test $(xtensa-esp32-elf-nm $dir/*.a | grep -w printf | wc -l) -eq 0; done; - for dir in esp32 esp32s2 esp32s3; do test $(xtensa-esp32-elf-nm $dir/*.a | grep -w ets_printf | wc -l) -eq 0; done; - - for dir in esp32 esp32s2 esp32s3 esp32c3; do if [ -e $dir/libwps.a ]; then exit 1; fi; done; - - for dir in esp32 esp32s2 esp32s3 esp32c3; do if [ -e $dir/libwpa.a ]; then exit 1; fi; done; - - for dir in esp32 esp32s2 esp32s3 esp32c3; do if [ -e $dir/libwpa2.a ]; then exit 1; fi; done; + - for dir in esp32 esp32s2 esp32s3 esp32c3 esp32c2; do if [ -e $dir/libwps.a ]; then exit 1; fi; done; + - for dir in esp32 esp32s2 esp32s3 esp32c3 esp32c2; do if [ -e $dir/libwpa.a ]; then exit 1; fi; done; + - for dir in esp32 esp32s2 esp32s3 esp32c3 esp32c2; do if [ -e $dir/libwpa2.a ]; then exit 1; fi; done; push_master_to_github: stage: deploy diff --git a/esp32/libcoexist.a b/esp32/libcoexist.a index 869cb870d..8aa7419e6 100644 Binary files a/esp32/libcoexist.a and b/esp32/libcoexist.a differ diff --git a/esp32/libcore.a b/esp32/libcore.a index 0a2379842..3f76d3c57 100644 Binary files a/esp32/libcore.a and b/esp32/libcore.a differ diff --git a/esp32/libespnow.a b/esp32/libespnow.a index 5e79cd4c7..ea2834fca 100644 Binary files a/esp32/libespnow.a and b/esp32/libespnow.a differ diff --git a/esp32/libmesh.a b/esp32/libmesh.a index 508c9750d..f55016098 100644 Binary files a/esp32/libmesh.a and b/esp32/libmesh.a differ diff --git a/esp32/libnet80211.a b/esp32/libnet80211.a index a682b55d5..c86eaad09 100644 Binary files a/esp32/libnet80211.a and b/esp32/libnet80211.a differ diff --git a/esp32/libpp.a b/esp32/libpp.a index 5bab74517..a1e7410f4 100644 Binary files a/esp32/libpp.a and b/esp32/libpp.a differ diff --git a/esp32/libsmartconfig.a b/esp32/libsmartconfig.a index a5a7ab2d4..2b012accf 100644 Binary files a/esp32/libsmartconfig.a and b/esp32/libsmartconfig.a differ diff --git a/esp32/libwapi.a b/esp32/libwapi.a index 78923d409..58f30cda1 100644 Binary files a/esp32/libwapi.a and b/esp32/libwapi.a differ diff --git a/esp32c2/libcoexist.a b/esp32c2/libcoexist.a new file mode 100644 index 000000000..864c66275 Binary files /dev/null and b/esp32c2/libcoexist.a differ diff --git a/esp32c2/libcore.a b/esp32c2/libcore.a new file mode 100644 index 000000000..2f6a8edc1 Binary files /dev/null and b/esp32c2/libcore.a differ diff --git a/esp32c2/libespnow.a b/esp32c2/libespnow.a new file mode 100644 index 000000000..a8446f1e6 Binary files /dev/null and b/esp32c2/libespnow.a differ diff --git a/esp32c2/libnet80211.a b/esp32c2/libnet80211.a new file mode 100644 index 000000000..84930c2f1 Binary files /dev/null and b/esp32c2/libnet80211.a differ diff --git a/esp32c2/libpp.a b/esp32c2/libpp.a new file mode 100644 index 000000000..f348677af Binary files /dev/null and b/esp32c2/libpp.a differ diff --git a/esp32c2/libsmartconfig.a b/esp32c2/libsmartconfig.a new file mode 100644 index 000000000..c2e6de9f4 Binary files /dev/null and b/esp32c2/libsmartconfig.a differ diff --git a/esp32c3/libcoexist.a b/esp32c3/libcoexist.a index 985e35341..e85bb8cd6 100644 Binary files a/esp32c3/libcoexist.a and b/esp32c3/libcoexist.a differ diff --git a/esp32c3/libcore.a b/esp32c3/libcore.a index f16a8dbbd..3a42055a3 100644 Binary files a/esp32c3/libcore.a and b/esp32c3/libcore.a differ diff --git a/esp32c3/libespnow.a b/esp32c3/libespnow.a index dcee7b4f1..ecafc67c1 100644 Binary files a/esp32c3/libespnow.a and b/esp32c3/libespnow.a differ diff --git a/esp32c3/libmesh.a b/esp32c3/libmesh.a index d69817427..6e0f2c2dd 100644 Binary files a/esp32c3/libmesh.a and b/esp32c3/libmesh.a differ diff --git a/esp32c3/libnet80211.a b/esp32c3/libnet80211.a index 957b65566..89d93d007 100644 Binary files a/esp32c3/libnet80211.a and b/esp32c3/libnet80211.a differ diff --git a/esp32c3/libpp.a b/esp32c3/libpp.a index ba4ccba82..333c79106 100644 Binary files a/esp32c3/libpp.a and b/esp32c3/libpp.a differ diff --git a/esp32c3/libsmartconfig.a b/esp32c3/libsmartconfig.a index 3f15c5806..a33d0cf21 100644 Binary files a/esp32c3/libsmartconfig.a and b/esp32c3/libsmartconfig.a differ diff --git a/esp32c3/libwapi.a b/esp32c3/libwapi.a index 97b1598a4..eca111170 100644 Binary files a/esp32c3/libwapi.a and b/esp32c3/libwapi.a differ diff --git a/esp32s2/libcoexist.a b/esp32s2/libcoexist.a index 298eff45d..9fbe596a8 100644 Binary files a/esp32s2/libcoexist.a and b/esp32s2/libcoexist.a differ diff --git a/esp32s2/libcore.a b/esp32s2/libcore.a index 351b9f377..f7d4e1bfb 100644 Binary files a/esp32s2/libcore.a and b/esp32s2/libcore.a differ diff --git a/esp32s2/libespnow.a b/esp32s2/libespnow.a index 9baff78d8..f116d78ca 100644 Binary files a/esp32s2/libespnow.a and b/esp32s2/libespnow.a differ diff --git a/esp32s2/libmesh.a b/esp32s2/libmesh.a index ff771bb2d..83fabc044 100644 Binary files a/esp32s2/libmesh.a and b/esp32s2/libmesh.a differ diff --git a/esp32s2/libnet80211.a b/esp32s2/libnet80211.a index 71cebc875..1c96903d0 100644 Binary files a/esp32s2/libnet80211.a and b/esp32s2/libnet80211.a differ diff --git a/esp32s2/libpp.a b/esp32s2/libpp.a index 6b2305ca8..d10789fdd 100644 Binary files a/esp32s2/libpp.a and b/esp32s2/libpp.a differ diff --git a/esp32s2/libsmartconfig.a b/esp32s2/libsmartconfig.a index 59b3d0345..407ca286c 100644 Binary files a/esp32s2/libsmartconfig.a and b/esp32s2/libsmartconfig.a differ diff --git a/esp32s2/libwapi.a b/esp32s2/libwapi.a index 04f9f19c2..4a3f1c752 100644 Binary files a/esp32s2/libwapi.a and b/esp32s2/libwapi.a differ diff --git a/esp32s3/libcoexist.a b/esp32s3/libcoexist.a index 495900d21..720e5222e 100644 Binary files a/esp32s3/libcoexist.a and b/esp32s3/libcoexist.a differ diff --git a/esp32s3/libcore.a b/esp32s3/libcore.a index 081295624..079f70ea9 100644 Binary files a/esp32s3/libcore.a and b/esp32s3/libcore.a differ diff --git a/esp32s3/libespnow.a b/esp32s3/libespnow.a index e44ed84db..2cabfbad8 100644 Binary files a/esp32s3/libespnow.a and b/esp32s3/libespnow.a differ diff --git a/esp32s3/libmesh.a b/esp32s3/libmesh.a index b3d5bef4d..bc53ca9a3 100644 Binary files a/esp32s3/libmesh.a and b/esp32s3/libmesh.a differ diff --git a/esp32s3/libnet80211.a b/esp32s3/libnet80211.a index c5110cf84..223f2d2d0 100644 Binary files a/esp32s3/libnet80211.a and b/esp32s3/libnet80211.a differ diff --git a/esp32s3/libpp.a b/esp32s3/libpp.a index 70da620d1..9b5dcab5b 100644 Binary files a/esp32s3/libpp.a and b/esp32s3/libpp.a differ diff --git a/esp32s3/libsmartconfig.a b/esp32s3/libsmartconfig.a index 07d2f1840..64faa5fa7 100644 Binary files a/esp32s3/libsmartconfig.a and b/esp32s3/libsmartconfig.a differ diff --git a/esp32s3/libwapi.a b/esp32s3/libwapi.a index 718d84aa5..10d39ff64 100644 Binary files a/esp32s3/libwapi.a and b/esp32s3/libwapi.a differ diff --git a/fix_printf.sh b/fix_printf.sh index 1d5fef610..782841769 100755 --- a/fix_printf.sh +++ b/fix_printf.sh @@ -1,10 +1,10 @@ #!/bin/bash -for dir in esp32 esp32s2 esp32c3 esp32s3; do +for dir in esp32 esp32s2 esp32c3 esp32s3 esp32c2; do if [ $dir = esp32 ]; then TOOLCHAIN="xtensa-esp32-elf" elif [ $dir = esp32s2 ]; then TOOLCHAIN="xtensa-esp32s2-elf" - elif [ $dir = esp32c3 ]; then + elif [ $dir = esp32c3 -o $dir = esp32c2 ]; then TOOLCHAIN="riscv32-esp-elf" elif [ $dir = esp32s3 ]; then TOOLCHAIN="xtensa-esp32s3-elf" @@ -24,6 +24,7 @@ for dir in esp32 esp32s2 esp32c3 esp32s3; do if [ $? -eq 0 ]; then echo $dir/libpp.a fixed $TOOLCHAIN-objcopy --redefine-sym printf=pp_printf libpp.a + $TOOLCHAIN-objcopy --redefine-sym ets_printf=pp_printf libpp.a fi git status libnet80211.a | grep "modified" >/dev/null 2>&1