juribeparada/MMDVM_HS
1
0
Fork 0
mirror of https://github.com/juribeparada/MMDVM_HS.git synced 2025-12-06 07:12:08 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Additional checks for overflows and some code cleanup

Browse source
This commit is contained in:
Andy CA6JAU 2018-10-28 19:03:37 -03:00
parent 3284a72feb
commit e0332c4efa
8 changed files with 37 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
DStarRX.cpp
View file

@ -330,7 +330,10 @@ void CDStarRX::processHeader(bool bit)
m_patternBuffer |= 0x01U; m_patternBuffer |= 0x01U;
WRITE_BIT2(m_rxBuffer, m_rxBufferBits, bit); WRITE_BIT2(m_rxBuffer, m_rxBufferBits, bit);
m_rxBufferBits++; m_rxBufferBits++;
if (m_rxBufferBits > DSTAR_BUFFER_LENGTH_BITS)
reset();
// A full FEC header // A full FEC header
if (m_rxBufferBits == DSTAR_FEC_SECTION_LENGTH_BITS) { if (m_rxBufferBits == DSTAR_FEC_SECTION_LENGTH_BITS) {
@ -361,7 +364,10 @@ void CDStarRX::processData(bool bit)
m_patternBuffer |= 0x01U; m_patternBuffer |= 0x01U;
WRITE_BIT2(m_rxBuffer, m_rxBufferBits, bit); WRITE_BIT2(m_rxBuffer, m_rxBufferBits, bit);
m_rxBufferBits++; m_rxBufferBits++;
if (m_rxBufferBits > DSTAR_BUFFER_LENGTH_BITS)
reset();
// Fuzzy matching of the end frame sequences // Fuzzy matching of the end frame sequences
if (countBits32((m_patternBuffer & END_SYNC_MASK) ^ END_SYNC_DATA) <= END_SYNC_ERRS) { if (countBits32((m_patternBuffer & END_SYNC_MASK) ^ END_SYNC_DATA) <= END_SYNC_ERRS) {

4
DStarRX.h
View file

@ -22,6 +22,8 @@
#include "DStarDefines.h" #include "DStarDefines.h"
const uint16_t DSTAR_BUFFER_LENGTH_BITS = 800U;
enum DSRX_STATE { enum DSRX_STATE {
DSRXS_NONE, DSRXS_NONE,
DSRXS_HEADER, DSRXS_HEADER,
@ -39,7 +41,7 @@ public:
private: private:
DSRX_STATE m_rxState; DSRX_STATE m_rxState;
uint32_t m_patternBuffer; uint32_t m_patternBuffer;
uint8_t m_rxBuffer[100U]; uint8_t m_rxBuffer[DSTAR_BUFFER_LENGTH_BITS / 8U];
unsigned int m_rxBufferBits; unsigned int m_rxBufferBits;
unsigned int m_dataBits; unsigned int m_dataBits;
unsigned int m_mar; unsigned int m_mar;

17
NXDNDefines.h
View file

@ -1,5 +1,6 @@
/* /*
* Copyright (C) 2016,2017,2018 by Jonathan Naylor G4KLX * Copyright (C) 2016,2017,2018 by Jonathan Naylor G4KLX
* Copyright (C) 2018 by Andy Uribe CA6JAU
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -19,16 +20,10 @@
#if !defined(NXDNDEFINES_H) #if !defined(NXDNDEFINES_H)
#define NXDNDEFINES_H #define NXDNDEFINES_H
const unsigned int NXDN_RADIO_SYMBOL_LENGTH = 10U; // At 24 kHz sample rate
const unsigned int NXDN_FRAME_LENGTH_BITS = 384U; const unsigned int NXDN_FRAME_LENGTH_BITS = 384U;
const unsigned int NXDN_FRAME_LENGTH_BYTES = NXDN_FRAME_LENGTH_BITS / 8U; const unsigned int NXDN_FRAME_LENGTH_BYTES = NXDN_FRAME_LENGTH_BITS / 8U;
const unsigned int NXDN_FRAME_LENGTH_SYMBOLS = NXDN_FRAME_LENGTH_BITS / 2U;
const unsigned int NXDN_FRAME_LENGTH_SAMPLES = NXDN_FRAME_LENGTH_SYMBOLS * NXDN_RADIO_SYMBOL_LENGTH;
const unsigned int NXDN_FSW_LENGTH_BITS = 20U; const unsigned int NXDN_FSW_LENGTH_BITS = 20U;
const unsigned int NXDN_FSW_LENGTH_SYMBOLS = NXDN_FSW_LENGTH_BITS / 2U;
const unsigned int NXDN_FSW_LENGTH_SAMPLES = NXDN_FSW_LENGTH_SYMBOLS * NXDN_RADIO_SYMBOL_LENGTH;
const uint8_t NXDN_FSW_BYTES[] = {0xCDU, 0xF5U, 0x90U}; const uint8_t NXDN_FSW_BYTES[] = {0xCDU, 0xF5U, 0x90U};
const uint8_t NXDN_FSW_BYTES_MASK[] = {0xFFU, 0xFFU, 0xF0U}; const uint8_t NXDN_FSW_BYTES_MASK[] = {0xFFU, 0xFFU, 0xF0U};
@ -37,14 +32,4 @@ const uint8_t NXDN_FSW_BYTES_LENGTH = 3U;
const uint32_t NXDN_FSW_BITS = 0x000CDF59U; const uint32_t NXDN_FSW_BITS = 0x000CDF59U;
const uint32_t NXDN_FSW_BITS_MASK = 0x000FFFFFU; const uint32_t NXDN_FSW_BITS_MASK = 0x000FFFFFU;
// C D F 5 9
// 11 00 11 01 11 11 01 01 10 01
// -3 +1 -3 +3 -3 -3 +3 +3 -1 +3
const int8_t NXDN_FSW_SYMBOLS_VALUES[] = {-3, +1, -3, +3, -3, -3, +3, +3, -1, +3};
const uint16_t NXDN_FSW_SYMBOLS = 0x014DU;
const uint16_t NXDN_FSW_SYMBOLS_MASK = 0x03FFU;
#endif #endif

12
NXDNRX.cpp
View file

@ -32,7 +32,6 @@ const uint8_t BIT_MASK_TABLE[] = {0x80U, 0x40U, 0x20U, 0x10U, 0x08U, 0x04U, 0x02
#define WRITE_BIT1(p,i,b) p[(i)>>3] = (b) ? (p[(i)>>3] | BIT_MASK_TABLE[(i)&7]) : (p[(i)>>3] & ~BIT_MASK_TABLE[(i)&7]) #define WRITE_BIT1(p,i,b) p[(i)>>3] = (b) ? (p[(i)>>3] | BIT_MASK_TABLE[(i)&7]) : (p[(i)>>3] & ~BIT_MASK_TABLE[(i)&7])
CNXDNRX::CNXDNRX() : CNXDNRX::CNXDNRX() :
m_prev(false),
m_state(NXDNRXS_NONE), m_state(NXDNRXS_NONE),
m_bitBuffer(0x00U), m_bitBuffer(0x00U),
m_outBuffer(), m_outBuffer(),
@ -45,7 +44,6 @@ m_lostCount(0U)
void CNXDNRX::reset() void CNXDNRX::reset()
{ {
m_prev = false;
m_state = NXDNRXS_NONE; m_state = NXDNRXS_NONE;
m_bitBuffer = 0x00U; m_bitBuffer = 0x00U;
m_bufferPtr = 0U; m_bufferPtr = 0U;
@ -77,7 +75,6 @@ void CNXDNRX::processNone(bool bit)
m_state = NXDNRXS_DATA; m_state = NXDNRXS_DATA;
io.setDecode(true); io.setDecode(true);
} }
} }
@ -89,7 +86,10 @@ void CNXDNRX::processData(bool bit)
m_bitBuffer |= 0x01U; m_bitBuffer |= 0x01U;
WRITE_BIT1(m_buffer, m_bufferPtr, bit); WRITE_BIT1(m_buffer, m_bufferPtr, bit);
m_bufferPtr++; m_bufferPtr++;
if (m_bufferPtr > NXDN_FRAME_LENGTH_BITS)
reset();
// Only search for a sync in the right place +-2 symbols // Only search for a sync in the right place +-2 symbols
if (m_bufferPtr >= (NXDN_FSW_LENGTH_BITS - 2U) && m_bufferPtr <= (NXDN_FSW_LENGTH_BITS + 2U)) { if (m_bufferPtr >= (NXDN_FSW_LENGTH_BITS - 2U) && m_bufferPtr <= (NXDN_FSW_LENGTH_BITS + 2U)) {
@ -108,13 +108,11 @@ void CNXDNRX::processData(bool bit)
if (m_lostCount == 0U) { if (m_lostCount == 0U) {
DEBUG1("NXDNRX: sync timed out, lost lock"); DEBUG1("NXDNRX: sync timed out, lost lock");
io.setDecode(false); io.setDecode(false);
serial.writeNXDNLost(); serial.writeNXDNLost();
reset();
m_state = NXDNRXS_NONE;
} else { } else {
// Write data to host
m_outBuffer[0U] = m_lostCount == (MAX_FSW_FRAMES - 1U) ? 0x01U : 0x00U; m_outBuffer[0U] = m_lostCount == (MAX_FSW_FRAMES - 1U) ? 0x01U : 0x00U;
writeRSSIData(m_outBuffer); writeRSSIData(m_outBuffer);
// Start the next frame // Start the next frame

2
NXDNRX.h
View file

@ -36,7 +36,6 @@ public:
void reset(); void reset();
private: private:
bool m_prev;
NXDNRX_STATE m_state; NXDNRX_STATE m_state;
uint64_t m_bitBuffer; uint64_t m_bitBuffer;
uint8_t m_outBuffer[NXDN_FRAME_LENGTH_BYTES + 3U]; uint8_t m_outBuffer[NXDN_FRAME_LENGTH_BYTES + 3U];
@ -51,4 +50,3 @@ private:
}; };
#endif #endif

10
YSFDefines.h
View file

@ -1,5 +1,6 @@
/* /*
* Copyright (C) 2009-2015 by Jonathan Naylor G4KLX * Copyright (C) 2009-2015 by Jonathan Naylor G4KLX
* Copyright (C) 2018 by Andy Uribe CA6JAU
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -21,14 +22,11 @@
const unsigned int YSF_FRAME_LENGTH_BYTES = 120U; const unsigned int YSF_FRAME_LENGTH_BYTES = 120U;
const unsigned int YSF_FRAME_LENGTH_BITS = YSF_FRAME_LENGTH_BYTES * 8U; const unsigned int YSF_FRAME_LENGTH_BITS = YSF_FRAME_LENGTH_BYTES * 8U;
const unsigned int YSF_FRAME_LENGTH_SYMBOLS = YSF_FRAME_LENGTH_BYTES * 4U;
const unsigned int YSF_SYNC_LENGTH_BYTES = 5U; const unsigned int YSF_SYNC_LENGTH_BYTES = 5U;
const unsigned int YSF_SYNC_LENGTH_BITS = YSF_SYNC_LENGTH_BYTES * 8U; const unsigned int YSF_SYNC_LENGTH_BITS = YSF_SYNC_LENGTH_BYTES * 8U;
const unsigned int YSF_SYNC_LENGTH_SYMBOLS = YSF_SYNC_LENGTH_BYTES * 4U;
const unsigned int YSF_FICH_LENGTH_BITS = 200U; const unsigned int YSF_FICH_LENGTH_BITS = 200U;
const unsigned int YSF_FICH_LENGTH_SYMBOLS = 100U;
const uint8_t YSF_SYNC_BYTES[] = {0xD4U, 0x71U, 0xC9U, 0x63U, 0x4DU}; const uint8_t YSF_SYNC_BYTES[] = {0xD4U, 0x71U, 0xC9U, 0x63U, 0x4DU};
const uint8_t YSF_SYNC_BYTES_LENGTH = 5U; const uint8_t YSF_SYNC_BYTES_LENGTH = 5U;
@ -36,11 +34,5 @@ const uint8_t YSF_SYNC_BYTES_LENGTH = 5U;
const uint64_t YSF_SYNC_BITS = 0x000000D471C9634DU; const uint64_t YSF_SYNC_BITS = 0x000000D471C9634DU;
const uint64_t YSF_SYNC_BITS_MASK = 0x000000FFFFFFFFFFU; const uint64_t YSF_SYNC_BITS_MASK = 0x000000FFFFFFFFFFU;
// D 4 7 1 C 9 6 3 4 D
// 11 01 01 00 01 11 00 01 11 00 10 01 01 10 00 11 01 00 11 01
// -3 +3 +3 +1 +3 -3 +1 +3 -3 +1 -1 +3 +3 -1 +3 -3 +3 +1 -3 +3
const uint32_t YSF_SYNC_SYMBOLS = 0x0007B5ADU;
const uint32_t YSF_SYNC_SYMBOLS_MASK = 0x000FFFFFU;
#endif #endif

20
YSFRX.cpp
View file

@ -1,6 +1,6 @@
/* /*
* Copyright (C) 2009-2017 by Jonathan Naylor G4KLX * Copyright (C) 2009-2017 by Jonathan Naylor G4KLX
* Copyright (C) 2016,2017 by Andy Uribe CA6JAU * Copyright (C) 2016,2017,2018 by Andy Uribe CA6JAU
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -32,7 +32,6 @@ const uint8_t BIT_MASK_TABLE[] = {0x80U, 0x40U, 0x20U, 0x10U, 0x08U, 0x04U, 0x02
#define WRITE_BIT1(p,i,b) p[(i)>>3] = (b) ? (p[(i)>>3] | BIT_MASK_TABLE[(i)&7]) : (p[(i)>>3] & ~BIT_MASK_TABLE[(i)&7]) #define WRITE_BIT1(p,i,b) p[(i)>>3] = (b) ? (p[(i)>>3] | BIT_MASK_TABLE[(i)&7]) : (p[(i)>>3] & ~BIT_MASK_TABLE[(i)&7])
CYSFRX::CYSFRX() : CYSFRX::CYSFRX() :
m_prev(false),
m_state(YSFRXS_NONE), m_state(YSFRXS_NONE),
m_bitBuffer(0x00U), m_bitBuffer(0x00U),
m_outBuffer(), m_outBuffer(),
@ -45,7 +44,6 @@ m_lostCount(0U)
void CYSFRX::reset() void CYSFRX::reset()
{ {
m_prev = false;
m_state = YSFRXS_NONE; m_state = YSFRXS_NONE;
m_bitBuffer = 0x00U; m_bitBuffer = 0x00U;
m_bufferPtr = 0U; m_bufferPtr = 0U;
@ -77,7 +75,6 @@ void CYSFRX::processNone(bool bit)
m_state = YSFRXS_DATA; m_state = YSFRXS_DATA;
io.setDecode(true); io.setDecode(true);
} }
} }
@ -89,9 +86,12 @@ void CYSFRX::processData(bool bit)
m_bitBuffer |= 0x01U; m_bitBuffer |= 0x01U;
WRITE_BIT1(m_buffer, m_bufferPtr, bit); WRITE_BIT1(m_buffer, m_bufferPtr, bit);
m_bufferPtr++;
// Only search for a sync in the right place +-2 symbols m_bufferPtr++;
if (m_bufferPtr > YSF_FRAME_LENGTH_BITS)
reset();
// Only search for a sync in the right place +-2 bits
if (m_bufferPtr >= (YSF_SYNC_LENGTH_BITS - 2U) && m_bufferPtr <= (YSF_SYNC_LENGTH_BITS + 2U)) { if (m_bufferPtr >= (YSF_SYNC_LENGTH_BITS - 2U) && m_bufferPtr <= (YSF_SYNC_LENGTH_BITS + 2U)) {
// Fuzzy matching of the data sync bit sequence // Fuzzy matching of the data sync bit sequence
if (countBits64((m_bitBuffer & YSF_SYNC_BITS_MASK) ^ YSF_SYNC_BITS) <= SYNC_BIT_RUN_ERRS) { if (countBits64((m_bitBuffer & YSF_SYNC_BITS_MASK) ^ YSF_SYNC_BITS) <= SYNC_BIT_RUN_ERRS) {
@ -103,18 +103,16 @@ void CYSFRX::processData(bool bit)
// Send a data frame to the host if the required number of bits have been received // Send a data frame to the host if the required number of bits have been received
if (m_bufferPtr == YSF_FRAME_LENGTH_BITS) { if (m_bufferPtr == YSF_FRAME_LENGTH_BITS) {
// We've not seen a data sync for too long, signal RXLOST and change to RX_NONE
m_lostCount--; m_lostCount--;
// We've not seen a data sync for too long, signal RXLOST and change to RX_NONE
if (m_lostCount == 0U) { if (m_lostCount == 0U) {
DEBUG1("YSFRX: sync timed out, lost lock"); DEBUG1("YSFRX: sync timed out, lost lock");
io.setDecode(false); io.setDecode(false);
serial.writeYSFLost(); serial.writeYSFLost();
reset();
m_state = YSFRXS_NONE;
} else { } else {
// Write data to host
m_outBuffer[0U] = m_lostCount == (MAX_SYNC_FRAMES - 1U) ? 0x01U : 0x00U; m_outBuffer[0U] = m_lostCount == (MAX_SYNC_FRAMES - 1U) ? 0x01U : 0x00U;
writeRSSIData(m_outBuffer); writeRSSIData(m_outBuffer);
// Start the next frame // Start the next frame

2
YSFRX.h
View file

@ -36,7 +36,6 @@ public:
void reset(); void reset();
private: private:
bool m_prev;
YSFRX_STATE m_state; YSFRX_STATE m_state;
uint64_t m_bitBuffer; uint64_t m_bitBuffer;
uint8_t m_outBuffer[YSF_FRAME_LENGTH_BYTES + 3U]; uint8_t m_outBuffer[YSF_FRAME_LENGTH_BYTES + 3U];
@ -51,4 +50,3 @@ private:
}; };
#endif #endif