Crash_Override
/
MMDVMHost-Private
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up the D-Star Control class a little.

This commit is contained in:
Jonathan Naylor 2021-05-18 19:44:41 +01:00
parent 21b66d5113
commit e2d61d1572
7 changed files with 54 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
DStarControl.cpp
View File

@ -140,9 +140,9 @@ unsigned int CDStarControl::maybeFixupVoiceFrame(
unsigned char n, unsigned char n,
bool blank_dtmf, bool blank_dtmf,
unsigned char* voice_sync_data, unsigned char* voice_sync_data,
unsigned int* voice_sync_data_len, unsigned int& voice_sync_data_len,
bool* next_frame_is_fast_data, bool& next_frame_is_fast_data,
unsigned int* skip_dtmf_blanking_frames unsigned int& skip_dtmf_blanking_frames
) )
{ {
unsigned int errors = 0U; unsigned int errors = 0U;
@ -152,37 +152,40 @@ unsigned int CDStarControl::maybeFixupVoiceFrame(
if (n == 0U) { if (n == 0U) {
::memcpy(voice_sync_data, data, MODEM_DATA_LEN); ::memcpy(voice_sync_data, data, MODEM_DATA_LEN);
*voice_sync_data_len = len; voice_sync_data_len = len;
} else if ((n % 2U != 0U) && } else if ((n % 2U != 0U) &&
((mini_header_type == DSTAR_SLOW_DATA_TYPE_FASTDATA01) || ((mini_header_type == DSTAR_SLOW_DATA_TYPE_FASTDATA01) ||
(mini_header_type == DSTAR_SLOW_DATA_TYPE_FASTDATA16))) { (mini_header_type == DSTAR_SLOW_DATA_TYPE_FASTDATA16))) {
*next_frame_is_fast_data = true; next_frame_is_fast_data = true;
if (blank_dtmf) if (blank_dtmf)
*skip_dtmf_blanking_frames = FAST_DATA_BEEP_GRACE_FRAMES; skip_dtmf_blanking_frames = FAST_DATA_BEEP_GRACE_FRAMES;
if (n == 1U) if (n == 1U)
LogDebug("D-Star, %s fastdata sequence no. 0", log_prefix); LogDebug("D-Star, %s fastdata sequence no. 0", log_prefix);
LogDebug("D-Star, %s fastdata sequence no. %2u", log_prefix, n); LogDebug("D-Star, %s fastdata sequence no. %2u", log_prefix, n);
} else if (*next_frame_is_fast_data == true) { } else if (next_frame_is_fast_data) {
*next_frame_is_fast_data = false; next_frame_is_fast_data = false;
if (blank_dtmf) if (blank_dtmf)
*skip_dtmf_blanking_frames = FAST_DATA_BEEP_GRACE_FRAMES; skip_dtmf_blanking_frames = FAST_DATA_BEEP_GRACE_FRAMES;
LogDebug("D-Star, %s fastdata sequence no. %2u", log_prefix, n); LogDebug("D-Star, %s fastdata sequence no. %2u", log_prefix, n);
} else { } else {
bool voice_sync_data_is_null_ambe_data = false; bool voice_sync_data_is_null_ambe_data = false;
bool data_is_null_ambe_data = false; bool data_is_null_ambe_data = false;
if ((n == 1U) && (::memcmp(voice_sync_data + offset, DSTAR_NULL_AMBE_DATA_BYTES_SCRAMBLED, DSTAR_VOICE_FRAME_LENGTH_BYTES) == 0)) if ((n == 1U) && (::memcmp(voice_sync_data + offset, DSTAR_NULL_AMBE_DATA_BYTES_SCRAMBLED, DSTAR_VOICE_FRAME_LENGTH_BYTES) == 0))
voice_sync_data_is_null_ambe_data = true; voice_sync_data_is_null_ambe_data = true;
if (::memcmp(data + offset, DSTAR_NULL_AMBE_DATA_BYTES_SCRAMBLED, DSTAR_VOICE_FRAME_LENGTH_BYTES) == 0) if (::memcmp(data + offset, DSTAR_NULL_AMBE_DATA_BYTES_SCRAMBLED, DSTAR_VOICE_FRAME_LENGTH_BYTES) == 0)
data_is_null_ambe_data = true; data_is_null_ambe_data = true;
if ((n == 1U) && !voice_sync_data_is_null_ambe_data) if ((n == 1U) && !voice_sync_data_is_null_ambe_data)
voice_sync_errors += m_fec.regenerateDStar(voice_sync_data + offset); voice_sync_errors += m_fec.regenerateDStar(voice_sync_data + offset);
if (!data_is_null_ambe_data) if (!data_is_null_ambe_data)
errors += m_fec.regenerateDStar(data + offset); errors += m_fec.regenerateDStar(data + offset);
if (blank_dtmf && (*skip_dtmf_blanking_frames > 0U)) { if (blank_dtmf && skip_dtmf_blanking_frames > 0U) {
(*skip_dtmf_blanking_frames)--; skip_dtmf_blanking_frames--;
} else if (blank_dtmf && (*skip_dtmf_blanking_frames == 0U)) { } else if (blank_dtmf && skip_dtmf_blanking_frames == 0U) {
if ((n == 1U) && !voice_sync_data_is_null_ambe_data) if ((n == 1U) && !voice_sync_data_is_null_ambe_data)
blankDTMF(voice_sync_data + offset); blankDTMF(voice_sync_data + offset);
if (!data_is_null_ambe_data) if (!data_is_null_ambe_data)
@ -191,17 +194,16 @@ unsigned int CDStarControl::maybeFixupVoiceFrame(
if (n == 1U) { if (n == 1U) {
if (voice_sync_data_is_null_ambe_data) if (voice_sync_data_is_null_ambe_data)
LogDebug("D-Star, %s nullaudio sequence no. 0", log_prefix); LogDebug("D-Star, %s nullaudio sequence no. 0", log_prefix);
else else
LogDebug("D-Star, %s audio sequence no. 0, errs: %2u/48 (%5.1f%%)", log_prefix, voice_sync_errors, LogDebug("D-Star, %s audio sequence no. 0, errs: %2u/48 (%5.1f%%)", log_prefix, voice_sync_errors, float(voice_sync_errors) / 0.48F);
float(voice_sync_errors) / 0.48F);
} }
if (data_is_null_ambe_data) if (data_is_null_ambe_data)
LogDebug("D-Star, %s nullaudio sequence no. %2u", log_prefix, n); LogDebug("D-Star, %s nullaudio sequence no. %2u", log_prefix, n);
else else
LogDebug("D-Star, %s audio sequence no. %2u, errs: %2u/48 (%5.1f%%)", log_prefix, n, errors, LogDebug("D-Star, %s audio sequence no. %2u, errs: %2u/48 (%5.1f%%)", log_prefix, n, errors, float(errors) / 0.48F);
float(errors) / 0.48F); }
}
return voice_sync_errors + errors; return voice_sync_errors + errors;
} }
@ -456,8 +458,7 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len)
unsigned int errors = 0U; unsigned int errors = 0U;
if (!m_rfHeader.isDataPacket()) { if (!m_rfHeader.isDataPacket()) {
errors = maybeFixupVoiceFrame(data, len, 1U, "RF", m_rfN, m_duplex, m_rfVoiceSyncData, &m_rfVoiceSyncDataLen, errors = maybeFixupVoiceFrame(data, len, 1U, "RF", m_rfN, m_duplex, m_rfVoiceSyncData, m_rfVoiceSyncDataLen, m_rfNextFrameIsFastData, m_rfSkipDTMFBlankingFrames);
&m_rfNextFrameIsFastData, &m_rfSkipDTMFBlankingFrames);
m_display->writeDStarBER(float(errors) / 0.48F); m_display->writeDStarBER(float(errors) / 0.48F);
m_rfErrs += errors; m_rfErrs += errors;
} }
@ -589,8 +590,7 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len)
unsigned int errors = 0U; unsigned int errors = 0U;
if (!m_rfHeader.isDataPacket()) { if (!m_rfHeader.isDataPacket()) {
errors = maybeFixupVoiceFrame(data, len, 1U, "RF", m_rfN, m_duplex, m_rfVoiceSyncData, &m_rfVoiceSyncDataLen, errors = maybeFixupVoiceFrame(data, len, 1U, "RF", m_rfN, m_duplex, m_rfVoiceSyncData, m_rfVoiceSyncDataLen, m_rfNextFrameIsFastData, m_rfSkipDTMFBlankingFrames);
&m_rfNextFrameIsFastData, &m_rfSkipDTMFBlankingFrames);
m_rfErrs += errors; m_rfErrs += errors;
} }
@ -790,8 +790,7 @@ void CDStarControl::writeNetwork()
unsigned int errors = 0U; unsigned int errors = 0U;
if (!m_netHeader.isDataPacket()) if (!m_netHeader.isDataPacket())
errors = maybeFixupVoiceFrame(data, length, 2U, "Net", n, true, m_netVoiceSyncData, &m_netVoiceSyncDataLen, errors = maybeFixupVoiceFrame(data, length, 2U, "Net", n, true, m_netVoiceSyncData, m_netVoiceSyncDataLen, m_netNextFrameIsFastData, m_netSkipDTMFBlankingFrames);
&m_netNextFrameIsFastData, &m_netSkipDTMFBlankingFrames);
// Insert silence and reject if in the past // Insert silence and reject if in the past
bool ret = insertSilence(data + 1U, n); bool ret = insertSilence(data + 1U, n);
@ -1187,11 +1186,10 @@ void CDStarControl::sendAck()
if (status == LS_LINKED_DEXTRA || status == LS_LINKED_DPLUS || status == LS_LINKED_DCS || status == LS_LINKED_CCS || status == LS_LINKED_LOOPBACK) { if (status == LS_LINKED_DEXTRA || status == LS_LINKED_DPLUS || status == LS_LINKED_DCS || status == LS_LINKED_CCS || status == LS_LINKED_LOOPBACK) {
CUtils::removeChar(reflector, ' ');//remove space from reflector so all nicely fits onto 20 chars in case rssi < 99dBm CUtils::removeChar(reflector, ' ');//remove space from reflector so all nicely fits onto 20 chars in case rssi < 99dBm
::sprintf(text, "%-8.8s %.1f%% -%udBm ", reflector, float(m_rfErrs * 100U) / float(m_rfBits), m_aveRSSI / m_rssiCount); ::sprintf(text, "%-8.8s %.1f%% -%udBm ", reflector, float(m_rfErrs * 100U) / float(m_rfBits), m_aveRSSI / m_rssiCount);
} } else {
else
::sprintf(text, "BER:%.1f%% -%udBm ", float(m_rfErrs * 100U) / float(m_rfBits), m_aveRSSI / m_rssiCount); ::sprintf(text, "BER:%.1f%% -%udBm ", float(m_rfErrs * 100U) / float(m_rfBits), m_aveRSSI / m_rssiCount);
} }
else if (m_ackMessage == DSTAR_ACK_SMETER && m_rssi != 0) { } else if (m_ackMessage == DSTAR_ACK_SMETER && m_rssi != 0) {
unsigned int signal, plus; unsigned int signal, plus;
char signalText[10U]; char signalText[10U];
CSMeter::getSignal(m_aveRSSI / m_rssiCount, signal, plus); CSMeter::getSignal(m_aveRSSI / m_rssiCount, signal, plus);
@ -1204,13 +1202,13 @@ void CDStarControl::sendAck()
::sprintf(text, "%-8.8s %.1f%% %s ", reflector, float(m_rfErrs * 100U) / float(m_rfBits), signalText); ::sprintf(text, "%-8.8s %.1f%% %s ", reflector, float(m_rfErrs * 100U) / float(m_rfBits), signalText);
else else
::sprintf(text, "BER:%.1f%% %s ", float(m_rfErrs * 100U) / float(m_rfBits), signalText); ::sprintf(text, "BER:%.1f%% %s ", float(m_rfErrs * 100U) / float(m_rfBits), signalText);
} } else {
else {
if (status == LS_LINKED_DEXTRA || status == LS_LINKED_DPLUS || status == LS_LINKED_DCS || status == LS_LINKED_CCS || status == LS_LINKED_LOOPBACK) if (status == LS_LINKED_DEXTRA || status == LS_LINKED_DPLUS || status == LS_LINKED_DCS || status == LS_LINKED_CCS || status == LS_LINKED_LOOPBACK)
::sprintf(text, "%-8.8s BER: %.1f%% ", reflector, float(m_rfErrs * 100U) / float(m_rfBits)); ::sprintf(text, "%-8.8s BER: %.1f%% ", reflector, float(m_rfErrs * 100U) / float(m_rfBits));
else else
::sprintf(text, "BER: %.1f%% ", float(m_rfErrs * 100U) / float(m_rfBits)); ::sprintf(text, "BER: %.1f%% ", float(m_rfErrs * 100U) / float(m_rfBits));
} }
m_slowData.setText(text); m_slowData.setText(text);
::memcpy(data, DSTAR_NULL_FRAME_DATA_BYTES, DSTAR_FRAME_LENGTH_BYTES + 1U); ::memcpy(data, DSTAR_NULL_FRAME_DATA_BYTES, DSTAR_FRAME_LENGTH_BYTES + 1U);
@ -1253,11 +1251,10 @@ void CDStarControl::sendError()
if (status == LS_LINKED_DEXTRA || status == LS_LINKED_DPLUS || status == LS_LINKED_DCS || status == LS_LINKED_CCS || status == LS_LINKED_LOOPBACK) { if (status == LS_LINKED_DEXTRA || status == LS_LINKED_DPLUS || status == LS_LINKED_DCS || status == LS_LINKED_CCS || status == LS_LINKED_LOOPBACK) {
CUtils::removeChar(reflector, ' ');//remove space from reflector so all nicely fits onto 20 chars in case rssi < 99dBm CUtils::removeChar(reflector, ' ');//remove space from reflector so all nicely fits onto 20 chars in case rssi < 99dBm
::sprintf(text, "%-8.8s %.1f%% -%udBm ", reflector, float(m_rfErrs * 100U) / float(m_rfBits), m_aveRSSI / m_rssiCount); ::sprintf(text, "%-8.8s %.1f%% -%udBm ", reflector, float(m_rfErrs * 100U) / float(m_rfBits), m_aveRSSI / m_rssiCount);
} } else {
else
::sprintf(text, "BER:%.1f%% -%udBm ", float(m_rfErrs * 100U) / float(m_rfBits), m_aveRSSI / m_rssiCount); ::sprintf(text, "BER:%.1f%% -%udBm ", float(m_rfErrs * 100U) / float(m_rfBits), m_aveRSSI / m_rssiCount);
} }
else if (m_ackMessage == DSTAR_ACK_SMETER && m_rssi != 0) { } else if (m_ackMessage == DSTAR_ACK_SMETER && m_rssi != 0) {
unsigned int signal, plus; unsigned int signal, plus;
char signalText[10U]; char signalText[10U];
CSMeter::getSignal(m_aveRSSI / m_rssiCount, signal, plus); CSMeter::getSignal(m_aveRSSI / m_rssiCount, signal, plus);
@ -1270,13 +1267,13 @@ void CDStarControl::sendError()
::sprintf(text, "%-8.8s %.1f%% %s ", reflector, float(m_rfErrs * 100U) / float(m_rfBits), signalText); ::sprintf(text, "%-8.8s %.1f%% %s ", reflector, float(m_rfErrs * 100U) / float(m_rfBits), signalText);
else else
::sprintf(text, "BER:%.1f%% %s ", float(m_rfErrs * 100U) / float(m_rfBits), signalText); ::sprintf(text, "BER:%.1f%% %s ", float(m_rfErrs * 100U) / float(m_rfBits), signalText);
} } else {
else {
if (status == LS_LINKED_DEXTRA || status == LS_LINKED_DPLUS || status == LS_LINKED_DCS || status == LS_LINKED_CCS || status == LS_LINKED_LOOPBACK) if (status == LS_LINKED_DEXTRA || status == LS_LINKED_DPLUS || status == LS_LINKED_DCS || status == LS_LINKED_CCS || status == LS_LINKED_LOOPBACK)
::sprintf(text, "%-8.8s BER: %.1f%% ", reflector, float(m_rfErrs * 100U) / float(m_rfBits)); ::sprintf(text, "%-8.8s BER: %.1f%% ", reflector, float(m_rfErrs * 100U) / float(m_rfBits));
else else
::sprintf(text, "BER: %.1f%% ", float(m_rfErrs * 100U) / float(m_rfBits)); ::sprintf(text, "BER: %.1f%% ", float(m_rfErrs * 100U) / float(m_rfBits));
} }
m_slowData.setText(text); m_slowData.setText(text);
::memcpy(data, DSTAR_NULL_FRAME_DATA_BYTES, DSTAR_FRAME_LENGTH_BYTES + 1U); ::memcpy(data, DSTAR_NULL_FRAME_DATA_BYTES, DSTAR_FRAME_LENGTH_BYTES + 1U);

7
DStarControl.h
View File

@ -107,7 +107,6 @@ private:
unsigned int m_rfSkipDTMFBlankingFrames; unsigned int m_rfSkipDTMFBlankingFrames;
unsigned int m_netSkipDTMFBlankingFrames; unsigned int m_netSkipDTMFBlankingFrames;
unsigned int maybeFixupVoiceFrame( unsigned int maybeFixupVoiceFrame(
unsigned char* data, unsigned char* data,
unsigned int len, unsigned int len,
@ -116,9 +115,9 @@ private:
unsigned char n, unsigned char n,
bool blank_dtmf, bool blank_dtmf,
unsigned char* voice_sync_data, unsigned char* voice_sync_data,
unsigned int* voice_sync_data_len, unsigned int& voice_sync_data_len,
bool* next_frame_is_fast_data, bool& next_frame_is_fast_data,
unsigned int* skip_dtmf_blanking_frames unsigned int& skip_dtmf_blanking_frames
); );
void writeNetwork(); void writeNetwork();

2
MMDVMHost.vcxproj
View File

@ -233,6 +233,7 @@
<ClInclude Include="SerialController.h" /> <ClInclude Include="SerialController.h" />
<ClInclude Include="SerialPort.h" /> <ClInclude Include="SerialPort.h" />
<ClInclude Include="SHA256.h" /> <ClInclude Include="SHA256.h" />
<ClInclude Include="SMeter.h" />
<ClInclude Include="StopWatch.h" /> <ClInclude Include="StopWatch.h" />
<ClInclude Include="Sync.h" /> <ClInclude Include="Sync.h" />
<ClInclude Include="TFTSerial.h" /> <ClInclude Include="TFTSerial.h" />
@ -327,6 +328,7 @@
<ClCompile Include="SerialController.cpp" /> <ClCompile Include="SerialController.cpp" />
<ClCompile Include="SerialPort.cpp" /> <ClCompile Include="SerialPort.cpp" />
<ClCompile Include="SHA256.cpp" /> <ClCompile Include="SHA256.cpp" />
<ClCompile Include="SMeter.cpp" />
<ClCompile Include="StopWatch.cpp" /> <ClCompile Include="StopWatch.cpp" />
<ClCompile Include="Sync.cpp" /> <ClCompile Include="Sync.cpp" />
<ClCompile Include="TFTSerial.cpp" /> <ClCompile Include="TFTSerial.cpp" />

6
MMDVMHost.vcxproj.filters
View File

@ -308,6 +308,9 @@
<ClInclude Include="SHA256.h"> <ClInclude Include="SHA256.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="SMeter.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="BPTC19696.cpp"> <ClCompile Include="BPTC19696.cpp">
@ -580,5 +583,8 @@
<ClCompile Include="SHA256.cpp"> <ClCompile Include="SHA256.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="SMeter.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
</Project> </Project>

16
SMeter.cpp
View File

@ -19,21 +19,19 @@
#include "SMeter.h" #include "SMeter.h"
#define RSSI_S1 141U const unsigned int RSSI_S1 = 141U;
#define RSSI_S9 93U const unsigned int RSSI_S9 = 93U;
void CSMeter::getSignal(unsigned int rssi, unsigned int & signal, unsigned int & plus) void CSMeter::getSignal(unsigned int rssi, unsigned int& signal, unsigned int& plus)
{ {
if (rssi > RSSI_S1) { if (rssi > RSSI_S1) {
signal = 0; signal = 0U;
plus = rssi - RSSI_S1; plus = rssi - RSSI_S1;
} } else if (rssi > RSSI_S9 && rssi <= RSSI_S1) {
else if (rssi > RSSI_S9 && rssi <= RSSI_S1) {
signal = ((RSSI_S1 - rssi) / 6U) + 1U; signal = ((RSSI_S1 - rssi) / 6U) + 1U;
plus = (RSSI_S1 - rssi) % 6U; plus = (RSSI_S1 - rssi) % 6U;
} } else {
else {
signal = 9U; signal = 9U;
plus = RSSI_S9 - rssi; plus = RSSI_S9 - rssi;
} }
} }

5
SMeter.h
View File

@ -20,13 +20,10 @@
#if !defined(SMETER_H) #if !defined(SMETER_H)
#define SMETER_H #define SMETER_H
#include <string>
#include <vector>
class CSMeter class CSMeter
{ {
public: public:
static void getSignal(unsigned int rssi, unsigned int & signal, unsigned int & plus); static void getSignal(unsigned int rssi, unsigned int& signal, unsigned int& plus);
}; };
#endif #endif

2
Version.h
View File

@ -19,6 +19,6 @@
#if !defined(VERSION_H) #if !defined(VERSION_H)
#define VERSION_H #define VERSION_H
const char* VERSION = "20210408"; const char* VERSION = "20210518";
#endif #endif