Update.

Author: Jiu-xiao

CMakeLists.txt

@@ -108,6 +108,7 @@ set(BIN_FILE ${PROJECT_BINARY_DIR}/${PROJECT_NAME}.bin)
 # libxr
 set(LIBXR_SYSTEM FreeRTOS)
 set(LIBXR_DRIVER ch)
+set(LIBXR_CH32_CONFIG_FILE ch32v30x_conf.h)
 
 add_subdirectory(libxr)
 
@@ -128,12 +129,8 @@ target_include_directories(${PROJECT_NAME}.elf PRIVATE
     PUBLIC User
 )
 
-target_link_libraries(xr
-    PUBLIC
-)
-
 target_link_libraries(${PROJECT_NAME}.elf
-    xr
+    PUBLIC xr
 )
 
 # tinyusb

Core/FreeRTOSConfig.h

@@ -67,7 +67,6 @@
     1 tab == 4 spaces!
 */
 
-
 #ifndef FREERTOS_CONFIG_H
 #define FREERTOS_CONFIG_H
 
@@ -86,6 +85,8 @@
 /* See https://www.freertos.org/Using-FreeRTOS-on-RISC-V.html */
 
 /* don't have MTIME */
+
+// clang-format off
 #define configMTIME_BASE_ADDRESS 	 ( 0 )
 #define configMTIMECMP_BASE_ADDRESS  ( 0 )
 
@@ -96,14 +97,14 @@
 #define configTICK_RATE_HZ				( ( TickType_t ) 1000 )
 #define configMAX_PRIORITIES			( 10 )
 #define configMINIMAL_STACK_SIZE		( ( unsigned short ) 384 ) /* Can be as low as 60 but some of the demo tasks that use this constant require it to be higher. */
-#define configTOTAL_HEAP_SIZE			( ( size_t ) ( 32 * 1024 ) )
+#define configTOTAL_HEAP_SIZE			( ( size_t ) ( 36 * 1024 ) )
 #define configMAX_TASK_NAME_LEN			( 16 )
 #define configUSE_TRACE_FACILITY		1
 #define configUSE_16_BIT_TICKS			0
 #define configIDLE_SHOULD_YIELD			0
 #define configUSE_MUTEXES				1
 #define configQUEUE_REGISTRY_SIZE		8
-#define configCHECK_FOR_STACK_OVERFLOW	3
+#define configCHECK_FOR_STACK_OVERFLOW	1
 #define configUSE_RECURSIVE_MUTEXES		1
 #define configUSE_MALLOC_FAILED_HOOK	0
 #define configUSE_APPLICATION_TASK_TAG	0
@@ -146,5 +147,6 @@ to exclude the API function. */
 header file. */
 #define configASSERT( x ) if( ( x ) == 0 ) { taskDISABLE_INTERRUPTS(); while(1); }
 
+// clang-format on
 
 #endif /* FREERTOS_CONFIG_H */

User/app_main.cpp

@@ -1,60 +1,85 @@
 #include <cmath>
+
+#include "ch32_gpio.hpp"
+#include "ch32_timebase.hpp"
+#include "ch32_uart.hpp"
 #include "ch32v30x_gpio.h"
 #include "libxr.hpp"
-#include "ch32_timebase.hpp"
-#include "tusb.h"
 #include "tinyusb_virtual_uart.hpp"
+#include "tusb.h"
 
 extern "C" void app_main()
 {
-    GPIO_InitTypeDef GPIO_InitStructure = {0};
-
-    RCC_APB2PeriphClockCmd(RCC_APB2Periph_GPIOB, ENABLE);
-    GPIO_InitStructure.GPIO_Pin = GPIO_Pin_4;
-    GPIO_InitStructure.GPIO_Mode = GPIO_Mode_Out_PP;
-    GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz;
-    GPIO_Init(GPIOB, &GPIO_InitStructure);
+  LibXR::CH32Timebase timebase;
 
-    LibXR::CH32Timebase timebase;
+  LibXR::PlatformInit(3, 8192);
 
-    LibXR::PlatformInit(3, 4096);
+  LibXR::CH32GPIO led_b(GPIOB, GPIO_Pin_4);
+  LibXR::CH32GPIO led_r(GPIOA, GPIO_Pin_15);
+  LibXR::CH32GPIO key(GPIOB, GPIO_Pin_3, LibXR::CH32GPIO::Direction::FALL_INTERRUPT,
+                      LibXR::CH32GPIO::Pull::UP, EXTI3_IRQn);
 
-    static LibXR::TinyUSBVirtualUART uart;
-
-    void (*blink_task)(void *) = [](void *)
-    {
-        static bool flag = false;
-        if (flag)
-        {
-            GPIO_SetBits(GPIOB, GPIO_Pin_4);
-            flag = false;
-        }
-        else
-        {
-            GPIO_ResetBits(GPIOB, GPIO_Pin_4);
-            flag = true;
-        }
-        static LibXR::WriteOperation op;
-    };
+  void (*key_cb_fun)(bool, LibXR::GPIO *) = [](bool, LibXR::GPIO *led)
+  {
+    static bool flag = false;
+    flag = !flag;
+    led->Write(flag);
+  };
 
-    LibXR::STDIO::read_ = uart.read_port_;
-    LibXR::STDIO::write_ = uart.write_port_;
+  auto key_cb =
+      LibXR::GPIO::Callback::Create(key_cb_fun, reinterpret_cast<LibXR::GPIO *>(&led_r));
 
-    auto blink_task_handle = LibXR::Timer::CreateTask(blink_task, reinterpret_cast<void *>(0), 500);
-    LibXR::Timer::Add(blink_task_handle);
-    LibXR::Timer::Start(blink_task_handle);
+  key.RegisterCallback(key_cb);
 
-    LibXR::RamFS ramfs;
+  key.DisableInterrupt();
 
-    LibXR::Terminal<> terminal(ramfs);
+  static LibXR::TinyUSBVirtualUART uart;
+  static uint8_t uart1_tx_buffer[64], uart1_rx_buffer[64];
 
-    auto terminal_task_handle = LibXR::Timer::CreateTask(terminal.TaskFun, &terminal, 1);
-    LibXR::Timer::Add(terminal_task_handle);
-    LibXR::Timer::Start(terminal_task_handle);
+  LibXR::CH32UART uart1(CH32_USART2, uart1_rx_buffer, uart1_tx_buffer, GPIOA, GPIO_Pin_2,
+                        GPIOA, GPIO_Pin_3, 0, 25);
 
+  uart1.SetConfig({
+      .baudrate = 115200,
+      .parity = LibXR::UART::Parity::NO_PARITY,
+      .data_bits = 8,
+      .stop_bits = 1,
+  });
 
-    while (1)
+  void (*blink_task)(LibXR::GPIO *) = [](LibXR::GPIO *led)
+  {
+    static bool flag = false;
+    if (flag)
     {
-        LibXR::Thread::Sleep(1000);
+      flag = false;
     }
-}
+    else
+    {
+      flag = true;
+    }
+
+    led->Write(flag);
+  };
+
+  LibXR::STDIO::read_ = uart1.read_port_;
+  LibXR::STDIO::write_ = uart1.write_port_;
+
+  auto blink_task_handle =
+      LibXR::Timer::CreateTask(blink_task, reinterpret_cast<LibXR::GPIO *>(&led_b), 500);
+  LibXR::Timer::Add(blink_task_handle);
+  LibXR::Timer::Start(blink_task_handle);
+
+  LibXR::RamFS ramfs;
+
+  LibXR::Terminal<> terminal(ramfs);
+
+  auto terminal_task_handle = LibXR::Timer::CreateTask(terminal.TaskFun, &terminal, 1);
+  LibXR::Timer::Add(terminal_task_handle);
+  LibXR::Timer::Start(terminal_task_handle);
+  LibXR::WriteOperation op;
+  uart1.Write(LibXR::ConstRawData("Hello World!\r\n"), op);
+  while (1)
+  {
+    LibXR::Thread::Sleep(1000);
+  }
+}

User/main.c

@@ -23,7 +23,7 @@ __attribute__((interrupt)) void USB_HP_CAN1_TX_IRQHandler(void)
   tud_task();
 }
 
-static void DefaultTask(void *pvParameters)
+static void DefaultTask(void* pvParameters)
 {
   (void)(pvParameters);
   app_main();
@@ -65,7 +65,7 @@ int main(void)
   RCC_OTGFSCLKConfig(otg_div);
   RCC_AHBPeriphClockCmd(RCC_AHBPeriph_OTG_FS, ENABLE);
   __enable_irq();
-  xTaskCreate(DefaultTask, "DefaultTask", 4096, NULL, 3, NULL);
+  xTaskCreate(DefaultTask, "DefaultTask", 5000, NULL, 3, NULL);
   vTaskStartScheduler();
   return 0;
 }