From 243ad6ce0c65c160783ad4f6606596772d9cfb30 Mon Sep 17 00:00:00 2001 From: Bryan Biedenkapp Date: Mon, 18 Dec 2023 11:36:37 -0500 Subject: [PATCH] increase NXDN voice call verbosity; correct incorrectly calculated data offset for NXDN voice data; --- src/edac/AMBEFEC.cpp | 1 - src/host/setup/HostSetup.cpp | 8 ++-- src/nxdn/NXDNDefines.h | 2 +- src/nxdn/packet/Voice.cpp | 12 +++--- tests/CMakeLists.txt | 1 + tests/nxdn/AMBE_FEC_Test.cpp | 73 ++++++++++++++++++++++++++++++++++++ 6 files changed, 85 insertions(+), 12 deletions(-) create mode 100644 tests/nxdn/AMBE_FEC_Test.cpp diff --git a/src/edac/AMBEFEC.cpp b/src/edac/AMBEFEC.cpp index 8bde494a..992ee355 100644 --- a/src/edac/AMBEFEC.cpp +++ b/src/edac/AMBEFEC.cpp @@ -564,7 +564,6 @@ uint32_t AMBEFEC::regenerateNXDN(uint8_t* bytes) const return errors; } - /// /// Returns the number of errors on the NXDN BER input bytes. /// diff --git a/src/host/setup/HostSetup.cpp b/src/host/setup/HostSetup.cpp index cf31c5ca..143712c4 100644 --- a/src/host/setup/HostSetup.cpp +++ b/src/host/setup/HostSetup.cpp @@ -1406,7 +1406,7 @@ void HostSetup::processNXDNBER(const uint8_t* buffer) { using namespace nxdn; - unsigned char data[NXDN_FRAME_LENGTH_BYTES]; + uint8_t data[NXDN_FRAME_LENGTH_BYTES]; ::memcpy(data, buffer, NXDN_FRAME_LENGTH_BYTES); NXDNUtils::scrambler(data); @@ -1419,7 +1419,7 @@ void HostSetup::processNXDNBER(const uint8_t* buffer) if (usc == NXDN_LICH_USC_SACCH_NS) { if (m_berFrames == 0U) { - LogMessage(LOG_CAL, "NXDN VCALL (Voice Call), 1031 Test Pattern Start"); + LogMessage(LOG_CAL, "NXDN VCALL (Voice Call), BER Start"); timerStart(); m_berErrs = 0U; @@ -1428,7 +1428,7 @@ void HostSetup::processNXDNBER(const uint8_t* buffer) return; } else { float ber = float(m_berErrs * 100U) / float(m_berBits); - LogMessage(LOG_CAL, "NXDN TX_REL (Transmission Release), 1031 Test Pattern BER, frames: %u, errs: %.3f%% (%u/%u)", m_berFrames, ber, m_berErrs, m_berBits); + LogMessage(LOG_CAL, "NXDN TX_REL (Transmission Release), BER Test, frames: %u, errs: %.3f%% (%u/%u)", m_berFrames, ber, m_berErrs, m_berBits); // handle displaying TUI updateTUIBER(ber); @@ -1454,7 +1454,7 @@ void HostSetup::processNXDNBER(const uint8_t* buffer) m_berFrames++; float ber = float(errors) / 1.88F; - LogMessage(LOG_CAL, "NXDN VCALL (Voice Call), 1031 Test Pattern BER, (errs): %.3f%% (%u/188)", ber, errors); + LogMessage(LOG_CAL, "NXDN VCALL (Voice Call), BER Test, (errs): %.3f%% (%u/188)", ber, errors); // handle displaying TUI updateTUIBER(ber); diff --git a/src/nxdn/NXDNDefines.h b/src/nxdn/NXDNDefines.h index 02a4d623..56f15cb7 100644 --- a/src/nxdn/NXDNDefines.h +++ b/src/nxdn/NXDNDefines.h @@ -105,7 +105,7 @@ namespace nxdn const uint32_t NXDN_RCCH_CAC_LC_LONG_LENGTH_BITS = 128U; const uint32_t NXDN_RCCH_CAC_LC_SHORT_LENGTH_BITS = 96U; - const uint32_t NXDN_FSW_LICH_SACCH_LENGTH_BITS = NXDN_FSW_LENGTH_BITS + NXDN_LICH_LENGTH_BITS + NXDN_SACCH_LENGTH_BITS; + const uint32_t NXDN_FSW_LICH_SACCH_LENGTH_BITS = NXDN_FSW_LENGTH_BITS + NXDN_LICH_LENGTH_BITS + NXDN_SACCH_FEC_LENGTH_BITS; const uint32_t NXDN_FSW_LICH_SACCH_LENGTH_BYTES = NXDN_FSW_LICH_SACCH_LENGTH_BITS / 8U; const uint8_t NXDN_LICH_RFCT_RCCH = 0U; diff --git a/src/nxdn/packet/Voice.cpp b/src/nxdn/packet/Voice.cpp index 9da74dfa..33aa9c90 100644 --- a/src/nxdn/packet/Voice.cpp +++ b/src/nxdn/packet/Voice.cpp @@ -573,7 +573,7 @@ bool Voice::process(uint8_t fct, uint8_t option, uint8_t* data, uint32_t len) m_rfBits += 188U; if (m_verbose) { - LogMessage(LOG_RF, "NXDN, " NXDN_RTCH_MSG_TYPE_VCALL ", audio, errs = %u/188 (%.1f%%)", errors, float(errors) / 1.88F); + LogMessage(LOG_RF, "NXDN, " NXDN_RTCH_MSG_TYPE_VCALL ", audio, srcId = %u, dstId = %u, errs = %u/188 (%.1f%%)", m_nxdn->m_rfLC.getSrcId(), m_nxdn->m_rfLC.getDstId(), errors, float(errors) / 1.88F); } } else if (option == NXDN_LICH_STEAL_FACCH1_1) { channel::FACCH1 facch11; @@ -603,7 +603,7 @@ bool Voice::process(uint8_t fct, uint8_t option, uint8_t* data, uint32_t len) m_rfBits += 94U; if (m_verbose) { - LogMessage(LOG_RF, "NXDN, " NXDN_RTCH_MSG_TYPE_VCALL ", audio, errs = %u/94 (%.1f%%)", errors, float(errors) / 0.94F); + LogMessage(LOG_RF, "NXDN, " NXDN_RTCH_MSG_TYPE_VCALL ", audio, srcId = %u, dstId = %u, errs = %u/94 (%.1f%%)", m_nxdn->m_rfLC.getSrcId(), m_nxdn->m_rfLC.getDstId(), errors, float(errors) / 0.94F); } } else if (option == NXDN_LICH_STEAL_FACCH1_2) { edac::AMBEFEC ambe; @@ -628,7 +628,7 @@ bool Voice::process(uint8_t fct, uint8_t option, uint8_t* data, uint32_t len) m_rfBits += 94U; if (m_verbose) { - LogMessage(LOG_RF, "NXDN, " NXDN_RTCH_MSG_TYPE_VCALL ", audio, errs = %u/94 (%.1f%%)", errors, float(errors) / 0.94F); + LogMessage(LOG_RF, "NXDN, " NXDN_RTCH_MSG_TYPE_VCALL ", srcId = %u, dstId = %u, audio, errs = %u/94 (%.1f%%)", m_nxdn->m_rfLC.getSrcId(), m_nxdn->m_rfLC.getDstId(), errors, float(errors) / 0.94F); } channel::FACCH1 facch12; @@ -975,7 +975,7 @@ bool Voice::processNetwork(uint8_t fct, uint8_t option, lc::RTCH& netLC, uint8_t m_rfBits += 188U; if (m_verbose) { - LogMessage(LOG_NET, "NXDN, " NXDN_RTCH_MSG_TYPE_VCALL ", audio, errs = %u/141 (%.1f%%)", errors, float(errors) / 1.88F); + LogMessage(LOG_NET, "NXDN, " NXDN_RTCH_MSG_TYPE_VCALL ", audio, srcId = %u, dstId = %u, errs = %u/141 (%.1f%%)", m_nxdn->m_netLC.getSrcId(), m_nxdn->m_netLC.getDstId(), errors, float(errors) / 1.88F); } } else if (option == NXDN_LICH_STEAL_FACCH1_1) { channel::FACCH1 facch1; @@ -994,7 +994,7 @@ bool Voice::processNetwork(uint8_t fct, uint8_t option, lc::RTCH& netLC, uint8_t m_rfBits += 94U; if (m_verbose) { - LogMessage(LOG_NET, "NXDN, " NXDN_RTCH_MSG_TYPE_VCALL ", audio, errs = %u/94 (%.1f%%)", errors, float(errors) / 0.94F); + LogMessage(LOG_NET, "NXDN, " NXDN_RTCH_MSG_TYPE_VCALL ", audio, srcId = %u, dstId = %u, errs = %u/94 (%.1f%%)", m_nxdn->m_netLC.getSrcId(), m_nxdn->m_netLC.getDstId(), errors, float(errors) / 0.94F); } } else if (option == NXDN_LICH_STEAL_FACCH1_2) { edac::AMBEFEC ambe; @@ -1008,7 +1008,7 @@ bool Voice::processNetwork(uint8_t fct, uint8_t option, lc::RTCH& netLC, uint8_t m_rfBits += 94U; if (m_verbose) { - LogMessage(LOG_NET, "NXDN, " NXDN_RTCH_MSG_TYPE_VCALL ", audio, errs = %u/94 (%.1f%%)", errors, float(errors) / 0.94F); + LogMessage(LOG_NET, "NXDN, " NXDN_RTCH_MSG_TYPE_VCALL ", audio, srcId = %u, dstId = %u, errs = %u/94 (%.1f%%)", m_nxdn->m_netLC.getSrcId(), m_nxdn->m_netLC.getDstId(), errors, float(errors) / 0.94F); } channel::FACCH1 facch1; bool valid = facch1.decode(data + 2U, NXDN_FSW_LENGTH_BITS + NXDN_LICH_LENGTH_BITS + NXDN_SACCH_FEC_LENGTH_BITS + NXDN_FACCH1_FEC_LENGTH_BITS); diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index c09be078..72361250 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -32,6 +32,7 @@ file(GLOB dvmtests_SRC "tests/crypto/*.cpp" "tests/edac/*.cpp" "tests/p25/*.cpp" + "tests/nxdn/*.cpp" ) # diff --git a/tests/nxdn/AMBE_FEC_Test.cpp b/tests/nxdn/AMBE_FEC_Test.cpp new file mode 100644 index 00000000..999b6c62 --- /dev/null +++ b/tests/nxdn/AMBE_FEC_Test.cpp @@ -0,0 +1,73 @@ +/** +* Digital Voice Modem - Host Software (Test Suite) +* GPLv2 Open Source. Use is subject to license terms. +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* @package DVM / Host Software / Test Suite +* +*/ +/* +* Copyright (C) 2023 Bryan Biedenkapp N2PLL +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ +#include "Defines.h" +#include "edac/AMBEFEC.h" +#include "edac/Golay24128.h" +#include "nxdn/NXDNDefines.h" +#include "nxdn/NXDNUtils.h" +#include "Log.h" +#include "Utils.h" + +using namespace edac; +using namespace nxdn; + +#include +#include +#include + +TEST_CASE("NXDN", "[AMBE FEC Test]") { + SECTION("NXDN_AMBEFEC_Test") { + bool failed = false; + + INFO("NXDN AMBE FEC FEC Test"); + + uint8_t testData[] = { + 0xCDU, 0xF5U, 0x9DU, 0x5DU, 0xFCU, 0xFAU, 0x0AU, 0x6EU, 0x8AU, 0x23U, 0x56U, 0xE8U, + 0x17U, 0x49U, 0xC6U, 0x58U, 0x89U, 0x30U, 0x1AU, 0xA5U, 0xF5U, 0xACU, 0x5AU, 0x6EU, 0xF8U, 0x09U, 0x3CU, 0x48U, + 0x0FU, 0x4FU, 0xFDU, 0xCFU, 0x80U, 0xD5U, 0x77U, 0x0CU, 0xFEU, 0xE9U, 0x05U, 0xCEU, 0xE6U, 0x20U, 0xDFU, 0xFFU, + 0x18U, 0x9CU, 0x2DU, 0xA9U + }; + + NXDNUtils::scrambler(testData); + + Utils::dump(2U, "NXDN AMBE FEC Test, descrambled test data", testData, NXDN_FRAME_LENGTH_BYTES); + + AMBEFEC fec = AMBEFEC(); + + uint32_t errors = 0U; + + errors += fec.measureNXDNBER(testData + NXDN_FSW_LICH_SACCH_LENGTH_BYTES + 0U); + errors += fec.measureNXDNBER(testData + NXDN_FSW_LICH_SACCH_LENGTH_BYTES + 9U); + errors += fec.measureNXDNBER(testData + NXDN_FSW_LICH_SACCH_LENGTH_BYTES + 18U); + errors += fec.measureNXDNBER(testData + NXDN_FSW_LICH_SACCH_LENGTH_BYTES + 27U); + + if (errors > 0) + failed = true; + +cleanup: + REQUIRE(failed==false); + } +}