Merge remote-tracking branch 'MaD_CaT/master'

# Conflicts:
#	project.godot

scripts/interfer.gd

@@ -301,6 +301,11 @@ func interfer_create(u, interfer_name, ecms, param, kni, id, dict, source_interf
 
 
 func send_ecm(ecm, unit0) -> void:
+    if ecm.krp != INTERFER_OFF:
+        if not emit_enable:
+            return
+        elif not ecm.modulation:
+            return
     msg6_num += 1
     var json_data = ecm.get_msg6_data(msg6_num)
     unit0.tx_stack.append(json_data)
@@ -338,5 +343,3 @@ func push_id(id: int) -> void:
 
 func on_emit_changed(state, ecms) -> void:
     emit_enable = state
-    for ecm in ecms.values():
-        ecm.modulation = state

scripts/prd.gd

@@ -242,9 +242,14 @@ class PRD:
             var json_data = json_conv.get_data()
             yemsg_board.need_write = true
             yemsg_board.ems_load = yemsg_board.LoadState.IN_PROCESS
-            yemsg_board.btn_load(json_data)
-            yemsg_board.state_board = yemsg_board.WRITE
-            yemsg_board.start_rw_kems(false)
+            var read_ok = yemsg_board.btn_load(json_data)
+            if read_ok:
+                yemsg_board.state_board = yemsg_board.WRITE
+                yemsg_board.start_rw_kems(false)
+            else:
+                yemsg_board.ems_load = yemsg_board.LoadState.FAIL
+                yemsg_board.set_wait()
+                log.error('Не удалось прочитать файл настроек ячейки ЭМС-Г %s' %abs_dir)
         else:
             yemsg_board.ems_load = yemsg_board.LoadState.FAIL
             yemsg_board.set_wait()