From 51da893d74468dd8ae898e97936a2357a6120eb0 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Sat, 26 Oct 2024 14:20:48 +0800 Subject: [PATCH] update --- api/apibasic/cmdid.cpp | 15 ++++++++++----- api/apibasic/cmdid.hpp | 38 +++++++++++--------------------------- 2 files changed, 21 insertions(+), 32 deletions(-) diff --git a/api/apibasic/cmdid.cpp b/api/apibasic/cmdid.cpp index acd6261..01f67ac 100644 --- a/api/apibasic/cmdid.cpp +++ b/api/apibasic/cmdid.cpp @@ -141,7 +141,6 @@ static cmdinfo_t table[] = { CMD_ITERM(kplate_code_scaner_open_laser), CMD_ITERM(kplate_code_scaner_close_laser), - CMD_ITERM(kpipette_zmotor_enable), CMD_ITERM(kpipette_zmotor_move_zero), CMD_ITERM(kpipette_zmotor_move_to_zero_point_quick), @@ -154,10 +153,10 @@ static cmdinfo_t table[] = { CMD_ITERM(kpipette_lld_prepare), CMD_ITERM(kpipette_lld), CMD_ITERM(kpipette_aspirate_prepare), - CMD_ITERM(kpipette_aspirate_set_llf_velocity), - CMD_ITERM(kpipette_aspirate_set_operation_verifi_p_thre), - CMD_ITERM(kpipette_aspirate_set_operation_verifi_eigen_time), - CMD_ITERM(kpipette_aspirate_set_operation_verifi_tolerance), + CMD_ITERM(kpipette_set_llf_velocity), + CMD_ITERM(kpipette_set_aspirate_operation_verifi_p_thre), + CMD_ITERM(kpipette_set_aspirate_operation_verifi_eigen_time), + CMD_ITERM(kpipette_set_aspirate_operation_verifi_tolerance), CMD_ITERM(kpipette_aspirate), CMD_ITERM(kpipette_aspirate_and_verify), CMD_ITERM(kpipette_shake_up), @@ -170,6 +169,12 @@ static cmdinfo_t table[] = { CMD_ITERM(kpipette_zmotor_read_zero_point_state), CMD_ITERM(kpipette_zmotor_read_dev_status_cache), + CMD_ITERM(kpipette_set_startz), + CMD_ITERM(kpipette_set_endz), + CMD_ITERM(kpipette_set_lld_type), + CMD_ITERM(kpipette_set_lld_c_threshold), + CMD_ITERM(kpipette_set_lld_p_threshold), + }; const char* cmdid2str(int32_t code) { diff --git a/api/apibasic/cmdid.hpp b/api/apibasic/cmdid.hpp index bd914ff..a4e999d 100644 --- a/api/apibasic/cmdid.hpp +++ b/api/apibasic/cmdid.hpp @@ -36,26 +36,6 @@ typedef enum { kxymotor_motor_move_by_direct = 0x030a, // kxymotor_read_enc_direct = 0x030b, // - // kpipette_ctrl_init_device = 0x7201, // param:(void) - // kpipette_ctrl_put_tip = 0x7202, // param:(void) - // kpipette_ctrl_move_to_ul = 0x7203, // param:(int32_t ul) - // kpipette_lld_prepare = 0x7204, // param:(void) - // kpipette_plld = 0x7205, // param:(int32_t zdpos, int32_t p_threshold) - // kpipette_clld = 0x7206, // param:(int32_t zdpos, int32_t c_threshold) - // kpipette_mlld = 0x7207, // param:(int32_t zdpos, int32_t c_threshold, int32_t p_threshold) - // kpipette_lld_is_detect_liquid = 0x7208, // param:(void) ack(int32_t isdetect) - // kpipette_aspirate = 0x7209, // param:(int32_t ul) - // kpipette_distribut = 0x720a, // param:(int32_t ul) - // kpipette_shake_up = 0x720b, // param:(int32_t ul, int32_t times) - // kpipette_enable_zmotor = 0x7214, // param:(int32_t ul, int32_t zmotor_v) - // kpipette_write_cmd_direct = 0x7215, // param:(int32_t ul, int32_t zmotor_v) - // kpipette_get_sensor_sample_data = 0x7216, // param:(int32_t ul, int32_t zmotor_v, int32_t times) - // kpipette_get_sensor_sample_data_num = 0x7217, // para:{enable}, ack:{} - // kpipette_sensor_sample_data_report = 0x7232, // para:{strbuf}, ack:{strbuf} - // kpipette_aspirate_llf = 0x720c, // para:{index} , ack:{motor_pos,cval,pval} - // kpipette_distribut_llf = 0x720d, // para:{} , ack:{num} - // kpipette_shake_up_llf = 0x720e, // val{regindex, oldval, toval} - ka8000_optical_module_power_ctrl = 0x0600, // ka8000_optical_open_laser = 0x0601, // ka8000_optical_close_laser = 0x0602, // @@ -158,10 +138,10 @@ typedef enum { kpipette_lld_prepare = 0x7409, kpipette_lld = 0x740A, kpipette_aspirate_prepare = 0x740B, - kpipette_aspirate_set_llf_velocity = 0x740C, - kpipette_aspirate_set_operation_verifi_p_thre = 0x740D, - kpipette_aspirate_set_operation_verifi_eigen_time = 0x740E, - kpipette_aspirate_set_operation_verifi_tolerance = 0x740F, + kpipette_set_llf_velocity = 0x740C, + kpipette_set_aspirate_operation_verifi_p_thre = 0x740D, + kpipette_set_aspirate_operation_verifi_eigen_time = 0x740E, + kpipette_set_aspirate_operation_verifi_tolerance = 0x740F, kpipette_aspirate = 0x7410, kpipette_aspirate_and_verify = 0x7411, kpipette_shake_up = 0x7412, @@ -173,9 +153,13 @@ typedef enum { kpipette_get_sensor_sample_data_num = 0x7418, kpipette_zmotor_read_zero_point_state = 0x7419, kpipette_zmotor_read_dev_status_cache = 0x741A, - - kpipette_lld_is_detect_liquid = 0x741B, - kpipette_lld_test = 0x741C, + kpipette_lld_is_detect_liquid = 0x741B, + kpipette_lld_test = 0x741C, + kpipette_set_startz = 0x741D, + kpipette_set_endz = 0x741E, + kpipette_set_lld_type = 0x741F, + kpipette_set_lld_c_threshold = 0x7420, + kpipette_set_lld_p_threshold = 0x7421, } cmdid_t;