merge ESP32S2BETA WiFi libraries to master branch(af6bf136)

.gitlab-ci.yml

@@ -12,20 +12,20 @@ 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
-    - grep $GIT_COMMIT_ID libcoexist.a
-    - grep $GIT_COMMIT_ID libcore.a
-    - grep $GIT_COMMIT_ID libespnow.a
-    - grep $GIT_COMMIT_ID libespnow.a
-    - grep $GIT_COMMIT_ID libnet80211.a
-    - grep $GIT_COMMIT_ID libpp.a
-    - grep $GIT_COMMIT_ID libsmartconfig.a
-    - grep $GIT_COMMIT_ID-remote libnet80211.a
-    - test $(grep $GIT_COMMIT_ID-dirty *.a | wc -l) -eq 0
-    - test $(xtensa-esp32-elf-nm *.a | grep -w printf | wc -l) -eq 0
-    - test $(xtensa-esp32-elf-nm *.a | grep -w ets_printf | wc -l) -eq 0
-    - if [ -e libwps.a ]; then exit 1; fi
-    - if [ -e libwpa.a ]; then exit 1; fi
-    - if [ -e libwpa2.a ]; then exit 1; fi
+    - for dir in esp32 esp32s2beta; do grep $GIT_COMMIT_ID $dir/libcoexist.a; done;
+    - for dir in esp32 esp32s2beta; do grep $GIT_COMMIT_ID $dir/libcore.a; done;
+    - for dir in esp32 esp32s2beta; do grep $GIT_COMMIT_ID $dir/libespnow.a; done;
+    - for dir in esp32 esp32s2beta; do grep $GIT_COMMIT_ID $dir/libespnow.a; done;
+    - for dir in esp32 esp32s2beta; do grep $GIT_COMMIT_ID $dir/libnet80211.a; done;
+    - for dir in esp32 esp32s2beta; do grep $GIT_COMMIT_ID $dir/libpp.a; done;
+    - for dir in esp32 esp32s2beta; do grep $GIT_COMMIT_ID $dir/libsmartconfig.a; done;
+    - for dir in esp32 esp32s2beta; do grep $GIT_COMMIT_ID-remote $dir/libnet80211.a; done;
+    - for dir in esp32 esp32s2beta; do test $(grep $GIT_COMMIT_ID-dirty $dir/*.a | wc -l) -eq 0; done;
+    - for dir in esp32 esp32s2beta; do test $(xtensa-esp32-elf-nm $dir/*.a | grep -w printf | wc -l) -eq 0; done;
+    - for dir in esp32 esp32s2beta; do test $(xtensa-esp32-elf-nm $dir/*.a | grep -w ets_printf | wc -l) -eq 0; done;
+    - for dir in esp32 esp32s2beta; do if [ -e $dir/libwps.a ]; then exit 1; fi; done;
+    - for dir in esp32 esp32s2beta; do if [ -e $dir/libwpa.a ]; then exit 1; fi; done;
+    - for dir in esp32 esp32s2beta; do if [ -e $dir/libwpa2.a ]; then exit 1; fi; done;
 
 
 push_master_to_github:

README.rst

@@ -1,7 +1,7 @@
 ESP32 WiFi Stack Libraries
 ====================
 
-This repository contains binary libraries supporting the ESP32 RF subsystems. It is used as a submodule within `Espressif IoT Development Framework`_ (ESP-IDF).
+This repository contains binary libraries supporting the ESP32 series RF subsystems. It is used as a submodule within `Espressif IoT Development Framework`_ (ESP-IDF).
 
 Files in this repository are Copyright (C) 2015-2016 Espressif Systems.
 

fix_printf.sh

@@ -1,10 +1,24 @@
 #!/bin/bash
-xtensa-esp32-elf-objcopy --redefine-sym ets_printf=phy_printf libphy.a 
-xtensa-esp32-elf-objcopy --redefine-sym ets_printf=rtc_printf librtc.a 
-xtensa-esp32-elf-objcopy --redefine-sym printf=sc_printf libsmartconfig.a 
-xtensa-esp32-elf-objcopy --redefine-sym printf=pp_printf libpp.a 
-xtensa-esp32-elf-objcopy --redefine-sym printf=net80211_printf libnet80211.a 
-xtensa-esp32-elf-objcopy --redefine-sym printf=core_printf libcore.a 
-xtensa-esp32-elf-objcopy --redefine-sym ets_printf=core_printf libcore.a 
-xtensa-esp32-elf-objcopy --redefine-sym ets_printf=coexist_printf libcoexist.a
-xtensa-esp32-elf-objcopy --redefine-sym printf=coexist_printf libcoexist.a
+for dir in esp32 esp32s2beta; do
+    if [ -d "$dir" ]; then
+        cd $dir
+        if [ $dir == esp32 ]; then
+            xtensa-esp32-elf-objcopy --redefine-sym ets_printf=phy_printf libphy.a 
+        elif [ $dir == esp32s2beta ]; then
+            xtensa-esp32-elf-objcopy --redefine-sym ets_printf=phy_printf libphyA.a
+            xtensa-esp32-elf-objcopy --redefine-sym ets_printf=phy_printf libphyB.a
+            xtensa-esp32-elf-objcopy --redefine-sym ets_printf=phy_printf libphy_marlin3.a
+        fi
+        xtensa-esp32-elf-objcopy --redefine-sym ets_printf=rtc_printf librtc.a 
+        xtensa-esp32-elf-objcopy --redefine-sym printf=sc_printf libsmartconfig.a 
+        xtensa-esp32-elf-objcopy --redefine-sym printf=pp_printf libpp.a 
+        xtensa-esp32-elf-objcopy --redefine-sym printf=net80211_printf libnet80211.a 
+        xtensa-esp32-elf-objcopy --redefine-sym printf=core_printf libcore.a 
+        xtensa-esp32-elf-objcopy --redefine-sym ets_printf=core_printf libcore.a 
+        xtensa-esp32-elf-objcopy --redefine-sym ets_printf=coexist_printf libcoexist.a
+        xtensa-esp32-elf-objcopy --redefine-sym printf=coexist_printf libcoexist.a
+        cd ..
+    else
+        echo "$dir does not exist"
+    fi
+done;