From a29cb23a75d1c14cef7a6fda3693593b0d763a6f Mon Sep 17 00:00:00 2001
From: Jonathan Naylor <naylorjs@yahoo.com>
Date: Sat, 27 Jun 2020 22:55:16 +0100
Subject: [PATCH] Remove TX Twist.

---
 AX25TX.cpp     | 11 +++--------
 AX25TX.h       |  2 --
 SerialPort.cpp |  9 +++------
 3 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/AX25TX.cpp b/AX25TX.cpp
index 5652bd8..152e1b5 100644
--- a/AX25TX.cpp
+++ b/AX25TX.cpp
@@ -53,7 +53,7 @@ m_twist(-6),
 m_poBuffer(),
 m_poLen(0U),
 m_poPtr(0U),
-m_txDelay(120U),
+m_txDelay(360U),
 m_tablePtr(0U),
 m_nrzi(false)
 {
@@ -140,9 +140,9 @@ void CAX25TX::writeBit(bool b)
   for (uint8_t i = 0U; i < AX25_RADIO_SYMBOL_LENGTH; i++) {
     in[i] = AUDIO_TABLE_DATA[m_tablePtr];
     if (b)
-      m_tablePtr += 6U;
-    else
       m_tablePtr += 11U;
+    else
+      m_tablePtr += 6U;
 
     if (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);
 }
 
-void CAX25TX::setParams(int8_t twist)
-{
-  m_twist.setTwist(twist);
-}
-
 void CAX25TX::setTXDelay(uint8_t delay)
 {
   m_txDelay = delay * 12U;
diff --git a/AX25TX.h b/AX25TX.h
index 628e549..2c8eb8b 100644
--- a/AX25TX.h
+++ b/AX25TX.h
@@ -31,8 +31,6 @@ public:
 
   void process();
 
-  void setParams(int8_t twist);
-
   void setTXDelay(uint8_t delay);
 
   uint8_t getSpace() const;
diff --git a/SerialPort.cpp b/SerialPort.cpp
index 7b64a47..2e2d3dc 100644
--- a/SerialPort.cpp
+++ b/SerialPort.cpp
@@ -109,7 +109,7 @@ const uint8_t MMDVM_DEBUG5       = 0xF5U;
 #define	HW_TYPE	"MMDVM"
 #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)
 #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)
     return 4U;
 
-  int8_t ax25TXTwist    = int8_t(data[23U]) - 128;
-  if (ax25TXTwist < -4 || ax25TXTwist > 10)
-    return 4U;
+  uint8_t ax25TXDelay   = data[23U];
 
   setMode(modemState);
 
@@ -382,7 +380,7 @@ uint8_t CSerialPort::setConfig(const uint8_t* data, uint16_t length)
   dmrDMOTX.setTXDelay(txDelay);
   nxdnTX.setTXDelay(txDelay);
   pocsagTX.setTXDelay(txDelay);
-  ax25TX.setTXDelay(txDelay);
+  ax25TX.setTXDelay(ax25TXDelay);
 
   dmrTX.setColorCode(colorCode);
   dmrRX.setColorCode(colorCode);
@@ -394,7 +392,6 @@ uint8_t CSerialPort::setConfig(const uint8_t* data, uint16_t length)
   p25TX.setParams(p25TXHang);
   nxdnTX.setParams(nxdnTXHang);
   ax25RX.setParams(ax25RXTwist);
-  ax25TX.setParams(ax25TXTwist);
 
   io.setParameters(rxInvert, txInvert, pttInvert, rxLevel, cwIdTXLevel, dstarTXLevel, dmrTXLevel, ysfTXLevel, p25TXLevel, nxdnTXLevel, pocsagTXLevel, fmTXLevel, ax25TXLevel, txDCOffset, rxDCOffset);