Merge remote-tracking branch 'origin/develop' into develop-pandian

Author: pandiannano

.github/workflows/nightly-build.yml

@@ -14,7 +14,7 @@ jobs:
     steps:
     - uses: actions/[email protected]
     - name: Install packages
-      run: source tools/ci.sh && ci_esp32_idf44_setup
+      run: source tools/ci.sh && ci_esp32_idf504_setup
     - name: Build
       run: source tools/ci.sh && ci_esp32_nightly_build
     - name: Deliver AtomS3 firmware

.github/workflows/ports_m5stack.yml

@@ -18,6 +18,6 @@ jobs:
     steps:
     - uses: actions/[email protected]
     - name: Install packages
-      run: source tools/ci.sh && ci_esp32_idf44_setup
+      run: source tools/ci.sh && ci_esp32_idf504_setup
     - name: Build
       run: source tools/ci.sh && ci_esp32_build

.gitignore

@@ -52,3 +52,4 @@ tools/littlefs/prebuilt/
 
 dependencies.lock
 m5stack/.workenv
+managed_components/

.pre-commit-config.yaml

@@ -0,0 +1,18 @@
+repos:
+  - repo: local
+    hooks:
+      - id: codeformat
+        name: MicroPython codeformat.py for changed C files
+        entry: tools/codeformat.py -v -c -f
+        language: python
+      - id: verifygitlog
+        name: MicroPython git commit message format checker
+        entry: tools/verifygitlog.py --check-file --ignore-rebase
+        language: python
+        verbose: true
+        stages: [commit-msg]
+  - repo: https://github.com/charliermarsh/ruff-pre-commit
+    rev: v0.1.3
+    hooks:
+      - id: ruff
+      - id: ruff-format

README.md

@@ -6,8 +6,7 @@
 
 ```shell
 mkdir uiflow_workspace && cd uiflow_workspace
-git clone https://github.com/m5stack/esp-idf.git
-git -C esp-idf checkout 014ee65f1f5e291230e398c4913020be9a6278a1
+git clone -b uiflow/v2.0-idf5.0.4 https://github.com/m5stack/esp-idf.git 
 git -C esp-idf submodule update --init --recursive
 ./esp-idf/install.sh
 . ./esp-idf/export.sh
@@ -18,38 +17,17 @@ git -C esp-idf submodule update --init --recursive
 ```shell
 git clone https://github.com/m5stack/uiflow_micropython
 cd uiflow_micropython/m5stack
-make submodules # Only need once
+make submodules
+make patch
 make littlefs
 make mpy-cross
-# Build and flash
-# atoms3
-make BOARD=M5STACK_AtomS3 pack_all flash
-# atoms3-lite
-make BOARD=M5STACK_AtomS3_Lite pack_all flash
-# atoms3u
-make BOARD=M5STACK_AtomS3U pack_all flash
-# core(BASIC/M5GO/GRAY) (Falsh 16MB)
-make BOARD=M5STACK_Basic pack_all flash
-# core(BASIC/M5GO/GRAY) (Falsh 4MB)
-make BOARD=M5STACK_Basic_4MB pack_all flash
-# capsule
-make BOARD=M5STACK_Capsule pack_all flash
-# core2,tough
-make BOARD=M5STACK_Core2 pack_all flash
-# cores3
-make BOARD=M5STACK_CoreS3 pack_all flash
-# dial
-make BOARD=M5STACK_Dial pack_all flash
-# fire
-make BOARD=M5STACK_Fire pack_all flash
-# stamps3
-make BOARD=M5STACK_StampS3 pack_all flash
-# stickcplus
-make BOARD=M5STACK_StickC_PLUS pack_all flash
-# stickcplus2
-make BOARD=M5STACK_StickC_PLUS2 pack_all flash
+make flash_all
 ```
 
+The default board build the M5STACK_AtomS3 one, You can specify a different board by passing `BOARD=<board>` to the make commands. More BOARD type define is under [m5satck/boards](./m5stack/boards/) path.
+
+More command support, you can check the [Makefile](./m5stack/Makefile).
+
 ## Documentation
 
 API documentation for this library can be found on [Read the Docs](https://uiflow-micropython.readthedocs.io/en/latest/).