From 4dbcfd6b049cd78ac17ee5785b704be659e36093 Mon Sep 17 00:00:00 2001
From: Jonathan Naylor <naylorjs@yahoo.com>
Date: Fri, 17 Jun 2016 07:47:11 +0100
Subject: [PATCH] Add the DMR Abort command.

---
 DMRTX.cpp      | 19 +++++++++++++++++++
 DMRTX.h        |  2 ++
 SerialPort.cpp | 10 ++++++++++
 3 files changed, 31 insertions(+)

diff --git a/DMRTX.cpp b/DMRTX.cpp
index 3406ff6..7800490 100644
--- a/DMRTX.cpp
+++ b/DMRTX.cpp
@@ -185,6 +185,25 @@ uint8_t CDMRTX::writeShortLC(const uint8_t* data, uint8_t length)
   return 0U;
 }
 
+uint8_t CDMRTX::writeAbort(const uint8_t* data, uint8_t length)
+{
+  if (length != 1U)
+    return 4U;
+
+  switch (data[0U]) {
+    case 1U:
+      m_fifo[0U].reset();
+      return 0U;
+
+    case 2U:
+      m_fifo[1U].reset();
+      return 0U;
+
+    default:
+      return 4U;
+  }
+}
+
 void CDMRTX::setStart(bool start)
 {
   m_state = start ? DMRTXSTATE_SLOT1 : DMRTXSTATE_IDLE;
diff --git a/DMRTX.h b/DMRTX.h
index 2db5f3f..ea404d0 100644
--- a/DMRTX.h
+++ b/DMRTX.h
@@ -40,7 +40,9 @@ public:
 
   uint8_t writeData1(const uint8_t* data, uint8_t length);
   uint8_t writeData2(const uint8_t* data, uint8_t length);
+
   uint8_t writeShortLC(const uint8_t* data, uint8_t length);
+  uint8_t writeAbort(const uint8_t* data, uint8_t length);
 
   void setStart(bool start);
   void setCal(bool start);
diff --git a/SerialPort.cpp b/SerialPort.cpp
index d11e7e3..a29fec2 100644
--- a/SerialPort.cpp
+++ b/SerialPort.cpp
@@ -47,6 +47,7 @@ const uint8_t MMDVM_DMR_DATA2    = 0x1AU;
 const uint8_t MMDVM_DMR_LOST2    = 0x1BU;
 const uint8_t MMDVM_DMR_SHORTLC  = 0x1CU;
 const uint8_t MMDVM_DMR_START    = 0x1DU;
+const uint8_t MMDVM_DMR_ABORT    = 0x1EU;
 
 const uint8_t MMDVM_YSF_DATA     = 0x20U;
 const uint8_t MMDVM_YSF_LOST     = 0x21U;
@@ -521,6 +522,15 @@ void CSerialPort::process()
             }
             break;
 
+          case MMDVM_DMR_ABORT:
+            if (m_dmrEnable)
+              err = dmrTX.writeAbort(m_buffer + 3U, m_len - 3U);
+            if (err != 0U) {
+              DEBUG2("Received invalid DMR Abort", err);
+              sendNAK(err);
+            }
+            break;
+
           case MMDVM_YSF_DATA:
             if (m_ysfEnable) {
               if (m_modemState == STATE_IDLE || m_modemState == STATE_YSF)