Merge branch 'master' of https://github.com/RT-Thread/rt-thread

Author: BernardXiong

.devcontainer/Dockerfile

@@ -9,7 +9,7 @@ RUN apt-get update
 
 RUN apt-get upgrade -y
 
-RUN apt-get install -y vim git wget python3 python-is-python3 pip gcc-arm-none-eabi scons libncurses5-dev
+RUN apt-get install -y vim git wget python3 python-is-python3 pip gcc-arm-none-eabi libncurses5-dev
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get install -y qemu-system-arm
 
@@ -34,7 +34,7 @@ RUN git clone https://github.com/RT-Thread/packages.git /root/.env/packages/pack
 
 ENV PATH="/root/.env/tools/scripts:$PATH"
 
-RUN pip install requests psutil kconfiglib tqdm -qq
+RUN pip install scons requests psutil kconfiglib tqdm -qq
 
 ENV RTT_EXEC_PATH=/usr/bin
 

.github/workflows/action_tools.yml

@@ -77,7 +77,7 @@ jobs:
       if: ${{ success() }}
       run: |
         echo "Test to dist project"
-        scons --dist --project-name=project -C $TEST_BSP_ROOT
+        scons --dist -C $TEST_BSP_ROOT
         scons --dist-ide -C $TEST_BSP_ROOT
         ls $TEST_BSP_ROOT
         ls $TEST_BSP_ROOT/dist

.github/workflows/bsp_buildings.yml

@@ -188,6 +188,7 @@ jobs:
                 - "stm32/stm32g474-st-nucleo"
                 - "stm32/stm32h563-st-nucleo"
                 - "stm32/stm32h503-st-nucleo"
+                - "stm32/stm32h723-st-nucleo"
                 - "stm32/stm32h743-armfly-v7"
                 - "stm32/stm32h743-atk-apollo"
                 - "stm32/stm32h743-openmv-h7plus"
@@ -342,7 +343,7 @@ jobs:
                 - "qemu-virt64-aarch64"
                 - "raspberry-pi/raspi3-64"
                 - "raspberry-pi/raspi4-64"
-                - "rockchip/rk3568"
+                #- "rockchip/rk3568"   too long
                 - "phytium/aarch64"
          -  RTT_BSP: "riscv-none" 
             RTT_TOOL_CHAIN: "sourcery-riscv-none-embed"

.github/workflows/doxygen.yml

@@ -1,13 +1,24 @@
 name: doc_doxygen
 on:
+  pull_request:
+    branches:
+      - master
+    paths:
+      - 'documentation/doxygen/**'
+      - 'src/**'
+      - 'include/**'
+      - 'components/drivers/include/drivers/**'
+      - 'components/dfs/dfs_v2/include/**'
+      - 'components/dfs/dfs_v2/src/**'
+      - 'components/finsh/**'
   # Runs at 16:00 UTC (BeiJing 00:00) on the 30st of every month
   schedule:
     - cron:  '0 16 30 * *'
   workflow_dispatch:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     name: doxygen_doc generate
     if: github.repository_owner == 'RT-Thread'
     steps:

bsp/ESP32_C3/.ci/attachconfig/ci.attachconfig.yml

@@ -0,0 +1,57 @@
+scons.args: &scons
+    scons_arg:
+      - '--strict'
+devices.gpio:
+    <<: *scons
+    kconfig:
+      - CONFIG_RT_USING_PIN=y
+      - CONFIG_BSP_USING_GPIO=y
+devices.uart:
+    kconfig:
+      - CONFIG_RT_USING_SERIAL=y
+      - CONFIG_RT_USING_SERIAL_V1=y
+      - CONFIG_BSP_USING_UART=y
+devices.i2c:
+    kconfig:
+      - CONFIG_RT_USING_I2C=y
+      - CONFIG_BSP_USING_I2C=y
+devices.hwi2c:
+    depends:
+      - devices.i2c
+    kconfig:
+      - CONFIG_BSP_USING_HW_I2C=y
+devices.swi2c:
+    depends:
+      - devices.i2c
+    kconfig:
+      - CONFIG_BSP_USING_SW_I2C=y
+      - CONFIG_BSP_USING_SW_I2C0=y
+devices.spi:
+    kconfig:
+      - CONFIG_RT_USING_SPI=y
+      - CONFIG_BSP_USING_SPI=y
+      - CONFIG_BSP_USING_SPI2=y
+devices.hwtimer:
+    kconfig:
+      - CONFIG_RT_USING_HWTIMER=y
+      - CONFIG_BSP_USING_HWTIMER=y
+      - CONFIG_BSP_USING_TIMER0=y
+devices.adc:
+    kconfig:
+      - CONFIG_RT_USING_ADC=y
+      - CONFIG_BSP_USING_ADC=y
+      - CONFIG_BSP_USING_ADC1=y
+devices.pwm:
+    kconfig:
+      - CONFIG_RT_USING_PWM=y
+      - CONFIG_BSP_USING_PWM=y
+      - CONFIG_BSP_USING_PWM0=y
+devices.ble:
+    kconfig:
+      - CONFIG_BSP_USING_BLE=y
+devices.wifi:
+    kconfig:
+      - CONFIG_BSP_USING_WIFI=y
+      - CONFIG_RT_USING_WIFI=y
+      - CONFIG_RT_USING_LWIP=y
+      - CONFIG_RT_USING_NETDEV=y

bsp/ESP32_C3/drivers/Kconfig

@@ -72,9 +72,28 @@ menu "On-chip Peripheral Drivers"
         default n
         select RT_USING_I2C
         if BSP_USING_I2C
-            config BSP_USING_I2C0
-                bool "Enable I2C0"
+            menuconfig BSP_USING_HW_I2C
+                bool "Enable HardWare I2C"
                 default n
+                
+            menuconfig BSP_USING_SW_I2C
+                bool "Enable SoftWare I2C"
+                default n
+                if BSP_USING_SW_I2C
+                    config BSP_USING_SW_I2C0
+                        bool "Enable SoftWare I2C0"
+                        default n
+                        if BSP_USING_SW_I2C0
+                            config BSP_SW_I2C0_SDA_PIN
+                                int "SWI2C0 sda pin number"
+                                range 0 21
+                                default 18
+                            config BSP_SW_I2C0_SCL_PIN
+                                int "SWI2C0 scl pin number"
+                                range 0 21
+                                default 19
+                        endif
+                endif
         endif
 
     menuconfig BSP_USING_SPI

bsp/ESP32_C3/drivers/SConscript

@@ -17,6 +17,9 @@ if GetDepend('BSP_USING_ADC'):
 
 if GetDepend('BSP_USING_I2C'):
     src += ['drv_hw_i2c.c']
+    
+if GetDepend('BSP_USING_SW_I2C'):
+    src += ['drv_sw_i2c.c']
 
 if GetDepend('BSP_USING_PWM'):
     src += ['drv_pwm.c']

bsp/ESP32_C3/drivers/board.c

@@ -1,21 +1,25 @@
 /*
- * Copyright (c) 2021-2022, RT-Thread Development Team
+ * Copyright (c) 2021-2024 RT-Thread Development Team
  *
  * SPDX-License-Identifier: Apache-2.0
  *
  * Change Logs:
  * Date           Author       Notes
  * 2022-06-02     supperthomas first version
+ * 2024-12-08     wumingzi     support rt_hw_us_delay
  */
 
 #include <rtthread.h>
+#include "rttypes.h"
 #include "hal/systimer_hal.h"
 #include "hal/systimer_ll.h"
 #include "esp_private/panic_internal.h"
 #include "esp_private/systimer.h"
 #include "esp_private/periph_ctrl.h"
 #include "esp_intr_alloc.h"
 #include "esp_attr.h"
+#include "esp_timer.h"
+#include "driver/gptimer.h"
 
 static systimer_hal_context_t systimer_hal;
 IRAM_ATTR void rt_SysTickIsrHandler(void *arg)
@@ -57,3 +61,31 @@ void rt_hw_board_init(void)
     rt_console_set_device(RT_CONSOLE_DEVICE_NAME);
 #endif
 }
+
+static gptimer_handle_t gptimer_hw_us = NULL;
+
+static int delay_us_init(void)
+{
+    gptimer_config_t timer_config = {
+        .clk_src = GPTIMER_CLK_SRC_DEFAULT,
+        .direction = GPTIMER_COUNT_UP,
+        .resolution_hz = 1 * 1000 * 1000, /* 1MHz, 1 tick = 1us*/
+    };
+    ESP_ERROR_CHECK(gptimer_new_timer(&timer_config, &gptimer_hw_us));
+    ESP_ERROR_CHECK(gptimer_enable(gptimer_hw_us));
+    return RT_EOK;
+}
+INIT_DEVICE_EXPORT(delay_us_init);
+
+void rt_hw_us_delay(rt_uint32_t us)
+{
+    uint64_t count = 0;
+    ESP_ERROR_CHECK(gptimer_start(gptimer_hw_us));
+    ESP_ERROR_CHECK(gptimer_set_raw_count(gptimer_hw_us, 0));
+    /* Retrieve the timestamp at anytime*/
+    while(count < (uint64_t)us)
+    {
+        ESP_ERROR_CHECK(gptimer_get_raw_count(gptimer_hw_us, &count));
+    }
+    ESP_ERROR_CHECK(gptimer_stop(gptimer_hw_us));
+}

bsp/ESP32_C3/drivers/board.h

@@ -1,27 +1,27 @@
 /*
- * Copyright (c) 2021-2022, RT-Thread Development Team
+ * Copyright (c) 2021-2024 RT-Thread Development Team
  *
  * SPDX-License-Identifier: Apache-2.0
  *
  * Change Logs:
  * Date           Author       Notes
  * 2022-06-02     supperthomas first version
+ * 2024-12-08     wumingzi     support rt_hw_us_delay
  */
 
 #ifndef __BOARD_H__
 #define __BOARD_H__
 
 #include <rtconfig.h>
+#include "rttypes.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
-
 void rt_hw_board_init(void);
+void rt_hw_us_delay(rt_uint32_t us);
 
 #ifdef __cplusplus
 }
 #endif
-
-#endif
-
+#endif

bsp/ESP32_C3/drivers/drv_gpio.c

@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2021-2022, RT-Thread Development Team
+ * Copyright (c) 2021-2024 RT-Thread Development Team
  *
  * SPDX-License-Identifier: Apache-2.0
  *
  * Change Logs:
  * Date           Author       Notes
  * 2022-06-03     supperthomas first version
- *
+ * 2024-12-08     wumingzi     support open drain mode for soft i2c
  */
 
 #include <rtthread.h>
@@ -37,9 +37,14 @@ static void mcu_pin_mode(rt_device_t dev, rt_base_t pin, rt_uint8_t mode)
     io_conf.pull_down_en = 0;
     io_conf.pull_up_en = 0;
     gpio_config(&io_conf);
-    if (mode == PIN_MODE_OUTPUT)
+    switch  (mode)
     {
-        gpio_set_direction(pin, GPIO_MODE_OUTPUT);
+        case PIN_MODE_INPUT:
+            gpio_set_direction(pin, GPIO_MODE_INPUT);
+        case PIN_MODE_OUTPUT:
+            gpio_set_direction(pin, GPIO_MODE_OUTPUT);
+        case PIN_MODE_OUTPUT_OD:
+            gpio_set_direction(pin, GPIO_MODE_INPUT_OUTPUT_OD);
     }
     /*TODO:set gpio out put mode */
 }
@@ -84,4 +89,4 @@ int rt_hw_pin_init(void)
 }
 INIT_BOARD_EXPORT(rt_hw_pin_init);
 
-#endif /* RT_USING_PIN */
+#endif /* RT_USING_PIN */