[finsh/msh] Add user commands support

onelife · onelife · commit 372038ae6503 · 2021-05-02T22:08:42.000+08:00
diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=RT-Thread
-version=0.9.0
+version=0.9.1
 author=onelife <onelife.real@gmail.com>, Bernard Xiong <bernard.xiong@gmail.com>
 maintainer=onelife <onelife.real@gmail.com>
 sentence=Real Time Operating System porting for Arduino SAM and SAMD boards
diff --git a/src/components/arduino/drv_button.cpp b/src/components/arduino/drv_button.cpp
@@ -41,7 +41,7 @@ typedef void (*rx_indicator)(void);
 #else /* RT_USING_ULOG */
 # define LOG_E(format, args...)         rt_kprintf(format "\n", ##args)
 # define LOG_W                          LOG_E
-# ifdef BSP_SPI_DEBUG
+# ifdef BSP_BUTTON_DEBUG
 #  define LOG_D(format, args...)        rt_kprintf(format "\n", ##args)
 # else
 #  define LOG_D(format, args...)
diff --git a/src/components/arduino/drv_iic.cpp b/src/components/arduino/drv_iic.cpp
@@ -36,7 +36,7 @@ extern "C" {
 #else /* RT_USING_ULOG */
 # define LOG_E(format, args...)     rt_kprintf(format "\n", ##args)
 # define LOG_W                      LOG_E
-# ifdef BSP_SPI_DEBUG
+# ifdef BSP_IIC_DEBUG
 #  define LOG_I(format, args...)    rt_kprintf(format "\n", ##args)
 # else
 #  define LOG_I(format, args...)
diff --git a/src/components/arduino/drv_iic_ft6206.cpp b/src/components/arduino/drv_iic_ft6206.cpp
@@ -43,7 +43,7 @@ typedef void (*rx_indicator)(void);
 #else /* RT_USING_ULOG */
 # define LOG_E(format, args...)         rt_kprintf(format "\n", ##args)
 # define LOG_W                          LOG_E
-# ifdef BSP_SPI_DEBUG
+# ifdef BSP_FT6206_DEBUG
 #  define LOG_D(format, args...)        rt_kprintf(format "\n", ##args)
 # else
 #  define LOG_D(format, args...)
diff --git a/src/components/arduino/drv_rtc.cpp b/src/components/arduino/drv_rtc.cpp
@@ -40,7 +40,7 @@ extern "C" {
 #else /* RT_USING_ULOG */
 # define LOG_E(format, args...)     rt_kprintf(format "\n", ##args)
 # define LOG_W                      LOG_E
-# ifdef BSP_SPI_DEBUG
+# ifdef BSP_RTC_DEBUG
 #  define LOG_I(format, args...)    rt_kprintf(format "\n", ##args)
 # else
 #  define LOG_I(format, args...)
diff --git a/src/components/arduino/drv_spi_ssd1306.cpp b/src/components/arduino/drv_spi_ssd1306.cpp
@@ -31,7 +31,7 @@ extern "C" {
 /* Private typedef -----------------------------------------------------------*/
 /* Private define ------------------------------------------------------------*/
 #ifdef RT_USING_ULOG
-# ifdef BSP_SSD_DEBUG
+# ifdef BSP_SSD1306_DEBUG
 #  define LOG_LVL                   LOG_LVL_DBG
 # else
 #  define LOG_LVL                   LOG_LVL_INFO
@@ -41,7 +41,7 @@ extern "C" {
 #else /* RT_USING_ULOG */
 # define LOG_E(format, args...)     rt_kprintf(format "\n", ##args)
 # define LOG_W                      LOG_E
-# ifdef BSP_SPI_DEBUG
+# ifdef BSP_SSD_DEBUG
 #  define LOG_D(format, args...)    rt_kprintf(format "\n", ##args)
 # else
 #  define LOG_D(format, args...)
diff --git a/src/components/arduino/drv_spi_ssd1331.cpp b/src/components/arduino/drv_spi_ssd1331.cpp
@@ -31,7 +31,7 @@ extern "C" {
 /* Private typedef -----------------------------------------------------------*/
 /* Private define ------------------------------------------------------------*/
 #ifdef RT_USING_ULOG
-# ifdef BSP_SSD_DEBUG
+# ifdef BSP_SSD1331_DEBUG
 #  define LOG_LVL                   LOG_LVL_DBG
 # else
 #  define LOG_LVL                   LOG_LVL_INFO
@@ -41,7 +41,7 @@ extern "C" {
 #else /* RT_USING_ULOG */
 # define LOG_E(format, args...)     rt_kprintf(format "\n", ##args)
 # define LOG_W                      LOG_E
-# ifdef BSP_SPI_DEBUG
+# ifdef BSP_SSD_DEBUG
 #  define LOG_D(format, args...)    rt_kprintf(format "\n", ##args)
 # else
 #  define LOG_D(format, args...)
diff --git a/src/components/arduino/drv_spi_st7735.cpp b/src/components/arduino/drv_spi_st7735.cpp
@@ -40,7 +40,7 @@ extern "C" {
 #else /* RT_USING_ULOG */
 # define LOG_E(format, args...)     rt_kprintf(format "\n", ##args)
 # define LOG_W                      LOG_E
-# ifdef BSP_SPI_DEBUG
+# ifdef BSP_ST7735_DEBUG
 #  define LOG_D(format, args...)    rt_kprintf(format "\n", ##args)
 # else
 #  define LOG_D(format, args...)
diff --git a/src/components/arduino/drv_spiili.cpp b/src/components/arduino/drv_spiili.cpp
@@ -41,7 +41,7 @@ extern "C" {
 #else /* RT_USING_ULOG */
 # define LOG_E(format, args...)     rt_kprintf(format "\n", ##args)
 # define LOG_W                      LOG_E
-# ifdef BSP_SPI_DEBUG
+# ifdef BSP_ILI_DEBUG
 #  define LOG_D(format, args...)    rt_kprintf(format "\n", ##args)
 # else
 #  define LOG_D(format, args...)
diff --git a/src/include/rtlibc.h b/src/include/rtlibc.h
@@ -13,13 +13,14 @@
 
 /* definitions for libc if toolchain has no these definitions */
 #include "libc/libc_stat.h"
-#if defined(CONFIG_ARDUINO) && defined(ARDUINO_ARCH_STM32)
+#if defined(CONFIG_ARDUINO) && defined(CONFIG_NO_ERRNO)
 # include "errno.h"
 #else
 # include "libc/libc_errno.h"
 #endif
-
-#include "libc/libc_fcntl.h"
+#if !(defined(CONFIG_ARDUINO) && defined(CONFIG_NO_FCNTL))
+# include "libc/libc_fcntl.h"
+#endif
 #include "libc/libc_ioctl.h"
 #include "libc/libc_dirent.h"
 #include "libc/libc_signal.h"
diff --git a/src/rtconfig.h b/src/rtconfig.h
@@ -121,6 +121,12 @@
 # define CONFIG_GUI_HIGH                (64)
 #endif /* CONFIG_USING_SSD1306_SPI4 */
 
+/* STM32duino */
+#ifdef ARDUINO_ARCH_STM32
+# define CONFIG_NO_ERRNO
+# define RT_TICK_PER_SECOND             (1000)
+#endif /* ARDUINO_ARCH_STM32 */
+
 
 /* Arduino Config */
 
@@ -131,10 +137,24 @@
 # ifndef CONFIG_PRIORITY_MAX
 #  define CONFIG_PRIORITY_MAX           (3)     /* NVIC */
 # endif
-#ifndef CONFIG_KERNEL_PRIORITY
-# define CONFIG_KERNEL_PRIORITY         (2)     /* Platform */
+# ifndef CONFIG_KERNEL_PRIORITY
+#  define CONFIG_KERNEL_PRIORITY        (2)     /* Platform */
+# endif
+#endif /* defined(ARDUINO_ARCH_SAM) || defined(ARDUINO_ARCH_SAMD) || defined(ARDUINO_ARCH_STM32) */
+
+#if defined(ARDUINO_ARCH_SAM)
+# define SERIAL_IRQn                    (UART_IRQn)
+#elif defined(ARDUINO_ARCH_SAMD)
+# define SERIAL_IRQn                    (USB_IRQn)
+#elif defined(ARDUINO_ARCH_STM32)
+# if defined(ARDUINO_NUCLEO_F767ZI)
+#  define SERIAL_IRQn                   (USART3_IRQn)
+# endif
+#elif defined(ARDUINO_ARCH_RISCV)
+ /* none */
+#else
+# warning "Unsupported architecture!"
 #endif
-#endif /* defined(ARDUINO_ARCH_SAM) || defined(ARDUINO_ARCH_SAMD) */
 
 #ifndef CONFIG_HEAP_SIZE
 # ifdef ARDUINO_ARCH_SAM
@@ -353,19 +373,21 @@
 #define RT_NAME_MAX                     (16)
 #define RT_ALIGN_SIZE                   (4)
 #define RT_THREAD_PRIORITY_MAX          (32)
-#define RT_TICK_PER_SECOND              (100)
+#ifndef RT_TICK_PER_SECOND
+# define RT_TICK_PER_SECOND             (100)
+#endif
 
 
 /* Arduino Thread Config */
 
 #ifndef CONFIG_ARDUINO_STACK_SIZE
-# define CONFIG_ARDUINO_STACK_SIZE      (3 * 512)
+# define CONFIG_ARDUINO_STACK_SIZE      (4 * 512)
 #endif
 #ifndef CONFIG_ARDUINO_PRIORITY
 # define CONFIG_ARDUINO_PRIORITY        (RT_THREAD_PRIORITY_MAX >> 1)
 #endif
 #ifndef CONFIG_ARDUINO_TICK
-# define CONFIG_ARDUINO_TICK            (15)
+# define CONFIG_ARDUINO_TICK            (RT_TICK_PER_SECOND / 10)
 #endif
 
 
@@ -379,19 +401,19 @@
 /* Utility Config */
 
 #define RT_USING_DEVICE                 /* Required by IPC, DRV */
-#define RT_USING_MUTEX                  /* Required by DFS, DRV */
-#define RT_USING_SEMAPHORE              /* Required by FINSH */
+#define RT_USING_MUTEX                  /* Required by DFS, DRV, CMSIS-OS */
+#define RT_USING_SEMAPHORE              /* Required by FINSH, CMSIS-OS */
 #define RT_USING_MAILBOX                /* Required by GUI */
-// #define RT_USING_MESSAGEQUEUE           /* Required by ? */
-// #define RT_USING_EVENT                  /* Required by ? */
+// #define RT_USING_MESSAGEQUEUE           /* Required by CMSIS-OS */
+// #define RT_USING_EVENT                  /* Required by CMSIS-OS */
 // #define RT_USING_SIGNALS                /* Required by ? */
 // #define RT_USING_HOOK
 // #define RT_USING_IDLE_HOOK
 
 
 /* Memory Management Config */
 
-#define RT_USING_MEMPOOL                /* Required by SIG, GUI */
+#define RT_USING_MEMPOOL                /* Required by SIG, GUI, CMSIS-OS */
 // #define RT_USING_MEMHEAP
 #define RT_USING_HEAP
 #define RT_USING_SMALL_MEM
diff --git a/src/rtt.cpp b/src/rtt.cpp
@@ -34,12 +34,6 @@
 #  define CONSOLE_DEVICE    CONFIG_SERIAL_DEVICE
 # endif
 
-#if defined(ARDUINO_ARCH_STM32)
-# if defined(ARDUINO_NUCLEO_F767ZI)
-#  define SERIAL_IRQn       (USART3_IRQn)
-# endif
-#endif
-
 
 # if CONFIG_USING_CONSOLE
 /* === Map Arduino "Serial" to RT-Thread Device === */
@@ -392,7 +386,7 @@ void arduino_thread_entry(void *param) {
         #if !CONFIG_USING_DRIVER_SERIAL
             if (serialEventRun) serialEventRun();
         #endif
-        rt_thread_sleep(1);
+        rt_thread_sleep(RT_TICK_PER_SECOND / 100);
     }
 }
 
@@ -431,20 +425,10 @@ void loop(void) { rt_thread_sleep(RT_TICK_PER_SECOND); }
 /* === RT-Thread Class === */
 
 void RT_Thread::begin(void) {
-    #if defined(ARDUINO_ARCH_SAM)
-        NVIC_SetPriority(UART_IRQn, CONFIG_PRIORITY_MAX);
-    #elif defined(ARDUINO_ARCH_SAMD)
-        NVIC_SetPriority(USB_IRQn, CONFIG_PRIORITY_MAX);
-    #elif defined(ARDUINO_ARCH_STM32)
-        NVIC_SetPriority(SERIAL_IRQn, CONFIG_PRIORITY_MAX);
-    #elif defined(ARDUINO_ARCH_RISCV)
-        /* none */
-    #else
-        #warning "Unsupported architecture!"
-    #endif
     #if defined(ARDUINO_ARCH_SAM) || defined(ARDUINO_ARCH_SAMD) || defined(ARDUINO_ARCH_STM32)
     NVIC_SetPriority(SysTick_IRQn, CONFIG_KERNEL_PRIORITY);
     NVIC_SetPriority(PendSV_IRQn, CONFIG_KERNEL_PRIORITY);
+    NVIC_SetPriority(SERIAL_IRQn, CONFIG_PRIORITY_MAX);
     #endif
 
     /* disable interrupt*/
diff --git a/src/shell_cmd.h b/src/shell_cmd.h
@@ -109,6 +109,10 @@ ADD_MSH_CMD(prtscn, capture screen, prtscn, int, int argc, char **argv)
 # endif
 #endif
 
+#if __has_include("user_cmd.h")
+# include "user_cmd.h"
+#endif
+
 
 /* Please add your commands with the following format:
 

-Original file line number
+Diff line change
@@ @@ -1,5 +1,5 @@ @@
 name=RT-Thread
 -version=0.9.0
 +version=0.9.1
 author=onelife <[email protected]>, Bernard Xiong <[email protected]>
 maintainer=onelife <[email protected]>
 sentence=Real Time Operating System porting for Arduino SAM and SAMD boards