Merge pull request #3365 from longtengmcu/master

给软件定时器增加定时器工作状态查询的功能

2 files changed, 14 insertions, 0 deletions

diff --git a/include/rtdef.h b/include/rtdef.h
index c8184a5a4b..8b86213082 100644
--- a/include/rtdef.h
+++ b/include/rtdef.h
@@ -431,6 +431,7 @@ struct rt_object_information
 #define RT_TIMER_CTRL_GET_TIME          0x1             /**< get timer control command */
 #define RT_TIMER_CTRL_SET_ONESHOT       0x2             /**< change timer to one shot */
 #define RT_TIMER_CTRL_SET_PERIODIC      0x3             /**< change timer to periodic */
+#define RT_TIMER_CTRL_GET_STATE         0x4             /**< get timer run state active or deactive*/
 
 #ifndef RT_TIMER_SKIP_LIST_LEVEL
 #define RT_TIMER_SKIP_LIST_LEVEL          1
diff --git a/src/timer.c b/src/timer.c
index d85ee080b5..0034f0246c 100644
--- a/src/timer.c
+++ b/src/timer.c
@@ -488,6 +488,19 @@ rt_err_t rt_timer_control(rt_timer_t timer, int cmd, void *arg)
     case RT_TIMER_CTRL_SET_PERIODIC:
         timer->parent.flag |= RT_TIMER_FLAG_PERIODIC;
         break;
+    /* zhaoshimin 20191204 add query the timer state */    
+    case RT_TIMER_CTRL_GET_STATE:
+        if(timer->parent.flag & RT_TIMER_FLAG_ACTIVATED)
+        {
+            /*timer is start and run*/
+            *(rt_tick_t *)arg = RT_TIMER_FLAG_ACTIVATED;
+        }
+        else
+        {
+            /*timer is stop*/
+            *(rt_tick_t *)arg = RT_TIMER_FLAG_DEACTIVATED;
+        }
+        break;    
     }
 
     return RT_EOK;