From 53126f5e4e051746c566e3251133382aa491943e Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Tue, 7 Jun 2016 23:50:01 +0100 Subject: [PATCH] More bug fixing for CONNECT. --- YSFGateway/GPS.cpp | 2 ++ YSFGateway/Version.h | 2 +- YSFGateway/WiresX.cpp | 4 ++-- YSFGateway/YSFGateway.cpp | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/YSFGateway/GPS.cpp b/YSFGateway/GPS.cpp index c38dde8..4016139 100644 --- a/YSFGateway/GPS.cpp +++ b/YSFGateway/GPS.cpp @@ -229,6 +229,8 @@ void CGPS::transmitGPS(const unsigned char* source) float longitude = lon_deg + ((lon_min + ((float)lon_min_frac * 0.01F)) * (1.0F / 60.0F)); longitude *= lon_dir; + LogMessage("GPS Position of lat=%f long=%f", latitude, longitude); + m_sent = true; } diff --git a/YSFGateway/Version.h b/YSFGateway/Version.h index aa44328..505d2d1 100644 --- a/YSFGateway/Version.h +++ b/YSFGateway/Version.h @@ -19,6 +19,6 @@ #if !defined(VERSION_H) #define VERSION_H -const char* VERSION = "20160517"; +const char* VERSION = "20160607"; #endif diff --git a/YSFGateway/WiresX.cpp b/YSFGateway/WiresX.cpp index 836202a..c7b1c6e 100644 --- a/YSFGateway/WiresX.cpp +++ b/YSFGateway/WiresX.cpp @@ -208,9 +208,9 @@ void CWiresX::processAll() WX_STATUS CWiresX::processConnect(const unsigned char* data) { - ::LogDebug("Received Connect to %5.5s from %10.10s", data + 5U, m_source + 10U); + ::LogDebug("Received Connect to %5.5s from %10.10s", data, m_source + 10U); - std::string id = std::string((char*)(data + 4U), 5U); + std::string id = std::string((char*)data, 5U); m_reflector = m_reflectors.find(id); if (m_reflector == NULL) diff --git a/YSFGateway/YSFGateway.cpp b/YSFGateway/YSFGateway.cpp index 429e078..07eca73 100644 --- a/YSFGateway/YSFGateway.cpp +++ b/YSFGateway/YSFGateway.cpp @@ -228,7 +228,7 @@ int CYSFGateway::run() switch (status) { case WXS_CONNECT: { CYSFReflector* reflector = m_wiresX->getReflector(); - LogMessage("Connect to %05u has been requested by %10.10s", reflector->m_id, buffer + 14U); + LogMessage("Connect to %5.5s has been requested by %10.10s", reflector->m_id.c_str(), buffer + 14U); m_netNetwork->setDestination(reflector->m_address, reflector->m_port); m_linked = true; }