From 7097ea4b1fcaf93de1ba0088a8acc9cec06e6bc7 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Sun, 12 Nov 2023 16:39:24 +0800 Subject: [PATCH] update --- .../step_motor_ctrl_module.cpp | 5 +- ...o_computer_module_device_script_cmder_paser.cpp | 55 +++++++++++----------- 2 files changed, 31 insertions(+), 29 deletions(-) diff --git a/components/step_motor_ctrl_module/step_motor_ctrl_module.cpp b/components/step_motor_ctrl_module/step_motor_ctrl_module.cpp index 9fffb86..0536903 100644 --- a/components/step_motor_ctrl_module/step_motor_ctrl_module.cpp +++ b/components/step_motor_ctrl_module/step_motor_ctrl_module.cpp @@ -19,7 +19,8 @@ void StepMotorCtrlModule::initialize(int moduleid, IStepperMotor* stepM, ZGPIO i m_lock.init(); m_statu_lock.init(); m_thread.init(TAG, 1024, osPriorityNormal); - m_flashmark = flashmark; + m_flashmark = flashmark; + m_factory_config = *defaultcfg; if (m_flashmark) { ZASSERT(ZNVS::ins().get_config(m_flashmark, (uint8_t*)&m_cfg, sizeof(m_cfg))); @@ -31,6 +32,8 @@ void StepMotorCtrlModule::initialize(int moduleid, IStepperMotor* stepM, ZGPIO i } else { m_cfg = m_factory_config; } + + active_cfg(); #if 0 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 81e38f1..801f442 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 @@ -82,7 +82,7 @@ void MicroComputerModuleDeviceScriptCmderPaser::app_dump_reg(int32_t moduleId, i int32_t configval = 0; int32_t ecode = 0; - ZLOGI(TAG,"-------------------------REG LIST--------------------------") + ZLOGI(TAG, "-------------------------REG LIST--------------------------") /******************************************************************************* * Ä£¿éͨÓÃÅäÖúÍ״̬ * @@ -100,13 +100,6 @@ void MicroComputerModuleDeviceScriptCmderPaser::app_dump_reg(int32_t moduleId, i DUMP_CONFIG("module_raw_sector_size", kreg_module_raw_sector_size); DUMP_CONFIG("module_raw_sector_num", kreg_module_raw_sector_num); DUMP_CONFIG("module_is_online", kreg_module_is_online); - DUMP_CONFIG("module_last_cmd_exec_status", kreg_module_last_cmd_exec_status); - DUMP_CONFIG("module_last_cmd_exec_val0", kreg_module_last_cmd_exec_val0); - DUMP_CONFIG("module_last_cmd_exec_val1", kreg_module_last_cmd_exec_val1); - DUMP_CONFIG("module_last_cmd_exec_val2", kreg_module_last_cmd_exec_val2); - DUMP_CONFIG("module_last_cmd_exec_val3", kreg_module_last_cmd_exec_val3); - DUMP_CONFIG("module_last_cmd_exec_val4", kreg_module_last_cmd_exec_val4); - DUMP_CONFIG("module_last_cmd_exec_val5", kreg_module_last_cmd_exec_val5); DUMP_CONFIG("module_private0", kreg_module_private0); DUMP_CONFIG("module_private1", kreg_module_private1); DUMP_CONFIG("module_private2", kreg_module_private2); @@ -117,26 +110,6 @@ void MicroComputerModuleDeviceScriptCmderPaser::app_dump_reg(int32_t moduleId, i DUMP_CONFIG("module_private7", kreg_module_private7); DUMP_CONFIG("module_private8", kreg_module_private8); DUMP_CONFIG("module_private9", kreg_module_private9); - DUMP_CONFIG("module_do_action0", kreg_module_do_action0); - DUMP_CONFIG("module_action_param1", kreg_module_action_param1); - DUMP_CONFIG("module_action_param2", kreg_module_action_param2); - DUMP_CONFIG("module_action_param3", kreg_module_action_param3); - DUMP_CONFIG("module_action_param4", kreg_module_action_param4); - DUMP_CONFIG("module_action_param5", kreg_module_action_param5); - DUMP_CONFIG("module_action_param6", kreg_module_action_param6); - DUMP_CONFIG("module_action_param7", kreg_module_action_param7); - DUMP_CONFIG("module_action_param8", kreg_module_action_param8); - DUMP_CONFIG("module_action_param9", kreg_module_action_param9); - DUMP_CONFIG("module_action_ack1", kreg_module_action_ack1); - DUMP_CONFIG("module_action_ack2", kreg_module_action_ack2); - DUMP_CONFIG("module_action_ack3", kreg_module_action_ack3); - DUMP_CONFIG("module_action_ack4", kreg_module_action_ack4); - DUMP_CONFIG("module_action_ack5", kreg_module_action_ack5); - DUMP_CONFIG("module_action_ack6", kreg_module_action_ack6); - DUMP_CONFIG("module_action_ack7", kreg_module_action_ack7); - DUMP_CONFIG("module_action_ack8", kreg_module_action_ack8); - DUMP_CONFIG("module_action_ack9", kreg_module_action_ack9); - /******************************************************************************* * SENSOR * *******************************************************************************/ @@ -384,6 +357,32 @@ void MicroComputerModuleDeviceScriptCmderPaser::app_dump_reg(int32_t moduleId, i 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); + + DUMP_CONFIG("module_last_cmd_exec_status", kreg_module_last_cmd_exec_status); + DUMP_CONFIG("module_last_cmd_exec_val0", kreg_module_last_cmd_exec_val0); + DUMP_CONFIG("module_last_cmd_exec_val1", kreg_module_last_cmd_exec_val1); + DUMP_CONFIG("module_last_cmd_exec_val2", kreg_module_last_cmd_exec_val2); + DUMP_CONFIG("module_last_cmd_exec_val3", kreg_module_last_cmd_exec_val3); + DUMP_CONFIG("module_last_cmd_exec_val4", kreg_module_last_cmd_exec_val4); + DUMP_CONFIG("module_last_cmd_exec_val5", kreg_module_last_cmd_exec_val5); + DUMP_CONFIG("module_action_param1", kreg_module_action_param1); + DUMP_CONFIG("module_action_param2", kreg_module_action_param2); + DUMP_CONFIG("module_action_param3", kreg_module_action_param3); + DUMP_CONFIG("module_action_param4", kreg_module_action_param4); + DUMP_CONFIG("module_action_param5", kreg_module_action_param5); + DUMP_CONFIG("module_action_param6", kreg_module_action_param6); + DUMP_CONFIG("module_action_param7", kreg_module_action_param7); + DUMP_CONFIG("module_action_param8", kreg_module_action_param8); + DUMP_CONFIG("module_action_param9", kreg_module_action_param9); + DUMP_CONFIG("module_action_ack1", kreg_module_action_ack1); + DUMP_CONFIG("module_action_ack2", kreg_module_action_ack2); + DUMP_CONFIG("module_action_ack3", kreg_module_action_ack3); + DUMP_CONFIG("module_action_ack4", kreg_module_action_ack4); + DUMP_CONFIG("module_action_ack5", kreg_module_action_ack5); + DUMP_CONFIG("module_action_ack6", kreg_module_action_ack6); + DUMP_CONFIG("module_action_ack7", kreg_module_action_ack7); + DUMP_CONFIG("module_action_ack8", kreg_module_action_ack8); + DUMP_CONFIG("module_action_ack9", kreg_module_action_ack9); } void MicroComputerModuleDeviceScriptCmderPaser::do_wait_for_module(int32_t paramN, const char* paraV[], ICmdParserACK* ack) {