- blockifized DeSymbolizer, DeFormatter, FrameReceiver

git-svn-id: http://moon:8086/svn/software/trunk/libsrc/cpp@1077 b431acfa-c32f-4a4a-93f1-934dc6c82436
2022-06-24 15:13:44 +00:00
parent 1da7f978ae
commit 8b6d6313e5
5 changed files with 209 additions and 142 deletions
@@ -3,7 +3,7 @@
 #include <math.h>
 #include <stdint.h>
 #include <algorithm>
-#include <stdio.h>
+#include <cstdio>

 #include <crc/crc.h>
 #include "DeFormatter.hpp"
@@ -11,87 +11,113 @@
 // --------------------------------------------------------------
 // Deformatter
 // --------------------------------------------------------------
-DeFormatter::DeFormatter(IDeFormatter *pDataHandler)
-	: m_pDataHandler(pDataHandler)
-	, m_scrambler(FRAME_SCRAMBLER_SEED, FRAME_SCRAMBLER_POLY)
-	, m_dataCount(0)
-	, m_state(Idle)
+DeFormatter::DeFormatter()
+: Processor::Block(1, 1)
+, m_scrambler(FRAME_SCRAMBLER_SEED, FRAME_SCRAMBLER_POLY)
+, m_dataCount(0)
+, m_state(Idle)
 {
 	resetStats();
 }

-DeFormatter::~DeFormatter()
-{
-}
-
-void DeFormatter::process(uint8_t data)
-{
-	if (m_state == Idle)
-	{
-		return;
-	}
-
-	uint8_t *pData;
-	if (m_state == Header)
-	{
-		pData = (uint8_t*)&m_Hdr;
-		pData[m_dataCount++] = data;
-		if (m_dataCount == (sizeof(frame_hdr_t)))
-		{
-			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)
-			{
-				// 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;
-		}
-	}
-}
-
-frame_statistics_t DeFormatter::getStats()
-{
-	return m_frameStats;
-}
-
 void DeFormatter::resetStats()
 {
 	memset(&m_frameStats, 0, sizeof(frame_statistics_t));
 }

-void DeFormatter::onReset()
+frame_statistics_t DeFormatter::getStats()
 {
-	m_dataCount = 0;
-	m_state = Header;
-};
+	return m_frameStats;
+}

-void DeFormatter::onData(data_t data)
+void DeFormatter::prepare()
 {
-	process((uint8_t)data);
+	// Get buffers
+	m_buf_in = buffer_in<uint8_t>();
+//	m_buf_out = buffer_out<uint8_t>();
+}
+
+void DeFormatter::process()
+{
+	// Process input
+	if (m_state == Idle)
+	{
+		process_sync();
+	}
+	else if (m_state == Header)
+	{
+		process_header();
+	}
+	else if (m_state == Data)
+	{
+		process_data();
+	}
+}
+
+void DeFormatter::process_sync()
+{
+	while(m_buf_in->len())
+	{
+		uint8_t data;
+		m_buf_in->read(&data, 1);
+		m_sync_preamble <<= 8;
+		m_sync_preamble = m_sync_preamble | (uint16_t)data & 0xFF;
+
+		if (m_sync_preamble == 0x55AA)
+		{
+			m_state = Header;
+			break;
+		}
+	}
+}
+
+void DeFormatter::process_header()
+{
+	if (m_buf_in->len() < sizeof(frame_hdr_t))
+	{
+		return;
+	}
+
+	m_buf_in->read((uint8_t*)&m_Hdr, sizeof(frame_hdr_t));
+	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;
+}
+
+void DeFormatter::process_data()
+{
+	if (m_Hdr.length != sizeof(m_data))
+	{
+		m_state = Idle;
+	}
+
+	if(m_buf_in->len() < m_Hdr.length)
+	{
+		return;
+	}
+
+	m_buf_in->read(m_data, m_Hdr.length);
+	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)
+	{
+		// Frame is valid
+		if (m_Hdr.type == FRAME_TYPE_DATA)
+		{
+			m_frameStats.numDataBytes += 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;
 }

 // --------------------------------------------------------------