From bb9fe7f5611dea18313acd416f66651b9396722a Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Fri, 23 Oct 2020 14:43:06 +0100 Subject: [PATCH 01/26] Initial work on M17 support. ADF7021 parameters not correct or complete yet. --- ADF7021.cpp | 64 +++++++++++++- ADF7021.h | 15 ++++ Config.h | 3 + Globals.h | 9 +- IO.cpp | 30 ++++++- IO.h | 8 +- M17Defines.h | 47 ++++++++++ M17RX.cpp | 137 ++++++++++++++++++++++++++++++ M17RX.h | 51 +++++++++++ M17TX.cpp | 124 +++++++++++++++++++++++++++ M17TX.h | 50 +++++++++++ MMDVM_HS.cpp | 9 +- MMDVM_HS.ino | 9 +- SerialPort.cpp | 117 +++++++++++++++++++++---- SerialPort.h | 5 +- configs/D2RG_MMDVM_HS.h | 3 + configs/MMDVM_HS_Dual_Hat-12mhz.h | 3 + configs/MMDVM_HS_Dual_Hat.h | 3 + configs/MMDVM_HS_Hat-12mhz.h | 3 + configs/MMDVM_HS_Hat.h | 3 + configs/NanoDV_NPI.h | 3 + configs/NanoDV_USB.h | 3 + configs/Nano_hotSPOT.h | 3 + configs/ZUMspot_Libre.h | 3 + configs/ZUMspot_RPi.h | 3 + configs/ZUMspot_USB.h | 3 + configs/ZUMspot_dualband.h | 3 + configs/ZUMspot_duplex.h | 3 + configs/generic_duplex_gpio.h | 3 + configs/generic_duplex_usb.h | 3 + configs/generic_gpio.h | 3 + version.h | 2 +- 32 files changed, 702 insertions(+), 26 deletions(-) create mode 100644 M17Defines.h create mode 100644 M17RX.cpp create mode 100644 M17RX.h create mode 100644 M17TX.cpp create mode 100644 M17TX.h diff --git a/ADF7021.cpp b/ADF7021.cpp index 6ccfc07..da5c403 100644 --- a/ADF7021.cpp +++ b/ADF7021.cpp @@ -1,4 +1,5 @@ /* + * Copyright (C) 2020 by Jonathan Naylor G4KLX * Copyright (C) 2016 by Jim McLaughlin KI6ZUM * Copyright (C) 2016,2017,2018,2019 by Andy Uribe CA6JAU * Copyright (C) 2017 by Danilo DB4PLE @@ -48,6 +49,7 @@ uint16_t m_dmrDev; uint16_t m_ysfDev; uint16_t m_p25Dev; uint16_t m_nxdnDev; +uint16_t m_m17Dev; uint16_t m_pocsagDev; static void Send_AD7021_control_shift() @@ -273,6 +275,9 @@ void CIO::ifConf(MMDVM_STATE modemState, bool reset) case STATE_NXDN: AFC_OFFSET = AFC_OFFSET_NXDN; break; + case STATE_M17: + AFC_OFFSET = AFC_OFFSET_M17; + break; default: break; } @@ -499,6 +504,33 @@ void CIO::ifConf(MMDVM_STATE modemState, bool reset) #endif break; + case STATE_M17: + // Dev: +1 symb 600 Hz, symb rate = 4800 + + ADF7021_REG3 = ADF7021_REG3_M17; + ADF7021_REG10 = ADF7021_REG10_M17; + + // K=32 + ADF7021_REG4 = (uint32_t) 0b0100 << 0; // register 4 + ADF7021_REG4 |= (uint32_t) 0b011 << 4; // mode, 4FSK + ADF7021_REG4 |= (uint32_t) 0b0 << 7; + ADF7021_REG4 |= (uint32_t) 0b11 << 8; + ADF7021_REG4 |= (uint32_t) ADF7021_DISC_BW_M17 << 10; // Disc BW + ADF7021_REG4 |= (uint32_t) ADF7021_POST_BW_M17 << 20; // Post dem BW + ADF7021_REG4 |= (uint32_t) 0b00 << 30; // IF filter (12.5 kHz) + + ADF7021_REG13 = (uint32_t) 0b1101 << 0; // register 13 + ADF7021_REG13 |= (uint32_t) ADF7021_SLICER_TH_M17 << 4; // slicer threshold + + ADF7021_REG2 = (uint32_t) 0b10 << 28; // invert data (and RC alpha = 0.5) + ADF7021_REG2 |= (uint32_t) (m_m17Dev / div2) << 19; // deviation +#if defined(ADF7021_DISABLE_RC_4FSK) + ADF7021_REG2 |= (uint32_t) 0b011 << 4; // modulation (4FSK) +#else + ADF7021_REG2 |= (uint32_t) 0b111 << 4; // modulation (RC 4FSK) +#endif + break; + default: break; } @@ -721,6 +753,29 @@ void CIO::ifConf2(MMDVM_STATE modemState) ADF7021_REG2 |= (uint32_t) 0b111 << 4; // modulation (RC 4FSK) break; + case STATE_M17: + // Dev: +1 symb 600 Hz, symb rate = 4800 + + ADF7021_REG3 = ADF7021_REG3_M17; + ADF7021_REG10 = ADF7021_REG10_M17; + + // K=32 + ADF7021_REG4 = (uint32_t) 0b0100 << 0; // register 4 + ADF7021_REG4 |= (uint32_t) 0b011 << 4; // mode, 4FSK + ADF7021_REG4 |= (uint32_t) 0b0 << 7; + ADF7021_REG4 |= (uint32_t) 0b11 << 8; + ADF7021_REG4 |= (uint32_t) ADF7021_DISC_BW_M17 << 10; // Disc BW + ADF7021_REG4 |= (uint32_t) ADF7021_POST_BW_M17 << 20; // Post dem BW + ADF7021_REG4 |= (uint32_t) 0b00 << 30; // IF filter (12.5 kHz) + + ADF7021_REG13 = (uint32_t) 0b1101 << 0; // register 13 + ADF7021_REG13 |= (uint32_t) ADF7021_SLICER_TH_M17 << 4; // slicer threshold + + ADF7021_REG2 = (uint32_t) 0b10 << 28; // invert data (and RC alpha = 0.5) + ADF7021_REG2 |= (uint32_t) (m_m17Dev / div2) << 19; // deviation + ADF7021_REG2 |= (uint32_t) 0b111 << 4; // modulation (RC 4FSK) + break; + default: break; } @@ -959,7 +1014,7 @@ void CIO::setPower(uint8_t power) m_power = power >> 2; } -void CIO::setDeviations(uint8_t dstarTXLevel, uint8_t dmrTXLevel, uint8_t ysfTXLevel, uint8_t p25TXLevel, uint8_t nxdnTXLevel, uint8_t pocsagTXLevel, bool ysfLoDev) +void CIO::setDeviations(uint8_t dstarTXLevel, uint8_t dmrTXLevel, uint8_t ysfTXLevel, uint8_t p25TXLevel, uint8_t nxdnTXLevel, uint8_t m17TXLevel, uint8_t pocsagTXLevel, bool ysfLoDev) { m_dstarDev = uint16_t((ADF7021_DEV_DSTAR * uint16_t(dstarTXLevel)) / 128U); m_dmrDev = uint16_t((ADF7021_DEV_DMR * uint16_t(dmrTXLevel)) / 128U); @@ -971,6 +1026,7 @@ void CIO::setDeviations(uint8_t dstarTXLevel, uint8_t dmrTXLevel, uint8_t ysfTXL m_p25Dev = uint16_t((ADF7021_DEV_P25 * uint16_t(p25TXLevel)) / 128U); m_nxdnDev = uint16_t((ADF7021_DEV_NXDN * uint16_t(nxdnTXLevel)) / 128U); + m_m17Dev = uint16_t((ADF7021_DEV_M17 * uint16_t(m17TXLevel)) / 128U); m_pocsagDev = uint16_t((ADF7021_DEV_POCSAG * uint16_t(pocsagTXLevel)) / 128U); } @@ -1090,6 +1146,11 @@ uint16_t CIO::devNXDN() return (uint16_t)((ADF7021_PFD * m_nxdnDev) / (f_div * 65536)); } +uint16_t CIO::devM17() +{ + return (uint16_t)((ADF7021_PFD * m_m17Dev) / (f_div * 65536)); +} + uint16_t CIO::devPOCSAG() { return (uint16_t)((ADF7021_PFD * m_pocsagDev) / (f_div * 65536)); @@ -1106,6 +1167,7 @@ void CIO::printConf() DEBUG2("YSF +1 sym dev (Hz):", devYSF()); DEBUG2("P25 +1 sym dev (Hz):", devP25()); DEBUG2("NXDN +1 sym dev (Hz):", devNXDN()); + DEBUG2("M17 +1 sym dev (Hz):", devM17()); DEBUG2("POCSAG dev (Hz):", devPOCSAG()); } diff --git a/ADF7021.h b/ADF7021.h index 19a2bb0..cd28ba6 100644 --- a/ADF7021.h +++ b/ADF7021.h @@ -87,6 +87,7 @@ www.analog.com/media/en/technical-documentation/data-sheets/ADF7021.pdf #define ADF7021_DEV_P25 22U #endif #define ADF7021_DEV_NXDN 13U +#define ADF7021_DEV_M17 23U // XXX FIXME #define ADF7021_DEV_POCSAG 160U // TX/RX CLOCK register (REG 03) @@ -97,12 +98,14 @@ www.analog.com/media/en/technical-documentation/data-sheets/ADF7021.pdf #define ADF7021_REG3_YSF_H 0x2A4C0493 #define ADF7021_REG3_P25 0x2A4C04D3 #define ADF7021_REG3_NXDN 0x2A4C04D3 +#define ADF7021_REG3_M17 0x2A4C04D3 // XXX FIXME #else #define ADF7021_REG3_DMR 0x2A4C80D3 #define ADF7021_REG3_YSF_L 0x2A4C80D3 #define ADF7021_REG3_YSF_H 0x2A4CC093 #define ADF7021_REG3_P25 0x2A4C80D3 #define ADF7021_REG3_NXDN 0x2A4CC113 +#define ADF7021_REG3_M17 0x2A4C80D3 // XXX FIXME #endif #define ADF7021_REG3_POCSAG 0x2A4F0093 @@ -139,26 +142,31 @@ www.analog.com/media/en/technical-documentation/data-sheets/ADF7021.pdf #define ADF7021_REG10_YSF 0x01FE473A #define ADF7021_REG10_P25 0x01FE473A #define ADF7021_REG10_NXDN 0x01FE473A +#define ADF7021_REG10_M17 0x01FE473A #if defined(ADF7021_AFC_POS) #define AFC_OFFSET_DMR -250 #define AFC_OFFSET_YSF -250 #define AFC_OFFSET_P25 -250 #define AFC_OFFSET_NXDN -250 +#define AFC_OFFSET_M17 -250 #else #define AFC_OFFSET_DMR 250 #define AFC_OFFSET_YSF 250 #define AFC_OFFSET_P25 250 #define AFC_OFFSET_NXDN 250 +#define AFC_OFFSET_M17 250 #endif #else #define ADF7021_REG10_DMR 0x049E472A #define ADF7021_REG10_YSF 0x049E472A #define ADF7021_REG10_P25 0x049E472A #define ADF7021_REG10_NXDN 0x049E472A +#define ADF7021_REG10_M17 0x049E472A #define AFC_OFFSET_DMR 0 #define AFC_OFFSET_YSF 0 #define AFC_OFFSET_P25 0 #define AFC_OFFSET_NXDN 0 +#define AFC_OFFSET_M17 0 #endif /****** Support for 12.2880 MHz TCXO ******/ @@ -198,12 +206,14 @@ www.analog.com/media/en/technical-documentation/data-sheets/ADF7021.pdf #define ADF7021_REG3_YSF_H 0x29EC0493 #define ADF7021_REG3_P25 0x29EC0493 #define ADF7021_REG3_NXDN 0x29EC0493 +#define ADF7021_REG3_M17 0x29EC0493 #else #define ADF7021_REG3_DMR 0x29ECA093 #define ADF7021_REG3_YSF_L 0x29ECA093 #define ADF7021_REG3_YSF_H 0x29ECA093 #define ADF7021_REG3_P25 0x29ECA093 #define ADF7021_REG3_NXDN 0x29ECA113 +#define ADF7021_REG3_M17 0x29ECA093 #endif #define ADF7021_REG3_POCSAG 0x29EE8093 @@ -240,26 +250,31 @@ www.analog.com/media/en/technical-documentation/data-sheets/ADF7021.pdf #define ADF7021_REG10_YSF 0x01FE557A #define ADF7021_REG10_P25 0x01FE557A #define ADF7021_REG10_NXDN 0x01FE557A +#define ADF7021_REG10_M17 0x01FE557A #if defined(ADF7021_AFC_POS) #define AFC_OFFSET_DMR -250 #define AFC_OFFSET_YSF -250 #define AFC_OFFSET_P25 -250 #define AFC_OFFSET_NXDN -250 +#define AFC_OFFSET_M17 -250 #else #define AFC_OFFSET_DMR 250 #define AFC_OFFSET_YSF 250 #define AFC_OFFSET_P25 250 #define AFC_OFFSET_NXDN 250 +#define AFC_OFFSET_M17 250 #endif #else #define ADF7021_REG10_DMR 0x049E556A #define ADF7021_REG10_YSF 0x049E556A #define ADF7021_REG10_P25 0x049E556A #define ADF7021_REG10_NXDN 0x049E556A +#define ADF7021_REG10_M17 0x049E556A #define AFC_OFFSET_DMR 0 #define AFC_OFFSET_YSF 0 #define AFC_OFFSET_P25 0 #define AFC_OFFSET_NXDN 0 +#define AFC_OFFSET_M17 0 #endif #endif diff --git a/Config.h b/Config.h index 842d5df..faa6ee1 100644 --- a/Config.h +++ b/Config.h @@ -93,6 +93,9 @@ // Use the YSF and P25 LEDs for NXDN // #define USE_ALTERNATE_NXDN_LEDS +// Use the D-Star and P25 LEDs for M17 +// #define USE_ALTERNATE_M17_LEDS + // Use the D-Star and DMR LEDs for POCSAG // #define USE_ALTERNATE_POCSAG_LEDS diff --git a/Globals.h b/Globals.h index ffc0ad8..1bd5356 100644 --- a/Globals.h +++ b/Globals.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015,2016 by Jonathan Naylor G4KLX + * Copyright (C) 2015,2016,2020 by Jonathan Naylor G4KLX * Copyright (C) 2016,2017,2018,2019 by Andy Uribe CA6JAU * Copyright (C) 2019 by Florian Wolters DF2ET * @@ -42,6 +42,7 @@ enum MMDVM_STATE { STATE_P25 = 4, STATE_NXDN = 5, STATE_POCSAG = 6, + STATE_M17 = 7, // Dummy states start at 90 STATE_DMRDMO1K = 92, @@ -77,6 +78,8 @@ const uint8_t MARK_NONE = 0x00U; #include "YSFTX.h" #include "P25RX.h" #include "P25TX.h" +#include "M17RX.h" +#include "M17TX.h" #include "NXDNRX.h" #include "NXDNTX.h" #include "POCSAGTX.h" @@ -103,6 +106,7 @@ extern bool m_dmrEnable; extern bool m_ysfEnable; extern bool m_p25Enable; extern bool m_nxdnEnable; +extern bool m_m17Enable; extern bool m_pocsagEnable; extern bool m_duplex; @@ -133,6 +137,9 @@ extern CYSFTX ysfTX; extern CP25RX p25RX; extern CP25TX p25TX; +extern CM17RX m17RX; +extern CM17TX m17TX; + extern CNXDNRX nxdnRX; extern CNXDNTX nxdnTX; diff --git a/IO.cpp b/IO.cpp index 805c21e..8c25acc 100644 --- a/IO.cpp +++ b/IO.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015,2016 by Jonathan Naylor G4KLX + * Copyright (C) 2015,2016,2020 by Jonathan Naylor G4KLX * Copyright (C) 2016,2017,2018 by Andy Uribe CA6JAU * Copyright (C) 2017 by Danilo DB4PLE @@ -51,6 +51,7 @@ m_int2counter(0U) YSF_pin(LOW); P25_pin(LOW); NXDN_pin(LOW); + M17_pin(LOW); POCSAG_pin(LOW); COS_pin(LOW); DEB_pin(LOW); @@ -89,6 +90,7 @@ void CIO::selfTest() YSF_pin(ledValue); P25_pin(ledValue); NXDN_pin(ledValue); + M17_pin(ledValue); POCSAG_pin(ledValue); COS_pin(ledValue); @@ -111,7 +113,7 @@ void CIO::process() if (m_started) { // Two seconds timeout if (m_watchdog >= 19200U) { - if (m_modemState == STATE_DSTAR || m_modemState == STATE_DMR || m_modemState == STATE_YSF || m_modemState == STATE_P25 || m_modemState == STATE_NXDN) { + if (m_modemState == STATE_DSTAR || m_modemState == STATE_DMR || m_modemState == STATE_YSF || m_modemState == STATE_P25 || m_modemState == STATE_NXDN || m_modemState == STATE_M17) { m_modemState = STATE_IDLE; setMode(m_modemState); } @@ -178,6 +180,8 @@ void CIO::process() scantime = SCAN_TIME; else if(m_modemState_prev == STATE_NXDN) scantime = SCAN_TIME; + else if(m_modemState_prev == STATE_M17) + scantime = SCAN_TIME; else scantime = SCAN_TIME; @@ -221,6 +225,9 @@ void CIO::process() case STATE_NXDN: nxdnRX.databit(bit); break; + case STATE_M17: + m17RX.databit(bit); + break; default: break; } @@ -252,6 +259,10 @@ void CIO::start() m_Modes[m_TotalModes] = STATE_NXDN; m_TotalModes++; } + if(m_m17Enable) { + m_Modes[m_TotalModes] = STATE_M17; + m_TotalModes++; + } #if defined(ENABLE_SCAN_MODE) if(m_TotalModes > 1U) @@ -412,6 +423,14 @@ void CIO::setMode(MMDVM_STATE modemState) #if defined(USE_ALTERNATE_NXDN_LEDS) } #endif +#if defined(USE_ALTERNATE_M17_LEDS) + if (modemState != STATE_M17) { +#endif + YSF_pin(modemState == STATE_DSTAR); + P25_pin(modemState == STATE_P25); +#if defined(USE_ALTERNATE_M17_LEDS) + } +#endif #if defined(USE_ALTERNATE_NXDN_LEDS) if (modemState != STATE_YSF && modemState != STATE_P25) { #endif @@ -426,6 +445,13 @@ void CIO::setMode(MMDVM_STATE modemState) #if defined(USE_ALTERNATE_POCSAG_LEDS) } #endif +#if defined(USE_ALTERNATE_M17_LEDS) + if (modemState != STATE_DSTAR && modemState != STATE_P25) { +#endif + M17_pin(modemState == STATE_M17); +#if defined(USE_ALTERNATE_M17_LEDS) + } +#endif } void CIO::setDecode(bool dcd) diff --git a/IO.h b/IO.h index fac37fe..5fec7fd 100644 --- a/IO.h +++ b/IO.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015,2016 by Jonathan Naylor G4KLX + * Copyright (C) 2015,2016,2020 by Jonathan Naylor G4KLX * Copyright (C) 2016,2017,2018 by Andy Uribe CA6JAU * Copyright (C) 2017 by Danilo DB4PLE @@ -98,6 +98,7 @@ public: void YSF_pin(bool on); void P25_pin(bool on); void NXDN_pin(bool on); + void M17_pin(bool on); void POCSAG_pin(bool on); void COS_pin(bool on); void interrupt(void); @@ -141,7 +142,7 @@ public: #endif void start(void); void startInt(void); - void setDeviations(uint8_t dstarTXLevel, uint8_t dmrTXLevel, uint8_t ysfTXLevel, uint8_t p25TXLevel, uint8_t nxdnTXLevel, uint8_t pocsagTXLevel, bool ysfLoDev); + void setDeviations(uint8_t dstarTXLevel, uint8_t dmrTXLevel, uint8_t ysfTXLevel, uint8_t p25TXLevel, uint8_t nxdnTXLevel, uint8_t m17TXLevel, uint8_t pocsagTXLevel, bool ysfLoDev); void updateCal(void); #if defined(SEND_RSSI_DATA) @@ -162,6 +163,7 @@ public: uint16_t devYSF(void); uint16_t devP25(void); uint16_t devNXDN(void); + uint16_t devM17(void); uint16_t devPOCSAG(void); void printConf(); #endif @@ -181,7 +183,7 @@ private: uint32_t m_scanPauseCnt; uint8_t m_scanPos; uint8_t m_TotalModes; - MMDVM_STATE m_Modes[5]; + MMDVM_STATE m_Modes[6]; bool m_ledValue; volatile uint32_t m_watchdog; volatile uint16_t m_int1counter; diff --git a/M17Defines.h b/M17Defines.h new file mode 100644 index 0000000..4947341 --- /dev/null +++ b/M17Defines.h @@ -0,0 +1,47 @@ +/* + * Copyright (C) 2016,2017,2018,2020 by Jonathan Naylor G4KLX + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#if !defined(M17DEFINES_H) +#define M17DEFINES_H + +const unsigned int M17_RADIO_SYMBOL_LENGTH = 5U; // At 24 kHz sample rate + +const unsigned int M17_FRAME_LENGTH_BITS = 384U; +const unsigned int M17_FRAME_LENGTH_BYTES = M17_FRAME_LENGTH_BITS / 8U; +const unsigned int M17_FRAME_LENGTH_SYMBOLS = M17_FRAME_LENGTH_BITS / 2U; +const unsigned int M17_FRAME_LENGTH_SAMPLES = M17_FRAME_LENGTH_SYMBOLS * M17_RADIO_SYMBOL_LENGTH; + +const unsigned int M17_SYNC_LENGTH_BITS = 16U; +const unsigned int M17_SYNC_LENGTH_SYMBOLS = M17_SYNC_LENGTH_BITS / 2U; +const unsigned int M17_SYNC_LENGTH_SAMPLES = M17_SYNC_LENGTH_SYMBOLS * M17_RADIO_SYMBOL_LENGTH; + +const uint8_t M17_SYNC_BYTES[] = {0x32U, 0x43U}; +const uint8_t M17_SYNC_BYTES_LENGTH = 2U; + +const uint16_t M17_SYNC_BITS = 0x3243U; + +// 3 2 4 3 +// 00 11 00 10 01 00 00 11 +// +1 -3 +1 -1 +3 +1 +1 -3 + +const int8_t M17_SYNC_SYMBOLS_VALUES[] = {+1, -3, +1, -1, +3, +1, +1, -3}; + +const uint8_t M17_SYNC_SYMBOLS = 0xAEU; + +#endif + diff --git a/M17RX.cpp b/M17RX.cpp new file mode 100644 index 0000000..78c21f6 --- /dev/null +++ b/M17RX.cpp @@ -0,0 +1,137 @@ +/* + * Copyright (C) 2009-2017,2018,2020 by Jonathan Naylor G4KLX + * Copyright (C) 2016,2017,2018 by Andy Uribe CA6JAU + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include "Config.h" +#include "Globals.h" +#include "M17RX.h" +#include "Utils.h" + +const uint8_t MAX_SYNC_BIT_START_ERRS = 0U; +const uint8_t MAX_SYNC_BIT_RUN_ERRS = 2U; + +const unsigned int MAX_SYNC_FRAMES = 5U + 1U; + +const uint8_t BIT_MASK_TABLE[] = {0x80U, 0x40U, 0x20U, 0x10U, 0x08U, 0x04U, 0x02U, 0x01U}; + +#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]) + +CM17RX::CM17RX() : +m_state(M17RXS_NONE), +m_bitBuffer(0x00U), +m_outBuffer(), +m_buffer(NULL), +m_bufferPtr(0U), +m_lostCount(0U) +{ + m_buffer = m_outBuffer + 1U; +} + +void CM17RX::reset() +{ + m_state = M17RXS_NONE; + m_bitBuffer = 0x00U; + m_bufferPtr = 0U; + m_lostCount = 0U; +} + +void CM17RX::databit(bool bit) +{ + if (m_state == M17RXS_NONE) + processNone(bit); + else + processData(bit); +} + +void CM17RX::processNone(bool bit) +{ + m_bitBuffer <<= 1; + if (bit) + m_bitBuffer |= 0x01U; + + // Fuzzy matching of the data sync bit sequence + if (countBits32(m_bitBuffer ^ M17_SYNC_BITS) <= MAX_SYNC_BIT_START_ERRS) { + DEBUG1("M17RX: sync found in None"); + for (uint8_t i = 0U; i < M17_SYNC_BYTES_LENGTH; i++) + m_buffer[i] = M17_SYNC_BYTES[i]; + + m_lostCount = MAX_SYNC_FRAMES; + m_bufferPtr = M17_SYNC_LENGTH_BITS; + m_state = M17RXS_DATA; + + io.setDecode(true); + } + +} + +void CM17RX::processData(bool bit) +{ + m_bitBuffer <<= 1; + if (bit) + m_bitBuffer |= 0x01U; + + WRITE_BIT1(m_buffer, m_bufferPtr, bit); + + m_bufferPtr++; + if (m_bufferPtr > M17_FRAME_LENGTH_BITS) + reset(); + + // Only search for a sync in the right place +-2 symbols + if (m_bufferPtr >= (M17_SYNC_LENGTH_BITS - 2U) && m_bufferPtr <= (M17_SYNC_LENGTH_BITS + 2U)) { + // Fuzzy matching of the data sync bit sequence + if (countBits32(m_bitBuffer ^ M17_SYNC_BITS) <= MAX_SYNC_BIT_RUN_ERRS) { + DEBUG2("M17RX: found sync in Data, pos", m_bufferPtr - M17_SYNC_LENGTH_BITS); + m_lostCount = MAX_SYNC_FRAMES; + m_bufferPtr = M17_SYNC_LENGTH_BITS; + } + } + + // Send a data frame to the host if the required number of bits have been received + if (m_bufferPtr == M17_FRAME_LENGTH_BITS) { + // We've not seen a data sync for too long, signal RXLOST and change to RX_NONE + m_lostCount--; + if (m_lostCount == 0U) { + DEBUG1("M17RX: sync timed out, lost lock"); + io.setDecode(false); + serial.writeM17Lost(); + reset(); + } else { + // Write data to host + m_outBuffer[0U] = m_lostCount == (MAX_SYNC_FRAMES - 1U) ? 0x01U : 0x00U; + writeRSSIData(m_outBuffer); + + // Start the next frame + ::memset(m_outBuffer, 0x00U, M17_FRAME_LENGTH_BYTES + 3U); + m_bufferPtr = 0U; + } + } +} + +void CM17RX::writeRSSIData(uint8_t* data) +{ +#if defined(SEND_RSSI_DATA) + uint16_t rssi = io.readRSSI(); + + data[49U] = (rssi >> 8) & 0xFFU; + data[50U] = (rssi >> 0) & 0xFFU; + + serial.writeM17Data(data, M17_FRAME_LENGTH_BYTES + 3U); +#else + serial.writeM17Data(data, M17_FRAME_LENGTH_BYTES + 1U); +#endif +} diff --git a/M17RX.h b/M17RX.h new file mode 100644 index 0000000..9ec7976 --- /dev/null +++ b/M17RX.h @@ -0,0 +1,51 @@ +/* + * Copyright (C) 2015,2016,2017,2018,2020 by Jonathan Naylor G4KLX + * Copyright (C) 2016,2017,2018 by Andy Uribe CA6JAU + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#if !defined(M17RX_H) +#define M17RX_H + +#include "M17Defines.h" + +enum M17RX_STATE { + M17RXS_NONE, + M17RXS_DATA +}; + +class CM17RX { +public: + CM17RX(); + + void databit(bool bit); + + void reset(); + +private: + M17RX_STATE m_state; + uint32_t m_bitBuffer; + uint8_t m_outBuffer[M17_FRAME_LENGTH_BYTES + 3U]; + uint8_t* m_buffer; + uint16_t m_bufferPtr; + uint16_t m_lostCount; + + void processNone(bool bit); + void processData(bool bit); + void writeRSSIData(uint8_t* data); +}; + +#endif diff --git a/M17TX.cpp b/M17TX.cpp new file mode 100644 index 0000000..4123ed5 --- /dev/null +++ b/M17TX.cpp @@ -0,0 +1,124 @@ +/* + * Copyright (C) 2009-2018,2020 by Jonathan Naylor G4KLX + * Copyright (C) 2017 by Andy Uribe CA6JAU + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include "Config.h" +#include "Globals.h" +#include "M17TX.h" + +#include "M17Defines.h" + +const uint8_t M17_SYNC = 0x77U; +const uint8_t M17_PREAMBLE = 0x77U; + +CM17TX::CM17TX() : +m_buffer(1500U), +m_poBuffer(), +m_poLen(0U), +m_poPtr(0U), +m_txDelay(240U), // 200ms +m_delay(false) +{ +} + +void CM17TX::process() +{ + if (m_buffer.getData() == 0U && m_poLen == 0U) + return; + + if (m_poLen == 0U) { + if (!m_tx) { + m_delay = true; + m_poLen = m_txDelay; + } else { + m_delay = false; + for (uint8_t i = 0U; i < M17_FRAME_LENGTH_BYTES; i++) + m_poBuffer[m_poLen++] = m_buffer.get(); + } + + m_poPtr = 0U; + } + + if (m_poLen > 0U) { + uint16_t space = io.getSpace(); + + while (space > 8U) { + if (m_delay) { + writeByte(M17_SYNC); + m_poPtr++; + } else + writeByte(m_poBuffer[m_poPtr++]); + + space -= 8U; + + if (m_poPtr >= m_poLen) { + if (m_delay) { + m_delay = false; + m_poPtr = 0U; + m_poLen = 3U; + } else { + m_poPtr = 0U; + m_poLen = 0U; + m_delay = false; + return; + } + } + } + } +} + +uint8_t CM17TX::writeData(const uint8_t* data, uint8_t length) +{ + if (length != (M17_FRAME_LENGTH_BYTES + 1U)) + return 4U; + + uint16_t space = m_buffer.getSpace(); + if (space < M17_FRAME_LENGTH_BYTES) + return 5U; + + for (uint8_t i = 0U; i < M17_FRAME_LENGTH_BYTES; i++) + m_buffer.put(data[i + 1U]); + + return 0U; +} + +void CM17TX::writeByte(uint8_t c) +{ + uint8_t bit; + uint8_t mask = 0x80U; + + for (uint8_t i = 0U; i < 8U; i++, c <<= 1) { + if ((c & mask) == mask) + bit = 1U; + else + bit = 0U; + + io.write(&bit, 1); + } +} + +void CM17TX::setTXDelay(uint8_t delay) +{ + m_txDelay = 600U + uint16_t(delay) * 12U; // 500ms + tx delay +} + +uint8_t CM17TX::getSpace() const +{ + return m_buffer.getSpace() / M17_FRAME_LENGTH_BYTES; +} + diff --git a/M17TX.h b/M17TX.h new file mode 100644 index 0000000..799794f --- /dev/null +++ b/M17TX.h @@ -0,0 +1,50 @@ +/* + * Copyright (C) 2015,2016,2017,2020 by Jonathan Naylor G4KLX + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#if !defined(M17TX_H) +#define M17TX_H + +#include "Config.h" + +#include "SerialRB.h" + +class CM17TX { +public: + CM17TX(); + + uint8_t writeData(const uint8_t* data, uint8_t length); + + void process(); + + void setTXDelay(uint8_t delay); + + uint8_t getSpace() const; + +private: + CSerialRB m_buffer; + uint8_t m_poBuffer[1200U]; + uint16_t m_poLen; + uint16_t m_poPtr; + uint16_t m_txDelay; + bool m_delay; + + void writeByte(uint8_t c); +}; + +#endif + diff --git a/MMDVM_HS.cpp b/MMDVM_HS.cpp index cd61683..aa6944c 100644 --- a/MMDVM_HS.cpp +++ b/MMDVM_HS.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015,2016 by Jonathan Naylor G4KLX + * Copyright (C) 2015,2016,2020 by Jonathan Naylor G4KLX * Copyright (C) 2016 by Mathis Schmieder DB9MAT * Copyright (C) 2016 by Colin Durbridge G4EML * Copyright (C) 2016,2017,2018,2019 by Andy Uribe CA6JAU @@ -43,6 +43,7 @@ bool m_dmrEnable = true; bool m_ysfEnable = true; bool m_p25Enable = true; bool m_nxdnEnable = true; +bool m_m17Enable = true; bool m_pocsagEnable = true; bool m_duplex = false; @@ -70,6 +71,9 @@ CYSFTX ysfTX; CP25RX p25RX; CP25TX p25TX; +CM17RX m17RX; +CM17TX m17TX; + CNXDNRX nxdnRX; CNXDNTX nxdnTX; @@ -125,6 +129,9 @@ void loop() if (m_nxdnEnable && m_modemState == STATE_NXDN) nxdnTX.process(); + if (m_m17Enable && m_modemState == STATE_M17) + m17TX.process(); + if (m_pocsagEnable && (m_modemState == STATE_POCSAG || pocsagTX.busy())) pocsagTX.process(); diff --git a/MMDVM_HS.ino b/MMDVM_HS.ino index 7d55012..a302968 100644 --- a/MMDVM_HS.ino +++ b/MMDVM_HS.ino @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015,2016 by Jonathan Naylor G4KLX + * Copyright (C) 2015,2016,2020 by Jonathan Naylor G4KLX * Copyright (C) 2016 by Colin Durbridge G4EML * Copyright (C) 2016,2017 by Andy Uribe CA6JAU * @@ -38,6 +38,7 @@ bool m_dmrEnable = true; bool m_ysfEnable = true; bool m_p25Enable = true; bool m_nxdnEnable = true; +bool m_m17Enable = true; bool m_pocsagEnable = true; bool m_duplex = false; @@ -65,6 +66,9 @@ CYSFTX ysfTX; CP25RX p25RX; CP25TX p25TX; +CM17RX m17RX; +CM17TX m17TX; + CNXDNRX nxdnRX; CNXDNTX nxdnTX; @@ -115,6 +119,9 @@ void loop() if (m_nxdnEnable && m_modemState == STATE_NXDN) nxdnTX.process(); + if (m_m17Enable && m_modemState == STATE_M17) + m17TX.process(); + if (m_pocsagEnable && (m_modemState == STATE_POCSAG || pocsagTX.busy())) pocsagTX.process(); diff --git a/SerialPort.cpp b/SerialPort.cpp index 1d5ff50..bd936c6 100644 --- a/SerialPort.cpp +++ b/SerialPort.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013,2015,2016,2018 by Jonathan Naylor G4KLX + * Copyright (C) 2013,2015,2016,2018,2020 by Jonathan Naylor G4KLX * Copyright (C) 2016 by Colin Durbridge G4EML * Copyright (C) 2016,2017,2018,2019 by Andy Uribe CA6JAU * Copyright (C) 2019 by Florian Wolters DF2ET @@ -60,6 +60,9 @@ const uint8_t MMDVM_P25_LOST = 0x32U; const uint8_t MMDVM_NXDN_DATA = 0x40U; const uint8_t MMDVM_NXDN_LOST = 0x41U; +const uint8_t MMDVM_M17_DATA = 0x45U; +const uint8_t MMDVM_M17_LOST = 0x46U; + const uint8_t MMDVM_POCSAG_DATA = 0x50U; const uint8_t MMDVM_ACK = 0x70U; @@ -126,7 +129,7 @@ void CSerialPort::getStatus() // Send all sorts of interesting internal values reply[0U] = MMDVM_FRAME_START; - reply[1U] = 13U; + reply[1U] = 14U; reply[2U] = MMDVM_GET_STATUS; reply[3U] = 0x00U; @@ -142,6 +145,8 @@ void CSerialPort::getStatus() reply[3U] |= 0x10U; if (m_pocsagEnable) reply[3U] |= 0x20U; + if (m_m17Enable) + reply[3U] |= 0x80U; reply[4U] = uint8_t(m_modemState); @@ -196,7 +201,12 @@ void CSerialPort::getStatus() else reply[12U] = 0U; - writeInt(1U, reply, 13); + if (m_m17Enable) + reply[13U] = m17TX.getSpace(); + else + reply[13U] = 0U; + + writeInt(1U, reply, 14); } void CSerialPort::getVersion() @@ -226,7 +236,7 @@ void CSerialPort::getVersion() uint8_t CSerialPort::setConfig(const uint8_t* data, uint8_t length) { - if (length < 13U) + if (length < 23U) return 4U; bool ysfLoDev = (data[0U] & 0x08U) == 0x08U; @@ -240,6 +250,7 @@ uint8_t CSerialPort::setConfig(const uint8_t* data, uint8_t length) bool p25Enable = (data[1U] & 0x08U) == 0x08U; bool nxdnEnable = (data[1U] & 0x10U) == 0x10U; bool pocsagEnable = (data[1U] & 0x20U) == 0x20U; + bool m17Enable = (data[1U] & 0x80U) == 0x80U; uint8_t txDelay = data[2U]; if (txDelay > 50U) @@ -247,7 +258,7 @@ uint8_t CSerialPort::setConfig(const uint8_t* data, uint8_t length) MMDVM_STATE modemState = MMDVM_STATE(data[3U]); - if (modemState != STATE_IDLE && modemState != STATE_DSTAR && modemState != STATE_DMR && modemState != STATE_YSF && modemState != STATE_P25 && modemState != STATE_NXDN && modemState != STATE_POCSAG && modemState != STATE_DSTARCAL && modemState != STATE_DMRCAL && modemState != STATE_DMRDMO1K && modemState != STATE_INTCAL && modemState != STATE_RSSICAL && modemState != STATE_POCSAGCAL) + if (modemState != STATE_IDLE && modemState != STATE_DSTAR && modemState != STATE_DMR && modemState != STATE_YSF && modemState != STATE_P25 && modemState != STATE_NXDN && modemState != STATE_M17 && modemState != STATE_POCSAG && modemState != STATE_DSTARCAL && modemState != STATE_DMRCAL && modemState != STATE_DMRDMO1K && modemState != STATE_INTCAL && modemState != STATE_RSSICAL && modemState != STATE_POCSAGCAL) return 4U; if (modemState == STATE_DSTAR && !dstarEnable) return 4U; @@ -261,6 +272,8 @@ uint8_t CSerialPort::setConfig(const uint8_t* data, uint8_t length) return 4U; if (modemState == STATE_POCSAG && !pocsagEnable) return 4U; + if (modemState == STATE_M17 && !m17Enable) + return 4U; uint8_t colorCode = data[6U]; if (colorCode > 15U) @@ -276,22 +289,18 @@ uint8_t CSerialPort::setConfig(const uint8_t* data, uint8_t length) uint8_t dmrTXLevel = data[10U]; uint8_t ysfTXLevel = data[11U]; uint8_t p25TXLevel = data[12U]; - uint8_t nxdnTXLevel = 128U; - uint8_t pocsagTXLevel = 128U; + uint8_t nxdnTXLevel = data[15U]; + uint8_t pocsagTXLevel = data[17U]; + uint8_t m17TXLevel = data[21U]; - if (length >= 16U) - nxdnTXLevel = data[15U]; - - if (length >= 18U) - pocsagTXLevel = data[17U]; - - io.setDeviations(dstarTXLevel, dmrTXLevel, ysfTXLevel, p25TXLevel, nxdnTXLevel, pocsagTXLevel, ysfLoDev); + io.setDeviations(dstarTXLevel, dmrTXLevel, ysfTXLevel, p25TXLevel, nxdnTXLevel, m17TXLevel, pocsagTXLevel, ysfLoDev); m_dstarEnable = dstarEnable; m_dmrEnable = dmrEnable; m_ysfEnable = ysfEnable; m_p25Enable = p25Enable; m_nxdnEnable = nxdnEnable; + m_m17Enable = m17Enable; m_pocsagEnable = pocsagEnable; if (modemState == STATE_DMRCAL || modemState == STATE_DMRDMO1K || modemState == STATE_RSSICAL || modemState == STATE_INTCAL) { @@ -332,6 +341,7 @@ uint8_t CSerialPort::setConfig(const uint8_t* data, uint8_t length) ysfTX.setTXDelay(txDelay); p25TX.setTXDelay(txDelay); nxdnTX.setTXDelay(txDelay); + m17TX.setTXDelay(txDelay); pocsagTX.setTXDelay(txDelay); dmrDMOTX.setTXDelay(txDelay); @@ -357,6 +367,8 @@ uint8_t CSerialPort::setConfig(const uint8_t* data, uint8_t length) io.ifConf(STATE_P25, true); else if(m_nxdnEnable) io.ifConf(STATE_NXDN, true); + else if(m_m17Enable) + io.ifConf(STATE_M17, true); else if(m_pocsagEnable) io.ifConf(STATE_POCSAG, true); } @@ -383,7 +395,7 @@ uint8_t CSerialPort::setMode(const uint8_t* data, uint8_t length) if (modemState == m_modemState) return 0U; - if (modemState != STATE_IDLE && modemState != STATE_DSTAR && modemState != STATE_DMR && modemState != STATE_YSF && modemState != STATE_P25 && modemState != STATE_NXDN && modemState != STATE_POCSAG && modemState != STATE_DSTARCAL && modemState != STATE_DMRCAL && modemState != STATE_DMRDMO1K && modemState != STATE_RSSICAL && modemState != STATE_INTCAL && modemState != STATE_POCSAGCAL) + if (modemState != STATE_IDLE && modemState != STATE_DSTAR && modemState != STATE_DMR && modemState != STATE_YSF && modemState != STATE_P25 && modemState != STATE_NXDN && modemState != STATE_M17 && modemState != STATE_POCSAG && modemState != STATE_DSTARCAL && modemState != STATE_DMRCAL && modemState != STATE_DMRDMO1K && modemState != STATE_RSSICAL && modemState != STATE_INTCAL && modemState != STATE_POCSAGCAL) return 4U; if (modemState == STATE_DSTAR && !m_dstarEnable) return 4U; @@ -395,6 +407,8 @@ uint8_t CSerialPort::setMode(const uint8_t* data, uint8_t length) return 4U; if (modemState == STATE_NXDN && !m_nxdnEnable) return 4U; + if (modemState == STATE_M17 && !m_m17Enable) + return 4U; if (modemState == STATE_POCSAG && !m_pocsagEnable) return 4U; @@ -469,6 +483,7 @@ void CSerialPort::setMode(MMDVM_STATE modemState) ysfRX.reset(); p25RX.reset(); nxdnRX.reset(); + m17RX.reset(); cwIdTX.reset(); break; case STATE_DSTAR: @@ -481,6 +496,7 @@ void CSerialPort::setMode(MMDVM_STATE modemState) ysfRX.reset(); p25RX.reset(); nxdnRX.reset(); + m17RX.reset(); cwIdTX.reset(); break; case STATE_YSF: @@ -493,6 +509,7 @@ void CSerialPort::setMode(MMDVM_STATE modemState) dstarRX.reset(); p25RX.reset(); nxdnRX.reset(); + m17RX.reset(); cwIdTX.reset(); break; case STATE_P25: @@ -505,6 +522,7 @@ void CSerialPort::setMode(MMDVM_STATE modemState) dstarRX.reset(); ysfRX.reset(); nxdnRX.reset(); + m17RX.reset(); cwIdTX.reset(); break; case STATE_NXDN: @@ -517,6 +535,20 @@ void CSerialPort::setMode(MMDVM_STATE modemState) dstarRX.reset(); ysfRX.reset(); p25RX.reset(); + m17RX.reset(); + cwIdTX.reset(); + break; + case STATE_M17: + DEBUG1("Mode set to M17"); +#if defined(DUPLEX) + dmrIdleRX.reset(); + dmrRX.reset(); +#endif + dmrDMORX.reset(); + dstarRX.reset(); + ysfRX.reset(); + p25RX.reset(); + nxdnRX.reset(); cwIdTX.reset(); break; case STATE_POCSAG: @@ -530,6 +562,7 @@ void CSerialPort::setMode(MMDVM_STATE modemState) ysfRX.reset(); p25RX.reset(); nxdnRX.reset(); + m17RX.reset(); cwIdTX.reset(); break; default: @@ -831,6 +864,20 @@ void CSerialPort::process() } break; + case MMDVM_M17_DATA: + if (m_m17Enable) { + if (m_modemState == STATE_IDLE || m_modemState == STATE_M17) + err = m17TX.writeData(m_buffer + 3U, m_len - 3U); + } + if (err == 0U) { + if (m_modemState == STATE_IDLE) + setMode(STATE_M17); + } else { + DEBUG2("Received invalid M17 data", err); + sendNAK(err); + } + break; + case MMDVM_POCSAG_DATA: if (m_pocsagEnable) { if (m_modemState == STATE_IDLE || m_modemState == STATE_POCSAG) { @@ -1186,6 +1233,46 @@ void CSerialPort::writeNXDNLost() writeInt(1U, reply, 3); } +void CSerialPort::writeM17Data(const uint8_t* data, uint8_t length) +{ + if (m_modemState != STATE_M17 && m_modemState != STATE_IDLE) + return; + + if (!m_m17Enable) + return; + + uint8_t reply[130U]; + + reply[0U] = MMDVM_FRAME_START; + reply[1U] = 0U; + reply[2U] = MMDVM_M17_DATA; + + uint8_t count = 3U; + for (uint8_t i = 0U; i < length; i++, count++) + reply[count] = data[i]; + + reply[1U] = count; + + writeInt(1U, reply, count); +} + +void CSerialPort::writeM17Lost() +{ + if (m_modemState != STATE_M17 && m_modemState != STATE_IDLE) + return; + + if (!m_m17Enable) + return; + + uint8_t reply[3U]; + + reply[0U] = MMDVM_FRAME_START; + reply[1U] = 3U; + reply[2U] = MMDVM_M17_LOST; + + writeInt(1U, reply, 3); +} + #if defined(SEND_RSSI_DATA) void CSerialPort::writeRSSIData(const uint8_t* data, uint8_t length) diff --git a/SerialPort.h b/SerialPort.h index 7061b33..c9cbddb 100644 --- a/SerialPort.h +++ b/SerialPort.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015,2016,2018 by Jonathan Naylor G4KLX + * Copyright (C) 2015,2016,2018,2020 by Jonathan Naylor G4KLX * Copyright (C) 2018 by Andy Uribe CA6JAU * * This program is free software; you can redistribute it and/or modify @@ -52,6 +52,9 @@ public: void writeNXDNData(const uint8_t* data, uint8_t length); void writeNXDNLost(); + void writeM17Data(const uint8_t* data, uint8_t length); + void writeM17Lost(); + #if defined(SEND_RSSI_DATA) void writeRSSIData(const uint8_t* data, uint8_t length); #endif diff --git a/configs/D2RG_MMDVM_HS.h b/configs/D2RG_MMDVM_HS.h index 9c55cf2..0a69e69 100644 --- a/configs/D2RG_MMDVM_HS.h +++ b/configs/D2RG_MMDVM_HS.h @@ -93,6 +93,9 @@ // Use the YSF and P25 LEDs for NXDN // #define USE_ALTERNATE_NXDN_LEDS +// Use the D-Star and P25 LEDs for M17 +// #define USE_ALTERNATE_M17_LEDS + // Use the D-Star and DMR LEDs for POCSAG // #define USE_ALTERNATE_POCSAG_LEDS diff --git a/configs/MMDVM_HS_Dual_Hat-12mhz.h b/configs/MMDVM_HS_Dual_Hat-12mhz.h index 88779ef..6fdda74 100644 --- a/configs/MMDVM_HS_Dual_Hat-12mhz.h +++ b/configs/MMDVM_HS_Dual_Hat-12mhz.h @@ -93,6 +93,9 @@ // Use the YSF and P25 LEDs for NXDN // #define USE_ALTERNATE_NXDN_LEDS +// Use the D-Star and P25 LEDs for M17 +// #define USE_ALTERNATE_M17_LEDS + // Use the D-Star and DMR LEDs for POCSAG #define USE_ALTERNATE_POCSAG_LEDS diff --git a/configs/MMDVM_HS_Dual_Hat.h b/configs/MMDVM_HS_Dual_Hat.h index ace2477..d6dfd04 100644 --- a/configs/MMDVM_HS_Dual_Hat.h +++ b/configs/MMDVM_HS_Dual_Hat.h @@ -93,6 +93,9 @@ // Use the YSF and P25 LEDs for NXDN // #define USE_ALTERNATE_NXDN_LEDS +// Use the D-Star and P25 LEDs for M17 +// #define USE_ALTERNATE_M17_LEDS + // Use the D-Star and DMR LEDs for POCSAG #define USE_ALTERNATE_POCSAG_LEDS diff --git a/configs/MMDVM_HS_Hat-12mhz.h b/configs/MMDVM_HS_Hat-12mhz.h index 34d38f2..f5cffff 100644 --- a/configs/MMDVM_HS_Hat-12mhz.h +++ b/configs/MMDVM_HS_Hat-12mhz.h @@ -93,6 +93,9 @@ // Use the YSF and P25 LEDs for NXDN // #define USE_ALTERNATE_NXDN_LEDS +// Use the D-Star and P25 LEDs for M17 +// #define USE_ALTERNATE_M17_LEDS + // Use the D-Star and DMR LEDs for POCSAG #define USE_ALTERNATE_POCSAG_LEDS diff --git a/configs/MMDVM_HS_Hat.h b/configs/MMDVM_HS_Hat.h index 643a817..a1d3cea 100644 --- a/configs/MMDVM_HS_Hat.h +++ b/configs/MMDVM_HS_Hat.h @@ -93,6 +93,9 @@ // Use the YSF and P25 LEDs for NXDN // #define USE_ALTERNATE_NXDN_LEDS +// Use the D-Star and P25 LEDs for M17 +// #define USE_ALTERNATE_M17_LEDS + // Use the D-Star and DMR LEDs for POCSAG #define USE_ALTERNATE_POCSAG_LEDS diff --git a/configs/NanoDV_NPI.h b/configs/NanoDV_NPI.h index 8f987d7..c5b5769 100644 --- a/configs/NanoDV_NPI.h +++ b/configs/NanoDV_NPI.h @@ -93,6 +93,9 @@ // Use the YSF and P25 LEDs for NXDN // #define USE_ALTERNATE_NXDN_LEDS +// Use the D-Star and P25 LEDs for M17 +// #define USE_ALTERNATE_M17_LEDS + // Use the D-Star and DMR LEDs for POCSAG // #define USE_ALTERNATE_POCSAG_LEDS diff --git a/configs/NanoDV_USB.h b/configs/NanoDV_USB.h index ce20034..c539483 100644 --- a/configs/NanoDV_USB.h +++ b/configs/NanoDV_USB.h @@ -93,6 +93,9 @@ // Use the YSF and P25 LEDs for NXDN // #define USE_ALTERNATE_NXDN_LEDS +// Use the D-Star and P25 LEDs for M17 +// #define USE_ALTERNATE_M17_LEDS + // Use the D-Star and DMR LEDs for POCSAG // #define USE_ALTERNATE_POCSAG_LEDS diff --git a/configs/Nano_hotSPOT.h b/configs/Nano_hotSPOT.h index 187cab6..0d99096 100644 --- a/configs/Nano_hotSPOT.h +++ b/configs/Nano_hotSPOT.h @@ -93,6 +93,9 @@ // Use the YSF and P25 LEDs for NXDN // #define USE_ALTERNATE_NXDN_LEDS +// Use the D-Star and P25 LEDs for M17 +// #define USE_ALTERNATE_M17_LEDS + // Use the D-Star and DMR LEDs for POCSAG // #define USE_ALTERNATE_POCSAG_LEDS diff --git a/configs/ZUMspot_Libre.h b/configs/ZUMspot_Libre.h index 842d5df..faa6ee1 100644 --- a/configs/ZUMspot_Libre.h +++ b/configs/ZUMspot_Libre.h @@ -93,6 +93,9 @@ // Use the YSF and P25 LEDs for NXDN // #define USE_ALTERNATE_NXDN_LEDS +// Use the D-Star and P25 LEDs for M17 +// #define USE_ALTERNATE_M17_LEDS + // Use the D-Star and DMR LEDs for POCSAG // #define USE_ALTERNATE_POCSAG_LEDS diff --git a/configs/ZUMspot_RPi.h b/configs/ZUMspot_RPi.h index f7cd5f6..dd86a47 100644 --- a/configs/ZUMspot_RPi.h +++ b/configs/ZUMspot_RPi.h @@ -93,6 +93,9 @@ // Use the YSF and P25 LEDs for NXDN // #define USE_ALTERNATE_NXDN_LEDS +// Use the D-Star and P25 LEDs for M17 +// #define USE_ALTERNATE_M17_LEDS + // Use the D-Star and DMR LEDs for POCSAG // #define USE_ALTERNATE_POCSAG_LEDS diff --git a/configs/ZUMspot_USB.h b/configs/ZUMspot_USB.h index b055bfb..a2e2a16 100644 --- a/configs/ZUMspot_USB.h +++ b/configs/ZUMspot_USB.h @@ -92,6 +92,9 @@ // Use the YSF and P25 LEDs for NXDN // #define USE_ALTERNATE_NXDN_LEDS +// Use the D-Star and P25 LEDs for M17 +// #define USE_ALTERNATE_M17_LEDS + // Use the D-Star and DMR LEDs for POCSAG // #define USE_ALTERNATE_POCSAG_LEDS diff --git a/configs/ZUMspot_dualband.h b/configs/ZUMspot_dualband.h index d974f08..162478f 100644 --- a/configs/ZUMspot_dualband.h +++ b/configs/ZUMspot_dualband.h @@ -91,6 +91,9 @@ // Use the YSF and P25 LEDs for NXDN // #define USE_ALTERNATE_NXDN_LEDS +// Use the D-Star and P25 LEDs for M17 +// #define USE_ALTERNATE_M17_LEDS + // Use the D-Star and DMR LEDs for POCSAG // #define USE_ALTERNATE_POCSAG_LEDS diff --git a/configs/ZUMspot_duplex.h b/configs/ZUMspot_duplex.h index 80da2c5..e837fbc 100644 --- a/configs/ZUMspot_duplex.h +++ b/configs/ZUMspot_duplex.h @@ -93,6 +93,9 @@ // Use the YSF and P25 LEDs for NXDN // #define USE_ALTERNATE_NXDN_LEDS +// Use the D-Star and P25 LEDs for M17 +// #define USE_ALTERNATE_M17_LEDS + // Use the D-Star and DMR LEDs for POCSAG // #define USE_ALTERNATE_POCSAG_LEDS diff --git a/configs/generic_duplex_gpio.h b/configs/generic_duplex_gpio.h index 96428b9..d8f1d1c 100644 --- a/configs/generic_duplex_gpio.h +++ b/configs/generic_duplex_gpio.h @@ -93,6 +93,9 @@ // Use the YSF and P25 LEDs for NXDN // #define USE_ALTERNATE_NXDN_LEDS +// Use the D-Star and P25 LEDs for M17 +// #define USE_ALTERNATE_M17_LEDS + // Use the D-Star and DMR LEDs for POCSAG // #define USE_ALTERNATE_POCSAG_LEDS diff --git a/configs/generic_duplex_usb.h b/configs/generic_duplex_usb.h index b1e7b74..4789c55 100644 --- a/configs/generic_duplex_usb.h +++ b/configs/generic_duplex_usb.h @@ -93,6 +93,9 @@ // Use the YSF and P25 LEDs for NXDN // #define USE_ALTERNATE_NXDN_LEDS +// Use the D-Star and P25 LEDs for M17 +// #define USE_ALTERNATE_M17_LEDS + // Use the D-Star and DMR LEDs for POCSAG // #define USE_ALTERNATE_POCSAG_LEDS diff --git a/configs/generic_gpio.h b/configs/generic_gpio.h index e946f12..eb93ed1 100644 --- a/configs/generic_gpio.h +++ b/configs/generic_gpio.h @@ -93,6 +93,9 @@ // Use the YSF and P25 LEDs for NXDN // #define USE_ALTERNATE_NXDN_LEDS +// Use the D-Star and P25 LEDs for M17 +// #define USE_ALTERNATE_M17_LEDS + // Use the D-Star and DMR LEDs for POCSAG // #define USE_ALTERNATE_POCSAG_LEDS diff --git a/version.h b/version.h index 7b8019f..531c923 100644 --- a/version.h +++ b/version.h @@ -25,7 +25,7 @@ #define VER_MAJOR "1" #define VER_MINOR "5" #define VER_REV "1b" -#define VERSION_DATE "20191201" +#define VERSION_DATE "20201023" #if defined(ZUMSPOT_ADF7021) #define BOARD_INFO "ZUMspot" From fc9cb227f3fc9a5a0ad825a23bce29d4d59b33f0 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Fri, 23 Oct 2020 17:05:16 +0100 Subject: [PATCH 02/26] Add M17 LED support. --- ADF7021.h | 19 +++++++++++++------ IOSTM.cpp | 27 +++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 6 deletions(-) diff --git a/ADF7021.h b/ADF7021.h index cd28ba6..7508439 100644 --- a/ADF7021.h +++ b/ADF7021.h @@ -117,6 +117,7 @@ www.analog.com/media/en/technical-documentation/data-sheets/ADF7021.pdf #define ADF7021_DISC_BW_YSF_H 516U // K=28 #define ADF7021_DISC_BW_P25 394U // K=32 #define ADF7021_DISC_BW_NXDN 295U // K=32 +#define ADF7021_DISC_BW_M17 393U // XXX FIXME #define ADF7021_DISC_BW_POCSAG 406U // K=22 // Post demodulator bandwith (REG 04) @@ -125,6 +126,7 @@ www.analog.com/media/en/technical-documentation/data-sheets/ADF7021.pdf #define ADF7021_POST_BW_YSF 20U #define ADF7021_POST_BW_P25 6U #define ADF7021_POST_BW_NXDN 7U +#define ADF7021_POST_BW_M17 7U // XXX FIXME #define ADF7021_POST_BW_POCSAG 1U // IF filter (REG 05) @@ -142,7 +144,7 @@ www.analog.com/media/en/technical-documentation/data-sheets/ADF7021.pdf #define ADF7021_REG10_YSF 0x01FE473A #define ADF7021_REG10_P25 0x01FE473A #define ADF7021_REG10_NXDN 0x01FE473A -#define ADF7021_REG10_M17 0x01FE473A +#define ADF7021_REG10_M17 0x01FE473A // XXX FIXME #if defined(ADF7021_AFC_POS) #define AFC_OFFSET_DMR -250 #define AFC_OFFSET_YSF -250 @@ -161,7 +163,7 @@ www.analog.com/media/en/technical-documentation/data-sheets/ADF7021.pdf #define ADF7021_REG10_YSF 0x049E472A #define ADF7021_REG10_P25 0x049E472A #define ADF7021_REG10_NXDN 0x049E472A -#define ADF7021_REG10_M17 0x049E472A +#define ADF7021_REG10_M17 0x049E472A // XXX FIXME #define AFC_OFFSET_DMR 0 #define AFC_OFFSET_YSF 0 #define AFC_OFFSET_P25 0 @@ -196,6 +198,7 @@ www.analog.com/media/en/technical-documentation/data-sheets/ADF7021.pdf #define ADF7021_DEV_P25 13U #endif #define ADF7021_DEV_NXDN 8U +#define ADF7021_DEV_M17 14U // XXX FIXME #define ADF7021_DEV_POCSAG 96U // TX/RX CLOCK register (REG 03) @@ -206,14 +209,14 @@ www.analog.com/media/en/technical-documentation/data-sheets/ADF7021.pdf #define ADF7021_REG3_YSF_H 0x29EC0493 #define ADF7021_REG3_P25 0x29EC0493 #define ADF7021_REG3_NXDN 0x29EC0493 -#define ADF7021_REG3_M17 0x29EC0493 +#define ADF7021_REG3_M17 0x29EC0493 // XXX FIXME #else #define ADF7021_REG3_DMR 0x29ECA093 #define ADF7021_REG3_YSF_L 0x29ECA093 #define ADF7021_REG3_YSF_H 0x29ECA093 #define ADF7021_REG3_P25 0x29ECA093 #define ADF7021_REG3_NXDN 0x29ECA113 -#define ADF7021_REG3_M17 0x29ECA093 +#define ADF7021_REG3_M17 0x29ECA093 // XXX FIXME #endif #define ADF7021_REG3_POCSAG 0x29EE8093 @@ -225,6 +228,7 @@ www.analog.com/media/en/technical-documentation/data-sheets/ADF7021.pdf #define ADF7021_DISC_BW_YSF_H 430U // K=28 #define ADF7021_DISC_BW_P25 493U // K=32 #define ADF7021_DISC_BW_NXDN 246U // K=32 +#define ADF7021_DISC_BW_M17 393U // XXX FIXME #define ADF7021_DISC_BW_POCSAG 338U // K=22 // Post demodulator bandwith (REG 04) @@ -233,6 +237,7 @@ www.analog.com/media/en/technical-documentation/data-sheets/ADF7021.pdf #define ADF7021_POST_BW_YSF 20U #define ADF7021_POST_BW_P25 6U #define ADF7021_POST_BW_NXDN 8U +#define ADF7021_POST_BW_M17 7U // XXX FIXME #define ADF7021_POST_BW_POCSAG 1U // IF filter (REG 05) @@ -250,7 +255,7 @@ www.analog.com/media/en/technical-documentation/data-sheets/ADF7021.pdf #define ADF7021_REG10_YSF 0x01FE557A #define ADF7021_REG10_P25 0x01FE557A #define ADF7021_REG10_NXDN 0x01FE557A -#define ADF7021_REG10_M17 0x01FE557A +#define ADF7021_REG10_M17 0x01FE557A // XXX FIXME #if defined(ADF7021_AFC_POS) #define AFC_OFFSET_DMR -250 #define AFC_OFFSET_YSF -250 @@ -269,7 +274,7 @@ www.analog.com/media/en/technical-documentation/data-sheets/ADF7021.pdf #define ADF7021_REG10_YSF 0x049E556A #define ADF7021_REG10_P25 0x049E556A #define ADF7021_REG10_NXDN 0x049E556A -#define ADF7021_REG10_M17 0x049E556A +#define ADF7021_REG10_M17 0x049E556A // XXX FIXME #define AFC_OFFSET_DMR 0 #define AFC_OFFSET_YSF 0 #define AFC_OFFSET_P25 0 @@ -288,6 +293,7 @@ www.analog.com/media/en/technical-documentation/data-sheets/ADF7021.pdf #define ADF7021_SLICER_TH_YSF_H 69U #define ADF7021_SLICER_TH_P25 43U #define ADF7021_SLICER_TH_NXDN 26U +#define ADF7021_SLICER_TH_M17 26U // XXX FIXME #else @@ -297,6 +303,7 @@ www.analog.com/media/en/technical-documentation/data-sheets/ADF7021.pdf #define ADF7021_SLICER_TH_YSF_H 75U #define ADF7021_SLICER_TH_P25 47U #define ADF7021_SLICER_TH_NXDN 26U +#define ADF7021_SLICER_TH_M17 26U // XXX FIXME #endif diff --git a/IOSTM.cpp b/IOSTM.cpp index 208cdeb..2d31f83 100644 --- a/IOSTM.cpp +++ b/IOSTM.cpp @@ -1,4 +1,5 @@ /* + * Copyright (C) 2020 by Jonathan Naylor G4KLX * Copyright (C) 2016 by Jim McLaughlin KI6ZUM * Copyright (C) 2016,2017,2018,2019 by Andy Uribe CA6JAU * Copyright (C) 2017 by Danilo DB4PLE @@ -83,6 +84,10 @@ #define PIN_NXDN_LED GPIO_Pin_8 #define PORT_NXDN_LED GPIOA +// XXX FIXME +#define PIN_M17_LED GPIO_Pin_8 +#define PORT_M17_LED GPIOA + #define PIN_POCSAG_LED GPIO_Pin_5 #define PORT_POCSAG_LED GPIOA @@ -173,6 +178,14 @@ #endif #define PORT_NXDN_LED GPIOA +// XXX FIXME +#if defined(STM32_USB_HOST) +#define PIN_M17_LED GPIO_Pin_1 +#else +#define PIN_M17_LED GPIO_Pin_7 +#endif +#define PORT_M17_LED GPIOA + #define PIN_POCSAG_LED GPIO_Pin_5 #define PORT_POCSAG_LED GPIOA @@ -248,6 +261,10 @@ #define PIN_NXDN_LED GPIO_Pin_8 #define PORT_NXDN_LED GPIOA +// XXX FIXME +#define PIN_M17_LED GPIO_Pin_8 +#define PORT_M17_LED GPIOA + #define PIN_POCSAG_LED GPIO_Pin_7 #define PORT_POCSAG_LED GPIOA @@ -734,6 +751,16 @@ void CIO::NXDN_pin(bool on) #endif } +void CIO::M17_pin(bool on) +{ +#if defined(USE_ALTERNATE_M17_LEDS) + GPIO_WriteBit(PORT_DSTAR_LED, PIN_DSTAR_LED, on ? Bit_SET : Bit_RESET); + GPIO_WriteBit(PORT_P25_LED, PIN_P25_LED, on ? Bit_SET : Bit_RESET); +#else + GPIO_WriteBit(PORT_M17_LED, PIN_M17_LED, on ? Bit_SET : Bit_RESET); +#endif +} + void CIO::POCSAG_pin(bool on) { #if defined(USE_ALTERNATE_POCSAG_LEDS) From 3f83f671a35054129fb48acb66e4c9f6625cd7b7 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Fri, 23 Oct 2020 18:10:53 +0100 Subject: [PATCH 03/26] Fix the synchronisation processing for M17. --- ADF7021.cpp | 4 ++-- ADF7021.h | 10 +++++----- M17Defines.h | 12 ------------ M17RX.cpp | 4 ++-- M17RX.h | 2 +- Utils.cpp | 11 ++++++++++- Utils.h | 4 +++- 7 files changed, 23 insertions(+), 24 deletions(-) diff --git a/ADF7021.cpp b/ADF7021.cpp index da5c403..156a7b1 100644 --- a/ADF7021.cpp +++ b/ADF7021.cpp @@ -505,7 +505,7 @@ void CIO::ifConf(MMDVM_STATE modemState, bool reset) break; case STATE_M17: - // Dev: +1 symb 600 Hz, symb rate = 4800 + // Dev: +1 symb 2400 Hz, symb rate = 4800 ADF7021_REG3 = ADF7021_REG3_M17; ADF7021_REG10 = ADF7021_REG10_M17; @@ -754,7 +754,7 @@ void CIO::ifConf2(MMDVM_STATE modemState) break; case STATE_M17: - // Dev: +1 symb 600 Hz, symb rate = 4800 + // Dev: +1 symb 2400 Hz, symb rate = 4800 ADF7021_REG3 = ADF7021_REG3_M17; ADF7021_REG10 = ADF7021_REG10_M17; diff --git a/ADF7021.h b/ADF7021.h index 7508439..5323bba 100644 --- a/ADF7021.h +++ b/ADF7021.h @@ -87,7 +87,7 @@ www.analog.com/media/en/technical-documentation/data-sheets/ADF7021.pdf #define ADF7021_DEV_P25 22U #endif #define ADF7021_DEV_NXDN 13U -#define ADF7021_DEV_M17 23U // XXX FIXME +#define ADF7021_DEV_M17 28U // XXX FIXME #define ADF7021_DEV_POCSAG 160U // TX/RX CLOCK register (REG 03) @@ -117,7 +117,7 @@ www.analog.com/media/en/technical-documentation/data-sheets/ADF7021.pdf #define ADF7021_DISC_BW_YSF_H 516U // K=28 #define ADF7021_DISC_BW_P25 394U // K=32 #define ADF7021_DISC_BW_NXDN 295U // K=32 -#define ADF7021_DISC_BW_M17 393U // XXX FIXME +#define ADF7021_DISC_BW_M17 459U // XXX FIXME #define ADF7021_DISC_BW_POCSAG 406U // K=22 // Post demodulator bandwith (REG 04) @@ -126,7 +126,7 @@ www.analog.com/media/en/technical-documentation/data-sheets/ADF7021.pdf #define ADF7021_POST_BW_YSF 20U #define ADF7021_POST_BW_P25 6U #define ADF7021_POST_BW_NXDN 7U -#define ADF7021_POST_BW_M17 7U // XXX FIXME +#define ADF7021_POST_BW_M17 20U // XXX FIXME #define ADF7021_POST_BW_POCSAG 1U // IF filter (REG 05) @@ -198,7 +198,7 @@ www.analog.com/media/en/technical-documentation/data-sheets/ADF7021.pdf #define ADF7021_DEV_P25 13U #endif #define ADF7021_DEV_NXDN 8U -#define ADF7021_DEV_M17 14U // XXX FIXME +#define ADF7021_DEV_M17 17U // XXX FIXME #define ADF7021_DEV_POCSAG 96U // TX/RX CLOCK register (REG 03) @@ -237,7 +237,7 @@ www.analog.com/media/en/technical-documentation/data-sheets/ADF7021.pdf #define ADF7021_POST_BW_YSF 20U #define ADF7021_POST_BW_P25 6U #define ADF7021_POST_BW_NXDN 8U -#define ADF7021_POST_BW_M17 7U // XXX FIXME +#define ADF7021_POST_BW_M17 20U // XXX FIXME #define ADF7021_POST_BW_POCSAG 1U // IF filter (REG 05) diff --git a/M17Defines.h b/M17Defines.h index 4947341..776bf8e 100644 --- a/M17Defines.h +++ b/M17Defines.h @@ -23,25 +23,13 @@ const unsigned int M17_RADIO_SYMBOL_LENGTH = 5U; // At 24 kHz sample rate const unsigned int M17_FRAME_LENGTH_BITS = 384U; const unsigned int M17_FRAME_LENGTH_BYTES = M17_FRAME_LENGTH_BITS / 8U; -const unsigned int M17_FRAME_LENGTH_SYMBOLS = M17_FRAME_LENGTH_BITS / 2U; -const unsigned int M17_FRAME_LENGTH_SAMPLES = M17_FRAME_LENGTH_SYMBOLS * M17_RADIO_SYMBOL_LENGTH; const unsigned int M17_SYNC_LENGTH_BITS = 16U; -const unsigned int M17_SYNC_LENGTH_SYMBOLS = M17_SYNC_LENGTH_BITS / 2U; -const unsigned int M17_SYNC_LENGTH_SAMPLES = M17_SYNC_LENGTH_SYMBOLS * M17_RADIO_SYMBOL_LENGTH; const uint8_t M17_SYNC_BYTES[] = {0x32U, 0x43U}; const uint8_t M17_SYNC_BYTES_LENGTH = 2U; const uint16_t M17_SYNC_BITS = 0x3243U; -// 3 2 4 3 -// 00 11 00 10 01 00 00 11 -// +1 -3 +1 -1 +3 +1 +1 -3 - -const int8_t M17_SYNC_SYMBOLS_VALUES[] = {+1, -3, +1, -1, +3, +1, +1, -3}; - -const uint8_t M17_SYNC_SYMBOLS = 0xAEU; - #endif diff --git a/M17RX.cpp b/M17RX.cpp index 78c21f6..b00ebc6 100644 --- a/M17RX.cpp +++ b/M17RX.cpp @@ -65,7 +65,7 @@ void CM17RX::processNone(bool bit) m_bitBuffer |= 0x01U; // Fuzzy matching of the data sync bit sequence - if (countBits32(m_bitBuffer ^ M17_SYNC_BITS) <= MAX_SYNC_BIT_START_ERRS) { + if (countBits16(m_bitBuffer ^ M17_SYNC_BITS) <= MAX_SYNC_BIT_START_ERRS) { DEBUG1("M17RX: sync found in None"); for (uint8_t i = 0U; i < M17_SYNC_BYTES_LENGTH; i++) m_buffer[i] = M17_SYNC_BYTES[i]; @@ -94,7 +94,7 @@ void CM17RX::processData(bool bit) // Only search for a sync in the right place +-2 symbols if (m_bufferPtr >= (M17_SYNC_LENGTH_BITS - 2U) && m_bufferPtr <= (M17_SYNC_LENGTH_BITS + 2U)) { // Fuzzy matching of the data sync bit sequence - if (countBits32(m_bitBuffer ^ M17_SYNC_BITS) <= MAX_SYNC_BIT_RUN_ERRS) { + if (countBits16(m_bitBuffer ^ M17_SYNC_BITS) <= MAX_SYNC_BIT_RUN_ERRS) { DEBUG2("M17RX: found sync in Data, pos", m_bufferPtr - M17_SYNC_LENGTH_BITS); m_lostCount = MAX_SYNC_FRAMES; m_bufferPtr = M17_SYNC_LENGTH_BITS; diff --git a/M17RX.h b/M17RX.h index 9ec7976..8448179 100644 --- a/M17RX.h +++ b/M17RX.h @@ -37,7 +37,7 @@ public: private: M17RX_STATE m_state; - uint32_t m_bitBuffer; + uint16_t m_bitBuffer; uint8_t m_outBuffer[M17_FRAME_LENGTH_BYTES + 3U]; uint8_t* m_buffer; uint16_t m_bufferPtr; diff --git a/Utils.cpp b/Utils.cpp index 03b2258..61a3423 100644 --- a/Utils.cpp +++ b/Utils.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 by Jonathan Naylor G4KLX + * Copyright (C) 2015,2020 by Jonathan Naylor G4KLX * Copyright (C) 2017 by Andy Uribe CA6JAU * * This program is free software; you can redistribute it and/or modify @@ -31,6 +31,15 @@ uint8_t countBits8(uint8_t bits) return BITS_TABLE[bits]; } +uint8_t countBits16(uint16_t bits) +{ + uint8_t* p = (uint8_t*)&bits; + uint8_t n = 0U; + n += BITS_TABLE[p[0U]]; + n += BITS_TABLE[p[1U]]; + return n; +} + uint8_t countBits32(uint32_t bits) { uint8_t* p = (uint8_t*)&bits; diff --git a/Utils.h b/Utils.h index 4ab35b7..c51043f 100644 --- a/Utils.h +++ b/Utils.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015,2016 by Jonathan Naylor G4KLX + * Copyright (C) 2015,2016,2020 by Jonathan Naylor G4KLX * Copyright (C) 2017 by Andy Uribe CA6JAU * * This program is free software; you can redistribute it and/or modify @@ -34,6 +34,8 @@ uint8_t countBits8(uint8_t bits); +uint8_t countBits16(uint16_t bits); + uint8_t countBits32(uint32_t bits); uint8_t countBits64(uint64_t bits); From dc2171bef7f0c7837420e53ae085459da9f8dae1 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Sun, 25 Oct 2020 14:07:40 +0000 Subject: [PATCH 04/26] Update the ADF7021 parameters for M17. --- ADF7021.cpp | 4 ++-- ADF7021.h | 29 +++++++++++++++-------------- version.h | 2 +- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/ADF7021.cpp b/ADF7021.cpp index 156a7b1..e7e44b1 100644 --- a/ADF7021.cpp +++ b/ADF7021.cpp @@ -424,7 +424,7 @@ void CIO::ifConf(MMDVM_STATE modemState, bool reset) break; case STATE_YSF: - // Dev: +1 symb 900 Hz, symb rate = 4800 + // Dev: +1 symb 2700/900 Hz, symb rate = 4800 ADF7021_REG3 = (m_LoDevYSF ? ADF7021_REG3_YSF_L : ADF7021_REG3_YSF_H); ADF7021_REG10 = ADF7021_REG10_YSF; @@ -685,7 +685,7 @@ void CIO::ifConf2(MMDVM_STATE modemState) break; case STATE_YSF: - // Dev: +1 symb 900 Hz, symb rate = 4800 + // Dev: +1 symb 2700/900 Hz, symb rate = 4800 ADF7021_REG3 = (m_LoDevYSF ? ADF7021_REG3_YSF_L : ADF7021_REG3_YSF_H); ADF7021_REG10 = ADF7021_REG10_YSF; diff --git a/ADF7021.h b/ADF7021.h index 5323bba..76d0893 100644 --- a/ADF7021.h +++ b/ADF7021.h @@ -1,4 +1,5 @@ /* + * Copyright (C) 2020 by Jonathan Naylor G4KLX * Copyright (C) 2016 by Jim McLaughlin KI6ZUM * Copyright (C) 2016,2017,2018 by Andy Uribe CA6JAU * Copyright (C) 2017 by Danilo DB4PLE @@ -52,7 +53,7 @@ www.analog.com/media/en/technical-documentation/data-sheets/ADF7021.pdf // Support for ADF7021-N version: // #define ADF7021_N_VER -// Enable AFC support for DMR, YSF and P25 (experimental): +// Enable AFC support for DMR, YSF, P25, and M17 (experimental): // (AFC is already enabled by default in D-Star) // #define ADF7021_ENABLE_4FSK_AFC @@ -65,7 +66,7 @@ www.analog.com/media/en/technical-documentation/data-sheets/ADF7021.pdf // R = 4 // DEMOD_CLK = 2.4576 MHz (DSTAR) // DEMOD_CLK = 4.9152 MHz (DMR, YSF_L, P25) -// DEMOD_CLK = 7.3728 MHz (YSF_H) +// DEMOD_CLK = 7.3728 MHz (YSF_H, M17) // DEMOD CLK = 3.6864 MHz (NXDN) // DEMOD_CLK = 7.3728 MHz (POCSAG) #define ADF7021_PFD 3686400.0 @@ -87,7 +88,7 @@ www.analog.com/media/en/technical-documentation/data-sheets/ADF7021.pdf #define ADF7021_DEV_P25 22U #endif #define ADF7021_DEV_NXDN 13U -#define ADF7021_DEV_M17 28U // XXX FIXME +#define ADF7021_DEV_M17 28U #define ADF7021_DEV_POCSAG 160U // TX/RX CLOCK register (REG 03) @@ -98,7 +99,7 @@ www.analog.com/media/en/technical-documentation/data-sheets/ADF7021.pdf #define ADF7021_REG3_YSF_H 0x2A4C0493 #define ADF7021_REG3_P25 0x2A4C04D3 #define ADF7021_REG3_NXDN 0x2A4C04D3 -#define ADF7021_REG3_M17 0x2A4C04D3 // XXX FIXME +#define ADF7021_REG3_M17 0x2A4C04D3 #else #define ADF7021_REG3_DMR 0x2A4C80D3 #define ADF7021_REG3_YSF_L 0x2A4C80D3 @@ -117,7 +118,7 @@ www.analog.com/media/en/technical-documentation/data-sheets/ADF7021.pdf #define ADF7021_DISC_BW_YSF_H 516U // K=28 #define ADF7021_DISC_BW_P25 394U // K=32 #define ADF7021_DISC_BW_NXDN 295U // K=32 -#define ADF7021_DISC_BW_M17 459U // XXX FIXME +#define ADF7021_DISC_BW_M17 393U // K=32 XXX FIXME #define ADF7021_DISC_BW_POCSAG 406U // K=22 // Post demodulator bandwith (REG 04) @@ -144,7 +145,7 @@ www.analog.com/media/en/technical-documentation/data-sheets/ADF7021.pdf #define ADF7021_REG10_YSF 0x01FE473A #define ADF7021_REG10_P25 0x01FE473A #define ADF7021_REG10_NXDN 0x01FE473A -#define ADF7021_REG10_M17 0x01FE473A // XXX FIXME +#define ADF7021_REG10_M17 0x01FE473A #if defined(ADF7021_AFC_POS) #define AFC_OFFSET_DMR -250 #define AFC_OFFSET_YSF -250 @@ -163,7 +164,7 @@ www.analog.com/media/en/technical-documentation/data-sheets/ADF7021.pdf #define ADF7021_REG10_YSF 0x049E472A #define ADF7021_REG10_P25 0x049E472A #define ADF7021_REG10_NXDN 0x049E472A -#define ADF7021_REG10_M17 0x049E472A // XXX FIXME +#define ADF7021_REG10_M17 0x049E472A #define AFC_OFFSET_DMR 0 #define AFC_OFFSET_YSF 0 #define AFC_OFFSET_P25 0 @@ -176,7 +177,7 @@ www.analog.com/media/en/technical-documentation/data-sheets/ADF7021.pdf // R = 2 // DEMOD_CLK = 2.4576 MHz (DSTAR) -// DEMOD_CLK = 6.1440 MHz (DMR, YSF_H, YSF_L, P25) +// DEMOD_CLK = 6.1440 MHz (DMR, YSF_H, YSF_L, P25, M17) // DEMOD_CLK = 3.0720 MHz (NXDN) // DEMOD_CLK = 6.1440 MHz (POCSAG) #define ADF7021_PFD 6144000.0 @@ -198,7 +199,7 @@ www.analog.com/media/en/technical-documentation/data-sheets/ADF7021.pdf #define ADF7021_DEV_P25 13U #endif #define ADF7021_DEV_NXDN 8U -#define ADF7021_DEV_M17 17U // XXX FIXME +#define ADF7021_DEV_M17 17U #define ADF7021_DEV_POCSAG 96U // TX/RX CLOCK register (REG 03) @@ -209,14 +210,14 @@ www.analog.com/media/en/technical-documentation/data-sheets/ADF7021.pdf #define ADF7021_REG3_YSF_H 0x29EC0493 #define ADF7021_REG3_P25 0x29EC0493 #define ADF7021_REG3_NXDN 0x29EC0493 -#define ADF7021_REG3_M17 0x29EC0493 // XXX FIXME +#define ADF7021_REG3_M17 0x29EC0493 #else #define ADF7021_REG3_DMR 0x29ECA093 #define ADF7021_REG3_YSF_L 0x29ECA093 #define ADF7021_REG3_YSF_H 0x29ECA093 #define ADF7021_REG3_P25 0x29ECA093 #define ADF7021_REG3_NXDN 0x29ECA113 -#define ADF7021_REG3_M17 0x29ECA093 // XXX FIXME +#define ADF7021_REG3_M17 0x29ECA093 #endif #define ADF7021_REG3_POCSAG 0x29EE8093 @@ -228,7 +229,7 @@ www.analog.com/media/en/technical-documentation/data-sheets/ADF7021.pdf #define ADF7021_DISC_BW_YSF_H 430U // K=28 #define ADF7021_DISC_BW_P25 493U // K=32 #define ADF7021_DISC_BW_NXDN 246U // K=32 -#define ADF7021_DISC_BW_M17 393U // XXX FIXME +#define ADF7021_DISC_BW_M17 491U // K=32 XXX FIXME #define ADF7021_DISC_BW_POCSAG 338U // K=22 // Post demodulator bandwith (REG 04) @@ -255,7 +256,7 @@ www.analog.com/media/en/technical-documentation/data-sheets/ADF7021.pdf #define ADF7021_REG10_YSF 0x01FE557A #define ADF7021_REG10_P25 0x01FE557A #define ADF7021_REG10_NXDN 0x01FE557A -#define ADF7021_REG10_M17 0x01FE557A // XXX FIXME +#define ADF7021_REG10_M17 0x01FE557A #if defined(ADF7021_AFC_POS) #define AFC_OFFSET_DMR -250 #define AFC_OFFSET_YSF -250 @@ -274,7 +275,7 @@ www.analog.com/media/en/technical-documentation/data-sheets/ADF7021.pdf #define ADF7021_REG10_YSF 0x049E556A #define ADF7021_REG10_P25 0x049E556A #define ADF7021_REG10_NXDN 0x049E556A -#define ADF7021_REG10_M17 0x049E556A // XXX FIXME +#define ADF7021_REG10_M17 0x049E556A #define AFC_OFFSET_DMR 0 #define AFC_OFFSET_YSF 0 #define AFC_OFFSET_P25 0 diff --git a/version.h b/version.h index 531c923..27fded5 100644 --- a/version.h +++ b/version.h @@ -25,7 +25,7 @@ #define VER_MAJOR "1" #define VER_MINOR "5" #define VER_REV "1b" -#define VERSION_DATE "20201023" +#define VERSION_DATE "20201025" #if defined(ZUMSPOT_ADF7021) #define BOARD_INFO "ZUMspot" From 743d0ca12ff772b7171caa14f5965b98bfe09921 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Mon, 9 Nov 2020 14:25:18 +0000 Subject: [PATCH 05/26] Update the serial protocol. --- SerialPort.cpp | 2 +- version.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/SerialPort.cpp b/SerialPort.cpp index bd936c6..dece371 100644 --- a/SerialPort.cpp +++ b/SerialPort.cpp @@ -250,7 +250,7 @@ uint8_t CSerialPort::setConfig(const uint8_t* data, uint8_t length) bool p25Enable = (data[1U] & 0x08U) == 0x08U; bool nxdnEnable = (data[1U] & 0x10U) == 0x10U; bool pocsagEnable = (data[1U] & 0x20U) == 0x20U; - bool m17Enable = (data[1U] & 0x80U) == 0x80U; + bool m17Enable = (data[1U] & 0x40U) == 0x40U; uint8_t txDelay = data[2U]; if (txDelay > 50U) diff --git a/version.h b/version.h index 27fded5..80ec5e0 100644 --- a/version.h +++ b/version.h @@ -25,7 +25,7 @@ #define VER_MAJOR "1" #define VER_MINOR "5" #define VER_REV "1b" -#define VERSION_DATE "20201025" +#define VERSION_DATE "20201109" #if defined(ZUMSPOT_ADF7021) #define BOARD_INFO "ZUMspot" From 818a27d114cf032a39bf72aa02e8d613bd0219f6 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Tue, 10 Nov 2020 16:56:44 +0000 Subject: [PATCH 06/26] Revert the M17 enable bit change. --- SerialPort.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SerialPort.cpp b/SerialPort.cpp index 1cb0211..fdc5037 100644 --- a/SerialPort.cpp +++ b/SerialPort.cpp @@ -250,7 +250,7 @@ uint8_t CSerialPort::setConfig(const uint8_t* data, uint8_t length) bool p25Enable = (data[1U] & 0x08U) == 0x08U; bool nxdnEnable = (data[1U] & 0x10U) == 0x10U; bool pocsagEnable = (data[1U] & 0x20U) == 0x20U; - bool m17Enable = (data[1U] & 0x40U) == 0x40U; + bool m17Enable = (data[1U] & 0x80U) == 0x80U; uint8_t txDelay = data[2U]; if (txDelay > 50U) From cde5b19080196b14661e82d8220e329423170d50 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Wed, 11 Nov 2020 11:50:02 +0000 Subject: [PATCH 07/26] Move the M17 enable bit position. --- SerialPort.cpp | 2 +- version.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/SerialPort.cpp b/SerialPort.cpp index fdc5037..1cb0211 100644 --- a/SerialPort.cpp +++ b/SerialPort.cpp @@ -250,7 +250,7 @@ uint8_t CSerialPort::setConfig(const uint8_t* data, uint8_t length) bool p25Enable = (data[1U] & 0x08U) == 0x08U; bool nxdnEnable = (data[1U] & 0x10U) == 0x10U; bool pocsagEnable = (data[1U] & 0x20U) == 0x20U; - bool m17Enable = (data[1U] & 0x80U) == 0x80U; + bool m17Enable = (data[1U] & 0x40U) == 0x40U; uint8_t txDelay = data[2U]; if (txDelay > 50U) diff --git a/version.h b/version.h index 1d77c9c..e16d8dc 100644 --- a/version.h +++ b/version.h @@ -25,7 +25,7 @@ #define VER_MAJOR "1" #define VER_MINOR "5" #define VER_REV "2" -#define VERSION_DATE "20201109" +#define VERSION_DATE "20201111" #if defined(ZUMSPOT_ADF7021) #define BOARD_INFO "ZUMspot" From d732807ee34107c65206ae3a2062a307973dea81 Mon Sep 17 00:00:00 2001 From: Andy CA6JAU Date: Sun, 15 Nov 2020 20:22:13 -0300 Subject: [PATCH 08/26] Change some ADF7021 register values for M17 (experimental) --- ADF7021.cpp | 6 +++--- ADF7021.h | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ADF7021.cpp b/ADF7021.cpp index 4298f46..4e1af57 100644 --- a/ADF7021.cpp +++ b/ADF7021.cpp @@ -424,7 +424,7 @@ void CIO::ifConf(MMDVM_STATE modemState, bool reset) break; case STATE_YSF: - // Dev: +1 symb 2700/900 Hz, symb rate = 4800 + // Dev: +1 symb 900 Hz, symb rate = 4800 ADF7021_REG3 = (m_LoDevYSF ? ADF7021_REG3_YSF_L : ADF7021_REG3_YSF_H); ADF7021_REG10 = ADF7021_REG10_YSF; @@ -505,7 +505,7 @@ void CIO::ifConf(MMDVM_STATE modemState, bool reset) break; case STATE_M17: - // Dev: +1 symb 2400 Hz, symb rate = 4800 + // Dev: +1 symb 800 Hz, symb rate = 4800 ADF7021_REG3 = ADF7021_REG3_M17; ADF7021_REG10 = ADF7021_REG10_M17; @@ -517,7 +517,7 @@ void CIO::ifConf(MMDVM_STATE modemState, bool reset) ADF7021_REG4 |= (uint32_t) 0b11 << 8; ADF7021_REG4 |= (uint32_t) ADF7021_DISC_BW_M17 << 10; // Disc BW ADF7021_REG4 |= (uint32_t) ADF7021_POST_BW_M17 << 20; // Post dem BW - ADF7021_REG4 |= (uint32_t) 0b00 << 30; // IF filter (12.5 kHz) + ADF7021_REG4 |= (uint32_t) 0b10 << 30; // IF filter (25 kHz) ADF7021_REG13 = (uint32_t) 0b1101 << 0; // register 13 ADF7021_REG13 |= (uint32_t) ADF7021_SLICER_TH_M17 << 4; // slicer threshold diff --git a/ADF7021.h b/ADF7021.h index 76d0893..7b58c5f 100644 --- a/ADF7021.h +++ b/ADF7021.h @@ -106,7 +106,7 @@ www.analog.com/media/en/technical-documentation/data-sheets/ADF7021.pdf #define ADF7021_REG3_YSF_H 0x2A4CC093 #define ADF7021_REG3_P25 0x2A4C80D3 #define ADF7021_REG3_NXDN 0x2A4CC113 -#define ADF7021_REG3_M17 0x2A4C80D3 // XXX FIXME +#define ADF7021_REG3_M17 0x2A4CC093 #endif #define ADF7021_REG3_POCSAG 0x2A4F0093 @@ -118,7 +118,7 @@ www.analog.com/media/en/technical-documentation/data-sheets/ADF7021.pdf #define ADF7021_DISC_BW_YSF_H 516U // K=28 #define ADF7021_DISC_BW_P25 394U // K=32 #define ADF7021_DISC_BW_NXDN 295U // K=32 -#define ADF7021_DISC_BW_M17 393U // K=32 XXX FIXME +#define ADF7021_DISC_BW_M17 571U // K=31 #define ADF7021_DISC_BW_POCSAG 406U // K=22 // Post demodulator bandwith (REG 04) @@ -127,7 +127,7 @@ www.analog.com/media/en/technical-documentation/data-sheets/ADF7021.pdf #define ADF7021_POST_BW_YSF 20U #define ADF7021_POST_BW_P25 6U #define ADF7021_POST_BW_NXDN 7U -#define ADF7021_POST_BW_M17 20U // XXX FIXME +#define ADF7021_POST_BW_M17 20U // Test #define ADF7021_POST_BW_POCSAG 1U // IF filter (REG 05) @@ -229,7 +229,7 @@ www.analog.com/media/en/technical-documentation/data-sheets/ADF7021.pdf #define ADF7021_DISC_BW_YSF_H 430U // K=28 #define ADF7021_DISC_BW_P25 493U // K=32 #define ADF7021_DISC_BW_NXDN 246U // K=32 -#define ADF7021_DISC_BW_M17 491U // K=32 XXX FIXME +#define ADF7021_DISC_BW_M17 476U // K=31 #define ADF7021_DISC_BW_POCSAG 338U // K=22 // Post demodulator bandwith (REG 04) @@ -238,7 +238,7 @@ www.analog.com/media/en/technical-documentation/data-sheets/ADF7021.pdf #define ADF7021_POST_BW_YSF 20U #define ADF7021_POST_BW_P25 6U #define ADF7021_POST_BW_NXDN 8U -#define ADF7021_POST_BW_M17 20U // XXX FIXME +#define ADF7021_POST_BW_M17 20U // Test #define ADF7021_POST_BW_POCSAG 1U // IF filter (REG 05) @@ -294,7 +294,7 @@ www.analog.com/media/en/technical-documentation/data-sheets/ADF7021.pdf #define ADF7021_SLICER_TH_YSF_H 69U #define ADF7021_SLICER_TH_P25 43U #define ADF7021_SLICER_TH_NXDN 26U -#define ADF7021_SLICER_TH_M17 26U // XXX FIXME +#define ADF7021_SLICER_TH_M17 59U // Test #else @@ -304,7 +304,7 @@ www.analog.com/media/en/technical-documentation/data-sheets/ADF7021.pdf #define ADF7021_SLICER_TH_YSF_H 75U #define ADF7021_SLICER_TH_P25 47U #define ADF7021_SLICER_TH_NXDN 26U -#define ADF7021_SLICER_TH_M17 26U // XXX FIXME +#define ADF7021_SLICER_TH_M17 59U // Test #endif From c9bd700100eca2f20076daeba1d464e776bdc65f Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Thu, 26 Nov 2020 10:22:03 +0000 Subject: [PATCH 09/26] Update to the latest M17 specification. --- M17Defines.h | 7 ++-- M17RX.cpp | 88 ++++++++++++++++++++++++++++++++++++++++++++------ M17RX.h | 3 ++ SerialPort.cpp | 42 ++++++++++++++++++++++-- SerialPort.h | 1 + version.h | 2 +- 6 files changed, 129 insertions(+), 14 deletions(-) diff --git a/M17Defines.h b/M17Defines.h index 776bf8e..4952fdc 100644 --- a/M17Defines.h +++ b/M17Defines.h @@ -26,10 +26,13 @@ const unsigned int M17_FRAME_LENGTH_BYTES = M17_FRAME_LENGTH_BITS / 8U; const unsigned int M17_SYNC_LENGTH_BITS = 16U; -const uint8_t M17_SYNC_BYTES[] = {0x32U, 0x43U}; +const uint8_t M17_HEADER_SYNC_BYTES[] = {0x5DU, 0xDDU}; +const uint8_t M17_DATA_SYNC_BYTES[] = {0xDDU, 0xDDU}; + const uint8_t M17_SYNC_BYTES_LENGTH = 2U; -const uint16_t M17_SYNC_BITS = 0x3243U; +const uint16_t M17_HEADER_SYNC_BITS = 0x5DDDU; +const uint16_t M17_DATA_SYNC_BITS = 0xDDDDU; #endif diff --git a/M17RX.cpp b/M17RX.cpp index b00ebc6..56405ce 100644 --- a/M17RX.cpp +++ b/M17RX.cpp @@ -52,10 +52,17 @@ void CM17RX::reset() void CM17RX::databit(bool bit) { - if (m_state == M17RXS_NONE) - processNone(bit); - else - processData(bit); + switch (m_state) { + case M17RXS_NONE: + processNone(bit); + break; + case M17RXS_HEADER: + processHeader(bit); + break; + default: + processData(bit); + break; + } } void CM17RX::processNone(bool bit) @@ -64,11 +71,24 @@ void CM17RX::processNone(bool bit) if (bit) m_bitBuffer |= 0x01U; + // Fuzzy matching of the header sync bit sequence + if (countBits16(m_bitBuffer ^ M17_HEADER_SYNC_BITS) <= MAX_SYNC_BIT_START_ERRS) { + DEBUG1("M17RX: header sync found in None"); + for (uint8_t i = 0U; i < M17_SYNC_BYTES_LENGTH; i++) + m_buffer[i] = M17_HEADER_SYNC_BYTES[i]; + + m_lostCount = MAX_SYNC_FRAMES; + m_bufferPtr = M17_SYNC_LENGTH_BITS; + m_state = M17RXS_HEADER; + + io.setDecode(true); + } + // Fuzzy matching of the data sync bit sequence - if (countBits16(m_bitBuffer ^ M17_SYNC_BITS) <= MAX_SYNC_BIT_START_ERRS) { - DEBUG1("M17RX: sync found in None"); + if (countBits16(m_bitBuffer ^ M17_DATA_SYNC_BITS) <= MAX_SYNC_BIT_START_ERRS) { + DEBUG1("M17RX: data sync found in None"); for (uint8_t i = 0U; i < M17_SYNC_BYTES_LENGTH; i++) - m_buffer[i] = M17_SYNC_BYTES[i]; + m_buffer[i] = M17_DATA_SYNC_BYTES[i]; m_lostCount = MAX_SYNC_FRAMES; m_bufferPtr = M17_SYNC_LENGTH_BITS; @@ -76,7 +96,43 @@ void CM17RX::processNone(bool bit) io.setDecode(true); } +} + +void CM17RX::processHeader(bool bit) +{ + m_bitBuffer <<= 1; + if (bit) + m_bitBuffer |= 0x01U; + + WRITE_BIT1(m_buffer, m_bufferPtr, bit); + + m_bufferPtr++; + if (m_bufferPtr > M17_FRAME_LENGTH_BITS) + reset(); + // Only search for a sync in the right place +-2 symbols + if (m_bufferPtr >= (M17_SYNC_LENGTH_BITS - 2U) && m_bufferPtr <= (M17_SYNC_LENGTH_BITS + 2U)) { + // Fuzzy matching of the data sync bit sequence + if (countBits16(m_bitBuffer ^ M17_HEADER_SYNC_BITS) <= MAX_SYNC_BIT_RUN_ERRS) { + DEBUG2("M17RX: found header sync in Data, pos", m_bufferPtr - M17_SYNC_LENGTH_BITS); + m_lostCount = MAX_SYNC_FRAMES; + m_bufferPtr = M17_SYNC_LENGTH_BITS; + } + } + + // Send a data frame to the host if the required number of bits have been received + if (m_bufferPtr == M17_FRAME_LENGTH_BITS) { + m_lostCount--; + + // Write data to host + m_outBuffer[0U] = 0x01U; + writeRSSIHeader(m_outBuffer); + + // Start the next frame + ::memset(m_outBuffer, 0x00U, M17_FRAME_LENGTH_BYTES + 3U); + m_state = M17RXS_DATA; + m_bufferPtr = 0U; + } } void CM17RX::processData(bool bit) @@ -94,8 +150,8 @@ void CM17RX::processData(bool bit) // Only search for a sync in the right place +-2 symbols if (m_bufferPtr >= (M17_SYNC_LENGTH_BITS - 2U) && m_bufferPtr <= (M17_SYNC_LENGTH_BITS + 2U)) { // Fuzzy matching of the data sync bit sequence - if (countBits16(m_bitBuffer ^ M17_SYNC_BITS) <= MAX_SYNC_BIT_RUN_ERRS) { - DEBUG2("M17RX: found sync in Data, pos", m_bufferPtr - M17_SYNC_LENGTH_BITS); + if (countBits16(m_bitBuffer ^ M17_DATA_SYNC_BITS) <= MAX_SYNC_BIT_RUN_ERRS) { + DEBUG2("M17RX: found data sync in Data, pos", m_bufferPtr - M17_SYNC_LENGTH_BITS); m_lostCount = MAX_SYNC_FRAMES; m_bufferPtr = M17_SYNC_LENGTH_BITS; } @@ -122,6 +178,20 @@ void CM17RX::processData(bool bit) } } +void CM17RX::writeRSSIHeader(uint8_t* data) +{ +#if defined(SEND_RSSI_DATA) + uint16_t rssi = io.readRSSI(); + + data[49U] = (rssi >> 8) & 0xFFU; + data[50U] = (rssi >> 0) & 0xFFU; + + serial.writeM17Header(data, M17_FRAME_LENGTH_BYTES + 3U); +#else + serial.writeM17Header(data, M17_FRAME_LENGTH_BYTES + 1U); +#endif +} + void CM17RX::writeRSSIData(uint8_t* data) { #if defined(SEND_RSSI_DATA) diff --git a/M17RX.h b/M17RX.h index 8448179..1a9b08e 100644 --- a/M17RX.h +++ b/M17RX.h @@ -24,6 +24,7 @@ enum M17RX_STATE { M17RXS_NONE, + M17RXS_HEADER, M17RXS_DATA }; @@ -44,7 +45,9 @@ private: uint16_t m_lostCount; void processNone(bool bit); + void processHeader(bool bit); void processData(bool bit); + void writeRSSIHeader(uint8_t* data); void writeRSSIData(uint8_t* data); }; diff --git a/SerialPort.cpp b/SerialPort.cpp index 1cb0211..edc3287 100644 --- a/SerialPort.cpp +++ b/SerialPort.cpp @@ -60,8 +60,9 @@ const uint8_t MMDVM_P25_LOST = 0x32U; const uint8_t MMDVM_NXDN_DATA = 0x40U; const uint8_t MMDVM_NXDN_LOST = 0x41U; -const uint8_t MMDVM_M17_DATA = 0x45U; -const uint8_t MMDVM_M17_LOST = 0x46U; +const uint8_t MMDVM_M17_HEADER = 0x45U; +const uint8_t MMDVM_M17_DATA = 0x46U; +const uint8_t MMDVM_M17_LOST = 0x47U; const uint8_t MMDVM_POCSAG_DATA = 0x50U; @@ -864,6 +865,20 @@ void CSerialPort::process() } break; + case MMDVM_M17_HEADER: + if (m_m17Enable) { + if (m_modemState == STATE_IDLE || m_modemState == STATE_M17) + err = m17TX.writeData(m_buffer + 3U, m_len - 3U); + } + if (err == 0U) { + if (m_modemState == STATE_IDLE) + setMode(STATE_M17); + } else { + DEBUG2("Received invalid M17 header", err); + sendNAK(err); + } + break; + case MMDVM_M17_DATA: if (m_m17Enable) { if (m_modemState == STATE_IDLE || m_modemState == STATE_M17) @@ -1233,6 +1248,29 @@ void CSerialPort::writeNXDNLost() writeInt(1U, reply, 3); } +void CSerialPort::writeM17Header(const uint8_t* data, uint8_t length) +{ + if (m_modemState != STATE_M17 && m_modemState != STATE_IDLE) + return; + + if (!m_m17Enable) + return; + + uint8_t reply[130U]; + + reply[0U] = MMDVM_FRAME_START; + reply[1U] = 0U; + reply[2U] = MMDVM_M17_HEADER; + + uint8_t count = 3U; + for (uint8_t i = 0U; i < length; i++, count++) + reply[count] = data[i]; + + reply[1U] = count; + + writeInt(1U, reply, count); +} + void CSerialPort::writeM17Data(const uint8_t* data, uint8_t length) { if (m_modemState != STATE_M17 && m_modemState != STATE_IDLE) diff --git a/SerialPort.h b/SerialPort.h index c9cbddb..38d2139 100644 --- a/SerialPort.h +++ b/SerialPort.h @@ -52,6 +52,7 @@ public: void writeNXDNData(const uint8_t* data, uint8_t length); void writeNXDNLost(); + void writeM17Header(const uint8_t* data, uint8_t length); void writeM17Data(const uint8_t* data, uint8_t length); void writeM17Lost(); diff --git a/version.h b/version.h index e16d8dc..043fee8 100644 --- a/version.h +++ b/version.h @@ -25,7 +25,7 @@ #define VER_MAJOR "1" #define VER_MINOR "5" #define VER_REV "2" -#define VERSION_DATE "20201111" +#define VERSION_DATE "20201126" #if defined(ZUMSPOT_ADF7021) #define BOARD_INFO "ZUMspot" From 6c4f2041cb27bf9abeddcfd208f523f6088b82fd Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Sat, 26 Dec 2020 12:51:35 +0000 Subject: [PATCH 10/26] Update the M17 sync vectors. --- M17Defines.h | 10 ++++++---- M17RX.cpp | 12 ++++++------ version.h | 2 +- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/M17Defines.h b/M17Defines.h index 4952fdc..2f8e98e 100644 --- a/M17Defines.h +++ b/M17Defines.h @@ -26,13 +26,15 @@ const unsigned int M17_FRAME_LENGTH_BYTES = M17_FRAME_LENGTH_BITS / 8U; const unsigned int M17_SYNC_LENGTH_BITS = 16U; -const uint8_t M17_HEADER_SYNC_BYTES[] = {0x5DU, 0xDDU}; -const uint8_t M17_DATA_SYNC_BYTES[] = {0xDDU, 0xDDU}; +const uint8_t M17_LINK_SETUP_SYNC_BYTES[] = {0x55U, 0xF7U}; +const uint8_t M17_STREAM_SYNC_BYTES[] = {0xFFU, 0x5DU}; +const uint8_t M17_PACKET_SYNC_BYTES[] = {0x75U, 0xFFU}; const uint8_t M17_SYNC_BYTES_LENGTH = 2U; -const uint16_t M17_HEADER_SYNC_BITS = 0x5DDDU; -const uint16_t M17_DATA_SYNC_BITS = 0xDDDDU; +const uint16_t M17_LINK_SETUP_SYNC_BITS = 0x55F7U; +const uint16_t M17_STREAM_SYNC_BITS = 0xFF5DU; +const uint16_t M17_PACKET_SYNC_BITS = 0x75FFU; #endif diff --git a/M17RX.cpp b/M17RX.cpp index 56405ce..d29d6d8 100644 --- a/M17RX.cpp +++ b/M17RX.cpp @@ -72,10 +72,10 @@ void CM17RX::processNone(bool bit) m_bitBuffer |= 0x01U; // Fuzzy matching of the header sync bit sequence - if (countBits16(m_bitBuffer ^ M17_HEADER_SYNC_BITS) <= MAX_SYNC_BIT_START_ERRS) { + if (countBits16(m_bitBuffer ^ M17_LINK_SETUP_SYNC_BITS) <= MAX_SYNC_BIT_START_ERRS) { DEBUG1("M17RX: header sync found in None"); for (uint8_t i = 0U; i < M17_SYNC_BYTES_LENGTH; i++) - m_buffer[i] = M17_HEADER_SYNC_BYTES[i]; + m_buffer[i] = M17_LINK_SETUP_SYNC_BYTES[i]; m_lostCount = MAX_SYNC_FRAMES; m_bufferPtr = M17_SYNC_LENGTH_BITS; @@ -85,10 +85,10 @@ void CM17RX::processNone(bool bit) } // Fuzzy matching of the data sync bit sequence - if (countBits16(m_bitBuffer ^ M17_DATA_SYNC_BITS) <= MAX_SYNC_BIT_START_ERRS) { + if (countBits16(m_bitBuffer ^ M17_STREAM_SYNC_BITS) <= MAX_SYNC_BIT_START_ERRS) { DEBUG1("M17RX: data sync found in None"); for (uint8_t i = 0U; i < M17_SYNC_BYTES_LENGTH; i++) - m_buffer[i] = M17_DATA_SYNC_BYTES[i]; + m_buffer[i] = M17_STREAM_SYNC_BYTES[i]; m_lostCount = MAX_SYNC_FRAMES; m_bufferPtr = M17_SYNC_LENGTH_BITS; @@ -113,7 +113,7 @@ void CM17RX::processHeader(bool bit) // Only search for a sync in the right place +-2 symbols if (m_bufferPtr >= (M17_SYNC_LENGTH_BITS - 2U) && m_bufferPtr <= (M17_SYNC_LENGTH_BITS + 2U)) { // Fuzzy matching of the data sync bit sequence - if (countBits16(m_bitBuffer ^ M17_HEADER_SYNC_BITS) <= MAX_SYNC_BIT_RUN_ERRS) { + if (countBits16(m_bitBuffer ^ M17_LINK_SETUP_SYNC_BITS) <= MAX_SYNC_BIT_RUN_ERRS) { DEBUG2("M17RX: found header sync in Data, pos", m_bufferPtr - M17_SYNC_LENGTH_BITS); m_lostCount = MAX_SYNC_FRAMES; m_bufferPtr = M17_SYNC_LENGTH_BITS; @@ -150,7 +150,7 @@ void CM17RX::processData(bool bit) // Only search for a sync in the right place +-2 symbols if (m_bufferPtr >= (M17_SYNC_LENGTH_BITS - 2U) && m_bufferPtr <= (M17_SYNC_LENGTH_BITS + 2U)) { // Fuzzy matching of the data sync bit sequence - if (countBits16(m_bitBuffer ^ M17_DATA_SYNC_BITS) <= MAX_SYNC_BIT_RUN_ERRS) { + if (countBits16(m_bitBuffer ^ M17_STREAM_SYNC_BITS) <= MAX_SYNC_BIT_RUN_ERRS) { DEBUG2("M17RX: found data sync in Data, pos", m_bufferPtr - M17_SYNC_LENGTH_BITS); m_lostCount = MAX_SYNC_FRAMES; m_bufferPtr = M17_SYNC_LENGTH_BITS; diff --git a/version.h b/version.h index 043fee8..a19dad5 100644 --- a/version.h +++ b/version.h @@ -25,7 +25,7 @@ #define VER_MAJOR "1" #define VER_MINOR "5" #define VER_REV "2" -#define VERSION_DATE "20201126" +#define VERSION_DATE "20201226" #if defined(ZUMSPOT_ADF7021) #define BOARD_INFO "ZUMspot" From 4f1ed20d7785204f9b2bc3d50b91ec0d302f3aec Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Fri, 1 Jan 2021 12:57:57 +0000 Subject: [PATCH 11/26] Add M17 packet mode processing. --- M17RX.cpp | 93 +++++++++++++++++++++++++++++++++++++++++++++---------- M17RX.h | 10 +++--- version.h | 2 +- 3 files changed, 84 insertions(+), 21 deletions(-) diff --git a/M17RX.cpp b/M17RX.cpp index d29d6d8..b16ce9a 100644 --- a/M17RX.cpp +++ b/M17RX.cpp @@ -1,6 +1,6 @@ /* - * Copyright (C) 2009-2017,2018,2020 by Jonathan Naylor G4KLX - * Copyright (C) 2016,2017,2018 by Andy Uribe CA6JAU + * Copyright (C) 2009-2018,2020,2021 by Jonathan Naylor G4KLX + * Copyright (C) 2016-2018 by Andy Uribe CA6JAU * * 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 @@ -59,8 +59,11 @@ void CM17RX::databit(bool bit) case M17RXS_HEADER: processHeader(bit); break; + case M17RXS_PACKET: + processPacket(bit); + break; default: - processData(bit); + processStream(bit); break; } } @@ -84,15 +87,28 @@ void CM17RX::processNone(bool bit) io.setDecode(true); } - // Fuzzy matching of the data sync bit sequence + // Fuzzy matching of the stream sync bit sequence if (countBits16(m_bitBuffer ^ M17_STREAM_SYNC_BITS) <= MAX_SYNC_BIT_START_ERRS) { - DEBUG1("M17RX: data sync found in None"); + DEBUG1("M17RX: stream sync found in None"); for (uint8_t i = 0U; i < M17_SYNC_BYTES_LENGTH; i++) m_buffer[i] = M17_STREAM_SYNC_BYTES[i]; m_lostCount = MAX_SYNC_FRAMES; m_bufferPtr = M17_SYNC_LENGTH_BITS; - m_state = M17RXS_DATA; + m_state = M17RXS_STREAM; + + io.setDecode(true); + } + + // Fuzzy matching of the packet sync bit sequence + if (countBits16(m_bitBuffer ^ M17_PACKET_SYNC_BITS) <= MAX_SYNC_BIT_START_ERRS) { + DEBUG1("M17RX: packet sync found in None"); + for (uint8_t i = 0U; i < M17_SYNC_BYTES_LENGTH; i++) + m_buffer[i] = M17_PACKET_SYNC_BYTES[i]; + + m_lostCount = MAX_SYNC_FRAMES; + m_bufferPtr = M17_SYNC_LENGTH_BITS; + m_state = M17RXS_PACKET; io.setDecode(true); } @@ -128,14 +144,14 @@ void CM17RX::processHeader(bool bit) m_outBuffer[0U] = 0x01U; writeRSSIHeader(m_outBuffer); - // Start the next frame + // Start the next frame, but we don't know the type ::memset(m_outBuffer, 0x00U, M17_FRAME_LENGTH_BYTES + 3U); - m_state = M17RXS_DATA; + m_state = M17RXS_NONE; m_bufferPtr = 0U; } } -void CM17RX::processData(bool bit) +void CM17RX::processStream(bool bit) { m_bitBuffer <<= 1; if (bit) @@ -147,28 +163,73 @@ void CM17RX::processData(bool bit) if (m_bufferPtr > M17_FRAME_LENGTH_BITS) reset(); - // Only search for a sync in the right place +-2 symbols + // Only search for a stream sync in the right place +-2 symbols if (m_bufferPtr >= (M17_SYNC_LENGTH_BITS - 2U) && m_bufferPtr <= (M17_SYNC_LENGTH_BITS + 2U)) { - // Fuzzy matching of the data sync bit sequence + // Fuzzy matching of the stream sync bit sequence if (countBits16(m_bitBuffer ^ M17_STREAM_SYNC_BITS) <= MAX_SYNC_BIT_RUN_ERRS) { - DEBUG2("M17RX: found data sync in Data, pos", m_bufferPtr - M17_SYNC_LENGTH_BITS); + DEBUG2("M17RX: found stream sync in Data, pos", m_bufferPtr - M17_SYNC_LENGTH_BITS); m_lostCount = MAX_SYNC_FRAMES; m_bufferPtr = M17_SYNC_LENGTH_BITS; } } - // Send a data frame to the host if the required number of bits have been received + // Send a stream frame to the host if the required number of bits have been received + if (m_bufferPtr == M17_FRAME_LENGTH_BITS) { + // We've not seen a stream sync for too long, signal RXLOST and change to RX_NONE + m_lostCount--; + if (m_lostCount == 0U) { + DEBUG1("M17RX: stream sync timed out, lost lock"); + io.setDecode(false); + serial.writeM17Lost(); + reset(); + } else { + // Write data to host + m_outBuffer[0U] = 0x00U; // Stream data + m_outBuffer[0U] |= m_lostCount == (MAX_SYNC_FRAMES - 1U) ? 0x01U : 0x00U; + writeRSSIData(m_outBuffer); + + // Start the next frame + ::memset(m_outBuffer, 0x00U, M17_FRAME_LENGTH_BYTES + 3U); + m_bufferPtr = 0U; + } + } +} + +void CM17RX::processPacket(bool bit) +{ + m_bitBuffer <<= 1; + if (bit) + m_bitBuffer |= 0x01U; + + WRITE_BIT1(m_buffer, m_bufferPtr, bit); + + m_bufferPtr++; + if (m_bufferPtr > M17_FRAME_LENGTH_BITS) + reset(); + + // Only search for a packet sync in the right place +-2 symbols + if (m_bufferPtr >= (M17_SYNC_LENGTH_BITS - 2U) && m_bufferPtr <= (M17_SYNC_LENGTH_BITS + 2U)) { + // Fuzzy matching of the packet sync bit sequence + if (countBits16(m_bitBuffer ^ M17_PACKET_SYNC_BITS) <= MAX_SYNC_BIT_RUN_ERRS) { + DEBUG2("M17RX: found packet sync in Data, pos", m_bufferPtr - M17_SYNC_LENGTH_BITS); + m_lostCount = MAX_SYNC_FRAMES; + m_bufferPtr = M17_SYNC_LENGTH_BITS; + } + } + + // Send a packet frame to the host if the required number of bits have been received if (m_bufferPtr == M17_FRAME_LENGTH_BITS) { - // We've not seen a data sync for too long, signal RXLOST and change to RX_NONE + // We've not seen a packet sync for too long, signal RXLOST and change to RX_NONE m_lostCount--; if (m_lostCount == 0U) { - DEBUG1("M17RX: sync timed out, lost lock"); + DEBUG1("M17RX: packet sync timed out, lost lock"); io.setDecode(false); serial.writeM17Lost(); reset(); } else { // Write data to host - m_outBuffer[0U] = m_lostCount == (MAX_SYNC_FRAMES - 1U) ? 0x01U : 0x00U; + m_outBuffer[0U] = 0x02U; // Packet data + m_outBuffer[0U] |= m_lostCount == (MAX_SYNC_FRAMES - 1U) ? 0x01U : 0x00U; writeRSSIData(m_outBuffer); // Start the next frame diff --git a/M17RX.h b/M17RX.h index 1a9b08e..417e5ab 100644 --- a/M17RX.h +++ b/M17RX.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2015,2016,2017,2018,2020 by Jonathan Naylor G4KLX - * Copyright (C) 2016,2017,2018 by Andy Uribe CA6JAU + * Copyright (C) 2015-2018,2020,2021 by Jonathan Naylor G4KLX + * Copyright (C) 2016-2018 by Andy Uribe CA6JAU * * 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 @@ -25,7 +25,8 @@ enum M17RX_STATE { M17RXS_NONE, M17RXS_HEADER, - M17RXS_DATA + M17RXS_STREAM, + M17RXS_PACKET }; class CM17RX { @@ -46,7 +47,8 @@ private: void processNone(bool bit); void processHeader(bool bit); - void processData(bool bit); + void processStream(bool bit); + void processPacket(bool bit); void writeRSSIHeader(uint8_t* data); void writeRSSIData(uint8_t* data); }; diff --git a/version.h b/version.h index a19dad5..94c0c84 100644 --- a/version.h +++ b/version.h @@ -25,7 +25,7 @@ #define VER_MAJOR "1" #define VER_MINOR "5" #define VER_REV "2" -#define VERSION_DATE "20201226" +#define VERSION_DATE "20210101" #if defined(ZUMSPOT_ADF7021) #define BOARD_INFO "ZUMspot" From 2f52282c47207c26f7aad268dd4b6fa946c219cf Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Sat, 2 Jan 2021 12:28:19 +0000 Subject: [PATCH 12/26] Clean up the M17 synchronisation. --- M17RX.cpp | 38 +++++++++++++------------------------- M17RX.h | 4 ++-- version.h | 2 +- 3 files changed, 16 insertions(+), 28 deletions(-) diff --git a/M17RX.cpp b/M17RX.cpp index b16ce9a..e3a6696 100644 --- a/M17RX.cpp +++ b/M17RX.cpp @@ -25,7 +25,7 @@ const uint8_t MAX_SYNC_BIT_START_ERRS = 0U; const uint8_t MAX_SYNC_BIT_RUN_ERRS = 2U; -const unsigned int MAX_SYNC_FRAMES = 5U + 1U; +const unsigned int MAX_SYNC_FRAMES = 3U + 1U; const uint8_t BIT_MASK_TABLE[] = {0x80U, 0x40U, 0x20U, 0x10U, 0x08U, 0x04U, 0x02U, 0x01U}; @@ -53,17 +53,17 @@ void CM17RX::reset() void CM17RX::databit(bool bit) { switch (m_state) { - case M17RXS_NONE: - processNone(bit); + case M17RXS_LINK_SETUP: + processLinkSetup(bit); break; - case M17RXS_HEADER: - processHeader(bit); + case M17RXS_STREAM: + processStream(bit); break; case M17RXS_PACKET: processPacket(bit); break; default: - processStream(bit); + processNone(bit); break; } } @@ -74,15 +74,15 @@ void CM17RX::processNone(bool bit) if (bit) m_bitBuffer |= 0x01U; - // Fuzzy matching of the header sync bit sequence + // Fuzzy matching of the link setup sync bit sequence if (countBits16(m_bitBuffer ^ M17_LINK_SETUP_SYNC_BITS) <= MAX_SYNC_BIT_START_ERRS) { - DEBUG1("M17RX: header sync found in None"); + DEBUG1("M17RX: link setup sync found in None"); for (uint8_t i = 0U; i < M17_SYNC_BYTES_LENGTH; i++) m_buffer[i] = M17_LINK_SETUP_SYNC_BYTES[i]; m_lostCount = MAX_SYNC_FRAMES; m_bufferPtr = M17_SYNC_LENGTH_BITS; - m_state = M17RXS_HEADER; + m_state = M17RXS_LINK_SETUP; io.setDecode(true); } @@ -114,7 +114,7 @@ void CM17RX::processNone(bool bit) } } -void CM17RX::processHeader(bool bit) +void CM17RX::processLinkSetup(bool bit) { m_bitBuffer <<= 1; if (bit) @@ -126,16 +126,6 @@ void CM17RX::processHeader(bool bit) if (m_bufferPtr > M17_FRAME_LENGTH_BITS) reset(); - // Only search for a sync in the right place +-2 symbols - if (m_bufferPtr >= (M17_SYNC_LENGTH_BITS - 2U) && m_bufferPtr <= (M17_SYNC_LENGTH_BITS + 2U)) { - // Fuzzy matching of the data sync bit sequence - if (countBits16(m_bitBuffer ^ M17_LINK_SETUP_SYNC_BITS) <= MAX_SYNC_BIT_RUN_ERRS) { - DEBUG2("M17RX: found header sync in Data, pos", m_bufferPtr - M17_SYNC_LENGTH_BITS); - m_lostCount = MAX_SYNC_FRAMES; - m_bufferPtr = M17_SYNC_LENGTH_BITS; - } - } - // Send a data frame to the host if the required number of bits have been received if (m_bufferPtr == M17_FRAME_LENGTH_BITS) { m_lostCount--; @@ -145,9 +135,7 @@ void CM17RX::processHeader(bool bit) writeRSSIHeader(m_outBuffer); // Start the next frame, but we don't know the type - ::memset(m_outBuffer, 0x00U, M17_FRAME_LENGTH_BYTES + 3U); - m_state = M17RXS_NONE; - m_bufferPtr = 0U; + reset(); } } @@ -167,7 +155,7 @@ void CM17RX::processStream(bool bit) if (m_bufferPtr >= (M17_SYNC_LENGTH_BITS - 2U) && m_bufferPtr <= (M17_SYNC_LENGTH_BITS + 2U)) { // Fuzzy matching of the stream sync bit sequence if (countBits16(m_bitBuffer ^ M17_STREAM_SYNC_BITS) <= MAX_SYNC_BIT_RUN_ERRS) { - DEBUG2("M17RX: found stream sync in Data, pos", m_bufferPtr - M17_SYNC_LENGTH_BITS); + DEBUG2("M17RX: found stream sync, pos", m_bufferPtr - M17_SYNC_LENGTH_BITS); m_lostCount = MAX_SYNC_FRAMES; m_bufferPtr = M17_SYNC_LENGTH_BITS; } @@ -211,7 +199,7 @@ void CM17RX::processPacket(bool bit) if (m_bufferPtr >= (M17_SYNC_LENGTH_BITS - 2U) && m_bufferPtr <= (M17_SYNC_LENGTH_BITS + 2U)) { // Fuzzy matching of the packet sync bit sequence if (countBits16(m_bitBuffer ^ M17_PACKET_SYNC_BITS) <= MAX_SYNC_BIT_RUN_ERRS) { - DEBUG2("M17RX: found packet sync in Data, pos", m_bufferPtr - M17_SYNC_LENGTH_BITS); + DEBUG2("M17RX: found packet sync, pos", m_bufferPtr - M17_SYNC_LENGTH_BITS); m_lostCount = MAX_SYNC_FRAMES; m_bufferPtr = M17_SYNC_LENGTH_BITS; } diff --git a/M17RX.h b/M17RX.h index 417e5ab..0cf3626 100644 --- a/M17RX.h +++ b/M17RX.h @@ -24,7 +24,7 @@ enum M17RX_STATE { M17RXS_NONE, - M17RXS_HEADER, + M17RXS_LINK_SETUP, M17RXS_STREAM, M17RXS_PACKET }; @@ -46,7 +46,7 @@ private: uint16_t m_lostCount; void processNone(bool bit); - void processHeader(bool bit); + void processLinkSetup(bool bit); void processStream(bool bit); void processPacket(bool bit); void writeRSSIHeader(uint8_t* data); diff --git a/version.h b/version.h index 94c0c84..d48ac89 100644 --- a/version.h +++ b/version.h @@ -25,7 +25,7 @@ #define VER_MAJOR "1" #define VER_MINOR "5" #define VER_REV "2" -#define VERSION_DATE "20210101" +#define VERSION_DATE "20210102" #if defined(ZUMSPOT_ADF7021) #define BOARD_INFO "ZUMspot" From df3a1401739ee4590ea806b893a91f11923dd4ef Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Sun, 14 Mar 2021 18:13:05 +0000 Subject: [PATCH 13/26] Fix and simplify the M17 receiver. --- M17RX.cpp | 128 ++++++++++++++++++++----------------------------- M17RX.h | 10 ++-- SerialPort.cpp | 62 +++++++++++++++++++----- SerialPort.h | 7 +-- version.h | 2 +- 5 files changed, 112 insertions(+), 97 deletions(-) diff --git a/M17RX.cpp b/M17RX.cpp index e3a6696..3954eb9 100644 --- a/M17RX.cpp +++ b/M17RX.cpp @@ -54,13 +54,9 @@ void CM17RX::databit(bool bit) { switch (m_state) { case M17RXS_LINK_SETUP: - processLinkSetup(bit); - break; case M17RXS_STREAM: - processStream(bit); - break; case M17RXS_PACKET: - processPacket(bit); + processData(bit); break; default: processNone(bit); @@ -114,7 +110,7 @@ void CM17RX::processNone(bool bit) } } -void CM17RX::processLinkSetup(bool bit) +void CM17RX::processData(bool bit) { m_bitBuffer <<= 1; if (bit) @@ -126,30 +122,16 @@ void CM17RX::processLinkSetup(bool bit) if (m_bufferPtr > M17_FRAME_LENGTH_BITS) reset(); - // Send a data frame to the host if the required number of bits have been received - if (m_bufferPtr == M17_FRAME_LENGTH_BITS) { - m_lostCount--; - - // Write data to host - m_outBuffer[0U] = 0x01U; - writeRSSIHeader(m_outBuffer); - - // Start the next frame, but we don't know the type - reset(); + // Only search for a link setup sync in the right place +-2 symbols + if (m_bufferPtr >= (M17_SYNC_LENGTH_BITS - 2U) && m_bufferPtr <= (M17_SYNC_LENGTH_BITS + 2U)) { + // Fuzzy matching of the stream sync bit sequence + if (countBits16(m_bitBuffer ^ M17_LINK_SETUP_SYNC_BITS) <= MAX_SYNC_BIT_RUN_ERRS) { + DEBUG2("M17RX: found link setup sync, pos", m_bufferPtr - M17_SYNC_LENGTH_BITS); + m_lostCount = MAX_SYNC_FRAMES; + m_bufferPtr = M17_SYNC_LENGTH_BITS; + m_state = M17RXS_LINK_SETUP; + } } -} - -void CM17RX::processStream(bool bit) -{ - m_bitBuffer <<= 1; - if (bit) - m_bitBuffer |= 0x01U; - - WRITE_BIT1(m_buffer, m_bufferPtr, bit); - - m_bufferPtr++; - if (m_bufferPtr > M17_FRAME_LENGTH_BITS) - reset(); // Only search for a stream sync in the right place +-2 symbols if (m_bufferPtr >= (M17_SYNC_LENGTH_BITS - 2U) && m_bufferPtr <= (M17_SYNC_LENGTH_BITS + 2U)) { @@ -158,67 +140,46 @@ void CM17RX::processStream(bool bit) DEBUG2("M17RX: found stream sync, pos", m_bufferPtr - M17_SYNC_LENGTH_BITS); m_lostCount = MAX_SYNC_FRAMES; m_bufferPtr = M17_SYNC_LENGTH_BITS; + m_state = M17RXS_STREAM; } } - // Send a stream frame to the host if the required number of bits have been received - if (m_bufferPtr == M17_FRAME_LENGTH_BITS) { - // We've not seen a stream sync for too long, signal RXLOST and change to RX_NONE - m_lostCount--; - if (m_lostCount == 0U) { - DEBUG1("M17RX: stream sync timed out, lost lock"); - io.setDecode(false); - serial.writeM17Lost(); - reset(); - } else { - // Write data to host - m_outBuffer[0U] = 0x00U; // Stream data - m_outBuffer[0U] |= m_lostCount == (MAX_SYNC_FRAMES - 1U) ? 0x01U : 0x00U; - writeRSSIData(m_outBuffer); - - // Start the next frame - ::memset(m_outBuffer, 0x00U, M17_FRAME_LENGTH_BYTES + 3U); - m_bufferPtr = 0U; - } - } -} - -void CM17RX::processPacket(bool bit) -{ - m_bitBuffer <<= 1; - if (bit) - m_bitBuffer |= 0x01U; - - WRITE_BIT1(m_buffer, m_bufferPtr, bit); - - m_bufferPtr++; - if (m_bufferPtr > M17_FRAME_LENGTH_BITS) - reset(); - // Only search for a packet sync in the right place +-2 symbols if (m_bufferPtr >= (M17_SYNC_LENGTH_BITS - 2U) && m_bufferPtr <= (M17_SYNC_LENGTH_BITS + 2U)) { - // Fuzzy matching of the packet sync bit sequence - if (countBits16(m_bitBuffer ^ M17_PACKET_SYNC_BITS) <= MAX_SYNC_BIT_RUN_ERRS) { + // Fuzzy matching of the stream sync bit sequence + if (countBits16(m_bitBuffer ^ M17_STREAM_SYNC_BITS) <= MAX_SYNC_BIT_RUN_ERRS) { DEBUG2("M17RX: found packet sync, pos", m_bufferPtr - M17_SYNC_LENGTH_BITS); m_lostCount = MAX_SYNC_FRAMES; m_bufferPtr = M17_SYNC_LENGTH_BITS; + m_state = M17RXS_PACKET; } } - // Send a packet frame to the host if the required number of bits have been received + // Send a frame to the host if the required number of bits have been received if (m_bufferPtr == M17_FRAME_LENGTH_BITS) { - // We've not seen a packet sync for too long, signal RXLOST and change to RX_NONE + // We've not seen a sync for too long, signal RXLOST and change to RX_NONE m_lostCount--; if (m_lostCount == 0U) { - DEBUG1("M17RX: packet sync timed out, lost lock"); + DEBUG1("M17RX: sync timed out, lost lock"); io.setDecode(false); serial.writeM17Lost(); reset(); } else { // Write data to host - m_outBuffer[0U] = 0x02U; // Packet data + m_outBuffer[0U] = 0x00U; // Stream data m_outBuffer[0U] |= m_lostCount == (MAX_SYNC_FRAMES - 1U) ? 0x01U : 0x00U; - writeRSSIData(m_outBuffer); + + switch (m_state) { + case M17RXS_LINK_SETUP: + writeRSSILinkSetup(m_outBuffer); + break; + case M17RXS_STREAM: + writeRSSIStream(m_outBuffer); + break; + default: + writeRSSIPacket(m_outBuffer); + break; + } // Start the next frame ::memset(m_outBuffer, 0x00U, M17_FRAME_LENGTH_BYTES + 3U); @@ -227,7 +188,7 @@ void CM17RX::processPacket(bool bit) } } -void CM17RX::writeRSSIHeader(uint8_t* data) +void CM17RX::writeRSSILinkSetup(uint8_t* data) { #if defined(SEND_RSSI_DATA) uint16_t rssi = io.readRSSI(); @@ -235,13 +196,13 @@ void CM17RX::writeRSSIHeader(uint8_t* data) data[49U] = (rssi >> 8) & 0xFFU; data[50U] = (rssi >> 0) & 0xFFU; - serial.writeM17Header(data, M17_FRAME_LENGTH_BYTES + 3U); + serial.writeM17LinkSetup(data, M17_FRAME_LENGTH_BYTES + 3U); #else - serial.writeM17Header(data, M17_FRAME_LENGTH_BYTES + 1U); + serial.writeM17LinkSetup(data, M17_FRAME_LENGTH_BYTES + 1U); #endif } -void CM17RX::writeRSSIData(uint8_t* data) +void CM17RX::writeRSSIStream(uint8_t* data) { #if defined(SEND_RSSI_DATA) uint16_t rssi = io.readRSSI(); @@ -249,8 +210,23 @@ void CM17RX::writeRSSIData(uint8_t* data) data[49U] = (rssi >> 8) & 0xFFU; data[50U] = (rssi >> 0) & 0xFFU; - serial.writeM17Data(data, M17_FRAME_LENGTH_BYTES + 3U); + serial.writeM17Stream(data, M17_FRAME_LENGTH_BYTES + 3U); #else - serial.writeM17Data(data, M17_FRAME_LENGTH_BYTES + 1U); + serial.writeM17Stream(data, M17_FRAME_LENGTH_BYTES + 1U); #endif } + +void CM17RX::writeRSSIPacket(uint8_t* data) +{ +#if defined(SEND_RSSI_DATA) + uint16_t rssi = io.readRSSI(); + + data[49U] = (rssi >> 8) & 0xFFU; + data[50U] = (rssi >> 0) & 0xFFU; + + serial.writeM17Packet(data, M17_FRAME_LENGTH_BYTES + 3U); +#else + serial.writeM17Packet(data, M17_FRAME_LENGTH_BYTES + 1U); +#endif +} + diff --git a/M17RX.h b/M17RX.h index 0cf3626..3329b81 100644 --- a/M17RX.h +++ b/M17RX.h @@ -46,11 +46,11 @@ private: uint16_t m_lostCount; void processNone(bool bit); - void processLinkSetup(bool bit); - void processStream(bool bit); - void processPacket(bool bit); - void writeRSSIHeader(uint8_t* data); - void writeRSSIData(uint8_t* data); + void processData(bool bit); + void writeRSSILinkSetup(uint8_t* data); + void writeRSSIStream(uint8_t* data); + void writeRSSIPacket(uint8_t* data); }; #endif + diff --git a/SerialPort.cpp b/SerialPort.cpp index edc3287..d230247 100644 --- a/SerialPort.cpp +++ b/SerialPort.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013,2015,2016,2018,2020 by Jonathan Naylor G4KLX + * Copyright (C) 2013,2015,2016,2018,2020,2021 by Jonathan Naylor G4KLX * Copyright (C) 2016 by Colin Durbridge G4EML * Copyright (C) 2016,2017,2018,2019 by Andy Uribe CA6JAU * Copyright (C) 2019 by Florian Wolters DF2ET @@ -60,9 +60,10 @@ const uint8_t MMDVM_P25_LOST = 0x32U; const uint8_t MMDVM_NXDN_DATA = 0x40U; const uint8_t MMDVM_NXDN_LOST = 0x41U; -const uint8_t MMDVM_M17_HEADER = 0x45U; -const uint8_t MMDVM_M17_DATA = 0x46U; -const uint8_t MMDVM_M17_LOST = 0x47U; +const uint8_t MMDVM_M17_LINK_SETUP = 0x45U; +const uint8_t MMDVM_M17_STREAM = 0x46U; +const uint8_t MMDVM_M17_PACKET = 0x47U; +const uint8_t MMDVM_M17_LOST = 0x48U; const uint8_t MMDVM_POCSAG_DATA = 0x50U; @@ -865,7 +866,7 @@ void CSerialPort::process() } break; - case MMDVM_M17_HEADER: + case MMDVM_M17_LINK_SETUP: if (m_m17Enable) { if (m_modemState == STATE_IDLE || m_modemState == STATE_M17) err = m17TX.writeData(m_buffer + 3U, m_len - 3U); @@ -874,12 +875,12 @@ void CSerialPort::process() if (m_modemState == STATE_IDLE) setMode(STATE_M17); } else { - DEBUG2("Received invalid M17 header", err); + DEBUG2("Received invalid M17 link setup data", err); sendNAK(err); } break; - case MMDVM_M17_DATA: + case MMDVM_M17_STREAM: if (m_m17Enable) { if (m_modemState == STATE_IDLE || m_modemState == STATE_M17) err = m17TX.writeData(m_buffer + 3U, m_len - 3U); @@ -888,7 +889,21 @@ void CSerialPort::process() if (m_modemState == STATE_IDLE) setMode(STATE_M17); } else { - DEBUG2("Received invalid M17 data", err); + DEBUG2("Received invalid M17 stream data", err); + sendNAK(err); + } + break; + + case MMDVM_M17_PACKET: + if (m_m17Enable) { + if (m_modemState == STATE_IDLE || m_modemState == STATE_M17) + err = m17TX.writeData(m_buffer + 3U, m_len - 3U); + } + if (err == 0U) { + if (m_modemState == STATE_IDLE) + setMode(STATE_M17); + } else { + DEBUG2("Received invalid M17 packet data", err); sendNAK(err); } break; @@ -1248,7 +1263,30 @@ void CSerialPort::writeNXDNLost() writeInt(1U, reply, 3); } -void CSerialPort::writeM17Header(const uint8_t* data, uint8_t length) +void CSerialPort::writeM17LinkSetup(const uint8_t* data, uint8_t length) +{ + if (m_modemState != STATE_M17 && m_modemState != STATE_IDLE) + return; + + if (!m_m17Enable) + return; + + uint8_t reply[130U]; + + reply[0U] = MMDVM_FRAME_START; + reply[1U] = 0U; + reply[2U] = MMDVM_M17_LINK_SETUP; + + uint8_t count = 3U; + for (uint8_t i = 0U; i < length; i++, count++) + reply[count] = data[i]; + + reply[1U] = count; + + writeInt(1U, reply, count); +} + +void CSerialPort::writeM17Stream(const uint8_t* data, uint8_t length) { if (m_modemState != STATE_M17 && m_modemState != STATE_IDLE) return; @@ -1260,7 +1298,7 @@ void CSerialPort::writeM17Header(const uint8_t* data, uint8_t length) reply[0U] = MMDVM_FRAME_START; reply[1U] = 0U; - reply[2U] = MMDVM_M17_HEADER; + reply[2U] = MMDVM_M17_STREAM; uint8_t count = 3U; for (uint8_t i = 0U; i < length; i++, count++) @@ -1271,7 +1309,7 @@ void CSerialPort::writeM17Header(const uint8_t* data, uint8_t length) writeInt(1U, reply, count); } -void CSerialPort::writeM17Data(const uint8_t* data, uint8_t length) +void CSerialPort::writeM17Packet(const uint8_t* data, uint8_t length) { if (m_modemState != STATE_M17 && m_modemState != STATE_IDLE) return; @@ -1283,7 +1321,7 @@ void CSerialPort::writeM17Data(const uint8_t* data, uint8_t length) reply[0U] = MMDVM_FRAME_START; reply[1U] = 0U; - reply[2U] = MMDVM_M17_DATA; + reply[2U] = MMDVM_M17_PACKET; uint8_t count = 3U; for (uint8_t i = 0U; i < length; i++, count++) diff --git a/SerialPort.h b/SerialPort.h index 38d2139..f397c52 100644 --- a/SerialPort.h +++ b/SerialPort.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015,2016,2018,2020 by Jonathan Naylor G4KLX + * Copyright (C) 2015,2016,2018,2020,2021 by Jonathan Naylor G4KLX * Copyright (C) 2018 by Andy Uribe CA6JAU * * This program is free software; you can redistribute it and/or modify @@ -52,8 +52,9 @@ public: void writeNXDNData(const uint8_t* data, uint8_t length); void writeNXDNLost(); - void writeM17Header(const uint8_t* data, uint8_t length); - void writeM17Data(const uint8_t* data, uint8_t length); + void writeM17LinkSetup(const uint8_t* data, uint8_t length); + void writeM17Stream(const uint8_t* data, uint8_t length); + void writeM17Packet(const uint8_t* data, uint8_t length); void writeM17Lost(); #if defined(SEND_RSSI_DATA) diff --git a/version.h b/version.h index d48ac89..3d379e6 100644 --- a/version.h +++ b/version.h @@ -25,7 +25,7 @@ #define VER_MAJOR "1" #define VER_MINOR "5" #define VER_REV "2" -#define VERSION_DATE "20210102" +#define VERSION_DATE "20210314" #if defined(ZUMSPOT_ADF7021) #define BOARD_INFO "ZUMspot" From e3cadb7f32c17dc5c74ab63723672bfbc8690847 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Sun, 22 Aug 2021 13:27:18 +0100 Subject: [PATCH 14/26] Remove M17 packet mode. --- M17Defines.h | 4 +--- M17RX.cpp | 40 ---------------------------------------- M17RX.h | 4 +--- SerialPort.cpp | 23 ----------------------- SerialPort.h | 1 - version.h | 3 ++- 6 files changed, 4 insertions(+), 71 deletions(-) diff --git a/M17Defines.h b/M17Defines.h index 2f8e98e..3cc28b9 100644 --- a/M17Defines.h +++ b/M17Defines.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016,2017,2018,2020 by Jonathan Naylor G4KLX + * Copyright (C) 2016,2017,2018,2020,2021 by Jonathan Naylor G4KLX * * 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 @@ -28,13 +28,11 @@ const unsigned int M17_SYNC_LENGTH_BITS = 16U; const uint8_t M17_LINK_SETUP_SYNC_BYTES[] = {0x55U, 0xF7U}; const uint8_t M17_STREAM_SYNC_BYTES[] = {0xFFU, 0x5DU}; -const uint8_t M17_PACKET_SYNC_BYTES[] = {0x75U, 0xFFU}; const uint8_t M17_SYNC_BYTES_LENGTH = 2U; const uint16_t M17_LINK_SETUP_SYNC_BITS = 0x55F7U; const uint16_t M17_STREAM_SYNC_BITS = 0xFF5DU; -const uint16_t M17_PACKET_SYNC_BITS = 0x75FFU; #endif diff --git a/M17RX.cpp b/M17RX.cpp index 3954eb9..9cd81b2 100644 --- a/M17RX.cpp +++ b/M17RX.cpp @@ -55,7 +55,6 @@ void CM17RX::databit(bool bit) switch (m_state) { case M17RXS_LINK_SETUP: case M17RXS_STREAM: - case M17RXS_PACKET: processData(bit); break; default: @@ -95,19 +94,6 @@ void CM17RX::processNone(bool bit) io.setDecode(true); } - - // Fuzzy matching of the packet sync bit sequence - if (countBits16(m_bitBuffer ^ M17_PACKET_SYNC_BITS) <= MAX_SYNC_BIT_START_ERRS) { - DEBUG1("M17RX: packet sync found in None"); - for (uint8_t i = 0U; i < M17_SYNC_BYTES_LENGTH; i++) - m_buffer[i] = M17_PACKET_SYNC_BYTES[i]; - - m_lostCount = MAX_SYNC_FRAMES; - m_bufferPtr = M17_SYNC_LENGTH_BITS; - m_state = M17RXS_PACKET; - - io.setDecode(true); - } } void CM17RX::processData(bool bit) @@ -144,17 +130,6 @@ void CM17RX::processData(bool bit) } } - // Only search for a packet sync in the right place +-2 symbols - if (m_bufferPtr >= (M17_SYNC_LENGTH_BITS - 2U) && m_bufferPtr <= (M17_SYNC_LENGTH_BITS + 2U)) { - // Fuzzy matching of the stream sync bit sequence - if (countBits16(m_bitBuffer ^ M17_STREAM_SYNC_BITS) <= MAX_SYNC_BIT_RUN_ERRS) { - DEBUG2("M17RX: found packet sync, pos", m_bufferPtr - M17_SYNC_LENGTH_BITS); - m_lostCount = MAX_SYNC_FRAMES; - m_bufferPtr = M17_SYNC_LENGTH_BITS; - m_state = M17RXS_PACKET; - } - } - // Send a frame to the host if the required number of bits have been received if (m_bufferPtr == M17_FRAME_LENGTH_BITS) { // We've not seen a sync for too long, signal RXLOST and change to RX_NONE @@ -177,7 +152,6 @@ void CM17RX::processData(bool bit) writeRSSIStream(m_outBuffer); break; default: - writeRSSIPacket(m_outBuffer); break; } @@ -216,17 +190,3 @@ void CM17RX::writeRSSIStream(uint8_t* data) #endif } -void CM17RX::writeRSSIPacket(uint8_t* data) -{ -#if defined(SEND_RSSI_DATA) - uint16_t rssi = io.readRSSI(); - - data[49U] = (rssi >> 8) & 0xFFU; - data[50U] = (rssi >> 0) & 0xFFU; - - serial.writeM17Packet(data, M17_FRAME_LENGTH_BYTES + 3U); -#else - serial.writeM17Packet(data, M17_FRAME_LENGTH_BYTES + 1U); -#endif -} - diff --git a/M17RX.h b/M17RX.h index 3329b81..1284a29 100644 --- a/M17RX.h +++ b/M17RX.h @@ -25,8 +25,7 @@ enum M17RX_STATE { M17RXS_NONE, M17RXS_LINK_SETUP, - M17RXS_STREAM, - M17RXS_PACKET + M17RXS_STREAM }; class CM17RX { @@ -49,7 +48,6 @@ private: void processData(bool bit); void writeRSSILinkSetup(uint8_t* data); void writeRSSIStream(uint8_t* data); - void writeRSSIPacket(uint8_t* data); }; #endif diff --git a/SerialPort.cpp b/SerialPort.cpp index d230247..bd73f02 100644 --- a/SerialPort.cpp +++ b/SerialPort.cpp @@ -1309,29 +1309,6 @@ void CSerialPort::writeM17Stream(const uint8_t* data, uint8_t length) writeInt(1U, reply, count); } -void CSerialPort::writeM17Packet(const uint8_t* data, uint8_t length) -{ - if (m_modemState != STATE_M17 && m_modemState != STATE_IDLE) - return; - - if (!m_m17Enable) - return; - - uint8_t reply[130U]; - - reply[0U] = MMDVM_FRAME_START; - reply[1U] = 0U; - reply[2U] = MMDVM_M17_PACKET; - - uint8_t count = 3U; - for (uint8_t i = 0U; i < length; i++, count++) - reply[count] = data[i]; - - reply[1U] = count; - - writeInt(1U, reply, count); -} - void CSerialPort::writeM17Lost() { if (m_modemState != STATE_M17 && m_modemState != STATE_IDLE) diff --git a/SerialPort.h b/SerialPort.h index f397c52..f38c9f0 100644 --- a/SerialPort.h +++ b/SerialPort.h @@ -54,7 +54,6 @@ public: void writeM17LinkSetup(const uint8_t* data, uint8_t length); void writeM17Stream(const uint8_t* data, uint8_t length); - void writeM17Packet(const uint8_t* data, uint8_t length); void writeM17Lost(); #if defined(SEND_RSSI_DATA) diff --git a/version.h b/version.h index 3d379e6..ccb44a5 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2017,2018,2019,2020 by Andy Uribe CA6JAU + * Copyright (C) 2020,2021 by Jonathan Naylor G4KLX * * 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 @@ -25,7 +26,7 @@ #define VER_MAJOR "1" #define VER_MINOR "5" #define VER_REV "2" -#define VERSION_DATE "20210314" +#define VERSION_DATE "20210822" #if defined(ZUMSPOT_ADF7021) #define BOARD_INFO "ZUMspot" From 800ec4fe140d1971334f6ac38249998b812b33eb Mon Sep 17 00:00:00 2001 From: Mathis Schmieder Date: Mon, 23 Aug 2021 18:41:29 +0100 Subject: [PATCH 15/26] Updated ADF7021 register values for M17 --- ADF7021.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ADF7021.h b/ADF7021.h index 7b58c5f..b638a91 100644 --- a/ADF7021.h +++ b/ADF7021.h @@ -118,7 +118,7 @@ www.analog.com/media/en/technical-documentation/data-sheets/ADF7021.pdf #define ADF7021_DISC_BW_YSF_H 516U // K=28 #define ADF7021_DISC_BW_P25 394U // K=32 #define ADF7021_DISC_BW_NXDN 295U // K=32 -#define ADF7021_DISC_BW_M17 571U // K=31 +#define ADF7021_DISC_BW_M17 590U // K=32 #define ADF7021_DISC_BW_POCSAG 406U // K=22 // Post demodulator bandwith (REG 04) @@ -127,7 +127,7 @@ www.analog.com/media/en/technical-documentation/data-sheets/ADF7021.pdf #define ADF7021_POST_BW_YSF 20U #define ADF7021_POST_BW_P25 6U #define ADF7021_POST_BW_NXDN 7U -#define ADF7021_POST_BW_M17 20U // Test +#define ADF7021_POST_BW_M17 8U // Test #define ADF7021_POST_BW_POCSAG 1U // IF filter (REG 05) @@ -229,7 +229,7 @@ www.analog.com/media/en/technical-documentation/data-sheets/ADF7021.pdf #define ADF7021_DISC_BW_YSF_H 430U // K=28 #define ADF7021_DISC_BW_P25 493U // K=32 #define ADF7021_DISC_BW_NXDN 246U // K=32 -#define ADF7021_DISC_BW_M17 476U // K=31 +#define ADF7021_DISC_BW_M17 491U // K=32 #define ADF7021_DISC_BW_POCSAG 338U // K=22 // Post demodulator bandwith (REG 04) @@ -238,7 +238,7 @@ www.analog.com/media/en/technical-documentation/data-sheets/ADF7021.pdf #define ADF7021_POST_BW_YSF 20U #define ADF7021_POST_BW_P25 6U #define ADF7021_POST_BW_NXDN 8U -#define ADF7021_POST_BW_M17 20U // Test +#define ADF7021_POST_BW_M17 8U // Test #define ADF7021_POST_BW_POCSAG 1U // IF filter (REG 05) From a80dc06ed67a83c39d4eef1991e8915bd56f870d Mon Sep 17 00:00:00 2001 From: Mathis Schmieder Date: Mon, 23 Aug 2021 18:44:32 +0100 Subject: [PATCH 16/26] Updated version.h --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index ccb44a5..461bc92 100644 --- a/version.h +++ b/version.h @@ -26,7 +26,7 @@ #define VER_MAJOR "1" #define VER_MINOR "5" #define VER_REV "2" -#define VERSION_DATE "20210822" +#define VERSION_DATE "20210823" #if defined(ZUMSPOT_ADF7021) #define BOARD_INFO "ZUMspot" From 36f607250aedd714ee818869572ee3f8459da77c Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Thu, 26 Aug 2021 18:14:05 +0100 Subject: [PATCH 17/26] Add support for the new EOF sync pattern. --- M17Defines.h | 3 +++ M17RX.cpp | 13 +++++++++---- M17TX.cpp | 31 +++++++++++++++++++++++++++++-- M17TX.h | 6 ++++-- SerialPort.cpp | 28 +++++++++++++++++++++++----- SerialPort.h | 1 + version.h | 2 +- 7 files changed, 70 insertions(+), 14 deletions(-) diff --git a/M17Defines.h b/M17Defines.h index 3cc28b9..65ac8a4 100644 --- a/M17Defines.h +++ b/M17Defines.h @@ -25,14 +25,17 @@ const unsigned int M17_FRAME_LENGTH_BITS = 384U; const unsigned int M17_FRAME_LENGTH_BYTES = M17_FRAME_LENGTH_BITS / 8U; const unsigned int M17_SYNC_LENGTH_BITS = 16U; +const unsigned int M17_SYNC_LENGTH_BYTES = M17_SYNC_LENGTH_BITS / 8U; const uint8_t M17_LINK_SETUP_SYNC_BYTES[] = {0x55U, 0xF7U}; const uint8_t M17_STREAM_SYNC_BYTES[] = {0xFFU, 0x5DU}; +const uint8_t M17_EOF_SYNC_BYTES[] = {0x55U, 0x5DU}; const uint8_t M17_SYNC_BYTES_LENGTH = 2U; const uint16_t M17_LINK_SETUP_SYNC_BITS = 0x55F7U; const uint16_t M17_STREAM_SYNC_BITS = 0xFF5DU; +const uint16_t M17_EOF_SYNC_BITS = 0x555DU; #endif diff --git a/M17RX.cpp b/M17RX.cpp index 9cd81b2..657fa33 100644 --- a/M17RX.cpp +++ b/M17RX.cpp @@ -108,7 +108,7 @@ void CM17RX::processData(bool bit) if (m_bufferPtr > M17_FRAME_LENGTH_BITS) reset(); - // Only search for a link setup sync in the right place +-2 symbols + // Only search for the syncs in the right place +-2 symbols if (m_bufferPtr >= (M17_SYNC_LENGTH_BITS - 2U) && m_bufferPtr <= (M17_SYNC_LENGTH_BITS + 2U)) { // Fuzzy matching of the stream sync bit sequence if (countBits16(m_bitBuffer ^ M17_LINK_SETUP_SYNC_BITS) <= MAX_SYNC_BIT_RUN_ERRS) { @@ -117,10 +117,7 @@ void CM17RX::processData(bool bit) m_bufferPtr = M17_SYNC_LENGTH_BITS; m_state = M17RXS_LINK_SETUP; } - } - // Only search for a stream sync in the right place +-2 symbols - if (m_bufferPtr >= (M17_SYNC_LENGTH_BITS - 2U) && m_bufferPtr <= (M17_SYNC_LENGTH_BITS + 2U)) { // Fuzzy matching of the stream sync bit sequence if (countBits16(m_bitBuffer ^ M17_STREAM_SYNC_BITS) <= MAX_SYNC_BIT_RUN_ERRS) { DEBUG2("M17RX: found stream sync, pos", m_bufferPtr - M17_SYNC_LENGTH_BITS); @@ -128,6 +125,14 @@ void CM17RX::processData(bool bit) m_bufferPtr = M17_SYNC_LENGTH_BITS; m_state = M17RXS_STREAM; } + + // Fuzzy matching of the eof sync bit sequence + if (countBits16(m_bitBuffer ^ M17_EOF_SYNC_BITS) <= MAX_SYNC_BIT_RUN_ERRS) { + DEBUG2("M17RX: found eof sync, pos", m_bufferPtr - M17_SYNC_LENGTH_BITS); + io.setDecode(false); + serial.writeM17EOT(); + reset(); + } } // Send a frame to the host if the required number of bits have been received diff --git a/M17TX.cpp b/M17TX.cpp index 4123ed5..20c16b8 100644 --- a/M17TX.cpp +++ b/M17TX.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2018,2020 by Jonathan Naylor G4KLX + * Copyright (C) 2009-2018,2020,2021 by Jonathan Naylor G4KLX * Copyright (C) 2017 by Andy Uribe CA6JAU * * This program is free software; you can redistribute it and/or modify @@ -82,7 +82,7 @@ void CM17TX::process() } } -uint8_t CM17TX::writeData(const uint8_t* data, uint8_t length) +uint8_t CM17TX::writeLinkSetup(const uint8_t* data, uint8_t length) { if (length != (M17_FRAME_LENGTH_BYTES + 1U)) return 4U; @@ -97,6 +97,33 @@ uint8_t CM17TX::writeData(const uint8_t* data, uint8_t length) return 0U; } +uint8_t CM17TX::writeStream(const uint8_t* data, uint8_t length) +{ + if (length != (M17_FRAME_LENGTH_BYTES + 1U)) + return 4U; + + uint16_t space = m_buffer.getSpace(); + if (space < M17_FRAME_LENGTH_BYTES) + return 5U; + + for (uint8_t i = 0U; i < M17_FRAME_LENGTH_BYTES; i++) + m_buffer.put(data[i + 1U]); + + return 0U; +} + +uint8_t CM17TX::writeEOT() +{ + uint16_t space = m_buffer.getSpace(); + if (space < M17_SYNC_LENGTH_BYTES) + return 5U; + + for (uint8_t i = 0U; i < M17_SYNC_LENGTH_BYTES; i++) + m_buffer.put(M17_EOF_SYNC_BYTES[i]); + + return 0U; +} + void CM17TX::writeByte(uint8_t c) { uint8_t bit; diff --git a/M17TX.h b/M17TX.h index 799794f..61b63c0 100644 --- a/M17TX.h +++ b/M17TX.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015,2016,2017,2020 by Jonathan Naylor G4KLX + * Copyright (C) 2015,2016,2017,2020,2021 by Jonathan Naylor G4KLX * * 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 @@ -27,7 +27,9 @@ class CM17TX { public: CM17TX(); - uint8_t writeData(const uint8_t* data, uint8_t length); + uint8_t writeLinkSetup(const uint8_t* data, uint8_t length); + uint8_t writeStream(const uint8_t* data, uint8_t length); + uint8_t writeEOT(); void process(); diff --git a/SerialPort.cpp b/SerialPort.cpp index bd73f02..6c7dc55 100644 --- a/SerialPort.cpp +++ b/SerialPort.cpp @@ -64,6 +64,7 @@ const uint8_t MMDVM_M17_LINK_SETUP = 0x45U; const uint8_t MMDVM_M17_STREAM = 0x46U; const uint8_t MMDVM_M17_PACKET = 0x47U; const uint8_t MMDVM_M17_LOST = 0x48U; +const uint8_t MMDVM_M17_EOT = 0x49U; const uint8_t MMDVM_POCSAG_DATA = 0x50U; @@ -869,7 +870,7 @@ void CSerialPort::process() case MMDVM_M17_LINK_SETUP: if (m_m17Enable) { if (m_modemState == STATE_IDLE || m_modemState == STATE_M17) - err = m17TX.writeData(m_buffer + 3U, m_len - 3U); + err = m17TX.writeLinkSetup(m_buffer + 3U, m_len - 3U); } if (err == 0U) { if (m_modemState == STATE_IDLE) @@ -883,7 +884,7 @@ void CSerialPort::process() case MMDVM_M17_STREAM: if (m_m17Enable) { if (m_modemState == STATE_IDLE || m_modemState == STATE_M17) - err = m17TX.writeData(m_buffer + 3U, m_len - 3U); + err = m17TX.writeStream(m_buffer + 3U, m_len - 3U); } if (err == 0U) { if (m_modemState == STATE_IDLE) @@ -894,16 +895,16 @@ void CSerialPort::process() } break; - case MMDVM_M17_PACKET: + case MMDVM_M17_EOT: if (m_m17Enable) { if (m_modemState == STATE_IDLE || m_modemState == STATE_M17) - err = m17TX.writeData(m_buffer + 3U, m_len - 3U); + err = m17TX.writeEOT(); } if (err == 0U) { if (m_modemState == STATE_IDLE) setMode(STATE_M17); } else { - DEBUG2("Received invalid M17 packet data", err); + DEBUG2("Received invalid M17 EOT", err); sendNAK(err); } break; @@ -1309,6 +1310,23 @@ void CSerialPort::writeM17Stream(const uint8_t* data, uint8_t length) writeInt(1U, reply, count); } +void CSerialPort::writeM17EOT() +{ + if (m_modemState != STATE_M17 && m_modemState != STATE_IDLE) + return; + + if (!m_m17Enable) + return; + + uint8_t reply[3U]; + + reply[0U] = MMDVM_FRAME_START; + reply[1U] = 3U; + reply[2U] = MMDVM_M17_EOT; + + writeInt(1U, reply, 3); +} + void CSerialPort::writeM17Lost() { if (m_modemState != STATE_M17 && m_modemState != STATE_IDLE) diff --git a/SerialPort.h b/SerialPort.h index f38c9f0..a8913f5 100644 --- a/SerialPort.h +++ b/SerialPort.h @@ -54,6 +54,7 @@ public: void writeM17LinkSetup(const uint8_t* data, uint8_t length); void writeM17Stream(const uint8_t* data, uint8_t length); + void writeM17EOT(); void writeM17Lost(); #if defined(SEND_RSSI_DATA) diff --git a/version.h b/version.h index ccb44a5..cc6658a 100644 --- a/version.h +++ b/version.h @@ -26,7 +26,7 @@ #define VER_MAJOR "1" #define VER_MINOR "5" #define VER_REV "2" -#define VERSION_DATE "20210822" +#define VERSION_DATE "20210826" #if defined(ZUMSPOT_ADF7021) #define BOARD_INFO "ZUMspot" From 6781dec322f4056715cec405f4965b8267f81acc Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Thu, 26 Aug 2021 18:28:14 +0100 Subject: [PATCH 18/26] Remove unnecessary link setup sync detection --- M17RX.cpp | 8 -------- 1 file changed, 8 deletions(-) diff --git a/M17RX.cpp b/M17RX.cpp index 657fa33..bcc1d86 100644 --- a/M17RX.cpp +++ b/M17RX.cpp @@ -110,14 +110,6 @@ void CM17RX::processData(bool bit) // Only search for the syncs in the right place +-2 symbols if (m_bufferPtr >= (M17_SYNC_LENGTH_BITS - 2U) && m_bufferPtr <= (M17_SYNC_LENGTH_BITS + 2U)) { - // Fuzzy matching of the stream sync bit sequence - if (countBits16(m_bitBuffer ^ M17_LINK_SETUP_SYNC_BITS) <= MAX_SYNC_BIT_RUN_ERRS) { - DEBUG2("M17RX: found link setup sync, pos", m_bufferPtr - M17_SYNC_LENGTH_BITS); - m_lostCount = MAX_SYNC_FRAMES; - m_bufferPtr = M17_SYNC_LENGTH_BITS; - m_state = M17RXS_LINK_SETUP; - } - // Fuzzy matching of the stream sync bit sequence if (countBits16(m_bitBuffer ^ M17_STREAM_SYNC_BITS) <= MAX_SYNC_BIT_RUN_ERRS) { DEBUG2("M17RX: found stream sync, pos", m_bufferPtr - M17_SYNC_LENGTH_BITS); From d9621c5c8baf45c31aea55fcfe10520fc66ff4b7 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Wed, 8 Sep 2021 19:52:31 +0100 Subject: [PATCH 19/26] Disable M17 EOT transmission for now. --- M17TX.cpp | 3 ++- version.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/M17TX.cpp b/M17TX.cpp index 20c16b8..dceb8b3 100644 --- a/M17TX.cpp +++ b/M17TX.cpp @@ -114,13 +114,14 @@ uint8_t CM17TX::writeStream(const uint8_t* data, uint8_t length) uint8_t CM17TX::writeEOT() { +/* uint16_t space = m_buffer.getSpace(); if (space < M17_SYNC_LENGTH_BYTES) return 5U; for (uint8_t i = 0U; i < M17_SYNC_LENGTH_BYTES; i++) m_buffer.put(M17_EOF_SYNC_BYTES[i]); - +*/ return 0U; } diff --git a/version.h b/version.h index cc6658a..0e57912 100644 --- a/version.h +++ b/version.h @@ -26,7 +26,7 @@ #define VER_MAJOR "1" #define VER_MINOR "5" #define VER_REV "2" -#define VERSION_DATE "20210826" +#define VERSION_DATE "20210908" #if defined(ZUMSPOT_ADF7021) #define BOARD_INFO "ZUMspot" From 6fc189793d89b8c2afa1ea22286e5c4f8b26945b Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Sun, 12 Sep 2021 20:59:59 +0100 Subject: [PATCH 20/26] Roll back some of recent changes. --- M17Defines.h | 4 ++-- M17RX.cpp | 18 +++++++++++++----- M17TX.cpp | 4 ++-- version.h | 2 +- 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/M17Defines.h b/M17Defines.h index 65ac8a4..d50dc08 100644 --- a/M17Defines.h +++ b/M17Defines.h @@ -29,13 +29,13 @@ const unsigned int M17_SYNC_LENGTH_BYTES = M17_SYNC_LENGTH_BITS / 8U; const uint8_t M17_LINK_SETUP_SYNC_BYTES[] = {0x55U, 0xF7U}; const uint8_t M17_STREAM_SYNC_BYTES[] = {0xFFU, 0x5DU}; -const uint8_t M17_EOF_SYNC_BYTES[] = {0x55U, 0x5DU}; +const uint8_t M17_EOT_SYNC_BYTES[] = {0x55U, 0x5DU}; const uint8_t M17_SYNC_BYTES_LENGTH = 2U; const uint16_t M17_LINK_SETUP_SYNC_BITS = 0x55F7U; const uint16_t M17_STREAM_SYNC_BITS = 0xFF5DU; -const uint16_t M17_EOF_SYNC_BITS = 0x555DU; +const uint16_t M17_EOT_SYNC_BITS = 0x555DU; #endif diff --git a/M17RX.cpp b/M17RX.cpp index bcc1d86..9c514d2 100644 --- a/M17RX.cpp +++ b/M17RX.cpp @@ -110,6 +110,14 @@ void CM17RX::processData(bool bit) // Only search for the syncs in the right place +-2 symbols if (m_bufferPtr >= (M17_SYNC_LENGTH_BITS - 2U) && m_bufferPtr <= (M17_SYNC_LENGTH_BITS + 2U)) { + // Fuzzy matching of the link setup sync bit sequence + if (countBits16(m_bitBuffer ^ M17_LINK_SETUP_SYNC_BITS) <= MAX_SYNC_BIT_RUN_ERRS) { + DEBUG2("M17RX: found link setup sync, pos", m_bufferPtr - M17_SYNC_LENGTH_BITS); + m_lostCount = MAX_SYNC_FRAMES; + m_bufferPtr = M17_SYNC_LENGTH_BITS; + m_state = M17RXS_LINK_SETUP; + } + // Fuzzy matching of the stream sync bit sequence if (countBits16(m_bitBuffer ^ M17_STREAM_SYNC_BITS) <= MAX_SYNC_BIT_RUN_ERRS) { DEBUG2("M17RX: found stream sync, pos", m_bufferPtr - M17_SYNC_LENGTH_BITS); @@ -118,12 +126,13 @@ void CM17RX::processData(bool bit) m_state = M17RXS_STREAM; } - // Fuzzy matching of the eof sync bit sequence - if (countBits16(m_bitBuffer ^ M17_EOF_SYNC_BITS) <= MAX_SYNC_BIT_RUN_ERRS) { - DEBUG2("M17RX: found eof sync, pos", m_bufferPtr - M17_SYNC_LENGTH_BITS); + // Fuzzy matching of the EOT sync bit sequence + if (countBits16(m_bitBuffer ^ M17_EOT_SYNC_BITS) <= MAX_SYNC_BIT_RUN_ERRS) { + DEBUG2("M17RX: found eot sync, pos", m_bufferPtr - M17_SYNC_LENGTH_BITS); io.setDecode(false); serial.writeM17EOT(); reset(); + return; } } @@ -138,8 +147,7 @@ void CM17RX::processData(bool bit) reset(); } else { // Write data to host - m_outBuffer[0U] = 0x00U; // Stream data - m_outBuffer[0U] |= m_lostCount == (MAX_SYNC_FRAMES - 1U) ? 0x01U : 0x00U; + m_outBuffer[0U] = m_lostCount == (MAX_SYNC_FRAMES - 1U) ? 0x01U : 0x00U; switch (m_state) { case M17RXS_LINK_SETUP: diff --git a/M17TX.cpp b/M17TX.cpp index dceb8b3..895dab6 100644 --- a/M17TX.cpp +++ b/M17TX.cpp @@ -116,11 +116,11 @@ uint8_t CM17TX::writeEOT() { /* uint16_t space = m_buffer.getSpace(); - if (space < M17_SYNC_LENGTH_BYTES) + if (space < M17_FRAME_LENGTH_BYTES) return 5U; for (uint8_t i = 0U; i < M17_SYNC_LENGTH_BYTES; i++) - m_buffer.put(M17_EOF_SYNC_BYTES[i]); + m_buffer.put(M17_EOT_SYNC_BYTES[i]); */ return 0U; } diff --git a/version.h b/version.h index 0e57912..2eae345 100644 --- a/version.h +++ b/version.h @@ -26,7 +26,7 @@ #define VER_MAJOR "1" #define VER_MINOR "5" #define VER_REV "2" -#define VERSION_DATE "20210908" +#define VERSION_DATE "20210912" #if defined(ZUMSPOT_ADF7021) #define BOARD_INFO "ZUMspot" From d408845f821d2a1f3a5fc80e71cc2d435e07d896 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Sun, 12 Sep 2021 21:47:08 +0100 Subject: [PATCH 21/26] Small optimisations of the sync decoding for M17 --- M17RX.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/M17RX.cpp b/M17RX.cpp index 9c514d2..06c5f16 100644 --- a/M17RX.cpp +++ b/M17RX.cpp @@ -69,7 +69,7 @@ void CM17RX::processNone(bool bit) if (bit) m_bitBuffer |= 0x01U; - // Fuzzy matching of the link setup sync bit sequence + // Exact matching of the link setup sync bit sequence if (countBits16(m_bitBuffer ^ M17_LINK_SETUP_SYNC_BITS) <= MAX_SYNC_BIT_START_ERRS) { DEBUG1("M17RX: link setup sync found in None"); for (uint8_t i = 0U; i < M17_SYNC_BYTES_LENGTH; i++) @@ -80,9 +80,11 @@ void CM17RX::processNone(bool bit) m_state = M17RXS_LINK_SETUP; io.setDecode(true); + + return; } - // Fuzzy matching of the stream sync bit sequence + // Exact matching of the stream sync bit sequence if (countBits16(m_bitBuffer ^ M17_STREAM_SYNC_BITS) <= MAX_SYNC_BIT_START_ERRS) { DEBUG1("M17RX: stream sync found in None"); for (uint8_t i = 0U; i < M17_SYNC_BYTES_LENGTH; i++) @@ -93,6 +95,8 @@ void CM17RX::processNone(bool bit) m_state = M17RXS_STREAM; io.setDecode(true); + + return; } } @@ -108,14 +112,15 @@ void CM17RX::processData(bool bit) if (m_bufferPtr > M17_FRAME_LENGTH_BITS) reset(); - // Only search for the syncs in the right place +-2 symbols - if (m_bufferPtr >= (M17_SYNC_LENGTH_BITS - 2U) && m_bufferPtr <= (M17_SYNC_LENGTH_BITS + 2U)) { + // Only search for the syncs in the right place +-1 bit + if (m_bufferPtr >= (M17_SYNC_LENGTH_BITS - 1U) && m_bufferPtr <= (M17_SYNC_LENGTH_BITS + 1U)) { // Fuzzy matching of the link setup sync bit sequence if (countBits16(m_bitBuffer ^ M17_LINK_SETUP_SYNC_BITS) <= MAX_SYNC_BIT_RUN_ERRS) { DEBUG2("M17RX: found link setup sync, pos", m_bufferPtr - M17_SYNC_LENGTH_BITS); m_lostCount = MAX_SYNC_FRAMES; m_bufferPtr = M17_SYNC_LENGTH_BITS; m_state = M17RXS_LINK_SETUP; + return; } // Fuzzy matching of the stream sync bit sequence @@ -124,6 +129,7 @@ void CM17RX::processData(bool bit) m_lostCount = MAX_SYNC_FRAMES; m_bufferPtr = M17_SYNC_LENGTH_BITS; m_state = M17RXS_STREAM; + return; } // Fuzzy matching of the EOT sync bit sequence From 023462a86dfd50740511de11c46ac4fc229f44d3 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Tue, 14 Sep 2021 19:16:05 +0100 Subject: [PATCH 22/26] Increase the IF bandwidth for duplex hotspots. --- ADF7021.cpp | 6 +++--- version.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ADF7021.cpp b/ADF7021.cpp index 4e1af57..500720b 100644 --- a/ADF7021.cpp +++ b/ADF7021.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 by Jonathan Naylor G4KLX + * Copyright (C) 2020,2021 by Jonathan Naylor G4KLX * Copyright (C) 2016 by Jim McLaughlin KI6ZUM * Copyright (C) 2016,2017,2018,2019,2020 by Andy Uribe CA6JAU * Copyright (C) 2017 by Danilo DB4PLE @@ -754,7 +754,7 @@ void CIO::ifConf2(MMDVM_STATE modemState) break; case STATE_M17: - // Dev: +1 symb 2400 Hz, symb rate = 4800 + // Dev: +1 symb 800 Hz, symb rate = 4800 ADF7021_REG3 = ADF7021_REG3_M17; ADF7021_REG10 = ADF7021_REG10_M17; @@ -766,7 +766,7 @@ void CIO::ifConf2(MMDVM_STATE modemState) ADF7021_REG4 |= (uint32_t) 0b11 << 8; ADF7021_REG4 |= (uint32_t) ADF7021_DISC_BW_M17 << 10; // Disc BW ADF7021_REG4 |= (uint32_t) ADF7021_POST_BW_M17 << 20; // Post dem BW - ADF7021_REG4 |= (uint32_t) 0b00 << 30; // IF filter (12.5 kHz) + ADF7021_REG4 |= (uint32_t) 0b10 << 30; // IF filter (25 kHz) ADF7021_REG13 = (uint32_t) 0b1101 << 0; // register 13 ADF7021_REG13 |= (uint32_t) ADF7021_SLICER_TH_M17 << 4; // slicer threshold diff --git a/version.h b/version.h index 2eae345..c3b873e 100644 --- a/version.h +++ b/version.h @@ -26,7 +26,7 @@ #define VER_MAJOR "1" #define VER_MINOR "5" #define VER_REV "2" -#define VERSION_DATE "20210912" +#define VERSION_DATE "20210914" #if defined(ZUMSPOT_ADF7021) #define BOARD_INFO "ZUMspot" From 92597e0d00595203bd9fbba163c967c271a8cf35 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Tue, 14 Sep 2021 20:53:41 +0100 Subject: [PATCH 23/26] Some contextual cleanups. --- ADF7021.cpp | 97 ++++++++++++++++++++++------------------------------- 1 file changed, 41 insertions(+), 56 deletions(-) diff --git a/ADF7021.cpp b/ADF7021.cpp index 500720b..8ec86de 100644 --- a/ADF7021.cpp +++ b/ADF7021.cpp @@ -54,10 +54,8 @@ uint16_t m_pocsagDev; static void Send_AD7021_control_shift() { - int AD7021_counter; - - for(AD7021_counter = 31; AD7021_counter >= 0; AD7021_counter--) { - if(bitRead(AD7021_control_word, AD7021_counter) == HIGH) + for (int AD7021_counter = 31; AD7021_counter >= 0; AD7021_counter--) { + if (bitRead(AD7021_control_word, AD7021_counter) == HIGH) io.SDATA_pin(HIGH); else io.SDATA_pin(LOW); @@ -67,6 +65,7 @@ static void Send_AD7021_control_shift() io.dlybit(); io.SCLK_pin(LOW); } + // to keep SDATA signal at defined level when idle (not required) io.SDATA_pin(LOW); } @@ -82,9 +81,8 @@ void Send_AD7021_control(bool doSle) { Send_AD7021_control_shift(); - if (doSle) { + if (doSle) Send_AD7021_control_slePulse(); - } } #if defined(DUPLEX) @@ -99,9 +97,8 @@ void Send_AD7021_control2(bool doSle) { Send_AD7021_control_shift(); - if (doSle) { + if (doSle) Send_AD7021_control_sle2Pulse(); - } } #endif @@ -110,15 +107,14 @@ uint16_t CIO::readRSSI() { uint32_t AD7021_RB; uint16_t RB_word = 0U; - int AD7021_counter; uint8_t RB_code, gain_code, gain_corr; // Register 7, readback enable, ADC RSSI mode AD7021_RB = 0x0147; // Send control register - for(AD7021_counter = 8; AD7021_counter >= 0; AD7021_counter--) { - if(bitRead(AD7021_RB, AD7021_counter) == HIGH) + for (int AD7021_counter = 8; AD7021_counter >= 0; AD7021_counter--) { + if (bitRead(AD7021_RB, AD7021_counter) == HIGH) SDATA_pin(HIGH); else SDATA_pin(LOW); @@ -143,16 +139,15 @@ uint16_t CIO::readRSSI() dlybit(); // Read SREAD pin - for(AD7021_counter = 17; AD7021_counter >= 0; AD7021_counter--) { + for (int AD7021_counter = 17; AD7021_counter >= 0; AD7021_counter--) { SCLK_pin(HIGH); dlybit(); - if( (AD7021_counter != 17) && (AD7021_counter != 0) ) - RB_word |= ( (SREAD_pin() & 0x01) << (AD7021_counter-1) ); + if ((AD7021_counter != 17) && (AD7021_counter != 0)) + RB_word |= ((SREAD_pin() & 0x01) << (AD7021_counter - 1)); SCLK_pin(LOW); dlybit(); - } #if defined(DUPLEX) @@ -223,7 +218,7 @@ void CIO::ifConf(MMDVM_STATE modemState, bool reset) #endif // Toggle CE pin for ADF7021 reset - if(reset) { + if (reset) { CE_pin(LOW); delay_reset(); CE_pin(HIGH); @@ -231,28 +226,24 @@ void CIO::ifConf(MMDVM_STATE modemState, bool reset) } // Check frequency band - if( (m_frequency_tx >= VHF1_MIN) && (m_frequency_tx < VHF1_MAX) ) { + if ((m_frequency_tx >= VHF1_MIN) && (m_frequency_tx < VHF1_MAX)) { ADF7021_REG1 = ADF7021_REG1_VHF1; // VHF1, external VCO div2 = 1U; - } - else if( (m_frequency_tx >= VHF2_MIN) && (m_frequency_tx < VHF2_MAX) ) { + } else if ((m_frequency_tx >= VHF2_MIN) && (m_frequency_tx < VHF2_MAX)) { ADF7021_REG1 = ADF7021_REG1_VHF2; // VHF1, external VCO div2 = 1U; - } - else if( (m_frequency_tx >= UHF1_MIN)&&(m_frequency_tx < UHF1_MAX) ) { + } else if ((m_frequency_tx >= UHF1_MIN)&&(m_frequency_tx < UHF1_MAX)) { ADF7021_REG1 = ADF7021_REG1_UHF1; // UHF1, internal VCO div2 = 1U; - } - else if( (m_frequency_tx >= UHF2_MIN)&&(m_frequency_tx < UHF2_MAX) ) { + } else if ((m_frequency_tx >= UHF2_MIN)&&(m_frequency_tx < UHF2_MAX)) { ADF7021_REG1 = ADF7021_REG1_UHF2; // UHF2, internal VCO div2 = 2U; - } - else { + } else { ADF7021_REG1 = ADF7021_REG1_UHF1; // UHF1, internal VCO div2 = 1U; } - if(div2 == 1U) + if (div2 == 1U) f_div = 2U; else f_div = 1U; @@ -282,10 +273,10 @@ void CIO::ifConf(MMDVM_STATE modemState, bool reset) break; } - if( div2 == 1U ) + if (div2 == 1U) divider = (m_frequency_rx - 100000 + AFC_OFFSET) / (ADF7021_PFD / 2U); else - divider = (m_frequency_rx - 100000 + (2*AFC_OFFSET)) / ADF7021_PFD; + divider = (m_frequency_rx - 100000 + (2 * AFC_OFFSET)) / ADF7021_PFD; m_RX_N_divider = floor(divider); divider = (divider - m_RX_N_divider) * 32768; @@ -302,7 +293,7 @@ void CIO::ifConf(MMDVM_STATE modemState, bool reset) ADF7021_RX_REG0 |= (uint32_t) m_RX_N_divider << 19; // frequency; ADF7021_RX_REG0 |= (uint32_t) m_RX_F_divider << 4; // frequency; - if( div2 == 1U ) + if (div2 == 1U) divider = m_frequency_tx / (ADF7021_PFD / 2U); else divider = m_frequency_tx / ADF7021_PFD; @@ -424,7 +415,7 @@ void CIO::ifConf(MMDVM_STATE modemState, bool reset) break; case STATE_YSF: - // Dev: +1 symb 900 Hz, symb rate = 4800 + // Dev: +1 symb 900/450 Hz, symb rate = 4800 ADF7021_REG3 = (m_LoDevYSF ? ADF7021_REG3_YSF_L : ADF7021_REG3_YSF_H); ADF7021_REG10 = ADF7021_REG10_YSF; @@ -623,7 +614,7 @@ void CIO::ifConf(MMDVM_STATE modemState, bool reset) } #if defined(DUPLEX) -if(m_duplex && (modemState != STATE_CWID && modemState != STATE_POCSAG)) +if (m_duplex && (modemState != STATE_CWID && modemState != STATE_POCSAG)) ifConf2(modemState); #endif } @@ -685,7 +676,7 @@ void CIO::ifConf2(MMDVM_STATE modemState) break; case STATE_YSF: - // Dev: +1 symb 2700/900 Hz, symb rate = 4800 + // Dev: +1 symb 900/450 Hz, symb rate = 4800 ADF7021_REG3 = (m_LoDevYSF ? ADF7021_REG3_YSF_L : ADF7021_REG3_YSF_H); ADF7021_REG10 = ADF7021_REG10_YSF; @@ -862,25 +853,23 @@ void CIO::interrupt() // possibly this is a design problem of the RF7021 board or too long wires // on the breadboard build // but normally this will not hurt too much - if (clk == last_clk) { + if (clk == last_clk) return; - } else { + else last_clk = clk; - } // we set the TX bit at TXD low, sampling of ADF7021 happens at rising clock if (m_tx && clk == 0U) { - m_txBuffer.get(bit, m_control); even = !even; #if defined(BIDIR_DATA_PIN) - if(bit) + if (bit) RXD_pin_write(HIGH); else RXD_pin_write(LOW); #else - if(bit) + if (bit) TXD_pin(HIGH); else TXD_pin(LOW); @@ -912,7 +901,7 @@ void CIO::interrupt() // we sample the RX bit at rising TXD clock edge, so TXD must be 1 and we are not in tx mode if (!m_tx && clk == 1U && !m_duplex) { - if(RXD_pin()) + if (RXD_pin()) bit = 1U; else bit = 0U; @@ -920,7 +909,7 @@ void CIO::interrupt() m_rxBuffer.put(bit, m_control); } - if (torx_request == true && even == ADF7021_EVEN_BIT && m_tx && clk == 0U) { + if (torx_request && even == ADF7021_EVEN_BIT && m_tx && clk == 0U) { // that is absolutely crucial in 4FSK, see datasheet: // enable sle after 1/4 tBit == 26uS when sending MSB (even == false) and clock is low delay_us(26U); @@ -946,10 +935,10 @@ void CIO::interrupt() m_modeTimerCnt++; m_int1counter++; - if(m_scanPauseCnt >= SCAN_PAUSE) + if (m_scanPauseCnt >= SCAN_PAUSE) m_scanPauseCnt = 0U; - if(m_scanPauseCnt != 0U) + if (m_scanPauseCnt != 0U) m_scanPauseCnt++; } @@ -958,8 +947,8 @@ void CIO::interrupt2() { uint8_t bit = 0U; - if(m_duplex) { - if(RXD2_pin()) + if (m_duplex) { + if (RXD2_pin()) bit = 1U; else bit = 0U; @@ -1003,7 +992,7 @@ void CIO::setRX(bool doSle) Data_dir_out(false); // Data pin input mode #endif - if(!doSle) { + if (!doSle) { torx_request = true; while(torx_request) { asm volatile ("nop"); } } @@ -1036,28 +1025,24 @@ void CIO::updateCal() float divider; // Check frequency band - if( (m_frequency_tx >= VHF1_MIN) && (m_frequency_tx < VHF1_MAX) ) { + if ((m_frequency_tx >= VHF1_MIN) && (m_frequency_tx < VHF1_MAX)) { ADF7021_REG1 = ADF7021_REG1_VHF1; // VHF1, external VCO div2 = 1U; - } - else if( (m_frequency_tx >= VHF2_MIN) && (m_frequency_tx < VHF2_MAX) ) { + } else if ((m_frequency_tx >= VHF2_MIN) && (m_frequency_tx < VHF2_MAX)) { ADF7021_REG1 = ADF7021_REG1_VHF2; // VHF1, external VCO div2 = 1U; - } - else if( (m_frequency_tx >= UHF1_MIN)&&(m_frequency_tx < UHF1_MAX) ) { + } else if ((m_frequency_tx >= UHF1_MIN)&&(m_frequency_tx < UHF1_MAX)) { ADF7021_REG1 = ADF7021_REG1_UHF1; // UHF1, internal VCO div2 = 1U; - } - else if( (m_frequency_tx >= UHF2_MIN)&&(m_frequency_tx < UHF2_MAX) ) { + } else if ((m_frequency_tx >= UHF2_MIN)&&(m_frequency_tx < UHF2_MAX)) { ADF7021_REG1 = ADF7021_REG1_UHF2; // UHF2, internal VCO div2 = 2U; - } - else { + } else { ADF7021_REG1 = ADF7021_REG1_UHF1; // UHF1, internal VCO div2 = 1U; } - if(div2 == 1U) + if (div2 == 1U) f_div = 2U; else f_div = 1U; @@ -1083,7 +1068,7 @@ void CIO::updateCal() AD7021_control_word = ADF7021_REG2; Send_AD7021_control(); - if( div2 == 1U ) + if (div2 == 1U) divider = m_frequency_tx / (ADF7021_PFD / 2U); else divider = m_frequency_tx / ADF7021_PFD; From ab3c9a39a3b7767e3397dece738622591b8e137b Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Wed, 15 Sep 2021 23:25:49 +0100 Subject: [PATCH 24/26] Modify the ADF7021 parameters for M17. --- ADF7021.h | 4 ++-- version.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ADF7021.h b/ADF7021.h index b638a91..1ae9a4f 100644 --- a/ADF7021.h +++ b/ADF7021.h @@ -127,7 +127,7 @@ www.analog.com/media/en/technical-documentation/data-sheets/ADF7021.pdf #define ADF7021_POST_BW_YSF 20U #define ADF7021_POST_BW_P25 6U #define ADF7021_POST_BW_NXDN 7U -#define ADF7021_POST_BW_M17 8U // Test +#define ADF7021_POST_BW_M17 7U // Test #define ADF7021_POST_BW_POCSAG 1U // IF filter (REG 05) @@ -229,7 +229,7 @@ www.analog.com/media/en/technical-documentation/data-sheets/ADF7021.pdf #define ADF7021_DISC_BW_YSF_H 430U // K=28 #define ADF7021_DISC_BW_P25 493U // K=32 #define ADF7021_DISC_BW_NXDN 246U // K=32 -#define ADF7021_DISC_BW_M17 491U // K=32 +#define ADF7021_DISC_BW_M17 492U // K=32 #define ADF7021_DISC_BW_POCSAG 338U // K=22 // Post demodulator bandwith (REG 04) diff --git a/version.h b/version.h index c3b873e..bbacfaf 100644 --- a/version.h +++ b/version.h @@ -26,7 +26,7 @@ #define VER_MAJOR "1" #define VER_MINOR "5" #define VER_REV "2" -#define VERSION_DATE "20210914" +#define VERSION_DATE "20210915" #if defined(ZUMSPOT_ADF7021) #define BOARD_INFO "ZUMspot" From 0f3a4fa24985603bdf269854e9a6c4ae1eae927d Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Sun, 19 Sep 2021 14:29:15 +0100 Subject: [PATCH 25/26] Change the EOT handling on M17 TX. --- M17TX.cpp | 30 +----------------------------- M17TX.h | 4 +--- SerialPort.cpp | 6 +++--- version.h | 2 +- 4 files changed, 6 insertions(+), 36 deletions(-) diff --git a/M17TX.cpp b/M17TX.cpp index 895dab6..5dfc3ca 100644 --- a/M17TX.cpp +++ b/M17TX.cpp @@ -82,7 +82,7 @@ void CM17TX::process() } } -uint8_t CM17TX::writeLinkSetup(const uint8_t* data, uint8_t length) +uint8_t CM17TX::writeData(const uint8_t* data, uint8_t length) { if (length != (M17_FRAME_LENGTH_BYTES + 1U)) return 4U; @@ -97,34 +97,6 @@ uint8_t CM17TX::writeLinkSetup(const uint8_t* data, uint8_t length) return 0U; } -uint8_t CM17TX::writeStream(const uint8_t* data, uint8_t length) -{ - if (length != (M17_FRAME_LENGTH_BYTES + 1U)) - return 4U; - - uint16_t space = m_buffer.getSpace(); - if (space < M17_FRAME_LENGTH_BYTES) - return 5U; - - for (uint8_t i = 0U; i < M17_FRAME_LENGTH_BYTES; i++) - m_buffer.put(data[i + 1U]); - - return 0U; -} - -uint8_t CM17TX::writeEOT() -{ -/* - uint16_t space = m_buffer.getSpace(); - if (space < M17_FRAME_LENGTH_BYTES) - return 5U; - - for (uint8_t i = 0U; i < M17_SYNC_LENGTH_BYTES; i++) - m_buffer.put(M17_EOT_SYNC_BYTES[i]); -*/ - return 0U; -} - void CM17TX::writeByte(uint8_t c) { uint8_t bit; diff --git a/M17TX.h b/M17TX.h index 61b63c0..00c2a33 100644 --- a/M17TX.h +++ b/M17TX.h @@ -27,9 +27,7 @@ class CM17TX { public: CM17TX(); - uint8_t writeLinkSetup(const uint8_t* data, uint8_t length); - uint8_t writeStream(const uint8_t* data, uint8_t length); - uint8_t writeEOT(); + uint8_t writeData(const uint8_t* data, uint8_t length); void process(); diff --git a/SerialPort.cpp b/SerialPort.cpp index 6c7dc55..4dd8a8a 100644 --- a/SerialPort.cpp +++ b/SerialPort.cpp @@ -870,7 +870,7 @@ void CSerialPort::process() case MMDVM_M17_LINK_SETUP: if (m_m17Enable) { if (m_modemState == STATE_IDLE || m_modemState == STATE_M17) - err = m17TX.writeLinkSetup(m_buffer + 3U, m_len - 3U); + err = m17TX.writeData(m_buffer + 3U, m_len - 3U); } if (err == 0U) { if (m_modemState == STATE_IDLE) @@ -884,7 +884,7 @@ void CSerialPort::process() case MMDVM_M17_STREAM: if (m_m17Enable) { if (m_modemState == STATE_IDLE || m_modemState == STATE_M17) - err = m17TX.writeStream(m_buffer + 3U, m_len - 3U); + err = m17TX.writeData(m_buffer + 3U, m_len - 3U); } if (err == 0U) { if (m_modemState == STATE_IDLE) @@ -898,7 +898,7 @@ void CSerialPort::process() case MMDVM_M17_EOT: if (m_m17Enable) { if (m_modemState == STATE_IDLE || m_modemState == STATE_M17) - err = m17TX.writeEOT(); + err = m17TX.writeData(m_buffer + 3U, m_len - 3U); } if (err == 0U) { if (m_modemState == STATE_IDLE) diff --git a/version.h b/version.h index bbacfaf..6b5aa28 100644 --- a/version.h +++ b/version.h @@ -26,7 +26,7 @@ #define VER_MAJOR "1" #define VER_MINOR "5" #define VER_REV "2" -#define VERSION_DATE "20210915" +#define VERSION_DATE "20210919" #if defined(ZUMSPOT_ADF7021) #define BOARD_INFO "ZUMspot" From 931cfde894ed38b8e743b48ef73c1f5e7ba39f7c Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Sun, 17 Oct 2021 18:44:14 +0100 Subject: [PATCH 26/26] Bump the minor version number. --- version.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.h b/version.h index 6b5aa28..450efcb 100644 --- a/version.h +++ b/version.h @@ -24,8 +24,8 @@ #include "ADF7021.h" #define VER_MAJOR "1" -#define VER_MINOR "5" -#define VER_REV "2" +#define VER_MINOR "6" +#define VER_REV "0" #define VERSION_DATE "20210919" #if defined(ZUMSPOT_ADF7021)