Merge branch 'master' into scsi

Author: GuEe-GUI

.github/PULL_REQUEST_TEMPLATE.md

@@ -61,4 +61,5 @@ The following content must not be changed in the submitted PR message. Otherwise
 - [ ] 所有变更均有原因及合理的，并且不会影响到其他软件组件代码或BSP All modifications are justified and not affect other components or BSP
 - [ ] 对难懂代码均提供对应的注释 I've commented appropriately where code is tricky
 - [ ] 代码是高质量的 Code in this PR is of high quality
-- [ ] 已经使用[formatting](https://github.com/mysterywolf/formatting) 等源码格式化工具确保格式符合[RT-Thread代码规范](https://github.com/RT-Thread/rt-thread/blob/master/documentation/contribution_guide/coding_style_cn.md) This PR complies with [RT-Thread code specification](https://github.com/RT-Thread/rt-thread/blob/master/documentation/contribution_guide/coding_style_en.md) 
+- [ ] 已经使用[formatting](https://github.com/mysterywolf/formatting) 等源码格式化工具确保格式符合[RT-Thread代码规范](https://github.com/RT-Thread/rt-thread/blob/master/documentation/contribution_guide/coding_style_cn.md) This PR complies with [RT-Thread code specification](https://github.com/RT-Thread/rt-thread/blob/master/documentation/contribution_guide/coding_style_en.md)
+- [ ] 如果是新增bsp, 已经添加ci检查到[.github/workflows/bsp_buildings.yml](workflows/bsp_buildings.yml)  详细请参考链接[BSP自查](https://www.rt-thread.org/document/site/#/rt-thread-version/rt-thread-standard/development-guide/bsp-selfcheck/bsp_selfcheck)

.github/workflows/bsp_buildings.yml

@@ -235,6 +235,7 @@ jobs:
                 - "renesas/ra6m4-iot"
                 - "renesas/ra6m3-ek"
                 - "renesas/ra6m3-hmi-board"
+                - "renesas/ra6e2-fpb"
                 - "renesas/ra4m2-eco"
                 - "renesas/ra2l1-cpk"
                 - "renesas/ra8m1-ek"
@@ -277,6 +278,7 @@ jobs:
                 - "gd32/arm/gd32450z-eval" 
                 - "gd32/arm/gd32470z-lckfb"
                 - "gd32/arm/gd32h759i-start"
+                - "gd32/arm/gd32e503v-eval"
                 - "n32/n32g43xcl-stb"
                 - "n32/n32g45xcl-stb"
                 - "n32/n32g45xml-stb"
@@ -301,14 +303,9 @@ jobs:
                 - "apm32/apm32e103ze-evalboard"
                 - "apm32/apm32e103ze-tinyboard"
                 - "apm32/apm32s103vb-miniboard"
-         -  RTT_BSP: "nordic_Infineon_TI_microchip" 
+         -  RTT_BSP: "Infineon_TI_microchip" 
             RTT_TOOL_CHAIN: "sourcery-arm"
             SUB_RTT_BSP:  
-                - "nrf5x/nrf51822"
-                - "nrf5x/nrf52832"
-                - "nrf5x/nrf52833"
-                - "nrf5x/nrf52840"
-                - "nrf5x/nrf5340"
                 - "Infineon/psoc6-cy8ckit-062S2-43012"
                 - "Infineon/psoc6-cy8ckit-062-BLE"
                 - "Infineon/psoc6-cy8ckit-062s4"
@@ -345,7 +342,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"
@@ -385,10 +382,18 @@ jobs:
             RTT_TOOL_CHAIN: "sourcery-i386-unknown-elf"
             SUB_RTT_BSP:  
                 - "x86"
+         -  RTT_BSP: "nordic(yml)"
+            RTT_TOOL_CHAIN: "sourcery-arm"
+            SUB_RTT_BSP:
+                - "nrf5x/nrf51822"
+                - "nrf5x/nrf52832"
+                - "nrf5x/nrf52833"
+                - "nrf5x/nrf52840"
+                - "nrf5x/nrf5340"
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@main
         with:
           python-version: 3.8
 

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

@@ -0,0 +1,47 @@
+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
+      - CONFIG_BSP_USING_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/drv_spi.c

@@ -6,10 +6,12 @@
  * Change Logs:
  * Date           Author       Notes
  * 2024-10-08     wumingzi      first implementation
+ * 2024-10-08     wumingzi      add custom configuration and support muti spi obj
  */
 
 #include <rtthread.h>
 #include <rtdevice.h>
+#include <time.h>
 
 #include "rtdef.h"
 #include "rttypes.h"
@@ -20,6 +22,7 @@
 #include "driver/spi_master.h"
 
 #include "drv_spi.h"
+#include "drivers/dev_spi.h"
 
 #ifdef RT_USING_SPI
 #ifdef BSP_USING_SPI2
@@ -29,7 +32,6 @@
 static struct rt_spi_bus spi_bus2;
 
 static spi_device_handle_t spi;
-
 static spi_bus_config_t buscfg;
 
 static struct esp32_spi spi_bus_obj[] = {
@@ -62,20 +64,9 @@ static void esp32_spi_init(struct esp32_spi *esp32_spi)
     spi_configure(NULL,NULL);
 }
 
-static void spi_pin_mode(rt_base_t pin)
-{
-    gpio_config_t io_conf;
-    io_conf.intr_type = GPIO_INTR_DISABLE;
-    io_conf.mode = GPIO_MODE_OUTPUT;
-    io_conf.pin_bit_mask = (1ULL << pin);
-    io_conf.pull_down_en = 0;
-    io_conf.pull_up_en = 1;
-}
-
 static rt_err_t spi_configure(struct rt_spi_device* device,
                           struct rt_spi_configuration* configuration)
 {
-    /* spi_pin_mode(RT_BSP_SPI_CS_PIN);*/
     static spi_bus_config_t buscfg =
     {
         .miso_io_num=SPI2_IOMUX_PIN_NUM_MISO,              /*MISO*/
@@ -89,19 +80,87 @@ static rt_err_t spi_configure(struct rt_spi_device* device,
     esp_err_t err = spi_bus_initialize(SPI2_HOST, &buscfg, SPI_DMA_CH_AUTO);
     ESP_ERROR_CHECK(err);
 
-    static spi_device_interface_config_t devcfg={
-        .clock_speed_hz = SPI_MASTER_FREQ_8M,
-        .mode = 0,
-        .spics_io_num = RT_BSP_SPI_CS_PIN,
-        .queue_size = 7,
-    };
+    static spi_device_interface_config_t devcfg;
+    if(configuration->data_width == 8)
+    {
+        size_t length;                  /*/< Total data length, in bits*/
+        size_t rxlength;                /*/< Total data length received, should be not greater than ``length`` in full-duplex mode (0 defaults this to the value of ``length``)*/
+    }
+
+    LOG_W("configuration->max_hz = %d \n",configuration->max_hz);
+    if(configuration->max_hz >= SPI_MASTER_FREQ_80M)
+    {
+        devcfg.clock_speed_hz = SPI_MASTER_FREQ_80M;    /*/< 80MHz*/
+    }
+    else if(configuration->max_hz >= SPI_MASTER_FREQ_40M)
+    {
+        devcfg.clock_speed_hz = SPI_MASTER_FREQ_40M;    /*/< 40MHz*/
+    }
+    else if(configuration->max_hz >= SPI_MASTER_FREQ_26M)
+    {
+        devcfg.clock_speed_hz = SPI_MASTER_FREQ_26M;    /*/< 26.67MHz*/
+    }
+    else if(configuration->max_hz >= SPI_MASTER_FREQ_20M)
+    {
+        devcfg.clock_speed_hz = SPI_MASTER_FREQ_20M;    /*/< 20MHz*/
+    }
+    else if(configuration->max_hz >= SPI_MASTER_FREQ_16M)
+    {
+        devcfg.clock_speed_hz = SPI_MASTER_FREQ_16M;    /*/< 16MHz*/
+    }
+    else if(configuration->max_hz >= SPI_MASTER_FREQ_13M)
+    {
+        devcfg.clock_speed_hz = SPI_MASTER_FREQ_13M;    /*/< 13.33MHz*/
+    }
+    else if(configuration->max_hz >= SPI_MASTER_FREQ_11M)
+    {
+        devcfg.clock_speed_hz = SPI_MASTER_FREQ_11M;    /*/< 11.43MHz*/
+    }
+    else if(configuration->max_hz >= SPI_MASTER_FREQ_10M)
+    {
+        devcfg.clock_speed_hz = SPI_MASTER_FREQ_10M;    /*/< 10MHz*/
+    }
+    else if(configuration->max_hz >= SPI_MASTER_FREQ_9M)
+    {
+        devcfg.clock_speed_hz = SPI_MASTER_FREQ_9M ;    /*/< 8.89MHz*/
+    }
+    else
+    {
+        devcfg.clock_speed_hz = SPI_MASTER_FREQ_8M ;
+    }
+
+    switch (configuration->mode)
+    {
+        case RT_SPI_MODE_0: /*!< CPOL = 0, CPHA = 0 */
+            devcfg.mode = 0;
+        case RT_SPI_MODE_1: /*!< CPOL = 0, CPHA = 1 */
+            devcfg.mode = 1;
+        case RT_SPI_MODE_2: /*!< CPOL = 1, CPHA = 0 */
+            devcfg.mode = 2;
+        case RT_SPI_MODE_3: /*!< CPOL = 1, CPHA = 1 */
+            devcfg.mode = 3;
+        default:
+            devcfg.mode = 0;
+    }
+
+    /* todo: support changing cs_pin,queue_size or specifing spi_device_interface_config_t and
+    * spi_transaction_t by resever data.Meanwhile finish the initialization of interrupt
+    * callback function and dma.
+    */
+
+    devcfg.spics_io_num = RT_BSP_SPI_CS_PIN;
+    devcfg.queue_size = 7;
 
     err = spi_bus_add_device(SPI2_HOST, &devcfg, &spi);
     ESP_ERROR_CHECK(err);
 
-    spi_bus_obj[0].bus_name = "spi2";
-    spi_bus_obj[0].spi_bus = &spi_bus2;
-    spi_bus_obj[0].esp32_spi_bus_cfg = &buscfg;
+    /* Although there is only one spi bus object, it will be a template for other bsps of ESP32 series */
+    for(int i = 0; i < sizeof(spi_bus_obj)/sizeof(spi_bus_obj[0]); i++)
+    {
+        spi_bus_obj[i].bus_name = "spi2";
+        spi_bus_obj[i].spi_bus = &spi_bus2;
+        spi_bus_obj[i].esp32_spi_bus_cfg = &buscfg;
+    }
 
     return RT_EOK;
 };
@@ -116,8 +175,8 @@ static rt_ssize_t spixfer(struct rt_spi_device* device, struct rt_spi_message* m
 
     trans.tx_buffer = message->send_buf;
     trans.rx_buffer = message->recv_buf;
-    trans.length = message->length;
-    trans.rxlength = message->length;
+    trans.length = (message->length)*8;
+    trans.rxlength = (message->length)*8;
 
     spi_device_acquire_bus(spi, portMAX_DELAY);
     esp_err_t err = spi_device_polling_transmit(spi, &trans);
@@ -161,17 +220,20 @@ int rt_hw_spi_init(void)
 {
     int result = 0;
 
-    spi_bus_obj[0].spi_bus->parent.user_data = (void *)&spi_bus_obj[0];
-    result = rt_spi_bus_register(spi_bus_obj[0].spi_bus, spi_bus_obj[0].bus_name, &esp32_spi_ops);
+    for(int i = 0; i < sizeof(spi_bus_obj)/sizeof(spi_bus_obj[0]); i++)
+    {
+        spi_bus_obj[i].spi_bus->parent.user_data = (void *)&spi_bus_obj[i];
+        result = rt_spi_bus_register(spi_bus_obj[i].spi_bus, spi_bus_obj[i].bus_name, &esp32_spi_ops);
 
-    RT_ASSERT(result == RT_EOK);
+        RT_ASSERT(result == RT_EOK);
 
-    LOG_D("%s bus init done", spi_bus_obj[i].bus_name);
+        LOG_D("%s bus init done", spi_bus_obj[i].bus_name);
+    }
 
     return result;
 }
 
 INIT_BOARD_EXPORT(rt_hw_spi_init);
 
 #endif /* BSP_USING_SPI0 || BSP_USING_SPI1 || BSP_USING_SPI2 || BSP_USING_SPI3 || BSP_USING_SPI4*/
-#endif /* RT_USING_SPI */
+#endif /* RT_USING_SPI */

bsp/ESP32_C3/main/main.c

@@ -14,6 +14,16 @@
 #include <rtdevice.h>
 #include <board.h>
 
+#ifdef BSP_USING_BLE
+void app_main()
+{
+    while(1)
+    {
+
+    }
+}
+#endif /* BSP_USING_BLE */
+
 int main(void)
 {
     rt_kprintf("Hello!RT-THREAD!\r\n");