diff --git a/esp32/libcore.a b/esp32/libcore.a index 30c87f1d6..3706c1ff0 100644 Binary files a/esp32/libcore.a and b/esp32/libcore.a differ diff --git a/esp32/libespnow.a b/esp32/libespnow.a index e40e1ffb1..66a57e856 100644 Binary files a/esp32/libespnow.a and b/esp32/libespnow.a differ diff --git a/esp32/libmesh.a b/esp32/libmesh.a index ee47ac47b..1ebe77599 100644 Binary files a/esp32/libmesh.a and b/esp32/libmesh.a differ diff --git a/esp32/libnet80211.a b/esp32/libnet80211.a index ca9985882..e34e145d5 100644 Binary files a/esp32/libnet80211.a and b/esp32/libnet80211.a differ diff --git a/esp32/libpp.a b/esp32/libpp.a index 6304ec642..3e0c90c3e 100644 Binary files a/esp32/libpp.a and b/esp32/libpp.a differ diff --git a/esp32/libsmartconfig.a b/esp32/libsmartconfig.a index 4e06093d1..7aeb6b959 100644 Binary files a/esp32/libsmartconfig.a and b/esp32/libsmartconfig.a differ diff --git a/esp32/libwapi.a b/esp32/libwapi.a index 202c4426f..aee0c8b8e 100644 Binary files a/esp32/libwapi.a and b/esp32/libwapi.a differ diff --git a/esp32_host/libcore.a b/esp32_host/libcore.a index 9c3145128..9051bcc04 100644 Binary files a/esp32_host/libcore.a and b/esp32_host/libcore.a differ diff --git a/esp32_host/libespnow.a b/esp32_host/libespnow.a index fc712dbc0..0bdc13f55 100644 Binary files a/esp32_host/libespnow.a and b/esp32_host/libespnow.a differ diff --git a/esp32_host/libmesh.a b/esp32_host/libmesh.a index 0586ba4ae..9c7cdc002 100644 Binary files a/esp32_host/libmesh.a and b/esp32_host/libmesh.a differ diff --git a/esp32_host/libnet80211.a b/esp32_host/libnet80211.a index b537d162e..44e15185a 100644 Binary files a/esp32_host/libnet80211.a and b/esp32_host/libnet80211.a differ diff --git a/esp32_host/libpp.a b/esp32_host/libpp.a index ce6849de9..95ef56762 100644 Binary files a/esp32_host/libpp.a and b/esp32_host/libpp.a differ diff --git a/esp32_host/libsmartconfig.a b/esp32_host/libsmartconfig.a index 249529cfe..6cfa126d1 100644 Binary files a/esp32_host/libsmartconfig.a and b/esp32_host/libsmartconfig.a differ diff --git a/esp32_host/libtarget.a b/esp32_host/libtarget.a index 85de6f5b1..b39e3aff8 100644 Binary files a/esp32_host/libtarget.a and b/esp32_host/libtarget.a differ diff --git a/esp32_host/libwapi.a b/esp32_host/libwapi.a index a739d9ed4..54031bc8e 100644 Binary files a/esp32_host/libwapi.a and b/esp32_host/libwapi.a differ diff --git a/esp32c2/libcore.a b/esp32c2/libcore.a index 4a45fd205..e42009c52 100644 Binary files a/esp32c2/libcore.a and b/esp32c2/libcore.a differ diff --git a/esp32c2/libespnow.a b/esp32c2/libespnow.a index 8eb81da4e..45b91fb89 100644 Binary files a/esp32c2/libespnow.a and b/esp32c2/libespnow.a differ diff --git a/esp32c2/libnet80211.a b/esp32c2/libnet80211.a index f208a9a18..ff244cd7c 100644 Binary files a/esp32c2/libnet80211.a and b/esp32c2/libnet80211.a differ diff --git a/esp32c2/libpp.a b/esp32c2/libpp.a index 07c92318c..d07302af2 100644 Binary files a/esp32c2/libpp.a and b/esp32c2/libpp.a differ diff --git a/esp32c2/libsmartconfig.a b/esp32c2/libsmartconfig.a index 8272b9980..63b992fa9 100644 Binary files a/esp32c2/libsmartconfig.a and b/esp32c2/libsmartconfig.a differ diff --git a/esp32c3/libcore.a b/esp32c3/libcore.a index 1263be4da..5e0e7c77e 100644 Binary files a/esp32c3/libcore.a and b/esp32c3/libcore.a differ diff --git a/esp32c3/libespnow.a b/esp32c3/libespnow.a index 26b118018..3f5a36c9e 100644 Binary files a/esp32c3/libespnow.a and b/esp32c3/libespnow.a differ diff --git a/esp32c3/libmesh.a b/esp32c3/libmesh.a index aedeb3c9e..f0bc18822 100644 Binary files a/esp32c3/libmesh.a and b/esp32c3/libmesh.a differ diff --git a/esp32c3/libnet80211.a b/esp32c3/libnet80211.a index 6a441e216..934e5922d 100644 Binary files a/esp32c3/libnet80211.a and b/esp32c3/libnet80211.a differ diff --git a/esp32c3/libpp.a b/esp32c3/libpp.a index f4b51456b..4769bb5ac 100644 Binary files a/esp32c3/libpp.a and b/esp32c3/libpp.a differ diff --git a/esp32c3/libsmartconfig.a b/esp32c3/libsmartconfig.a index 9479f1bde..3023896c9 100644 Binary files a/esp32c3/libsmartconfig.a and b/esp32c3/libsmartconfig.a differ diff --git a/esp32c3/libwapi.a b/esp32c3/libwapi.a index a70b13408..ceeaa58e3 100644 Binary files a/esp32c3/libwapi.a and b/esp32c3/libwapi.a differ diff --git a/esp32c5/libcore.a b/esp32c5/libcore.a index 4a45fd205..e42009c52 100644 Binary files a/esp32c5/libcore.a and b/esp32c5/libcore.a differ diff --git a/esp32c5/libespnow.a b/esp32c5/libespnow.a index c3ea47074..09961e2f8 100644 Binary files a/esp32c5/libespnow.a and b/esp32c5/libespnow.a differ diff --git a/esp32c5/libmesh.a b/esp32c5/libmesh.a index 2d9d66c96..03c008ff1 100644 Binary files a/esp32c5/libmesh.a and b/esp32c5/libmesh.a differ diff --git a/esp32c5/libnet80211.a b/esp32c5/libnet80211.a index 9b55263dd..278849418 100644 Binary files a/esp32c5/libnet80211.a and b/esp32c5/libnet80211.a differ diff --git a/esp32c5/libpp.a b/esp32c5/libpp.a index 1d0c658c5..3d2cb89f7 100644 Binary files a/esp32c5/libpp.a and b/esp32c5/libpp.a differ diff --git a/esp32c5/libsmartconfig.a b/esp32c5/libsmartconfig.a index 9d6832cdc..733a40b0e 100644 Binary files a/esp32c5/libsmartconfig.a and b/esp32c5/libsmartconfig.a differ diff --git a/esp32c5/libwapi.a b/esp32c5/libwapi.a index a70b13408..ceeaa58e3 100644 Binary files a/esp32c5/libwapi.a and b/esp32c5/libwapi.a differ diff --git a/esp32c6/libcore.a b/esp32c6/libcore.a index 1263be4da..5e0e7c77e 100644 Binary files a/esp32c6/libcore.a and b/esp32c6/libcore.a differ diff --git a/esp32c6/libespnow.a b/esp32c6/libespnow.a index 8cf259c48..aeec22f46 100644 Binary files a/esp32c6/libespnow.a and b/esp32c6/libespnow.a differ diff --git a/esp32c6/libmesh.a b/esp32c6/libmesh.a index b723b0544..68ac7d9bb 100644 Binary files a/esp32c6/libmesh.a and b/esp32c6/libmesh.a differ diff --git a/esp32c6/libnet80211.a b/esp32c6/libnet80211.a index 0e47e1d1d..4f0f56c81 100644 Binary files a/esp32c6/libnet80211.a and b/esp32c6/libnet80211.a differ diff --git a/esp32c6/libpp.a b/esp32c6/libpp.a index 1395ecbbe..6c4d267e1 100644 Binary files a/esp32c6/libpp.a and b/esp32c6/libpp.a differ diff --git a/esp32c6/libsmartconfig.a b/esp32c6/libsmartconfig.a index b1d20c8f4..abfbbead5 100644 Binary files a/esp32c6/libsmartconfig.a and b/esp32c6/libsmartconfig.a differ diff --git a/esp32c6/libwapi.a b/esp32c6/libwapi.a index a70b13408..ceeaa58e3 100644 Binary files a/esp32c6/libwapi.a and b/esp32c6/libwapi.a differ diff --git a/esp32c61/libcore.a b/esp32c61/libcore.a index 4a45fd205..e42009c52 100644 Binary files a/esp32c61/libcore.a and b/esp32c61/libcore.a differ diff --git a/esp32c61/libespnow.a b/esp32c61/libespnow.a index 8cf259c48..aeec22f46 100644 Binary files a/esp32c61/libespnow.a and b/esp32c61/libespnow.a differ diff --git a/esp32c61/libmesh.a b/esp32c61/libmesh.a index b723b0544..68ac7d9bb 100644 Binary files a/esp32c61/libmesh.a and b/esp32c61/libmesh.a differ diff --git a/esp32c61/libnet80211.a b/esp32c61/libnet80211.a index 2d2000686..9bc6e2f6d 100644 Binary files a/esp32c61/libnet80211.a and b/esp32c61/libnet80211.a differ diff --git a/esp32c61/libpp.a b/esp32c61/libpp.a index 3b52c8283..2daf12dc4 100644 Binary files a/esp32c61/libpp.a and b/esp32c61/libpp.a differ diff --git a/esp32c61/libsmartconfig.a b/esp32c61/libsmartconfig.a index 8f84af74c..b81e083ca 100644 Binary files a/esp32c61/libsmartconfig.a and b/esp32c61/libsmartconfig.a differ diff --git a/esp32c61/libwapi.a b/esp32c61/libwapi.a index a70b13408..ceeaa58e3 100644 Binary files a/esp32c61/libwapi.a and b/esp32c61/libwapi.a differ diff --git a/esp32s2/libcore.a b/esp32s2/libcore.a index 0a5ead140..22b1f1de8 100644 Binary files a/esp32s2/libcore.a and b/esp32s2/libcore.a differ diff --git a/esp32s2/libespnow.a b/esp32s2/libespnow.a index 1bed1e9f3..064504e8a 100644 Binary files a/esp32s2/libespnow.a and b/esp32s2/libespnow.a differ diff --git a/esp32s2/libmesh.a b/esp32s2/libmesh.a index 95d38346a..ccc75a438 100644 Binary files a/esp32s2/libmesh.a and b/esp32s2/libmesh.a differ diff --git a/esp32s2/libnet80211.a b/esp32s2/libnet80211.a index 507edac24..e8cfb9051 100644 Binary files a/esp32s2/libnet80211.a and b/esp32s2/libnet80211.a differ diff --git a/esp32s2/libpp.a b/esp32s2/libpp.a index f8faf09eb..08208f7d4 100644 Binary files a/esp32s2/libpp.a and b/esp32s2/libpp.a differ diff --git a/esp32s2/libsmartconfig.a b/esp32s2/libsmartconfig.a index 939026cf2..8be0f014a 100644 Binary files a/esp32s2/libsmartconfig.a and b/esp32s2/libsmartconfig.a differ diff --git a/esp32s2/libwapi.a b/esp32s2/libwapi.a index fdcedc47c..aa6454bf8 100644 Binary files a/esp32s2/libwapi.a and b/esp32s2/libwapi.a differ diff --git a/esp32s3/libcore.a b/esp32s3/libcore.a index b25b85466..11da7007b 100644 Binary files a/esp32s3/libcore.a and b/esp32s3/libcore.a differ diff --git a/esp32s3/libespnow.a b/esp32s3/libespnow.a index 9d8fb524a..ffaa06227 100644 Binary files a/esp32s3/libespnow.a and b/esp32s3/libespnow.a differ diff --git a/esp32s3/libmesh.a b/esp32s3/libmesh.a index 5d5aa6771..ec2a7aeb4 100644 Binary files a/esp32s3/libmesh.a and b/esp32s3/libmesh.a differ diff --git a/esp32s3/libnet80211.a b/esp32s3/libnet80211.a index cc0ec37c7..13cf86b63 100644 Binary files a/esp32s3/libnet80211.a and b/esp32s3/libnet80211.a differ diff --git a/esp32s3/libpp.a b/esp32s3/libpp.a index e62ac0019..aca6743ba 100644 Binary files a/esp32s3/libpp.a and b/esp32s3/libpp.a differ diff --git a/esp32s3/libsmartconfig.a b/esp32s3/libsmartconfig.a index 03f72a632..5761e3657 100644 Binary files a/esp32s3/libsmartconfig.a and b/esp32s3/libsmartconfig.a differ diff --git a/esp32s3/libwapi.a b/esp32s3/libwapi.a index b3b2a7940..e7cef4bbd 100644 Binary files a/esp32s3/libwapi.a and b/esp32s3/libwapi.a differ diff --git a/update_lib.sh b/update_lib.sh new file mode 100755 index 000000000..e88fab133 --- /dev/null +++ b/update_lib.sh @@ -0,0 +1,75 @@ +#!/bin/bash +if [ $1 != "update" -a $1 != "rebase" ]; then + echo $0 update commit_id [path] + echo $0 rebase commit_id [path] + exit 1 +fi + +cmd=$1 +if [ -z $2 ]; then + echo wrong commit_id $2 + exit 1 +fi +SHA=$2 + +LIB_PATH=$3 +if [ -z $3 ]; then + LIB_PATH=/mnt/software_output23/esp32_rtos_sdk_core +fi + +result=$(find $LIB_PATH -name *$SHA -print -quit | head -n 1) +echo find $SHA in $result +suffix="${result##*/}" +IFS="^" read -r sbranch tbranch mr_number commit_id <<< "$suffix" +sbranch="${sbranch//\~/\/}" +if [ $tbranch == "ng_net80211" ]; then + tbranch=master +fi +if [ $commit_id != $SHA ];then + echo commit id $commit_id does not match $SHA + exit 1 +fi +echo source branch is $sbranch +echo target branch is $tbranch +echo VNC MR number $mr_number +echo VNC commit SHA is $commit_id + +if [ $cmd == "rebase" ]; then + cd .. + echo change to esp-idf dir $(pwd) + git pull + git checkout $tbranch + git pull origin $tbranch + git checkout $sbranch + cd lib + echo change to wifi-lib dir $(pwd) +fi + +echo checkout $tbranch +git checkout $tbranch +echo pull origin $tbranch +git pull origin $tbranch +echo delete branch $sbranch +git branch -D $sbranch +echo checkout $sbranch on $tbranch +git checkout -b $sbranch +echo cp $result to local +cp $result/* . -rf +./fix_printf.sh +commit_message=$(cat $result/MR_TITLE | head -n 1) +commit_message=$commit_message" VNC MR"$mr_number" ("$commit_id")" +echo $commit_message +git commit -am "$commit_message" +rm MR_TITLE + + +if [ $cmd == "rebase" ]; then + cd .. + echo change to esp-idf dir $(pwd) + git commit -a --amend + git rebase $sbranch + cd lib + echo change to wifi-lib dir $(pwd) +fi + +echo please notice that $sbranch for wifi-lib and esp-idf not pushed to gitlab, please do the push manully.