diff --git a/esp32/libcoexist.a b/esp32/libcoexist.a
index d7409a196..b90e6e384 100644
Binary files a/esp32/libcoexist.a and b/esp32/libcoexist.a differ
diff --git a/esp32/libcore.a b/esp32/libcore.a
index 2708a8d32..63e091c75 100644
Binary files a/esp32/libcore.a and b/esp32/libcore.a differ
diff --git a/esp32/libespnow.a b/esp32/libespnow.a
index 2a2764986..bddb8018d 100644
Binary files a/esp32/libespnow.a and b/esp32/libespnow.a differ
diff --git a/esp32/libmesh.a b/esp32/libmesh.a
index ac6835957..551803726 100644
Binary files a/esp32/libmesh.a and b/esp32/libmesh.a differ
diff --git a/esp32/libnet80211.a b/esp32/libnet80211.a
index dde5c99c5..40e2a4ab2 100644
Binary files a/esp32/libnet80211.a and b/esp32/libnet80211.a differ
diff --git a/esp32/libpp.a b/esp32/libpp.a
index b0984dde1..8269b6980 100644
Binary files a/esp32/libpp.a and b/esp32/libpp.a differ
diff --git a/esp32/libsmartconfig.a b/esp32/libsmartconfig.a
index 5214a9efc..b17b8f27e 100644
Binary files a/esp32/libsmartconfig.a and b/esp32/libsmartconfig.a differ
diff --git a/esp32c3/libcoexist.a b/esp32c3/libcoexist.a
index 4ad39d863..834a55c8e 100644
Binary files a/esp32c3/libcoexist.a and b/esp32c3/libcoexist.a differ
diff --git a/esp32c3/libcore.a b/esp32c3/libcore.a
index 3622ce54a..f027525d0 100644
Binary files a/esp32c3/libcore.a and b/esp32c3/libcore.a differ
diff --git a/esp32c3/libespnow.a b/esp32c3/libespnow.a
index 069a65d21..a9cd7a05a 100644
Binary files a/esp32c3/libespnow.a and b/esp32c3/libespnow.a differ
diff --git a/esp32c3/libmesh.a b/esp32c3/libmesh.a
index 46bd3967a..70f16f3eb 100644
Binary files a/esp32c3/libmesh.a and b/esp32c3/libmesh.a differ
diff --git a/esp32c3/libnet80211.a b/esp32c3/libnet80211.a
index 56ca55583..54d38caeb 100644
Binary files a/esp32c3/libnet80211.a and b/esp32c3/libnet80211.a differ
diff --git a/esp32c3/libpp.a b/esp32c3/libpp.a
index 7349261a0..39e9eedbd 100644
Binary files a/esp32c3/libpp.a and b/esp32c3/libpp.a differ
diff --git a/esp32c3/libsmartconfig.a b/esp32c3/libsmartconfig.a
index e4cd11033..4f1a310a7 100644
Binary files a/esp32c3/libsmartconfig.a and b/esp32c3/libsmartconfig.a differ
diff --git a/esp32s2/libcoexist.a b/esp32s2/libcoexist.a
index e576f05cd..4861edbc6 100644
Binary files a/esp32s2/libcoexist.a and b/esp32s2/libcoexist.a differ
diff --git a/esp32s2/libcore.a b/esp32s2/libcore.a
index 870c5adc0..0f7a1072a 100644
Binary files a/esp32s2/libcore.a and b/esp32s2/libcore.a differ
diff --git a/esp32s2/libespnow.a b/esp32s2/libespnow.a
index 4098e7fae..bf853dabe 100644
Binary files a/esp32s2/libespnow.a and b/esp32s2/libespnow.a differ
diff --git a/esp32s2/libmesh.a b/esp32s2/libmesh.a
index 6f88be39a..481ff9612 100644
Binary files a/esp32s2/libmesh.a and b/esp32s2/libmesh.a differ
diff --git a/esp32s2/libnet80211.a b/esp32s2/libnet80211.a
index 2d99b6054..151871dd1 100644
Binary files a/esp32s2/libnet80211.a and b/esp32s2/libnet80211.a differ
diff --git a/esp32s2/libpp.a b/esp32s2/libpp.a
index 270660c6a..20daf6292 100644
Binary files a/esp32s2/libpp.a and b/esp32s2/libpp.a differ
diff --git a/esp32s2/libsmartconfig.a b/esp32s2/libsmartconfig.a
index 1be0b8332..f9cf1ee68 100644
Binary files a/esp32s2/libsmartconfig.a and b/esp32s2/libsmartconfig.a differ
diff --git a/fix_printf.sh b/fix_printf.sh
index 8737da531..8699de90f 100755
--- a/fix_printf.sh
+++ b/fix_printf.sh
@@ -1,115 +1,67 @@
 #!/bin/bash
-for dir in esp32 esp32s2; do
+for dir in esp32 esp32s2 esp32c3; do
+    if [ $dir = esp32 ]; then
+        TOOLCHAIN="xtensa-esp32-elf"
+    elif [ $dir = esp32s2 ]; then
+        TOOLCHAIN="xtensa-esp32s2-elf"
+    elif [ $dir = esp32c3 ]; then
+        TOOLCHAIN="riscv32-esp-elf"
+    else
+        echo "$dir does not exist"
+    fi
     if [ -d "$dir" ]; then
         cd $dir
         git status libphy.a | grep "modified" >/dev/null 2>&1
         if [ $? -eq 0 ]; then
             echo $dir/libphy.a fixed
-            xtensa-esp32-elf-objcopy --redefine-sym ets_printf=phy_printf libphy.a
+            $TOOLCHAIN-objcopy --redefine-sym ets_printf=phy_printf libphy.a
         fi
 
-        git status librtc.a | grep "modified" >/dev/null 2>&1
-        if [ $? -eq 0 ]; then
-            echo $dir/librtc.a fixed
-            xtensa-esp32-elf-objcopy --redefine-sym ets_printf=rtc_printf librtc.a
+        if [ $dir = esp32 ] || [ $dir = esp32s2 ]; then
+            git status librtc.a | grep "modified" >/dev/null 2>&1
+            if [ $? -eq 0 ]; then
+                echo $dir/librtc.a fixed
+                $TOOLCHAIN-objcopy --redefine-sym ets_printf=rtc_printf librtc.a
+            fi
         fi
 
         git status libsmartconfig.a | grep "modified" >/dev/null 2>&1
         if [ $? -eq 0 ]; then
             echo $dir/libsmartconfig.a fixed
-            xtensa-esp32-elf-objcopy --redefine-sym printf=sc_printf libsmartconfig.a
+            $TOOLCHAIN-objcopy --redefine-sym printf=sc_printf libsmartconfig.a
         fi
 
         git status libpp.a | grep "modified" >/dev/null 2>&1
         if [ $? -eq 0 ]; then
             echo $dir/libpp.a fixed
-            xtensa-esp32-elf-objcopy --redefine-sym printf=pp_printf libpp.a
+            $TOOLCHAIN-objcopy --redefine-sym printf=pp_printf libpp.a
         fi
 
         git status libnet80211.a | grep "modified" >/dev/null 2>&1
         if [ $? -eq 0 ]; then
             echo $dir/libnet80211.a fixed
-            xtensa-esp32-elf-objcopy --redefine-sym printf=net80211_printf libnet80211.a
+            $TOOLCHAIN-objcopy --redefine-sym printf=net80211_printf libnet80211.a
         fi
 
         git status libmesh.a | grep "modified" >/dev/null 2>&1
         if [ $? -eq 0 ]; then
             echo $dir/libmesh.a fixed
-            xtensa-esp32-elf-objcopy --redefine-sym printf=mesh_printf libmesh.a
-            xtensa-esp32-elf-objcopy --redefine-sym ets_printf=mesh_printf libmesh.a
+            $TOOLCHAIN-objcopy --redefine-sym printf=mesh_printf libmesh.a
+            $TOOLCHAIN-objcopy --redefine-sym ets_printf=mesh_printf libmesh.a
         fi
 
         git status libcore.a | grep "modified" >/dev/null 2>&1
         if [ $? -eq 0 ]; then
             echo $dir/libcore.a fixed
-            xtensa-esp32-elf-objcopy --redefine-sym printf=core_printf libcore.a
-            xtensa-esp32-elf-objcopy --redefine-sym ets_printf=core_printf libcore.a
+            $TOOLCHAIN-objcopy --redefine-sym printf=core_printf libcore.a
+            $TOOLCHAIN-objcopy --redefine-sym ets_printf=core_printf libcore.a
         fi
 
         git status libcoexist.a | grep "modified" >/dev/null 2>&1
         if [ $? -eq 0 ]; then
             echo $dir/libcoexist.a fixed
-            xtensa-esp32-elf-objcopy --redefine-sym ets_printf=coexist_printf libcoexist.a
-            xtensa-esp32-elf-objcopy --redefine-sym printf=coexist_printf libcoexist.a
-        fi
-        cd ..
-    else
-        echo "$dir does not exist"
-    fi
-done;
-
-for dir in esp32c3; do
-    if [ -d "$dir" ]; then
-        cd $dir
-        git status libphy.a | grep "modified" >/dev/null 2>&1
-        if [ $? -eq 0 ]; then
-            echo $dir/libphy.a fixed
-            riscv32-esp-elf-objcopy --redefine-sym ets_printf=phy_printf libphy.a
-        fi
-
-        git status librtc.a | grep "modified" >/dev/null 2>&1
-        if [ $? -eq 0 ]; then
-            echo $dir/librtc.a fixed
-            riscv32-esp-elf-objcopy --redefine-sym ets_printf=rtc_printf librtc.a
-        fi
-
-        git status libsmartconfig.a | grep "modified" >/dev/null 2>&1
-        if [ $? -eq 0 ]; then
-            echo $dir/libsmartconfig.a fixed
-            riscv32-esp-elf-objcopy --redefine-sym printf=sc_printf libsmartconfig.a
-        fi
-
-        git status libpp.a | grep "modified" >/dev/null 2>&1
-        if [ $? -eq 0 ]; then
-            echo $dir/libpp.a fixed
-            riscv32-esp-elf-objcopy --redefine-sym printf=pp_printf libpp.a
-        fi
-
-        git status libnet80211.a | grep "modified" >/dev/null 2>&1
-        if [ $? -eq 0 ]; then
-            echo $dir/libnet80211.a fixed
-            riscv32-esp-elf-objcopy --redefine-sym printf=net80211_printf libnet80211.a
-        fi
-
-        git status libmesh.a | grep "modified" >/dev/null 2>&1
-        if [ $? -eq 0 ]; then
-            echo $dir/libmesh.a fixed
-            riscv32-esp-elf-objcopy --redefine-sym printf=mesh_printf libmesh.a
-            riscv32-esp-elf-objcopy --redefine-sym ets_printf=mesh_printf libmesh.a
-        fi
-
-        git status libcore.a | grep "modified" >/dev/null 2>&1
-        if [ $? -eq 0 ]; then
-            echo $dir/libcore.a fixed
-            riscv32-esp-elf-objcopy --redefine-sym printf=core_printf libcore.a
-            riscv32-esp-elf-objcopy --redefine-sym ets_printf=core_printf libcore.a
-        fi
-
-        git status libcoexist.a | grep "modified" >/dev/null 2>&1
-        if [ $? -eq 0 ]; then
-            echo $dir/libcoexist.a fixed
-            riscv32-esp-elf-objcopy --redefine-sym ets_printf=coexist_printf libcoexist.a
-            riscv32-esp-elf-objcopy --redefine-sym printf=coexist_printf libcoexist.a
+            $TOOLCHAIN-objcopy --redefine-sym ets_printf=coexist_printf libcoexist.a
+            $TOOLCHAIN-objcopy --redefine-sym printf=coexist_printf libcoexist.a
         fi
         cd ..
     else