g4klx/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost.git synced 2026-04-06 06:53:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into mqtt

Browse source
This commit is contained in:
Jonathan Naylor 2026-02-18 13:54:01 +00:00
commit 76d4f0d1a1
6 changed files with 58 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

45
Modem.cpp
View file

@ -311,7 +311,8 @@ m_fmMaxDevLevel(90.0F),
m_fmExtEnable(false),
#endif
m_capabilities1(0x00U),
m_capabilities2(0x00U)
m_capabilities2(0x00U),
m_serialDataLen(0U)
{
m_buffer = new unsigned char[BUFFER_LENGTH];
}
@ -988,6 +989,48 @@ void CModem::clock(unsigned int ms)
m_rxSerialData.addData(m_buffer + m_offset, m_length - m_offset);
}
// NEW: Buffer serial data and forward complete commands as transparent data
{
// Add received bytes to our accumulation buffer
for (unsigned int i = 0; i < (m_length - m_offset); i++) {
if (m_serialDataLen < 256) {
m_serialDataBuffer[m_serialDataLen++] = m_buffer[m_offset + i];
// Check for Nextion command terminator (0xFF 0xFF 0xFF)
if (m_serialDataLen >= 3 &&
m_serialDataBuffer[m_serialDataLen - 3] == 0xFF &&
m_serialDataBuffer[m_serialDataLen - 2] == 0xFF &&
m_serialDataBuffer[m_serialDataLen - 1] == 0xFF) {
// We have a complete command
// Add it to the RX transparent data queue so it will be forwarded to NextionDriver
// With sendFrameType=1, we need to include the frame type byte
// Create a buffer with frame type byte + command data
unsigned char frameBuffer[260];
frameBuffer[0] = 0x90; // Frame type: transparent data
::memcpy(frameBuffer + 1, m_serialDataBuffer, m_serialDataLen);
// Add length byte and data with frame type to RX queue
unsigned char len = m_serialDataLen + 1U; // +1 for frame type byte
m_rxTransparentData.addData(&len, 1U);
m_rxTransparentData.addData(frameBuffer, len);
if (m_trace) {
CUtils::dump(1U, "Adding button command with frame type to RX Transparent queue", frameBuffer, len);
}
// Reset buffer for next command
m_serialDataLen = 0U;
}
} else {
// Buffer overflow, reset
LogWarning("Serial data buffer overflow, resetting");
m_serialDataLen = 0U;
}
}
}
break;
default: