From 02d5218baa5f56879404776597b9f2b0a6805471 Mon Sep 17 00:00:00 2001 From: Andy CA6JAU Date: Sun, 7 Jan 2018 00:24:58 -0300 Subject: [PATCH] Changing name DMR1KCAL to DMRCAL1K --- CalDMR.cpp | 26 +++++++++++++------------- CalDMR.h | 14 +++++++------- CalP25.h | 1 + Globals.h | 2 +- MMDVM.cpp | 2 +- MMDVM.ino | 2 +- SerialPort.cpp | 8 ++++---- 7 files changed, 28 insertions(+), 27 deletions(-) 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.h b/CalP25.h index 12a7e15..6374ed2 100644 --- a/CalP25.h +++ b/CalP25.h @@ -20,6 +20,7 @@ #define CALP25_H #include "Config.h" +#include "P25Defines.h" enum P25CAL1K { P25CAL1K_IDLE, diff --git a/Globals.h b/Globals.h index 1d12b92..d671e7b 100644 --- a/Globals.h +++ b/Globals.h @@ -51,7 +51,7 @@ enum MMDVM_STATE { // Dummy states start at 90 STATE_P25CAL1K = 93, - STATE_DMR1KCAL = 94, + STATE_DMRCAL1K = 94, STATE_LFCAL = 95, STATE_RSSICAL = 96, STATE_CWID = 97, diff --git a/MMDVM.cpp b/MMDVM.cpp index eb204ae..37c0a41 100644 --- a/MMDVM.cpp +++ b/MMDVM.cpp @@ -94,7 +94,7 @@ 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) diff --git a/MMDVM.ino b/MMDVM.ino index 5fb0ddc..d132f2a 100644 --- a/MMDVM.ino +++ b/MMDVM.ino @@ -91,7 +91,7 @@ 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) diff --git a/SerialPort.cpp b/SerialPort.cpp index c82587b..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 && modemState != STATE_P25CAL1K) + 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 && modemState != STATE_P25CAL1K) + 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(); @@ -503,7 +503,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 || 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);