maxim/uarep-ctl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'MaD_CaT/master'

Browse Source
This commit is contained in:
sasha80
2025-03-27 14:50:07 +03:00
parent 82724ebe22 9401656a3b
commit 12cec9c7e9
5 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
data/save1.png.import
View File

@@ -3,15 +3,15 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://csnts8f155sf7"
path="res://.godot/imported/save1.png-71614b438670d8c00484426836e4048f.ctex"
path="res://.godot/imported/save1.png-fe0ea2e877c55fd87cac57974b80e102.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://scenes/настройки/save1.png"
dest_files=["res://.godot/imported/save1.png-71614b438670d8c00484426836e4048f.ctex"]
source_file="res://data/save1.png"
dest_files=["res://.godot/imported/save1.png-fe0ea2e877c55fd87cac57974b80e102.ctex"]
[params]

4
scenes/настройки/настройки.gd
View File

@@ -52,6 +52,8 @@ const SETTING_TABLE = [
['уарэп-спт25-1', TableEdit, TableEdit ],
['уарэп-спт25-2', TableEdit, TableEdit ]
]
const EXTERNAL_CU = 17 # Внешнее целееуказание
const SUPPRESS = 18 # Строка - Подавление
const KEYBORD = 19 # Строка - Виртуальная клавиатура
const HIDE_EMS2 = 20 # Строка - Скрыть вкладку ЭМС 2
@@ -142,7 +144,7 @@ func setting_tab():
func button_settings():
var extern_cu_node = $scroll_set/table.get_node2(1, SUPPRESS).get_children()[1]
var extern_cu_node = $scroll_set/table.get_node2(1, EXTERNAL_CU).get_children()[1]
extern_cu_node.connect('pressed', on_external_cu_btn_pressed.bind(extern_cu_node))
$scroll_set/table.set_row_text(SUPPRESS,(['Кнопка «Подавление»']))
$scroll_set/table.set_row_text(KEYBORD,(['Виртуальная клавиатура']))

2
scenes/настройки/настройки.tscn
View File

@@ -2,7 +2,7 @@
[ext_resource type="Script" path="res://scenes/настройки/настройки.gd" id="1_2l3rd"]
[ext_resource type="Script" path="res://table/table.gd" id="2_6sx73"]
[ext_resource type="Texture2D" uid="uid://lkw8k7ouj42i" path="res://data/save1.png" id="3_dbpks"]
[ext_resource type="Texture2D" uid="uid://csnts8f155sf7" path="res://data/save1.png" id="3_dbpks"]
[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_pyq6h"]
texture = ExtResource("3_dbpks")

2
scenes/эмс/эмс.tscn
View File

@@ -2,7 +2,7 @@
[ext_resource type="Script" path="res://scenes/эмс/эмс.gd" id="1_mk57x"]
[ext_resource type="PackedScene" uid="uid://da7w3vkhadfwe" path="res://scenes/button-flat/button-flat.tscn" id="2_eju8r"]
[ext_resource type="Texture2D" uid="uid://lkw8k7ouj42i" path="res://data/save1.png" id="3_onafb"]
[ext_resource type="Texture2D" uid="uid://csnts8f155sf7" path="res://data/save1.png" id="3_onafb"]
[ext_resource type="Texture2D" uid="uid://o8mam0a060d8" path="res://data/load1.png" id="4_afjfs"]
[ext_resource type="Texture2D" uid="uid://bdlbqs88bki8x" path="res://data/connect-a.png" id="5_2nrut"]
[ext_resource type="Texture2D" uid="uid://u3tnejvpm8it" path="res://data/disconnect-a.png" id="6_g3q7m"]

4
scripts/tcp5p28.gd
View File

@@ -46,7 +46,7 @@ class TCP5P28 extends unit.Unit:
var tx_stack: Array ## Массив пакетов для отправки.
func _to_string() -> String: return String('капсрпб: "%s" %s ' % [self.name, ['отключен', 'на связи'][int(online)]])
func _to_string() -> String: return String('5П-28: "%s" %s ' % [self.name, ['отключен', 'на связи'][int(online)]])
func parse(data: PackedByteArray, tick: int):
rx_tick = tick
@@ -80,7 +80,7 @@ class TCP5P28 extends unit.Unit:
var data_len = 4 + len(ths) * 80 # длинна блока данных в байтах
var tick0 = Time.get_ticks_msec()
data.resize(4)
data.encode_u16(0, 0) # Код ошибки
data.encode_u16(0, 0) # Код ошибки
data.encode_u16(2, len(ths)) # Количество целей
for th in ths.values():
data.append_array(get_threats_data(th, int(tick0)))