Fix compilation bugs.
This commit is contained in:
parent
cb51a14575
commit
e164538b09
3 changed files with 7 additions and 7 deletions
|
@ -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)
|
||||
|
|
10
Conf.h
10
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;
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
#if !defined(_WIN32) && !defined(_WIN64)
|
||||
|
||||
#include "SerialController.h"
|
||||
#include "PseudoTTYController.h"
|
||||
#include "Log.h"
|
||||
|
||||
#include <cstring>
|
||||
|
|
Loading…
Reference in a new issue