исправление после мерджа
This commit is contained in:
@@ -113,8 +113,7 @@ func _ready() -> void:
|
||||
|
||||
unit.connect('line_changed', Callable(self, 'on_line_changed'))
|
||||
unit.connect('command_fail', Callable(self, 'on_command_fail'))
|
||||
connect_fs_1()
|
||||
connect_fs_2()
|
||||
|
||||
read_port_isa([Constants.BASE_PORTS.UG+6, Constants.BASE_PORTS.UG+8, Constants.BASE_PORTS.EMS_G+8])
|
||||
|
||||
|
||||
@@ -285,6 +284,13 @@ func set_can_macro(can_frequency: int):
|
||||
counter_fs_1 += 1
|
||||
|
||||
|
||||
func status_can_macro_1(state_can: bool):
|
||||
unit_fs.status_can_macro_exec(state_can, counter_fs_1, client_fs_1)
|
||||
counter_fs_1 += 1
|
||||
unit_fs.get_base_can_macro(counter_fs_1, client_fs_1)
|
||||
counter_fs_1 += 1
|
||||
|
||||
|
||||
## 2 ФС коннект
|
||||
func connect_fs_2():
|
||||
if client_fs_2:
|
||||
@@ -359,6 +365,8 @@ func set_can_macro_2(can_frequency: int):
|
||||
counter_fs_2 += 1
|
||||
|
||||
|
||||
func can_macro_exec_2(state_can: bool):
|
||||
unit_fs.set_state_base_can_macro(state_can, counter_fs_2, client_fs_2)
|
||||
func status_can_macro_2(state_can: bool):
|
||||
unit_fs.status_can_macro_exec(state_can, counter_fs_2, client_fs_2)
|
||||
counter_fs_2 += 1
|
||||
unit_fs.get_base_can_macro(counter_fs_2, client_fs_2)
|
||||
counter_fs_2 += 1
|
||||
|
||||
Reference in New Issue
Block a user