From 62762eee6e2c0cda5971dffe58d68bc10a5207cb Mon Sep 17 00:00:00 2001 From: zhaohe Date: Wed, 12 Jun 2024 17:03:10 +0800 Subject: [PATCH] update --- api/apibasic/cmdid.hpp | 13 ++++++++----- api/zi_pipette_ctrl_module.hpp | 14 ++++++++------ 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/api/apibasic/cmdid.hpp b/api/apibasic/cmdid.hpp index 5f68b56..748d6cd 100644 --- a/api/apibasic/cmdid.hpp +++ b/api/apibasic/cmdid.hpp @@ -128,11 +128,14 @@ typedef enum { * 移液枪 * ***********************************************************************************************************************/ - kpipette_ctrl_init_device = CMDID(0x72, 1), // para:{} , ack:{} - kpipette_ctrl_put_tip = CMDID(0x72, 2), // para:{} , ack:{} - kpipette_ctrl_move_to_ul = CMDID(0x72, 3), // para:{ul} , ack:{} - kpipette_clld_test = CMDID(0x72, 4), // para:{zdpos}, ack:{} - kpipette_plld_test = CMDID(0x72, 5), // para:{zdpos}, ack:{} + kpipette_ctrl_init_device = CMDID(0x72, 1), // para:{} , ack:{} + kpipette_ctrl_put_tip = CMDID(0x72, 2), // para:{} , ack:{} + kpipette_ctrl_move_to_ul = CMDID(0x72, 3), // para:{ul} , ack:{} + kpipette_lld_prepare = CMDID(0x72, 4), // para:{} , ack:{} 移动泵机到plld探测位置 + kpipette_lld = CMDID(0x72, 5), // para:{zdpos, c_threshold, p_threshold}, ack:{} + kpipette_aspirate = CMDID(0x72, 6), // para:{ul}, ack:{} + kpipette_distribut = CMDID(0x72, 7), // para:{ul}, ack:{} + kpipette_enable_zmotor = CMDID(0x72, 20), // para:{enable}, ack:{} kpipette_write_cmd_direct = CMDID(0x72, 21), // para:{strbuf}, ack:{strbuf} kpipette_get_sensor_sample_data = CMDID(0x72, 22), // para:{index} , ack:{motor_pos,cval,pval} diff --git a/api/zi_pipette_ctrl_module.hpp b/api/zi_pipette_ctrl_module.hpp index 52ddcf4..830ade1 100644 --- a/api/zi_pipette_ctrl_module.hpp +++ b/api/zi_pipette_ctrl_module.hpp @@ -11,15 +11,17 @@ class ZIPipetteCtrlModule { public: virtual ~ZIPipetteCtrlModule() {} - virtual int32_t pipette_ctrl_init_device() = 0; - virtual int32_t pipette_ctrl_put_tip() = 0; - virtual int32_t pipette_ctrl_move_to_ul(int32_t ul) = 0; - virtual int32_t pipette_clld_test(int32_t zdpos) = 0; - virtual int32_t pipette_plld_test(int32_t zdpos) = 0; + virtual int32_t pipette_ctrl_init_device() = 0; + virtual int32_t pipette_ctrl_put_tip() = 0; + virtual int32_t pipette_ctrl_move_to_ul(int32_t ul) = 0; + virtual int32_t pipette_lld_prepare() = 0; + virtual int32_t pipette_lld(int32_t zdpos, int32_t c_threshold, int32_t p_threshold) = 0; + virtual int32_t pipette_aspirate(int32_t ul) = 0; + virtual int32_t pipette_distribut(int32_t ul) = 0; virtual int32_t pipette_enable_zmotor(int32_t enable) = 0; virtual int32_t pipette_write_cmd_direct(uint8_t *tx, int32_t len, uint8_t *rx, int32_t *rxlen) = 0; virtual int32_t pipette_get_sensor_sample_data(int32_t index, int32_t *motor_pos, int32_t *cval, int32_t *pval) = 0; virtual int32_t pipette_get_sensor_sample_data_num(int32_t *num) = 0; }; -} // namespace iflytop \ No newline at end of file +} // namespace iflytop