diff --git a/components/zcancmder/zcan_protocol_parser.cpp b/components/zcancmder/zcan_protocol_parser.cpp index f9f5ef8..c43b7cf 100644 --- a/components/zcancmder/zcan_protocol_parser.cpp +++ b/components/zcancmder/zcan_protocol_parser.cpp @@ -63,6 +63,12 @@ void ZCanProtocolParser::initialize(IZCanReceiver* cancmder) { REGFN(code_scaner_result_is_ready); REGFN(code_scaner_get_result_length); REGFN(code_scaner_read_scaner_result); + + + REGFN(pipette_ctrl_init_device); + REGFN(pipette_ctrl_put_tip); + REGFN(pipette_ctrl_move_to_ul); + #if 0 REGFN(xymotor_enable); REGFN(xymotor_move_by); @@ -72,10 +78,6 @@ void ZCanProtocolParser::initialize(IZCanReceiver* cancmder) { REGFN(xymotor_read_pos); REGFN(xymotor_calculated_pos_by_move_to_zero); - REGFN(pipette_ctrl_init_device); - REGFN(pipette_ctrl_put_tip); - REGFN(pipette_ctrl_move_to_ul); - REGFN(a8000_optical_module_power_ctrl); REGFN(a8000_optical_open_laser); REGFN(a8000_optical_close_laser); @@ -422,6 +424,28 @@ int32_t ZCanProtocolParser::code_scaner_read_scaner_result(cmdcontxt_t* cxt) { } #undef MODULE_CLASS +/*********************************************************************************************************************** + * ZIPipetteCtrlModule * + ***********************************************************************************************************************/ + +#define MODULE_CLASS ZIPipetteCtrlModule +int32_t ZCanProtocolParser::pipette_ctrl_init_device(cmdcontxt_t* cxt) { + CHECK_AND_GET_MODULE(0); + return module->pipette_ctrl_init_device(); +} + +int32_t ZCanProtocolParser::pipette_ctrl_put_tip(cmdcontxt_t* cxt) { + CHECK_AND_GET_MODULE(0); + return module->pipette_ctrl_put_tip(); +} + +int32_t ZCanProtocolParser::pipette_ctrl_move_to_ul(cmdcontxt_t* cxt) { + CHECK_AND_GET_MODULE(1); + return module->pipette_ctrl_move_to_ul(cxt->params[0]); +} + +#undef MODULE_CLASS + #if 0 #define MODULE_CLASS ZIXYMotor @@ -464,27 +488,7 @@ int32_t ZCanProtocolParser::xymotor_calculated_pos_by_move_to_zero(cmdcontxt_t* #undef MODULE_CLASS -/*********************************************************************************************************************** - * ZIPipetteCtrlModule * - ***********************************************************************************************************************/ -#define MODULE_CLASS ZIPipetteCtrlModule -int32_t ZCanProtocolParser::pipette_ctrl_init_device(cmdcontxt_t* cxt) { - CHECK_AND_GET_MODULE(0); - return module->pipette_ctrl_init_device(); -} - -int32_t ZCanProtocolParser::pipette_ctrl_put_tip(cmdcontxt_t* cxt) { - CHECK_AND_GET_MODULE(0); - return module->pipette_ctrl_put_tip(); -} - -int32_t ZCanProtocolParser::pipette_ctrl_move_to_ul(cmdcontxt_t* cxt) { - CHECK_AND_GET_MODULE(1); - return module->pipette_ctrl_move_to_ul(cxt->params[0]); -} - -#undef MODULE_CLASS /*********************************************************************************************************************** * ZIA8000OpticalModule * diff --git a/components/zcancmder/zcan_protocol_parser.hpp b/components/zcancmder/zcan_protocol_parser.hpp index 5d69777..70fe13f 100644 --- a/components/zcancmder/zcan_protocol_parser.hpp +++ b/components/zcancmder/zcan_protocol_parser.hpp @@ -97,6 +97,10 @@ class ZCanProtocolParser : public IZCanReceiverListener { static int32_t code_scaner_get_result_length(cmdcontxt_t* cxt); static int32_t code_scaner_read_scaner_result(cmdcontxt_t* cxt); + static int32_t pipette_ctrl_init_device(cmdcontxt_t* cxt); + static int32_t pipette_ctrl_put_tip(cmdcontxt_t* cxt); + static int32_t pipette_ctrl_move_to_ul(cmdcontxt_t* cxt); + #if 0 static int32_t xymotor_enable(cmdcontxt_t* cxt); static int32_t xymotor_move_by(cmdcontxt_t* cxt); @@ -106,9 +110,6 @@ class ZCanProtocolParser : public IZCanReceiverListener { static int32_t xymotor_read_pos(cmdcontxt_t* cxt); static int32_t xymotor_calculated_pos_by_move_to_zero(cmdcontxt_t* cxt); - static int32_t pipette_ctrl_init_device(cmdcontxt_t* cxt); - static int32_t pipette_ctrl_put_tip(cmdcontxt_t* cxt); - static int32_t pipette_ctrl_move_to_ul(cmdcontxt_t* cxt); static int32_t a8000_optical_module_power_ctrl(cmdcontxt_t* cxt); static int32_t a8000_optical_open_laser(cmdcontxt_t* cxt);