From 1ad20fd4a04dd133f501fda87862a14d73efe8f3 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Wed, 7 Apr 2021 19:02:04 +0100 Subject: [PATCH] Disable packet mode in M17. --- M17RX.cpp | 14 +++++++------- Version.h | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/M17RX.cpp b/M17RX.cpp index fa09084..1e0dc92 100644 --- a/M17RX.cpp +++ b/M17RX.cpp @@ -127,9 +127,9 @@ void CM17RX::processNone(q15_t sample) { bool ret1 = correlateSync(M17_LINK_SETUP_SYNC_SYMBOLS, M17_LINK_SETUP_SYNC_SYMBOLS_VALUES, M17_LINK_SETUP_SYNC_BYTES, MAX_SYNC_SYMBOL_START_ERRS, MAX_SYNC_BIT_START_ERRS); bool ret2 = correlateSync(M17_STREAM_SYNC_SYMBOLS, M17_STREAM_SYNC_SYMBOLS_VALUES, M17_STREAM_SYNC_BYTES, MAX_SYNC_SYMBOL_START_ERRS, MAX_SYNC_BIT_START_ERRS); - bool ret3 = correlateSync(M17_PACKET_SYNC_SYMBOLS, M17_PACKET_SYNC_SYMBOLS_VALUES, M17_PACKET_SYNC_BYTES, MAX_SYNC_SYMBOL_START_ERRS, MAX_SYNC_BIT_START_ERRS); + // bool ret3 = correlateSync(M17_PACKET_SYNC_SYMBOLS, M17_PACKET_SYNC_SYMBOLS_VALUES, M17_PACKET_SYNC_BYTES, MAX_SYNC_SYMBOL_START_ERRS, MAX_SYNC_BIT_START_ERRS); - if (ret1 || ret2 || ret3) { + if (ret1 || ret2 /* || ret3 */ ) { // On the first sync, start the countdown to the state change if (m_countdown == 0U) { m_rssiAccum = 0U; @@ -144,7 +144,7 @@ void CM17RX::processNone(q15_t sample) if (ret1) m_nextState = M17RXS_LINK_SETUP; if (ret2) m_nextState = M17RXS_STREAM; - if (ret3) m_nextState = M17RXS_PACKET; + // if (ret3) m_nextState = M17RXS_PACKET; } } @@ -172,21 +172,21 @@ void CM17RX::processData(q15_t sample) if (m_dataPtr >= m_minSyncPtr && m_dataPtr <= m_maxSyncPtr) { bool ret1 = correlateSync(M17_LINK_SETUP_SYNC_SYMBOLS, M17_LINK_SETUP_SYNC_SYMBOLS_VALUES, M17_LINK_SETUP_SYNC_BYTES, MAX_SYNC_SYMBOL_RUN_ERRS, MAX_SYNC_BIT_RUN_ERRS); bool ret2 = correlateSync(M17_STREAM_SYNC_SYMBOLS, M17_STREAM_SYNC_SYMBOLS_VALUES, M17_STREAM_SYNC_BYTES, MAX_SYNC_SYMBOL_RUN_ERRS, MAX_SYNC_BIT_RUN_ERRS); - bool ret3 = correlateSync(M17_PACKET_SYNC_SYMBOLS, M17_PACKET_SYNC_SYMBOLS_VALUES, M17_PACKET_SYNC_BYTES, MAX_SYNC_SYMBOL_RUN_ERRS, MAX_SYNC_BIT_RUN_ERRS); + // bool ret3 = correlateSync(M17_PACKET_SYNC_SYMBOLS, M17_PACKET_SYNC_SYMBOLS_VALUES, M17_PACKET_SYNC_BYTES, MAX_SYNC_SYMBOL_RUN_ERRS, MAX_SYNC_BIT_RUN_ERRS); if (ret1) m_state = M17RXS_LINK_SETUP; if (ret2) m_state = M17RXS_STREAM; - if (ret3) m_state = M17RXS_PACKET; + // if (ret3) m_state = M17RXS_PACKET; } } else { if (m_dataPtr >= m_minSyncPtr || m_dataPtr <= m_maxSyncPtr) { bool ret1 = correlateSync(M17_LINK_SETUP_SYNC_SYMBOLS, M17_LINK_SETUP_SYNC_SYMBOLS_VALUES, M17_LINK_SETUP_SYNC_BYTES, MAX_SYNC_SYMBOL_RUN_ERRS, MAX_SYNC_BIT_RUN_ERRS); bool ret2 = correlateSync(M17_STREAM_SYNC_SYMBOLS, M17_STREAM_SYNC_SYMBOLS_VALUES, M17_STREAM_SYNC_BYTES, MAX_SYNC_SYMBOL_RUN_ERRS, MAX_SYNC_BIT_RUN_ERRS); - bool ret3 = correlateSync(M17_PACKET_SYNC_SYMBOLS, M17_PACKET_SYNC_SYMBOLS_VALUES, M17_PACKET_SYNC_BYTES, MAX_SYNC_SYMBOL_RUN_ERRS, MAX_SYNC_BIT_RUN_ERRS); + // bool ret3 = correlateSync(M17_PACKET_SYNC_SYMBOLS, M17_PACKET_SYNC_SYMBOLS_VALUES, M17_PACKET_SYNC_BYTES, MAX_SYNC_SYMBOL_RUN_ERRS, MAX_SYNC_BIT_RUN_ERRS); if (ret1) m_state = M17RXS_LINK_SETUP; if (ret2) m_state = M17RXS_STREAM; - if (ret3) m_state = M17RXS_PACKET; + // if (ret3) m_state = M17RXS_PACKET; } } diff --git a/Version.h b/Version.h index 31dea88..4be44b1 100644 --- a/Version.h +++ b/Version.h @@ -19,7 +19,7 @@ #if !defined(VERSION_H) #define VERSION_H -#define VERSION "20210314" +#define VERSION "20210407" #endif