zhunk 1 год назад
Родитель
Сommit
b369c4ca7a
24 измененных файлов с 229 добавлено и 29 удалено
  1. 15 1
      Application_cbd_apm32f1/.config
  2. 17 3
      Application_cbd_apm32f1/.config.old
  3. 1 1
      Application_cbd_apm32f1/.cproject
  4. BIN
      Application_cbd_apm32f1/.settings/.rtmenus
  5. 37 1
      Application_cbd_apm32f1/applications/control.c
  6. 4 4
      Application_cbd_apm32f1/applications/control.h
  7. 13 2
      Application_cbd_apm32f1/applications/hmi.c
  8. 1 0
      Application_cbd_apm32f1/drivers/drv_common.c
  9. 112 10
      Application_cbd_apm32f1/drivers/drv_rtc.c
  10. 1 1
      Application_cbd_apm32f1/libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rtc.c
  11. 9 0
      Application_cbd_apm32f1/packages/syswatch-latest/src/syswatch.c
  12. 3 0
      Application_cbd_apm32f1/rt-thread/components/drivers/include/drivers/rtc.h
  13. 10 6
      Application_cbd_apm32f1/rt-thread/components/drivers/rtc/alarm.c
  14. 1 0
      Application_cbd_apm32f1/rt-thread/components/drivers/rtc/rtc.c
  15. BIN
      Application_cbd_apm32f1/rt-thread/tools/building.pyc
  16. BIN
      Application_cbd_apm32f1/rt-thread/tools/eclipse.pyc
  17. BIN
      Application_cbd_apm32f1/rt-thread/tools/gcc.pyc
  18. BIN
      Application_cbd_apm32f1/rt-thread/tools/menuconfig.pyc
  19. BIN
      Application_cbd_apm32f1/rt-thread/tools/mkdist.pyc
  20. BIN
      Application_cbd_apm32f1/rt-thread/tools/options.pyc
  21. BIN
      Application_cbd_apm32f1/rt-thread/tools/rt_studio.pyc
  22. BIN
      Application_cbd_apm32f1/rt-thread/tools/utils.pyc
  23. 5 0
      Application_cbd_apm32f1/rtconfig.h
  24. BIN
      Application_cbd_apm32f1/rtconfig.pyc

+ 15 - 1
Application_cbd_apm32f1/.config

@@ -146,7 +146,7 @@ CONFIG_RT_USING_PWM=y
 # CONFIG_RT_USING_MTD_NAND is not set
 # CONFIG_RT_USING_PM is not set
 CONFIG_RT_USING_RTC=y
-# CONFIG_RT_USING_ALARM is not set
+CONFIG_RT_USING_ALARM=y
 # CONFIG_RT_USING_SOFT_RTC is not set
 # CONFIG_RT_USING_SDIO is not set
 CONFIG_RT_USING_SPI=y
@@ -397,6 +397,7 @@ CONFIG_PKG_OTA_DOWNLOADER_VER="v1.0.0"
 # CONFIG_PKG_USING_QMODBUS is not set
 # CONFIG_PKG_USING_PNET is not set
 # CONFIG_PKG_USING_OPENER is not set
+# CONFIG_PKG_USING_FREEMQTT is not set
 # end of IoT - internet of things
 
 #
@@ -675,6 +676,7 @@ CONFIG_PKG_SYSWATCH_VER="latest"
 # CONFIG_PKG_USING_RMP is not set
 # CONFIG_PKG_USING_R_RHEALSTONE is not set
 # CONFIG_PKG_USING_HEARTBEAT is not set
+# CONFIG_PKG_USING_MICRO_ROS_RTTHREAD_PACKAGE is not set
 # end of system packages
 
 #
@@ -798,6 +800,8 @@ CONFIG_PKG_SYSWATCH_VER="latest"
 #
 # HC32 DDL Drivers
 #
+# CONFIG_PKG_USING_HC32F4_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_HC32F4_SERIES_DRIVER is not set
 # end of HC32 DDL Drivers
 
 #
@@ -811,6 +815,14 @@ CONFIG_PKG_SYSWATCH_VER="latest"
 # CONFIG_PKG_USING_NXP_IMX6UL_DRIVER is not set
 # CONFIG_PKG_USING_NXP_IMXRT_DRIVER is not set
 # end of NXP HAL & SDK Drivers
+
+#
+# NUVOTON Drivers
+#
+# CONFIG_PKG_USING_NUVOTON_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_NUVOTON_SERIES_DRIVER is not set
+# CONFIG_PKG_USING_NUVOTON_RAM926_LIB is not set
+# end of NUVOTON Drivers
 # end of HAL & SDK Drivers
 
 #
@@ -886,6 +898,7 @@ CONFIG_PKG_SYSWATCH_VER="latest"
 # CONFIG_PKG_USING_STHS34PF80 is not set
 # CONFIG_PKG_USING_P3T1755 is not set
 # CONFIG_PKG_USING_QMI8658 is not set
+# CONFIG_PKG_USING_ICM20948 is not set
 # end of sensors drivers
 
 #
@@ -983,6 +996,7 @@ CONFIG_PKG_LEDBLINK_VER="latest"
 # CONFIG_PKG_USING_SERVO is not set
 # CONFIG_PKG_USING_SEAN_WS2812B is not set
 # CONFIG_PKG_USING_IC74HC165 is not set
+# CONFIG_PKG_USING_IST8310 is not set
 # end of peripheral libraries and drivers
 
 #

+ 17 - 3
Application_cbd_apm32f1/.config.old

@@ -80,7 +80,7 @@ CONFIG_RT_USING_DEVICE=y
 # CONFIG_RT_USING_DEVICE_OPS is not set
 # CONFIG_RT_USING_INTERRUPT_INFO is not set
 CONFIG_RT_USING_CONSOLE=y
-CONFIG_RT_CONSOLEBUF_SIZE=256
+CONFIG_RT_CONSOLEBUF_SIZE=1024
 CONFIG_RT_CONSOLE_DEVICE_NAME="uart1"
 # end of Kernel Device Object
 
@@ -146,7 +146,7 @@ CONFIG_RT_USING_PWM=y
 # CONFIG_RT_USING_MTD_NAND is not set
 # CONFIG_RT_USING_PM is not set
 CONFIG_RT_USING_RTC=y
-# CONFIG_RT_USING_ALARM is not set
+CONFIG_RT_USING_ALARM=y
 # CONFIG_RT_USING_SOFT_RTC is not set
 # CONFIG_RT_USING_SDIO is not set
 CONFIG_RT_USING_SPI=y
@@ -181,7 +181,7 @@ CONFIG_RT_USING_WDT=y
 #
 # C/C++ and POSIX layer
 #
-CONFIG_RT_LIBC_DEFAULT_TIMEZONE=0
+CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
 
 #
 # POSIX (Portable Operating System Interface) layer
@@ -397,6 +397,7 @@ CONFIG_PKG_OTA_DOWNLOADER_VER="v1.0.0"
 # CONFIG_PKG_USING_QMODBUS is not set
 # CONFIG_PKG_USING_PNET is not set
 # CONFIG_PKG_USING_OPENER is not set
+# CONFIG_PKG_USING_FREEMQTT is not set
 # end of IoT - internet of things
 
 #
@@ -675,6 +676,7 @@ CONFIG_PKG_SYSWATCH_VER="latest"
 # CONFIG_PKG_USING_RMP is not set
 # CONFIG_PKG_USING_R_RHEALSTONE is not set
 # CONFIG_PKG_USING_HEARTBEAT is not set
+# CONFIG_PKG_USING_MICRO_ROS_RTTHREAD_PACKAGE is not set
 # end of system packages
 
 #
@@ -798,6 +800,8 @@ CONFIG_PKG_SYSWATCH_VER="latest"
 #
 # HC32 DDL Drivers
 #
+# CONFIG_PKG_USING_HC32F4_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_HC32F4_SERIES_DRIVER is not set
 # end of HC32 DDL Drivers
 
 #
@@ -811,6 +815,14 @@ CONFIG_PKG_SYSWATCH_VER="latest"
 # CONFIG_PKG_USING_NXP_IMX6UL_DRIVER is not set
 # CONFIG_PKG_USING_NXP_IMXRT_DRIVER is not set
 # end of NXP HAL & SDK Drivers
+
+#
+# NUVOTON Drivers
+#
+# CONFIG_PKG_USING_NUVOTON_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_NUVOTON_SERIES_DRIVER is not set
+# CONFIG_PKG_USING_NUVOTON_RAM926_LIB is not set
+# end of NUVOTON Drivers
 # end of HAL & SDK Drivers
 
 #
@@ -886,6 +898,7 @@ CONFIG_PKG_SYSWATCH_VER="latest"
 # CONFIG_PKG_USING_STHS34PF80 is not set
 # CONFIG_PKG_USING_P3T1755 is not set
 # CONFIG_PKG_USING_QMI8658 is not set
+# CONFIG_PKG_USING_ICM20948 is not set
 # end of sensors drivers
 
 #
@@ -983,6 +996,7 @@ CONFIG_PKG_LEDBLINK_VER="latest"
 # CONFIG_PKG_USING_SERVO is not set
 # CONFIG_PKG_USING_SEAN_WS2812B is not set
 # CONFIG_PKG_USING_IC74HC165 is not set
+# CONFIG_PKG_USING_IST8310 is not set
 # end of peripheral libraries and drivers
 
 #

Разница между файлами не показана из-за своего большого размера
+ 1 - 1
Application_cbd_apm32f1/.cproject


BIN
Application_cbd_apm32f1/.settings/.rtmenus


+ 37 - 1
Application_cbd_apm32f1/applications/control.c

@@ -7,6 +7,7 @@
  * Change Logs:
  * Date           Author       Notes
  * 2020-05-30     Administrator       the first version
+ * 2025-06-26     RTC闹钟使用定时开启和关闭路由器供电
  */
 #include "beep.h"
 #include "hmi.h"
@@ -1434,7 +1435,9 @@ void ResetInit(void)
            //1.打开路由器供电
            if(device_status.power_status==1)
            {
+#if   MATCH_DEVICE ==0
                ctr_router(ON);
+#endif
                ctr_RTU_DTU(ON);
                //2.打开相机供电
                ctr_photo(ON);
@@ -1489,7 +1492,9 @@ void ResetInit(void)
         if(device_status.power_status==1)
         {
             //1.打开路由器供电
-            ctr_router(ON);
+#if   MATCH_DEVICE ==0
+               ctr_router(ON);
+#endif
             ctr_RTU_DTU(ON);
             //2.打开相机供电
             ctr_photo(ON);
@@ -2622,9 +2627,40 @@ int Work_Loop_Task(void)
     }
     return result_loop;
 }
+#ifdef RT_USING_ALARM
 
+void alarm_callback_router_on(rt_alarm_t alarm, time_t timestamp)
+{
+    LOG_W("alarm_callback_router_on.\n");
+    ctr_router(ON);
+}
+void alarm_callback_router_off(rt_alarm_t alarm, time_t timestamp)
+{
+    LOG_W("alarm_callback_router_off.\n");
+    ctr_router(OFF);
+}
 
+void alarm_app_router(void)
+{
+    struct rt_alarm_setup setup;
+    struct rt_alarm * alarm_router_on = RT_NULL;
 
+    if (alarm_router_on != RT_NULL)
+        return;
+
+    setup.flag = RT_ALARM_DAILY;
+    setup.wktime.tm_hour = 23;
+    setup.wktime.tm_min = 0;
+    setup.wktime.tm_sec = 0;
+
+    alarm_router_on = rt_alarm_create(alarm_callback_router_on, &setup);
+    if(RT_NULL != alarm_router_on)
+    {
+        LOG_I("设置闹钟: %d:%d:%d",setup.wktime.tm_hour,setup.wktime.tm_min,setup.wktime.tm_sec);
+        rt_alarm_start(alarm_router_on);
+    }
+}
+#endif
 
 MSH_CMD_EXPORT(HardWare_Check,HardWare_Check<ON|OFF>);
 MSH_CMD_EXPORT(ctr_lamp,ctr_lamp<ON|OFF>);

+ 4 - 4
Application_cbd_apm32f1/applications/control.h

@@ -17,8 +17,8 @@
 
 
 #define LAMP_EN          0             //李新3灯管:0关闭,1打开
-#define PCB_V1           0             //1-旧PCB,0-新PCB(模块化)
-#define MATCH_DEVICE     0             //比赛设备
+#define PCB_V1           1             //1-旧PCB,0-新PCB(模块化)
+#define MATCH_DEVICE     1             //比赛设备
 #define SENSOR_EN        1             //温湿度:0关闭,1打开
 #define UART_TEST_EN     0             ///串口测试0-关闭,1-启用
 
@@ -33,7 +33,7 @@
     #define VERSION_HK_2000W    "1.3led.40(2000W)"       //水稻
 #else
     #define VERSION_HK          "2.5.41(HK)"            //4.0海康-1200W
-    #define VERSION_HK_2000W    "2.22.4(2000W)"         //4.0水稻
+    #define VERSION_HK_2000W    "2.23.4(2000W)"         //4.0水稻
 #endif
 
 #define VERSION_ZP          "1.45.1(ZP)"            //1.0转盘
@@ -320,7 +320,7 @@ void SunTest(void);                             //光控测试
 /*****************************************************/
 uint16_t ctr_xmove(uint32_t xdis,uint16_t pulse);
 /***********************孢子仪****************************/
-
+void alarm_app_router(void);
 /***************************************************/
 //线程
 int Control_clear(void);

+ 13 - 2
Application_cbd_apm32f1/applications/hmi.c

@@ -348,8 +348,13 @@ static void HMI_Decode(void)
             HMI_WRITE("workSta.net.val=1");
         }
         else {
+            #if MATCH_DEVICE == 0
             HMI_WRITE("workSta.net.val=0");
             HMI_WRITE("menu.net.val=0");
+            #else
+            HMI_WRITE("workSta.net.val=1");
+            HMI_WRITE("menu.net.val=1");
+            #endif
         }
         if(atoi(device_status.csq)==0&&atoi(device_status.net)==1)
         {
@@ -2061,8 +2066,14 @@ void Check_ParamConfig(void)
         rt_sprintf(device_status.net,"1");
         rt_sprintf(device_status.csq,"0");
         rt_sprintf(device_status.sim,"1");
-
+#ifdef RT_USING_ALARM
+        alarm_app_router();
+#endif
+#if MATCH_DEVICE== 0
         ctr_router(ON);
+#else
+        ctr_router(OFF);
+#endif
         Hmi_Fresh();
         if(device_status.dtype!=7)
         {
@@ -2141,7 +2152,7 @@ void Check_ParamConfig(void)
             Work_Loop_Task();
         }
 #if MATCH_DEVICE == 1
-        device_status.selfcheck_ws = 3;
+        //device_status.selfcheck_ws = 3;
 #endif
 #endif
     }

+ 1 - 0
Application_cbd_apm32f1/drivers/drv_common.c

@@ -18,6 +18,7 @@ static void reboot(uint8_t argc, char **argv)
     rt_hw_cpu_reset();
 }
 FINSH_FUNCTION_EXPORT_ALIAS(reboot, __cmd_reboot, Reboot System);
+MSH_CMD_EXPORT_ALIAS(reboot, reboot, Reboot System);
 #endif /* RT_USING_FINSH */
 
 /* SysTick configuration */

+ 112 - 10
Application_cbd_apm32f1/drivers/drv_rtc.c

@@ -25,14 +25,22 @@
 #ifndef RTC_BKP_DR1
 #define RTC_BKP_DR1 RT_NULL
 #endif
-
-//#define DRV_DEBUG
+#define DBG_ENABLE
+#define DBG_COLOR
 #define LOG_TAG             "drv.rtc"
+#define DBG_LVL DBG_LOG
 #include <drv_log.h>
 
 #define BKUP_REG_DATA 0xA0A0
 
 static struct rt_device rtc;
+static struct rt_rtc_device rtc_device;
+
+#ifdef RT_USING_ALARM
+static rt_err_t rtc_alarm_time_set(struct rt_rtc_device* p_dev);
+static int rt_rtc_alarm_init(void);
+static RTC_AlarmTypeDef salarmstructure;
+#endif
 
 static RTC_HandleTypeDef RTC_Handler;
 uint32_t           RTC_ReadTimeCounter(RTC_HandleTypeDef *hrtc);
@@ -54,8 +62,7 @@ static time_t get_rtc_timestamp(void)
 //    tm_new.tm_year = RTC_DateStruct.Year + 100;
 //
 //    LOG_D("get rtc time.");
-//    RTC_ReadTimeCounter(&RTC_Handler);
-    //return mktime(&tm_new);
+//    return mktime(&tm_new);
     return RTC_ReadTimeCounter(&RTC_Handler);
 }
 
@@ -79,18 +86,20 @@ static rt_err_t set_rtc_time_stamp(time_t time_stamp)
 //    RTC_DateStruct.Year    = p_tm->tm_year - 100;
 //    RTC_DateStruct.WeekDay = p_tm->tm_wday + 1;
 //
-//    if (HAL_RTC_SetTime(&RTC_Handler, &RTC_TimeStruct, RTC_FORMAT_BIN) != HAL_OK)
+//    if (HAL_RTC_SetDate(&RTC_Handler, &RTC_DateStruct, RTC_FORMAT_BIN) != HAL_OK)
 //    {
 //        return -RT_ERROR;
 //    }
-//    if (HAL_RTC_SetDate(&RTC_Handler, &RTC_DateStruct, RTC_FORMAT_BIN) != HAL_OK)
+//
+//    if (HAL_RTC_SetTime(&RTC_Handler, &RTC_TimeStruct, RTC_FORMAT_BIN) != HAL_OK)
 //    {
 //        return -RT_ERROR;
 //    }
 //
+//
 //    LOG_D("set rtc time.");
-     HAL_RTCEx_BKUPWrite(&RTC_Handler, RTC_BKP_DR1, BKUP_REG_DATA);
-//    return RT_EOK;
+//    HAL_RTCEx_BKUPWrite(&RTC_Handler, RTC_BKP_DR1, BKUP_REG_DATA);
+
     RTC_WriteTimeCounter(&RTC_Handler,time_stamp);
     return RT_EOK;
 }
@@ -181,6 +190,9 @@ static rt_err_t rt_rtc_config(struct rt_device *dev)
 static rt_err_t rt_rtc_control(rt_device_t dev, int cmd, void *args)
 {
     rt_err_t result = RT_EOK;
+#ifdef RT_USING_ALARM
+    struct rt_rtc_wkalarm *p_wkalarm = RT_NULL;
+#endif
     RT_ASSERT(dev != RT_NULL);
     switch (cmd)
     {
@@ -190,12 +202,43 @@ static rt_err_t rt_rtc_control(rt_device_t dev, int cmd, void *args)
         break;
 
     case RT_DEVICE_CTRL_RTC_SET_TIME:
-        if (set_rtc_time_stamp(*(rt_uint32_t *)args))
-        {
+        if (set_rtc_time_stamp(*(rt_uint32_t *)args) != RT_EOK) {
+            // 错误处理
             result = -RT_ERROR;
         }
+#ifdef RT_USING_ALARM
+        rt_alarm_update(&rtc_device.parent, 1);
+#endif
+
         LOG_D("RTC: set rtc_time %x\n", *(rt_uint32_t *)args);
         break;
+#ifdef RT_USING_ALARM
+    case RT_DEVICE_CTRL_RTC_GET_ALARM:
+        args = &rtc_device.wkalarm;
+        LOG_D("GET_ALARM %d:%d:%d",rtc_device.wkalarm.tm_hour,
+                rtc_device.wkalarm.tm_min,rtc_device.wkalarm.tm_sec);
+        break;
+
+    case RT_DEVICE_CTRL_RTC_SET_ALARM:
+        LOG_D("RT_DEVICE_CTRL_RTC_SET_ALARM");
+        p_wkalarm = (struct rt_rtc_wkalarm *)args;
+        if (p_wkalarm != RT_NULL)
+        {
+            rtc_device.wkalarm.enable = p_wkalarm->enable;
+            rtc_device.wkalarm.tm_hour = p_wkalarm->tm_hour;
+            rtc_device.wkalarm.tm_min = p_wkalarm->tm_min;
+            rtc_device.wkalarm.tm_sec = p_wkalarm->tm_sec;
+            rtc_alarm_time_set(&rtc_device);
+        }
+        else
+        {
+            result = -RT_ERROR;
+            LOG_E("RT_DEVICE_CTRL_RTC_SET_ALARM error!!");
+        }
+        LOG_D("SET_ALARM %d:%d:%d",p_wkalarm->tm_hour,
+            p_wkalarm->tm_min,p_wkalarm->tm_sec);
+        break;
+#endif
     }
 
     return result;
@@ -250,9 +293,68 @@ int rt_hw_rtc_init(void)
         LOG_E("rtc register err code: %d", result);
         return result;
     }
+#ifdef RT_USING_ALARM
+    rt_rtc_alarm_init();
+#endif
     LOG_D("rtc init success");
     return RT_EOK;
 }
+
+#ifdef RT_USING_ALARM
+void rt_rtc_alarm_enable(void)
+{
+    HAL_RTC_SetAlarm_IT(&RTC_Handler,&salarmstructure,RTC_FORMAT_BIN);
+    HAL_RTC_GetAlarm(&RTC_Handler,&salarmstructure,RTC_ALARM_A,RTC_FORMAT_BIN);
+    LOG_D("alarm read:%d:%d:%d", salarmstructure.AlarmTime.Hours,
+        salarmstructure.AlarmTime.Minutes,
+        salarmstructure.AlarmTime.Seconds);
+    HAL_NVIC_SetPriority(RTC_Alarm_IRQn, 0x02, 0);
+    HAL_NVIC_EnableIRQ(RTC_Alarm_IRQn);
+}
+
+void rt_rtc_alarm_disable(void)
+{
+    HAL_RTC_DeactivateAlarm(&RTC_Handler, RTC_ALARM_A);
+    HAL_NVIC_DisableIRQ(RTC_Alarm_IRQn);
+}
+
+static int rt_rtc_alarm_init(void)
+{
+    return RT_EOK;
+}
+
+static rt_err_t rtc_alarm_time_set(struct rt_rtc_device* p_dev)
+{
+    if (p_dev->wkalarm.enable)
+    {
+        salarmstructure.Alarm = RTC_ALARM_A;
+        salarmstructure.AlarmTime.Hours = p_dev->wkalarm.tm_hour;
+        salarmstructure.AlarmTime.Minutes = p_dev->wkalarm.tm_min;
+        salarmstructure.AlarmTime.Seconds = p_dev->wkalarm.tm_sec;
+        LOG_D("alarm set:%d:%d:%d", salarmstructure.AlarmTime.Hours,
+            salarmstructure.AlarmTime.Minutes,
+            salarmstructure.AlarmTime.Seconds);
+        rt_rtc_alarm_enable();
+    }
+
+    return RT_EOK;
+}
+
+void HAL_RTC_AlarmAEventCallback(RTC_HandleTypeDef *hrtc)
+{
+    //LOG_D("rtc alarm isr.\n");
+    rt_alarm_update(&rtc_device.parent, 1);
+}
+
+void RTC_Alarm_IRQHandler(void)
+{
+    rt_interrupt_enter();
+    HAL_RTC_AlarmIRQHandler(&RTC_Handler);
+    rt_interrupt_leave();
+}
+
+#endif
+
 INIT_APP_EXPORT(rt_hw_rtc_init);
 
 #endif /* BSP_USING_ONCHIP_RTC */

+ 1 - 1
Application_cbd_apm32f1/libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rtc.c

@@ -1239,7 +1239,7 @@ HAL_StatusTypeDef HAL_RTC_SetAlarm_IT(RTC_HandleTypeDef *hrtc, RTC_AlarmTypeDef
     /* Add 1 day to alarm counter*/
     counter_alarm += (uint32_t)(24U * 3600U);
   }
-
+  rt_kprintf("counter_alarm:%d\r",counter_alarm);
   /* Write alarm counter in RTC registers */
   if (RTC_WriteAlarmCounter(hrtc, counter_alarm) != HAL_OK)
   {

+ 9 - 0
Application_cbd_apm32f1/packages/syswatch-latest/src/syswatch.c

@@ -398,6 +398,15 @@ static void syswatch_thread_entry(void *parameter)
             rt_hw_cpu_reset();
             #endif
         }
+        if((alarm_new.tm_hour)==23&&(alarm_new.tm_min==00)&&(alarm_new.tm_sec==0))
+        {
+            ctr_router(1);
+        }
+
+        if((alarm_new.tm_hour)==6&&(alarm_new.tm_min==00)&&(alarm_new.tm_sec==0))
+        {
+            ctr_router(0);
+        }
         #endif
         rt_thread_delay(RT_TICK_PER_SECOND);
         syswatch_wdt_feed();

+ 3 - 0
Application_cbd_apm32f1/rt-thread/components/drivers/include/drivers/rtc.h

@@ -52,6 +52,9 @@ typedef struct rt_rtc_device
 {
     struct rt_device parent;
     const struct rt_rtc_ops *ops;
+    #ifdef RT_USING_ALARM
+        struct rt_rtc_wkalarm   wkalarm;
+    #endif
 } rt_rtc_dev_t;
 
 //rt_err_t rt_hw_rtc_register(rt_rtc_dev_t  *rtc,

+ 10 - 6
Application_cbd_apm32f1/rt-thread/components/drivers/rtc/alarm.c

@@ -223,8 +223,11 @@ static void alarm_update(rt_uint32_t event)
     {
         /* get time of now */
         get_timestamp(&timestamp);
-        gmtime_r(&timestamp, &now);
+        rt_kprintf("alarm_update:%d/r",timestamp);
 
+        //gmtime_r(&timestamp, &now);
+        localtime_r(&timestamp, &now);
+        rt_kprintf("alarm_update now:%d-%d-%d/r",now.tm_year,now.tm_mon,now.tm_mday);
         for (next = _container.head.next; next != &_container.head; next = next->next)
         {
             alarm = rt_list_entry(next, struct rt_alarm, list);
@@ -234,7 +237,8 @@ static void alarm_update(rt_uint32_t event)
 
         /* get time of now */
         get_timestamp(&timestamp);
-        gmtime_r(&timestamp, &now);
+        //gmtime_r(&timestamp, &now);
+        localtime_r(&timestamp, &now);
         sec_now = alarm_mkdaysec(&now);
 
         for (next = _container.head.next; next != &_container.head; next = next->next)
@@ -339,8 +343,8 @@ static rt_err_t alarm_setup(rt_alarm_t alarm, struct tm *wktime)
     *setup = *wktime;
     /* get time of now */
     get_timestamp(&timestamp);
-    gmtime_r(&timestamp, &now);
-
+    //gmtime_r(&timestamp, &now);
+    localtime_r(&timestamp, &now);
     /* if these are a "don't care" value,we set them to now*/
     if ((setup->tm_sec > 59) || (setup->tm_sec < 0))
         setup->tm_sec = now.tm_sec;
@@ -554,8 +558,8 @@ rt_err_t rt_alarm_start(rt_alarm_t alarm)
 
         /* get time of now */
         get_timestamp(&timestamp);
-        gmtime_r(&timestamp, &now);
-
+        //gmtime_r(&timestamp, &now);
+        localtime_r(&timestamp, &now);
         alarm->flag |= RT_ALARM_STATE_START;
 
         /* set alarm */

+ 1 - 0
Application_cbd_apm32f1/rt-thread/components/drivers/rtc/rtc.c

@@ -345,6 +345,7 @@ static void date(int argc, char **argv)
         }
         /* converts the local time into the calendar time. */
         now = mktime(&tm_new);
+        rt_kprintf("now stamp: %d", now);
         err = set_timestamp(now);
         if (err != RT_EOK)
         {

BIN
Application_cbd_apm32f1/rt-thread/tools/building.pyc


BIN
Application_cbd_apm32f1/rt-thread/tools/eclipse.pyc


BIN
Application_cbd_apm32f1/rt-thread/tools/gcc.pyc


BIN
Application_cbd_apm32f1/rt-thread/tools/menuconfig.pyc


BIN
Application_cbd_apm32f1/rt-thread/tools/mkdist.pyc


BIN
Application_cbd_apm32f1/rt-thread/tools/options.pyc


BIN
Application_cbd_apm32f1/rt-thread/tools/rt_studio.pyc


BIN
Application_cbd_apm32f1/rt-thread/tools/utils.pyc


+ 5 - 0
Application_cbd_apm32f1/rtconfig.h

@@ -98,6 +98,7 @@
 #define RT_USING_ADC
 #define RT_USING_PWM
 #define RT_USING_RTC
+//#define RT_USING_ALARM
 #define RT_USING_SPI
 #define RT_USING_SFUD
 #define RT_SFUD_USING_SFDP
@@ -303,6 +304,10 @@
 /* NXP HAL & SDK Drivers */
 
 /* end of NXP HAL & SDK Drivers */
+
+/* NUVOTON Drivers */
+
+/* end of NUVOTON Drivers */
 /* end of HAL & SDK Drivers */
 
 /* sensors drivers */

BIN
Application_cbd_apm32f1/rtconfig.pyc