diff --git a/DMRSlot.cpp b/DMRSlot.cpp index 0ccd6cd..7ac1245 100644 --- a/DMRSlot.cpp +++ b/DMRSlot.cpp @@ -579,22 +579,30 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len) if (m_rfState != RS_RF_DATA || m_rfFrames == 0U) return false; + char title[80U]; // Regenerate the rate 1/2 payload if (dataType == DT_RATE_12_DATA) { CBPTC19696 bptc; unsigned char payload[12U]; bptc.decode(data + 2U, payload); + ::sprintf(title, "DMR Slot %u, Data 1/2", m_slotNo); + CUtils::dump(1U, title, payload, 12U); bptc.encode(payload, data + 2U); } else if (dataType == DT_RATE_34_DATA) { CDMRTrellis trellis; unsigned char payload[18U]; bool ret = trellis.decode(data + 2U, payload); if (ret) { + ::sprintf(title, "DMR Slot %u, Data 3/4", m_slotNo); + CUtils::dump(1U, title, payload, 18U); trellis.encode(payload, data + 2U); } else { LogMessage("DMR Slot %u, unfixable RF rate 3/4 data", m_slotNo); CUtils::dump(1U, "Data", data + 2U, DMR_FRAME_LENGTH_BYTES); } + } else { + ::sprintf(title, "DMR Slot %u, Data 1/1", m_slotNo); + CUtils::dump(1U, title, data + 2U, 24U); } // Regenerate the Slot Type @@ -1836,24 +1844,33 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData) return; } + char title[80U]; // Regenerate the rate 1/2 payload if (dataType == DT_RATE_12_DATA) { CBPTC19696 bptc; unsigned char payload[12U]; bptc.decode(data + 2U, payload); + ::sprintf(title, "DMR Slot %u, Data 1/2", m_slotNo); + CUtils::dump(1U, title, payload, 12U); bptc.encode(payload, data + 2U); } else if (dataType == DT_RATE_34_DATA) { CDMRTrellis trellis; unsigned char payload[18U]; bool ret = trellis.decode(data + 2U, payload); if (ret) { + ::sprintf(title, "DMR Slot %u, Data 3/4", m_slotNo); + CUtils::dump(1U, title, payload, 18U); trellis.encode(payload, data + 2U); } else { LogMessage("DMR Slot %u, unfixable network rate 3/4 data", m_slotNo); CUtils::dump(1U, "Data", data + 2U, DMR_FRAME_LENGTH_BYTES); } + } else { + ::sprintf(title, "DMR Slot %u, Data 1/1", m_slotNo); + CUtils::dump(1U, title, data + 2U, 24U); } + // Regenerate the Slot Type CDMRSlotType slotType; slotType.putData(data + 2U); diff --git a/DMRTrellis.cpp b/DMRTrellis.cpp index f0a73cb..cdf30ed 100644 --- a/DMRTrellis.cpp +++ b/DMRTrellis.cpp @@ -280,12 +280,12 @@ void CDMRTrellis::pointsToDibits(const unsigned char* points, signed char* dibit void CDMRTrellis::bitsToTribits(const unsigned char* payload, unsigned char* tribits) const { for (unsigned int i = 0U; i < 48U; i++) { - unsigned int n = 143U - i * 3U; + unsigned int n = i * 3U; bool b1 = READ_BIT(payload, n) != 0x00U; - n--; + n++; bool b2 = READ_BIT(payload, n) != 0x00U; - n--; + n++; bool b3 = READ_BIT(payload, n) != 0x00U; unsigned char tribit = 0U; @@ -308,12 +308,12 @@ void CDMRTrellis::tribitsToBits(const unsigned char* tribits, unsigned char* pay bool b2 = (tribit & 0x02U) == 0x02U; bool b3 = (tribit & 0x01U) == 0x01U; - unsigned int n = 143U - i * 3U; + unsigned int n = i * 3U; WRITE_BIT(payload, n, b1); - n--; + n++; WRITE_BIT(payload, n, b2); - n--; + n++; WRITE_BIT(payload, n, b3); } } diff --git a/Version.h b/Version.h index 737ddb4..19548a7 100644 --- a/Version.h +++ b/Version.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015-2021 by Jonathan Naylor G4KLX + * Copyright (C) 2015-2023 by Jonathan Naylor G4KLX * * 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 @@ -19,6 +19,6 @@ #if !defined(VERSION_H) #define VERSION_H -const char* VERSION = "20230723"; +const char* VERSION = "20230927"; #endif