From 0f3a4fa24985603bdf269854e9a6c4ae1eae927d Mon Sep 17 00:00:00 2001
From: Jonathan Naylor <naylorjs@yahoo.com>
Date: Sun, 19 Sep 2021 14:29:15 +0100
Subject: [PATCH] Change the EOT handling on M17 TX.

---
 M17TX.cpp      | 30 +-----------------------------
 M17TX.h        |  4 +---
 SerialPort.cpp |  6 +++---
 version.h      |  2 +-
 4 files changed, 6 insertions(+), 36 deletions(-)

diff --git a/M17TX.cpp b/M17TX.cpp
index 895dab6..5dfc3ca 100644
--- a/M17TX.cpp
+++ b/M17TX.cpp
@@ -82,7 +82,7 @@ void CM17TX::process()
   }
 }
 
-uint8_t CM17TX::writeLinkSetup(const uint8_t* data, uint8_t length)
+uint8_t CM17TX::writeData(const uint8_t* data, uint8_t length)
 {
   if (length != (M17_FRAME_LENGTH_BYTES + 1U))
     return 4U;
@@ -97,34 +97,6 @@ uint8_t CM17TX::writeLinkSetup(const uint8_t* data, uint8_t length)
   return 0U;
 }
 
-uint8_t CM17TX::writeStream(const uint8_t* data, uint8_t length)
-{
-  if (length != (M17_FRAME_LENGTH_BYTES + 1U))
-    return 4U;
-
-  uint16_t space = m_buffer.getSpace();
-  if (space < M17_FRAME_LENGTH_BYTES)
-    return 5U;
-
-  for (uint8_t i = 0U; i < M17_FRAME_LENGTH_BYTES; i++)
-    m_buffer.put(data[i + 1U]);
-
-  return 0U;
-}
-
-uint8_t CM17TX::writeEOT()
-{
-/*
-  uint16_t space = m_buffer.getSpace();
-  if (space < M17_FRAME_LENGTH_BYTES)
-    return 5U;
-
-  for (uint8_t i = 0U; i < M17_SYNC_LENGTH_BYTES; i++)
-    m_buffer.put(M17_EOT_SYNC_BYTES[i]);
-*/
-  return 0U;
-}
-
 void CM17TX::writeByte(uint8_t c)
 {
   uint8_t bit;
diff --git a/M17TX.h b/M17TX.h
index 61b63c0..00c2a33 100644
--- a/M17TX.h
+++ b/M17TX.h
@@ -27,9 +27,7 @@ class CM17TX {
 public:
   CM17TX();
 
-  uint8_t writeLinkSetup(const uint8_t* data, uint8_t length);
-  uint8_t writeStream(const uint8_t* data, uint8_t length);
-  uint8_t writeEOT();
+  uint8_t writeData(const uint8_t* data, uint8_t length);
 
   void process();
 
diff --git a/SerialPort.cpp b/SerialPort.cpp
index 6c7dc55..4dd8a8a 100644
--- a/SerialPort.cpp
+++ b/SerialPort.cpp
@@ -870,7 +870,7 @@ void CSerialPort::process()
           case MMDVM_M17_LINK_SETUP:
             if (m_m17Enable) {
               if (m_modemState == STATE_IDLE || m_modemState == STATE_M17)
-                err = m17TX.writeLinkSetup(m_buffer + 3U, m_len - 3U);
+                err = m17TX.writeData(m_buffer + 3U, m_len - 3U);
             }
             if (err == 0U) {
               if (m_modemState == STATE_IDLE)
@@ -884,7 +884,7 @@ void CSerialPort::process()
           case MMDVM_M17_STREAM:
             if (m_m17Enable) {
               if (m_modemState == STATE_IDLE || m_modemState == STATE_M17)
-                err = m17TX.writeStream(m_buffer + 3U, m_len - 3U);
+                err = m17TX.writeData(m_buffer + 3U, m_len - 3U);
             }
             if (err == 0U) {
               if (m_modemState == STATE_IDLE)
@@ -898,7 +898,7 @@ void CSerialPort::process()
           case MMDVM_M17_EOT:
             if (m_m17Enable) {
               if (m_modemState == STATE_IDLE || m_modemState == STATE_M17)
-                err = m17TX.writeEOT();
+                err = m17TX.writeData(m_buffer + 3U, m_len - 3U);
             }
             if (err == 0U) {
               if (m_modemState == STATE_IDLE)
diff --git a/version.h b/version.h
index bbacfaf..6b5aa28 100644
--- a/version.h
+++ b/version.h
@@ -26,7 +26,7 @@
 #define VER_MAJOR       "1"
 #define VER_MINOR       "5"
 #define VER_REV         "2"
-#define VERSION_DATE    "20210915"
+#define VERSION_DATE    "20210919"
 
 #if defined(ZUMSPOT_ADF7021)
 #define BOARD_INFO      "ZUMspot"