From 4871ad12105a53f382b5735bf3f10a4f4216adf2 Mon Sep 17 00:00:00 2001 From: Andy CA6JAU Date: Wed, 3 Jan 2018 00:55:14 -0300 Subject: [PATCH 1/4] Adding DMR 1031 Hz Test Pattern --- CalDMR.cpp | 148 +++++++++++++++++++++++++++++++++++++++++++++++-- CalDMR.h | 18 +++++- DMRTX.cpp | 14 +++++ DMRTX.h | 6 +- Globals.h | 1 + MMDVM.cpp | 4 +- MMDVM.ino | 4 +- SerialPort.cpp | 16 +++++- 8 files changed, 196 insertions(+), 15 deletions(-) diff --git a/CalDMR.cpp b/CalDMR.cpp index 5622c1d..1ce50dd 100644 --- a/CalDMR.cpp +++ b/CalDMR.cpp @@ -21,19 +21,152 @@ #include "Globals.h" #include "CalDMR.h" +const uint8_t DATALC_1K[] = {0x00U, + 0x00U, 0x20U, 0x08U, 0x08U, 0x02U, 0x38U, 0x15U, 0x00U, 0x2CU, 0xA0U, 0x14U, + 0x60U, 0x84U, 0x6DU, 0xFFU, 0x57U, 0xD7U, 0x5DU, 0xF5U, 0xDEU, 0x30U, 0x30U, + 0x01U, 0x10U, 0x01U, 0x40U, 0x03U, 0xC0U, 0x13U, 0xC1U, 0x1EU, 0x80U, 0x6FU}; + +const uint8_t DATATERMLC_1K[] = {0x00U, + 0x00U, 0x4FU, 0x08U, 0xDCU, 0x02U, 0x88U, 0x15U, 0x78U, 0x2CU, 0xD0U, 0x14U, + 0xC0U, 0x84U, 0xADU, 0xFFU, 0x57U, 0xD7U, 0x5DU, 0xF5U, 0xD9U, 0x65U, 0x24U, + 0x02U, 0x28U, 0x06U, 0x20U, 0x0FU, 0x80U, 0x1BU, 0xC1U, 0x07U, 0x80U, 0x5CU}; + +const uint8_t VOICE0_1K[] = {0x00U, + 0xCEU, 0xA8U, 0xFEU, 0x83U, 0xACU, 0xC4U, 0x58U, 0x20U, 0x0AU, 0xCEU, 0xA8U, + 0xFEU, 0x83U, 0xA7U, 0x55U, 0xFDU, 0x7DU, 0xF7U, 0x5FU, 0x7CU, 0xC4U, 0x58U, + 0x20U, 0x0AU, 0xCEU, 0xA8U, 0xFEU, 0x83U, 0xACU, 0xC4U, 0x58U, 0x20U, 0x0AU}; + +//0xA1U, 0x30U, 0x00U, 0x00U, 0x90U, 0x09U, 0x1CU, +const uint8_t VOICE1_1K[] = {0x00U, + 0xCEU, 0xA8U, 0xFEU, 0x83U, 0xACU, 0xC4U, 0x58U, 0x20U, 0x0AU, 0xCEU, 0xA8U, + 0xFEU, 0x83U, 0xA1U, 0x30U, 0x00U, 0x00U, 0x90U, 0x09U, 0x1CU, 0xC4U, 0x58U, + 0x20U, 0x0AU, 0xCEU, 0xA8U, 0xFEU, 0x83U, 0xACU, 0xC4U, 0x58U, 0x20U, 0x0AU}; + +//0xA1U, 0x70U, 0x00U, 0x90U, 0x00U, 0x07U, 0x4CU, +const uint8_t VOICE2_1K[] = {0x00U, + 0xCEU, 0xA8U, 0xFEU, 0x83U, 0xACU, 0xC4U, 0x58U, 0x20U, 0x0AU, 0xCEU, 0xA8U, + 0xFEU, 0x83U, 0xA1U, 0x70U, 0x00U, 0x90U, 0x00U, 0x07U, 0x4CU, 0xC4U, 0x58U, + 0x20U, 0x0AU, 0xCEU, 0xA8U, 0xFEU, 0x83U, 0xACU, 0xC4U, 0x58U, 0x20U, 0x0AU}; + +//0xA1U, 0x70U, 0x00U, 0x31U, 0x40U, 0x07U, 0x4CU, +const uint8_t VOICE3_1K[] = {0x00U, + 0xCEU, 0xA8U, 0xFEU, 0x83U, 0xACU, 0xC4U, 0x58U, 0x20U, 0x0AU, 0xCEU, 0xA8U, + 0xFEU, 0x83U, 0xA1U, 0x70U, 0x00U, 0x31U, 0x40U, 0x07U, 0x4CU, 0xC4U, 0x58U, + 0x20U, 0x0AU, 0xCEU, 0xA8U, 0xFEU, 0x83U, 0xACU, 0xC4U, 0x58U, 0x20U, 0x0AU}; + +//0xA1U, 0x50U, 0xA1U, 0x71U, 0xD1U, 0x70U, 0x7CU, +const uint8_t VOICE4_1K[] = {0x00U, + 0xCEU, 0xA8U, 0xFEU, 0x83U, 0xACU, 0xC4U, 0x58U, 0x20U, 0x0AU, 0xCEU, 0xA8U, + 0xFEU, 0x83U, 0xA1U, 0x50U, 0xA1U, 0x71U, 0xD1U, 0x70U, 0x7CU, 0xC4U, 0x58U, + 0x20U, 0x0AU, 0xCEU, 0xA8U, 0xFEU, 0x83U, 0xACU, 0xC4U, 0x58U, 0x20U, 0x0AU}; + +//0xA1U, 0x10U, 0x00U, 0x00U, 0x00U, 0x0EU, 0x2CU, +const uint8_t VOICE5_1K[] = {0x00U, + 0xCEU, 0xA8U, 0xFEU, 0x83U, 0xACU, 0xC4U, 0x58U, 0x20U, 0x0AU, 0xCEU, 0xA8U, + 0xFEU, 0x83U, 0xA1U, 0x10U, 0x00U, 0x00U, 0x00U, 0x0EU, 0x2CU, 0xC4U, 0x58U, + 0x20U, 0x0AU, 0xCEU, 0xA8U, 0xFEU, 0x83U, 0xACU, 0xC4U, 0x58U, 0x20U, 0x0AU}; + +const uint8_t SHORTLC_1K[] = {0x33U, 0x3AU, 0xA0U, 0x30U, 0x00U, 0x55U, 0xA6U, 0x5FU, 0x50U}; CCalDMR::CCalDMR() : -m_transmit(false) +m_transmit(false), +m_state(DMR1KCAL_IDLE), +m_frame_start(0U) { } void CCalDMR::process() { - if (m_transmit) { - dmrTX.setCal(true); - dmrTX.process(); - } else { - dmrTX.setCal(false); + switch (m_modemState) { + case STATE_DMRCAL: + case STATE_LFCAL: + if (m_transmit) { + dmrTX.setCal(true); + dmrTX.process(); + } else { + dmrTX.setCal(false); + } + break; + case STATE_DMR1KCAL: + dmr1kcal(); + break; + default: + break; + } +} + +void CCalDMR::dmr1kcal() +{ + switch (m_state) { + case DMR1KCAL_IDLE: + dmrTX.setStart(false); + dmrTX.resetFifo2(); + m_state = DMR1KCAL_IDLE; + break; + case DMR1KCAL_DATALC: + dmrTX.setColorCode(1U); + dmrTX.writeShortLC(SHORTLC_1K, 9U); + dmrTX.setStart(true); + if (dmrTX.writeData2(DATALC_1K, DMR_FRAME_LENGTH_BYTES + 1U) == 5U) + m_state = DMR1KCAL_DATALC; + else + m_state = DMR1KCAL_V0; + break; + case DMR1KCAL_V0: + if (dmrTX.writeData2(VOICE0_1K, DMR_FRAME_LENGTH_BYTES + 1U) == 5U) + m_state = DMR1KCAL_V0; + else + m_state = DMR1KCAL_V1; + break; + case DMR1KCAL_V1: + if (dmrTX.writeData2(VOICE1_1K, DMR_FRAME_LENGTH_BYTES + 1U) == 5U) + m_state = DMR1KCAL_V1; + else + m_state = DMR1KCAL_V2; + break; + case DMR1KCAL_V2: + if (dmrTX.writeData2(VOICE2_1K, DMR_FRAME_LENGTH_BYTES + 1U) == 5U) + m_state = DMR1KCAL_V2; + else + m_state = DMR1KCAL_V3; + break; + case DMR1KCAL_V3: + if (dmrTX.writeData2(VOICE3_1K, DMR_FRAME_LENGTH_BYTES + 1U) == 5U) + m_state = DMR1KCAL_V3; + else + m_state = DMR1KCAL_V4; + break; + case DMR1KCAL_V4: + if (dmrTX.writeData2(VOICE4_1K, DMR_FRAME_LENGTH_BYTES + 1U) == 5U) + m_state = DMR1KCAL_V4; + else + m_state = DMR1KCAL_V5; + break; + case DMR1KCAL_V5: + if (dmrTX.writeData2(VOICE5_1K, DMR_FRAME_LENGTH_BYTES + 1U) == 5U) + m_state = DMR1KCAL_V5; + else { + if(m_transmit) + m_state = DMR1KCAL_V0; + else + m_state = DMR1KCAL_TERMLC; + } + break; + case DMR1KCAL_TERMLC: + if (dmrTX.writeData2(DATATERMLC_1K, DMR_FRAME_LENGTH_BYTES + 1U) == 5U) + m_state = DMR1KCAL_TERMLC; + else { + m_state = DMR1KCAL_WAIT; + m_frame_start = dmrTX.getFrameCount(); + } + break; + case DMR1KCAL_WAIT: + if (dmrTX.getFrameCount() > (m_frame_start + 30U)) + m_state = DMR1KCAL_IDLE; + break; + default: + m_state = DMR1KCAL_IDLE; + break; } } @@ -44,6 +177,9 @@ uint8_t CCalDMR::write(const uint8_t* data, uint8_t length) m_transmit = data[0U] == 1U; + if(m_transmit && m_state == DMR1KCAL_IDLE && m_modemState == STATE_DMR1KCAL) + m_state = DMR1KCAL_DATALC; + return 0U; } diff --git a/CalDMR.h b/CalDMR.h index c3231c5..bf58702 100644 --- a/CalDMR.h +++ b/CalDMR.h @@ -23,16 +23,32 @@ #include "Config.h" #include "DMRDefines.h" +enum DMR1KCAL { + DMR1KCAL_IDLE, + DMR1KCAL_DATALC, + DMR1KCAL_V0, + DMR1KCAL_V1, + DMR1KCAL_V2, + DMR1KCAL_V3, + DMR1KCAL_V4, + DMR1KCAL_V5, + DMR1KCAL_TERMLC, + DMR1KCAL_WAIT +}; + class CCalDMR { public: CCalDMR(); void process(); + void dmr1kcal(); uint8_t write(const uint8_t* data, uint8_t length); private: - bool m_transmit; + bool m_transmit; + DMR1KCAL m_state; + uint32_t m_frame_start; }; #endif diff --git a/DMRTX.cpp b/DMRTX.cpp index 20b7b6d..a55e05c 100644 --- a/DMRTX.cpp +++ b/DMRTX.cpp @@ -389,3 +389,17 @@ void CDMRTX::setColorCode(uint8_t colorCode) slotType.encode(colorCode, DT_IDLE, m_idle); } +void CDMRTX::resetFifo1() +{ + m_fifo[0U].reset(); +} + +void CDMRTX::resetFifo2() +{ + m_fifo[1U].reset(); +} + +uint32_t CDMRTX::getFrameCount() +{ + return m_frameCount; +} \ No newline at end of file diff --git a/DMRTX.h b/DMRTX.h index de271d3..00977d5 100644 --- a/DMRTX.h +++ b/DMRTX.h @@ -48,7 +48,11 @@ public: void setCal(bool start); void process(); - + + void resetFifo1(); + void resetFifo2(); + uint32_t getFrameCount(); + uint8_t getSpace1() const; uint8_t getSpace2() const; diff --git a/Globals.h b/Globals.h index e6aab33..fa64066 100644 --- a/Globals.h +++ b/Globals.h @@ -50,6 +50,7 @@ enum MMDVM_STATE { STATE_P25 = 4, // Dummy states start at 90 + STATE_DMR1KCAL = 94, STATE_LFCAL = 95, STATE_RSSICAL = 96, STATE_CWID = 97, diff --git a/MMDVM.cpp b/MMDVM.cpp index 879ea7e..e7a9b74 100644 --- a/MMDVM.cpp +++ b/MMDVM.cpp @@ -77,7 +77,7 @@ void loop() if (m_dstarEnable && m_modemState == STATE_DSTAR) dstarTX.process(); - if (m_dmrEnable && m_modemState == STATE_DMR) { + if ((m_dmrEnable && m_modemState == STATE_DMR) || m_modemState == STATE_DMR1KCAL) { if (m_duplex) dmrTX.process(); else @@ -93,7 +93,7 @@ void loop() if (m_modemState == STATE_DSTARCAL) calDStarTX.process(); - if (m_modemState == STATE_DMRCAL || m_modemState == STATE_LFCAL) + if (m_modemState == STATE_DMRCAL || m_modemState == STATE_LFCAL || m_modemState == STATE_DMR1KCAL) calDMR.process(); if (m_modemState == STATE_IDLE) diff --git a/MMDVM.ino b/MMDVM.ino index e476ea4..1a345d9 100644 --- a/MMDVM.ino +++ b/MMDVM.ino @@ -74,7 +74,7 @@ void loop() if (m_dstarEnable && m_modemState == STATE_DSTAR) dstarTX.process(); - if (m_dmrEnable && m_modemState == STATE_DMR) { + if ((m_dmrEnable && m_modemState == STATE_DMR) || m_modemState == STATE_DMR1KCAL) { if (m_duplex) dmrTX.process(); else @@ -90,7 +90,7 @@ void loop() if (m_modemState == STATE_DSTARCAL) calDStarTX.process(); - if (m_modemState == STATE_DMRCAL || m_modemState == STATE_LFCAL) + if (m_modemState == STATE_DMRCAL || m_modemState == STATE_LFCAL || m_modemState == STATE_DMR1KCAL) calDMR.process(); if (m_modemState == STATE_IDLE) diff --git a/SerialPort.cpp b/SerialPort.cpp index 304409d..e6a20a7 100644 --- a/SerialPort.cpp +++ b/SerialPort.cpp @@ -243,7 +243,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_DSTARCAL && modemState != STATE_DMRCAL && modemState != STATE_RSSICAL && modemState != STATE_LFCAL) + if (modemState != STATE_IDLE && modemState != STATE_DSTAR && modemState != STATE_DMR && modemState != STATE_YSF && modemState != STATE_P25 && modemState != STATE_DSTARCAL && modemState != STATE_DMRCAL && modemState != STATE_RSSICAL && modemState != STATE_LFCAL && modemState != STATE_DMR1KCAL) return 4U; if (modemState == STATE_DSTAR && !dstarEnable) return 4U; @@ -309,7 +309,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_DSTARCAL && modemState != STATE_DMRCAL && modemState != STATE_RSSICAL && modemState != STATE_LFCAL) + if (modemState != STATE_IDLE && modemState != STATE_DSTAR && modemState != STATE_DMR && modemState != STATE_YSF && modemState != STATE_P25 && modemState != STATE_DSTARCAL && modemState != STATE_DMRCAL && modemState != STATE_RSSICAL && modemState != STATE_LFCAL && modemState != STATE_DMR1KCAL) return 4U; if (modemState == STATE_DSTAR && !m_dstarEnable) return 4U; @@ -402,6 +402,16 @@ void CSerialPort::setMode(MMDVM_STATE modemState) p25RX.reset(); cwIdTX.reset(); break; + case STATE_DMR1KCAL: + DEBUG1("Mode set to DMR 1031 Hz Calibrate"); + dmrIdleRX.reset(); + dmrDMORX.reset(); + dmrRX.reset(); + dstarRX.reset(); + ysfRX.reset(); + p25RX.reset(); + cwIdTX.reset(); + break; default: DEBUG1("Mode set to Idle"); // STATE_IDLE @@ -483,7 +493,7 @@ void CSerialPort::process() case MMDVM_CAL_DATA: if (m_modemState == STATE_DSTARCAL) err = calDStarTX.write(m_buffer + 3U, m_len - 3U); - if (m_modemState == STATE_DMRCAL || m_modemState == STATE_LFCAL) + if (m_modemState == STATE_DMRCAL || m_modemState == STATE_LFCAL || m_modemState == STATE_DMR1KCAL) err = calDMR.write(m_buffer + 3U, m_len - 3U); if (err == 0U) { sendACK(); From e1d1faea82ce7f64fc4d36fc92f3048b5a72316b Mon Sep 17 00:00:00 2001 From: Andy CA6JAU Date: Thu, 4 Jan 2018 01:10:33 -0300 Subject: [PATCH 2/4] Code reordering and cleanup --- CalDMR.cpp | 126 +++++++++++++++++++---------------------------------- CalDMR.h | 10 ++--- MMDVM.cpp | 2 +- MMDVM.ino | 2 +- 4 files changed, 51 insertions(+), 89 deletions(-) diff --git a/CalDMR.cpp b/CalDMR.cpp index 1ce50dd..19039be 100644 --- a/CalDMR.cpp +++ b/CalDMR.cpp @@ -31,48 +31,30 @@ const uint8_t DATATERMLC_1K[] = {0x00U, 0xC0U, 0x84U, 0xADU, 0xFFU, 0x57U, 0xD7U, 0x5DU, 0xF5U, 0xD9U, 0x65U, 0x24U, 0x02U, 0x28U, 0x06U, 0x20U, 0x0FU, 0x80U, 0x1BU, 0xC1U, 0x07U, 0x80U, 0x5CU}; -const uint8_t VOICE0_1K[] = {0x00U, +const uint8_t AMBE_1K[] = {0x00U, 0xCEU, 0xA8U, 0xFEU, 0x83U, 0xACU, 0xC4U, 0x58U, 0x20U, 0x0AU, 0xCEU, 0xA8U, - 0xFEU, 0x83U, 0xA7U, 0x55U, 0xFDU, 0x7DU, 0xF7U, 0x5FU, 0x7CU, 0xC4U, 0x58U, + 0xFEU, 0x83U, 0xA0U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x0CU, 0xC4U, 0x58U, 0x20U, 0x0AU, 0xCEU, 0xA8U, 0xFEU, 0x83U, 0xACU, 0xC4U, 0x58U, 0x20U, 0x0AU}; -//0xA1U, 0x30U, 0x00U, 0x00U, 0x90U, 0x09U, 0x1CU, -const uint8_t VOICE1_1K[] = {0x00U, - 0xCEU, 0xA8U, 0xFEU, 0x83U, 0xACU, 0xC4U, 0x58U, 0x20U, 0x0AU, 0xCEU, 0xA8U, - 0xFEU, 0x83U, 0xA1U, 0x30U, 0x00U, 0x00U, 0x90U, 0x09U, 0x1CU, 0xC4U, 0x58U, - 0x20U, 0x0AU, 0xCEU, 0xA8U, 0xFEU, 0x83U, 0xACU, 0xC4U, 0x58U, 0x20U, 0x0AU}; - -//0xA1U, 0x70U, 0x00U, 0x90U, 0x00U, 0x07U, 0x4CU, -const uint8_t VOICE2_1K[] = {0x00U, - 0xCEU, 0xA8U, 0xFEU, 0x83U, 0xACU, 0xC4U, 0x58U, 0x20U, 0x0AU, 0xCEU, 0xA8U, - 0xFEU, 0x83U, 0xA1U, 0x70U, 0x00U, 0x90U, 0x00U, 0x07U, 0x4CU, 0xC4U, 0x58U, - 0x20U, 0x0AU, 0xCEU, 0xA8U, 0xFEU, 0x83U, 0xACU, 0xC4U, 0x58U, 0x20U, 0x0AU}; - -//0xA1U, 0x70U, 0x00U, 0x31U, 0x40U, 0x07U, 0x4CU, -const uint8_t VOICE3_1K[] = {0x00U, - 0xCEU, 0xA8U, 0xFEU, 0x83U, 0xACU, 0xC4U, 0x58U, 0x20U, 0x0AU, 0xCEU, 0xA8U, - 0xFEU, 0x83U, 0xA1U, 0x70U, 0x00U, 0x31U, 0x40U, 0x07U, 0x4CU, 0xC4U, 0x58U, - 0x20U, 0x0AU, 0xCEU, 0xA8U, 0xFEU, 0x83U, 0xACU, 0xC4U, 0x58U, 0x20U, 0x0AU}; - -//0xA1U, 0x50U, 0xA1U, 0x71U, 0xD1U, 0x70U, 0x7CU, -const uint8_t VOICE4_1K[] = {0x00U, - 0xCEU, 0xA8U, 0xFEU, 0x83U, 0xACU, 0xC4U, 0x58U, 0x20U, 0x0AU, 0xCEU, 0xA8U, - 0xFEU, 0x83U, 0xA1U, 0x50U, 0xA1U, 0x71U, 0xD1U, 0x70U, 0x7CU, 0xC4U, 0x58U, - 0x20U, 0x0AU, 0xCEU, 0xA8U, 0xFEU, 0x83U, 0xACU, 0xC4U, 0x58U, 0x20U, 0x0AU}; - -//0xA1U, 0x10U, 0x00U, 0x00U, 0x00U, 0x0EU, 0x2CU, -const uint8_t VOICE5_1K[] = {0x00U, - 0xCEU, 0xA8U, 0xFEU, 0x83U, 0xACU, 0xC4U, 0x58U, 0x20U, 0x0AU, 0xCEU, 0xA8U, - 0xFEU, 0x83U, 0xA1U, 0x10U, 0x00U, 0x00U, 0x00U, 0x0EU, 0x2CU, 0xC4U, 0x58U, - 0x20U, 0x0AU, 0xCEU, 0xA8U, 0xFEU, 0x83U, 0xACU, 0xC4U, 0x58U, 0x20U, 0x0AU}; +const uint8_t SYNCEMB_1K[6][7] = { + {0x07U, 0x55U, 0xFDU, 0x7DU, 0xF7U, 0x5FU, 0x70U}, + {0x01U, 0x30U, 0x00U, 0x00U, 0x90U, 0x09U, 0x10U}, + {0x01U, 0x70U, 0x00U, 0x90U, 0x00U, 0x07U, 0x40U}, + {0x01U, 0x70U, 0x00U, 0x31U, 0x40U, 0x07U, 0x40U}, + {0x01U, 0x50U, 0xA1U, 0x71U, 0xD1U, 0x70U, 0x70U}, + {0x01U, 0x10U, 0x00U, 0x00U, 0x00U, 0x0EU, 0x20U}, + }; const uint8_t SHORTLC_1K[] = {0x33U, 0x3AU, 0xA0U, 0x30U, 0x00U, 0x55U, 0xA6U, 0x5FU, 0x50U}; CCalDMR::CCalDMR() : m_transmit(false), m_state(DMR1KCAL_IDLE), -m_frame_start(0U) +m_frame_start(0U), +m_dmr1k(), +m_rfN(0) { + ::memcpy(m_dmr1k, AMBE_1K, DMR_FRAME_LENGTH_BYTES + 1U); } void CCalDMR::process() @@ -95,70 +77,52 @@ void CCalDMR::process() } } +void CCalDMR::createData1k(uint8_t n) +{ + for(uint8_t i = 0; i < 5U; i++) + m_dmr1k[i + 15U] = SYNCEMB_1K[n][i + 1U]; + + m_dmr1k[14U] &= 0xF0U; + m_dmr1k[20U] &= 0x0FU; + m_dmr1k[14U] |= SYNCEMB_1K[n][0] & 0x0FU; + m_dmr1k[20U] |= SYNCEMB_1K[n][6] & 0xF0U; +} + void CCalDMR::dmr1kcal() { + dmrTX.process(); + + uint16_t space = dmrTX.getSpace2(); + if (space < 1U) + return; + switch (m_state) { case DMR1KCAL_IDLE: dmrTX.setStart(false); dmrTX.resetFifo2(); - m_state = DMR1KCAL_IDLE; + m_rfN = 0U; break; case DMR1KCAL_DATALC: dmrTX.setColorCode(1U); dmrTX.writeShortLC(SHORTLC_1K, 9U); + dmrTX.writeData2(DATALC_1K, DMR_FRAME_LENGTH_BYTES + 1U); dmrTX.setStart(true); - if (dmrTX.writeData2(DATALC_1K, DMR_FRAME_LENGTH_BYTES + 1U) == 5U) - m_state = DMR1KCAL_DATALC; - else - m_state = DMR1KCAL_V0; + m_state = DMR1KCAL_VOICE; break; - case DMR1KCAL_V0: - if (dmrTX.writeData2(VOICE0_1K, DMR_FRAME_LENGTH_BYTES + 1U) == 5U) - m_state = DMR1KCAL_V0; - else - m_state = DMR1KCAL_V1; - break; - case DMR1KCAL_V1: - if (dmrTX.writeData2(VOICE1_1K, DMR_FRAME_LENGTH_BYTES + 1U) == 5U) - m_state = DMR1KCAL_V1; - else - m_state = DMR1KCAL_V2; - break; - case DMR1KCAL_V2: - if (dmrTX.writeData2(VOICE2_1K, DMR_FRAME_LENGTH_BYTES + 1U) == 5U) - m_state = DMR1KCAL_V2; - else - m_state = DMR1KCAL_V3; - break; - case DMR1KCAL_V3: - if (dmrTX.writeData2(VOICE3_1K, DMR_FRAME_LENGTH_BYTES + 1U) == 5U) - m_state = DMR1KCAL_V3; - else - m_state = DMR1KCAL_V4; - break; - case DMR1KCAL_V4: - if (dmrTX.writeData2(VOICE4_1K, DMR_FRAME_LENGTH_BYTES + 1U) == 5U) - m_state = DMR1KCAL_V4; - else - m_state = DMR1KCAL_V5; - break; - case DMR1KCAL_V5: - if (dmrTX.writeData2(VOICE5_1K, DMR_FRAME_LENGTH_BYTES + 1U) == 5U) - m_state = DMR1KCAL_V5; - else { - if(m_transmit) - m_state = DMR1KCAL_V0; - else + case DMR1KCAL_VOICE: + createData1k(m_rfN); + dmrTX.writeData2(m_dmr1k, DMR_FRAME_LENGTH_BYTES + 1U); + if(m_rfN == 5U) { + m_rfN = 0U; + if(!m_transmit) m_state = DMR1KCAL_TERMLC; - } + } else + m_rfN++; break; case DMR1KCAL_TERMLC: - if (dmrTX.writeData2(DATATERMLC_1K, DMR_FRAME_LENGTH_BYTES + 1U) == 5U) - m_state = DMR1KCAL_TERMLC; - else { - m_state = DMR1KCAL_WAIT; - m_frame_start = dmrTX.getFrameCount(); - } + dmrTX.writeData2(DATATERMLC_1K, DMR_FRAME_LENGTH_BYTES + 1U); + m_frame_start = dmrTX.getFrameCount(); + m_state = DMR1KCAL_WAIT; break; case DMR1KCAL_WAIT: if (dmrTX.getFrameCount() > (m_frame_start + 30U)) diff --git a/CalDMR.h b/CalDMR.h index bf58702..9aa37c0 100644 --- a/CalDMR.h +++ b/CalDMR.h @@ -26,12 +26,7 @@ enum DMR1KCAL { DMR1KCAL_IDLE, DMR1KCAL_DATALC, - DMR1KCAL_V0, - DMR1KCAL_V1, - DMR1KCAL_V2, - DMR1KCAL_V3, - DMR1KCAL_V4, - DMR1KCAL_V5, + DMR1KCAL_VOICE, DMR1KCAL_TERMLC, DMR1KCAL_WAIT }; @@ -42,6 +37,7 @@ public: void process(); void dmr1kcal(); + void createData1k(uint8_t n); uint8_t write(const uint8_t* data, uint8_t length); @@ -49,6 +45,8 @@ private: bool m_transmit; DMR1KCAL m_state; uint32_t m_frame_start; + uint8_t m_dmr1k[DMR_FRAME_LENGTH_BYTES + 1U]; + uint8_t m_rfN; }; #endif diff --git a/MMDVM.cpp b/MMDVM.cpp index e7a9b74..39be538 100644 --- a/MMDVM.cpp +++ b/MMDVM.cpp @@ -77,7 +77,7 @@ void loop() if (m_dstarEnable && m_modemState == STATE_DSTAR) dstarTX.process(); - if ((m_dmrEnable && m_modemState == STATE_DMR) || m_modemState == STATE_DMR1KCAL) { + if (m_dmrEnable && m_modemState == STATE_DMR) { if (m_duplex) dmrTX.process(); else diff --git a/MMDVM.ino b/MMDVM.ino index 1a345d9..9e07926 100644 --- a/MMDVM.ino +++ b/MMDVM.ino @@ -74,7 +74,7 @@ void loop() if (m_dstarEnable && m_modemState == STATE_DSTAR) dstarTX.process(); - if ((m_dmrEnable && m_modemState == STATE_DMR) || m_modemState == STATE_DMR1KCAL) { + if (m_dmrEnable && m_modemState == STATE_DMR) { if (m_duplex) dmrTX.process(); else From c6e9227aee3cf1241a29b9ca1e735822cc65c3ba Mon Sep 17 00:00:00 2001 From: Andy CA6JAU Date: Sat, 6 Jan 2018 11:00:03 -0300 Subject: [PATCH 3/4] More cleanup and adding comments --- CalDMR.cpp | 61 +++++++++++++++++++++++++++++------------------------- CalDMR.h | 6 +++--- 2 files changed, 36 insertions(+), 31 deletions(-) diff --git a/CalDMR.cpp b/CalDMR.cpp index 19039be..c6f028f 100644 --- a/CalDMR.cpp +++ b/CalDMR.cpp @@ -21,30 +21,36 @@ #include "Globals.h" #include "CalDMR.h" -const uint8_t DATALC_1K[] = {0x00U, +// Voice LC Header, CC: 1, srcID: 1, dstID: TG9 +const uint8_t VH_1K[] = {0x00U, 0x00U, 0x20U, 0x08U, 0x08U, 0x02U, 0x38U, 0x15U, 0x00U, 0x2CU, 0xA0U, 0x14U, 0x60U, 0x84U, 0x6DU, 0xFFU, 0x57U, 0xD7U, 0x5DU, 0xF5U, 0xDEU, 0x30U, 0x30U, 0x01U, 0x10U, 0x01U, 0x40U, 0x03U, 0xC0U, 0x13U, 0xC1U, 0x1EU, 0x80U, 0x6FU}; -const uint8_t DATATERMLC_1K[] = {0x00U, +// Voice Term with LC, CC: 1, srcID: 1, dstID: TG9 +const uint8_t VT_1K[] = {0x00U, 0x00U, 0x4FU, 0x08U, 0xDCU, 0x02U, 0x88U, 0x15U, 0x78U, 0x2CU, 0xD0U, 0x14U, 0xC0U, 0x84U, 0xADU, 0xFFU, 0x57U, 0xD7U, 0x5DU, 0xF5U, 0xD9U, 0x65U, 0x24U, 0x02U, 0x28U, 0x06U, 0x20U, 0x0FU, 0x80U, 0x1BU, 0xC1U, 0x07U, 0x80U, 0x5CU}; -const uint8_t AMBE_1K[] = {0x00U, +// Voice coding data + FEC, 1031 Hz Test Pattern +const uint8_t VOICE_1K[] = {0x00U, 0xCEU, 0xA8U, 0xFEU, 0x83U, 0xACU, 0xC4U, 0x58U, 0x20U, 0x0AU, 0xCEU, 0xA8U, 0xFEU, 0x83U, 0xA0U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x0CU, 0xC4U, 0x58U, 0x20U, 0x0AU, 0xCEU, 0xA8U, 0xFEU, 0x83U, 0xACU, 0xC4U, 0x58U, 0x20U, 0x0AU}; +// Embedded LC: CC: 1, srcID: 1, dstID: TG9 const uint8_t SYNCEMB_1K[6][7] = { - {0x07U, 0x55U, 0xFDU, 0x7DU, 0xF7U, 0x5FU, 0x70U}, - {0x01U, 0x30U, 0x00U, 0x00U, 0x90U, 0x09U, 0x10U}, - {0x01U, 0x70U, 0x00U, 0x90U, 0x00U, 0x07U, 0x40U}, - {0x01U, 0x70U, 0x00U, 0x31U, 0x40U, 0x07U, 0x40U}, - {0x01U, 0x50U, 0xA1U, 0x71U, 0xD1U, 0x70U, 0x70U}, - {0x01U, 0x10U, 0x00U, 0x00U, 0x00U, 0x0EU, 0x20U}, - }; + {0x07U, 0x55U, 0xFDU, 0x7DU, 0xF7U, 0x5FU, 0x70U}, // MS VOICE SYNC (audio seq 0) + {0x01U, 0x30U, 0x00U, 0x00U, 0x90U, 0x09U, 0x10U}, // EMB + Embedded LC1 (audio seq 1) + {0x01U, 0x70U, 0x00U, 0x90U, 0x00U, 0x07U, 0x40U}, // EMB + Embedded LC2 (audio seq 2) + {0x01U, 0x70U, 0x00U, 0x31U, 0x40U, 0x07U, 0x40U}, // EMB + Embedded LC3 (audio seq 3) + {0x01U, 0x50U, 0xA1U, 0x71U, 0xD1U, 0x70U, 0x70U}, // EMB + Embedded LC4 (audio seq 4) + {0x01U, 0x10U, 0x00U, 0x00U, 0x00U, 0x0EU, 0x20U}}; // EMB (audio seq 5) +// Short LC: +// TS1: dstID: 0, ACTIVITY_NONE +// TS2: dstID: TG9, ACTIVITY_VOICE const uint8_t SHORTLC_1K[] = {0x33U, 0x3AU, 0xA0U, 0x30U, 0x00U, 0x55U, 0xA6U, 0x5FU, 0x50U}; CCalDMR::CCalDMR() : @@ -52,9 +58,9 @@ m_transmit(false), m_state(DMR1KCAL_IDLE), m_frame_start(0U), m_dmr1k(), -m_rfN(0) +m_audioSeq(0) { - ::memcpy(m_dmr1k, AMBE_1K, DMR_FRAME_LENGTH_BYTES + 1U); + ::memcpy(m_dmr1k, VOICE_1K, DMR_FRAME_LENGTH_BYTES + 1U); } void CCalDMR::process() @@ -97,36 +103,35 @@ void CCalDMR::dmr1kcal() return; switch (m_state) { - case DMR1KCAL_IDLE: - dmrTX.setStart(false); - dmrTX.resetFifo2(); - m_rfN = 0U; - break; - case DMR1KCAL_DATALC: + case DMR1KCAL_VH: dmrTX.setColorCode(1U); dmrTX.writeShortLC(SHORTLC_1K, 9U); - dmrTX.writeData2(DATALC_1K, DMR_FRAME_LENGTH_BYTES + 1U); + dmrTX.writeData2(VH_1K, DMR_FRAME_LENGTH_BYTES + 1U); dmrTX.setStart(true); m_state = DMR1KCAL_VOICE; break; case DMR1KCAL_VOICE: - createData1k(m_rfN); + createData1k(m_audioSeq); dmrTX.writeData2(m_dmr1k, DMR_FRAME_LENGTH_BYTES + 1U); - if(m_rfN == 5U) { - m_rfN = 0U; + if(m_audioSeq == 5U) { + m_audioSeq = 0U; if(!m_transmit) - m_state = DMR1KCAL_TERMLC; + m_state = DMR1KCAL_VT; } else - m_rfN++; + m_audioSeq++; break; - case DMR1KCAL_TERMLC: - dmrTX.writeData2(DATATERMLC_1K, DMR_FRAME_LENGTH_BYTES + 1U); + case DMR1KCAL_VT: + dmrTX.writeData2(VT_1K, DMR_FRAME_LENGTH_BYTES + 1U); m_frame_start = dmrTX.getFrameCount(); m_state = DMR1KCAL_WAIT; break; case DMR1KCAL_WAIT: - if (dmrTX.getFrameCount() > (m_frame_start + 30U)) + if (dmrTX.getFrameCount() > (m_frame_start + 30U)) { + dmrTX.setStart(false); + dmrTX.resetFifo2(); + m_audioSeq = 0U; m_state = DMR1KCAL_IDLE; + } break; default: m_state = DMR1KCAL_IDLE; @@ -142,7 +147,7 @@ uint8_t CCalDMR::write(const uint8_t* data, uint8_t length) m_transmit = data[0U] == 1U; if(m_transmit && m_state == DMR1KCAL_IDLE && m_modemState == STATE_DMR1KCAL) - m_state = DMR1KCAL_DATALC; + m_state = DMR1KCAL_VH; return 0U; } diff --git a/CalDMR.h b/CalDMR.h index 9aa37c0..1fbae4e 100644 --- a/CalDMR.h +++ b/CalDMR.h @@ -25,9 +25,9 @@ enum DMR1KCAL { DMR1KCAL_IDLE, - DMR1KCAL_DATALC, + DMR1KCAL_VH, DMR1KCAL_VOICE, - DMR1KCAL_TERMLC, + DMR1KCAL_VT, DMR1KCAL_WAIT }; @@ -46,7 +46,7 @@ private: DMR1KCAL m_state; uint32_t m_frame_start; uint8_t m_dmr1k[DMR_FRAME_LENGTH_BYTES + 1U]; - uint8_t m_rfN; + uint8_t m_audioSeq; }; #endif From 2ec02e53e3440375815bed0f3d77c0916a2c7ea7 Mon Sep 17 00:00:00 2001 From: Andy CA6JAU Date: Sat, 6 Jan 2018 11:05:43 -0300 Subject: [PATCH 4/4] Fix comment and formatting --- CalDMR.cpp | 2 +- DMRTX.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CalDMR.cpp b/CalDMR.cpp index c6f028f..52f1a78 100644 --- a/CalDMR.cpp +++ b/CalDMR.cpp @@ -41,7 +41,7 @@ const uint8_t VOICE_1K[] = {0x00U, // Embedded LC: CC: 1, srcID: 1, dstID: TG9 const uint8_t SYNCEMB_1K[6][7] = { - {0x07U, 0x55U, 0xFDU, 0x7DU, 0xF7U, 0x5FU, 0x70U}, // MS VOICE SYNC (audio seq 0) + {0x07U, 0x55U, 0xFDU, 0x7DU, 0xF7U, 0x5FU, 0x70U}, // BS VOICE SYNC (audio seq 0) {0x01U, 0x30U, 0x00U, 0x00U, 0x90U, 0x09U, 0x10U}, // EMB + Embedded LC1 (audio seq 1) {0x01U, 0x70U, 0x00U, 0x90U, 0x00U, 0x07U, 0x40U}, // EMB + Embedded LC2 (audio seq 2) {0x01U, 0x70U, 0x00U, 0x31U, 0x40U, 0x07U, 0x40U}, // EMB + Embedded LC3 (audio seq 3) diff --git a/DMRTX.cpp b/DMRTX.cpp index a55e05c..9824f9c 100644 --- a/DMRTX.cpp +++ b/DMRTX.cpp @@ -402,4 +402,4 @@ void CDMRTX::resetFifo2() uint32_t CDMRTX::getFrameCount() { return m_frameCount; -} \ No newline at end of file +}