From aacd73ba42dfe58706fe83f8521ebe0ff957a79c Mon Sep 17 00:00:00 2001 From: Jie Feng Date: Thu, 24 Jul 2025 22:30:10 +0800 Subject: [PATCH] Add nanoch32v305 --- docs/reference/boards.rst | 3 +- .../boards/ch32v307v_r1_1v0/board.cmake | 0 .../boards/ch32v307v_r1_1v0/board.h | 0 .../boards/ch32v307v_r1_1v0/board.mk | 0 .../ch32v30x/boards/nanoch32v305/board.cmake | 4 ++ hw/bsp/ch32v30x/boards/nanoch32v305/board.h | 48 +++++++++++++++++++ hw/bsp/ch32v30x/boards/nanoch32v305/board.mk | 1 + hw/bsp/{ch32v307 => ch32v30x}/ch32v307.ld | 0 hw/bsp/{ch32v307 => ch32v30x}/ch32v30x_conf.h | 0 hw/bsp/{ch32v307 => ch32v30x}/ch32v30x_it.c | 0 hw/bsp/{ch32v307 => ch32v30x}/ch32v30x_it.h | 0 hw/bsp/{ch32v307 => ch32v30x}/debug_uart.c | 0 hw/bsp/{ch32v307 => ch32v30x}/debug_uart.h | 0 hw/bsp/{ch32v307 => ch32v30x}/family.c | 7 ++- hw/bsp/{ch32v307 => ch32v30x}/family.cmake | 0 hw/bsp/{ch32v307 => ch32v30x}/family.mk | 0 .../{ch32v307 => ch32v30x}/system_ch32v30x.c | 0 .../{ch32v307 => ch32v30x}/system_ch32v30x.h | 0 hw/bsp/{ch32v307 => ch32v30x}/wch-riscv.cfg | 0 tools/get_deps.py | 2 +- 20 files changed, 62 insertions(+), 3 deletions(-) rename hw/bsp/{ch32v307 => ch32v30x}/boards/ch32v307v_r1_1v0/board.cmake (100%) rename hw/bsp/{ch32v307 => ch32v30x}/boards/ch32v307v_r1_1v0/board.h (100%) rename hw/bsp/{ch32v307 => ch32v30x}/boards/ch32v307v_r1_1v0/board.mk (100%) create mode 100644 hw/bsp/ch32v30x/boards/nanoch32v305/board.cmake create mode 100644 hw/bsp/ch32v30x/boards/nanoch32v305/board.h create mode 100644 hw/bsp/ch32v30x/boards/nanoch32v305/board.mk rename hw/bsp/{ch32v307 => ch32v30x}/ch32v307.ld (100%) rename hw/bsp/{ch32v307 => ch32v30x}/ch32v30x_conf.h (100%) rename hw/bsp/{ch32v307 => ch32v30x}/ch32v30x_it.c (100%) rename hw/bsp/{ch32v307 => ch32v30x}/ch32v30x_it.h (100%) rename hw/bsp/{ch32v307 => ch32v30x}/debug_uart.c (100%) rename hw/bsp/{ch32v307 => ch32v30x}/debug_uart.h (100%) rename hw/bsp/{ch32v307 => ch32v30x}/family.c (98%) rename hw/bsp/{ch32v307 => ch32v30x}/family.cmake (100%) rename hw/bsp/{ch32v307 => ch32v30x}/family.mk (100%) rename hw/bsp/{ch32v307 => ch32v30x}/system_ch32v30x.c (100%) rename hw/bsp/{ch32v307 => ch32v30x}/system_ch32v30x.h (100%) rename hw/bsp/{ch32v307 => ch32v30x}/wch-riscv.cfg (100%) diff --git a/docs/reference/boards.rst b/docs/reference/boards.rst index 41e765683..824b1214b 100644 --- a/docs/reference/boards.rst +++ b/docs/reference/boards.rst @@ -326,5 +326,6 @@ ch32v103r_r1_1v0 CH32V103R-R1-1v1 ch32v10x https://github.com/openwch/ch32v10 ch32v203c_r0_1v0 CH32V203C-R0-1v0 ch32v20x https://github.com/openwch/ch32v20x/tree/main/SCHPCB/CH32V203C-R0 ch32v203g_r0_1v0 CH32V203G-R0-1v0 ch32v20x https://github.com/openwch/ch32v20x/tree/main/SCHPCB/CH32V203C-R0 nanoch32v203 nanoCH32V203 ch32v20x https://github.com/wuxx/nanoCH32V203 -ch32v307v_r1_1v0 CH32V307V-R1-1v0 ch32v307 https://github.com/openwch/ch32v307/tree/main/SCHPCB/CH32V307V-R1-1v0 +nanoch32v305 nanoCH32V305 ch32v30x https://github.com/wuxx/nanoCH32V305 +ch32v307v_r1_1v0 CH32V307V-R1-1v0 ch32v30x https://github.com/openwch/ch32v307/tree/main/SCHPCB/CH32V307V-R1-1v0 ================ ================ ======== ===================================================================== ====== diff --git a/hw/bsp/ch32v307/boards/ch32v307v_r1_1v0/board.cmake b/hw/bsp/ch32v30x/boards/ch32v307v_r1_1v0/board.cmake similarity index 100% rename from hw/bsp/ch32v307/boards/ch32v307v_r1_1v0/board.cmake rename to hw/bsp/ch32v30x/boards/ch32v307v_r1_1v0/board.cmake diff --git a/hw/bsp/ch32v307/boards/ch32v307v_r1_1v0/board.h b/hw/bsp/ch32v30x/boards/ch32v307v_r1_1v0/board.h similarity index 100% rename from hw/bsp/ch32v307/boards/ch32v307v_r1_1v0/board.h rename to hw/bsp/ch32v30x/boards/ch32v307v_r1_1v0/board.h diff --git a/hw/bsp/ch32v307/boards/ch32v307v_r1_1v0/board.mk b/hw/bsp/ch32v30x/boards/ch32v307v_r1_1v0/board.mk similarity index 100% rename from hw/bsp/ch32v307/boards/ch32v307v_r1_1v0/board.mk rename to hw/bsp/ch32v30x/boards/ch32v307v_r1_1v0/board.mk diff --git a/hw/bsp/ch32v30x/boards/nanoch32v305/board.cmake b/hw/bsp/ch32v30x/boards/nanoch32v305/board.cmake new file mode 100644 index 000000000..9f5682042 --- /dev/null +++ b/hw/bsp/ch32v30x/boards/nanoch32v305/board.cmake @@ -0,0 +1,4 @@ +function(update_board TARGET) +# target_compile_definitions(${TARGET} PUBLIC +# ) +endfunction() diff --git a/hw/bsp/ch32v30x/boards/nanoch32v305/board.h b/hw/bsp/ch32v30x/boards/nanoch32v305/board.h new file mode 100644 index 000000000..62bbef94c --- /dev/null +++ b/hw/bsp/ch32v30x/boards/nanoch32v305/board.h @@ -0,0 +1,48 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2023 Ha Thach (tinyusb.org) for Adafruit Industries + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +/* metadata: + name: nanoCH32V305 + url: https://github.com/wuxx/nanoCH32V305 +*/ + +#ifndef BOARD_H_ +#define BOARD_H_ + +#ifdef __cplusplus + extern "C" { +#endif + +#define LED_PORT GPIOA +#define LED_PIN GPIO_Pin_3 +#define LED_STATE_ON 0 +#define LED_CLOCK_EN() RCC_APB2PeriphClockCmd(RCC_APB2Periph_GPIOC, ENABLE) + +// TODO UART port + +#ifdef __cplusplus + } +#endif + +#endif diff --git a/hw/bsp/ch32v30x/boards/nanoch32v305/board.mk b/hw/bsp/ch32v30x/boards/nanoch32v305/board.mk new file mode 100644 index 000000000..4e91d8938 --- /dev/null +++ b/hw/bsp/ch32v30x/boards/nanoch32v305/board.mk @@ -0,0 +1 @@ +LD_FILE = $(FAMILY_PATH)/ch32v307.ld diff --git a/hw/bsp/ch32v307/ch32v307.ld b/hw/bsp/ch32v30x/ch32v307.ld similarity index 100% rename from hw/bsp/ch32v307/ch32v307.ld rename to hw/bsp/ch32v30x/ch32v307.ld diff --git a/hw/bsp/ch32v307/ch32v30x_conf.h b/hw/bsp/ch32v30x/ch32v30x_conf.h similarity index 100% rename from hw/bsp/ch32v307/ch32v30x_conf.h rename to hw/bsp/ch32v30x/ch32v30x_conf.h diff --git a/hw/bsp/ch32v307/ch32v30x_it.c b/hw/bsp/ch32v30x/ch32v30x_it.c similarity index 100% rename from hw/bsp/ch32v307/ch32v30x_it.c rename to hw/bsp/ch32v30x/ch32v30x_it.c diff --git a/hw/bsp/ch32v307/ch32v30x_it.h b/hw/bsp/ch32v30x/ch32v30x_it.h similarity index 100% rename from hw/bsp/ch32v307/ch32v30x_it.h rename to hw/bsp/ch32v30x/ch32v30x_it.h diff --git a/hw/bsp/ch32v307/debug_uart.c b/hw/bsp/ch32v30x/debug_uart.c similarity index 100% rename from hw/bsp/ch32v307/debug_uart.c rename to hw/bsp/ch32v30x/debug_uart.c diff --git a/hw/bsp/ch32v307/debug_uart.h b/hw/bsp/ch32v30x/debug_uart.h similarity index 100% rename from hw/bsp/ch32v307/debug_uart.h rename to hw/bsp/ch32v30x/debug_uart.h diff --git a/hw/bsp/ch32v307/family.c b/hw/bsp/ch32v30x/family.c similarity index 98% rename from hw/bsp/ch32v307/family.c rename to hw/bsp/ch32v30x/family.c index 48eb8a38c..bd01f4f46 100644 --- a/hw/bsp/ch32v307/family.c +++ b/hw/bsp/ch32v30x/family.c @@ -122,12 +122,13 @@ void board_init(void) { GPIO_Init(LED_PORT, &GPIO_InitStructure); // Button +#ifdef BUTTON_PORT BUTTON_CLOCK_EN(); GPIO_InitStructure.GPIO_Pin = BUTTON_PIN; GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IPU; GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz; GPIO_Init(BUTTON_PORT, &GPIO_InitStructure); - +#endif /* Enable interrupts globally */ __enable_irq(); @@ -157,7 +158,11 @@ void board_led_write(bool state) { } uint32_t board_button_read(void) { +#ifdef BUTTON_PORT return BUTTON_STATE_ACTIVE == GPIO_ReadInputDataBit(BUTTON_PORT, BUTTON_PIN); +#else + return false; +#endif } int board_uart_read(uint8_t* buf, int len) { diff --git a/hw/bsp/ch32v307/family.cmake b/hw/bsp/ch32v30x/family.cmake similarity index 100% rename from hw/bsp/ch32v307/family.cmake rename to hw/bsp/ch32v30x/family.cmake diff --git a/hw/bsp/ch32v307/family.mk b/hw/bsp/ch32v30x/family.mk similarity index 100% rename from hw/bsp/ch32v307/family.mk rename to hw/bsp/ch32v30x/family.mk diff --git a/hw/bsp/ch32v307/system_ch32v30x.c b/hw/bsp/ch32v30x/system_ch32v30x.c similarity index 100% rename from hw/bsp/ch32v307/system_ch32v30x.c rename to hw/bsp/ch32v30x/system_ch32v30x.c diff --git a/hw/bsp/ch32v307/system_ch32v30x.h b/hw/bsp/ch32v30x/system_ch32v30x.h similarity index 100% rename from hw/bsp/ch32v307/system_ch32v30x.h rename to hw/bsp/ch32v30x/system_ch32v30x.h diff --git a/hw/bsp/ch32v307/wch-riscv.cfg b/hw/bsp/ch32v30x/wch-riscv.cfg similarity index 100% rename from hw/bsp/ch32v307/wch-riscv.cfg rename to hw/bsp/ch32v30x/wch-riscv.cfg diff --git a/tools/get_deps.py b/tools/get_deps.py index 4a980b255..539ab52a9 100755 --- a/tools/get_deps.py +++ b/tools/get_deps.py @@ -204,7 +204,7 @@ deps_optional = { 'ch32v20x'], 'hw/mcu/wch/ch32v307': ['https://github.com/openwch/ch32v307.git', '184f21b852cb95eed58e86e901837bc9fff68775', - 'ch32v307'], + 'ch32v30x'], 'hw/mcu/wch/ch32f20x': ['https://github.com/openwch/ch32f20x.git', '77c4095087e5ed2c548ec9058e655d0b8757663b', 'ch32f20x'],