Unsignedio
/
MMDVM
mirror of https://github.com/markqvist/MMDVM.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Changing name DMR1KCAL to DMRCAL1K

nxdn
Andy CA6JAU 2018-01-07 00:24:58 -03:00
parent 394d0cbc6b
commit 02d5218baa
7 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
CalDMR.cpp
View File

@ -55,7 +55,7 @@ const uint8_t SHORTLC_1K[] = {0x33U, 0x3AU, 0xA0U, 0x30U, 0x00U, 0x55U, 0xA6U, 0
CCalDMR::CCalDMR() : CCalDMR::CCalDMR() :
m_transmit(false), m_transmit(false),
m_state(DMR1KCAL_IDLE), m_state(DMRCAL1K_IDLE),
m_frame_start(0U), m_frame_start(0U),
m_dmr1k(), m_dmr1k(),
m_audioSeq(0) m_audioSeq(0)
@ -75,7 +75,7 @@ void CCalDMR::process()
dmrTX.setCal(false); dmrTX.setCal(false);
} }
break; break;
case STATE_DMR1KCAL: case STATE_DMRCAL1K:
dmr1kcal(); dmr1kcal();
break; break;
default: default:
@ -103,38 +103,38 @@ void CCalDMR::dmr1kcal()
return; return;
switch (m_state) { switch (m_state) {
case DMR1KCAL_VH: case DMRCAL1K_VH:
dmrTX.setColorCode(1U); dmrTX.setColorCode(1U);
dmrTX.writeShortLC(SHORTLC_1K, 9U); dmrTX.writeShortLC(SHORTLC_1K, 9U);
dmrTX.writeData2(VH_1K, DMR_FRAME_LENGTH_BYTES + 1U); dmrTX.writeData2(VH_1K, DMR_FRAME_LENGTH_BYTES + 1U);
dmrTX.setStart(true); dmrTX.setStart(true);
m_state = DMR1KCAL_VOICE; m_state = DMRCAL1K_VOICE;
break; break;
case DMR1KCAL_VOICE: case DMRCAL1K_VOICE:
createData1k(m_audioSeq); createData1k(m_audioSeq);
dmrTX.writeData2(m_dmr1k, DMR_FRAME_LENGTH_BYTES + 1U); dmrTX.writeData2(m_dmr1k, DMR_FRAME_LENGTH_BYTES + 1U);
if(m_audioSeq == 5U) { if(m_audioSeq == 5U) {
m_audioSeq = 0U; m_audioSeq = 0U;
if(!m_transmit) if(!m_transmit)
m_state = DMR1KCAL_VT; m_state = DMRCAL1K_VT;
} else } else
m_audioSeq++; m_audioSeq++;
break; break;
case DMR1KCAL_VT: case DMRCAL1K_VT:
dmrTX.writeData2(VT_1K, DMR_FRAME_LENGTH_BYTES + 1U); dmrTX.writeData2(VT_1K, DMR_FRAME_LENGTH_BYTES + 1U);
m_frame_start = dmrTX.getFrameCount(); m_frame_start = dmrTX.getFrameCount();
m_state = DMR1KCAL_WAIT; m_state = DMRCAL1K_WAIT;
break; break;
case DMR1KCAL_WAIT: case DMRCAL1K_WAIT:
if (dmrTX.getFrameCount() > (m_frame_start + 30U)) { if (dmrTX.getFrameCount() > (m_frame_start + 30U)) {
dmrTX.setStart(false); dmrTX.setStart(false);
dmrTX.resetFifo2(); dmrTX.resetFifo2();
m_audioSeq = 0U; m_audioSeq = 0U;
m_state = DMR1KCAL_IDLE; m_state = DMRCAL1K_IDLE;
} }
break; break;
default: default:
m_state = DMR1KCAL_IDLE; m_state = DMRCAL1K_IDLE;
break; break;
} }
} }
@ -146,8 +146,8 @@ uint8_t CCalDMR::write(const uint8_t* data, uint8_t length)
m_transmit = data[0U] == 1U; m_transmit = data[0U] == 1U;
if(m_transmit && m_state == DMR1KCAL_IDLE && m_modemState == STATE_DMR1KCAL) if(m_transmit && m_state == DMRCAL1K_IDLE && m_modemState == STATE_DMRCAL1K)
m_state = DMR1KCAL_VH; m_state = DMRCAL1K_VH;
return 0U; return 0U;
} }

14
CalDMR.h
View File

@ -23,12 +23,12 @@
#include "Config.h" #include "Config.h"
#include "DMRDefines.h" #include "DMRDefines.h"
enum DMR1KCAL { enum DMRCAL1K {
DMR1KCAL_IDLE, DMRCAL1K_IDLE,
DMR1KCAL_VH, DMRCAL1K_VH,
DMR1KCAL_VOICE, DMRCAL1K_VOICE,
DMR1KCAL_VT, DMRCAL1K_VT,
DMR1KCAL_WAIT DMRCAL1K_WAIT
}; };
class CCalDMR { class CCalDMR {
@ -43,7 +43,7 @@ public:
private: private:
bool m_transmit; bool m_transmit;
DMR1KCAL m_state; DMRCAL1K m_state;
uint32_t m_frame_start; uint32_t m_frame_start;
uint8_t m_dmr1k[DMR_FRAME_LENGTH_BYTES + 1U]; uint8_t m_dmr1k[DMR_FRAME_LENGTH_BYTES + 1U];
uint8_t m_audioSeq; uint8_t m_audioSeq;

1
CalP25.h
View File

@ -20,6 +20,7 @@
#define CALP25_H #define CALP25_H
#include "Config.h" #include "Config.h"
#include "P25Defines.h"
enum P25CAL1K { enum P25CAL1K {
P25CAL1K_IDLE, P25CAL1K_IDLE,

2
Globals.h
View File

@ -51,7 +51,7 @@ enum MMDVM_STATE {
// Dummy states start at 90 // Dummy states start at 90
STATE_P25CAL1K = 93, STATE_P25CAL1K = 93,
STATE_DMR1KCAL = 94, STATE_DMRCAL1K = 94,
STATE_LFCAL = 95, STATE_LFCAL = 95,
STATE_RSSICAL = 96, STATE_RSSICAL = 96,
STATE_CWID = 97, STATE_CWID = 97,

2
MMDVM.cpp
View File

@ -94,7 +94,7 @@ void loop()
if (m_modemState == STATE_DSTARCAL) if (m_modemState == STATE_DSTARCAL)
calDStarTX.process(); 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(); calDMR.process();
if (m_modemState == STATE_P25CAL1K) if (m_modemState == STATE_P25CAL1K)

2
MMDVM.ino
View File

@ -91,7 +91,7 @@ void loop()
if (m_modemState == STATE_DSTARCAL) if (m_modemState == STATE_DSTARCAL)
calDStarTX.process(); 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(); calDMR.process();
if (m_modemState == STATE_P25CAL1K) if (m_modemState == STATE_P25CAL1K)

8
SerialPort.cpp
View File

@ -243,7 +243,7 @@ uint8_t CSerialPort::setConfig(const uint8_t* data, uint8_t length)
MMDVM_STATE modemState = MMDVM_STATE(data[3U]); 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; return 4U;
if (modemState == STATE_DSTAR && !dstarEnable) if (modemState == STATE_DSTAR && !dstarEnable)
return 4U; return 4U;
@ -309,7 +309,7 @@ uint8_t CSerialPort::setMode(const uint8_t* data, uint8_t length)
if (modemState == m_modemState) if (modemState == m_modemState)
return 0U; 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; return 4U;
if (modemState == STATE_DSTAR && !m_dstarEnable) if (modemState == STATE_DSTAR && !m_dstarEnable)
return 4U; return 4U;
@ -402,7 +402,7 @@ void CSerialPort::setMode(MMDVM_STATE modemState)
p25RX.reset(); p25RX.reset();
cwIdTX.reset(); cwIdTX.reset();
break; break;
case STATE_DMR1KCAL: case STATE_DMRCAL1K:
DEBUG1("Mode set to DMR 1031 Hz Calibrate"); DEBUG1("Mode set to DMR 1031 Hz Calibrate");
dmrIdleRX.reset(); dmrIdleRX.reset();
dmrDMORX.reset(); dmrDMORX.reset();
@ -503,7 +503,7 @@ void CSerialPort::process()
case MMDVM_CAL_DATA: case MMDVM_CAL_DATA:
if (m_modemState == STATE_DSTARCAL) if (m_modemState == STATE_DSTARCAL)
err = calDStarTX.write(m_buffer + 3U, m_len - 3U); 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); err = calDMR.write(m_buffer + 3U, m_len - 3U);
if (m_modemState == STATE_P25CAL1K) if (m_modemState == STATE_P25CAL1K)
err = calP25.write(m_buffer + 3U, m_len - 3U); err = calP25.write(m_buffer + 3U, m_len - 3U);