add button support

2 files changed, 92 insertions, 29 deletions

diff --git a/hw/bsp/ch32v307/boards/ch32v307v-r1-1v0/board.h b/hw/bsp/ch32v307/boards/ch32v307v-r1-1v0/board.h
new file mode 100644
index 000000000..0eab34916
--- /dev/null
+++ b/hw/bsp/ch32v307/boards/ch32v307v-r1-1v0/board.h
@@ -0,0 +1,50 @@
+/* 
+ * 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.
+ */
+
+#ifndef BOARD_H_
+#define BOARD_H_
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+// LED: need to wire pin LED1 to PC0 in the J3 header
+#define LED_PORT              GPIOC
+#define LED_PIN               GPIO_Pin_0
+#define LED_STATE_ON          0
+#define LED_CLOCK_EN()        RCC_APB2PeriphClockCmd(RCC_APB2Periph_GPIOC, ENABLE)
+
+// Button: need to wire pin KEY to PC1 in the J3 header
+#define BUTTON_PORT           GPIOC
+#define BUTTON_PIN            GPIO_Pin_1
+#define BUTTON_STATE_ACTIVE   0
+#define BUTTON_CLOCK_EN()     do { } while(0) // same as LED clock, no need to do anything
+
+// TODO UART port
+
+#ifdef __cplusplus
+ }
+#endif
+
+#endif
diff --git a/hw/bsp/ch32v307/family.c b/hw/bsp/ch32v307/family.c
index 0260918ab..65519ce50 100644
--- a/hw/bsp/ch32v307/family.c
+++ b/hw/bsp/ch32v307/family.c
@@ -28,19 +28,22 @@
 #include "debug_uart.h"
 #include "ch32v30x.h"
 
-#include "../board.h"
+#include "bsp/board.h"
+#include "board.h"
 
 //--------------------------------------------------------------------+
 // Forward USB interrupt events to TinyUSB IRQ Handler
 //--------------------------------------------------------------------+
 
-void USBHS_IRQHandler(void) __attribute__((naked));
-void USBHS_IRQHandler(void) { 
-        __asm volatile ("call USBHS_IRQHandler_impl; mret");
+void USBHS_IRQHandler (void) __attribute__((naked));
+void USBHS_IRQHandler (void)
+{
+  __asm volatile ("call USBHS_IRQHandler_impl; mret");
 }
 
-__attribute__ ((used)) void USBHS_IRQHandler_impl(void) { 
-  tud_int_handler(0); 
+__attribute__ ((used)) void USBHS_IRQHandler_impl (void)
+{
+  tud_int_handler(0);
 }
 
 //--------------------------------------------------------------------+
@@ -49,13 +52,13 @@ __attribute__ ((used)) void USBHS_IRQHandler_impl(void) {
 
 uint32_t SysTick_Config(uint32_t ticks)
 {
-    NVIC_EnableIRQ(SysTicK_IRQn);
-    SysTick->CTLR=0;
-    SysTick->SR=0;
-    SysTick->CNT=0;
-    SysTick->CMP=ticks-1;
-    SysTick->CTLR=0xF;
-    return 0;
+  NVIC_EnableIRQ(SysTicK_IRQn);
+  SysTick->CTLR=0;
+  SysTick->SR=0;
+  SysTick->CNT=0;
+  SysTick->CMP=ticks-1;
+  SysTick->CTLR=0xF;
+  return 0;
 }
 
 void board_init(void) {
@@ -63,7 +66,6 @@ void board_init(void) {
   /* Disable interrupts during init */
   __disable_irq();
 
-
 #if CFG_TUSB_OS == OPT_OS_NONE
   SysTick_Config(SystemCoreClock / 1000);
 #endif
@@ -79,11 +81,19 @@ void board_init(void) {
 
   GPIO_InitTypeDef GPIO_InitStructure = {0};
 
-  RCC_APB2PeriphClockCmd(RCC_APB2Periph_GPIOC, ENABLE);
-  GPIO_InitStructure.GPIO_Pin = GPIO_Pin_0;
+  // LED
+  LED_CLOCK_EN();
+  GPIO_InitStructure.GPIO_Pin = LED_PIN;
   GPIO_InitStructure.GPIO_Mode = GPIO_Mode_Out_OD;
   GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz;
-  GPIO_Init(GPIOC, &GPIO_InitStructure);
+  GPIO_Init(LED_PORT, &GPIO_InitStructure);
+
+  // Button
+  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);
 
   /* Enable interrupts globally */
   __enable_irq();
@@ -114,26 +124,29 @@ uint32_t board_millis(void) { return system_ticks; }
 // Board porting API
 //--------------------------------------------------------------------+
 
-void board_led_write(bool state) {
-  (void) state;
-
-  GPIO_WriteBit(GPIOC, GPIO_Pin_0, state);
+void board_led_write (bool state)
+{
+  GPIO_WriteBit(LED_PORT, LED_PIN, state);
 }
 
-uint32_t board_button_read(void) {
-  return false;
+uint32_t board_button_read (void)
+{
+  return BUTTON_STATE_ACTIVE == GPIO_ReadInputDataBit(BUTTON_PORT, BUTTON_PIN);
 }
 
-int board_uart_read(uint8_t* buf, int len) {
-  (void)buf;
-  (void)len;
+int board_uart_read (uint8_t *buf, int len)
+{
+  (void) buf;
+  (void) len;
   return 0;
 }
 
-int board_uart_write(void const* buf, int len) {
+int board_uart_write (void const *buf, int len)
+{
   int txsize = len;
-  while (txsize--) {
-    uart_write(*(uint8_t const*)buf);
+  while ( txsize-- )
+  {
+    uart_write(*(uint8_t const*) buf);
     buf++;
   }
   return len;