g4klx/ircDDBGateway
1
0
Fork 0
mirror of https://github.com/g4klx/ircDDBGateway.git synced 2026-04-05 22:35:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Complete the TH-D74E gatewaying and explicit APRS.FI password entry.

Browse source
This commit is contained in:
Jonathan Naylor 2018-06-27 06:31:33 +01:00
parent 076acc66ee
commit 8696548f3e
14 changed files with 111 additions and 350 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Common/APRSWriter.cpp
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2010-2014 by Jonathan Naylor G4KLX
* Copyright (C) 2010-2014,2018 by Jonathan Naylor G4KLX
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -118,9 +118,8 @@ bool CAPRSEntry::isOK()
}
}
CAPRSWriter::CAPRSWriter(const wxString& hostname, unsigned int port, const wxString& gateway, const wxString& address) :
CAPRSWriter::CAPRSWriter(const wxString& hostname, unsigned int port, const wxString& gateway, const wxString& password, const wxString& address) :
m_thread(NULL),
m_enabled(false),
m_idTimer(1000U, 20U * 60U), // 20 minutes
m_gateway(),
m_array()
@ -128,8 +127,9 @@ m_array()
wxASSERT(!hostname.IsEmpty());
wxASSERT(port > 0U);
wxASSERT(!gateway.IsEmpty());
wxASSERT(!password.IsEmpty());
m_thread = new CAPRSWriterThread(gateway, address, hostname, port);
m_thread = new CAPRSWriterThread(gateway, password, address, hostname, port);
m_gateway = gateway;
m_gateway.Truncate(LONG_CALLSIGN_LENGTH - 1U);
@ -179,15 +179,10 @@ void CAPRSWriter::writeData(const wxString& callsign, const CAMBEData& data)
unsigned char buffer[400U];
data.getData(buffer, DV_FRAME_MAX_LENGTH_BYTES);
bool complete = collector->writeData(buffer + VOICE_FRAME_LENGTH_BYTES);
bool complete = collector->writeData(callsign, buffer + VOICE_FRAME_LENGTH_BYTES);
if (!complete)
return;
if (!m_enabled) {
collector->reset();
return;
}
if (!m_thread->isConnected()) {
collector->reset();
return;
@ -246,16 +241,6 @@ void CAPRSWriter::reset(const wxString& callsign)
entry->reset();
}
void CAPRSWriter::setEnabled(bool enabled)
{
m_enabled = enabled;
if (m_enabled) {
sendIdFrames();
m_idTimer.start();
}
}
void CAPRSWriter::clock(unsigned int ms)
{
m_idTimer.clock(ms);