juribeparada/MMDVM_HS
1
0
Fork 0
mirror of https://github.com/juribeparada/MMDVM_HS.git synced 2025-12-06 07:12:08 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change the EOT handling on M17 TX.

Browse source
This commit is contained in:
Jonathan Naylor 2021-09-19 14:29:15 +01:00
parent ab3c9a39a3
commit 0f3a4fa249
4 changed files with 6 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
M17TX.cpp
View file

@ -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)) if (length != (M17_FRAME_LENGTH_BYTES + 1U))
return 4U; return 4U;
@ -97,34 +97,6 @@ uint8_t CM17TX::writeLinkSetup(const uint8_t* data, uint8_t length)
return 0U; 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) void CM17TX::writeByte(uint8_t c)
{ {
uint8_t bit; uint8_t bit;

4
M17TX.h
View file

@ -27,9 +27,7 @@ class CM17TX {
public: public:
CM17TX(); CM17TX();
uint8_t writeLinkSetup(const uint8_t* data, uint8_t length); uint8_t writeData(const uint8_t* data, uint8_t length);
uint8_t writeStream(const uint8_t* data, uint8_t length);
uint8_t writeEOT();
void process(); void process();

6
SerialPort.cpp
View file

@ -870,7 +870,7 @@ void CSerialPort::process()
case MMDVM_M17_LINK_SETUP: case MMDVM_M17_LINK_SETUP:
if (m_m17Enable) { if (m_m17Enable) {
if (m_modemState == STATE_IDLE || m_modemState == STATE_M17) 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 (err == 0U) {
if (m_modemState == STATE_IDLE) if (m_modemState == STATE_IDLE)
@ -884,7 +884,7 @@ void CSerialPort::process()
case MMDVM_M17_STREAM: case MMDVM_M17_STREAM:
if (m_m17Enable) { if (m_m17Enable) {
if (m_modemState == STATE_IDLE || m_modemState == STATE_M17) 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 (err == 0U) {
if (m_modemState == STATE_IDLE) if (m_modemState == STATE_IDLE)
@ -898,7 +898,7 @@ void CSerialPort::process()
case MMDVM_M17_EOT: case MMDVM_M17_EOT:
if (m_m17Enable) { if (m_m17Enable) {
if (m_modemState == STATE_IDLE || m_modemState == STATE_M17) 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 (err == 0U) {
if (m_modemState == STATE_IDLE) if (m_modemState == STATE_IDLE)

2
version.h
View file

@ -26,7 +26,7 @@
#define VER_MAJOR "1" #define VER_MAJOR "1"
#define VER_MINOR "5" #define VER_MINOR "5"
#define VER_REV "2" #define VER_REV "2"
#define VERSION_DATE "20210915" #define VERSION_DATE "20210919"
#if defined(ZUMSPOT_ADF7021) #if defined(ZUMSPOT_ADF7021)
#define BOARD_INFO "ZUMspot" #define BOARD_INFO "ZUMspot"