From 5d9cae688a7b35dc626baceea0092a9a3ca21270 Mon Sep 17 00:00:00 2001 From: pandx Date: Tue, 5 Nov 2024 16:28:25 +0800 Subject: [PATCH] use hex to output short addr. --- scheduler/schedule.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scheduler/schedule.cpp b/scheduler/schedule.cpp index 63ead03..0fbdb99 100644 --- a/scheduler/schedule.cpp +++ b/scheduler/schedule.cpp @@ -135,7 +135,7 @@ int SensorScheduler::GetNextDuration(int short_addr) { int id = 0; auto iter = short_addr_map_.find(short_addr); if (iter == short_addr_map_.end()) { - zlog_error(zct, "cannot find id for short_addr %d", short_addr); + zlog_error(zct, "cannot find id for short_addr %x", short_addr); return 0; } else { id = iter->second; @@ -151,7 +151,7 @@ long SensorScheduler::GetBaseTimestamp(int short_addr) { int id = 0; auto iter = short_addr_map_.find(short_addr); if (iter == short_addr_map_.end()) { - zlog_error(zct, "cannot find id for short_addr %d", short_addr); + zlog_error(zct, "cannot find id for short_addr %x", short_addr); return 0; } else { id = iter->second; @@ -232,7 +232,7 @@ int SensorScheduler::GetAvailableId(int short_addr) { break; } } - zlog_warn(zct, "[GetAvailableId][%d] short addr : %d", available_id, short_addr); + zlog_warn(zct, "[GetAvailableId][%d] short addr : %x", available_id, short_addr); short_addr_map_[short_addr] = available_id; ShortAddrCfg::WriteCfg(short_addr_map_); return available_id; @@ -462,7 +462,7 @@ int SensorScheduler::UpdateConfigResult(int short_addr, int result) { int id = 0; auto iter = short_addr_map_.find(short_addr); if (iter == short_addr_map_.end()) { - zlog_error(zct, "cannot find id for short_addr %d", short_addr); + zlog_error(zct, "cannot find id for short_addr %x", short_addr); return 1; } else { id = iter->second; @@ -481,7 +481,7 @@ int SensorScheduler::UpgradeSensor(int short_addr, std::string sensor_type, int int id = 0; auto iter = short_addr_map_.find(short_addr); if (iter == short_addr_map_.end()) { - zlog_error(zct, "cannot find id for short_addr %d", short_addr); + zlog_error(zct, "cannot find id for short_addr %x", short_addr); return 1; } else { id = iter->second; @@ -515,12 +515,12 @@ int SensorScheduler::UpgradeResult(int short_addr, int result) { result == kZigbeeHWMismatch || result == kUpgradeDoneBefore) { upgrade_.erase(id); - zlog_info(zbt, "[%d] short addr:%d upgrade successfully", id, short_addr); + zlog_info(zbt, "[%d] short addr:%x upgrade successfully", id, short_addr); UpgradeCfg::WriteCfg(upgrade_); } else { auto upgrade_iter = upgrade_.find(id); if (upgrade_iter->second.try_times >= 10) { - zlog_error(zct, "[%d] short addr:%d upgrade 10 time failure", id, short_addr); + zlog_error(zct, "[%d] short addr:%x upgrade 10 time failure", id, short_addr); upgrade_.erase(id); UpgradeCfg::WriteCfg(upgrade_); // TODO: call interface to write into database