zhangsheng/WLG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use hex to output short addr.

Browse Source
This commit is contained in:
pandx 2024-11-05 16:28:25 +08:00
parent 972aec0f26
commit 5d9cae688a
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
scheduler/schedule.cpp
View File

@ -135,7 +135,7 @@ int SensorScheduler::GetNextDuration(int short_addr) {
int id = 0; int id = 0;
auto iter = short_addr_map_.find(short_addr); auto iter = short_addr_map_.find(short_addr);
if (iter == short_addr_map_.end()) { 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; return 0;
} else { } else {
id = iter->second; id = iter->second;
@ -151,7 +151,7 @@ long SensorScheduler::GetBaseTimestamp(int short_addr) {
int id = 0; int id = 0;
auto iter = short_addr_map_.find(short_addr); auto iter = short_addr_map_.find(short_addr);
if (iter == short_addr_map_.end()) { 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; return 0;
} else { } else {
id = iter->second; id = iter->second;
@ -232,7 +232,7 @@ int SensorScheduler::GetAvailableId(int short_addr) {
break; 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; short_addr_map_[short_addr] = available_id;
ShortAddrCfg::WriteCfg(short_addr_map_); ShortAddrCfg::WriteCfg(short_addr_map_);
return available_id; return available_id;
@ -462,7 +462,7 @@ int SensorScheduler::UpdateConfigResult(int short_addr, int result) {
int id = 0; int id = 0;
auto iter = short_addr_map_.find(short_addr); auto iter = short_addr_map_.find(short_addr);
if (iter == short_addr_map_.end()) { 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; return 1;
} else { } else {
id = iter->second; id = iter->second;
@ -481,7 +481,7 @@ int SensorScheduler::UpgradeSensor(int short_addr, std::string sensor_type, int
int id = 0; int id = 0;
auto iter = short_addr_map_.find(short_addr); auto iter = short_addr_map_.find(short_addr);
if (iter == short_addr_map_.end()) { 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; return 1;
} else { } else {
id = iter->second; id = iter->second;
@ -515,12 +515,12 @@ int SensorScheduler::UpgradeResult(int short_addr, int result) {
result == kZigbeeHWMismatch || result == kZigbeeHWMismatch ||
result == kUpgradeDoneBefore) { result == kUpgradeDoneBefore) {
upgrade_.erase(id); 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_); UpgradeCfg::WriteCfg(upgrade_);
} else { } else {
auto upgrade_iter = upgrade_.find(id); auto upgrade_iter = upgrade_.find(id);
if (upgrade_iter->second.try_times >= 10) { 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); upgrade_.erase(id);
UpgradeCfg::WriteCfg(upgrade_); UpgradeCfg::WriteCfg(upgrade_);
// TODO: call interface to write into database // TODO: call interface to write into database