diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml index e5a47bb..d5ed440 100644 --- a/.settings/language.settings.xml +++ b/.settings/language.settings.xml @@ -5,7 +5,7 @@ - + @@ -16,7 +16,7 @@ - + diff --git a/sdk/components/pipette_module/pipette_ctrl_module_v2.cpp b/sdk/components/pipette_module/pipette_ctrl_module_v2.cpp index 763925e..63a0220 100644 --- a/sdk/components/pipette_module/pipette_ctrl_module_v2.cpp +++ b/sdk/components/pipette_module/pipette_ctrl_module_v2.cpp @@ -1047,20 +1047,21 @@ void PipetteModuleV2::thread_start_work(const char *fnname, function fn) // DO_IN_THREAD(m_smtp2.pump_get_motor_pos_ul(&pump_after_pos_ul)); int32_t endpos = zm_get_now_pos(); // m_state.dul = pump_after_pos_ul - pump_before_pos_ul; - m_state.dpos = endpos - startpos; - + m_state.dpos = endpos - startpos; + creg.module_status = 0; } catch (const zapp_thread_stoped_exception &e) { // break by usr ZLOGI(TAG, "break by usr"); m_zm->stop(); m_smtp2.pump_stop(); + creg.module_status = 0; } catch (const zapp_exception &e) { ZLOGI(TAG, "catch exception %d", e.ecode()); m_zm->stop(); m_smtp2.pump_stop(); creg.module_errorcode = e.ecode(); + creg.module_status = 2; } - creg.module_status = 0; ZLOGI(TAG, "<- end work"); }); }