mirror of
https://github.com/DJ2LS/FreeDATA
synced 2024-05-14 08:04:33 +00:00
first test run with overriding connection attempts #288
This commit is contained in:
parent
38281ec06c
commit
a8a643f15a
2 changed files with 6 additions and 4 deletions
|
@ -525,7 +525,7 @@ exports.sendMessage = function(dxcallsign, mode, frames, data, checksum, uuid, c
|
||||||
data = btoa(data)
|
data = btoa(data)
|
||||||
|
|
||||||
//command = '{"type" : "arq", "command" : "send_message", "parameter" : [{ "dxcallsign" : "' + dxcallsign + '", "mode" : "' + mode + '", "n_frames" : "' + frames + '", "data" : "' + data + '" , "checksum" : "' + checksum + '"}]}'
|
//command = '{"type" : "arq", "command" : "send_message", "parameter" : [{ "dxcallsign" : "' + dxcallsign + '", "mode" : "' + mode + '", "n_frames" : "' + frames + '", "data" : "' + data + '" , "checksum" : "' + checksum + '"}]}'
|
||||||
command = '{"type" : "arq", "command" : "send_raw", "uuid" : "'+ uuid +'", "parameter" : [{"dxcallsign" : "' + dxcallsign + '", "mode" : "' + mode + '", "n_frames" : "' + frames + '", "data" : "' + data + '", attempts: "15"}]}'
|
command = '{"type" : "arq", "command" : "send_raw", "uuid" : "'+ uuid +'", "parameter" : [{"dxcallsign" : "' + dxcallsign + '", "mode" : "' + mode + '", "n_frames" : "' + frames + '", "data" : "' + data + '", "attempts": "15"}]}'
|
||||||
socketLog.info(command)
|
socketLog.info(command)
|
||||||
socketLog.info("-------------------------------------")
|
socketLog.info("-------------------------------------")
|
||||||
writeTncCommand(command)
|
writeTncCommand(command)
|
||||||
|
@ -563,7 +563,7 @@ exports.stopBeacon = function() {
|
||||||
|
|
||||||
// OPEN ARQ SESSION
|
// OPEN ARQ SESSION
|
||||||
exports.connectARQ = function(dxcallsign) {
|
exports.connectARQ = function(dxcallsign) {
|
||||||
command = '{"type" : "arq", "command" : "connect", "dxcallsign": "'+ dxcallsign + '", attempts: "15"}'
|
command = '{"type" : "arq", "command" : "connect", "dxcallsign": "'+ dxcallsign + '", "attempts": "15"}'
|
||||||
writeTncCommand(command)
|
writeTncCommand(command)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -256,7 +256,8 @@ class DATA:
|
||||||
# [3] N_FRAMES_PER_BURST int
|
# [3] N_FRAMES_PER_BURST int
|
||||||
# [4] self.transmission_uuid str
|
# [4] self.transmission_uuid str
|
||||||
# [5] mycallsign with ssid
|
# [5] mycallsign with ssid
|
||||||
self.open_dc_and_transmit(data[1], data[2], data[3], data[4], data[5])
|
# [6] attempts
|
||||||
|
self.open_dc_and_transmit(data[1], data[2], data[3], data[4], data[5], data[6])
|
||||||
|
|
||||||
else:
|
else:
|
||||||
self.log.error(
|
self.log.error(
|
||||||
|
@ -1594,7 +1595,7 @@ class DATA:
|
||||||
n_frames_per_burst: int,
|
n_frames_per_burst: int,
|
||||||
transmission_uuid: str,
|
transmission_uuid: str,
|
||||||
mycallsign,
|
mycallsign,
|
||||||
attempts,
|
attempts:int,
|
||||||
) -> bool:
|
) -> bool:
|
||||||
"""
|
"""
|
||||||
Open data channel and transmit data
|
Open data channel and transmit data
|
||||||
|
@ -1605,6 +1606,7 @@ class DATA:
|
||||||
n_frames_per_burst:int:
|
n_frames_per_burst:int:
|
||||||
transmission_uuid:str:
|
transmission_uuid:str:
|
||||||
mycallsign:bytes:
|
mycallsign:bytes:
|
||||||
|
attempts:int: Overriding number of attempts initiating a connection
|
||||||
|
|
||||||
Returns:
|
Returns:
|
||||||
True if the data session was opened and the data was sent
|
True if the data session was opened and the data was sent
|
||||||
|
|
Loading…
Reference in a new issue