Browse Source

update

master
zhaohe 2 years ago
parent
commit
cab4a096a0
  1. 9
      components/zprotocol_helper/micro_computer_module_device_script_cmder_paser.cpp
  2. 2
      components/zprotocols/zcancmder_v2

9
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_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_adc_result_overflow", kreg_boditech_optical_adc_result_overflow);
DUMP_CONFIG("boditech_optical_laster_intensity", kreg_boditech_optical_laster_intensity); DUMP_CONFIG("boditech_optical_laster_intensity", kreg_boditech_optical_laster_intensity);
} }
void MicroComputerModuleDeviceScriptCmderPaser::initialize(ICmdParser* cancmder, ZModuleDeviceManager* deviceManager) { 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); 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) { 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) { void MicroComputerModuleDeviceScriptCmderPaser::do_scan_module(int32_t paramN, const char* paraV[], ICmdParserACK* ack) {
m_deviceManager->for_each_module([this](int32_t id) { // m_deviceManager->for_each_module([this](int32_t id) { //
int32_t ecode = m_deviceManager->module_ping(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");
}
}); });
} }

2
components/zprotocols/zcancmder_v2

@ -1 +1 @@
Subproject commit c8f8ad1cd51a5f05ead5cfac7cc6dcd8d61ad4f9
Subproject commit 8ba982c43ae7ef8076613bee92c4b9ecd5d21799
Loading…
Cancel
Save