add workaround for close instance with blocked handler

Author: alisitsyn

examples/tcp/mb_tcp_slave/main/tcp_slave.c

@@ -41,8 +41,8 @@
 #define MB_REG_HOLDING_START_AREA2_SIZE     ((size_t)((HOLD_OFFSET(holding_area2_end) - HOLD_OFFSET(holding_u8_a)) << 1))
 
 #define MB_PAR_INFO_GET_TOUT                (10) // Timeout for get parameter info
-#define MB_CHAN_DATA_MAX_VAL                (6)
-#define MB_CHAN_DATA_OFFSET                 (1.2f)
+#define MB_CHAN_DATA_MAX_VAL                (60)
+#define MB_CHAN_DATA_OFFSET                 (10.1f)
 
 #define MB_READ_MASK                        (MB_EVENT_INPUT_REG_RD \
                                                 | MB_EVENT_HOLDING_REG_RD \

modbus/mb_objects/mb_master.c

@@ -172,8 +172,11 @@ static mb_err_enum_t mbm_register_default_handlers(mb_base_t *inst)
 static mb_err_enum_t mbm_unregister_handlers(mb_base_t *inst)
 {
     mbm_object_t *mbm_obj = MB_GET_OBJ_CTX(inst, mbm_object_t, base);
-    (void)mb_delete_command_handlers(&mbm_obj->handler_descriptor);
-    mbm_obj->handler_descriptor.instance = NULL;
+    CRITICAL_SECTION(mbm_obj->handler_descriptor.lock) {
+        ESP_LOGD(TAG, "Close %s command handlers.", mbm_obj->base.descr.parent_name);
+        (void)mb_delete_command_handlers(&mbm_obj->handler_descriptor);
+        mbm_obj->handler_descriptor.instance = NULL;
+    }
     CRITICAL_SECTION_CLOSE(mbm_obj->handler_descriptor.lock);
     return MB_ENOERR;
 }
@@ -427,6 +430,9 @@ mb_err_enum_t mbm_disable(mb_base_t *inst)
 {
     mb_err_enum_t status = MB_ENOERR;
     mbm_object_t *mbm_obj = MB_GET_OBJ_CTX(inst, mbm_object_t, base);
+    CRITICAL_SECTION(mbm_obj->handler_descriptor.lock) {
+        ESP_LOGW(TAG, "The function handler for %s object is unlocked.", inst->descr.parent_name);
+    }
     CRITICAL_SECTION(inst->lock)
     {
         if (mbm_obj->cur_state == STATE_ENABLED) {

modbus/mb_objects/mb_slave.c

@@ -159,8 +159,11 @@ static mb_err_enum_t mbs_register_default_handlers(mb_base_t *inst)
 static mb_err_enum_t mbs_unregister_handlers(mb_base_t *inst)
 {
     mbs_object_t *mbs_obj = MB_GET_OBJ_CTX(inst, mbs_object_t, base);
-    (void)mb_delete_command_handlers(&mbs_obj->handler_descriptor);
-    mbs_obj->handler_descriptor.instance = NULL;
+    CRITICAL_SECTION(mbs_obj->handler_descriptor.lock) {
+        ESP_LOGD(TAG, "Close %s command handlers.", mbs_obj->base.descr.parent_name);
+        (void)mb_delete_command_handlers(&mbs_obj->handler_descriptor);
+        mbs_obj->handler_descriptor.instance = NULL;
+    }
     CRITICAL_SECTION_CLOSE(mbs_obj->handler_descriptor.lock);
     return MB_ENOERR;
 }
@@ -397,7 +400,10 @@ mb_err_enum_t mbs_enable(mb_base_t *inst)
 mb_err_enum_t mbs_disable(mb_base_t *inst)
 {
     mb_err_enum_t status = MB_ENOERR;
-    mbs_object_t *mbs_obj = MB_GET_OBJ_CTX(inst, mbs_object_t, base);;
+    mbs_object_t *mbs_obj = MB_GET_OBJ_CTX(inst, mbs_object_t, base);
+    CRITICAL_SECTION(mbs_obj->handler_descriptor.lock) {
+        ESP_LOGW(TAG, "The function handler for %s object is unlocked.", inst->descr.parent_name);
+    }
     CRITICAL_SECTION(inst->lock) {
         if (mbs_obj->cur_state == STATE_ENABLED) {
             MB_OBJ(mbs_obj->base.transp_obj)->frm_stop(mbs_obj->base.transp_obj);