Merge branch 'master' of github.com:CXSforHPU/rt-thread

Author: CXSforHPU

bsp/stm32/stm32u575-st-nucleo/README.md

@@ -2,7 +2,7 @@
 
 **English** | [中文](README_zh.md)
 
-## MCU: STM32U575ZI @110MHz, 2048 KB FLASH,  786 KB RAM
+## MCU: STM32U575ZI @160MHz, 2048 KB FLASH,  786 KB RAM
 
 The STM32U575xx devices belong to an ultra-low-power microcontrollers family (STM32U5 Series) based on the high-performance Arm® Cortex®-M33 32-bit RISC core. They operate at a frequency of up to 160 MHz.
 

bsp/stm32/stm32u585-iot02a/README.md

@@ -1,4 +1,4 @@
-# 第一部分：NUCLEO-U575ZI-Q 开发板 BSP 说明
+# 第一部分：STM32 B-U585I-IOT02A 开发板 BSP 说明
 
 [English](README.md) | **中文**
 

bsp/stm32/stm32u585-iot02a/README_zh.md

@@ -167,7 +167,8 @@ struct rt_device *fal_blk_device_create(const char *parition_name)
         return NULL;
     }
 
-    if ((fal_flash = fal_flash_device_find(fal_part->flash_name)) == NULL)
+    fal_flash = fal_flash_device_find(fal_part->flash_name);
+    if (fal_flash == NULL)
     {
         LOG_E("Error: the flash device name (%s) is not found.", fal_part->flash_name);
         return NULL;
@@ -309,7 +310,8 @@ struct rt_device *fal_mtd_nor_device_create(const char *parition_name)
         return NULL;
     }
 
-    if ((fal_flash = fal_flash_device_find(fal_part->flash_name)) == NULL)
+    fal_flash = fal_flash_device_find(fal_part->flash_name);
+    if (fal_flash == NULL)
     {
         LOG_E("Error: the flash device name (%s) is not found.", fal_part->flash_name);
         return NULL;
@@ -620,19 +622,24 @@ static void fal(rt_uint8_t argc, char **argv) {
             if (argc >= 3)
             {
                 char *dev_name = argv[2];
-                if ((flash_dev = fal_flash_device_find(dev_name)) != NULL)
+                flash_dev = fal_flash_device_find(dev_name);
+                if (flash_dev != NULL)
                 {
                     part_dev = NULL;
                 }
-                else if ((part_dev = fal_partition_find(dev_name)) != NULL)
-                {
-                    flash_dev = NULL;
-                }
                 else
                 {
-                    rt_kprintf("Device %s NOT found. Probe failed.\n", dev_name);
-                    flash_dev = NULL;
-                    part_dev = NULL;
+                    part_dev = fal_partition_find(dev_name);
+                    if (part_dev != NULL)
+                    {
+                        flash_dev = NULL;
+                    }
+                    else
+                    {
+                        rt_kprintf("Device %s NOT found. Probe failed.\n", dev_name);
+                        flash_dev = NULL;
+                        part_dev = NULL;
+                    }
                 }
             }
 

components/fal/src/fal_rtt.c

@@ -783,6 +783,13 @@ void rt_components_board_init(void);
 #else
 int rt_kprintf(const char *fmt, ...);
 void rt_kputs(const char *str);
+#ifdef RT_USING_CONSOLE_OUTPUT_CTL
+void rt_console_output_set_enabled(rt_bool_t enabled);
+rt_bool_t rt_console_output_get_enabled(void);
+#else
+#define rt_console_output_set_enabled(enabled) ((void)0)
+#define rt_console_output_get_enabled()        (RT_TRUE)
+#endif /* RT_USING_CONSOLE_OUTPUT_CTL */
 #endif /* RT_USING_CONSOLE */
 
 rt_err_t rt_backtrace(void);

include/rtthread.h

@@ -430,6 +430,18 @@ if RT_USING_CONSOLE
         string "the device name for console"
         default "uart1"
 
+    config RT_USING_CONSOLE_OUTPUT_CTL
+        bool "Enable runtime console output control"
+        default y
+        help
+            Enable runtime control for console output.
+            When enabled, rt_console_output_set_enabled() and
+            rt_console_output_get_enabled() can be used to switch
+            rt_kputs()/rt_kprintf() output on or off dynamically.
+
+            When disabled, these APIs are not compiled as real symbols and
+            output path has no runtime check, so console output stays enabled.
+
 endif
 
 config RT_VER_NUM

src/Kconfig

@@ -208,6 +208,32 @@ rt_device_t rt_console_set_device(const char *name)
 RTM_EXPORT(rt_console_set_device);
 #endif /* RT_USING_DEVICE */
 
+#ifdef RT_USING_CONSOLE_OUTPUT_CTL
+static volatile rt_bool_t _console_output_enabled = RT_TRUE;
+
+/**
+ * @brief Enable or disable console log output.
+ *
+ * @param enabled RT_TRUE to enable output, RT_FALSE to disable output.
+ */
+void rt_console_output_set_enabled(rt_bool_t enabled)
+{
+    _console_output_enabled = enabled;
+}
+RTM_EXPORT(rt_console_output_set_enabled);
+
+/**
+ * @brief Get current console log output enable state.
+ *
+ * @return RT_TRUE if output is enabled, RT_FALSE otherwise.
+ */
+rt_bool_t rt_console_output_get_enabled(void)
+{
+    return _console_output_enabled;
+}
+RTM_EXPORT(rt_console_output_get_enabled);
+#endif /* RT_USING_CONSOLE_OUTPUT_CTL */
+
 rt_weak void rt_hw_console_output(const char *str)
 {
     /* empty console output */
@@ -346,6 +372,11 @@ void rt_kputs(const char *str)
         return;
     }
 
+    if (!rt_console_output_get_enabled())
+    {
+        return;
+    }
+
     _kputs(str, rt_strlen(str));
 }
 
@@ -362,6 +393,11 @@ rt_weak int rt_kprintf(const char *fmt, ...)
     rt_size_t length = 0;
     static char rt_log_buf[RT_CONSOLEBUF_SIZE];
 
+    if (!rt_console_output_get_enabled())
+    {
+        return 0;
+    }
+
     va_start(args, fmt);
     PRINTF_BUFFER_TAKE;