diff --git a/CalDMR.cpp b/CalDMR.cpp index 5622c1d..1fc4058 100644 --- a/CalDMR.cpp +++ b/CalDMR.cpp @@ -21,19 +21,121 @@ #include "Globals.h" #include "CalDMR.h" +// 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}; + +// 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}; + +// 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}, // 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) + {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() : -m_transmit(false) +m_transmit(false), +m_state(DMRCAL1K_IDLE), +m_frame_start(0U), +m_dmr1k(), +m_audioSeq(0) { + ::memcpy(m_dmr1k, VOICE_1K, DMR_FRAME_LENGTH_BYTES + 1U); } 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_DMRCAL1K: + dmr1kcal(); + break; + default: + break; + } +} + +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 DMRCAL1K_VH: + dmrTX.setColorCode(1U); + dmrTX.writeShortLC(SHORTLC_1K, 9U); + dmrTX.writeData2(VH_1K, DMR_FRAME_LENGTH_BYTES + 1U); + dmrTX.setStart(true); + m_state = DMRCAL1K_VOICE; + break; + case DMRCAL1K_VOICE: + createData1k(m_audioSeq); + dmrTX.writeData2(m_dmr1k, DMR_FRAME_LENGTH_BYTES + 1U); + if(m_audioSeq == 5U) { + m_audioSeq = 0U; + if(!m_transmit) + m_state = DMRCAL1K_VT; + } else + m_audioSeq++; + break; + case DMRCAL1K_VT: + dmrTX.writeData2(VT_1K, DMR_FRAME_LENGTH_BYTES + 1U); + m_frame_start = dmrTX.getFrameCount(); + m_state = DMRCAL1K_WAIT; + break; + case DMRCAL1K_WAIT: + if (dmrTX.getFrameCount() > (m_frame_start + 30U)) { + dmrTX.setStart(false); + dmrTX.resetFifo2(); + m_audioSeq = 0U; + m_state = DMRCAL1K_IDLE; + } + break; + default: + m_state = DMRCAL1K_IDLE; + break; } } @@ -44,6 +146,9 @@ uint8_t CCalDMR::write(const uint8_t* data, uint8_t length) m_transmit = data[0U] == 1U; + if(m_transmit && m_state == DMRCAL1K_IDLE && m_modemState == STATE_DMRCAL1K) + m_state = DMRCAL1K_VH; + return 0U; } diff --git a/CalDMR.h b/CalDMR.h index c3231c5..8ff5ae5 100644 --- a/CalDMR.h +++ b/CalDMR.h @@ -23,16 +23,30 @@ #include "Config.h" #include "DMRDefines.h" +enum DMRCAL1K { + DMRCAL1K_IDLE, + DMRCAL1K_VH, + DMRCAL1K_VOICE, + DMRCAL1K_VT, + DMRCAL1K_WAIT +}; + class CCalDMR { public: CCalDMR(); void process(); + void dmr1kcal(); + void createData1k(uint8_t n); uint8_t write(const uint8_t* data, uint8_t length); private: - bool m_transmit; + bool m_transmit; + DMRCAL1K m_state; + uint32_t m_frame_start; + uint8_t m_dmr1k[DMR_FRAME_LENGTH_BYTES + 1U]; + uint8_t m_audioSeq; }; #endif diff --git a/CalP25.cpp b/CalP25.cpp new file mode 100644 index 0000000..b1b9b6d --- /dev/null +++ b/CalP25.cpp @@ -0,0 +1,97 @@ +/* + * Copyright (C) 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 "CalP25.h" + +// Recommended 1011 Hz test pattern for P25 Phase 1 (ANSI/TIA-102.CAAA) +// NAC: 0x293, srcID: 1, dstID: TG1 +unsigned char LDU1_1K[] = {0x00, + 0x55, 0x75, 0xF5, 0xFF, 0x77, 0xFF, 0x29, 0x35, 0x54, 0x7B, 0xCB, 0x19, 0x4D, 0x0D, 0xCE, 0x24, 0xA1, 0x24, + 0x0D, 0x43, 0x3C, 0x0B, 0xE1, 0xB9, 0x18, 0x44, 0xFC, 0xC1, 0x62, 0x96, 0x27, 0x60, 0xE4, 0xE2, 0x4A, 0x10, + 0x90, 0xD4, 0x33, 0xC0, 0xBE, 0x1B, 0x91, 0x84, 0x4C, 0xFC, 0x16, 0x29, 0x62, 0x76, 0x0E, 0xC0, 0x00, 0x00, + 0x00, 0x00, 0x03, 0x89, 0x28, 0x49, 0x0D, 0x43, 0x3C, 0x02, 0xF8, 0x6E, 0x46, 0x11, 0x3F, 0xC1, 0x62, 0x94, + 0x89, 0xD8, 0x39, 0x00, 0x00, 0x00, 0x00, 0x1C, 0x38, 0x24, 0xA1, 0x24, 0x35, 0x0C, 0xF0, 0x2F, 0x86, 0xE4, + 0x18, 0x44, 0xFF, 0x05, 0x8A, 0x58, 0x9D, 0x83, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x70, 0xE2, 0x4A, 0x12, 0x40, + 0xD4, 0x33, 0xC0, 0xBE, 0x1B, 0x91, 0x84, 0x4F, 0xF0, 0x16, 0x29, 0x62, 0x76, 0x0E, 0x6D, 0xE5, 0xD5, 0x48, + 0xAD, 0xE3, 0x89, 0x28, 0x49, 0x0D, 0x43, 0x3C, 0x08, 0xF8, 0x6E, 0x46, 0x11, 0x3F, 0xC1, 0x62, 0x96, 0x24, + 0xD8, 0x3B, 0xA1, 0x41, 0xC2, 0xD2, 0xBA, 0x38, 0x90, 0xA1, 0x24, 0x35, 0x0C, 0xF0, 0x2F, 0x86, 0xE4, 0x60, + 0x44, 0xFF, 0x05, 0x8A, 0x58, 0x9D, 0x83, 0x94, 0xC8, 0xFB, 0x02, 0x35, 0xA4, 0xE2, 0x4A, 0x12, 0x43, 0x50, + 0x33, 0xC0, 0xBE, 0x1B, 0x91, 0x84, 0x4F, 0xF0, 0x58, 0x29, 0x62, 0x76, 0x0E, 0xC0, 0x00, 0x00, 0x00, 0x0C, + 0x89, 0x28, 0x49, 0x0D, 0x43, 0x3C, 0x0B, 0xE1, 0xB8, 0x46, 0x11, 0x3F, 0xC1, 0x62, 0x96, 0x27, 0x60, 0xE4}; + +unsigned char LDU2_1K[] = {0x00, + 0x55, 0x75, 0xF5, 0xFF, 0x77, 0xFF, 0x29, 0x3A, 0xB8, 0xA4, 0xEF, 0xB0, 0x9A, 0x8A, 0xCE, 0x24, 0xA1, 0x24, + 0x0D, 0x43, 0x3C, 0x0B, 0xE1, 0xB9, 0x18, 0x44, 0xFC, 0xC1, 0x62, 0x96, 0x27, 0x60, 0xEC, 0xE2, 0x4A, 0x10, + 0x90, 0xD4, 0x33, 0xC0, 0xBE, 0x1B, 0x91, 0x84, 0x4C, 0xFC, 0x16, 0x29, 0x62, 0x76, 0x0E, 0x40, 0x00, 0x00, + 0x00, 0x00, 0x03, 0x89, 0x28, 0x49, 0x0D, 0x43, 0x3C, 0x02, 0xF8, 0x6E, 0x46, 0x11, 0x3F, 0xC1, 0x62, 0x94, + 0x89, 0xD8, 0x3B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x24, 0xA1, 0x24, 0x35, 0x0C, 0xF0, 0x2F, 0x86, 0xE4, + 0x18, 0x44, 0xFF, 0x05, 0x8A, 0x58, 0x9D, 0x83, 0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE2, 0x4A, 0x12, 0x40, + 0xD4, 0x33, 0xC0, 0xBE, 0x1B, 0x91, 0x84, 0x4F, 0xF0, 0x16, 0x29, 0x62, 0x76, 0x0E, 0xE0, 0xE0, 0x00, 0x00, + 0x00, 0x03, 0x89, 0x28, 0x49, 0x0D, 0x43, 0x3C, 0x08, 0xF8, 0x6E, 0x46, 0x11, 0x3F, 0xC1, 0x62, 0x96, 0x24, + 0xD8, 0x39, 0xAE, 0x8B, 0x48, 0xB6, 0x49, 0x38, 0x90, 0xA1, 0x24, 0x35, 0x0C, 0xF0, 0x2F, 0x86, 0xE4, 0x60, + 0x44, 0xFF, 0x05, 0x8A, 0x58, 0x9D, 0x83, 0xB9, 0xA8, 0xF4, 0xF1, 0xFD, 0x60, 0xE2, 0x4A, 0x12, 0x43, 0x50, + 0x33, 0xC0, 0xBE, 0x1B, 0x91, 0x84, 0x4F, 0xF0, 0x58, 0x29, 0x62, 0x76, 0x0E, 0x40, 0x00, 0x00, 0x00, 0x0C, + 0x89, 0x28, 0x49, 0x0D, 0x43, 0x3C, 0x0B, 0xE1, 0xB8, 0x46, 0x11, 0x3F, 0xC1, 0x62, 0x96, 0x27, 0x60, 0xEC}; + +CCalP25::CCalP25() : +m_transmit(false), +m_state(P25CAL1K_IDLE) +{ +} + +void CCalP25::process() +{ + p25TX.process(); + + uint16_t space = p25TX.getSpace(); + if (space < 1U) + return; + + switch (m_state) { + case P25CAL1K_LDU1: + p25TX.writeData(LDU1_1K, P25_LDU_FRAME_LENGTH_BYTES + 1U); + m_state = P25CAL1K_LDU2; + break; + case P25CAL1K_LDU2: + p25TX.writeData(LDU2_1K, P25_LDU_FRAME_LENGTH_BYTES + 1U); + if(!m_transmit) + m_state = P25CAL1K_IDLE; + else + m_state = P25CAL1K_LDU1; + break; + default: + m_state = P25CAL1K_IDLE; + break; + } +} + +uint8_t CCalP25::write(const uint8_t* data, uint8_t length) +{ + if (length != 1U) + return 4U; + + m_transmit = data[0U] == 1U; + + if(m_transmit && m_state == P25CAL1K_IDLE) + m_state = P25CAL1K_LDU1; + + return 0U; +} + diff --git a/CalP25.h b/CalP25.h new file mode 100644 index 0000000..6374ed2 --- /dev/null +++ b/CalP25.h @@ -0,0 +1,45 @@ +/* + * Copyright (C) 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(CALP25_H) +#define CALP25_H + +#include "Config.h" +#include "P25Defines.h" + +enum P25CAL1K { + P25CAL1K_IDLE, + P25CAL1K_LDU1, + P25CAL1K_LDU2 +}; + +class CCalP25 { +public: + CCalP25(); + + void process(); + + uint8_t write(const uint8_t* data, uint8_t length); + +private: + bool m_transmit; + P25CAL1K m_state; +}; + +#endif + diff --git a/DMRTX.cpp b/DMRTX.cpp index 6ec8e38..68843a4 100644 --- a/DMRTX.cpp +++ b/DMRTX.cpp @@ -395,3 +395,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; +} 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 2c58601..7f85241 100644 --- a/Globals.h +++ b/Globals.h @@ -50,6 +50,8 @@ enum MMDVM_STATE { STATE_P25 = 4, // Dummy states start at 90 + STATE_P25CAL1K = 93, + STATE_DMRCAL1K = 94, STATE_LFCAL = 95, STATE_RSSICAL = 96, STATE_CWID = 97, @@ -72,6 +74,7 @@ enum MMDVM_STATE { #include "CalDStarRX.h" #include "CalDStarTX.h" #include "CalDMR.h" +#include "CalP25.h" #include "CalRSSI.h" #include "CWIdTX.h" #include "Debug.h" @@ -120,6 +123,7 @@ extern CP25TX p25TX; extern CCalDStarRX calDStarRX; extern CCalDStarTX calDStarTX; extern CCalDMR calDMR; +extern CCalP25 calP25; extern CCalRSSI calRSSI; extern CCWIdTX cwIdTX; diff --git a/IOSTM_CMSIS.cpp b/IOSTM_CMSIS.cpp index 28fd859..6d54f6f 100644 --- a/IOSTM_CMSIS.cpp +++ b/IOSTM_CMSIS.cpp @@ -290,6 +290,9 @@ static inline void ADCInit() // Trigger first conversion ADC1->CR2 |= ADC_CR2_ADON; +#if defined(SEND_RSSI_DATA) + ADC2->CR2 |= ADC_CR2_ADON; +#endif } @@ -355,10 +358,16 @@ void CIO::interrupt() uint16_t rawRSSI = 0U; bitband_t eoc = (bitband_t)BITBAND_PERIPH(&ADC1->SR, ADC_SR_EOS_Pos); bitband_t adon = (bitband_t)BITBAND_PERIPH(&ADC1->CR2, ADC_CR2_ADON_Pos); +#if defined(SEND_RSSI_DATA) + bitband_t rssi_adon = (bitband_t)BITBAND_PERIPH(&ADC2->CR2, ADC_CR2_ADON_Pos); +#endif if (*eoc) { // trigger next conversion *adon = 1; +#if defined(SEND_RSSI_DATA) + *rssi_adon = 1; +#endif m_txBuffer.get(sample, control); DAC->DHR12R1 = sample; // Send the value to the DAC diff --git a/MMDVM.cpp b/MMDVM.cpp index 879ea7e..37c0a41 100644 --- a/MMDVM.cpp +++ b/MMDVM.cpp @@ -55,6 +55,7 @@ CP25TX p25TX; CCalDStarRX calDStarRX; CCalDStarTX calDStarTX; CCalDMR calDMR; +CCalP25 calP25; CCalRSSI calRSSI; CCWIdTX cwIdTX; @@ -93,11 +94,14 @@ 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_DMRCAL1K) calDMR.process(); - if (m_modemState == STATE_IDLE) - cwIdTX.process(); + if (m_modemState == STATE_P25CAL1K) + calP25.process(); + + if (m_modemState == STATE_IDLE) + cwIdTX.process(); } int main() diff --git a/MMDVM.ino b/MMDVM.ino index e476ea4..d132f2a 100644 --- a/MMDVM.ino +++ b/MMDVM.ino @@ -52,6 +52,7 @@ CP25TX p25TX; CCalDStarRX calDStarRX; CCalDStarTX calDStarTX; CCalDMR calDMR; +CCalP25 calP25; CCalRSSI calRSSI; CCWIdTX cwIdTX; @@ -90,9 +91,12 @@ 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_DMRCAL1K) calDMR.process(); + if (m_modemState == STATE_P25CAL1K) + calP25.process(); + if (m_modemState == STATE_IDLE) cwIdTX.process(); } diff --git a/SerialPort.cpp b/SerialPort.cpp index 17ee217..5fecd87 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_DMRCAL1K && modemState != STATE_P25CAL1K) 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_DMRCAL1K && modemState != STATE_P25CAL1K) return 4U; if (modemState == STATE_DSTAR && !m_dstarEnable) return 4U; @@ -402,6 +402,26 @@ void CSerialPort::setMode(MMDVM_STATE modemState) p25RX.reset(); cwIdTX.reset(); break; + case STATE_DMRCAL1K: + DEBUG1("Mode set to DMR 1031 Hz Calibrate"); + dmrIdleRX.reset(); + dmrDMORX.reset(); + dmrRX.reset(); + dstarRX.reset(); + ysfRX.reset(); + p25RX.reset(); + cwIdTX.reset(); + break; + case STATE_P25CAL1K: + DEBUG1("Mode set to P25 1011 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 @@ -482,8 +502,10 @@ 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_DMRCAL1K) err = calDMR.write(m_buffer + 3U, m_len - 3U); + if (m_modemState == STATE_P25CAL1K) + err = calP25.write(m_buffer + 3U, m_len - 3U); if (err == 0U) { sendACK(); } else {