From e164538b09ef4bcd4dc86fdaf208ebda8a412271 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Thu, 25 Jun 2020 21:23:43 +0100 Subject: [PATCH] Fix compilation bugs. --- AX25Network.cpp | 2 +- Conf.h | 10 +++++----- PseudoTTYController.cpp | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/AX25Network.cpp b/AX25Network.cpp index 192b6df..dec4ea3 100644 --- a/AX25Network.cpp +++ b/AX25Network.cpp @@ -103,7 +103,7 @@ unsigned int CAX25Network::read(unsigned char* data, unsigned int length) bool complete = false; unsigned char c; - while (m_serial.read(&c, 1U) > 0U) { + while (m_serial.read(&c, 1U) > 0) { if (m_rxLength == 0U && c == AX25_FEND) m_rxData[m_rxLength++] = c; else if (m_rxLength > 0U) diff --git a/Conf.h b/Conf.h index c3c0c16..04c2be8 100644 --- a/Conf.h +++ b/Conf.h @@ -470,11 +470,6 @@ private: bool m_pocsagEnabled; unsigned int m_pocsagFrequency; - bool m_ax25Enabled; - int m_ax25RXTwist; - int m_ax25TXTwist; - bool m_ax25Trace; - bool m_fmEnabled; std::string m_fmCallsign; unsigned int m_fmCallsignSpeed; @@ -509,6 +504,11 @@ private: unsigned int m_fmExtAudioBoost; unsigned int m_fmModeHang; + bool m_ax25Enabled; + int m_ax25RXTwist; + int m_ax25TXTwist; + bool m_ax25Trace; + bool m_dstarNetworkEnabled; std::string m_dstarGatewayAddress; unsigned int m_dstarGatewayPort; diff --git a/PseudoTTYController.cpp b/PseudoTTYController.cpp index a21fb3d..e853c52 100644 --- a/PseudoTTYController.cpp +++ b/PseudoTTYController.cpp @@ -19,7 +19,7 @@ #if !defined(_WIN32) && !defined(_WIN64) -#include "SerialController.h" +#include "PseudoTTYController.h" #include "Log.h" #include