Merge branch 'develop'

.github/workflows/ci-esp32.yml

@@ -0,0 +1,71 @@
+name: Continuous Integration (CI) for Esp32
+
+on:
+  push:
+
+  pull_request:
+    branches: [ develop ]
+
+jobs:
+  build:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-20.04, windows-latest]
+        variant: [esp32, esp32s2, esp32c3, esp32s3, esp32c2]
+        idf_version: ["4.3", "4.4", "5.0"]
+        exclude:
+          - variant: esp32s3
+            idf_version: "4.3"
+          - variant: esp32c2
+            idf_version: "4.3"
+          - variant: esp32c2
+            idf_version: "4.4"
+
+    concurrency: 
+      group: ${{ github.workflow }}-${{ github.ref }}-${{ toJson(matrix) }}
+      cancel-in-progress: true
+
+    runs-on: ${{ matrix.os }}
+
+    env:
+      SMING_ARCH: Esp32
+      SMING_SOC: ${{ matrix.variant }}
+      INSTALL_IDF_VER: ${{ matrix.idf_version }}
+
+    steps:
+    - name: Fix autocrlf setting
+      run: |
+        git config --global --add core.autocrlf input
+
+    - name: Checkout code
+      uses: actions/checkout@v3
+
+    - name: Configure environment
+      shell: pwsh
+      run: |
+        "CI_BUILD_DIR=" + (Resolve-Path ".").path >> $env:GITHUB_ENV
+        "SMING_HOME=" + (Resolve-Path "Sming").path >> $env:GITHUB_ENV
+
+    - name: Install build tools for Ubuntu
+      if: ${{ matrix.os ==  'ubuntu-20.04' }}
+      run: |
+        Tools/ci/install.sh
+
+    - name: Install build tools for Windows   
+      if: ${{ matrix.os == 'windows-latest' }}
+      run: |
+         . Tools/ci/setenv.ps1
+         Tools/ci/install.cmd
+
+    - name: Build and test for ${{matrix.variant}} with IDF v${{matrix.idf_version}} on Ubuntu
+      if: ${{ matrix.os == 'ubuntu-20.04' }}
+      run: |
+        source $SMING_HOME/../Tools/export.sh
+        Tools/ci/build.sh
+
+    - name: Build and test for ${{matrix.variant}} with IDF v${{matrix.idf_version}} on Windows
+      if: ${{ matrix.os == 'windows-latest' }}
+      run: |
+        . Tools/ci/setenv.ps1
+        Tools/ci/build.cmd

.github/workflows/ci.yml

@@ -12,18 +12,12 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-20.04, windows-latest]
-        variant: [esp8266, host, esp32, esp32s2, esp32c3, rp2040]
+        variant: [esp8266, host, rp2040]
         include:
           - variant: esp8266
             arch: Esp8266
           - variant: host
             arch: Host
-          - variant: esp32
-            arch: Esp32
-          - variant: esp32s2
-            arch: Esp32
-          - variant: esp32c3
-            arch: Esp32
           - variant: rp2040
             arch: Rp2040
 
@@ -33,6 +27,10 @@ jobs:
 
     runs-on: ${{ matrix.os }}
 
+    env:
+      SMING_ARCH: ${{ matrix.arch }}
+      SMING_SOC: ${{ matrix.variant }}
+
     steps:
     - name: Fix autocrlf setting
       run: |
@@ -46,21 +44,19 @@ jobs:
       run: |
         "CI_BUILD_DIR=" + (Resolve-Path ".").path >> $env:GITHUB_ENV
         "SMING_HOME=" + (Resolve-Path "Sming").path >> $env:GITHUB_ENV
-        "SMING_ARCH=${{ matrix.arch }}" >> $env:GITHUB_ENV
-        "SMING_SOC=${{ matrix.variant }}" >> $env:GITHUB_ENV
 
     - name: Install build tools for Ubuntu
-      if: ${{ matrix.os ==  'ubuntu-20.04' }}
+      if: ${{ matrix.os == 'ubuntu-20.04' }}
       run: |
         Tools/ci/install.sh
 
     - name: Install build tools for Windows   
-      if: ${{ matrix.os ==  'windows-latest' }}
+      if: ${{ matrix.os == 'windows-latest' }}
       run: |
          . Tools/ci/setenv.ps1
          Tools/ci/install.cmd
 
-    - name: Build and test for ${{matrix.arch}} on Ubuntu
+    - name: Build and test for ${{matrix.variant}} on Ubuntu
       env: 
         CLANG_FORMAT: clang-format-8
       if: ${{ matrix.os == 'ubuntu-20.04' }}
@@ -69,7 +65,7 @@ jobs:
         $CLANG_FORMAT --version
         Tools/ci/build.sh
 
-    - name: Build and test for ${{matrix.arch}} on Windows
+    - name: Build and test for ${{matrix.variant}} on Windows
       if: ${{ matrix.os == 'windows-latest' }}
       run: |
         . Tools/ci/setenv.ps1

.github/workflows/library.yml

@@ -21,7 +21,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-20.04, windows-latest]
         variant: [esp8266, host, esp32, esp32s2, esp32c3, rp2040]
         include:
           - variant: esp8266
@@ -71,7 +71,7 @@ jobs:
         "SMING_SOC=${{ matrix.variant }}" >> $env:GITHUB_ENV
 
     - name: Install build tools for Ubuntu
-      if: ${{ matrix.os ==  'ubuntu-latest' }}
+      if: ${{ matrix.os ==  'ubuntu-20.04' }}
       run: |
         . $SMING_HOME/../Tools/export.sh
         $SMING_HOME/../Tools/ci/install.sh $SMING_ARCH
@@ -85,7 +85,7 @@ jobs:
     - name: Build and Test for ${{matrix.arch}} on Ubuntu
       env:
         CLANG_FORMAT: clang-format-8
-      if: ${{ matrix.os == 'ubuntu-latest' }}
+      if: ${{ matrix.os == 'ubuntu-20.04' }}
       run: |
         . $SMING_HOME/../Tools/export.sh
         make -j$(nproc) -f $CI_MAKEFILE

.gitmodules

@@ -69,6 +69,10 @@
 	path = Sming/Components/rboot/rboot
 	url = https://github.com/mikee47/rboot
 	ignore = dirty
+[submodule "uzlib"]
+	path = Sming/Components/uzlib/uzlib
+	url = https://github.com/pfalcon/uzlib.git
+	ignore = dirty
 [submodule "ws_parser"]
 	path = Sming/Components/ws_parser
 	url = https://github.com/charliesome/ws_parser.git
@@ -233,6 +237,10 @@
 	path = Sming/Libraries/FatIFS
 	url = https://github.com/mikee47/FatIFS
 	ignore = dirty
+[submodule "Libraries.FlashIP"]
+	path = Sming/Libraries/FlashIP
+	url = https://github.com/mikee47/FlashIP
+	ignore = dirty
 [submodule "Libraries.flatbuffers"]
 	path = Sming/Libraries/flatbuffers/src
 	url = https://github.com/google/flatbuffers.git
@@ -369,10 +377,14 @@
 	path = Sming/Libraries/UPnP
 	url = https://github.com/mikee47/Sming-UPnP
 	ignore = dirty
-[submodule "Sming/Libraries/UPnP-Schema"]
+[submodule "Libraries.UPnP-Schema"]
 	path = Sming/Libraries/UPnP-Schema
 	url = https://github.com/mikee47/UPnP-Schema
 	ignore = dirty
+[submodule "Libraries.USB"]
+	path = Sming/Libraries/USB
+	url = https://github.com/mikee47/Sming-USB
+	ignore = dirty
 [submodule "Libraries.VT100"]
 	path = Sming/Libraries/VT100
 	url = https://github.com/mikee47/VT100

README.md

@@ -1,7 +1,7 @@
 # Sming
 
 Sming is an asynchronous embedded C/C++ framework with superb performance and multiple network features. 
-Sming is [open source](LICENSE), modular and supports [multiple architectures](https://sming.readthedocs.io/en/latest/features.html) including ESP8266 and ESP32.
+Sming is [open source](LICENSE), modular and supports [multiple architectures](https://sming.readthedocs.io/en/latest/features.html) including ESP8266, ESP32 and RP2040.
 
 [![Examples](https://github.com/SmingHub/Sming/wiki/images/small/combine.png)](https://github.com/SmingHub/Sming/wiki/examples)
 
@@ -29,14 +29,14 @@ You can also try Sming without installing anything locally. We have an [interact
 
 The purpose of Sming is to simplify the creation of embedded applications. The documentation will help you get started in no time.
 
-- [**Documentation for version 4.7.0**](https://sming.readthedocs.io/en/stable) - current stable version.
+- [**Documentation for version 5.0.0**](https://sming.readthedocs.io/en/stable) - current stable version.
 - [Documentation for latest](https://sming.readthedocs.io/en/latest) - development version.
 
 ## Releases
 
 ### Stable
 
-- [Sming V4.7.0](https://github.com/SmingHub/Sming/releases/tag/4.7.0) - great new features, performance and stability improvements.
+- [Sming V5.0.0](https://github.com/SmingHub/Sming/releases/tag/5.0.0) - great new features, performance and stability improvements.
 
 ### Development