diff --git a/sdk/components/pipette_module/pipette_ctrl_module_v2.cpp b/sdk/components/pipette_module/pipette_ctrl_module_v2.cpp index 375fc50..ba1f917 100644 --- a/sdk/components/pipette_module/pipette_ctrl_module_v2.cpp +++ b/sdk/components/pipette_module/pipette_ctrl_module_v2.cpp @@ -221,7 +221,7 @@ int32_t PipetteModule::do_pipette_ctrl_put_tip() { creg.module_status = 1; m_thread.start( [this]() { // - DO_IN_THREAD(befor_run()); + DO_IN_THREAD(do_put_tip_before_run()); DO_IN_THREAD(m_smtp2.pump_put_tip()); while (true) { if (!check_when_run()) break; @@ -729,6 +729,13 @@ int32_t PipetteModule::befor_run() { return 0; } + +int32_t PipetteModule::do_put_tip_before_run() { + creg.module_status = 1; + creg.module_errorcode = 0; + m_state.dul = 0; +} + int32_t PipetteModule::after_run() { ZLOGI(TAG, "after_run"); m_smtp2.pump_stop(); diff --git a/sdk/components/pipette_module/pipette_ctrl_module_v2.hpp b/sdk/components/pipette_module/pipette_ctrl_module_v2.hpp index 1e1a09b..563d25c 100644 --- a/sdk/components/pipette_module/pipette_ctrl_module_v2.hpp +++ b/sdk/components/pipette_module/pipette_ctrl_module_v2.hpp @@ -168,6 +168,7 @@ class PipetteModule : public ZIModule, public ZIPipetteCtrlModule { private: int32_t befor_run(); + int32_t do_put_tip_before_run(); int32_t after_run(); bool check_when_run(); diff --git a/usrc/subboards/subboard10_hbot_v2/subboard10_hbot_v2.cpp b/usrc/subboards/subboard10_hbot_v2/subboard10_hbot_v2.cpp index 4e6c212..173c0a0 100644 --- a/usrc/subboards/subboard10_hbot_v2/subboard10_hbot_v2.cpp +++ b/usrc/subboards/subboard10_hbot_v2/subboard10_hbot_v2.cpp @@ -96,7 +96,7 @@ void Subboard10HbotV2::initialize() { #define V1 200 xy_defaultcfg.robot_type = XYRobotCtrlModule::khbot; - xy_defaultcfg.one_circle_pulse = 7344; + xy_defaultcfg.one_circle_pulse = 7215; xy_defaultcfg.one_circle_pulse_denominator = 10; xy_defaultcfg.ihold = 10; xy_defaultcfg.irun = 31;