mirror of
https://github.com/DJ2LS/FreeDATA
synced 2024-05-14 08:04:33 +00:00
adjusted some command handling
This commit is contained in:
parent
bb73d897f9
commit
a6aabd1bc4
|
@ -11,12 +11,11 @@ const settings = useSettingsStore(pinia);
|
||||||
import { useStateStore } from "../store/stateStore.js";
|
import { useStateStore } from "../store/stateStore.js";
|
||||||
const state = useStateStore(pinia);
|
const state = useStateStore(pinia);
|
||||||
|
|
||||||
import { sendCQ, sendPing, startBeacon, stopBeacon } from "../js/sock.js";
|
import { sendPing, startBeacon, stopBeacon } from "../js/sock.js";
|
||||||
import { postToServer } from "../js/rest.js";
|
import { postToServer } from "../js/rest.js";
|
||||||
|
|
||||||
|
|
||||||
function transmitCQ() {
|
function transmitCQ() {
|
||||||
sendCQ();
|
|
||||||
postToServer("localhost", 5000, "modem/cqcqcq", null);
|
postToServer("localhost", 5000, "modem/cqcqcq", null);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -3,37 +3,40 @@ let retries = 0;
|
||||||
let maxRetries = 15;
|
let maxRetries = 15;
|
||||||
|
|
||||||
function connect() {
|
function connect() {
|
||||||
socket = new WebSocket("ws://localhost:5000/events");
|
|
||||||
|
|
||||||
// handle opening
|
socket = new WebSocket("ws://localhost:5000/events");
|
||||||
socket.addEventListener("open", function (event) {
|
|
||||||
console.log("Connected to the WebSocket server");
|
|
||||||
retries = 0; // Reset the retries back to 0 since the connection was successful
|
|
||||||
});
|
|
||||||
|
|
||||||
// handle data
|
// handle opening
|
||||||
socket.addEventListener("message", function (event) {
|
socket.addEventListener('open', function (event) {
|
||||||
console.log("Message from server:", event.data);
|
console.log('Connected to the WebSocket server');
|
||||||
});
|
retries = 0; // Reset the retries back to 0 since the connection was successful
|
||||||
|
});
|
||||||
|
|
||||||
// handle errors
|
// handle data
|
||||||
socket.addEventListener("error", function (event) {
|
socket.addEventListener('message', function (event) {
|
||||||
console.error("WebSocket error:", event);
|
console.log('Message from server:', event.data);
|
||||||
});
|
console.log('Message from server:', event);
|
||||||
|
|
||||||
// handle closing and reconnect
|
});
|
||||||
socket.addEventListener("close", function (event) {
|
|
||||||
console.log("WebSocket connection closed:", event.code);
|
|
||||||
|
|
||||||
// Reconnect handler
|
// handle errors
|
||||||
if (!event.wasClean && retries < maxRetries) {
|
socket.addEventListener('error', function (event) {
|
||||||
setTimeout(() => {
|
console.error('WebSocket error:', event);
|
||||||
console.log("Reconnecting to websocket. Attempt: " + retries);
|
});
|
||||||
connect();
|
|
||||||
}, 1000);
|
// handle closing and reconnect
|
||||||
retries++;
|
socket.addEventListener('close', function (event) {
|
||||||
}
|
console.log('WebSocket connection closed:', event.code);
|
||||||
});
|
|
||||||
|
// Reconnect handler
|
||||||
|
if (!event.wasClean && retries < maxRetries) {
|
||||||
|
setTimeout(() => {
|
||||||
|
console.log("Reconnecting to websocket. Attempt: " + retries)
|
||||||
|
connect();
|
||||||
|
}, 1000);
|
||||||
|
retries++;
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// Initial connection attempt
|
// Initial connection attempt
|
||||||
|
|
|
@ -19,7 +19,7 @@ export async function getFromServer(host, port, endpoint) {
|
||||||
const data = await response.json();
|
const data = await response.json();
|
||||||
|
|
||||||
// move received data to our data dispatcher
|
// move received data to our data dispatcher
|
||||||
restDataDispatcher(endpoint, data.data);
|
restDataDispatcher(endpoint, data);
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function postToServer(host, port, endpoint, data) {
|
export async function postToServer(host, port, endpoint, data) {
|
||||||
|
|
|
@ -34,7 +34,7 @@ var setTxAudioLevelOnce = true;
|
||||||
var setRxAudioLevelOnce = true;
|
var setRxAudioLevelOnce = true;
|
||||||
|
|
||||||
// network connection Timeout
|
// network connection Timeout
|
||||||
setTimeout(connectModem, 2000);
|
//setTimeout(connectModem, 2000);
|
||||||
|
|
||||||
function connectModem() {
|
function connectModem() {
|
||||||
//exports.connectModem = function(){
|
//exports.connectModem = function(){
|
||||||
|
|
|
@ -583,7 +583,6 @@ class RF:
|
||||||
tci_timeout_reached = False
|
tci_timeout_reached = False
|
||||||
else:
|
else:
|
||||||
tci_timeout_reached = True
|
tci_timeout_reached = True
|
||||||
|
|
||||||
threading.Event().wait(0.01)
|
threading.Event().wait(0.01)
|
||||||
# if we're transmitting FreeDATA signals, reset channel busy state
|
# if we're transmitting FreeDATA signals, reset channel busy state
|
||||||
ModemParam.channel_busy = False
|
ModemParam.channel_busy = False
|
||||||
|
@ -598,7 +597,6 @@ class RF:
|
||||||
|
|
||||||
self.modem_transmit_queue.task_done()
|
self.modem_transmit_queue.task_done()
|
||||||
Modem.transmitting = False
|
Modem.transmitting = False
|
||||||
threading.Event().set()
|
|
||||||
|
|
||||||
end_of_transmission = time.time()
|
end_of_transmission = time.time()
|
||||||
transmission_time = end_of_transmission - start_of_transmission
|
transmission_time = end_of_transmission - start_of_transmission
|
||||||
|
@ -843,6 +841,7 @@ class RF:
|
||||||
)
|
)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
self.log.warning("[MDM] [demod_audio] Stream not active anymore", e=e)
|
self.log.warning("[MDM] [demod_audio] Stream not active anymore", e=e)
|
||||||
|
|
||||||
return nin
|
return nin
|
||||||
|
|
||||||
def init_codec2(self):
|
def init_codec2(self):
|
||||||
|
|
Loading…
Reference in a new issue