diff --git a/scenes/pribor-afsp/pribor-afsp-1.tscn b/scenes/pribor-afsp/pribor-afsp-1.tscn index 8577aa7..8267382 100644 --- a/scenes/pribor-afsp/pribor-afsp-1.tscn +++ b/scenes/pribor-afsp/pribor-afsp-1.tscn @@ -25,7 +25,6 @@ metadata/DeviceName = &"Устройство РР левого борта" script = ExtResource("2_4vyhj") [node name="timer" type="Timer" parent="request"] -wait_time = 4.168 autostart = true script = SubResource("GDScript_yhnwg") diff --git a/scenes/pribor-afsp/pribor-afsp.gd b/scenes/pribor-afsp/pribor-afsp.gd index ed443ad..b8018e7 100644 --- a/scenes/pribor-afsp/pribor-afsp.gd +++ b/scenes/pribor-afsp/pribor-afsp.gd @@ -60,7 +60,6 @@ func _on_request_completed(result, _response_code, headers, body: PackedByteArra ## [param block_a] - Кликнутый элемент контроля. func _on_item_pressed(block_a: Control): var metas = block_a.get_meta_list() - print_debug(block_a) for n in metas: var v = block_a.get_meta(n) print_debug('%s:%s' % [n, v]) diff --git a/scenes/pribor-afsp/pribor-rtr.tscn b/scenes/pribor-afsp/pribor-rtr.tscn index df3e780..b92a659 100644 --- a/scenes/pribor-afsp/pribor-rtr.tscn +++ b/scenes/pribor-afsp/pribor-rtr.tscn @@ -187,7 +187,6 @@ fname = "Яч. связи" script = ExtResource("4_pspup") [node name="timer" type="Timer" parent="request"] -wait_time = 4.168 autostart = true [connection signal="request_completed" from="request" to="." method="_on_request_completed"] diff --git a/scripts/interfer.gd b/scripts/interfer.gd index 802841c..608a79d 100644 --- a/scripts/interfer.gd +++ b/scripts/interfer.gd @@ -142,7 +142,6 @@ func on_nav_data_received(coords: Dictionary, unit_caps): 'lat': coords.get('latitude', 0), 'course': coords.get('k', 0), 'speed': coords.get('speed', 0) } - print_debug(data_to_json) var json_data = JSON.stringify(data_to_json).to_utf8_buffer() unit_caps.tx_stack.append(json_data) msg8_num += 1 @@ -294,10 +293,7 @@ func interfer_create(u, interfer_name, ecms, param, kni, id, dict, source_interf ecm.powp = 100.0 ecm.source_interfer = source_interfer ecm.modulation = emit_enable - if param.has('um'): - ecm.um = param['um'] - else: - ecm.um = 15.0 # Значение по умолчанию + ecm.um = param.get('um', 15.0) # Значение по умолчанию signaller.emit_signal('interfer_new', ecm) if interfer_name == 'off': signaller.emit_signal('interfer_off', ecm, ecms, thrs) @@ -307,8 +303,8 @@ func interfer_create(u, interfer_name, ecms, param, kni, id, dict, source_interf func send_ecm(ecm, unit0) -> void: - msg_num += 1 - var json_data = ecm.get_msg6_data(msg_num) + msg6_num += 1 + var json_data = ecm.get_msg6_data(msg6_num) unit0.tx_stack.append(json_data)