Доработка. Номер должен увеличиваться при отправке сообщения
This commit is contained in:
@@ -63,6 +63,7 @@ class Interfer:
|
||||
data_to_json['get'] = []
|
||||
data_to_json['params'] = params
|
||||
var pac = JSON.stringify(data_to_json).to_utf8_buffer()
|
||||
print_debug(data_to_json)
|
||||
return pac
|
||||
|
||||
func set_from_dic(dic: Dictionary):
|
||||
@@ -121,10 +122,9 @@ func _ready():
|
||||
func on_timer_check_state(unit, ecms, resend_timeout):
|
||||
var tick = Time.get_ticks_msec()
|
||||
for ecm in ecms.values():
|
||||
if ecm.svk == STATE_TSMT:
|
||||
if (tick - ecm.tick_tx) >= resend_timeout:
|
||||
send_ecm(ecm, unit)
|
||||
ecm.tick_tx = tick
|
||||
if (tick - ecm.tick_tx) >= resend_timeout:
|
||||
send_ecm(ecm, unit)
|
||||
ecm.tick_tx = tick
|
||||
|
||||
|
||||
func on_manual_control():
|
||||
@@ -266,7 +266,6 @@ func interfer_create(interfer_name, ecms, param, kni, id, dict, source_interfer)
|
||||
ecm.ispp = ispp
|
||||
ecms[ispp] = ecm
|
||||
ecm.svk = STATE_TSMT # Подготовка к передаче сообщения
|
||||
ecm.ss = msg_ss
|
||||
ecm.kni = kni
|
||||
ecm.krp = interfer_name
|
||||
ecm.params = param
|
||||
@@ -285,7 +284,8 @@ func interfer_create(interfer_name, ecms, param, kni, id, dict, source_interfer)
|
||||
|
||||
|
||||
func send_ecm(ecm, unit):
|
||||
var json_data = ecm.get_msg6_data()
|
||||
msg_num += 1
|
||||
var json_data = ecm.get_msg6_data(msg_num)
|
||||
unit.tx_stack.append(json_data)
|
||||
|
||||
|
||||
|
||||
@@ -27,7 +27,8 @@ class Serial extends SerialPort:
|
||||
class Socket extends PacketPeerUDP:
|
||||
func send_to(addr, data):
|
||||
set_dest_address(addr[0], addr[1])
|
||||
put_packet(data)
|
||||
var rc: = put_packet(data)
|
||||
print_debug([addr, data, rc])
|
||||
|
||||
|
||||
class SocketTCP extends TCPServer:
|
||||
@@ -212,7 +213,8 @@ func poll_receive_tcp(sock: SocketTCP) -> bool:
|
||||
var peer_len_data = peer.get_available_bytes()
|
||||
if peer_len_data > 0:
|
||||
get_client_data(sock, peer_len_data, peer)
|
||||
if sock.unit_key in units_tcp and sock.rx_all: units_tcp[sock.unit_key].parse(sock.rx_data, tick)
|
||||
if sock.unit_key in units_tcp and sock.rx_all:
|
||||
units_tcp[sock.unit_key].parse(sock.rx_data, tick)
|
||||
return false
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user