diff --git a/components/pipette_module/pipette_ctrl_module_v2.hpp b/components/pipette_module/pipette_ctrl_module_v2.hpp index 203da9d..f6c1443 100644 --- a/components/pipette_module/pipette_ctrl_module_v2.hpp +++ b/components/pipette_module/pipette_ctrl_module_v2.hpp @@ -43,9 +43,9 @@ class PipetteModule : public ZIModule, public ZIPipetteCtrlModule { * Module * *******************************************************************************/ - virtual int32_t module_enable(int32_t enable) override; - virtual int32_t module_stop() override; - virtual int32_t module_break() override; + virtual int32_t module_enable(int32_t enable) ; + virtual int32_t module_stop() ; + virtual int32_t module_break() ; virtual int32_t module_get_status(int32_t *status) override; @@ -67,4 +67,4 @@ class PipetteModule : public ZIModule, public ZIPipetteCtrlModule { private: int32_t _read_error_status(); }; -} // namespace iflytop \ No newline at end of file +} // namespace iflytop diff --git a/components/sensors/m3078/m3078_code_scaner.cpp b/components/sensors/m3078/m3078_code_scaner.cpp index 76bbadc..b3d6eac 100644 --- a/components/sensors/m3078/m3078_code_scaner.cpp +++ b/components/sensors/m3078/m3078_code_scaner.cpp @@ -27,7 +27,7 @@ void M3078CodeScanner::initialize(int moduleid, hardware_config_t* hardwareconfi }); m_uart.startRxIt(); m_triggerGpio.initAsOutput(hardwareconfig->triggerPin, ZGPIO::kMode_nopull, true, false); - creg.module_enable = 1; + //creg.module_enable = 1; id = moduleid; } void M3078CodeScanner::trigger() { @@ -90,8 +90,8 @@ int32_t M3078CodeScanner::get_raw_sector_num(int32_t* num) { int32_t M3078CodeScanner::module_xxx_reg(int32_t param_id, bool read, int32_t& val) { switch (param_id) { MODULE_COMMON_PROCESS_REG_CB(); - PROCESS_REG(kreg_module_raw_sector_size, /* */ get_id_info_len(&val), ACTION_NONE); - PROCESS_REG(kreg_module_raw_sector_num, /* */ get_raw_sector_num(&val), ACTION_NONE); + // PROCESS_REG(kreg_module_raw_sector_size, /* */ get_id_info_len(&val), ACTION_NONE); + // PROCESS_REG(kreg_module_raw_sector_num, /* */ get_raw_sector_num(&val), ACTION_NONE); default: return err::kmodule_not_find_config_index; diff --git a/components/sensors/m3078/m3078_code_scaner.hpp b/components/sensors/m3078/m3078_code_scaner.hpp index 0e00a4e..a019750 100644 --- a/components/sensors/m3078/m3078_code_scaner.hpp +++ b/components/sensors/m3078/m3078_code_scaner.hpp @@ -85,10 +85,10 @@ class M3078CodeScanner : public ZIModule { *id = this->id; return 0; } - virtual int32_t module_stop() override; - virtual int32_t module_break() override; + virtual int32_t module_stop() ; + virtual int32_t module_break() ; virtual int32_t module_start() ; - virtual int32_t module_read_raw(int32_t index, uint8_t* data, int32_t* len) override; + virtual int32_t module_read_raw(int32_t index, uint8_t* data, int32_t* len) ; virtual int32_t module_get_status(int32_t* status) override; private: 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 581d647..7a2e0dc 100644 --- a/components/step_motor_ctrl_module/step_motor_ctrl_module.cpp +++ b/components/step_motor_ctrl_module/step_motor_ctrl_module.cpp @@ -8,10 +8,16 @@ using namespace iflytop; #define TAG "SMCM" +void StepMotorCtrlModule::initialize(int moduleid, IStepperMotor* stepM, ZGPIO* zero, ZGPIO* end, config_t* cfg) {} + int32_t StepMotorCtrlModule::module_xxx_reg(int32_t param_id, bool read, int32_t& val) { return 0; } int32_t StepMotorCtrlModule::module_get_status(int32_t* status) { return 0; } -int32_t StepMotorCtrlModule::step_motor_enable(int32_t enable) { return 0; } +int32_t StepMotorCtrlModule::step_motor_enable(int32_t enable) { + zlock_guard l(m_lock); + ZLOGI(TAG, "m%d motor_enable %ld", m_id, enable); + m_stepM1->enable(enable); +} int32_t StepMotorCtrlModule::step_motor_read_pos(int32_t* pos) { return 0; } int32_t StepMotorCtrlModule::step_motor_stop(int32_t breakstop) { return 0; } int32_t StepMotorCtrlModule::step_motor_easy_rotate(int32_t direction) { return 0; } diff --git a/components/step_motor_ctrl_module/step_motor_ctrl_module.hpp b/components/step_motor_ctrl_module/step_motor_ctrl_module.hpp index c43832c..a3881c6 100644 --- a/components/step_motor_ctrl_module/step_motor_ctrl_module.hpp +++ b/components/step_motor_ctrl_module/step_motor_ctrl_module.hpp @@ -59,14 +59,11 @@ class StepMotorCtrlModule : public ZIModule, public ZIStepMotor { *id = m_id; return 0; } - virtual int32_t module_stop() { return step_motor_stop(0); } - virtual int32_t module_break() { return step_motor_stop(1); } - virtual int32_t module_enable(int32_t enable) { return step_motor_enable(enable); } + virtual int32_t module_get_status(int32_t* status); + virtual int32_t module_xxx_reg(int32_t param_id, bool read, int32_t& val); /*********************************************************************************************************************** * ZIStepMotor * ***********************************************************************************************************************/ - virtual int32_t module_get_status(int32_t* status); - virtual int32_t module_xxx_reg(int32_t param_id, bool read, int32_t& val); virtual int32_t step_motor_enable(int32_t enable); virtual int32_t step_motor_read_pos(int32_t* pos); diff --git a/components/step_motor_ctrl_module/step_motor_ctrl_module.cpp.bak b/components/step_motor_ctrl_module/step_motor_ctrl_module_cpp.bak similarity index 100% rename from components/step_motor_ctrl_module/step_motor_ctrl_module.cpp.bak rename to components/step_motor_ctrl_module/step_motor_ctrl_module_cpp.bak diff --git a/components/water_cooling_temperature_control_module/water_cooling_temperature_control_module.hpp b/components/water_cooling_temperature_control_module/water_cooling_temperature_control_module.hpp index 8b0f372..4e108c2 100644 --- a/components/water_cooling_temperature_control_module/water_cooling_temperature_control_module.hpp +++ b/components/water_cooling_temperature_control_module/water_cooling_temperature_control_module.hpp @@ -88,7 +88,7 @@ class WaterCoolingTemperatureControlModule : public ZIModule { virtual int32_t module_active_cfg() ; - virtual int32_t module_stop() override; + virtual int32_t module_stop() ; virtual int32_t module_start() ; virtual int32_t module_clear_error() override; diff --git a/components/zcancmder/zcan_protocol_parser.cpp b/components/zcancmder/zcan_protocol_parser.cpp index af4da9e..379a32c 100644 --- a/components/zcancmder/zcan_protocol_parser.cpp +++ b/components/zcancmder/zcan_protocol_parser.cpp @@ -15,8 +15,8 @@ void ZCanProtocolParser::initialize(IZCanReceiver* cancmder) { m_cancmder->registerListener(this); REGFN(module_ping); - REGFN(module_stop); - REGFN(module_break); + // REGFN(module_stop); + // REGFN(module_break); // REGFN(module_get_last_exec_status); REGFN(module_get_status); REGFN(module_set_reg); @@ -31,8 +31,8 @@ void ZCanProtocolParser::initialize(IZCanReceiver* cancmder) { // REGFN(module_factory_reset); // REGFN(module_flush_cfg); // REGFN(module_active_cfg); - REGFN(module_read_raw); - REGFN(module_enable); + // REGFN(module_read_raw); + // REGFN(module_enable); // REGFN(module_start); REGFN(step_motor_enable); @@ -137,14 +137,14 @@ int32_t ZCanProtocolParser::module_ping(cmdcontxt_t* cxt) { CHECK_AND_GET_MODULE(0); return module->module_ping(); } -int32_t ZCanProtocolParser::module_stop(cmdcontxt_t* cxt) { - CHECK_AND_GET_MODULE(0); - return module->module_stop(); -} -int32_t ZCanProtocolParser::module_break(cmdcontxt_t* cxt) { - CHECK_AND_GET_MODULE(0); - return module->module_break(); -} +// int32_t ZCanProtocolParser::module_stop(cmdcontxt_t* cxt) { +// CHECK_AND_GET_MODULE(0); +// return module->module_stop(); +// } +// int32_t ZCanProtocolParser::module_break(cmdcontxt_t* cxt) { +// CHECK_AND_GET_MODULE(0); +// return module->module_break(); +// } // int32_t ZCanProtocolParser::module_get_last_exec_status(cmdcontxt_t* cxt) { // CHECK_AND_GET_MODULE(0); // int32_t* ack = (int32_t*)cxt->ackbuf; @@ -215,16 +215,16 @@ int32_t ZCanProtocolParser::module_clear_error(cmdcontxt_t* cxt) { // CHECK_AND_GET_MODULE(0); // return module->module_active_cfg(); // } -int32_t ZCanProtocolParser::module_read_raw(cmdcontxt_t* cxt) { - CHECK_AND_GET_MODULE(1); - int32_t* ack = (int32_t*)cxt->ackbuf; - cxt->acklen = ZCANCMD_READ_BUF_MAX_SIZE; - return module->module_read_raw(cxt->param[0], cxt->ackbuf, &cxt->acklen); -} -int32_t ZCanProtocolParser::module_enable(cmdcontxt_t* cxt) { - CHECK_AND_GET_MODULE(1); - return module->module_enable(cxt->param[0]); -} +// int32_t ZCanProtocolParser::module_read_raw(cmdcontxt_t* cxt) { +// CHECK_AND_GET_MODULE(1); +// int32_t* ack = (int32_t*)cxt->ackbuf; +// cxt->acklen = ZCANCMD_READ_BUF_MAX_SIZE; +// return module->module_read_raw(cxt->param[0], cxt->ackbuf, &cxt->acklen); +// } +// int32_t ZCanProtocolParser::module_enable(cmdcontxt_t* cxt) { +// CHECK_AND_GET_MODULE(1); +// return module->module_enable(cxt->param[0]); +// } // int32_t ZCanProtocolParser::module_start(cmdcontxt_t* cxt) { // CHECK_AND_GET_MODULE(0); // return module->module_start();