Merge pull request #31 from RT-Thread/master

pr

Author: mysterywolf

.github/workflows/action.yml

@@ -123,7 +123,6 @@ jobs:
          - {RTT_BSP: "swm320", RTT_TOOL_CHAIN: "sourcery-arm"}
          - {RTT_BSP: "swm320-lq100", RTT_TOOL_CHAIN: "sourcery-arm"}
          - {RTT_BSP: "beaglebone", RTT_TOOL_CHAIN: "sourcery-arm"}
-         - {RTT_BSP: "zynq7000", RTT_TOOL_CHAIN: "sourcery-arm"}
          - {RTT_BSP: "zynqmp-r5-axu4ev", RTT_TOOL_CHAIN: "sourcery-arm"}
          - {RTT_BSP: "frdm-k64f", RTT_TOOL_CHAIN: "sourcery-arm"}
          - {RTT_BSP: "fh8620", RTT_TOOL_CHAIN: "sourcery-arm"}

Jenkinsfile

@@ -107,7 +107,6 @@ pipeline {
                         ['stm32f20x', 'sourcery-arm'],
                         ['swm320-lq100', 'sourcery-arm'],
                         ['beaglebone', 'sourcery-arm'],
-                        ['zynq7000', 'sourcery-arm'],
                         ['frdm-k64f', 'sourcery-arm'],
                         ['fh8620', 'sourcery-arm'],
                         ['xplorer4330/M4', 'sourcery-arm'],

bsp/bluetrum/ab32vg1-ab-prougen/board/Kconfig

@@ -176,6 +176,10 @@ menu "On-chip Peripheral Drivers"
             config RTC_USING_INTERNAL_CLK
             bool "Using internal clock RTC"
             default y
+            config RTC_USING_1S_INT
+            bool "Using 1 second interrupt"
+            depends on RT_USING_ALARM
+            default n
         endif
 
     menuconfig BSP_USING_ADC

bsp/bluetrum/libraries/hal_drivers/drv_rtc.c

@@ -7,6 +7,7 @@
  * Date           Author            Notes
  * 2021-01-28     greedyhao         first version
  * 2021-03-19     iysheng           modify just set time first power up
+ * 2021-03-26     iysheng           add alarm and 1s interrupt support
  */
 
 #include "board.h"
@@ -134,15 +135,22 @@ void hal_rtc_init(void)
 
         irtc_time_write(RTCCNT_CMD, sec);
     }
+#ifdef RT_USING_ALARM
+    RTCCON |= RTC_CON_ALM_INTERRUPT;
+#ifdef RTC_USING_1S_INT
+    RTCCON |= RTC_CON_1S_INTERRUPT;
+#endif
+#endif
 }
 /************** HAL End *******************/
 
-static time_t get_rtc_timestamp(void)
+static time_t get_rtc_time_stamp(void)
 {
     time_t sec = 0;
 
     sec = irtc_time_read(RTCCNT_CMD);
     LOG_D("get rtc time.");
+
     return sec;
 }
 
@@ -153,6 +161,22 @@ static rt_err_t set_rtc_time_stamp(time_t time_stamp)
     return RT_EOK;
 }
 
+static rt_err_t set_rtc_alarm_stamp(time_t alarm_stamp)
+{
+    irtc_time_write(RTCALM_CMD, alarm_stamp);
+
+    return RT_EOK;
+}
+
+static time_t get_rtc_alarm_stamp(void)
+{
+    time_t sec = 0;
+
+    sec = irtc_time_read(RTCALM_CMD);
+
+    return sec;
+}
+
 static void rt_rtc_init(void)
 {
     hal_rtc_init();
@@ -165,16 +189,27 @@ static rt_err_t rt_rtc_control(rt_device_t dev, int cmd, void *args)
     switch (cmd)
     {
     case RT_DEVICE_CTRL_RTC_GET_TIME:
-        *(rt_uint32_t *)args = get_rtc_timestamp();
-        LOG_D("RTC: get rtc_time %x\n", *(rt_uint32_t *)args);
+        *(rt_uint32_t *)args = get_rtc_time_stamp();
+        LOG_D("RTC: get rtc_time %x", *(rt_uint32_t *)args);
         break;
 
     case RT_DEVICE_CTRL_RTC_SET_TIME:
         if (set_rtc_time_stamp(*(rt_uint32_t *)args))
         {
             result = -RT_ERROR;
         }
-        LOG_D("RTC: set rtc_time %x\n", *(rt_uint32_t *)args);
+        LOG_D("RTC: set rtc_time %x", *(rt_uint32_t *)args);
+        break;
+    case RT_DEVICE_CTRL_RTC_SET_ALARM:
+        if (set_rtc_alarm_stamp(*(rt_uint32_t *)args))
+        {
+            result = -RT_ERROR;
+        }
+        LOG_D("RTC: set alarm_stamp %x", *(rt_uint32_t *)args);
+        break;
+    case RT_DEVICE_CTRL_RTC_GET_ALARM:
+        *(rt_uint32_t *)args = get_rtc_alarm_stamp();
+        LOG_D("RTC: get alarm_stamp %x", *(rt_uint32_t *)args);
         break;
     }
 
@@ -217,15 +252,41 @@ static rt_err_t rt_hw_rtc_register(rt_device_t device, const char *name, rt_uint
     return rt_device_register(device, name, flag);
 }
 
+#ifdef RT_USING_ALARM
+static void rtc_isr(int vector, void *param)
+{
+    rt_interrupt_enter();
+
+    if (RTCCON & RTC_CON_ALM_PEND)
+    {
+        RTCCPND |= RTC_CPND_ALM;
+    }
+
+#ifdef RTC_USING_1S_INT
+    if (RTCCON & RTC_CON_1S_PEND)
+    {
+        RTCCPND |= RTC_CPND_1S;
+    }
+#endif
+
+    rt_interrupt_leave();
+}
+#endif
+
 int rt_hw_rtc_init(void)
 {
     rt_err_t result;
+
     result = rt_hw_rtc_register(&rtc, "rtc", RT_DEVICE_FLAG_RDWR);
     if (result != RT_EOK)
     {
         LOG_E("rtc register err code: %d", result);
         return result;
     }
+
+#ifdef RT_USING_ALARM
+    rt_hw_interrupt_install(IRQ_RTC_VECTOR, rtc_isr, RT_NULL, "rtc_isr");
+#endif
     LOG_D("rtc init success");
     return RT_EOK;
 }

bsp/bluetrum/libraries/hal_libraries/ab32vg1_hal/include/ab32vg1_hal_rtc.h

@@ -32,6 +32,10 @@ enum
 #define RTC_CON_BAUD_SELECT                 (0x3u <<  1)    /*!< Increase clock selection           */
 #define RTC_CON_CHIP_SELECT                 (0x1u <<  0)    /*!< RTC chip select                    */
 
+// RTCCPND
+#define RTC_CPND_1S                         (0x1u <<  18)    /*!< Clear RTC 1S pending              */
+#define RTC_CPND_ALM                      (0x1u <<  17)    /*!< Clear RTC alarm pendind           */
+
 // RTCCON0
 #define RTC_CON0_PWRUP_FIRST                (0x01u << 7)    /*!< RTC first power up flag            */
 #define RTC_CON0_INTERNAL_32K               (0x01u << 6)    /*!< Internal 32K select                */