Merge branch 'RT-Thread:master' into master

Author: htl5241

.github/workflows/bsp_buildings.yml

@@ -41,66 +41,29 @@ permissions:
 jobs:
   generate-matrix:
     runs-on: ubuntu-22.04
+    name: 🔍 Summary of Git Diff Changes
     outputs:
       filtered_matrix: ${{ steps.filter.outputs.filtered_matrix }}
     steps:
       - name: Checkout repo
         uses: actions/checkout@main
         with:
-          sparse-checkout: .github/ALL_BSP_COMPILE.json
           persist-credentials: false
-      - name: Read matrix config
-        id: read-config
-        run: |
-          #读取ALL_BSP_COMPILE.json文件
-          raw_matrix_base64=$(cat .github/ALL_BSP_COMPILE.json |egrep -v '^//'|base64 -w 0)
-          echo "raw_matrix=$raw_matrix_base64" >> $GITHUB_OUTPUT
-      - name: Get changed files
-        id: changed_files
-        if: github.event_name == 'pull_request'
-        run: |
-          changed_files=$(curl -s \
-            "https://api.github.com/repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }}/files" | \
-            jq -r '.[].filename') 
-          prefix=$(echo "$changed_files" | cut -d'/' -f1 | sort -u )
-          has_bsp=true
-          for r in "$prefix"; do
-            if [[ ! "$r" == "bsp" ]]; then
-                has_bsp=false
-                break
-            fi
-          done
-          if [[ $has_bsp == true ]]; then
-            changed_files=$(echo "${changed_files}"| cut -d'/' -f2 | sort -u| tr '\n' ',' | sed 's/,$//')
-            echo "CHANGED_FILES=[${changed_files}]" >> $GITHUB_OUTPUT
-          fi
-          #获取修改文件的路径，如果有bsp以外的文件夹则编译全部bsp，否则获取对应文件夹名
-
-          echo "${changed_files}"
+          fetch-depth: 0
       - name: Filter matrix
         id: filter
         run: |
-          raw_matrix=$(echo "${{ steps.read-config.outputs.raw_matrix }}" | base64 --decode)
-
-          CHANGED_FILES=${{ steps.changed_files.outputs.CHANGED_FILES }}
-          CHANGED_FILES=$(echo "$CHANGED_FILES" | sed 's/\[\|\]//g')
-          # 将修改的文件路径与ALL_BSP_COMPILE.json文件的SUB_RTT_BSP进行判断，判断是否包含
-          filtered_matrix=[]
-          echo "${CHANGED_FILES}"
-          if [[ -z "$CHANGED_FILES" ]]; then
-              FILTER_CONDITION='.legs[]'
-              filtered_matrix=$(jq -c "{legs: [$FILTER_CONDITION]}" <<< "$raw_matrix")
-          else
-            CONDITIONS=$(echo "$CHANGED_FILES" | awk 'BEGIN { RS="," } { printf "contains(\"%s\") or ", $1 }')
-            CONDITIONS=${CONDITIONS% or }
-
-            FILTER_CONDITION=".legs[] | select(any(.SUB_RTT_BSP[]; $CONDITIONS))"
-
-            filtered_matrix=$(jq -c "{legs: [$FILTER_CONDITION]}" <<< "$raw_matrix")
-          fi
+          git config --global http.postBuffer 524288000
+          git remote -v
+          git fetch origin
+          git branch
+          git branch -a
+          python tools/ci/git_diff_show.py origin/master
+          raw_matrix=$(cat .github/ALL_BSP_COMPILE_TEMP.json)
 
+          FILTER_CONDITION='.legs[]'
+          filtered_matrix=$(jq -c "{legs: [$FILTER_CONDITION]}" <<< "$raw_matrix")
           echo "filtered_matrix=${filtered_matrix}" >> $GITHUB_OUTPUT
-          
           echo ${filtered_matrix}
   build:
     runs-on: ubuntu-22.04

.github/workflows/git_diff_status_show.yml

@@ -41,6 +41,8 @@ Each peripheral supporting condition for this BSP is as follows:
 | ------------------------ | --------------- | ------------------------------------------------------------ |
 | GPIO                     | Support         |                                                              |
 | UART                     | Support         | Using LUATOS_ESP32C3 development board requires connecting serial port to USB chip UART0_TX and UART0_RX (such as CP2102) |
+| I2C              | Supported     | Hardware I2C may encounter transmission errors. Software I2C is recommended, but it occupies a general hardware system timer. |
+| SPI              | Supported     | Supports custom configuration |
 | JTAG debug               | Support         | ESP32C3 usb-linked development boards can be debugged        |
 | WIFI | Partial support | There are currently some problems, such as `rt_mq_recive` cannot be used in ISR, etc. |
 | BLE | Partially supported | There are currently some problems, such as `NimBLE` running errors after starting for a while |
@@ -91,6 +93,48 @@ Type "apropos word" to search for commands related to "word".
 
 ## Environment construction and compilation
 
+### Docker deploy
+
+If you want to lightly experiment with the ESP32-C3, it is recommended to quickly set up the environment using Docker. Otherwise, use a native environment setup.
+
+  1. Ensure Docker is installed and the inner network environment is properly configured. You can obtain the Docker image either via a pre-built docker image or by building it from a Dockerfile. Note that the docker image may not always be up-to-date, while the Dockerfile allows you to fetch the latest main branch. Below are the setup commands:
+      * Setting up the development environment using a Dockerfile:
+
+      ```sh
+      cd docker
+      sudo docker build --build-arg HTTP_PROXY=http://ip:port --build-arg HTTPS_PROXY=http://ip:port -t image_name .
+      ``` 
+      Replace ip:port with your proxy server's IP and port. Otherwise, network issues may occur when pulling repositories.
+
+      * Setting up the development environment using a pre-built Docker image:
+
+      ```sh
+      sudo docker pull 1078249029/rtthread_esp32c3:latest
+      ```
+
+  2. Enter the Docker container:
+  
+      ```sh
+      sudo docker run -it --device=/dev/ttyUSB* image_name
+      ```
+
+      The --device parameter is used for debugging and flashing code. You can obtain the corresponding port by running ls /dev/ttyUSB* on the host machine. If you used the pre-built Docker image, replace image_name with 1078249029/rtthread_esp32c3.
+
+  3. Using the Environment:
+   
+      Flashing firmware:
+
+        ```sh
+        sudo esptool.py -b 115200 --before default_reset --after hard_reset write_flash --flash_mode dio --flash_size detect --flash_freq 80m 0x0 path/to/your/bootloader.bin 0x08000 path/to/your/partition-table.bin 0x010000 path/to/your/rtthread.bin
+        ```
+
+      Debugging:
+
+        ```sh
+        sudo minicom -c on -D /dev/ttyUSB*
+        ```
+### Native setup
+
 1. Download the RISC-V toolchain:
 
      ```sh
@@ -180,7 +224,8 @@ or we can check ESPRESSIF's [Troubleshooting](https://docs.espressif.com/project
 Maintainer: 
 
 - [supperthomas](https://github.com/supperthomas) email address: [[email protected]](mailto:[email protected])
--  [tangzz98](https://github.com/tangzz98) email address: [[email protected]]([email protected])
+- [tangzz98](https://github.com/tangzz98) email address: [[email protected]]([email protected])
+- [wumingzi](https://github.com/1078249029) email address: [[email protected]]([email protected])
 
 Special thanks to [chenyingchun0312](https://github.com/chenyingchun0312) for providing support on the RISC-V part working.
 

bsp/ESP32_C3/README.md

@@ -48,6 +48,8 @@
 | :----------------- | :----------: | :------------------------------------- |
 | GPIO              |     支持     |  |
 | UART              |     支持     | 使用LUATOS_ESP32C3开发板需要在UART0_TX和UART0_RX连接串口转USB芯片（如CP2102）|
+| I2C              |     支持     | 硬件I2C会产生传输错误，推荐使用软件I2C，但使用软件I2C会占用一个硬件通用定时器 |
+| SPI              |     支持     | 支持自定义配置|
 | JTAG调试          |     支持     | ESP32C3采用USB方式和PC链接的开发板可以调试                                |
 | WIFI              | 部分支持 | 目前存在一些问题，例如不能在ISR中使用`rt_mq_recive`等 |
 | BLE             | 部分支持 | 目前存在一些问题，例如`NimBLE`启动一段时间后运行错误 |
@@ -99,12 +101,55 @@ Type "apropos word" to search for commands related to "word".
 
 ## 环境搭建及编译
 
+### Docker
+
+如果想要通轻度尝鲜esp32c3，推荐使用docker快速搭建环境，否则请使用原生环境搭建
+
+  1. 在确保已经安装 docker 并配置docker内部网络环境的基础上可以通过 docker image 或 dockerfile 获取镜像，docker image 不保证时效性，而 dockerfile 可以获取最新的主线分支，下面是对应的搭建命令
+      * 通过 dockerfile 搭建开发环境
+
+      ```sh
+      cd docker
+      sudo docker build --build-arg HTTP_PROXY=http://ip:port --build-arg HTTPS_PROXY=http://ip:port -t image_name .
+      ``` 
+      这里的 ip:port 需要修改为代理服务器 ip 和端口号，否则拉取仓库时可能会出现网络问题
+
+      * 通过docker image搭建开发环境
+
+      ```sh
+      sudo docker pull 1078249029/rtthread_esp32c3:latest
+      ```
+
+  2. 进入 docker 
+  
+      ```sh
+      sudo docker run -it --device=/dev/ttyUSB* image_name
+      ```
+
+      device 参数用于调试、烧录代码，通过在宿主机内执行`ls /dev/ttyUSB*`即可获得对应端口，如果是通过 docker image 搭建环境的需要将 image_name 替换为`1078249029/rtthread_esp32c3`
+
+  3. 环境使用
+   
+      使用下列命令烧录
+
+        ```sh
+        sudo esptool.py -b 115200 --before default_reset --after hard_reset write_flash --flash_mode dio --flash_size detect --flash_freq 80m 0x0 path/to/your/bootloader.bin 0x08000 path/to/your/partition-table.bin 0x010000 path/to/your/rtthread.bin
+        ```
+
+      使用下列命令调试
+
+        ```sh
+        sudo minicom -c on -D /dev/ttyUSB*
+        ```
+
+### 原生环境搭建
+
 1. 下载 RISC-V 工具链：
 
-    ```sh
-    wget https://github.com/espressif/crosstool-NG/releases/download/esp-2022r1-RC1/riscv32-esp-elf-gcc11_2_0-esp-2022r1-RC1-linux-amd64.tar.xz
-    tar xf riscv32-esp-elf-gcc11_2_0-esp-2022r1-RC1-linux-amd64.tar.xz
-    ```
+ ```sh
+ wget https://github.com/espressif/crosstool-NG/releases/download/esp-2022r1-RC1/riscv32-esp-elf-gcc11_2_0-esp-2022r1-RC1-linux-amd64.tar.xz
+ tar xf riscv32-esp-elf-gcc11_2_0-esp-2022r1-RC1-linux-amd64.tar.xz
+ ```
 
   2. 配置工具链的路径：
 
@@ -190,6 +235,7 @@ Linux 下可以使用先前下载的 esptool 进行烧录
 
 -  [supperthomas](https://github.com/supperthomas) 邮箱：<[email protected]>
 -  [tangzz98](https://github.com/tangzz98) 邮箱：<[email protected]>
+-  [wumingzi](https://github.com/1078249029) 邮箱：<[email protected]>
 
 ## 特别感谢
 

bsp/ESP32_C3/README_ZH.md

@@ -0,0 +1,48 @@
+FROM ubuntu:22.04
+
+ARG HTTP_PROXY
+ARG HTTPS_PROXY
+ENV http_proxy=${HTTP_PROXY}
+ENV https_proxy=${HTTPS_PROXY}
+
+
+# 1. Basic options(with root)
+RUN apt update && \
+    apt install -y software-properties-common && \
+    add-apt-repository universe && \
+    apt update && \
+    apt install -y --no-install-recommends \
+        sudo git wget python3 python3-pip scons vim xz-utils minicom && \
+    pip3 install esptool && \
+    useradd -m dev && \
+    echo "dev ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
+
+# 2. Switch to dev user
+USER dev
+WORKDIR /home/dev
+
+# 3. Install esp-idf toolchains
+RUN wget -q https://github.com/espressif/crosstool-NG/releases/download/esp-2022r1-RC1/riscv32-esp-elf-gcc11_2_0-esp-2022r1-RC1-linux-amd64.tar.xz && \
+    sudo tar -xf riscv32-esp-elf-gcc11_2_0-esp-2022r1-RC1-linux-amd64.tar.xz -C /opt
+
+# 4. Clone RT-Thread and switch master
+RUN git clone https://github.com/RT-Thread/rt-thread.git && \
+    cd rt-thread && \
+    git switch master
+
+# 5. Install env tools
+WORKDIR /home/dev/rt-thread
+RUN wget https://raw.githubusercontent.com/RT-Thread/env/master/install_ubuntu.sh && \
+    chmod +x install_ubuntu.sh && \
+    ./install_ubuntu.sh
+
+# 6. Modify toolchains path
+RUN sed -i "s|^.*EXEC_PATH.*|    EXEC_PATH   = r'/opt/riscv32-esp-elf/bin'|" bsp/ESP32_C3/rtconfig.py
+
+# 7. Set enviroment variables
+ENV PATH="/opt/riscv32-esp-elf/bin:/home/dev/.env/tools/scripts:$PATH"
+
+# 8. Update rtthread packages
+WORKDIR /home/dev/rt-thread/bsp/ESP32_C3
+RUN pkgs --update
+

bsp/ESP32_C3/docker/Dockerfile

@@ -411,7 +411,6 @@ static void dma_recv_isr(struct rt_serial_device *serial, rt_uint8_t isr_flag)
     RT_ASSERT(serial != RT_NULL);
     uart = rt_container_of(serial, struct stm32_uart, serial);
 
-    recv_len = 0;
     counter = __HAL_DMA_GET_COUNTER(&(uart->dma_rx.handle));
 
     if (counter <= uart->dma_rx.remaining_cnt)

bsp/stm32/libraries/HAL_Drivers/drivers/drv_usart_v2.c

@@ -157,7 +157,10 @@ struct rt_pci_device
     rt_uint8_t pin;
     struct rt_pic *intx_pic;
 
+    rt_bool_t pm_enabled;
+
     struct rt_pci_bus_resource resource[RT_PCI_BAR_NR_MAX];
+    struct rt_pci_bus_resource rom;
 
     rt_uint8_t pme_cap;
     rt_uint8_t msi_cap;

components/drivers/include/drivers/pci.h

@@ -14,6 +14,9 @@ src = ['access.c', 'host-bridge.c', 'irq.c', 'pci.c', 'pme.c', 'probe.c']
 if GetDepend(['RT_USING_OFW']):
     src += ['ofw.c']
 
+if GetDepend(['RT_USING_DFS_PROCFS']):
+    src += ['procfs.c']
+
 if GetDepend(['RT_PCI_ECAM']):
     src += ['ecam.c']
 

components/drivers/pci/SConscript

@@ -695,6 +695,10 @@ rt_err_t rt_pci_device_alloc_resource(struct rt_pci_host_bridge *host_bridge,
                 rt_pci_write_config_u32(pdev, rom_addr, addr);
             }
             command |= PCIM_CMD_MEMEN;
+
+            pdev->rom.base = addr;
+            pdev->rom.size = size;
+            pdev->rom.flags = PCI_BUS_REGION_F_MEM;
         }
     }
 

components/drivers/pci/pci.c

@@ -107,6 +107,7 @@ static void pci_pme_active(struct rt_pci_device *pdev, rt_bool_t enable)
     }
 
     rt_pci_write_config_u16(pdev, pdev->pme_cap + PCIR_POWER_STATUS, pmcsr);
+    pdev->pm_enabled = enable;
 }
 
 void rt_pci_pme_active(struct rt_pci_device *pdev, rt_bool_t enable)