From e3e00782ddfdee93255717b3b572dc6ce8e3ffac Mon Sep 17 00:00:00 2001 From: sasha80 Date: Wed, 26 Mar 2025 15:05:03 +0300 Subject: [PATCH 1/3] =?UTF-8?q?=D0=A7=D0=B8=D1=81=D1=82=D0=BA=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scenes/настройки/GridContainer.gd | 1 - 1 file changed, 1 deletion(-) delete mode 100644 scenes/настройки/GridContainer.gd diff --git a/scenes/настройки/GridContainer.gd b/scenes/настройки/GridContainer.gd deleted file mode 100644 index 41bed780..00000000 --- a/scenes/настройки/GridContainer.gd +++ /dev/null @@ -1 +0,0 @@ -extends "res://table/table.gd" From 54b03d9ecd8e57feb41c2fa1b9baf2e7b22d3646 Mon Sep 17 00:00:00 2001 From: sasha80 Date: Wed, 26 Mar 2025 15:05:42 +0300 Subject: [PATCH 2/3] =?UTF-8?q?=D0=A0=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE?= =?UTF-8?q?=D1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/spt25.gd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/spt25.gd b/scripts/spt25.gd index a047a0dc..965445b3 100644 --- a/scripts/spt25.gd +++ b/scripts/spt25.gd @@ -6,9 +6,9 @@ const REQUEST_PERIOD: int = 3000 ## Переиод запроса, мс class SPT25 extends unit.Unit: enum CmdCode { - START = 0, - STOP = 2, - INFO = 4, + START = 1, ## СВУ к МПСУ: Пуск преобразователя + STOP = 2, ## СВУ к МПСУ: Стоп преобразователя + INFO = 4, ## СВУ к МПСУ: Получить информацию о состоянии преобразователя. МПСУ к СВУ: Информация о состоянии преобразователя } func _to_string() -> String: return String('СПТ-25 %s %s' % [self.name, ['отключен', 'на связи'][int(online)]]) From 82724ebe2209912538ddf12f5a41bc25ef8498ca Mon Sep 17 00:00:00 2001 From: sasha80 Date: Thu, 27 Mar 2025 14:49:33 +0300 Subject: [PATCH 3/3] =?UTF-8?q?=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=BA=D0=B0.=20=D0=A1=D0=BE=D1=81=D1=82=D0=BE=D1=8F=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=BF=D0=BE=D0=B4=D0=BA=D0=BB=D1=8E=D1=87=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D0=BA=205=D0=BF28?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/network.gd | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/network.gd b/scripts/network.gd index fc68b199..08a0648f 100644 --- a/scripts/network.gd +++ b/scripts/network.gd @@ -204,8 +204,9 @@ func poll_receive(sock: Socket) -> bool: func poll_receive_tcp(sock: SocketTCP) -> bool: if sock.is_connection_available(): # check if someone's trying to connect - var client = sock.take_connection() # accept connection + var client: = sock.take_connection() # accept connection sock.peerstream.set_stream_peer(client) # bind peerstream to new client + log.info('подключен: %s:%d к порту: %d' % [ client.get_connected_host(), client.get_connected_port(), client.get_local_port() ] ) var peer = sock.peerstream.get_stream_peer() if peer: var peer_len_data = peer.get_available_bytes()