From fcebeffff8cee354b8a8fdbb7ee6812b7d5c0545 Mon Sep 17 00:00:00 2001 From: Andy CA6JAU Date: Sun, 27 Jan 2019 12:50:46 -0300 Subject: [PATCH] Fix Wires-X SEARCH last page --- YSF2DMR/WiresX.cpp | 8 +++++++- YSF2NXDN/WiresX.cpp | 6 ++++++ YSF2P25/WiresX.cpp | 6 ++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/YSF2DMR/WiresX.cpp b/YSF2DMR/WiresX.cpp index 348465f..ce7c8a0 100644 --- a/YSF2DMR/WiresX.cpp +++ b/YSF2DMR/WiresX.cpp @@ -829,7 +829,7 @@ void CWiresX::sendAllReply() unsigned int k = 1029U - offset; for(unsigned int i = 0U; i < k; i++) data[i + offset] = 0x20U; - + offset += k; data[offset + 0U] = 0x03U; // End of data marker @@ -913,6 +913,12 @@ void CWiresX::sendSearchReply() data[offset + 49U] = 0x0DU; } + unsigned int k = 1029U - offset; + for(unsigned int i = 0U; i < k; i++) + data[i + offset] = 0x20U; + + offset += k; + data[offset + 0U] = 0x03U; // End of data marker data[offset + 1U] = CCRC::addCRC(data, offset + 1U); diff --git a/YSF2NXDN/WiresX.cpp b/YSF2NXDN/WiresX.cpp index 58d1cd6..07964b2 100644 --- a/YSF2NXDN/WiresX.cpp +++ b/YSF2NXDN/WiresX.cpp @@ -864,6 +864,12 @@ void CWiresX::sendSearchReply() data[offset + 49U] = 0x0DU; } + unsigned int k = 1029U - offset; + for(unsigned int i = 0U; i < k; i++) + data[i + offset] = 0x20U; + + offset += k; + data[offset + 0U] = 0x03U; // End of data marker data[offset + 1U] = CCRC::addCRC(data, offset + 1U); diff --git a/YSF2P25/WiresX.cpp b/YSF2P25/WiresX.cpp index 58d1cd6..07964b2 100644 --- a/YSF2P25/WiresX.cpp +++ b/YSF2P25/WiresX.cpp @@ -864,6 +864,12 @@ void CWiresX::sendSearchReply() data[offset + 49U] = 0x0DU; } + unsigned int k = 1029U - offset; + for(unsigned int i = 0U; i < k; i++) + data[i + offset] = 0x20U; + + offset += k; + data[offset + 0U] = 0x03U; // End of data marker data[offset + 1U] = CCRC::addCRC(data, offset + 1U);