dominic/YSFClients
1
0
Fork 0
Code Releases Activity

Rewrite the GPS data collector.

Browse source
This commit is contained in:
Jonathan Naylor 2016-06-13 23:12:28 +01:00
parent 9296316ffe
commit 9e76b24e7a
3 changed files with 52 additions and 44 deletions

90
YSFGateway/GPS.cpp
View file

@ -20,6 +20,7 @@
#include "YSFPayload.h" #include "YSFPayload.h"
#include "YSFDefines.h" #include "YSFDefines.h"
#include "Utils.h" #include "Utils.h"
#include "CRC.h"
#include "Log.h" #include "Log.h"
#include <cstdio> #include <cstdio>
@ -33,8 +34,6 @@ const unsigned char LONG_GPS[] = {0x47U, 0x64U};
CGPS::CGPS(const std::string& callsign, const std::string& suffix, const std::string& password, const std::string& address, unsigned int port) : CGPS::CGPS(const std::string& callsign, const std::string& suffix, const std::string& password, const std::string& address, unsigned int port) :
m_writer(callsign, suffix, password, address, port), m_writer(callsign, suffix, password, address, port),
m_buffer(NULL), m_buffer(NULL),
m_dt1(false),
m_dt2(false),
m_sent(false) m_sent(false)
{ {
assert(!callsign.empty()); assert(!callsign.empty());
@ -42,7 +41,7 @@ m_sent(false)
assert(!address.empty()); assert(!address.empty());
assert(port > 0U); assert(port > 0U);
m_buffer = new unsigned char[20U]; m_buffer = new unsigned char[300U];
} }
CGPS::~CGPS() CGPS::~CGPS()
@ -60,72 +59,85 @@ bool CGPS::open()
return m_writer.open(); return m_writer.open();
} }
void CGPS::data(const unsigned char* source, const unsigned char* data, unsigned char fi, unsigned char dt, unsigned char fn) void CGPS::data(const unsigned char* source, const unsigned char* data, unsigned char fi, unsigned char dt, unsigned char fn, unsigned char ft)
{ {
if (m_sent) if (m_sent)
return; return;
// In case we had the data but not the source callsign if (fi != YSF_FI_COMMUNICATIONS)
if (m_dt1 && m_dt2) {
transmitGPS(source);
return; return;
}
CYSFPayload payload; CYSFPayload payload;
if (fi == YSF_FI_COMMUNICATIONS && dt == YSF_DT_VD_MODE1) { if (dt == YSF_DT_VD_MODE1) {
if (fn == 3U && !m_dt1) { if (fn == 0U || fn == 1U || fn == 2U)
bool valid = payload.readVDMode1Data(data, m_buffer); return;
if (valid) {
m_dt1 = true;
m_dt2 = true;
// If no GPS data then mark it as complete for this transmission bool valid = payload.readVDMode1Data(data, m_buffer + (fn - 3U) * 20U);
if (::memcmp(m_buffer + 1U, NULL_GPS, 2U) == 0) { if (!valid)
CUtils::dump("Null GPS data received", m_buffer, 20U); return;
m_sent = true;
if (fn == ft) {
bool valid = false;
// Find the end marker
for (unsigned int i = (fn - 2U) * 20U; i > 0U; i--) {
if (m_buffer[i] == 0x03U) {
unsigned char crc = CCRC::addCRC(m_buffer, i + 1U);
if (crc == m_buffer[i + 1U])
valid = true;
break;
} }
}
if (valid) {
if (::memcmp(m_buffer + 1U, SHRT_GPS, 2U) == 0) { if (::memcmp(m_buffer + 1U, SHRT_GPS, 2U) == 0) {
CUtils::dump("Short GPS data received", m_buffer, 20U); CUtils::dump("Short GPS data received", m_buffer, (fn - 2U) * 20U);
transmitGPS(source); transmitGPS(source);
} }
if (::memcmp(m_buffer + 1U, LONG_GPS, 2U) == 0) { if (::memcmp(m_buffer + 1U, LONG_GPS, 2U) == 0) {
CUtils::dump("Long GPS data received", m_buffer, 20U); CUtils::dump("Long GPS data received", m_buffer, (fn - 2U) * 20U);
transmitGPS(source); transmitGPS(source);
} }
m_sent = true;
} }
} }
} else if (fi == YSF_FI_COMMUNICATIONS && dt == YSF_DT_VD_MODE2) { } else if (dt == YSF_DT_VD_MODE2) {
if (fn == 6U && !m_dt1) { if (fn != 6U && fn != 7U)
bool valid = payload.readVDMode2Data(data, m_buffer + 0U); return;
if (valid) {
m_dt1 = true;
// If no GPS data then mark it as complete for this transmission bool valid = payload.readVDMode2Data(data, m_buffer + (fn - 6U) * 10U);
if (::memcmp(m_buffer + 1U, NULL_GPS, 2U) == 0) { if (!valid)
CUtils::dump("Null GPS data received", m_buffer, 20U); return;
m_sent = true;
m_dt2 = true; if (fn == ft) {
bool valid = false;
// Find the end marker
for (unsigned int i = (fn - 5U) * 10U; i > 0U; i--) {
if (m_buffer[i] == 0x03U) {
unsigned char crc = CCRC::addCRC(m_buffer, i + 1U);
if (crc == m_buffer[i + 1U])
valid = true;
break;
} }
} }
}
if (fn == 7U && !m_dt2) {
bool valid = payload.readVDMode2Data(data, m_buffer + 10U);
if (valid) {
m_dt2 = true;
if (valid) {
if (::memcmp(m_buffer + 1U, SHRT_GPS, 2U) == 0) { if (::memcmp(m_buffer + 1U, SHRT_GPS, 2U) == 0) {
CUtils::dump("Short GPS data received", m_buffer, 20U); CUtils::dump("Short GPS data received", m_buffer, (fn - 5U) * 10U);
transmitGPS(source); transmitGPS(source);
} }
if (::memcmp(m_buffer + 1U, LONG_GPS, 2U) == 0) { if (::memcmp(m_buffer + 1U, LONG_GPS, 2U) == 0) {
CUtils::dump("Long GPS data received", m_buffer, 20U); CUtils::dump("Long GPS data received", m_buffer, (fn - 5U) * 10U);
transmitGPS(source); transmitGPS(source);
} }
m_sent = true;
} }
} }
} }
@ -133,8 +145,6 @@ void CGPS::data(const unsigned char* source, const unsigned char* data, unsigned
void CGPS::reset() void CGPS::reset()
{ {
m_dt1 = false;
m_dt2 = false;
m_sent = false; m_sent = false;
} }

4
YSFGateway/GPS.h
View file

@ -32,7 +32,7 @@ public:
bool open(); bool open();
void data(const unsigned char* source, const unsigned char* data, unsigned char fi, unsigned char dt, unsigned char fn); void data(const unsigned char* source, const unsigned char* data, unsigned char fi, unsigned char dt, unsigned char fn, unsigned char ft);
void clock(unsigned int ms); void clock(unsigned int ms);
@ -43,8 +43,6 @@ public:
private: private:
CAPRSWriter m_writer; CAPRSWriter m_writer;
unsigned char* m_buffer; unsigned char* m_buffer;
bool m_dt1;
bool m_dt2;
bool m_sent; bool m_sent;
void transmitGPS(const unsigned char* source); void transmitGPS(const unsigned char* source);

2
YSFGateway/YSFGateway.cpp
View file

@ -251,7 +251,7 @@ int CYSFGateway::run()
} }
if (m_gps != NULL) if (m_gps != NULL)
m_gps->data(buffer + 14U, buffer + 35U, fi, dt, fn); m_gps->data(buffer + 14U, buffer + 35U, fi, dt, fn, ft);
} }
if (networkEnabled && m_linked && !m_exclude) if (networkEnabled && m_linked && !m_exclude)