Superminaren
/
MMDVM
mirror of https://github.com/g4klx/MMDVM.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove TX Twist.

This commit is contained in:
Jonathan Naylor 2020-06-27 22:55:16 +01:00
parent bb66c72ef3
commit a29cb23a75
3 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
AX25TX.cpp
View File

@ -53,7 +53,7 @@ m_twist(-6),
m_poBuffer(), m_poBuffer(),
m_poLen(0U), m_poLen(0U),
m_poPtr(0U), m_poPtr(0U),
m_txDelay(120U), m_txDelay(360U),
m_tablePtr(0U), m_tablePtr(0U),
m_nrzi(false) m_nrzi(false)
{ {
@ -140,9 +140,9 @@ void CAX25TX::writeBit(bool b)
for (uint8_t i = 0U; i < AX25_RADIO_SYMBOL_LENGTH; i++) { for (uint8_t i = 0U; i < AX25_RADIO_SYMBOL_LENGTH; i++) {
in[i] = AUDIO_TABLE_DATA[m_tablePtr]; in[i] = AUDIO_TABLE_DATA[m_tablePtr];
if (b) if (b)
m_tablePtr += 6U;
else
m_tablePtr += 11U; m_tablePtr += 11U;
else
m_tablePtr += 6U;
if (m_tablePtr >= AUDIO_TABLE_LEN) if (m_tablePtr >= AUDIO_TABLE_LEN)
m_tablePtr -= AUDIO_TABLE_LEN; m_tablePtr -= AUDIO_TABLE_LEN;
@ -154,11 +154,6 @@ void CAX25TX::writeBit(bool b)
io.write(STATE_AX25, out, AX25_RADIO_SYMBOL_LENGTH); io.write(STATE_AX25, out, AX25_RADIO_SYMBOL_LENGTH);
} }
void CAX25TX::setParams(int8_t twist)
{
m_twist.setTwist(twist);
}
void CAX25TX::setTXDelay(uint8_t delay) void CAX25TX::setTXDelay(uint8_t delay)
{ {
m_txDelay = delay * 12U; m_txDelay = delay * 12U;

2
AX25TX.h
View File

@ -31,8 +31,6 @@ public:
void process(); void process();
void setParams(int8_t twist);
void setTXDelay(uint8_t delay); void setTXDelay(uint8_t delay);
uint8_t getSpace() const; uint8_t getSpace() const;

9
SerialPort.cpp
View File

@ -109,7 +109,7 @@ const uint8_t MMDVM_DEBUG5 = 0xF5U;
#define HW_TYPE "MMDVM" #define HW_TYPE "MMDVM"
#endif #endif
#define DESCRIPTION "20200625 (D-Star/DMR/System Fusion/P25/NXDN/POCSAG/FM/AX.25)" #define DESCRIPTION "20200627 (D-Star/DMR/System Fusion/P25/NXDN/POCSAG/FM/AX.25)"
#if defined(GITVERSION) #if defined(GITVERSION)
#define concat(h, a, b, c) h " " a " " b " GitID #" c "" #define concat(h, a, b, c) h " " a " " b " GitID #" c ""
@ -360,9 +360,7 @@ uint8_t CSerialPort::setConfig(const uint8_t* data, uint16_t length)
if (ax25RXTwist < -4 || ax25RXTwist > 10) if (ax25RXTwist < -4 || ax25RXTwist > 10)
return 4U; return 4U;
int8_t ax25TXTwist = int8_t(data[23U]) - 128; uint8_t ax25TXDelay = data[23U];
if (ax25TXTwist < -4 || ax25TXTwist > 10)
return 4U;
setMode(modemState); setMode(modemState);
@ -382,7 +380,7 @@ uint8_t CSerialPort::setConfig(const uint8_t* data, uint16_t length)
dmrDMOTX.setTXDelay(txDelay); dmrDMOTX.setTXDelay(txDelay);
nxdnTX.setTXDelay(txDelay); nxdnTX.setTXDelay(txDelay);
pocsagTX.setTXDelay(txDelay); pocsagTX.setTXDelay(txDelay);
ax25TX.setTXDelay(txDelay); ax25TX.setTXDelay(ax25TXDelay);
dmrTX.setColorCode(colorCode); dmrTX.setColorCode(colorCode);
dmrRX.setColorCode(colorCode); dmrRX.setColorCode(colorCode);
@ -394,7 +392,6 @@ uint8_t CSerialPort::setConfig(const uint8_t* data, uint16_t length)
p25TX.setParams(p25TXHang); p25TX.setParams(p25TXHang);
nxdnTX.setParams(nxdnTXHang); nxdnTX.setParams(nxdnTXHang);
ax25RX.setParams(ax25RXTwist); ax25RX.setParams(ax25RXTwist);
ax25TX.setParams(ax25TXTwist);
io.setParameters(rxInvert, txInvert, pttInvert, rxLevel, cwIdTXLevel, dstarTXLevel, dmrTXLevel, ysfTXLevel, p25TXLevel, nxdnTXLevel, pocsagTXLevel, fmTXLevel, ax25TXLevel, txDCOffset, rxDCOffset); io.setParameters(rxInvert, txInvert, pttInvert, rxLevel, cwIdTXLevel, dstarTXLevel, dmrTXLevel, ysfTXLevel, p25TXLevel, nxdnTXLevel, pocsagTXLevel, fmTXLevel, ax25TXLevel, txDCOffset, rxDCOffset);