Merge pull request #4618 from mysterywolf/key

[stm32 pandora] implement drv_key and modify drv_sdcard

bsp/stm32/stm32l475-atk-pandora/board/Kconfig

@@ -15,6 +15,13 @@ menu "Onboard Peripheral Drivers"
         select BSP_USING_UART1
         default y
 
+    config BSP_USING_KEY
+        bool "Enable onboard keys"
+        select RT_USING_PIN
+        select RT_USING_TIMER_SOFT
+        select PKG_USING_MULTIBUTTON
+        default n
+
     config BSP_USING_QSPI_FLASH
         bool "Enable QSPI FLASH (W25Q128 qspi1)"
         select BSP_USING_QSPI

bsp/stm32/stm32l475-atk-pandora/board/SConscript

@@ -12,6 +12,9 @@ board.c
 CubeMX_Config/Src/stm32l4xx_hal_msp.c
 ''')
 
+if GetDepend('BSP_USING_KEY'):
+    src = src + ['ports/drv_key.c']
+
 if GetDepend(['BSP_USING_QSPI_FLASH']):
     src += Glob('ports/drv_qspi_flash.c')
     
@@ -19,7 +22,7 @@ if GetDepend('BSP_USING_SPI_LCD'):
     src = src + ['ports/drv_lcd.c']
 
 if GetDepend(['BSP_USING_SDCARD']):
-    src += Glob('ports/sdcard_port.c')
+    src += Glob('ports/drv_sdcard.c')
 
 if GetDepend(['BSP_USING_ICM20608']) or GetDepend(['BSP_USING_AHT10']):
     src += Glob('ports/sensor_port.c')

bsp/stm32/stm32l475-atk-pandora/board/ports/drv_key.c

@@ -0,0 +1,122 @@
+/*
+ * Copyright (c) 2006-2021, RT-Thread Development Team
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Change Logs:
+ * Date           Author            Notes
+ * 2021-04-17     Meco Man          first version
+ */
+#include <rtthread.h>
+
+#ifdef BSP_USING_KEY
+#define DBG_TAG    "KEY"
+#define DBG_LVL    DBG_INFO
+#include <rtdbg.h>
+#include <rtdevice.h>
+#include <drv_gpio.h>
+#include <multi_button.h>
+
+#define KEY0_PIN        GET_PIN(D, 10)
+#define KEY1_PIN        GET_PIN(D, 9)
+#define KEY2_PIN        GET_PIN(D, 8)
+#define KEY_WKUP_PIN    GET_PIN(C, 13)
+
+static struct rt_timer key_timer;
+
+static struct button key0;
+static struct button key1;
+static struct button key2;
+static struct button key_wkup;
+
+/*---- user codes area begin ----*/
+/*users can modify according to needs*/
+static void key0_BtnCallback(void* state)
+{
+    rt_kprintf("key0!\n");
+}
+
+static void key1_BtnCallback(void* state)
+{
+    rt_kprintf("key1!\n");
+}
+
+static void key2_BtnCallback(void* state)
+{
+    rt_kprintf("key2!\n");
+}
+
+static void key_wkup_BtnCallback(void* state)
+{
+    rt_kprintf("key wkup!\n");
+}
+/*---- user codes area end ----*/
+
+static void _cb_key_timer(void *parameter)
+{
+    button_ticks();
+}
+
+static uint8_t _cb_key0_pin_level(void)
+{
+    return rt_pin_read(KEY0_PIN);
+}
+
+static uint8_t _cb_key1_pin_level(void)
+{
+    return rt_pin_read(KEY1_PIN);
+}
+
+static uint8_t _cb_key2_pin_level(void)
+{
+    return rt_pin_read(KEY2_PIN);
+}
+
+static uint8_t _cb_key_wkup_pin_level(void)
+{
+    return rt_pin_read(KEY_WKUP_PIN);
+}
+
+static int onboard_key_init(void)
+{
+    rt_timer_init(&key_timer,
+                  "key timer",
+                  _cb_key_timer,
+                  RT_NULL,
+                  rt_tick_from_millisecond(TICKS_INTERVAL),
+                  RT_TIMER_FLAG_PERIODIC | RT_TIMER_FLAG_SOFT_TIMER);
+
+    if(rt_timer_start(&key_timer) < 0)
+    {
+        LOG_E("drv_key timer initialization failed");
+        return -1;
+    }
+
+    rt_pin_mode(KEY0_PIN, PIN_MODE_INPUT);
+    rt_pin_mode(KEY1_PIN, PIN_MODE_INPUT);
+    rt_pin_mode(KEY2_PIN, PIN_MODE_INPUT);
+    rt_pin_mode(KEY_WKUP_PIN, PIN_MODE_INPUT);
+
+    button_init(&key0, _cb_key0_pin_level, PIN_LOW);
+    button_init(&key1, _cb_key1_pin_level, PIN_LOW);
+    button_init(&key2, _cb_key2_pin_level, PIN_LOW);
+    button_init(&key_wkup, _cb_key_wkup_pin_level, PIN_HIGH);
+
+    /*---- user codes area begin ----*/
+    /*users can modify according to needs*/
+    button_attach(&key0, PRESS_DOWN, key0_BtnCallback);
+    button_attach(&key1, PRESS_DOWN, key1_BtnCallback);
+    button_attach(&key2, PRESS_DOWN, key2_BtnCallback);
+    button_attach(&key_wkup, PRESS_UP, key_wkup_BtnCallback);
+    /*---- user codes area end ----*/
+
+    button_start(&key0);
+    button_start(&key1);
+    button_start(&key2);
+    button_start(&key_wkup);
+
+    return 0;
+}
+INIT_APP_EXPORT(onboard_key_init);
+
+#endif

bsp/stm32/stm32l475-atk-pandora/board/ports/drv_sdcard.c

@@ -23,7 +23,7 @@
 #define DBG_LVL DBG_INFO
 #include <rtdbg.h>
 
-void sd_mount(void *parameter)
+static void sd_mount(void *parameter)
 {
     while (1)
     {
@@ -43,7 +43,7 @@ void sd_mount(void *parameter)
     }
 }
 
-int stm32_sdcard_mount(void)
+static int onboard_sdcard_mount(void)
 {
     rt_thread_t tid;
 
@@ -67,7 +67,7 @@ int stm32_sdcard_mount(void)
 
     return RT_EOK;
 }
-INIT_APP_EXPORT(stm32_sdcard_mount);
+INIT_APP_EXPORT(onboard_sdcard_mount);
 
 static int rt_hw_spi1_tfcard(void)
 {

components/drivers/misc/pin.c

@@ -47,7 +47,7 @@ static rt_size_t _pin_write(rt_device_t dev, rt_off_t pos, const void *buffer, r
     return size;
 }
 
-static rt_err_t  _pin_control(rt_device_t dev, int cmd, void *args)
+static rt_err_t _pin_control(rt_device_t dev, int cmd, void *args)
 {
     struct rt_device_pin_mode *mode;
     struct rt_device_pin *pin = (struct rt_device_pin *)dev;
@@ -111,6 +111,7 @@ rt_err_t rt_pin_attach_irq(rt_int32_t pin, rt_uint32_t mode,
     }
     return -RT_ENOSYS;
 }
+
 rt_err_t rt_pin_detach_irq(rt_int32_t pin)
 {
     RT_ASSERT(_hw_pin.ops != RT_NULL);
@@ -146,7 +147,7 @@ void rt_pin_write(rt_base_t pin, rt_base_t value)
 }
 FINSH_FUNCTION_EXPORT_ALIAS(rt_pin_write, pinWrite, write value to hardware pin);
 
-int  rt_pin_read(rt_base_t pin)
+int rt_pin_read(rt_base_t pin)
 {
     RT_ASSERT(_hw_pin.ops != RT_NULL);
     return _hw_pin.ops->pin_read(&_hw_pin.parent, pin);
@@ -166,4 +167,3 @@ rt_base_t rt_pin_get(const char *name)
     return _hw_pin.ops->pin_get(name);
 }
 FINSH_FUNCTION_EXPORT_ALIAS(rt_pin_get, pinGet, get pin number from hardware pin);
-