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

Author: BernardXiong

.github/workflows/manual_dist.yml

@@ -6,6 +6,7 @@
 # Change Logs:
 # Date           Author       Notes
 # 2023-07-01     Supperthomas the first version
+# 2024-09-06     Supperthomas add debug for action and add cppcheck for project
 #
 name:  manual_scons_dist_trigger_only_one
 
@@ -43,6 +44,11 @@ on:
         required: true
         type: boolean
         default: false
+      debug_flag:
+        description: 'True to debug action, False not debug'
+        required: true
+        type: boolean
+        default: false
 
 permissions:
   contents: read # to fetch code (actions/checkout)
@@ -68,6 +74,7 @@ jobs:
           git config --global http.postBuffer 524288000
           echo "RTT_ROOT=${{ github.workspace }}" >> $GITHUB_ENV
           echo "RTT_CC=gcc" >> $GITHUB_ENV
+          sudo apt-get -qq install cppcheck
 
       - name: Install Arm ToolChains
         if: ${{ github.event.inputs.bsp_tool_chain == 'sourcery-arm' && success() }}
@@ -144,22 +151,28 @@ jobs:
           RTT_BSP: ${{ github.event.inputs.bsp_options }}
           RTT_TOOL_CHAIN: ${{ github.event.inputs.bsp_tool_chain}}
         run: |
-          # source ~/.env/env.sh
+          source ~/.env/env.sh
           echo $RTT_BSP
           ls bsp/$RTT_BSP/Kconfig && scons -C bsp/$RTT_BSP --pyconfig-silent
           config=${{ github.event.inputs.bsp_config}}
           echo "$config"
           echo "$config" >> bsp/$RTT_BSP/.config
+          insert_code="env.Tool('compilation_db')\nenv.CompilationDatabase()\n"
+          sed -i "/DoBuilding(TARGET, objs)/i $insert_code" bsp/$RTT_BSP/SConstruct
           scons -C bsp/$RTT_BSP --pyconfig-silent
           pushd bsp/$RTT_BSP && pkgs --update && popd
           cat bsp/$RTT_BSP/.config
           scons -C bsp/$RTT_BSP -j$(nproc) 
-          mkdir -p ${{ github.workspace }}/$RTT_BSP 
-          cp -r bsp/$RTT_BSP ${{ github.workspace }}/$RTT_BSP/
-          scons --dist -C bsp/$RTT_BSP
-          cp bsp/$RTT_BSP/dist/project.zip ${{ github.workspace }}/$RTT_BSP/
-          ls bsp/$RTT_BSP/dist
+          ls bsp/$RTT_BSP
+          cppcheck --project=bsp/$RTT_BSP/compile_commands.json 
           pwd
+
+          
+          
+      - name: Setup Debug Session
+        if:  ${{ github.event.inputs.debug_flag }} 
+        uses: csexton/debugger-action@master
+        
       - uses: actions/upload-artifact@v3
         if:  ${{ github.event.inputs.dist_flag }} 
         with:

.github/workflows/static_code_analysis.yml

@@ -46,7 +46,7 @@ jobs:
           cd build
           cmake ..
           make
-          sudo make install
+          sudo make install FILESDIR=/usr/local/share/Cppcheck CFGDIR=/usr/share/Cppcheck/cfg
           cppcheck --version
           cd ../../
           git remote -v

bsp/cvitek/cv18xx_risc-v/SConstruct

@@ -21,8 +21,6 @@ env['ASCOM'] = env['ASPPCOM']
 
 Export('RTT_ROOT')
 Export('rtconfig')
-rtconfig.CPU='virt64'
-rtconfig.ARCH='risc-v'
 
 SDK_ROOT = os.path.abspath('./')
 

bsp/nxp/mcx/mcxc/Libraries/drivers/drv_i2c.c

@@ -0,0 +1,152 @@
+/*
+ * Copyright (c) 2006-2024 RT-Thread Development Team
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Change Logs:
+ * Date           Author       Notes
+ * 2024-09-03     Yilin Sun    Initial version
+ */
+
+#include <rtdevice.h>
+
+#include "fsl_i2c.h"
+
+#ifdef RT_USING_I2C
+
+#define BSP_DEFAULT_I2C_FREQ (100000)
+
+typedef struct
+{
+    struct rt_i2c_bus_device parent;
+    I2C_Type *instance;
+    uint32_t input_frequency;
+} mcx_i2c_obj_t;
+
+typedef struct
+{
+    I2C_Type *instance;
+    uint8_t id;
+} mcx_i2c_instance_t;
+
+static const mcx_i2c_instance_t mcx_i2c_instances[] =
+{
+#ifdef BSP_USING_I2C0
+    {I2C0, 0},
+#endif
+
+#ifdef BSP_USING_I2C1
+    {I2C1, 1},
+#endif
+};
+
+static mcx_i2c_obj_t mcx_i2c_list[ARRAY_SIZE(mcx_i2c_instances)];
+
+static int mcx_i2c_master_xfer(struct rt_i2c_bus_device *bus, struct rt_i2c_msg msgs[], rt_uint32_t num)
+{
+    struct rt_i2c_msg *msg;
+    i2c_master_transfer_t xfer = {0};
+    rt_uint32_t i;
+    rt_ssize_t ret = 0;
+
+    mcx_i2c_obj_t *i2c = (mcx_i2c_obj_t *)bus;
+
+    for (i = 0; i < num; i++)
+    {
+        msg = &msgs[i];
+
+        if (msg->flags & RT_I2C_RD)
+        {
+            xfer.slaveAddress = msg->addr;
+            xfer.direction = kI2C_Read;
+            xfer.subaddress = 0;
+            xfer.subaddressSize = 0;
+            xfer.data = msg->buf;
+            xfer.dataSize = msg->len;
+
+            xfer.flags = kI2C_TransferDefaultFlag;
+
+            if (i != 0)
+            {
+                xfer.flags |= kI2C_TransferRepeatedStartFlag;
+            }
+
+            if (i != num - 1)
+            {
+                xfer.flags |= kI2C_TransferNoStopFlag;
+            }
+
+
+            if (I2C_MasterTransferBlocking(i2c->instance, &xfer) != kStatus_Success)
+            {
+                return i;
+            }
+        }
+        else
+        {
+            xfer.slaveAddress = msg->addr;
+            xfer.direction = kI2C_Write;
+            xfer.subaddress = 0;
+            xfer.subaddressSize = 0;
+            xfer.data = msg->buf;
+            xfer.dataSize = msg->len;
+
+            xfer.flags = kI2C_TransferDefaultFlag;
+
+            if (i != 0)
+            {
+                xfer.flags |= kI2C_TransferRepeatedStartFlag;
+            }
+
+            if (i != num - 1)
+            {
+                xfer.flags |= kI2C_TransferNoStopFlag;
+            }
+
+            if (I2C_MasterTransferBlocking(i2c->instance, &xfer) != kStatus_Success)
+            {
+                return i;
+            }
+        }
+    }
+
+    ret = num;
+
+    return ret;
+}
+
+static const struct rt_i2c_bus_device_ops mcx_i2c_ops =
+{
+    mcx_i2c_master_xfer,
+    RT_NULL,
+    RT_NULL,
+};
+
+static int rt_hw_i2c_init(void)
+{
+    i2c_master_config_t master_cfg;
+    char name_buf[16];
+
+    for (size_t i = 0; i < ARRAY_SIZE(mcx_i2c_instances); i++)
+    {
+        mcx_i2c_list[i].input_frequency = CLOCK_GetCoreSysClkFreq();
+        mcx_i2c_list[i].instance = mcx_i2c_instances[i].instance;
+        mcx_i2c_list[i].parent.ops = &mcx_i2c_ops;
+
+        I2C_MasterGetDefaultConfig(&master_cfg);
+
+        master_cfg.baudRate_Bps = BSP_DEFAULT_I2C_FREQ;
+
+        I2C_MasterInit(mcx_i2c_list[i].instance, &master_cfg, mcx_i2c_list[i].input_frequency);
+
+        rt_snprintf(name_buf, 16, "i2c%d", mcx_i2c_instances[i].id);
+
+        rt_i2c_bus_device_register(&mcx_i2c_list[i].parent, name_buf);
+    }
+
+    return RT_EOK;
+}
+
+INIT_DEVICE_EXPORT(rt_hw_i2c_init);
+
+#endif

bsp/nxp/mcx/mcxc/frdm-mcxc444/README_EN.md

@@ -1 +1,93 @@
-FRDM-MCXC444 support
+# NXP FRDM-MCXC444 Introduction
+
+## Overview
+The FRDM-MCXC444 is NXP's official low-cost evaluation board based on the MCX C444 MCU. It is designed for rapid prototyping and features a compact and scalable form factor. The board provides industry-standard headers for easy access to the MCU's I/O pins and supports the MCUXpresso development environment. 
+
+Key features of the FRDM-MCXC444 include:
+
+- SLCD functionality
+- Arduino-compatible expansion headers
+- MCUXpresso IDE support
+
+The appearance of the board is shown in the figure below:
+
+![img](figures/board.png)
+
+The common on-board resources for this board are listed below:
+
+![board_block_diagram](figures/board_block_diagram.png)
+
+For more details on the development board, please refer to [NXP official website](https://www.nxp.com/products/processors-and-microcontrollers/arm-microcontrollers/general-purpose-mcus/mcx-arm-cortex-m/mcx-c-series-microcontrollers:MCX-C-SERIES)。
+
+## Preparation
+
+To run sample programs on the FRDM-MCXC444 board, you need to make the following preparations:
+
+1. Development Environment
+
+   Keil V5 with MCXC444 package installed.
+
+2. Source Code Acquisition
+
+   Visit https://github.com/RT-Thread/rt-thread and download the latest stable release zip package from the Assets section.
+
+3. Hardware Connection
+
+   Use a USB cable to connect the USB port of the development board to your PC.
+
+> NXP's official hands-on tutorial for the FRDM-MCXC444 can be found at [here](https://www.nxp.com/design/design-center/development-boards-and-designs/general-purpose-mcus/frdm-development-board-for-mcx-c444-mcus:FRDM-MCXC444)
+
+
+![img](figures/usb_pc.png)
+
+## Run the First Sample Program
+
+### Compile and Download
+
+1. Navigate to the `rt-thread\bsp\nxp\mcxc\frdm-mcxc444` folder.
+2. Open the project file in Keil.
+3. Compile the project.
+4. Click the download button to flash the firmware to the development board.
+
+![dir](figures/dir.png)
+
+Execute the compilation. After it, click the download button to download the firmware to the development board. Then, the program will start running automatically, observe the program running status.
+
+> Tip: The default configuration of the project uses CMSIS-DAP to download the program. And then click the Download button to download the program to the development board.
+
+![project](figures/project.png)
+
+### Run
+
+If it does not run automatically, press the reset button to restart the board and observe the actual effect of the LEDs on the board. After normal operation, the LEDs will blink periodically, as shown in the following figure:
+
+![run](figures/run.gif)
+
+After downloading the program, it should start running automatically. If not, press the reset button on the board.
+
+Connect the board's serial port to your PC and open a serial terminal with the following settings:
+
+- Baud rate: 115200
+- Data bits: 8
+- Stop bits: 1
+- Parity: None
+
+Reset the device, and you should see the RT-Thread startup information in the serial terminal:
+
+```bash
+ \ | /
+- RT -     Thread Operating System
+ / | \     5.2.0 build Sep  4 2024 10:46:13
+ 2006 - 2024 Copyright by RT-Thread team
+using armclang, version: 6190004
+NXP MCXC444
+msh >
+```
+
+## Keep Learning
+
+Completed RT-Thread Quickstart! Click here for [Kernel Learning](../../kernel/kernel-video.md) .
+
+## Additional Information
+
+[NXP FRDM-MCXC444](https://www.nxp.com/design/design-center/development-boards-and-designs/general-purpose-mcus/frdm-development-board-for-mcx-c444-mcus:FRDM-MCXC444)

bsp/nxp/mcx/mcxc/frdm-mcxc444/applications/main.c

@@ -19,7 +19,7 @@
 #define LED_PIN         ((4*32)+31)
 #define BUTTON_PIN      ((2*32)+3)
 
-static void sw_pin_cb(void *args);
+static void sw2_pin_cb(void *args);
 
 int main(void)
 {
@@ -36,10 +36,10 @@ int main(void)
     rt_pin_mode(LED_PIN, PIN_MODE_OUTPUT);  /* Set GPIO as Output */
 
     rt_pin_mode(BUTTON_PIN, PIN_MODE_INPUT_PULLUP);
-    rt_pin_attach_irq(BUTTON_PIN, PIN_IRQ_MODE_FALLING, sw_pin_cb, RT_NULL);
+    rt_pin_attach_irq(BUTTON_PIN, PIN_IRQ_MODE_FALLING, sw2_pin_cb, RT_NULL);
     rt_pin_irq_enable(BUTTON_PIN, 1);
 
-    rt_kprintf("MCXC444 HelloWorld\r\n");
+    rt_kprintf("NXP MCXC444\r\n");
 
     while (1)
     {
@@ -50,9 +50,9 @@ int main(void)
     }
 }
 
-static void sw_pin_cb(void *args)
+static void sw2_pin_cb(void *args)
 {
-    rt_kprintf("sw pressed\r\n");
+    rt_kprintf("sw2 pressed\r\n");
 }
 
 // end file

bsp/nxp/mcx/mcxc/frdm-mcxc444/board/Kconfig

@@ -39,10 +39,10 @@ menu "On-chip Peripheral Drivers"
 
             if BSP_USING_I2C
                 config BSP_USING_I2C0
-                    bool "Enable Flexcomm0 I2C"
+                    bool "Enable I2C0"
                     default y
                 config BSP_USING_I2C1
-                    bool "Enable Flexcomm1 I2C"
+                    bool "Enable I2C1"
                     default y
             endif
 

bsp/nxp/mcx/mcxc/frdm-mcxc444/board/MCUX_Config/board/pin_mux.c

@@ -27,12 +27,14 @@ void BOARD_InitPins(void)
     CLOCK_EnableClock(kCLOCK_PortC);
     CLOCK_EnableClock(kCLOCK_PortD);
     CLOCK_EnableClock(kCLOCK_PortE);
-    
-    PORT_SetPinMux(PORTA, 1U, kPORT_MuxAlt2);   /* LPUART0_RX */
-    PORT_SetPinMux(PORTA, 2U, kPORT_MuxAlt2);   /* LPUART0_TX */
-    
-    PORT_SetPinMux(PORTE, 0U, kPORT_MuxAlt3);   /* LPUART1_TX */
-    PORT_SetPinMux(PORTE, 1U, kPORT_MuxAlt3);   /* LPUART1_RX */
+
+    PORT_SetPinMux(PORTA, 4, kPORT_MuxAsGpio);   /* NMI */
+
+    PORT_SetPinMux(PORTA, 1, kPORT_MuxAlt2);   /* LPUART0_RX */
+    PORT_SetPinMux(PORTA, 2, kPORT_MuxAlt2);   /* LPUART0_TX */
+
+    PORT_SetPinMux(PORTE, 0, kPORT_MuxAlt3);   /* LPUART1_TX */
+    PORT_SetPinMux(PORTE, 1, kPORT_MuxAlt3);   /* LPUART1_RX */
 
     SIM->SOPT5 = 0;
 }