datachannel attempt fix

This commit is contained in:
DJ2LS 2021-11-19 17:47:25 +01:00
parent 5218eb3909
commit 9dcf98e229
3 changed files with 5 additions and 6 deletions

View file

@ -18,7 +18,7 @@ var chatDB = path.join(configFolder, 'chatDB.json')
window.addEventListener('DOMContentLoaded', () => {
// SEND MSG
document.getElementById("sendMessage").addEventListener("click", () => {
dxcallsign = 'DN2LS'
dxcallsign = document.getElementById('chatModuledxCall').value
let Data = {
command: "sendMessage",
dxcallsign : dxcallsign.toUpperCase(),

View file

@ -19,7 +19,7 @@
<script src="../node_modules/chartjs-plugin-annotation/dist/chartjs-plugin-annotation.min.js"></script>
<input id="chatModuledxCall"></input>
<button class="btn btn-sm btn-primary me-2" id="sendMessage" type="button">SEND MSG</button>
</body>

View file

@ -678,14 +678,13 @@ async def arq_open_data_channel(mode):
connection_frame[2:3] = static.MYCALLSIGN_CRC8
connection_frame[3:9] = static.MYCALLSIGN
connection_frame[12:13] = bytes([DATA_CHANNEL_MODE])
while not DATA_CHANNEL_READY_FOR_DATA:
time.sleep(0.01)
for attempt in range(1,DATA_CHANNEL_MAX_RETRIES+1):
static.INFO.append("DATACHANNEL;OPENING")
attempt = str(attempt) + "/" + str(DATA_CHANNEL_MAX_RETRIES)
structlog.get_logger("structlog").info("[TNC] DATA [" + str(static.MYCALLSIGN, 'utf-8') + "]>> <<[" + str(static.DXCALLSIGN, 'utf-8') + "]", attempt=attempt)
structlog.get_logger("structlog").info("[TNC] DATA [" + str(static.MYCALLSIGN, 'utf-8') + "]>> <<[" + str(static.DXCALLSIGN, 'utf-8') + "]", attempt=str(attempt) + "/" + str(DATA_CHANNEL_MAX_RETRIES))
while not modem.transmit_signalling(connection_frame, 1):
time.sleep(0.01)
@ -698,7 +697,7 @@ async def arq_open_data_channel(mode):
break
if DATA_CHANNEL_READY_FOR_DATA:
break
if not DATA_CHANNEL_READY_FOR_DATA and attempt == DATA_CHANNEL_MAX_RETRIES:
static.INFO.append("DATACHANNEL;FAILED")