Skip to content

Commit

Permalink
correct NXDN IF bandwidth to 12.5khz; compress debug messages;
Browse files Browse the repository at this point in the history
  • Loading branch information
@gatekeep
gatekeep committed Dec 18, 2023
1 parent c75ff52 commit 941f57b
Show file tree
Hide file tree
Showing 13 changed files with 115 additions and 120 deletions.
2 changes: 1 addition & 1 deletion ADF7021.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1283,7 +1283,7 @@ void IO::configureTxRx(DVM_STATE modemState)
ADF7021_REG4 |= (uint32_t)ADF7021_REG4_INV_CLKDAT << 8; // Clock/Data Inversion
ADF7021_REG4 |= (uint32_t)(nxdnDiscBW & 0x3FFU) << 10; // Discriminator BW
ADF7021_REG4 |= (uint32_t)(nxdnPostBW & 0xFFFU) << 20; // Post Demod BW
ADF7021_REG4 |= (uint32_t)ADF7021_REG4_IF_1875K << 30; // IF Filter
ADF7021_REG4 |= (uint32_t)ADF7021_REG4_IF_125K << 30; // IF Filter

/*
** 3FSK/4FSK Demod (Register 13)
Expand Down
2 changes: 1 addition & 1 deletion CWIdTX.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ uint8_t CWIdTX::write(const uint8_t* data, uint8_t length)

m_poLen += 5U;

DEBUG2("CWIdTx: write(): message created with length", m_poLen);
DEBUG2("CWIdTx::write() message length", m_poLen);

return RSN_OK;
}
Expand Down
8 changes: 4 additions & 4 deletions IO.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ void IO::process()
if (m_cwIdState) {
// check for CW ID end of transmission
m_cwIdState = false;
DEBUG2("IO::process(): setting modem state", m_modemState);
DEBUG2("IO::process() setting modem state", m_modemState);
io.rf1Conf(m_modemState, true);
}

Expand Down Expand Up @@ -230,10 +230,10 @@ void IO::setMode(DVM_STATE modemState)
relativeState = serial.calRelativeState(modemState);
}

DEBUG3("IO::setMode(): setting modem state", modemState, relativeState);
DEBUG3("IO::setMode() setting modem state", modemState, relativeState);
rf1Conf(relativeState, true);

DEBUG4("IO::setMode(): setting lights", relativeState == STATE_DMR, relativeState == STATE_P25, relativeState == STATE_NXDN);
DEBUG4("IO::setMode() setting lights", relativeState == STATE_DMR, relativeState == STATE_P25, relativeState == STATE_NXDN);
setDMRInt(relativeState == STATE_DMR);
setP25Int(relativeState == STATE_P25);
setNXDNInt(relativeState == STATE_NXDN);
Expand Down Expand Up @@ -300,7 +300,7 @@ uint8_t IO::setRFParams(uint32_t rxFreq, uint32_t txFreq, uint8_t rfPower, ADF_G
m_rxFrequency = rxFreq;
m_txFrequency = txFreq;

DEBUG5("IO::setRFParams(): setting RF params", m_rxFrequency, m_txFrequency, m_rfPower, m_gainMode);
DEBUG5("IO::setRFParams() setting RF params", m_rxFrequency, m_txFrequency, m_rfPower, m_gainMode);

return RSN_OK;
}
Expand Down
54 changes: 27 additions & 27 deletions SerialPort.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ void SerialPort::process()
sendACK();
}
else {
DEBUG2("SerialPort: process(): received invalid calibration data", err);
DEBUG2("SerialPort::process() received invalid calibration data", err);
sendNAK(err);
}
break;
Expand All @@ -170,7 +170,7 @@ void SerialPort::process()
sendACK();
}
else {
DEBUG2("SerialPort: process(): received invalid data to write to flash", err);
DEBUG2("SerialPort::process() received invalid data to write to flash", err);
sendNAK(err);
}
break;
Expand All @@ -181,7 +181,7 @@ void SerialPort::process()
sendACK();
}
else {
DEBUG2("SerialPort: process(): received invalid data to set buffers", err);
DEBUG2("SerialPort::process() received invalid data to set buffers", err);
sendNAK(err);
}
break;
Expand All @@ -192,13 +192,13 @@ void SerialPort::process()
if (m_modemState == STATE_IDLE) {
m_cwIdState = true;

DEBUG2("SerialPort: process(): setting modem state", STATE_CW);
DEBUG2("SerialPort::process() setting modem state", STATE_CW);
io.rf1Conf(STATE_CW, true);

err = cwIdTX.write(m_buffer + 3U, m_len - 3U);
}
if (err != RSN_OK) {
DEBUG2("SerialPort: process(): invalid CW Id data", err);
DEBUG2("SerialPort::process() invalid CW Id data", err);
sendNAK(err);
}
break;
Expand All @@ -217,7 +217,7 @@ void SerialPort::process()
setMode(STATE_DMR);
}
else {
DEBUG2("SerialPort: process() received invalid DMR data", err);
DEBUG2("SerialPort::process() received invalid DMR data", err);
sendNAK(err);
}
#else
Expand All @@ -243,7 +243,7 @@ void SerialPort::process()
setMode(STATE_DMR);
}
else {
DEBUG2("SerialPort: process(): received invalid DMR data", err);
DEBUG2("SerialPort::process() received invalid DMR data", err);
sendNAK(err);
}
break;
Expand All @@ -266,7 +266,7 @@ void SerialPort::process()
}
}
if (err != RSN_OK) {
DEBUG3("SerialPort: process(): received invalid DMR start", err, m_len);
DEBUG3("SerialPort::process() received invalid DMR start", err, m_len);
sendNAK(err);
}
#else
Expand All @@ -279,7 +279,7 @@ void SerialPort::process()
if (m_dmrEnable)
err = dmrTX.writeShortLC(m_buffer + 3U, m_len - 3U);
if (err != RSN_OK) {
DEBUG2("SerialPort: process(): received invalid DMR Short LC", err);
DEBUG2("SerialPort::process() received invalid DMR Short LC", err);
sendNAK(err);
}
#else
Expand All @@ -292,7 +292,7 @@ void SerialPort::process()
if (m_dmrEnable)
err = dmrTX.writeAbort(m_buffer + 3U, m_len - 3U);
if (err != RSN_OK) {
DEBUG2("SerialPort: process(): received invalid DMR Abort", err);
DEBUG2("SerialPort::process() received invalid DMR Abort", err);
sendNAK(err);
}
#else
Expand All @@ -310,7 +310,7 @@ void SerialPort::process()
}
}
if (err != RSN_OK) {
DEBUG2("SerialPort: process(): received invalid DMR CACH AT Control", err);
DEBUG2("SerialPort::process() received invalid DMR CACH AT Control", err);
sendNAK(err);
}
#else
Expand Down Expand Up @@ -351,7 +351,7 @@ void SerialPort::process()
setMode(STATE_P25);
}
else {
DEBUG2("SerialPort: process(): Received invalid P25 data", err);
DEBUG2("SerialPort::process() received invalid P25 data", err);
sendNAK(err);
}
break;
Expand All @@ -374,7 +374,7 @@ void SerialPort::process()
setMode(STATE_NXDN);
}
else {
DEBUG2("SerialPort: process(): Received invalid NXDN data", err);
DEBUG2("SerialPort::process() received invalid NXDN data", err);
sendNAK(err);
}
break;
Expand Down Expand Up @@ -1061,12 +1061,12 @@ uint8_t SerialPort::setConfig(const uint8_t* data, uint8_t length)

#if !defined(DUPLEX)
if (m_duplex) {
DEBUG1("Full duplex not supported with this firmware");
DEBUG1("SerialPort::setConfig() Full duplex not supported with this firmware");
return RSN_INVALID_REQUEST;
}
#elif defined(DUPLEX) && (defined(ZUMSPOT_ADF7021) || defined(LONESTAR_USB) || defined(SKYBRIDGE_HS))
if (io.isDualBand() && m_duplex) {
DEBUG1("Full duplex is not supported on this board");
DEBUG1("SerialPort::setConfig() Full duplex is not supported on this board");
return RSN_INVALID_REQUEST;
}
#endif
Expand Down Expand Up @@ -1132,13 +1132,13 @@ void SerialPort::setMode(DVM_STATE modemState)
{
switch (modemState) {
case STATE_DMR:
DEBUG1("SerialPort: setMode(): mode set to DMR");
DEBUG1("SerialPort::setMode() mode set to DMR");
p25RX.reset();
nxdnRX.reset();
cwIdTX.reset();
break;
case STATE_P25:
DEBUG1("SerialPort: setMode(): mode set to P25");
DEBUG1("SerialPort::setMode() mode set to P25");
#if defined(DUPLEX)
dmrIdleRX.reset();
dmrRX.reset();
Expand All @@ -1148,7 +1148,7 @@ void SerialPort::setMode(DVM_STATE modemState)
cwIdTX.reset();
break;
case STATE_NXDN:
DEBUG1("SerialPort: setMode(): mode set to NXDN");
DEBUG1("SerialPort::setMode() mode set to NXDN");
#if defined(DUPLEX)
dmrIdleRX.reset();
dmrRX.reset();
Expand All @@ -1158,7 +1158,7 @@ void SerialPort::setMode(DVM_STATE modemState)
cwIdTX.reset();
break;
case STATE_DMR_CAL:
DEBUG1("SerialPort: setMode(): mode set to DMR Calibrate");
DEBUG1("SerialPort::setMode() mode set to DMR Calibrate");
#if defined(DUPLEX)
dmrIdleRX.reset();
dmrRX.reset();
Expand All @@ -1169,7 +1169,7 @@ void SerialPort::setMode(DVM_STATE modemState)
cwIdTX.reset();
break;
case STATE_P25_CAL:
DEBUG1("SerialPort: setMode(): mode set to P25 Calibrate");
DEBUG1("SerialPort::setMode() mode set to P25 Calibrate");
#if defined(DUPLEX)
dmrIdleRX.reset();
dmrRX.reset();
Expand All @@ -1180,7 +1180,7 @@ void SerialPort::setMode(DVM_STATE modemState)
cwIdTX.reset();
break;
case STATE_NXDN_CAL:
DEBUG1("SerialPort: setMode(): mode set to NXDN Calibrate");
DEBUG1("SerialPort::setMode() mode set to NXDN Calibrate");
#if defined(DUPLEX)
dmrIdleRX.reset();
dmrRX.reset();
Expand All @@ -1191,7 +1191,7 @@ void SerialPort::setMode(DVM_STATE modemState)
cwIdTX.reset();
break;
case STATE_RSSI_CAL:
DEBUG1("SerialPort: setMode(): mode set to RSSI Calibrate");
DEBUG1("SerialPort::setMode() mode set to RSSI Calibrate");
#if defined(DUPLEX)
dmrIdleRX.reset();
dmrRX.reset();
Expand All @@ -1202,7 +1202,7 @@ void SerialPort::setMode(DVM_STATE modemState)
cwIdTX.reset();
break;
case STATE_DMR_LF_CAL:
DEBUG1("SerialPort: setMode(): mode set to DMR 80Hz Calibrate");
DEBUG1("SerialPort::setMode() mode set to DMR 80Hz Calibrate");
#if defined(DUPLEX)
dmrIdleRX.reset();
dmrRX.reset();
Expand All @@ -1213,7 +1213,7 @@ void SerialPort::setMode(DVM_STATE modemState)
cwIdTX.reset();
break;
case STATE_DMR_CAL_1K:
DEBUG1("SerialPort: setMode(): mode set to DMR BS 1031Hz Calibrate");
DEBUG1("SerialPort::setMode() mode set to DMR BS 1031Hz Calibrate");
#if defined(DUPLEX)
dmrIdleRX.reset();
dmrRX.reset();
Expand All @@ -1224,7 +1224,7 @@ void SerialPort::setMode(DVM_STATE modemState)
cwIdTX.reset();
break;
case STATE_DMR_DMO_CAL_1K:
DEBUG1("SerialPort: setMode(): mode set to DMR MS 1031Hz Calibrate");
DEBUG1("SerialPort::setMode() mode set to DMR MS 1031Hz Calibrate");
#if defined(DUPLEX)
dmrIdleRX.reset();
dmrRX.reset();
Expand All @@ -1235,7 +1235,7 @@ void SerialPort::setMode(DVM_STATE modemState)
cwIdTX.reset();
break;
case STATE_P25_CAL_1K:
DEBUG1("SerialPort: setMode(): mode set to P25 1011Hz Calibrate");
DEBUG1("SerialPort::setMode() mode set to P25 1011Hz Calibrate");
#if defined(DUPLEX)
dmrIdleRX.reset();
dmrRX.reset();
Expand All @@ -1246,7 +1246,7 @@ void SerialPort::setMode(DVM_STATE modemState)
cwIdTX.reset();
break;
default:
DEBUG1("SerialPort: setMode(): mode set to Idle");
DEBUG1("SerialPort::setMode() mode set to Idle");
// STATE_IDLE
break;
}
Expand Down

0 comments on commit 941f57b

Please sign in to comment.