diff --git a/CalDMR.cpp b/CalDMR.cpp index 52f1a78..1fc4058 100644 --- a/CalDMR.cpp +++ b/CalDMR.cpp @@ -55,7 +55,7 @@ const uint8_t SHORTLC_1K[] = {0x33U, 0x3AU, 0xA0U, 0x30U, 0x00U, 0x55U, 0xA6U, 0 CCalDMR::CCalDMR() : m_transmit(false), -m_state(DMR1KCAL_IDLE), +m_state(DMRCAL1K_IDLE), m_frame_start(0U), m_dmr1k(), m_audioSeq(0) @@ -75,7 +75,7 @@ void CCalDMR::process() dmrTX.setCal(false); } break; - case STATE_DMR1KCAL: + case STATE_DMRCAL1K: dmr1kcal(); break; default: @@ -103,38 +103,38 @@ void CCalDMR::dmr1kcal() return; switch (m_state) { - case DMR1KCAL_VH: + 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 = DMR1KCAL_VOICE; + m_state = DMRCAL1K_VOICE; break; - case DMR1KCAL_VOICE: + 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 = DMR1KCAL_VT; + m_state = DMRCAL1K_VT; } else m_audioSeq++; break; - case DMR1KCAL_VT: + case DMRCAL1K_VT: dmrTX.writeData2(VT_1K, DMR_FRAME_LENGTH_BYTES + 1U); m_frame_start = dmrTX.getFrameCount(); - m_state = DMR1KCAL_WAIT; + m_state = DMRCAL1K_WAIT; break; - case DMR1KCAL_WAIT: + case DMRCAL1K_WAIT: if (dmrTX.getFrameCount() > (m_frame_start + 30U)) { dmrTX.setStart(false); dmrTX.resetFifo2(); m_audioSeq = 0U; - m_state = DMR1KCAL_IDLE; + m_state = DMRCAL1K_IDLE; } break; default: - m_state = DMR1KCAL_IDLE; + m_state = DMRCAL1K_IDLE; break; } } @@ -146,8 +146,8 @@ 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_VH; + 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 1fbae4e..8ff5ae5 100644 --- a/CalDMR.h +++ b/CalDMR.h @@ -23,12 +23,12 @@ #include "Config.h" #include "DMRDefines.h" -enum DMR1KCAL { - DMR1KCAL_IDLE, - DMR1KCAL_VH, - DMR1KCAL_VOICE, - DMR1KCAL_VT, - DMR1KCAL_WAIT +enum DMRCAL1K { + DMRCAL1K_IDLE, + DMRCAL1K_VH, + DMRCAL1K_VOICE, + DMRCAL1K_VT, + DMRCAL1K_WAIT }; class CCalDMR { @@ -43,7 +43,7 @@ public: private: bool m_transmit; - DMR1KCAL m_state; + DMRCAL1K m_state; uint32_t m_frame_start; uint8_t m_dmr1k[DMR_FRAME_LENGTH_BYTES + 1U]; uint8_t m_audioSeq; 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/Globals.h b/Globals.h index fa64066..d671e7b 100644 --- a/Globals.h +++ b/Globals.h @@ -50,7 +50,8 @@ enum MMDVM_STATE { STATE_P25 = 4, // Dummy states start at 90 - STATE_DMR1KCAL = 94, + STATE_P25CAL1K = 93, + STATE_DMRCAL1K = 94, STATE_LFCAL = 95, STATE_RSSICAL = 96, STATE_CWID = 97, @@ -73,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" @@ -121,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/MMDVM.cpp b/MMDVM.cpp index 39be538..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 || m_modemState == STATE_DMR1KCAL) + 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 9e07926..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 || m_modemState == STATE_DMR1KCAL) + 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 e6a20a7..d734013 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 && modemState != STATE_DMR1KCAL) + 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 && modemState != STATE_DMR1KCAL) + 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,7 +402,7 @@ void CSerialPort::setMode(MMDVM_STATE modemState) p25RX.reset(); cwIdTX.reset(); break; - case STATE_DMR1KCAL: + case STATE_DMRCAL1K: DEBUG1("Mode set to DMR 1031 Hz Calibrate"); dmrIdleRX.reset(); dmrDMORX.reset(); @@ -412,6 +412,16 @@ void CSerialPort::setMode(MMDVM_STATE modemState) 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 @@ -493,8 +503,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 || m_modemState == STATE_DMR1KCAL) + 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 {