juribeparada/MMDVM_HS
1
0
Fork 0
mirror of https://github.com/juribeparada/MMDVM_HS.git synced 2026-04-06 06:43:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

More support for NXDN

Browse source
This commit is contained in:
Andy CA6JAU 2018-02-13 13:50:56 -03:00
parent ae4431c884
commit bc0f7bcc87
2 changed files with 69 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
IO.cpp
View file

@ -1,6 +1,6 @@
/*
* Copyright (C) 2015,2016 by Jonathan Naylor G4KLX
* Copyright (C) 2016,2017 by Andy Uribe CA6JAU
* Copyright (C) 2016,2017,2018 by Andy Uribe CA6JAU
* Copyright (C) 2017 by Danilo DB4PLE
* This program is free software; you can redistribute it and/or modify
@ -47,6 +47,7 @@ m_watchdog(0U)
DMR_pin(LOW);
YSF_pin(LOW);
P25_pin(LOW);
NXDN_pin(LOW);
COS_pin(LOW);
DEB_pin(LOW);
@ -83,6 +84,7 @@ void CIO::selfTest()
DMR_pin(ledValue);
YSF_pin(ledValue);
P25_pin(ledValue);
NXDN_pin(ledValue);
COS_pin(ledValue);
blinks++;
@ -104,7 +106,7 @@ void CIO::process()
if (m_started) {
// Two seconds timeout
if (m_watchdog >= 19200U) {
if (m_modemState == STATE_DSTAR || m_modemState == STATE_DMR || m_modemState == STATE_YSF || m_modemState == STATE_P25) {
if (m_modemState == STATE_DSTAR || m_modemState == STATE_DMR || m_modemState == STATE_YSF || m_modemState == STATE_P25 || m_modemState == STATE_NXDN) {
m_modemState = STATE_IDLE;
setMode(m_modemState);
}
@ -144,6 +146,8 @@ void CIO::process()
scantime = SCAN_TIME;
else if(m_modemState_prev == STATE_P25)
scantime = SCAN_TIME;
else if(m_modemState_prev == STATE_NXDN)
scantime = SCAN_TIME;
else
scantime = SCAN_TIME;
@ -184,6 +188,9 @@ void CIO::process()
case STATE_P25:
p25RX.databit(bit);
break;
case STATE_NXDN:
nxdnRX.databit(bit);
break;
default:
break;
}
@ -211,6 +218,10 @@ void CIO::start()
m_Modes[m_TotalModes] = STATE_P25;
m_TotalModes++;
}
if(m_nxdnEnable) {
m_Modes[m_TotalModes] = STATE_NXDN;
m_TotalModes++;
}
#if defined(ENABLE_SCAN_MODE)
if(m_TotalModes > 1)
@ -291,6 +302,7 @@ void CIO::setMode(MMDVM_STATE modemState)
DMR_pin(modemState == STATE_DMR);
YSF_pin(modemState == STATE_YSF);
P25_pin(modemState == STATE_P25);
NXDN_pin(modemState == STATE_NXDN);
}
void CIO::setDecode(bool dcd)