From cab4a096a0de7685ae64ca53d345d45adfec96a9 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Tue, 7 Nov 2023 12:46:13 +0800 Subject: [PATCH] update --- .../micro_computer_module_device_script_cmder_paser.cpp | 9 ++++----- components/zprotocols/zcancmder_v2 | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/components/zprotocol_helper/micro_computer_module_device_script_cmder_paser.cpp b/components/zprotocol_helper/micro_computer_module_device_script_cmder_paser.cpp index 155f413..1951491 100644 --- a/components/zprotocol_helper/micro_computer_module_device_script_cmder_paser.cpp +++ b/components/zprotocol_helper/micro_computer_module_device_script_cmder_paser.cpp @@ -349,7 +349,6 @@ void MicroComputerModuleDeviceScriptCmderPaser::do_dumpreg(int32_t paramN, const DUMP_CONFIG("boditech_optical_scan_gain_adjust_suggestion", kreg_boditech_optical_scan_gain_adjust_suggestion); DUMP_CONFIG("boditech_optical_adc_result_overflow", kreg_boditech_optical_adc_result_overflow); DUMP_CONFIG("boditech_optical_laster_intensity", kreg_boditech_optical_laster_intensity); - } void MicroComputerModuleDeviceScriptCmderPaser::initialize(ICmdParser* cancmder, ZModuleDeviceManager* deviceManager) { @@ -363,9 +362,7 @@ void MicroComputerModuleDeviceScriptCmderPaser::initialize(ICmdParser* cancmder, ZLOGI(TAG, "onRegValChangeEvent(%d,%d,%d)", moduleid, event_id, eventval); }); - cancmder->regCMD("app_wait_for_module", "(mid,timeout)", -1, [this](int32_t paramN, const char* paraV[], ICmdParserACK* ack) { - do_wait_for_module(paramN, paraV, ack); - }); + cancmder->regCMD("app_wait_for_module", "(mid,timeout)", -1, [this](int32_t paramN, const char* paraV[], ICmdParserACK* ack) { do_wait_for_module(paramN, paraV, ack); }); } void MicroComputerModuleDeviceScriptCmderPaser::do_wait_for_module(int32_t paramN, const char* paraV[], ICmdParserACK* ack) { @@ -420,6 +417,8 @@ void MicroComputerModuleDeviceScriptCmderPaser::do_wait_for_module(int32_t modul void MicroComputerModuleDeviceScriptCmderPaser::do_scan_module(int32_t paramN, const char* paraV[], ICmdParserACK* ack) { m_deviceManager->for_each_module([this](int32_t id) { // int32_t ecode = m_deviceManager->module_ping(id); - ZLOGI(TAG, "module %d : %s", id, ecode == 0 ? "online" : "offline"); + if (ecode == 0) { + ZLOGI(TAG, "module %d : %s", id, ecode == 0 ? "online" : "offline"); + } }); } diff --git a/components/zprotocols/zcancmder_v2 b/components/zprotocols/zcancmder_v2 index c8f8ad1..8ba982c 160000 --- a/components/zprotocols/zcancmder_v2 +++ b/components/zprotocols/zcancmder_v2 @@ -1 +1 @@ -Subproject commit c8f8ad1cd51a5f05ead5cfac7cc6dcd8d61ad4f9 +Subproject commit 8ba982c43ae7ef8076613bee92c4b9ecd5d21799