From 9eb45910eee7f7e1182df5c8c7cfe9d9e99dcd2c Mon Sep 17 00:00:00 2001 From: dj2ls Date: Thu, 3 Mar 2022 20:40:52 +0100 Subject: [PATCH] updated message transfer command --- gui/sock.js | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/gui/sock.js b/gui/sock.js index 28b7691c..dee457e1 100644 --- a/gui/sock.js +++ b/gui/sock.js @@ -339,22 +339,27 @@ exports.sendFile = function(dxcallsign, mode, frames, filename, filetype, data, var datatype = "f" - //data = data.split('base64,') - //data = data[1] data = datatype + split_char + filename + split_char + filetype + split_char + checksum + split_char + data socketLog.info(data) socketLog.info(btoa(data)) data = btoa(data) - - //command = '{"type" : "arq", "command" : "send_file", "parameter" : [{"dxcallsign" : "' + dxcallsign + '", "mode" : "' + mode + '", "n_frames" : "' + frames + '", "filename" : "' + filename + '", "filetype" : "' + filetype + '", "data" : "' + data + '", "checksum" : "' + checksum + '"}]}' + command = '{"type" : "arq", "command" : "send_raw", "parameter" : [{"dxcallsign" : "' + dxcallsign + '", "mode" : "' + mode + '", "n_frames" : "' + frames + '", "data" : "' + data + '"}]}' writeTncCommand(command) } // Send Message exports.sendMessage = function(dxcallsign, mode, frames, data, checksum) { - command = '{"type" : "arq", "command" : "send_message", "parameter" : [{ "dxcallsign" : "' + dxcallsign + '", "mode" : "' + mode + '", "n_frames" : "' + frames + '", "data" : "' + data + '" , "checksum" : "' + checksum + '"}]}' - socketLog.info(command) + socketLog.info(data) + + var datatype = "m" + data = datatype + split_char + split_char + checksum + split_char + data + socketLog.info(data) + socketLog.info(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_raw", "parameter" : [{"dxcallsign" : "' + dxcallsign + '", "mode" : "' + mode + '", "n_frames" : "' + frames + '", "data" : "' + data + '"}]}' writeTncCommand(command) }