Merge branch 'master' into nxdn

Fixitdaz · Feb 12, 2018 · 36a4404 · 36a4404
2 parents 14a4dc2 + 66241f2
commit 36a4404
Show file tree

Hide file tree

Showing 7 changed files with 95 additions and 13 deletions.
diff --git a/CalDMR.cpp b/CalDMR.cpp
@@ -21,25 +21,37 @@
 #include "Globals.h"
 #include "CalDMR.h"
 
-// Voice LC Header, CC: 1, srcID: 1, dstID: TG9
+// Voice LC BS 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
+// Voice Term BS 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 LC MS Header, CC: 1, srcID: 1, dstID: TG9
+const uint8_t VH_DMO1K[] = {0x00U,
+ 0x00U, 0x20U, 0x08U, 0x08U, 0x02U, 0x38U, 0x15U, 0x00U, 0x2CU, 0xA0U, 0x14U,
+ 0x60U, 0x84U, 0x6DU, 0x5DU, 0x7FU, 0x77U, 0xFDU, 0x75U, 0x7EU, 0x30U, 0x30U,
+ 0x01U, 0x10U, 0x01U, 0x40U, 0x03U, 0xC0U, 0x13U, 0xC1U, 0x1EU, 0x80U, 0x6FU};
+
+// Voice Term MS with LC, CC: 1, srcID: 1, dstID: TG9
+const uint8_t VT_DMO1K[] = {0x00U,
+ 0x00U, 0x4FU, 0x08U, 0xDCU, 0x02U, 0x88U, 0x15U, 0x78U, 0x2CU, 0xD0U, 0x14U,
+ 0xC0U, 0x84U, 0xADU, 0x5DU, 0x7FU, 0x77U, 0xFDU, 0x75U, 0x79U, 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
+// Embedded LC BS: 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)
@@ -48,6 +60,15 @@ const uint8_t SYNCEMB_1K[6][7] = {
  {0x01U, 0x50U, 0xA1U, 0x71U, 0xD1U, 0x70U, 0x70U}, // EMB + Embedded LC4 (audio seq 4)
  {0x01U, 0x10U, 0x00U, 0x00U, 0x00U, 0x0EU, 0x20U}}; // EMB (audio seq 5)
 
+// Embedded LC MS: CC: 1, srcID: 1, dstID: TG9
+const uint8_t SYNCEMB_DMO1K[6][7] = {
+ {0x07U, 0xF7U, 0xD5U, 0xDDU, 0x57U, 0xDFU, 0xD0U}, // 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
@@ -78,6 +99,9 @@ void CCalDMR::process()
  case STATE_DMRCAL1K:
  dmr1kcal();
  break;
+ case STATE_DMRDMO1K:
+ dmrdmo1k();
+ break;
  default:
  break;
  }
@@ -94,6 +118,17 @@ void CCalDMR::createData1k(uint8_t n)
  m_dmr1k[20U] |= SYNCEMB_1K[n][6] & 0xF0U;
 }
 
+void CCalDMR::createDataDMO1k(uint8_t n)
+{
+ for(uint8_t i = 0; i < 5U; i++)
+ m_dmr1k[i + 15U] = SYNCEMB_DMO1K[n][i + 1U];
+
+ m_dmr1k[14U] &= 0xF0U;
+ m_dmr1k[20U] &= 0x0FU;
+ m_dmr1k[14U] |= SYNCEMB_DMO1K[n][0] & 0x0FU;
+ m_dmr1k[20U] |= SYNCEMB_DMO1K[n][6] & 0xF0U;
+}
+
 void CCalDMR::dmr1kcal()
 {
  dmrTX.process();
@@ -139,14 +174,48 @@ void CCalDMR::dmr1kcal()
  }
 }
 
+void CCalDMR::dmrdmo1k()
+{
+ dmrDMOTX.process();
+
+ uint16_t space = dmrDMOTX.getSpace();
+ if (space < 1U)
+ return;
+
+ switch (m_state) {
+ case DMRCAL1K_VH:
+ dmrDMOTX.writeData(VH_DMO1K, DMR_FRAME_LENGTH_BYTES + 1U);
+ m_state = DMRCAL1K_VOICE;
+ break;
+ case DMRCAL1K_VOICE:
+ createDataDMO1k(m_audioSeq);
+ dmrDMOTX.writeData(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:
+ dmrDMOTX.writeData(VT_DMO1K, DMR_FRAME_LENGTH_BYTES + 1U);
+ m_state = DMRCAL1K_IDLE;
+ break;
+ default:
+ m_state = DMRCAL1K_IDLE;
+ m_audioSeq = 0U;
+ break;
+ }
+}
+
 uint8_t CCalDMR::write(const uint8_t* data, uint8_t length)
 {
  if (length != 1U)
  return 4U;
 
  m_transmit = data[0U] == 1U;
 
- if(m_transmit && m_state == DMRCAL1K_IDLE && m_modemState == STATE_DMRCAL1K)
+ if(m_transmit && m_state == DMRCAL1K_IDLE && (m_modemState == STATE_DMRCAL1K || m_modemState == STATE_DMRDMO1K))
  m_state = DMRCAL1K_VH;
 
  return 0U;

diff --git a/CalDMR.h b/CalDMR.h
@@ -37,7 +37,9 @@ class CCalDMR {
 
  void process();
  void dmr1kcal();
+ void dmrdmo1k();
  void createData1k(uint8_t n);
+ void createDataDMO1k(uint8_t n);
 
  uint8_t write(const uint8_t* data, uint8_t length);
 

diff --git a/Config.h b/Config.h
@@ -39,7 +39,7 @@
 // #define USE_COS_AS_LOCKOUT
 
 // Use pins to output the current mode
-// #define ARDUINO_MODE_PINS
+#define ARDUINO_MODE_PINS
 
 // For the original Arduino Due pin layout
 // #define ARDUINO_DUE_PAPA
@@ -54,7 +54,7 @@
 // #define ARDUINO_DUE_NTH
 
 // For ST Nucleo-64 STM32F446RE board
-// #define STM32F4_NUCLEO_MORPHO_HEADER
+#define STM32F4_NUCLEO_MORPHO_HEADER
 // #define STM32F4_NUCLEO_ARDUINO_HEADER
 
 // Use separate mode pins to switch external filters/bandwidth for example
@@ -64,6 +64,6 @@
 // #define SEND_RSSI_DATA
 
 // Use the modem as a serial repeater for Nextion displays
-// #define SERIAL_REPEATER
+#define SERIAL_REPEATER
 
 #endif
diff --git a/Globals.h b/Globals.h
@@ -51,6 +51,7 @@ enum MMDVM_STATE {
  STATE_NXDN = 5,
 
  // Dummy states start at 90
+ STATE_DMRDMO1K = 92,
  STATE_P25CAL1K = 93,
  STATE_DMRCAL1K = 94,
  STATE_LFCAL = 95,

diff --git a/MMDVM.cpp b/MMDVM.cpp
@@ -101,7 +101,7 @@ void loop()
  if (m_modemState == STATE_DSTARCAL)
  calDStarTX.process();
 
- if (m_modemState == STATE_DMRCAL || m_modemState == STATE_LFCAL || m_modemState == STATE_DMRCAL1K)
+ if (m_modemState == STATE_DMRCAL || m_modemState == STATE_LFCAL || m_modemState == STATE_DMRCAL1K || m_modemState == STATE_DMRDMO1K)
  calDMR.process();
 
  if (m_modemState == STATE_P25CAL1K)

diff --git a/MMDVM.ino b/MMDVM.ino
@@ -98,7 +98,7 @@ void loop()
  if (m_modemState == STATE_DSTARCAL)
  calDStarTX.process();
 
- if (m_modemState == STATE_DMRCAL || m_modemState == STATE_LFCAL || m_modemState == STATE_DMRCAL1K)
+ if (m_modemState == STATE_DMRCAL || m_modemState == STATE_LFCAL || m_modemState == STATE_DMRCAL1K || m_modemState == STATE_DMRDMO1K)
  calDMR.process();
 
  if (m_modemState == STATE_P25CAL1K)

diff --git a/SerialPort.cpp b/SerialPort.cpp
@@ -254,7 +254,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_NXDN && modemState != STATE_DSTARCAL && modemState != STATE_DMRCAL && modemState != STATE_RSSICAL && modemState != STATE_LFCAL && modemState != STATE_DMRCAL1K && modemState != STATE_P25CAL1K)
+ if (modemState != STATE_IDLE && modemState != STATE_DSTAR && modemState != STATE_DMR && modemState != STATE_YSF && modemState != STATE_P25 && modemState != STATE_NXDN && modemState != STATE_DSTARCAL && modemState != STATE_DMRCAL && modemState != STATE_RSSICAL && modemState != STATE_LFCAL && modemState != STATE_DMRCAL1K && modemState != STATE_P25CAL1K && modemState != STATE_DMRDMO1K)
  return 4U;
  if (modemState == STATE_DSTAR && !dstarEnable)
  return 4U;
@@ -326,7 +326,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_NXDN && modemState != STATE_DSTARCAL && modemState != STATE_DMRCAL && modemState != STATE_RSSICAL && modemState != STATE_LFCAL && modemState != STATE_DMRCAL1K && modemState != STATE_P25CAL1K)
+ if (modemState != STATE_IDLE && modemState != STATE_DSTAR && modemState != STATE_DMR && modemState != STATE_YSF && modemState != STATE_P25 && modemState != STATE_NXDN && modemState != STATE_DSTARCAL && modemState != STATE_DMRCAL && modemState != STATE_RSSICAL && modemState != STATE_LFCAL && modemState != STATE_DMRCAL1K && modemState != STATE_P25CAL1K && modemState != STATE_DMRDMO1K)
  return 4U;
  if (modemState == STATE_DSTAR && !m_dstarEnable)
  return 4U;
@@ -440,7 +440,7 @@ void CSerialPort::setMode(MMDVM_STATE modemState)
  cwIdTX.reset();
  break;
  case STATE_DMRCAL1K:
- DEBUG1("Mode set to DMR 1031 Hz Calibrate");
+ DEBUG1("Mode set to DMR BS 1031 Hz Calibrate");
  dmrIdleRX.reset();
  dmrDMORX.reset();
  dmrRX.reset();
@@ -461,6 +461,16 @@ void CSerialPort::setMode(MMDVM_STATE modemState)
  nxdnRX.reset();
  cwIdTX.reset();
  break;
+ case STATE_DMRDMO1K:
+ DEBUG1("Mode set to DMR MS 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
@@ -542,7 +552,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_DMRCAL1K)
+ if (m_modemState == STATE_DMRCAL || m_modemState == STATE_LFCAL || m_modemState == STATE_DMRCAL1K || m_modemState == STATE_DMRDMO1K)
  err = calDMR.write(m_buffer + 3U, m_len - 3U);
  if (m_modemState == STATE_P25CAL1K)
  err = calP25.write(m_buffer + 3U, m_len - 3U);