Merge branch 'develop'

hevake · hevake · commit 072af9ae5e23 · 2025-01-21T20:38:57.000+08:00
diff --git a/modules/alarm/alarm.cpp b/modules/alarm/alarm.cpp
@@ -116,6 +116,7 @@ void Alarm::refresh() {
   if (state_ == State::kRunning) {
     state_ = State::kInited;
     sp_timer_ev_->disable();
+    target_utc_sec_ = 0;    //! 如果不清0，那么每refresh()一次都会往后延一天
     activeTimer();
   }
 }
diff --git a/version.mk b/version.mk
@@ -21,4 +21,4 @@
 # TBOX版本号
 TBOX_VERSION_MAJOR := 1
 TBOX_VERSION_MINOR := 11
-TBOX_VERSION_REVISION := 5
+TBOX_VERSION_REVISION := 6

Original file line number	Diff line number	Diff line change
`@@ -116,6 +116,7 @@ void Alarm::refresh() {`
`116`	`116`	`if (state_ == State::kRunning) {`
`117`	`117`	`state_ = State::kInited;`
`118`	`118`	`sp_timer_ev_->disable();`
	`119`	`+ target_utc_sec_ = 0; //! 如果不清0，那么每refresh()一次都会往后延一天`
`119`	`120`	`activeTimer();`
`120`	`121`	`}`
`121`	`122`	`}`