Remove compiler warnings.

This commit is contained in:
Jonathan Naylor
2016-03-03 17:08:24 +00:00
parent 96589f8a7e
commit 944192f246
3 changed files with 3 additions and 5 deletions

View File

@@ -62,8 +62,8 @@ private:
CDMRDataHeader m_netDataHeader; CDMRDataHeader m_netDataHeader;
unsigned char m_rfSeqNo; unsigned char m_rfSeqNo;
unsigned char m_netSeqNo; unsigned char m_netSeqNo;
unsigned char m_netN;
unsigned char m_rfN; unsigned char m_rfN;
unsigned char m_netN;
CTimer m_networkWatchdog; CTimer m_networkWatchdog;
CTimer m_rfTimeoutTimer; CTimer m_rfTimeoutTimer;
CTimer m_netTimeoutTimer; CTimer m_netTimeoutTimer;

View File

@@ -74,8 +74,6 @@ bool CYSFControl::writeModem(unsigned char *data)
return false; return false;
bool valid = (data[1U] & YSF_CKSUM_OK) == YSF_CKSUM_OK; bool valid = (data[1U] & YSF_CKSUM_OK) == YSF_CKSUM_OK;
unsigned char fi = data[1U] & YSF_FI_MASK;
unsigned char dt = data[1U] & YSF_DT_MASK;
if (type == TAG_DATA && valid && m_state == RS_RF_LISTENING) { if (type == TAG_DATA && valid && m_state == RS_RF_LISTENING) {
m_frames = 0U; m_frames = 0U;
@@ -144,7 +142,7 @@ bool CYSFControl::writeModem(unsigned char *data)
unsigned char fn = m_fich.getFN(); unsigned char fn = m_fich.getFN();
unsigned char dt = m_fich.getDT(); unsigned char dt = m_fich.getDT();
LogMessage("YSF, Valid FICH, FI=%X FN=%u DT=%X", m_fich.getFI(), m_fich.getFN(), m_fich.getDT()); LogMessage("YSF, Valid FICH, FI=%X FN=%u DT=%X", fi, fn, dt);
m_payload.decode(data + 2U, fi, fn, dt); m_payload.decode(data + 2U, fi, fn, dt);
// payload.encode(data + 2U); XXX // payload.encode(data + 2U); XXX

View File

@@ -89,7 +89,7 @@ void CYSFConvolution::decode(uint8_t s0, uint8_t s1)
++m_dp; ++m_dp;
assert((m_dp - m_decisions) <= 180U); assert((m_dp - m_decisions) <= 180);
uint16_t* tmp = m_oldMetrics; uint16_t* tmp = m_oldMetrics;
m_oldMetrics = m_newMetrics; m_oldMetrics = m_newMetrics;