From 3d732601df904c8bf21a27e0c7a08c6f339aa020 Mon Sep 17 00:00:00 2001 From: pandx Date: Fri, 8 Nov 2024 14:39:09 +0800 Subject: [PATCH] add interface to clear sensor cfg. --- scheduler/schedule.cpp | 18 ++++++++++++++---- scheduler/schedule.hpp | 2 +- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/scheduler/schedule.cpp b/scheduler/schedule.cpp index f86d060..d43f8d2 100644 --- a/scheduler/schedule.cpp +++ b/scheduler/schedule.cpp @@ -615,9 +615,19 @@ void SensorScheduler::ModifyScheduleTs(int diff_ts) { out_file.close(); } -void SensorScheduler::ClearScheduleCfg() { +void SensorScheduler::ClearScheduleCfg(int short_addr) { zlog_warn(zbt, "[ClearScheduleCfg] clear all schedule config"); - ShortAddrCfg::ClearCfg(); - UpdateCfg::ClearCfg(); - UpgradeCfg::ClearCfg(); + if (short_addr == 0) { + update_.clear(); + upgrade_.clear(); + ShortAddrCfg::ClearCfg(); + UpdateCfg::ClearCfg(); + UpgradeCfg::ClearCfg(); + } else { + UpdateConfigResult(short_addr, 0); + UpgradeResult(short_addr, kUpgradeSuccess); + short_addr_map_.erase(short_addr); + ShortAddrCfg::WriteCfg(short_addr_map_); + } + } \ No newline at end of file diff --git a/scheduler/schedule.hpp b/scheduler/schedule.hpp index 645d81b..63efaa5 100644 --- a/scheduler/schedule.hpp +++ b/scheduler/schedule.hpp @@ -92,7 +92,7 @@ public: void AdjustSupportModification(bool support_modification); // ======schedule.json操作结束====== - void ClearScheduleCfg(); + void ClearScheduleCfg(int short_addr = 0); long GetLocalTs(); long GetLocalWorldTime(std::string &world_time);