jens/cpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- refactore Formatter

Browse Source 
- prpeared for unscrambled sync data
- State-based deformatter


git-svn-id: http://moon:8086/svn/software/trunk/libsrc/cpp@1063 b431acfa-c32f-4a4a-93f1-934dc6c82436
This commit is contained in:
jens
2022-06-23 11:18:07 +00:00
parent 10572920de
commit 7147962697
5 changed files with 69 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/Formatter.cpp
+45 -33
View File
@@ -3,6 +3,7 @@
#include <math.h>
#include <stdint.h>
#include <algorithm>
#include <stdio.h>
#include <crc/crc.h>
#include "Formatter.hpp"
@@ -20,8 +21,8 @@ Formatter::Formatter(IFormatter *pFrameHandler)
memset(&m_frame, 0, sizeof(frame_t));
// Set preamble
m_frame.hdr.preamble[0] = FRAME_PREAMBLE_IV;
m_frame.hdr.preamble[1] = ~(m_frame.hdr.preamble[0]);
m_frame.preamble.data[0] = FRAME_PREAMBLE_IV;
m_frame.preamble.data[1] = ~(m_frame.preamble.data[0]);
}
Formatter::~Formatter()
@@ -115,10 +116,10 @@ void Formatter::commit(frame_type frameType, uint32_t dataCount)
m_frame.hdr.crc16 = Crc16(FRAME_CRC16_POLY, FRAME_CRC16_IV, m_frame.data, FRAME_NUM_BYTES_PER_FRAME);
m_frame.hdr.prn_state = m_scrambler.stateGet();
m_scrambler.process(m_frame.data, FRAME_NUM_BYTES_PER_FRAME);
m_scrambler.process((uint8_t*)&m_frame.hdr.crc16, sizeof(m_frame.hdr.crc16));
m_scrambler.process((uint8_t*)&m_frame.hdr.type, sizeof(m_frame.hdr.type));
m_scrambler.process((uint8_t*)&m_frame.hdr.length, sizeof(m_frame.hdr.length));
m_scrambler.process(m_frame.data, FRAME_NUM_BYTES_PER_FRAME);
m_pFrameHandler->onFrame((void*)&m_frame, sizeof(frame_t));
}
@@ -130,7 +131,7 @@ DeFormatter::DeFormatter(IDeFormatter *pDataHandler)
: m_pDataHandler(pDataHandler)
, m_scrambler(FRAME_SCRAMBLER_SEED, FRAME_SCRAMBLER_POLY)
, m_dataCount(0)
, m_enable(0)
, m_state(Idle)
{
resetStats();
}
@@ -141,39 +142,50 @@ DeFormatter::~DeFormatter()
void DeFormatter::process(uint8_t data)
{
uint8_t *pData;
pData = (uint8_t*)&m_frame;
pData += 2;
if (!m_enable)
return;
pData[m_dataCount++] = data;
if (m_dataCount == (sizeof(frame_t)-2))
if (m_state == Idle)
{
m_scrambler.stateSet(m_frame.hdr.prn_state);
m_scrambler.process(m_frame.data, FRAME_NUM_BYTES_PER_FRAME);
m_scrambler.process((uint8_t*)&m_frame.hdr.crc16, sizeof(m_frame.hdr.crc16));
m_scrambler.process((uint8_t*)&m_frame.hdr.type, sizeof(m_frame.hdr.type));
m_scrambler.process((uint8_t*)&m_frame.hdr.length, sizeof(m_frame.hdr.length));
uint16_t crc16_ist = Crc16(FRAME_CRC16_POLY, FRAME_CRC16_IV, m_frame.data, FRAME_NUM_BYTES_PER_FRAME);
if (crc16_ist == m_frame.hdr.crc16)
return;
}
uint8_t *pData;
if (m_state == Header)
{
pData = (uint8_t*)&m_Hdr;
pData[m_dataCount++] = data;
if (m_dataCount == (sizeof(frame_hdr_t)))
{
// Frame is valid
if (m_frame.hdr.type == FRAME_TYPE_DATA)
m_scrambler.stateSet(m_Hdr.prn_state);
m_scrambler.process((uint8_t*)&m_Hdr.crc16, sizeof(m_Hdr.crc16));
m_scrambler.process((uint8_t*)&m_Hdr.type, sizeof(m_Hdr.type));
m_scrambler.process((uint8_t*)&m_Hdr.length, sizeof(m_Hdr.length));
m_dataCount = 0;
m_state = Data;
}
}
else if (m_state == Data)
{
pData = (uint8_t*)&m_data;
pData[m_dataCount++] = data;
if (m_dataCount == m_Hdr.length)
{
m_scrambler.process(m_data, FRAME_NUM_BYTES_PER_FRAME);
uint16_t crc16_ist = Crc16(FRAME_CRC16_POLY, FRAME_CRC16_IV, m_data, FRAME_NUM_BYTES_PER_FRAME);
if (crc16_ist == m_Hdr.crc16)
{
m_frameStats.numDataBytes += m_frame.hdr.length;
m_pDataHandler->onData(m_frame.data, m_frame.hdr.length);
// Frame is valid
if (m_Hdr.type == FRAME_TYPE_DATA)
{
m_frameStats.numDataBytes += m_Hdr.length;
m_pDataHandler->onData(m_data, m_Hdr.length);
}
}
m_frameStats.numDataFrame += (uint32_t)(m_Hdr.type == FRAME_TYPE_DATA);
m_frameStats.numIdleFrame += (uint32_t)(m_Hdr.type == FRAME_TYPE_IDLE);
m_frameStats.numInvalidFrame += (uint32_t)(crc16_ist != m_Hdr.crc16);
m_frameStats.numTotalFrame++;
m_dataCount = 0;
m_state = Idle;
}
m_frameStats.numDataFrame += (uint32_t)(m_frame.hdr.type == FRAME_TYPE_DATA);
m_frameStats.numIdleFrame += (uint32_t)(m_frame.hdr.type == FRAME_TYPE_IDLE);
m_frameStats.numInvalidFrame += (uint32_t)(crc16_ist != m_frame.hdr.crc16);
m_frameStats.numTotalFrame++;
m_dataCount = 0;
m_enable = 0;
}
}
@@ -190,7 +202,7 @@ void DeFormatter::resetStats()
void DeFormatter::onReset()
{
m_dataCount = 0;
m_enable = 1;
m_state = Header;
};
void DeFormatter::onData(data_t data)