Merge pull request #1315 from TanekLiang/v2m-update-pin

[bsp][v2m-mps2] add pin device support and update project files

bsp/v2m-mps2/.config

@@ -76,6 +76,7 @@ CONFIG_FINSH_USING_HISTORY=y
 CONFIG_FINSH_HISTORY_LINES=5
 CONFIG_FINSH_USING_SYMTAB=y
 CONFIG_FINSH_USING_DESCRIPTION=y
+# CONFIG_FINSH_ECHO_DISABLE_DEFAULT is not set
 CONFIG_FINSH_THREAD_PRIORITY=20
 CONFIG_FINSH_THREAD_STACK_SIZE=4096
 CONFIG_FINSH_CMD_SIZE=80
@@ -98,7 +99,7 @@ CONFIG_RT_USING_SERIAL=y
 # CONFIG_RT_USING_HWTIMER is not set
 # CONFIG_RT_USING_CPUTIME is not set
 # CONFIG_RT_USING_I2C is not set
-# CONFIG_RT_USING_PIN is not set
+CONFIG_RT_USING_PIN=y
 # CONFIG_RT_USING_MTD_NOR is not set
 # CONFIG_RT_USING_MTD_NAND is not set
 # CONFIG_RT_USING_RTC is not set
@@ -118,6 +119,7 @@ CONFIG_RT_USING_SERIAL=y
 #
 CONFIG_RT_USING_LIBC=y
 # CONFIG_RT_USING_PTHREADS is not set
+# CONFIG_HAVE_SYS_SIGNALS is not set
 
 #
 # Network stack
@@ -133,11 +135,6 @@ CONFIG_RT_USING_LIBC=y
 #
 # CONFIG_RT_USING_MODBUS is not set
 
-#
-# RT-Thread UI Engine
-#
-# CONFIG_PKG_USING_GUIENGINE is not set
-
 #
 # VBUS(Virtual Software BUS)
 #
@@ -162,8 +159,14 @@ CONFIG_RT_USING_LIBC=y
 #
 # system packages
 #
-# CONFIG_PKG_USING_PARTITION is not set
+
+#
+# RT-Thread GUI Engine
+#
+# CONFIG_PKG_USING_GUIENGINE is not set
 # CONFIG_PKG_USING_PERSIMMON is not set
+# CONFIG_PKG_USING_LWEXT4 is not set
+# CONFIG_PKG_USING_PARTITION is not set
 # CONFIG_PKG_USING_SQLITE is not set
 # CONFIG_PKG_USING_RTI is not set
 
@@ -194,6 +197,8 @@ CONFIG_RT_USING_LIBC=y
 #
 # CONFIG_PKG_USING_WLAN_WICED is not set
 # CONFIG_PKG_USING_COAP is not set
+# CONFIG_PKG_USING_NOPOLL is not set
+# CONFIG_PKG_USING_NETUTILS is not set
 
 #
 # security packages
@@ -206,7 +211,43 @@ CONFIG_RT_USING_LIBC=y
 # language packages
 #
 # CONFIG_PKG_USING_JERRYSCRIPT is not set
-# CONFIG_PKG_USING_MICROPYTHON is not set
+CONFIG_PKG_USING_MICROPYTHON=y
+CONFIG_PKG_MICROPYTHON_PATH="/packages/language/micropython"
+
+#
+# System Module
+#
+# CONFIG_MICROPYTHON_USING_UOS is not set
+# CONFIG_MICROPYTHON_USING_USELECT is not set
+# CONFIG_MICROPYTHON_USING_UCTYPES is not set
+# CONFIG_MICROPYTHON_USING_UERRNO is not set
+
+#
+# Tools Module
+#
+# CONFIG_MICROPYTHON_USING_CMATH is not set
+# CONFIG_MICROPYTHON_USING_UBINASCII is not set
+# CONFIG_MICROPYTHON_USING_UHASHLIB is not set
+# CONFIG_MICROPYTHON_USING_UHEAPQ is not set
+# CONFIG_MICROPYTHON_USING_UJSON is not set
+# CONFIG_MICROPYTHON_USING_URE is not set
+# CONFIG_MICROPYTHON_USING_UZLIB is not set
+# CONFIG_MICROPYTHON_USING_URANDOM is not set
+
+#
+# Network Module
+#
+# CONFIG_MICROPYTHON_USING_USOCKET is not set
+
+#
+# Hardware Module
+#
+# CONFIG_MICROPYTHON_USING_MACHINE_I2C is not set
+# CONFIG_MICROPYTHON_USING_MACHINE_SPI is not set
+CONFIG_PKG_MICROPYTHON_HEAP_SIZE=8192
+CONFIG_PKG_USING_MICROPYTHON_LATEST_VERSION=y
+# CONFIG_PKG_USING_MICROPYTHON_V10903 is not set
+CONFIG_PKG_MICROPYTHON_VER="latest"
 
 #
 # multimedia packages
@@ -217,6 +258,7 @@ CONFIG_RT_USING_LIBC=y
 # tools packages
 #
 # CONFIG_PKG_USING_CMBACKTRACE is not set
+# CONFIG_PKG_USING_EASYFLASH is not set
 # CONFIG_PKG_USING_EASYLOGGER is not set
 # CONFIG_PKG_USING_SYSTEMVIEW is not set
 # CONFIG_PKG_USING_IPERF is not set
@@ -226,6 +268,8 @@ CONFIG_RT_USING_LIBC=y
 #
 # CONFIG_PKG_USING_FASTLZ is not set
 # CONFIG_PKG_USING_MINILZO is not set
+# CONFIG_PKG_USING_QUICKLZ is not set
+# CONFIG_PKG_USING_MULTIBUTTON is not set
 
 #
 # example package: hello
@@ -243,10 +287,6 @@ CONFIG_RT_USING_LIBC=y
 # Network Utilities
 #
 # CONFIG_PKG_USING_WLAN_WICED_SRC is not set
-
-#
-# Cloudsdk: RT_thread IOT Cloudsdk
-#
 # CONFIG_PKG_USING_CLOUDSDK is not set
 
 #
@@ -255,6 +295,7 @@ CONFIG_RT_USING_LIBC=y
 # CONFIG_PKG_USING_WEBNET is not set
 # CONFIG_PKG_USING_COREMARK is not set
 # CONFIG_PKG_USING_POWER_MANAGER is not set
+# CONFIG_PKG_USING_RT_OTA is not set
 CONFIG_SOC_V2M_MPS2=y
 CONFIG_RT_USING_UART=y
 CONFIG_RT_USING_UART0=y

bsp/v2m-mps2/drivers/SConscript

@@ -11,6 +11,9 @@ drv_uart.c
 CPPPATH = [cwd]
 CPPDEFINES = []
 
+if GetDepend('RT_USING_PIN'):
+    src += ['drv_pin.c']
+
 group = DefineGroup('Drivers', src, depend = [''], CPPPATH = CPPPATH, CPPDEFINES=CPPDEFINES)
 
 Return('group')

bsp/v2m-mps2/drivers/drv_pin.c

+/*
+ * File      : drv_pin.c
+ * This file is part of RT-Thread RTOS
+ * COPYRIGHT (C) 2006-2013, RT-Thread Development Team
+ *
+ * The license and distribution terms for this file may be
+ * found in the file LICENSE in this distribution or at
+ * http://www.rt-thread.org/license/LICENSE
+ *
+ * Change Logs:
+ * Date           Author       Notes
+ * 2018-03-25     Tanek        the first version.
+ */
+#include <rtthread.h>
+#include <rthw.h>
+#include <drivers/pin.h>
+#include <SMM_MPS2.h>
+
+#ifdef RT_USING_PIN
+
+// pin 0 ~ 7  : switch 0 ~ 7
+// pin 8 ~ 15 : user led 0 ~ 7
+
+static void v2m_pin_mode(rt_device_t dev, rt_base_t pin, rt_base_t mode)
+{
+    return ;
+}
+
+static int v2m_pin_read(rt_device_t dev, rt_base_t pin)
+{
+    RT_ASSERT(dev != RT_NULL);
+
+    if (0 <= pin && pin <= 7)
+    {
+        return !!(MPS2_SCC->CFG_REG3 & (0x01 << pin));   // switchs
+    }
+    else if (8 <= pin && pin <= 15)
+    {
+        return !!(MPS2_SCC->CFG_REG1 & (0x01 << (pin - 8)));   // leds
+    }
+    else
+    {
+        RT_ASSERT(RT_NULL);
+        return 0;
+    }
+}
+
+static void v2m_pin_write(rt_device_t dev, rt_base_t pin, rt_base_t value)
+{
+    RT_ASSERT(dev != RT_NULL);
+
+    if (8 <= pin && pin <= 15)
+    {
+        rt_uint32_t reg = MPS2_SCC->CFG_REG1;
+
+        if (value)
+            reg |= 1 << (pin - 8);
+        else
+            reg &= ~(1 << (pin - 8));
+
+        MPS2_SCC->CFG_REG1 = reg;
+    }
+    else
+    {
+        RT_ASSERT(RT_NULL);
+    }
+}
+
+int rt_hw_pin_init(void)
+{
+    int ret = RT_EOK;
+
+    static const struct rt_pin_ops v2m_pin_ops =
+    {
+        v2m_pin_mode,
+        v2m_pin_write,
+        v2m_pin_read,
+        RT_NULL,
+        RT_NULL,
+        RT_NULL
+    };
+
+    ret = rt_device_pin_register("pin", &v2m_pin_ops, RT_NULL);
+
+    return ret;
+}
+INIT_BOARD_EXPORT(rt_hw_pin_init);
+
+#endif /*RT_USING_PIN */

bsp/v2m-mps2/rtconfig.h

@@ -8,9 +8,7 @@
 
 #define RT_NAME_MAX 8
 #define RT_ALIGN_SIZE 4
-/* RT_THREAD_PRIORITY_8 is not set */
 #define RT_THREAD_PRIORITY_32
-/* RT_THREAD_PRIORITY_256 is not set */
 #define RT_THREAD_PRIORITY_MAX 32
 #define RT_TICK_PER_SECOND 100
 #define RT_DEBUG
@@ -19,7 +17,6 @@
 #define RT_DEBUG_THREAD 0
 #define RT_USING_HOOK
 #define IDLE_THREAD_STACK_SIZE 256
-/* RT_USING_TIMER_SOFT is not set */
 
 /* Inter-Thread communication */
 
@@ -28,26 +25,19 @@
 #define RT_USING_EVENT
 #define RT_USING_MAILBOX
 #define RT_USING_MESSAGEQUEUE
-/* RT_USING_SIGNALS is not set */
 
 /* Memory Management */
 
-/* RT_USING_MEMPOOL is not set */
 #define RT_USING_MEMHEAP
-/* RT_USING_NOHEAP is not set */
-/* RT_USING_SMALL_MEM is not set */
-/* RT_USING_SLAB is not set */
 #define RT_USING_MEMHEAP_AS_HEAP
 #define RT_USING_HEAP
 
 /* Kernel Device Object */
 
 #define RT_USING_DEVICE
-/* RT_USING_INTERRUPT_INFO is not set */
 #define RT_USING_CONSOLE
 #define RT_CONSOLEBUF_SIZE 128
 #define RT_CONSOLE_DEVICE_NAME "uart0"
-/* RT_USING_MODULE is not set */
 #define ARCH_ARM
 #define ARCH_ARM_CORTEX_M
 #define ARCH_ARM_CORTEX_M7
@@ -60,7 +50,6 @@
 
 /* C++ features */
 
-/* RT_USING_CPLUSPLUS is not set */
 
 /* Command shell */
 
@@ -73,152 +62,100 @@
 #define FINSH_THREAD_PRIORITY 20
 #define FINSH_THREAD_STACK_SIZE 4096
 #define FINSH_CMD_SIZE 80
-/* FINSH_USING_AUTH is not set */
 #define FINSH_USING_MSH
-/* FINSH_USING_MSH_DEFAULT is not set */
-/* FINSH_USING_MSH_ONLY is not set */
 
 /* Device virtual file system */
 
-/* RT_USING_DFS is not set */
 
 /* Device Drivers */
 
 #define RT_USING_DEVICE_IPC
 #define RT_USING_SERIAL
-/* RT_USING_CAN is not set */
-/* RT_USING_HWTIMER is not set */
-/* RT_USING_CPUTIME is not set */
-/* RT_USING_I2C is not set */
-/* RT_USING_PIN is not set */
-/* RT_USING_MTD_NOR is not set */
-/* RT_USING_MTD_NAND is not set */
-/* RT_USING_RTC is not set */
-/* RT_USING_SDIO is not set */
-/* RT_USING_SPI is not set */
-/* RT_USING_WDT is not set */
-/* RT_USING_WIFI is not set */
+#define RT_USING_PIN
 
 /* Using USB */
 
-/* RT_USING_USB_HOST is not set */
-/* RT_USING_USB_DEVICE is not set */
 
 /* POSIX layer and C standard library */
 
 #define RT_USING_LIBC
-/* RT_USING_PTHREADS is not set */
 
 /* Network stack */
 
 /* light weight TCP/IP stack */
 
-/* RT_USING_LWIP is not set */
 
 /* Modbus master and slave stack */
 
-/* RT_USING_MODBUS is not set */
-
-/* RT-Thread UI Engine */
-
-/* PKG_USING_GUIENGINE is not set */
 
 /* VBUS(Virtual Software BUS) */
 
-/* RT_USING_VBUS is not set */
 
 /* Utilities */
 
-/* RT_USING_LOGTRACE is not set */
-/* RT_USING_RYM is not set */
 
 /* ARM CMSIS */
 
-/* RT_USING_CMSIS_OS is not set */
-/* RT_USING_RTT_CMSIS is not set */
 
 /* RT-Thread online packages */
 
 /* system packages */
 
-/* PKG_USING_PARTITION is not set */
-/* PKG_USING_PERSIMMON is not set */
-/* PKG_USING_SQLITE is not set */
-/* PKG_USING_RTI is not set */
+/* RT-Thread GUI Engine */
+
 
 /* IoT - internet of things */
 
-/* PKG_USING_PAHOMQTT is not set */
-/* PKG_USING_WEBCLIENT is not set */
-/* PKG_USING_MONGOOSE is not set */
-/* PKG_USING_WEBTERMINAL is not set */
-/* PKG_USING_CJSON is not set */
-/* PKG_USING_LJSON is not set */
-/* PKG_USING_EZXML is not set */
-/* PKG_USING_NANOPB is not set */
-/* PKG_USING_GAGENT_CLOUD is not set */
 
 /* Wi-Fi */
 
 /* Marvell WiFi */
 
-/* PKG_USING_WLANMARVELL is not set */
 
 /* Wiced WiFi */
 
-/* PKG_USING_WLAN_WICED is not set */
-/* PKG_USING_COAP is not set */
 
 /* security packages */
 
-/* PKG_USING_MBEDTLS is not set */
-/* PKG_USING_libsodium is not set */
-/* PKG_USING_TINYCRYPT is not set */
 
 /* language packages */
 
-/* PKG_USING_JERRYSCRIPT is not set */
-/* PKG_USING_MICROPYTHON is not set */
+#define PKG_USING_MICROPYTHON
+
+/* System Module */
+
+
+/* Tools Module */
+
+
+/* Network Module */
+
+
+/* Hardware Module */
+
+#define PKG_MICROPYTHON_HEAP_SIZE 8192
+#define PKG_USING_MICROPYTHON_LATEST_VERSION
 
 /* multimedia packages */
 
-/* PKG_USING_OPENMV is not set */
 
 /* tools packages */
 
-/* PKG_USING_CMBACKTRACE is not set */
-/* PKG_USING_EASYLOGGER is not set */
-/* PKG_USING_SYSTEMVIEW is not set */
-/* PKG_USING_IPERF is not set */
 
 /* miscellaneous packages */
 
-/* PKG_USING_FASTLZ is not set */
-/* PKG_USING_MINILZO is not set */
 
 /* example package: hello */
 
-/* PKG_USING_HELLO is not set */
 
 /* Privated Packages of RealThread */
 
-/* PKG_USING_CODEC is not set */
-/* PKG_USING_PLAYER is not set */
-/* PKG_USING_PERSIMMON_SRC is not set */
 
 /* Network Utilities */
 
-/* PKG_USING_WLAN_WICED_SRC is not set */
-
-/* Cloudsdk: RT_thread IOT Cloudsdk */
-
-/* PKG_USING_CLOUDSDK is not set */
 
 /* Webnet: A web server package for rt-thread */
 
-/* PKG_USING_WEBNET is not set */
-/* PKG_USING_COREMARK is not set */
-/* PKG_USING_POWER_MANAGER is not set */
 #define SOC_V2M_MPS2
 #define RT_USING_UART
 #define RT_USING_UART0