diff --git a/api/zi_a8000_optical_module.hpp b/api/zi_a8000_optical_module.hpp index 2ed84ae..c6c358a 100644 --- a/api/zi_a8000_optical_module.hpp +++ b/api/zi_a8000_optical_module.hpp @@ -15,7 +15,7 @@ class ZIA8000OpticalModule { } optical_type_t; public: - virtual ~ZIA8000OpticalModule() = 0; + virtual ~ZIA8000OpticalModule(){}; /******************************************************************************* * TEST * @@ -41,4 +41,4 @@ class ZIA8000OpticalModule { */ virtual int32_t a8000_optical_scan_current_point_amp_adc_val(int32_t type, int32_t lastergain, int32_t ampgain, int32_t* laster_fb_val, int32_t* adcval) = 0; }; -} // namespace iflytop \ No newline at end of file +} // namespace iflytop diff --git a/protocol_proxy.cpp b/protocol_proxy.cpp index 9c45ba7..ab4203b 100644 --- a/protocol_proxy.cpp +++ b/protocol_proxy.cpp @@ -201,3 +201,21 @@ int32_t ZIProtocolProxy::code_scaner_read_scaner_result(int32_t para0, uint8_t * int32_t ZIProtocolProxy::pipette_ctrl_init_device() { PROXY_IMPL_00(kpipette_ctrl_init_device, 30); }; int32_t ZIProtocolProxy::pipette_ctrl_put_tip() { PROXY_IMPL_00(kpipette_ctrl_put_tip, 30); }; int32_t ZIProtocolProxy::pipette_ctrl_move_to_ul(int32_t para0) { PROXY_IMPL_10(kpipette_ctrl_move_to_ul, 30); }; + +#if 0 + virtual int32_t a8000_optical_open_laser(int32_t type) = 0; + virtual int32_t a8000_optical_close_laser(int32_t type) = 0; + virtual int32_t a8000_optical_set_laster_gain(int32_t type, int32_t gain) = 0; + virtual int32_t a8000_optical_set_scan_amp_gain(int32_t type, int32_t gain) = 0; + virtual int32_t a8000_optical_read_scanner_adc_val(int32_t type, int32_t* adcval) = 0; + virtual int32_t a8000_optical_read_laster_adc_val(int32_t type, int32_t* adcval) = 0; + virtual int32_t a8000_optical_scan_current_point_amp_adc_val(int32_t type, int32_t lastergain, int32_t ampgain, int32_t* laster_fb_val, int32_t* adcval) = 0; +#endif + +int32_t ZIProtocolProxy::a8000_optical_open_laser(int32_t para0) { PROXY_IMPL_10(ka8000_optical_open_laser, 30); } +int32_t ZIProtocolProxy::a8000_optical_close_laser(int32_t para0) { PROXY_IMPL_10(ka8000_optical_close_laser, 30); } +int32_t ZIProtocolProxy::a8000_optical_set_laster_gain(int32_t para0, int32_t para1) { PROXY_IMPL_20(ka8000_optical_set_laster_gain, 30); } +int32_t ZIProtocolProxy::a8000_optical_set_scan_amp_gain(int32_t para0, int32_t para1) { PROXY_IMPL_20(ka8000_optical_set_scan_amp_gain, 30); } +int32_t ZIProtocolProxy::a8000_optical_read_scanner_adc_val(int32_t para0, int32_t *ack0) { PROXY_IMPL_11(ka8000_optical_read_scanner_adc_val, 30); } +int32_t ZIProtocolProxy::a8000_optical_read_laster_adc_val(int32_t para0, int32_t *ack0) { PROXY_IMPL_11(ka8000_optical_read_laster_adc_val, 30); } +int32_t ZIProtocolProxy::a8000_optical_scan_current_point_amp_adc_val(int32_t para0, int32_t para1, int32_t para2, int32_t *ack0, int32_t *ack1) { PROXY_IMPL_22(ka8000_optical_scan_current_point_amp_adc_val, 30); } diff --git a/protocol_proxy.hpp b/protocol_proxy.hpp index 0568072..9b0eaf0 100644 --- a/protocol_proxy.hpp +++ b/protocol_proxy.hpp @@ -9,8 +9,9 @@ namespace iflytop { class ZIProtocolProxy : public ZIMotor, // public ZIXYMotor, // public ZIModule, - public ZICodeScaner , - public ZIPipetteCtrlModule{ + public ZICodeScaner, + public ZIPipetteCtrlModule, + public ZIA8000OpticalModule { private: IZcanCmderMaster *m_cancmder; int32_t m_id = 0; @@ -81,7 +82,7 @@ class ZIProtocolProxy : public ZIMotor, // virtual int32_t motor_move_to_zero_backward_and_calculated_shift(int32_t findzerospeed, int32_t findzeroedge_speed, int32_t acc, int32_t overtime) { return err::koperation_not_support; } virtual int32_t motor_read_pos(int32_t* pos) { return err::koperation_not_support; } - virtual int32_t motor_set_current_pos_by_change_shift(int32_t pos) { return err::koperation_not_support; } // һ�����ڶ�� + virtual int32_t motor_set_current_pos_by_change_shift(int32_t pos) { return err::koperation_not_support; } // һ�����ڶ�� virtual int32_t motor_calculated_pos_by_move_to_zero() { return err::koperation_not_support; } #endif @@ -152,6 +153,23 @@ class ZIProtocolProxy : public ZIMotor, // virtual int32_t pipette_ctrl_put_tip() override; virtual int32_t pipette_ctrl_move_to_ul(int32_t ul) override; +#if 0 + virtual int32_t a8000_optical_open_laser(int32_t type) = 0; + virtual int32_t a8000_optical_close_laser(int32_t type) = 0; + virtual int32_t a8000_optical_set_laster_gain(int32_t type, int32_t gain) = 0; + virtual int32_t a8000_optical_set_scan_amp_gain(int32_t type, int32_t gain) = 0; + virtual int32_t a8000_optical_read_scanner_adc_val(int32_t type, int32_t* adcval) = 0; + virtual int32_t a8000_optical_read_laster_adc_val(int32_t type, int32_t* adcval) = 0; + virtual int32_t a8000_optical_scan_current_point_amp_adc_val(int32_t type, int32_t lastergain, int32_t ampgain, int32_t* laster_fb_val, int32_t* adcval) = 0; +#endif + + virtual int32_t a8000_optical_open_laser(int32_t type) override; + virtual int32_t a8000_optical_close_laser(int32_t type) override; + virtual int32_t a8000_optical_set_laster_gain(int32_t type, int32_t gain) override; + virtual int32_t a8000_optical_set_scan_amp_gain(int32_t type, int32_t gain) override; + virtual int32_t a8000_optical_read_scanner_adc_val(int32_t type, int32_t *adcval) override; + virtual int32_t a8000_optical_read_laster_adc_val(int32_t type, int32_t *adcval) override; + virtual int32_t a8000_optical_scan_current_point_amp_adc_val(int32_t type, int32_t lastergain, int32_t ampgain, int32_t *laster_fb_val, int32_t *adcval) override; }; } // namespace iflytop \ No newline at end of file diff --git a/zmodule_device_manager.cpp b/zmodule_device_manager.cpp index d293675..3d24308 100644 --- a/zmodule_device_manager.cpp +++ b/zmodule_device_manager.cpp @@ -45,12 +45,8 @@ int32_t ZModuleDeviceManager::module_stop(uint16_t id) { PROXY_IMPL(ZIModule, mo int32_t ZModuleDeviceManager::module_break(uint16_t id) { PROXY_IMPL(ZIModule, module_break); } int32_t ZModuleDeviceManager::module_get_last_exec_status(uint16_t id, int32_t *ack0) { PROXY_IMPL(ZIModule, module_get_last_exec_status, ack0); } int32_t ZModuleDeviceManager::module_get_status(uint16_t id, int32_t *status) { PROXY_IMPL(ZIModule, module_get_status, status); } -int32_t ZModuleDeviceManager::module_set_reg(uint16_t id, int32_t param_id, int32_t param_value) { - PROXY_IMPL(ZIModule, module_set_reg, param_id, param_value); -} -int32_t ZModuleDeviceManager::module_get_reg(uint16_t id, int32_t param_id, int32_t *param_value) { - PROXY_IMPL(ZIModule, module_get_reg, param_id, param_value); -} +int32_t ZModuleDeviceManager::module_set_reg(uint16_t id, int32_t param_id, int32_t param_value) { PROXY_IMPL(ZIModule, module_set_reg, param_id, param_value); } +int32_t ZModuleDeviceManager::module_get_reg(uint16_t id, int32_t param_id, int32_t *param_value) { PROXY_IMPL(ZIModule, module_get_reg, param_id, param_value); } int32_t ZModuleDeviceManager::module_readio(uint16_t id, int32_t *io) { PROXY_IMPL(ZIModule, module_readio, io); } int32_t ZModuleDeviceManager::module_writeio(uint16_t id, int32_t ioindex, int32_t io) { PROXY_IMPL(ZIModule, module_writeio, ioindex, io); } int32_t ZModuleDeviceManager::module_read_adc(uint16_t id, int32_t adcindex, int32_t *adc) { PROXY_IMPL(ZIModule, module_read_adc, adcindex, adc); } @@ -61,9 +57,7 @@ int32_t ZModuleDeviceManager::module_get_inited_flag(uint16_t id, int32_t *flag) int32_t ZModuleDeviceManager::module_factory_reset(uint16_t id) { PROXY_IMPL(ZIModule, module_factory_reset); } int32_t ZModuleDeviceManager::module_flush_cfg(uint16_t id) { PROXY_IMPL(ZIModule, module_flush_cfg); } int32_t ZModuleDeviceManager::module_active_cfg(uint16_t id) { PROXY_IMPL(ZIModule, module_active_cfg); } -int32_t ZModuleDeviceManager::module_read_raw(uint16_t id, int32_t startadd, uint8_t *data, int32_t *len) { - PROXY_IMPL(ZIModule, module_read_raw, startadd, data, len); -} +int32_t ZModuleDeviceManager::module_read_raw(uint16_t id, int32_t startadd, uint8_t *data, int32_t *len) { PROXY_IMPL(ZIModule, module_read_raw, startadd, data, len); } int32_t ZModuleDeviceManager::module_enable(uint16_t id, int32_t enable) { PROXY_IMPL(ZIModule, module_enable, enable); } int32_t ZModuleDeviceManager::module_start(uint16_t id) { PROXY_IMPL(ZIModule, module_start); } @@ -90,53 +84,25 @@ int32_t ZModuleDeviceManager::module_start(uint16_t id) { PROXY_IMPL(ZIModule, m virtual int32_t motor_move_to_zero_backward_and_calculated_shift(int32_t findzerospeed, int32_t findzeroedge_speed, int32_t acc, int32_t overtime) { return err::koperation_not_support; } virtual int32_t motor_read_pos(int32_t* pos) { return err::koperation_not_support; } - virtual int32_t motor_set_current_pos_by_change_shift(int32_t pos) { return err::koperation_not_support; } // һ�����ڶ�� + virtual int32_t motor_set_current_pos_by_change_shift(int32_t pos) { return err::koperation_not_support; } // һ�����ڶ�� virtual int32_t motor_calculated_pos_by_move_to_zero() { return err::koperation_not_support; } #endif int32_t ZModuleDeviceManager::motor_enable(uint16_t id, int32_t enable) { PROXY_IMPL(ZIMotor, motor_enable, enable); } -int32_t ZModuleDeviceManager::motor_rotate(uint16_t id, int32_t direction, int32_t motor_velocity, int32_t acc) { - PROXY_IMPL(ZIMotor, motor_rotate, direction, motor_velocity, acc); -} -int32_t ZModuleDeviceManager::motor_move_by(uint16_t id, int32_t distance, int32_t motor_velocity, int32_t acc) { - PROXY_IMPL(ZIMotor, motor_move_by, distance, motor_velocity, acc); -} -int32_t ZModuleDeviceManager::motor_move_to(uint16_t id, int32_t position, int32_t motor_velocity, int32_t acc) { - PROXY_IMPL(ZIMotor, motor_move_to, position, motor_velocity, acc); -} -int32_t ZModuleDeviceManager::motor_rotate_with_torque(uint16_t id, int32_t direction, int32_t torque) { - PROXY_IMPL(ZIMotor, motor_rotate_with_torque, direction, torque); -} -int32_t ZModuleDeviceManager::motor_rotate_acctime(uint16_t id, int32_t direction, int32_t motor_velocity, int32_t acctime) { - PROXY_IMPL(ZIMotor, motor_rotate_acctime, direction, motor_velocity, acctime); -} -int32_t ZModuleDeviceManager::motor_move_by_acctime(uint16_t id, int32_t distance, int32_t motor_velocity, int32_t acctime) { - PROXY_IMPL(ZIMotor, motor_move_by_acctime, distance, motor_velocity, acctime); -} -int32_t ZModuleDeviceManager::motor_move_to_acctime(uint16_t id, int32_t position, int32_t motor_velocity, int32_t acctime) { - PROXY_IMPL(ZIMotor, motor_move_to_acctime, position, motor_velocity, acctime); -} -int32_t ZModuleDeviceManager::motor_move_to_zero_forward(uint16_t id, int32_t findzerospeed, int32_t findzeroedge_speed, int32_t acc, int32_t overtime) { - PROXY_IMPL(ZIMotor, motor_move_to_zero_forward, findzerospeed, findzeroedge_speed, acc, overtime); -} -int32_t ZModuleDeviceManager::motor_move_to_zero_backward(uint16_t id, int32_t findzerospeed, int32_t findzeroedge_speed, int32_t acc, int32_t overtime) { - PROXY_IMPL(ZIMotor, motor_move_to_zero_backward, findzerospeed, findzeroedge_speed, acc, overtime); -} +int32_t ZModuleDeviceManager::motor_rotate(uint16_t id, int32_t direction, int32_t motor_velocity, int32_t acc) { PROXY_IMPL(ZIMotor, motor_rotate, direction, motor_velocity, acc); } +int32_t ZModuleDeviceManager::motor_move_by(uint16_t id, int32_t distance, int32_t motor_velocity, int32_t acc) { PROXY_IMPL(ZIMotor, motor_move_by, distance, motor_velocity, acc); } +int32_t ZModuleDeviceManager::motor_move_to(uint16_t id, int32_t position, int32_t motor_velocity, int32_t acc) { PROXY_IMPL(ZIMotor, motor_move_to, position, motor_velocity, acc); } +int32_t ZModuleDeviceManager::motor_rotate_with_torque(uint16_t id, int32_t direction, int32_t torque) { PROXY_IMPL(ZIMotor, motor_rotate_with_torque, direction, torque); } +int32_t ZModuleDeviceManager::motor_rotate_acctime(uint16_t id, int32_t direction, int32_t motor_velocity, int32_t acctime) { PROXY_IMPL(ZIMotor, motor_rotate_acctime, direction, motor_velocity, acctime); } +int32_t ZModuleDeviceManager::motor_move_by_acctime(uint16_t id, int32_t distance, int32_t motor_velocity, int32_t acctime) { PROXY_IMPL(ZIMotor, motor_move_by_acctime, distance, motor_velocity, acctime); } +int32_t ZModuleDeviceManager::motor_move_to_acctime(uint16_t id, int32_t position, int32_t motor_velocity, int32_t acctime) { PROXY_IMPL(ZIMotor, motor_move_to_acctime, position, motor_velocity, acctime); } +int32_t ZModuleDeviceManager::motor_move_to_zero_forward(uint16_t id, int32_t findzerospeed, int32_t findzeroedge_speed, int32_t acc, int32_t overtime) { PROXY_IMPL(ZIMotor, motor_move_to_zero_forward, findzerospeed, findzeroedge_speed, acc, overtime); } +int32_t ZModuleDeviceManager::motor_move_to_zero_backward(uint16_t id, int32_t findzerospeed, int32_t findzeroedge_speed, int32_t acc, int32_t overtime) { PROXY_IMPL(ZIMotor, motor_move_to_zero_backward, findzerospeed, findzeroedge_speed, acc, overtime); } int32_t ZModuleDeviceManager::motor_read_pos(uint16_t id, int32_t *pos) { PROXY_IMPL(ZIMotor, motor_read_pos, pos); } -int32_t ZModuleDeviceManager::motor_set_current_pos_by_change_shift(uint16_t id, int32_t pos) { - PROXY_IMPL(ZIMotor, motor_set_current_pos_by_change_shift, pos); -} -int32_t ZModuleDeviceManager::motor_move_to_zero_forward_and_calculated_shift(uint16_t id, int32_t findzerospeed, int32_t findzeroedge_speed, int32_t acc, - int32_t overtime) { - PROXY_IMPL(ZIMotor, motor_move_to_zero_forward_and_calculated_shift, findzerospeed, findzeroedge_speed, acc, overtime); -} -int32_t ZModuleDeviceManager::motor_move_to_zero_backward_and_calculated_shift(uint16_t id, int32_t findzerospeed, int32_t findzeroedge_speed, int32_t acc, - int32_t overtime) { - PROXY_IMPL(ZIMotor, motor_move_to_zero_backward_and_calculated_shift, findzerospeed, findzeroedge_speed, acc, overtime); -} -int32_t ZModuleDeviceManager::motor_move_to_torque(uint16_t id, int32_t pos, int32_t torque, int32_t overtime) { - PROXY_IMPL(ZIMotor, motor_move_to_torque, pos, torque, overtime); -} +int32_t ZModuleDeviceManager::motor_set_current_pos_by_change_shift(uint16_t id, int32_t pos) { PROXY_IMPL(ZIMotor, motor_set_current_pos_by_change_shift, pos); } +int32_t ZModuleDeviceManager::motor_move_to_zero_forward_and_calculated_shift(uint16_t id, int32_t findzerospeed, int32_t findzeroedge_speed, int32_t acc, int32_t overtime) { PROXY_IMPL(ZIMotor, motor_move_to_zero_forward_and_calculated_shift, findzerospeed, findzeroedge_speed, acc, overtime); } +int32_t ZModuleDeviceManager::motor_move_to_zero_backward_and_calculated_shift(uint16_t id, int32_t findzerospeed, int32_t findzeroedge_speed, int32_t acc, int32_t overtime) { PROXY_IMPL(ZIMotor, motor_move_to_zero_backward_and_calculated_shift, findzerospeed, findzeroedge_speed, acc, overtime); } +int32_t ZModuleDeviceManager::motor_move_to_torque(uint16_t id, int32_t pos, int32_t torque, int32_t overtime) { PROXY_IMPL(ZIMotor, motor_move_to_torque, pos, torque, overtime); } int32_t ZModuleDeviceManager::motor_calculated_pos_by_move_to_zero(uint16_t id) { PROXY_IMPL(ZIMotor, motor_calculated_pos_by_move_to_zero); } /******************************************************************************* * ZIXYMotor * @@ -150,12 +116,8 @@ int32_t ZModuleDeviceManager::motor_calculated_pos_by_move_to_zero(uint16_t id) virtual int32_t xymotor_read_pos(int32_t *x, int32_t *y) { return err::koperation_not_support; } #endif int32_t ZModuleDeviceManager::xymotor_enable(uint16_t id, int32_t enable) { PROXY_IMPL(ZIXYMotor, xymotor_enable, enable); } -int32_t ZModuleDeviceManager::xymotor_move_by(uint16_t id, int32_t dx, int32_t dy, int32_t motor_velocity) { - PROXY_IMPL(ZIXYMotor, xymotor_move_by, dx, dy, motor_velocity); -} -int32_t ZModuleDeviceManager::xymotor_move_to(uint16_t id, int32_t x, int32_t y, int32_t motor_velocity) { - PROXY_IMPL(ZIXYMotor, xymotor_move_to, x, y, motor_velocity); -} +int32_t ZModuleDeviceManager::xymotor_move_by(uint16_t id, int32_t dx, int32_t dy, int32_t motor_velocity) { PROXY_IMPL(ZIXYMotor, xymotor_move_by, dx, dy, motor_velocity); } +int32_t ZModuleDeviceManager::xymotor_move_to(uint16_t id, int32_t x, int32_t y, int32_t motor_velocity) { PROXY_IMPL(ZIXYMotor, xymotor_move_to, x, y, motor_velocity); } int32_t ZModuleDeviceManager::xymotor_move_to_zero(uint16_t id) { PROXY_IMPL(ZIXYMotor, xymotor_move_to_zero); } int32_t ZModuleDeviceManager::xymotor_move_to_zero_and_calculated_shift(uint16_t id) { PROXY_IMPL(ZIXYMotor, xymotor_move_to_zero_and_calculated_shift); } int32_t ZModuleDeviceManager::xymotor_read_pos(uint16_t id, int32_t *x, int32_t *y) { PROXY_IMPL(ZIXYMotor, xymotor_read_pos, x, y); } @@ -168,9 +130,7 @@ int32_t ZModuleDeviceManager::xymotor_calculated_pos_by_move_to_zero(uint16_t id #endif int32_t ZModuleDeviceManager::code_scaner_start_scan(uint16_t id) { PROXY_IMPL(ZICodeScaner, code_scaner_start_scan); } int32_t ZModuleDeviceManager::code_scaner_stop_scan(uint16_t id) { PROXY_IMPL(ZICodeScaner, code_scaner_stop_scan); } -int32_t ZModuleDeviceManager::code_scaner_read_scaner_result(uint16_t id, int32_t startadd, uint8_t *data, int32_t *len) { - PROXY_IMPL(ZICodeScaner, code_scaner_read_scaner_result, startadd, data, len); -} +int32_t ZModuleDeviceManager::code_scaner_read_scaner_result(uint16_t id, int32_t startadd, uint8_t *data, int32_t *len) { PROXY_IMPL(ZICodeScaner, code_scaner_read_scaner_result, startadd, data, len); } #if 0 virtual int32_t pipette_ctrl_init_device() { return err::koperation_not_support; }; @@ -180,4 +140,24 @@ int32_t ZModuleDeviceManager::code_scaner_read_scaner_result(uint16_t id, int32_ int32_t ZModuleDeviceManager::pipette_ctrl_init_device(uint16_t id) { PROXY_IMPL(ZIPipetteCtrlModule, pipette_ctrl_init_device); } int32_t ZModuleDeviceManager::pipette_ctrl_put_tip(uint16_t id) { PROXY_IMPL(ZIPipetteCtrlModule, pipette_ctrl_put_tip); } -int32_t ZModuleDeviceManager::pipette_ctrl_move_to_ul(uint16_t id, int32_t ul) { PROXY_IMPL(ZIPipetteCtrlModule, pipette_ctrl_move_to_ul, ul); } \ No newline at end of file +int32_t ZModuleDeviceManager::pipette_ctrl_move_to_ul(uint16_t id, int32_t ul) { PROXY_IMPL(ZIPipetteCtrlModule, pipette_ctrl_move_to_ul, ul); } + +#if 0 + virtual int32_t a8000_optical_open_laser(int32_t type) = 0; + virtual int32_t a8000_optical_close_laser(int32_t type) = 0; + virtual int32_t a8000_optical_set_laster_gain(int32_t type, int32_t gain) = 0; + virtual int32_t a8000_optical_set_scan_amp_gain(int32_t type, int32_t gain) = 0; + virtual int32_t a8000_optical_read_scanner_adc_val(int32_t type, int32_t* adcval) = 0; + virtual int32_t a8000_optical_read_laster_adc_val(int32_t type, int32_t* adcval) = 0; + virtual int32_t a8000_optical_scan_current_point_amp_adc_val(int32_t type, int32_t lastergain, int32_t ampgain, int32_t* laster_fb_val, int32_t* adcval) = 0; +#endif + +int32_t ZModuleDeviceManager::a8000_optical_open_laser(uint16_t id, int32_t type) { PROXY_IMPL(ZIA8000OpticalModule, a8000_optical_open_laser, type); } +int32_t ZModuleDeviceManager::a8000_optical_close_laser(uint16_t id, int32_t type) { PROXY_IMPL(ZIA8000OpticalModule, a8000_optical_close_laser, type); } +int32_t ZModuleDeviceManager::a8000_optical_set_laster_gain(uint16_t id, int32_t type, int32_t gain) { PROXY_IMPL(ZIA8000OpticalModule, a8000_optical_set_laster_gain, type, gain); } +int32_t ZModuleDeviceManager::a8000_optical_set_scan_amp_gain(uint16_t id, int32_t type, int32_t gain) { PROXY_IMPL(ZIA8000OpticalModule, a8000_optical_set_scan_amp_gain, type, gain); } +int32_t ZModuleDeviceManager::a8000_optical_read_scanner_adc_val(uint16_t id, int32_t type, int32_t *adcval) { PROXY_IMPL(ZIA8000OpticalModule, a8000_optical_read_scanner_adc_val, type, adcval); } +int32_t ZModuleDeviceManager::a8000_optical_read_laster_adc_val(uint16_t id, int32_t type, int32_t *adcval) { PROXY_IMPL(ZIA8000OpticalModule, a8000_optical_read_laster_adc_val, type, adcval); } +int32_t ZModuleDeviceManager::a8000_optical_scan_current_point_amp_adc_val(uint16_t id, int32_t type, int32_t lastergain, int32_t ampgain, int32_t *laster_fb_val, int32_t *adcval) { + PROXY_IMPL(ZIA8000OpticalModule, a8000_optical_scan_current_point_amp_adc_val, type, lastergain, ampgain, laster_fb_val, adcval); +} \ No newline at end of file diff --git a/zmodule_device_manager.hpp b/zmodule_device_manager.hpp index 45e7436..d667512 100644 --- a/zmodule_device_manager.hpp +++ b/zmodule_device_manager.hpp @@ -121,7 +121,7 @@ class ZModuleDeviceManager { virtual int32_t motor_move_to_zero_backward_and_calculated_shift(int32_t findzerospeed, int32_t findzeroedge_speed, int32_t acc, int32_t overtime) { return err::koperation_not_support; } virtual int32_t motor_read_pos(int32_t* pos) { return err::koperation_not_support; } - virtual int32_t motor_set_current_pos_by_change_shift(int32_t pos) { return err::koperation_not_support; } // һ�����ڶ�� + virtual int32_t motor_set_current_pos_by_change_shift(int32_t pos) { return err::koperation_not_support; } // һ�����ڶ�� virtual int32_t motor_calculated_pos_by_move_to_zero() { return err::koperation_not_support; } #endif @@ -183,6 +183,24 @@ class ZModuleDeviceManager { virtual int32_t pipette_ctrl_put_tip(uint16_t id); virtual int32_t pipette_ctrl_move_to_ul(uint16_t id, int32_t ul); +#if 0 + virtual int32_t a8000_optical_open_laser(int32_t type) = 0; + virtual int32_t a8000_optical_close_laser(int32_t type) = 0; + virtual int32_t a8000_optical_set_laster_gain(int32_t type, int32_t gain) = 0; + virtual int32_t a8000_optical_set_scan_amp_gain(int32_t type, int32_t gain) = 0; + virtual int32_t a8000_optical_read_scanner_adc_val(int32_t type, int32_t* adcval) = 0; + virtual int32_t a8000_optical_read_laster_adc_val(int32_t type, int32_t* adcval) = 0; + virtual int32_t a8000_optical_scan_current_point_amp_adc_val(int32_t type, int32_t lastergain, int32_t ampgain, int32_t* laster_fb_val, int32_t* adcval) = 0; +#endif + + virtual int32_t a8000_optical_open_laser(uint16_t id, int32_t type); + virtual int32_t a8000_optical_close_laser(uint16_t id, int32_t type); + virtual int32_t a8000_optical_set_laster_gain(uint16_t id, int32_t type, int32_t gain); + virtual int32_t a8000_optical_set_scan_amp_gain(uint16_t id, int32_t type, int32_t gain); + virtual int32_t a8000_optical_read_scanner_adc_val(uint16_t id, int32_t type, int32_t *adcval); + virtual int32_t a8000_optical_read_laster_adc_val(uint16_t id, int32_t type, int32_t *adcval); + virtual int32_t a8000_optical_scan_current_point_amp_adc_val(uint16_t id, int32_t type, int32_t lastergain, int32_t ampgain, int32_t *laster_fb_val, int32_t *adcval); + virtual ~ZModuleDeviceManager() {} private: diff --git a/zmodule_device_script_cmder_paser.cpp b/zmodule_device_script_cmder_paser.cpp index 736225b..08f9f31 100644 --- a/zmodule_device_script_cmder_paser.cpp +++ b/zmodule_device_script_cmder_paser.cpp @@ -219,4 +219,23 @@ void ZModuleDeviceScriptCmderPaser::regfn() { PROCESS_PACKET_10(pipette_ctrl_init_device, "(mid)"); PROCESS_PACKET_10(pipette_ctrl_put_tip, "(mid)"); PROCESS_PACKET_20(pipette_ctrl_move_to_ul, "(mid, ul)"); + + +#if 0 + virtual int32_t a8000_optical_open_laser(int32_t type) = 0; + virtual int32_t a8000_optical_close_laser(int32_t type) = 0; + virtual int32_t a8000_optical_set_laster_gain(int32_t type, int32_t gain) = 0; + virtual int32_t a8000_optical_set_scan_amp_gain(int32_t type, int32_t gain) = 0; + virtual int32_t a8000_optical_read_scanner_adc_val(int32_t type, int32_t* adcval) = 0; + virtual int32_t a8000_optical_read_laster_adc_val(int32_t type, int32_t* adcval) = 0; + virtual int32_t a8000_optical_scan_current_point_amp_adc_val(int32_t type, int32_t lastergain, int32_t ampgain, int32_t* laster_fb_val, int32_t* adcval) = 0; +#endif + + PROCESS_PACKET_20(a8000_optical_open_laser, "(mid,type)"); + PROCESS_PACKET_20(a8000_optical_close_laser, "(mid,type)"); + PROCESS_PACKET_30(a8000_optical_set_laster_gain, "(type,mid,gain)"); + PROCESS_PACKET_30(a8000_optical_set_scan_amp_gain, "(type,mid,gain)"); + PROCESS_PACKET_21(a8000_optical_read_scanner_adc_val, "(type,mid)"); + PROCESS_PACKET_21(a8000_optical_read_laster_adc_val, "(type,mid)"); + PROCESS_PACKET_42(a8000_optical_scan_current_point_amp_adc_val, "(type,mid,lastergain,ampgain)"); }