diff --git a/NXDNTX.cpp b/NXDNTX.cpp index 00eead0..68679b0 100644 --- a/NXDNTX.cpp +++ b/NXDNTX.cpp @@ -54,7 +54,7 @@ m_poBuffer(), m_poLen(0U), m_poPtr(0U), m_txDelay(240U), // 200ms -m_txHang(6000U), // 5s +m_txHang(3000U), // 5s m_txCount(0U) { ::memset(m_modState, 0x00U, 16U * sizeof(q15_t)); @@ -72,10 +72,7 @@ m_txCount(0U) void CNXDNTX::process() { - if (m_buffer.getData() == 0U && m_poLen == 0U && m_txCount == 0U) - return; - - if (m_poLen == 0U) { + if (m_poLen == 0U && m_buffer.getData() > 0U) { if (!m_tx) { for (uint16_t i = 0U; i < m_txDelay; i++) m_poBuffer[m_poLen++] = NXDN_SYNC; @@ -201,5 +198,5 @@ uint8_t CNXDNTX::getSpace() const void CNXDNTX::setParams(uint8_t txHang) { - m_txHang = txHang * 1200U; + m_txHang = txHang * 600U; } diff --git a/P25TX.cpp b/P25TX.cpp index cc148c1..7e24806 100644 --- a/P25TX.cpp +++ b/P25TX.cpp @@ -70,10 +70,7 @@ m_txCount(0U) void CP25TX::process() { - if (m_buffer.getData() == 0U && m_poLen == 0U && m_txCount == 0U) - return; - - if (m_poLen == 0U) { + if (m_poLen == 0U && m_buffer.getData() > 0U) { if (!m_tx) { for (uint16_t i = 0U; i < m_txDelay; i++) m_poBuffer[m_poLen++] = P25_START_SYNC; diff --git a/SerialPort.cpp b/SerialPort.cpp index 54494cc..2a9a241 100644 --- a/SerialPort.cpp +++ b/SerialPort.cpp @@ -107,7 +107,7 @@ const uint8_t MMDVM_DEBUG5 = 0xF5U; #define HW_TYPE "MMDVM" #endif -#define DESCRIPTION "20200519 (D-Star/DMR/System Fusion/P25/NXDN/POCSAG/FM)" +#define DESCRIPTION "20200520 (D-Star/DMR/System Fusion/P25/NXDN/POCSAG/FM)" #if defined(GITVERSION) #define concat(h, a, b, c) h " " a " " b " GitID #" c "" diff --git a/YSFTX.cpp b/YSFTX.cpp index 15f3920..527122e 100644 --- a/YSFTX.cpp +++ b/YSFTX.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2018,2020 by Jonathan Naylor G4KLX + * Copyright (C) 2009-2018 by Jonathan Naylor G4KLX * Copyright (C) 2017 by Andy Uribe CA6JAU * * This program is free software; you can redistribute it and/or modify @@ -66,9 +66,6 @@ m_txCount(0U) void CYSFTX::process() { - if (m_buffer.getData() == 0U && m_poLen == 0U && m_txCount == 0U) - return; - // If we have YSF data to transmit, do so. if (m_poLen == 0U && m_buffer.getData() > 0U) { if (!m_tx) {