diff --git a/api/apibasic/cmdid.hpp b/api/apibasic/cmdid.hpp index 3b04515..c8e3a58 100644 --- a/api/apibasic/cmdid.hpp +++ b/api/apibasic/cmdid.hpp @@ -139,6 +139,9 @@ typedef enum { kpipette_aspirate = CMDID(0x72, 9), // param:(int32_t ul) kpipette_distribut = CMDID(0x72, 10), // param:(int32_t ul) kpipette_shake_up = CMDID(0x72, 11), // param:(int32_t ul, int32_t times) + kpipette_aspirate_llf = CMDID(0x72, 12), // param:(int32_t ul, int32_t dpos, int32_t zmotor_v) + kpipette_distribut_llf = CMDID(0x72, 13), // param:(int32_t ul, int32_t dpos, int32_t zmotor_v) + kpipette_shake_up_llf = CMDID(0x72, 14), // param:(int32_t ul, int32_t dpos, int32_t zmotor_v, int32_t times) kpipette_enable_zmotor = CMDID(0x72, 20), // para:{enable}, ack:{} kpipette_write_cmd_direct = CMDID(0x72, 21), // para:{strbuf}, ack:{strbuf} diff --git a/api/zi_pipette_ctrl_module.hpp b/api/zi_pipette_ctrl_module.hpp index b4ff097..e8fa0a7 100644 --- a/api/zi_pipette_ctrl_module.hpp +++ b/api/zi_pipette_ctrl_module.hpp @@ -11,17 +11,20 @@ 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_lld_prepare() = 0; - virtual int32_t pipette_plld(int32_t zdpos, int32_t p_threshold) = 0; - virtual int32_t pipette_clld(int32_t zdpos, int32_t c_threshold) = 0; - virtual int32_t pipette_mlld(int32_t zdpos, int32_t c_threshold, int32_t p_threshold) = 0; - virtual int32_t pipette_lld_is_detect_liquid(int32_t *liquid) = 0; - virtual int32_t pipette_aspirate(int32_t ul) = 0; - virtual int32_t pipette_distribut(int32_t ul) = 0; - virtual int32_t pipette_shake_up(int32_t ul, int32_t times) = 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_plld(int32_t zdpos, int32_t p_threshold) = 0; + virtual int32_t pipette_clld(int32_t zdpos, int32_t c_threshold) = 0; + virtual int32_t pipette_mlld(int32_t zdpos, int32_t c_threshold, int32_t p_threshold) = 0; + virtual int32_t pipette_lld_is_detect_liquid(int32_t *liquid) = 0; + virtual int32_t pipette_aspirate(int32_t ul) = 0; + virtual int32_t pipette_distribut(int32_t ul) = 0; + virtual int32_t pipette_shake_up(int32_t ul, int32_t times) = 0; + virtual int32_t pipette_aspirate_llf(int32_t ul, int32_t dpos, int32_t zmotor_v) = 0; + virtual int32_t pipette_distribut_llf(int32_t ul, int32_t dpos, int32_t zmotor_v) = 0; + virtual int32_t pipette_shake_up_llf(int32_t ul, int32_t dpos, int32_t zmotor_v, int32_t times) = 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;