Browse Source

update

master
zhaohe 1 year ago
parent
commit
a11e4e17d3
  1. 8
      components/pipette_module/pipette_ctrl_module_v2.cpp
  2. 4
      components/pipette_module/pipette_ctrl_module_v2.hpp

8
components/pipette_module/pipette_ctrl_module_v2.cpp

@ -144,7 +144,7 @@ int32_t PipetteModule::do_pipette_ctrl_init_device() {
DO_BEFORE_LOOP(befor_run());
DO_BEFORE_LOOP(m_smtp2.pump_init());
while (true) {
if (!check_when_run) break;
if (!check_when_run()) break;
if (m_thread.getExitFlag()) break;
int32_t isbusy = 0;
@ -163,7 +163,7 @@ int32_t PipetteModule::do_pipette_ctrl_put_tip() {
DO_BEFORE_LOOP(befor_run());
DO_BEFORE_LOOP(m_smtp2.pump_put_tip());
while (true) {
if (!check_when_run) break;
if (!check_when_run()) break;
if (m_thread.getExitFlag()) break;
int32_t isbusy = 0;
@ -183,7 +183,7 @@ int32_t PipetteModule::do_pipette_ctrl_move_to_ul(int32_t ul) {
DO_BEFORE_LOOP(befor_run());
DO_BEFORE_LOOP(m_smtp2.pump_move_to_ul(ul));
while (true) {
if (!check_when_run) break;
if (!check_when_run()) break;
if (m_thread.getExitFlag()) break;
int32_t isbusy = 0;
@ -213,7 +213,7 @@ int32_t PipetteModule::do_pipette_clld_test(int32_t zdpos) {
capturedata_num = 0;
while (true) {
if (!check_when_run) break;
if (!check_when_run()) break;
if (m_thread.getExitFlag()) break;
bool motorstoped = false;

4
components/pipette_module/pipette_ctrl_module_v2.hpp

@ -101,8 +101,8 @@ class PipetteModule : public ZIModule, public ZIPipetteCtrlModule {
virtual int32_t pipette_ctrl_init_device() override;
virtual int32_t pipette_ctrl_put_tip() override;
virtual int32_t pipette_ctrl_move_to_ul(int32_t ul) override;
virtual int32_t pipette_clld_test(int32_t zdpos) override; // 主要用于收集压力阈值数据
virtual int32_t pipette_plld_test(int32_t zdpos) override; // 主要用于收集压力阈值数据
virtual int32_t pipette_clld_test(int32_t zdpos) override;
virtual int32_t pipette_plld_test(int32_t zdpos) override;
virtual int32_t pipette_enable_zmotor(int32_t enable);
virtual int32_t pipette_write_cmd_direct(uint8_t *tx, int32_t len, uint8_t *rx, int32_t *rxlen) override;

Loading…
Cancel
Save