diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml
index b11d35087..889062099 100644
--- a/.github/workflows/workflow.yaml
+++ b/.github/workflows/workflow.yaml
@@ -160,8 +160,6 @@ jobs:
             variant: default
           - platform: OpenBK7231N
             variant: default
-          - platform: OpenBK7238
-            variant: default
           - platform: OpenXR809
             variant: default
           - platform: OpenXR806
@@ -212,9 +210,6 @@ jobs:
             variant: irRemoteESP
           - platform: OpenBK7231N
             variant: sensors
-          
-          - platform: OpenBK7238
-            variant: berry
 
           - platform: OpenBL602
             variant: berry
@@ -321,10 +316,67 @@ jobs:
             output/${{ needs.refs.outputs.version }}${{ matrix.variant != 'default' && '_' || '' }}${{ matrix.variant != 'default' && matrix.variant || '' }}/${{ matrix.platform }}_${{ needs.refs.outputs.version }}${{ matrix.variant != 'default' && '_' || '' }}${{ matrix.variant != 'default' && matrix.variant || '' }}.factory.bin
           if-no-files-found: warn
 
+  build_beken:
+    name: Build beken alt
+    needs: refs
+    runs-on: ubuntu-22.04
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          # default for all platforms
+          - platform: OpenBK7231N_ALT
+            variant: default
+          - platform: OpenBK7231T_ALT
+            variant: default
+          - platform: OpenBK7231U
+            variant: default
+          - platform: OpenBK7238
+            variant: default
+          - platform: OpenBK7252
+            variant: default
+          - platform: OpenBK7252N
+            variant: default
+          
+          - platform: OpenBK7238
+            variant: berry
+    steps:
+      - name: Source checkout
+        uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.8'
+          architecture: 'x64'
+      - name: Install dependencies
+        run: |
+          sudo dpkg --add-architecture i386
+          sudo apt-get update
+          sudo apt-get -y install libc6-i386 make
+          pip3 install pycryptodomex
+          pip3 install configobj
+          pip3 install toml
+          pip3 install fdt
+      - run: ls -la
+      - name: Run make
+        run: make APP_VERSION=${{ needs.refs.outputs.version }}${{ matrix.variant != 'default' && '_' || '' }}${{ matrix.variant != 'default' && matrix.variant || '' }} APP_NAME=${{ matrix.platform }} VARIANT="${{ matrix.variant }}" ${{ matrix.platform }}
+      - name: Save build assets
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ env.APP_NAME }}_${{ needs.refs.outputs.version }}_${{ matrix.platform }}${{ matrix.variant != 'default' && '_' || '' }}${{ matrix.variant != 'default' && matrix.variant || '' }}
+          path: |
+            output/${{ needs.refs.outputs.version }}${{ matrix.variant != 'default' && '_' || '' }}${{ matrix.variant != 'default' && matrix.variant || '' }}/${{ matrix.platform }}_UA_${{ needs.refs.outputs.version }}${{ matrix.variant != 'default' && '_' || '' }}${{ matrix.variant != 'default' && matrix.variant || '' }}.bin
+            output/${{ needs.refs.outputs.version }}${{ matrix.variant != 'default' && '_' || '' }}${{ matrix.variant != 'default' && matrix.variant || '' }}/${{ matrix.platform }}_UG_${{ needs.refs.outputs.version }}${{ matrix.variant != 'default' && '_' || '' }}${{ matrix.variant != 'default' && matrix.variant || '' }}.bin
+            output/${{ needs.refs.outputs.version }}${{ matrix.variant != 'default' && '_' || '' }}${{ matrix.variant != 'default' && matrix.variant || '' }}/${{ matrix.platform }}_QIO_${{ needs.refs.outputs.version }}${{ matrix.variant != 'default' && '_' || '' }}${{ matrix.variant != 'default' && matrix.variant || '' }}.bin
+            output/${{ needs.refs.outputs.version }}${{ matrix.variant != 'default' && '_' || '' }}${{ matrix.variant != 'default' && matrix.variant || '' }}/OpenBK7231M_ALT_QIO_${{ needs.refs.outputs.version }}${{ matrix.variant != 'default' && '_' || '' }}${{ matrix.variant != 'default' && matrix.variant || '' }}.bin
+            output/${{ needs.refs.outputs.version }}${{ matrix.variant != 'default' && '_' || '' }}${{ matrix.variant != 'default' && matrix.variant || '' }}/${{ matrix.platform }}_${{ needs.refs.outputs.version }}${{ matrix.variant != 'default' && '_' || '' }}${{ matrix.variant != 'default' && matrix.variant || '' }}.rbl
+            output/${{ needs.refs.outputs.version }}${{ matrix.variant != 'default' && '_' || '' }}${{ matrix.variant != 'default' && matrix.variant || '' }}/${{ matrix.platform }}_Tuya_QIO_${{ needs.refs.outputs.version }}${{ matrix.variant != 'default' && '_' || '' }}${{ matrix.variant != 'default' && matrix.variant || '' }}.bin
+            output/${{ needs.refs.outputs.version }}${{ matrix.variant != 'default' && '_' || '' }}${{ matrix.variant != 'default' && matrix.variant || '' }}/${{ matrix.platform }}_Tuya_UA_${{ needs.refs.outputs.version }}${{ matrix.variant != 'default' && '_' || '' }}${{ matrix.variant != 'default' && matrix.variant || '' }}.bin
+          if-no-files-found: warn
+
   merge:
     name: Merge Artifacts
     runs-on: ubuntu-22.04
-    needs: [refs, build, build2, build_idf]
+    needs: [refs, build, build2, build_idf, build_beken]
     #if: always() && needs.refs.outputs.new_release == 'true' && (github.ref == 'refs/heads/main' || github.ref_name == 'alpha')
     steps:
       - name: Merge Artifacts
diff --git a/.releaserc.yaml b/.releaserc.yaml
index dcf25f94d..ccc63003b 100644
--- a/.releaserc.yaml
+++ b/.releaserc.yaml
@@ -77,9 +77,12 @@ generateNotes:
         
         - BK7231T (eg WB3S, WB2S, WB2L)
         - BK7231N (eg CB2S, CB2L, WB2L_M1)
+        - BK7231S/BK7231U (eg C-8133U, HLK-B30)
         - BK7238 (eg NiceMCU, XH-CB3S)
+        - BK7252 (eg A9 cameras, for testing only! No camera driver is implemented.)
         - T34 (based on BK7231N)
         - BL2028N (based on BK7231N)
+        - CC8000 (based on BK7231U)
         - XR809 (eg XR2, XR3)
         - BL602 (eg DT-BL200, SM-028_V1.3)
         - LF686 (based on BL602)
@@ -110,51 +113,57 @@ generateNotes:
 
         ### Assets
         Refer to the following table for the usage of the various assests included in this release
-        | Platform | Usage      | Filename                                                                                                                           |
-        | ---      | ---        | ---                                                                                                                                |
-        | BK7231T  | OTA Update | [OpenBK7231T_{{version}}.rbl]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenBK7231T_{{version}}.rbl)         |
-        | BK7231T  | CCtr Flash | [OpenBK7231T_UG_{{version}}.bin]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenBK7231T_UG_{{version}}.bin)   |
-        | BK7231T  | UART Flash | [OpenBK7231T_UA_{{version}}.bin]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenBK7231T_UA_{{version}}.bin)   |
-        | BK7231T  | SPI Flash | [OpenBK7231T_QIO_{{version}}.bin]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenBK7231T_QIO_{{version}}.bin) |
-        | BK7231N  | OTA Update | [OpenBK7231N_{{version}}.rbl]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenBK7231N_{{version}}.rbl)         |
-        | BK7231N  | CCtr Flash | [OpenBK7231N_UG_{{version}}.bin]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenBK7231N_UG_{{version}}.bin)   |
-        | BK7231N  | UART Flash | [OpenBK7231N_QIO_{{version}}.bin]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenBK7231N_QIO_{{version}}.bin) |   
-        | BK7238  | OTA Update | [OpenBK7238_{{version}}.rbl]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenBK7238_{{version}}.rbl)         |
-        | BK7238  | UART Flash | [OpenBK7238_QIO_{{version}}.bin]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenBK7238_QIO_{{version}}.bin) |   
-        | XR809    |            | [OpenXR809_{{version}}.img]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenXR809_{{version}}.img)             |
-        | BL602    | UART Flash | [OpenBL602_{{version}}.bin]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenBL602_{{version}}.bin)             |
-        | BL602    | OTA Web App | [OpenBL602_{{version}}_OTA.bin.xz.ota]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenBL602_{{version}}_OTA.bin.xz.ota)             |
-        | W800     | OTA Update | [OpenW800_{{version}}_ota.img]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenW800_{{version}}_ota.img)       |
-        | W800     | UART Flash | [OpenW800_{{version}}.fls]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenW800_{{version}}.fls)               |
-        | W600     | OTA Update | [OpenW600_{{version}}_gz.img]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenW600_{{version}}_gz.img)         |
-        | W600     | UART Flash | [OpenW600_{{version}}.fls]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenW600_{{version}}.fls)               |
-        | LN882H   | OTA Update | [OpenLN882H_{{version}}_OTA.bin]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenLN882H_{{version}}_OTA.bin)   |
-        | LN882H   | UART Flash | [OpenLN882H_{{version}}.bin]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenLN882H_{{version}}.bin)           |        
-        | BK7231M  | UART Flash | [OpenBK7231M_QIO_{{version}}.bin]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenBK7231M_QIO_{{version}}.bin) |
-        | TR6260   | UART Flash | [OpenTR6260_{{version}}.bin]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenTR6260_{{version}}.bin) |
-        | RTL87X0C | UART Flash | [OpenRTL87X0C_{{version}}.bin]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenRTL87X0C_{{version}}.bin)               |
-        | RTL87X0C | OTA Update | [OpenRTL87X0C_{{version}}_ota.img]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenRTL87X0C_{{version}}_ota.img)         |   
-        | RTL8710A | UART Flash | [OpenRTL8710A_{{version}}.bin]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenRTL8710A_{{version}}.bin)               |
-        | RTL8710A | OTA Update | [OpenRTL8710A_{{version}}_ota.img]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenRTL8710A_{{version}}_ota.img)         |  
-        | RTL8710B | UART Flash | [OpenRTL8710B_{{version}}.bin]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenRTL8710B_{{version}}.bin)               |
-        | RTL8710B | OTA Update | [OpenRTL8710B_{{version}}_ota.img]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenRTL8710B_{{version}}_ota.img)         |  
-        | RTL8720D | UART Flash | [OpenRTL8720D_{{version}}.bin]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenRTL8720D_{{version}}.bin)               |
-        | RTL8720D | OTA Update | [OpenRTL8720D_{{version}}_ota.img]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenRTL8720D_{{version}}_ota.img)         |  
-        | ECR6600  | UART Flash | [OpenECR6600_{{version}}.bin]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenECR6600_{{version}}.bin)             |
-        | ECR6600  | OTA       | [OpenECR6600_{{version}}_ota.img]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenECR6600_{{version}}_ota.img)             |
-        | ESP32  | UART Flash | [OpenESP32_{{version}}.factory.bin]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenESP32_{{version}}.factory.bin) |
-        | ESP32  | OTA Flash | [OpenESP32_{{version}}.img]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenESP32_{{version}}.img) |
-        | ESP32 S2  | UART Flash | [OpenESP32S2_{{version}}.factory.bin]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenESP32S2_{{version}}.factory.bin) |
-        | ESP32 S2  | OTA Flash | [OpenESP32S2_{{version}}.img]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenESP32S2_{{version}}.img) |
-        | ESP32 S3  | UART Flash | [OpenESP32S3_{{version}}.factory.bin]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenESP32S3_{{version}}.factory.bin) |
-        | ESP32 S3  | OTA Flash | [OpenESP32S3_{{version}}.img]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenESP32S3_{{version}}.img) |
-        | ESP32 C2  | UART Flash | [OpenESP32C2_{{version}}.factory.bin]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenESP32C2_{{version}}.factory.bin) |
-        | ESP32 C2  | OTA Flash | [OpenESP32C2_{{version}}.img]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenESP32C2_{{version}}.img) |
-        | ESP32 C3  | UART Flash | [OpenESP32C3_{{version}}.factory.bin]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenESP32C3_{{version}}.factory.bin) |
-        | ESP32 C3  | OTA Flash | [OpenESP32C3_{{version}}.img]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenESP32C3_{{version}}.img) |
-        | ESP32 C6  | UART Flash | [OpenESP32C6_{{version}}.factory.bin]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenESP32C6_{{version}}.factory.bin) |
-        | ESP32 C6  | OTA Flash | [OpenESP32C6_{{version}}.img]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenESP32C6_{{version}}.img) |
-        | Win32    | - | [obkSimulator_{{version}}.zip]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/obkSimulator_{{version}}.zip) |
+        | Platform | Usage      | Filename                                                                                                                                     |
+        | ---      | ---        | ---                                                                                                                                          |
+        | BK7231T  | OTA Update | [OpenBK7231T_{{version}}.rbl]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenBK7231T_{{version}}.rbl)                   |
+        | BK7231T  | CCtr Flash | [OpenBK7231T_UG_{{version}}.bin]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenBK7231T_UG_{{version}}.bin)             |
+        | BK7231T  | UART Flash | [OpenBK7231T_UA_{{version}}.bin]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenBK7231T_UA_{{version}}.bin)             |
+        | BK7231T  | SPI Flash  | [OpenBK7231T_QIO_{{version}}.bin]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenBK7231T_QIO_{{version}}.bin)           |
+        | BK7231N  | OTA Update | [OpenBK7231N_{{version}}.rbl]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenBK7231N_{{version}}.rbl)                   |
+        | BK7231N  | CCtr Flash | [OpenBK7231N_UG_{{version}}.bin]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenBK7231N_UG_{{version}}.bin)             |
+        | BK7231N  | UART Flash | [OpenBK7231N_QIO_{{version}}.bin]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenBK7231N_QIO_{{version}}.bin)           |
+        | BK7231U  | OTA Update | [OpenBK7231U_{{version}}.rbl]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenBK7231U_{{version}}.rbl)                   |
+        | BK7231U  | UART Flash | [OpenBK7231U_UA_{{version}}.bin]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenBK7231U_UA_{{version}}.bin)             |
+        | BK7231U  | SPI Flash  | [OpenBK7231U_QIO_{{version}}.bin]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenBK7231U_QIO_{{version}}.bin)           |
+        | BK7238   | OTA Update | [OpenBK7238_{{version}}.rbl]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenBK7238_{{version}}.rbl)                     |
+        | BK7238   | UART Flash | [OpenBK7238_QIO_{{version}}.bin]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenBK7238_QIO_{{version}}.bin)             |
+        | BK7252   | OTA Update | [OpenBK7252_{{version}}.rbl]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenBK7252_{{version}}.rbl)                     |
+        | BK7252   | UART Flash | [OpenBK7252_UA_{{version}}.bin]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenBK7252_UA_{{version}}.bin)               |
+        | BK7252   | SPI Flash  | [OpenBK7252_QIO_{{version}}.bin]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenBK7252_QIO_{{version}}.bin)             |
+        | XR809    | UART Flash | [OpenXR809_{{version}}.img]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenXR809_{{version}}.img)                       |
+        | BL602    | UART Flash | [OpenBL602_{{version}}.bin]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenBL602_{{version}}.bin)                       |
+        | BL602    | OTA Update | [OpenBL602_{{version}}_OTA.bin.xz.ota]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenBL602_{{version}}_OTA.bin.xz.ota) |
+        | W800     | OTA Update | [OpenW800_{{version}}_ota.img]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenW800_{{version}}_ota.img)                 |
+        | W800     | UART Flash | [OpenW800_{{version}}.fls]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenW800_{{version}}.fls)                         |
+        | W600     | OTA Update | [OpenW600_{{version}}_gz.img]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenW600_{{version}}_gz.img)                   |
+        | W600     | UART Flash | [OpenW600_{{version}}.fls]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenW600_{{version}}.fls)                         |
+        | LN882H   | OTA Update | [OpenLN882H_{{version}}_OTA.bin]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenLN882H_{{version}}_OTA.bin)             |
+        | LN882H   | UART Flash | [OpenLN882H_{{version}}.bin]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenLN882H_{{version}}.bin)                     |
+        | BK7231M  | UART Flash | [OpenBK7231M_QIO_{{version}}.bin]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenBK7231M_QIO_{{version}}.bin)           |
+        | TR6260   | UART Flash | [OpenTR6260_{{version}}.bin]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenTR6260_{{version}}.bin)                     |
+        | RTL87X0C | UART Flash | [OpenRTL87X0C_{{version}}.bin]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenRTL87X0C_{{version}}.bin)                 |
+        | RTL87X0C | OTA Update | [OpenRTL87X0C_{{version}}_ota.img]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenRTL87X0C_{{version}}_ota.img)         |
+        | RTL8710A | JTAG Flash | [OpenRTL8710A_{{version}}.bin]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenRTL8710A_{{version}}.bin)                 |
+        | RTL8710A | OTA Update | [OpenRTL8710A_{{version}}_ota.img]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenRTL8710A_{{version}}_ota.img)         |
+        | RTL8710B | UART Flash | [OpenRTL8710B_{{version}}.bin]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenRTL8710B_{{version}}.bin)                 |
+        | RTL8710B | OTA Update | [OpenRTL8710B_{{version}}_ota.img]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenRTL8710B_{{version}}_ota.img)         |
+        | RTL8720D | UART Flash | [OpenRTL8720D_{{version}}.bin]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenRTL8720D_{{version}}.bin)                 |
+        | RTL8720D | OTA Update | [OpenRTL8720D_{{version}}_ota.img]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenRTL8720D_{{version}}_ota.img)         |
+        | ECR6600  | UART Flash | [OpenECR6600_{{version}}.bin]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenECR6600_{{version}}.bin)                   |
+        | ECR6600  | OTA Update | [OpenECR6600_{{version}}_ota.img]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenECR6600_{{version}}_ota.img)           |
+        | ESP32    | UART Flash | [OpenESP32_{{version}}.factory.bin]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenESP32_{{version}}.factory.bin)       |
+        | ESP32    | OTA Flash  | [OpenESP32_{{version}}.img]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenESP32_{{version}}.img)                       |
+        | ESP32 S2 | UART Flash | [OpenESP32S2_{{version}}.factory.bin]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenESP32S2_{{version}}.factory.bin)   |
+        | ESP32 S2 | OTA Flash  | [OpenESP32S2_{{version}}.img]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenESP32S2_{{version}}.img)                   |
+        | ESP32 S3 | UART Flash | [OpenESP32S3_{{version}}.factory.bin]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenESP32S3_{{version}}.factory.bin)   |
+        | ESP32 S3 | OTA Flash  | [OpenESP32S3_{{version}}.img]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenESP32S3_{{version}}.img)                   |
+        | ESP32 C2 | UART Flash | [OpenESP32C2_{{version}}.factory.bin]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenESP32C2_{{version}}.factory.bin)   |
+        | ESP32 C2 | OTA Flash  | [OpenESP32C2_{{version}}.img]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenESP32C2_{{version}}.img)                   |
+        | ESP32 C3 | UART Flash | [OpenESP32C3_{{version}}.factory.bin]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenESP32C3_{{version}}.factory.bin)   |
+        | ESP32 C3 | OTA Flash  | [OpenESP32C3_{{version}}.img]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenESP32C3_{{version}}.img)                   |
+        | ESP32 C6 | UART Flash | [OpenESP32C6_{{version}}.factory.bin]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenESP32C6_{{version}}.factory.bin)   |
+        | ESP32 C6 | OTA Flash  | [OpenESP32C6_{{version}}.img]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenESP32C6_{{version}}.img)                   |
+        | Win32    |            | [obkSimulator_{{version}}.zip]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/obkSimulator_{{version}}.zip)                 |
 
 
         CCtr Flash = Tuya cloud Cutter flash
@@ -162,6 +171,8 @@ generateNotes:
         BK7231M is basically a BK7231N but with 000000 encryption keys. BK7231EasyGUIFlasher will show the encryption keys and warn you if you are trying to flash BK7231N with 000000 keys.
         BK7231M binary will work also for some BL2028Ns, they are also often just a BK7231N with 000000 etc keys.
 
+        RTL8710A (RTL8711AM) can be flashed either via JTAG/SWD, or CH341A SPI.
+
         Flashing instructions are available on the project's [README.md]({{host}}/{{owner}}/{{repository}}#readme)
     preset: conventionalcommits
     presetConfig:
@@ -198,7 +209,7 @@ generateNotes:
           hidden: false
         - type: ""
           section: "Changes"
-          hidden: false          
+          hidden: false
 prepare:
   - path: "@semantic-release/git"
 publish:
diff --git a/Makefile b/Makefile
index 4330ade5c..ba8222c8e 100644
--- a/Makefile
+++ b/Makefile
@@ -135,7 +135,8 @@ sdk/OpenLN882H/project/OpenBeken/app:
 
 .PHONY: prebuild_OpenBK7231N prebuild_OpenBK7231T prebuild_OpenBL602 prebuild_OpenLN882H 
 .PHONY: prebuild_OpenW600 prebuild_OpenW800 prebuild_OpenXR809 prebuild_OpenXR806 prebuild_OpenXR872 prebuild_ESPIDF prebuild_OpenTR6260
-.PHONY: prebuild_OpenRTL87X0C prebuild_OpenBK7238 prebuild_OpenBK7231N_ALT
+.PHONY: prebuild_OpenRTL87X0C prebuild_OpenBK7238 prebuild_OpenBK7231N_ALT prebuild_OpenBK7231U
+.PHONY: prebuild_OpenBK7231N_ALT prebuild_OpenBK7231T_ALT prebuild_OpenBK7252
 
 prebuild_OpenBK7231N: berry
 	git submodule update --init --recursive --depth=1 sdk/OpenBK7231N
@@ -286,6 +287,38 @@ prebuild_OpenBK7231N_ALT: berry actions_gcc
 	else echo "prebuild for OpenBK7231N not found ... "; \
 	fi
 
+prebuild_OpenBK7231U: berry actions_gcc
+	git submodule update --init --recursive --depth=1 sdk/beken_freertos_sdk
+	@if [ -e platforms/BK723x/pre_build_7231u.sh ]; then \
+		echo "prebuild found for OpenBK7231U"; \
+		sh platforms/BK723x/pre_build_7231u.sh; \
+	else echo "prebuild for OpenBK7231U not found ... "; \
+	fi
+
+prebuild_OpenBK7231T_ALT: berry actions_gcc
+	git submodule update --init --recursive --depth=1 sdk/beken_freertos_sdk
+	@if [ -e platforms/BK723x/pre_build_7231t.sh ]; then \
+		echo "prebuild found for OpenBK7231T"; \
+		sh platforms/BK723x/pre_build_7231t.sh; \
+	else echo "prebuild for OpenBK7231T not found ... "; \
+	fi
+
+prebuild_OpenBK7252: berry actions_gcc
+	git submodule update --init --recursive --depth=1 sdk/beken_freertos_sdk
+	@if [ -e platforms/BK723x/pre_build_7252.sh ]; then \
+		echo "prebuild found for OpenBK7252"; \
+		sh platforms/BK723x/pre_build_7252.sh; \
+	else echo "prebuild for OpenBK7252 not found ... "; \
+	fi
+
+prebuild_OpenBK7252N: berry actions_gcc
+	git submodule update --init --recursive --depth=1 sdk/beken_freertos_sdk
+	@if [ -e platforms/BK723x/pre_build_7252n.sh ]; then \
+		echo "prebuild found for OpenBK7252N"; \
+		sh platforms/BK723x/pre_build_7252n.sh; \
+	else echo "prebuild for OpenBK7252N not found ... "; \
+	fi
+
 prebuild_OpenECR6600: berry
 	git submodule update --init --recursive --depth=1 sdk/OpenECR6600
 	@if [ -e platforms/ECR6600/pre_build.sh ]; then \
@@ -479,17 +512,60 @@ OpenRTL8720D: prebuild_OpenRTL8720D
 OpenBK7238: prebuild_OpenBK7238
 	cd sdk/beken_freertos_sdk && OBK_VARIANT=$(OBK_VARIANT) sh build.sh bk7238 $(APP_VERSION)
 	mkdir -p output/$(APP_VERSION)
-	cp sdk/beken_freertos_sdk/out/all_2M.1220.bin output/$(APP_VERSION)/OpenBK7238_QIO_${APP_VERSION}.bin
+	cp sdk/beken_freertos_sdk/out/bk7238.bin output/$(APP_VERSION)/OpenBK7238_${APP_VERSION}.bin
+	cp sdk/beken_freertos_sdk/out/bk7238_QIO.bin output/$(APP_VERSION)/OpenBK7238_QIO_${APP_VERSION}.bin
 	cp sdk/beken_freertos_sdk/out/app.rbl output/$(APP_VERSION)/OpenBK7238_${APP_VERSION}.rbl
-	cp sdk/beken_freertos_sdk/out/bk7238_bsp_uart_2M.1220.bin output/$(APP_VERSION)/OpenBK7238_UA_${APP_VERSION}.bin
+	cp sdk/beken_freertos_sdk/out/bk7238_UA.bin output/$(APP_VERSION)/OpenBK7238_UA_${APP_VERSION}.bin
+
+.PHONY: OpenBK7231U
+OpenBK7231U: prebuild_OpenBK7231U
+	cd sdk/beken_freertos_sdk && sh build.sh bk7231u $(APP_VERSION)
+	mkdir -p output/$(APP_VERSION)
+	cp sdk/beken_freertos_sdk/out/bk7231u_QIO.bin output/$(APP_VERSION)/OpenBK7231U_QIO_${APP_VERSION}.bin
+	cp sdk/beken_freertos_sdk/out/bk7231u.bin output/$(APP_VERSION)/OpenBK7231U_${APP_VERSION}.bin
+	cp sdk/beken_freertos_sdk/out/app.rbl output/$(APP_VERSION)/OpenBK7231U_${APP_VERSION}.rbl
+	cp sdk/beken_freertos_sdk/out/bk7231u_UA.bin output/$(APP_VERSION)/OpenBK7231U_UA_${APP_VERSION}.bin
+
+.PHONY: OpenBK7252
+OpenBK7252: prebuild_OpenBK7252
+	cd sdk/beken_freertos_sdk && sh build.sh bk7251 $(APP_VERSION)
+	mkdir -p output/$(APP_VERSION)
+	cp sdk/beken_freertos_sdk/out/bk7251.bin output/$(APP_VERSION)/OpenBK7252_${APP_VERSION}.bin
+	cp sdk/beken_freertos_sdk/out/bk7251_QIO.bin output/$(APP_VERSION)/OpenBK7252_QIO_${APP_VERSION}.bin
+	cp sdk/beken_freertos_sdk/out/app.rbl output/$(APP_VERSION)/OpenBK7252_${APP_VERSION}.rbl
+	cp sdk/beken_freertos_sdk/out/bk7251_UA.bin output/$(APP_VERSION)/OpenBK7252_UA_${APP_VERSION}.bin
+	cp sdk/beken_freertos_sdk/out/bk7251_Tuya_QIO.bin output/$(APP_VERSION)/OpenBK7252_Tuya_QIO_${APP_VERSION}.bin
+	cp sdk/beken_freertos_sdk/out/bk7251_Tuya_UA.bin output/$(APP_VERSION)/OpenBK7252_Tuya_UA_${APP_VERSION}.bin
+
+.PHONY: OpenBK7252N
+OpenBK7252N: prebuild_OpenBK7252N
+	cd sdk/beken_freertos_sdk && sh build.sh bk7252n $(APP_VERSION)
+	mkdir -p output/$(APP_VERSION)
+	cp sdk/beken_freertos_sdk/out/bk7252n.bin output/$(APP_VERSION)/OpenBK7252N_${APP_VERSION}.bin
+	cp sdk/beken_freertos_sdk/out/bk7252n_QIO.bin output/$(APP_VERSION)/OpenBK7252N_QIO_${APP_VERSION}.bin
+	cp sdk/beken_freertos_sdk/out/app.rbl output/$(APP_VERSION)/OpenBK7252N_${APP_VERSION}.rbl
+	cp sdk/beken_freertos_sdk/out/bk7252n_UA.bin output/$(APP_VERSION)/OpenBK7252N_UA_${APP_VERSION}.bin
+	#cp sdk/beken_freertos_sdk/out/bk7252n_Tuya_QIO.bin output/$(APP_VERSION)/OpenBK7252N_Tuya_QIO_${APP_VERSION}.bin
+	#cp sdk/beken_freertos_sdk/out/bk7252n_Tuya_UA.bin output/$(APP_VERSION)/OpenBK7252N_Tuya_UA_${APP_VERSION}.bin
 
 .PHONY: OpenBK7231N_ALT
 OpenBK7231N_ALT: prebuild_OpenBK7231N_ALT
 	cd sdk/beken_freertos_sdk && OBK_VARIANT=$(OBK_VARIANT) sh build.sh bk7231n $(APP_VERSION)
 	mkdir -p output/$(APP_VERSION)
-	cp sdk/beken_freertos_sdk/out/all_2M.1220.bin output/$(APP_VERSION)/OpenBK7231N_ALT_QIO_${APP_VERSION}.bin
+	cp sdk/beken_freertos_sdk/out/bk7231n_QIO.bin output/$(APP_VERSION)/OpenBK7231N_ALT_QIO_${APP_VERSION}.bin
+	cp sdk/beken_freertos_sdk/out/bk7231n.bin output/$(APP_VERSION)/OpenBK7231N_ALT_${APP_VERSION}.bin
 	cp sdk/beken_freertos_sdk/out/app.rbl output/$(APP_VERSION)/OpenBK7231N_ALT_${APP_VERSION}.rbl
-	cp sdk/beken_freertos_sdk/out/bk7231n_bsp_uart_2M.1220.bin output/$(APP_VERSION)/OpenBK7231N_ALT_UA_${APP_VERSION}.bin
+	cp sdk/beken_freertos_sdk/out/bk7231n_UA.bin output/$(APP_VERSION)/OpenBK7231N_ALT_UA_${APP_VERSION}.bin
+	cp sdk/beken_freertos_sdk/out/BK7231M_QIO.bin output/$(APP_VERSION)/OpenBK7231M_ALT_QIO_${APP_VERSION}.bin
+
+.PHONY: OpenBK7231T_ALT
+OpenBK7231T_ALT: prebuild_OpenBK7231T_ALT
+	cd sdk/beken_freertos_sdk && sh build.sh bk7231 $(APP_VERSION)
+	mkdir -p output/$(APP_VERSION)
+	cp sdk/beken_freertos_sdk/out/bk7231t_QIO.bin output/$(APP_VERSION)/OpenBK7231T_ALT_QIO_${APP_VERSION}.bin
+	cp sdk/beken_freertos_sdk/out/bk7231u.bin output/$(APP_VERSION)/OpenBK7231T_ALT_${APP_VERSION}.bin
+	cp sdk/beken_freertos_sdk/out/app.rbl output/$(APP_VERSION)/OpenBK7231T_ALT_${APP_VERSION}.rbl
+	cp sdk/beken_freertos_sdk/out/bk7231t_UA.bin output/$(APP_VERSION)/OpenBK7231T_ALT_UA_${APP_VERSION}.bin
 	
 .PHONY: OpenECR6600
 ECRDIR := $(PWD)/sdk/OpenECR6600
diff --git a/README.md b/README.md
index 9a6dc2033..5f05257fa 100644
--- a/README.md
+++ b/README.md
@@ -9,6 +9,7 @@ Although this repository is named "OpenBK7231T_App", it has evolved into a multi
 -   T34 (flash as if [standard BK7231N](https://developer.tuya.com/en/docs/iot/t34-module-datasheet?id=Ka0l4h5zvg6j8)), see [flashing trick](https://www.elektroda.com/rtvforum/topic4036975.html)
 -   BL2028N ([BL2028N is a Belon version of BK7231N](https://www.elektroda.com/rtvforum/viewtopic.php?p=20262533#20262533))
 -   BK7238 (eg XH-CB3S) (see [tutorial for 1$ board](https://www.elektroda.com/rtvforum/topic4106397.html#21440428))
+-   BK7231S/BK7231U - BK7231S is an original non-Tuya version of BK7231T. BK7231U is a version intended for cameras/displays. Usually comes with 00000000 keys. If flashing via SPI, can be updated to use BK7231T firmware built with zero keys.
 -   [XR809](https://www.elektroda.com/rtvforum/topic3806769.html) (eg [XR3](https://developer.tuya.com/en/docs/iot/xr3-datasheet?id=K98s9168qi49g)) ([Example](https://www.elektroda.com/rtvforum/topic4063735.html))
 -   [BL602](https://www.elektroda.com/rtvforum/topic3889041.html) (eg [SM-028_V1.3](https://www.elektroda.com/rtvforum/topic3945435.html), [BW2L](https://www.elektroda.com/rtvforum/topic4111244.html)), see also [BL602 flash OBK via OTA tutorial](https://www.elektroda.com/rtvforum/topic4050297.html) (Magic Home devices only)
 -   [LF686](https://www.leapfive.com/wp-content/uploads/2020/09/LF686-Datasheet.pdf) (LeapFive BL602. Flash as if [standard BL602](https://www.elektroda.com/rtvforum/topic4024917.html)). LF686/BL602 factory firmware backup/restore [guide1](https://www.elektroda.com/rtvforum/topic4108535.html) [guide2](https://www.elektroda.com/rtvforum/topic4051649.html)
diff --git a/platforms/BK723x/OpenBeken.mk b/platforms/BK723x/OpenBeken.mk
index 4bef77dea..69e335cde 100644
--- a/platforms/BK723x/OpenBeken.mk
+++ b/platforms/BK723x/OpenBeken.mk
@@ -6,15 +6,21 @@ INCLUDES += -I./fixes
 CCFLAGS += -DPLATFORM_BEKEN -DPLATFORM_BEKEN_NEW
 
 ifeq ($(CFG_SOC_NAME), 1)
-CFLAGS += -DPLATFORM_BK7231T
+CCFLAGS += -DPLATFORM_BK7231T
 else ifeq ($(CFG_SOC_NAME), 2)
+ifeq ($(SOC_BK7231T), 1)
+CCFLAGS += -DPLATFORM_BK7231T
+else
 CCFLAGS += -DPLATFORM_BK7231U
+endif
 else ifeq ($(CFG_SOC_NAME), 3)
-CCFLAGS += -DPLATFORM_BK7251
+CCFLAGS += -DPLATFORM_BK7252
 else ifeq ($(CFG_SOC_NAME), 5)
 CCFLAGS += -DPLATFORM_BK7231N
 else ifeq ($(CFG_SOC_NAME), 7)
 CCFLAGS += -DPLATFORM_BK7238
+else ifeq ($(CFG_SOC_NAME), 8)
+CCFLAGS += -DPLATFORM_BK7252N
 endif
 
 SRC_C += ./fixes/blank.c
diff --git a/platforms/BK723x/ps.c b/platforms/BK723x/ps.c
index 7d168bfe2..aafe33554 100644
--- a/platforms/BK723x/ps.c
+++ b/platforms/BK723x/ps.c
@@ -1,70 +1,6 @@
 #include "include.h"
-#include "rw_pub.h"
-#include "vif_mgmt.h"
-#include "sa_station.h"
-#include "param_config.h"
-#include "common/ieee802_11_defs.h"
-#include "driver_beken.h"
-#include "mac_ie.h"
-#include "sa_ap.h"
-#include "main_none.h"
-#include "sm.h"
-#include "mac.h"
-#include "sm_task.h"
-#include "scan_task.h"
-#include "hal_machw.h"
-#include "error.h"
-#include "lwip_netif_address.h"
-#include "lwip/inet.h"
-#include <stdbool.h>
-#include "rw_pub.h"
-#include "power_save_pub.h"
-#include "rwnx.h"
-#include "net.h"
-#include "mm_bcn.h"
-#include "mm_task.h"
-#include "mcu_ps_pub.h"
-#include "manual_ps_pub.h"
-#include "gpio_pub.h"
-#include "phy_trident.h"
-#include "rw_msg_rx.h"
-#include "app.h"
-#include "ate_app.h"
-#include "wdt_pub.h"
-#include "start_type_pub.h"
-#include "wpa_psk_cache.h"
-#include "drv_model_pub.h"
-#include "str_pub.h"
-
-#if CFG_WPA_CTRL_IFACE
-#include "wlan_defs_pub.h"
-#include "wpa_ctrl.h"
-#include "flash_pub.h"
-#endif
-
-#if CFG_ROLE_LAUNCH
-#include "role_launch.h"
-#endif
-
-#if (FAST_CONNECT_INFO_ENC_METHOD != ENC_METHOD_NULL)
-#include "soft_encrypt.h"
-#endif
-
-#if CFG_SUPPORT_OTA_HTTP
-#include "utils_httpc.h"
-#endif
-
-#include "bk7011_cal_pub.h"
-#include "target_util_pub.h"
+#include "co_math.h"
 #include "wlan_ui_pub.h"
-#if CFG_WIFI_P2P
-#include "video_demo_pub.h"
-#include "rw_ieee80211.h"
-//#include "sys.h"
-#endif
-#include "low_voltage_ps.h"
-#include "intc_pub.h"
-#include "arm_arch.h"
 
 BK_PS_LEVEL global_ps_level = 0;
 int bk_wlan_power_save_set_level(BK_PS_LEVEL level)
diff --git a/sdk/beken_freertos_sdk b/sdk/beken_freertos_sdk
index 022f4c2f2..b782aa140 160000
--- a/sdk/beken_freertos_sdk
+++ b/sdk/beken_freertos_sdk
@@ -1 +1 @@
-Subproject commit 022f4c2f25ac2f9f704f1dcfdf93eb1dbdd3e963
+Subproject commit b782aa140f605ab7e54e6dc02f653a6d88e35d4d
diff --git a/src/driver/drv_bl0937.c b/src/driver/drv_bl0937.c
index 0cc05d112..52f1157cf 100644
--- a/src/driver/drv_bl0937.c
+++ b/src/driver/drv_bl0937.c
@@ -412,6 +412,7 @@ void BL0937_RunEverySecond(void)
 	float final_p;
 	bool bNeedRestart;
 	portTickType ticksElapsed;
+	portTickType xPassedTicks;
 
 	bNeedRestart = false;
 	if(g_invertSEL)
@@ -496,9 +497,9 @@ void BL0937_RunEverySecond(void)
 #else
 
 #endif
-
-	ticksElapsed = (xTaskGetTickCount() - pulseStamp);
-	pulseStamp = xTaskGetTickCount();
+	xPassedTicks = xTaskGetTickCount();
+	ticksElapsed = (xPassedTicks - pulseStamp);
+	pulseStamp = xPassedTicks;
 	//addLogAdv(LOG_INFO, LOG_FEATURE_ENERGYMETER,"Voltage pulses %i, current %i, power %i\n", res_v, res_c, res_p);
 
 	PwrCal_Scale(res_v, res_c, res_p, &final_v, &final_c, &final_p);
diff --git a/src/driver/drv_sm15155e.c b/src/driver/drv_sm15155e.c
index cb87f4005..84dda1ea1 100644
--- a/src/driver/drv_sm15155e.c
+++ b/src/driver/drv_sm15155e.c
@@ -11,7 +11,7 @@ LED_Map 0 1 3 2 4
 
 */
 
-#if PLATFORM_BK7231N || WINDOWS
+#if (PLATFORM_BK7231N || WINDOWS) && !PLATFORM_BEKEN_NEW
 
 
 #include "../new_cfg.h"
diff --git a/src/driver/drv_sm16703P.c b/src/driver/drv_sm16703P.c
index b4d875833..924972214 100644
--- a/src/driver/drv_sm16703P.c
+++ b/src/driver/drv_sm16703P.c
@@ -1,4 +1,4 @@
-#if PLATFORM_BK7231N || WINDOWS
+#if (PLATFORM_BK7231N || WINDOWS) && !PLATFORM_BEKEN_NEW
 
 
 #include "../new_cfg.h"
diff --git a/src/driver/drv_spiLED.c b/src/driver/drv_spiLED.c
index 4ebd6e63f..72be6428b 100644
--- a/src/driver/drv_spiLED.c
+++ b/src/driver/drv_spiLED.c
@@ -1,4 +1,4 @@
-#if PLATFORM_BK7231N || WINDOWS
+#if (PLATFORM_BK7231N || WINDOWS) && !PLATFORM_BEKEN_NEW
 
 
 #include "../new_cfg.h"
diff --git a/src/hal/bk7231/hal_pins_bk7231.c b/src/hal/bk7231/hal_pins_bk7231.c
index f139a8df5..2761118d9 100644
--- a/src/hal/bk7231/hal_pins_bk7231.c
+++ b/src/hal/bk7231/hal_pins_bk7231.c
@@ -34,19 +34,19 @@ const char *HAL_PIN_GetPinNameAlias(int index)
 	// some of pins have special roles
 	switch(index)
 	{
-#ifndef PLATFORM_BK7238
-		case 1:		return "RXD2";
-		case 10:	return "RXD1";
-		case 23:	return "ADC3";
-		case 24:	return "PWM4";
-		case 26:	return "PWM5";
-#else
+#if PLATFORM_BK7238
 		case 1:		return "RXD2/ADC5";
 		case 10:	return "RXD1/ADC6";
 		case 26:	return "PWM5/ADC1";
 		case 24:	return "PWM4/ADC2";
 		case 20:	return "ADC3";
 		case 28:	return "ADC4";
+#else
+		case 1:		return "RXD2";
+		case 10:	return "RXD1";
+		case 23:	return "ADC3";
+		case 24:	return "PWM4";
+		case 26:	return "PWM5";
 #endif
 		case 0:		return "TXD2";
 		case 11:	return "TXD1";
diff --git a/src/hal/bk7231/hal_wifi_bk7231.c b/src/hal/bk7231/hal_wifi_bk7231.c
index 438de5ccd..7954b4944 100644
--- a/src/hal/bk7231/hal_wifi_bk7231.c
+++ b/src/hal/bk7231/hal_wifi_bk7231.c
@@ -24,7 +24,7 @@
 #define SECURITY_TYPE_WPA2_AES		BK_SECURITY_TYPE_WPA2_AES
 #define SECURITY_TYPE_WPA2_MIXED	BK_SECURITY_TYPE_WPA2_MIXED
 #define SECURITY_TYPE_AUTO			BK_SECURITY_TYPE_AUTO
-
+#define RW_EVT_STA_CONNECT_FAILED	RW_EVT_STA_AUTH_FAILED
 #endif
 
 //extern int pbkdf2_sha1(const char* passphrase, const u8* ssid, size_t ssid_len,
@@ -280,7 +280,14 @@ void wl_status(void* ctxt)
 	case RW_EVT_STA_PASSWORD_WRONG:
 	case RW_EVT_STA_NO_AP_FOUND:
 	case RW_EVT_STA_ASSOC_FULL:
+#ifdef PLATFORM_BEKEN_NEW
+	case RW_EVT_STA_DEAUTH:
+	case RW_EVT_STA_DISASSOC:
+	case RW_EVT_STA_ASSOC_FAILED:
+	case RW_EVT_STA_ACTIVE_DISCONNECTED:
+#else
 	case RW_EVT_STA_DISCONNECTED:    /* disconnect with server */
+#endif
 		if (g_wifiStatusCallback != 0) {
 			g_wifiStatusCallback(WIFI_STA_DISCONNECTED);
 		}
diff --git a/src/httpserver/new_tcp_server.c b/src/httpserver/new_tcp_server.c
index 502d07db2..4b16e0ed8 100644
--- a/src/httpserver/new_tcp_server.c
+++ b/src/httpserver/new_tcp_server.c
@@ -42,11 +42,8 @@ static void tcp_client_thread(tcp_thread_t* arg)
 	char* reply = NULL;
 	int replyBufferSize = REPLY_BUFFER_SIZE;
 
-	GLOBAL_INT_DECLARATION();
-	GLOBAL_INT_DISABLE();
 	reply = (char*)os_malloc(replyBufferSize);
 	buf = (char*)os_malloc(INCOMING_BUFFER_SIZE);
-	GLOBAL_INT_RESTORE();
 
 	if(buf == 0 || reply == 0)
 	{
@@ -76,9 +73,7 @@ static void tcp_client_thread(tcp_thread_t* arg)
 		}
 		// grow by INCOMING_BUFFER_SIZE
 		request.receivedLenmax += INCOMING_BUFFER_SIZE;
-		GLOBAL_INT_DISABLE();
 		request.received = (char*)realloc(request.received, request.receivedLenmax + 2);
-		GLOBAL_INT_RESTORE();
 		if(request.received == NULL)
 		{
 			// no memory
@@ -110,12 +105,10 @@ static void tcp_client_thread(tcp_thread_t* arg)
 	}
 
 exit:
-	GLOBAL_INT_DISABLE();
 	if(buf != NULL)
 		os_free(buf);
 	if(reply != NULL)
 		os_free(reply);
-	GLOBAL_INT_RESTORE();
 
 	lwip_close(fd);
 	arg->isCompleted = true;
@@ -298,6 +291,7 @@ error:
 			sock[i].fd = INVALID_SOCK;
 		}
 	}
+	rtos_delay_milliseconds(2000);
 	xTaskCreate(
 		(TaskFunction_t)restart_tcp_server,
 		"TCP Restart",
diff --git a/src/new_common.h b/src/new_common.h
index e01a2756d..ffec98cfa 100644
--- a/src/new_common.h
+++ b/src/new_common.h
@@ -73,6 +73,21 @@ void OTA_RequestDownloadFromHTTP(const char *s);
 #define DEVICENAME_PREFIX_SHORT "obk"
 #define PLATFORM_MCU_NAME "BK7238"
 #define MANUFACTURER "Beken Corporation"
+#elif PLATFORM_BK7231U
+#define DEVICENAME_PREFIX_FULL "OpenBK7231U"
+#define DEVICENAME_PREFIX_SHORT "obk"
+#define PLATFORM_MCU_NAME "BK7231U"
+#define MANUFACTURER "Beken Corporation"
+#elif PLATFORM_BK7252
+#define DEVICENAME_PREFIX_FULL "OpenBK7252"
+#define DEVICENAME_PREFIX_SHORT "obk"
+#define PLATFORM_MCU_NAME "BK7252"
+#define MANUFACTURER "Beken Corporation"
+#elif PLATFORM_BK7252N
+#define DEVICENAME_PREFIX_FULL "OpenBK7252N"
+#define DEVICENAME_PREFIX_SHORT "obk"
+#define PLATFORM_MCU_NAME "BK7252N"
+#define MANUFACTURER "Beken Corporation"
 #elif PLATFORM_BL602
 #define DEVICENAME_PREFIX_FULL "OpenBL602"
 #define DEVICENAME_PREFIX_SHORT "obl"
@@ -184,6 +199,12 @@ This platform is not supported, error!
 #define USER_SW_VER "RTL8720D_Test"
 #elif defined(PLATFORM_BK7238)
 #define USER_SW_VER "BK7238_Test"
+#elif defined(PLATFORM_BK7231U)
+#define USER_SW_VER "BK7231U_Test"
+#elif defined(PLATFORM_BK7252)
+#define USER_SW_VER "BK7252_Test"
+#elif defined(PLATFORM_BK7252N)
+#define USER_SW_VER "BK7252N_Test"
 #elif PLATFORM_ECR6600
 #define USER_SW_VER "ECR6600_Test"
 #else
diff --git a/src/new_pins.c b/src/new_pins.c
index 8401854c5..7fc62cb2f 100644
--- a/src/new_pins.c
+++ b/src/new_pins.c
@@ -209,15 +209,7 @@ void PINS_BeginDeepSleepWithPinWakeUp(unsigned int wakeUpTime) {
 		}
 	}
 	addLogAdv(LOG_INFO, LOG_FEATURE_GENERAL, "Index map: %i, edge: %i", g_gpio_index_map[0], g_gpio_edge_map[0]);
-#ifdef PLATFORM_BEKEN
-	// NOTE: this function:
-	// void bk_enter_deep_sleep(UINT32 gpio_index_map,UINT32 gpio_edge_map)
-	// On BK7231T, will overwrite HAL pin settings, and depending on edge map,
-	// will set a internal pullup or internall pulldown
-#ifdef PLATFORM_BK7231T
-	extern void deep_sleep_wakeup_with_gpio(UINT32 gpio_index_map, UINT32 gpio_edge_map);
-	deep_sleep_wakeup_with_gpio(g_gpio_index_map[0], g_gpio_edge_map[0]);
-#elif PLATFORM_BEKEN_NEW
+#ifdef PLATFORM_BEKEN_NEW
 	PS_DEEP_CTRL_PARAM params;
 	params.gpio_index_map = g_gpio_index_map[0];
 	params.gpio_edge_map = g_gpio_edge_map[0];
@@ -226,13 +218,20 @@ void PINS_BeginDeepSleepWithPinWakeUp(unsigned int wakeUpTime) {
 	{
 		params.wake_up_way = PS_DEEP_WAKEUP_GPIO | PS_DEEP_WAKEUP_RTC;
 		params.sleep_time = wakeUpTime;
-		bk_enter_deep_sleep_mode(&params);
 	}
 	else
 	{
 		params.wake_up_way = PS_DEEP_WAKEUP_GPIO;
-		bk_enter_deep_sleep_mode(&params);
 	}
+	bk_enter_deep_sleep_mode(&params);
+#elif PLATFORM_BEKEN
+	// NOTE: this function:
+	// void bk_enter_deep_sleep(UINT32 gpio_index_map,UINT32 gpio_edge_map)
+	// On BK7231T, will overwrite HAL pin settings, and depending on edge map,
+	// will set a internal pullup or internall pulldown
+#ifdef PLATFORM_BK7231T
+	extern void deep_sleep_wakeup_with_gpio(UINT32 gpio_index_map, UINT32 gpio_edge_map);
+	deep_sleep_wakeup_with_gpio(g_gpio_index_map[0], g_gpio_edge_map[0]);
 #else
 	extern void bk_enter_deep_sleep(UINT32 g_gpio_index_map, UINT32 g_gpio_edge_map);
 	extern void deep_sleep_wakeup(const UINT32* g_gpio_index_map,
diff --git a/src/new_pins.h b/src/new_pins.h
index df12a868e..1d0bdf943 100644
--- a/src/new_pins.h
+++ b/src/new_pins.h
@@ -1052,6 +1052,8 @@ typedef enum channelType_e {
 #define PLATFORM_GPIO_MAX 64
 #elif PLATFORM_ECR6600
 #define PLATFORM_GPIO_MAX 27
+#elif PLATFORM_BK7252
+#define PLATFORM_GPIO_MAX 40
 #else
 #define PLATFORM_GPIO_MAX 29
 #endif
diff --git a/src/user_main.c b/src/user_main.c
index 8c4862fc3..fe75c342d 100644
--- a/src/user_main.c
+++ b/src/user_main.c
@@ -129,7 +129,10 @@ static int get_tsen_adc(
 extern void extended_app_waiting_for_launch(void);
 void extended_app_waiting_for_launch2()
 {
+	// 3.0.76 'broke' it. It is now called in init_app_thread, which will later call user_main
+#ifndef PLATFORM_BEKEN_NEW
 	extended_app_waiting_for_launch();
+#endif
 
 	// define FIXED_DELAY if delay wanted on non-beken platforms.
 #if PLATFORM_BK7231N || PLATFORM_BEKEN_NEW
@@ -553,6 +556,9 @@ void Main_OnEverySecond()
 		temp_single_get_current_temperature(&temperature);
 #if PLATFORM_BK7231T
 		g_wifi_temperature = 2.21f * (temperature / 25.0f) - 65.91f;
+#if PLATFORM_BEKEN_NEW
+		g_wifi_temperature = temperature * 0.04f;
+#endif
 #else
 		g_wifi_temperature = (-0.457f * temperature) + 188.474f;
 #endif
@@ -1265,7 +1271,7 @@ void Main_Init_Before_Delay()
 	// read or initialise the boot count flash area
 	HAL_FlashVars_IncreaseBootCount();
 
-#if defined(PLATFORM_BEKEN) && !defined(PLATFORM_BEKEN_NEW)
+#if defined(PLATFORM_BEKEN)
 	// this just increments our idle counter variable.
 	// it registers a cllback from RTOS IDLE function.
 	// why is it called IRDA??  is this where they check for IR?