Skip to content

Commit 8363a72

Browse files
g4klxg4klx
committed
Merge branch 'master' into M17_AX25_FM
2 parents c0e3fd0 + e2d61d1 commit 8363a72

19 files changed

+194
-68
lines changed

‎Conf.cpp

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ m_dstarBlackList(),
139139
m_dstarWhiteList(),
140140
m_dstarAckReply(true),
141141
m_dstarAckTime(750U),
142-
m_dstarAckMessage(false),
142+
m_dstarAckMessage(DSTAR_ACK_BER),
143143
m_dstarErrorReply(true),
144144
m_dstarRemoteGateway(false),
145145
m_dstarModeHang(10U),
@@ -644,9 +644,11 @@ bool CConf::read()
644644
m_dstarAckReply = ::atoi(value) == 1;
645645
else if (::strcmp(key, "AckTime") == 0)
646646
m_dstarAckTime = (unsigned int)::atoi(value);
647-
else if (::strcmp(key, "AckMessage") == 0)
648-
m_dstarAckMessage = ::atoi(value) == 1;
649-
else if (::strcmp(key, "ErrorReply") == 0)
647+
else if (::strcmp(key, "AckMessage") == 0) {
648+
m_dstarAckMessage = (DSTAR_ACK_MESSAGE)::atoi(value);
649+
if (m_dstarAckMessage != DSTAR_ACK_BER && m_dstarAckMessage != DSTAR_ACK_RSSI && m_dstarAckMessage != DSTAR_ACK_SMETER)
650+
m_dstarAckMessage = DSTAR_ACK_BER;
651+
} else if (::strcmp(key, "ErrorReply") == 0)
650652
m_dstarErrorReply = ::atoi(value) == 1;
651653
else if (::strcmp(key, "RemoteGateway") == 0)
652654
m_dstarRemoteGateway = ::atoi(value) == 1;
@@ -1504,7 +1506,7 @@ unsigned int CConf::getDStarAckTime() const
15041506
return m_dstarAckTime;
15051507
}
15061508

1507-
bool CConf::getDStarAckMessage() const
1509+
DSTAR_ACK_MESSAGE CConf::getDStarAckMessage() const
15081510
{
15091511
return m_dstarAckMessage;
15101512
}

‎Conf.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ class CConf
120120
std::vector<std::string> getDStarWhiteList() const;
121121
bool getDStarAckReply() const;
122122
unsigned int getDStarAckTime() const;
123-
bool getDStarAckMessage() const;
123+
DSTAR_ACK_MESSAGE getDStarAckMessage() const;
124124
bool getDStarErrorReply() const;
125125
bool getDStarRemoteGateway() const;
126126
unsigned int getDStarModeHang() const;
@@ -452,7 +452,7 @@ class CConf
452452
std::vector<std::string> m_dstarWhiteList;
453453
bool m_dstarAckReply;
454454
unsigned int m_dstarAckTime;
455-
bool m_dstarAckMessage;
455+
DSTAR_ACK_MESSAGE m_dstarAckMessage;
456456
bool m_dstarErrorReply;
457457
bool m_dstarRemoteGateway;
458458
unsigned int m_dstarModeHang;

‎DStarControl.cpp

Lines changed: 66 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#include "Utils.h"
1616
#include "Sync.h"
1717
#include "Log.h"
18+
#include "SMeter.h"
1819

1920
#include <cstdio>
2021
#include <cassert>
@@ -37,7 +38,7 @@ bool CallsignCompare(const std::string& arg, const unsigned char* my)
3738

3839
// #define DUMP_DSTAR
3940

40-
CDStarControl::CDStarControl(const std::string& callsign, const std::string& module, bool selfOnly, bool ackReply, unsigned int ackTime, bool ackMessage, bool errorReply, const std::vector<std::string>& blackList, const std::vector<std::string>& whiteList, CDStarNetwork* network, CDisplay* display, unsigned int timeout, bool duplex, bool remoteGateway, CRSSIInterpolator* rssiMapper) :
41+
CDStarControl::CDStarControl(const std::string& callsign, const std::string& module, bool selfOnly, bool ackReply, unsigned int ackTime, DSTAR_ACK_MESSAGE ackMessage, bool errorReply, const std::vector<std::string>& blackList, const std::vector<std::string>& whiteList, CDStarNetwork* network, CDisplay* display, unsigned int timeout, bool duplex, bool remoteGateway, CRSSIInterpolator* rssiMapper) :
4142
m_callsign(NULL),
4243
m_gateway(NULL),
4344
m_selfOnly(selfOnly),
@@ -139,9 +140,9 @@ unsigned int CDStarControl::maybeFixupVoiceFrame(
139140
unsigned char n,
140141
bool blank_dtmf,
141142
unsigned char* voice_sync_data,
142-
unsigned int* voice_sync_data_len,
143-
bool* next_frame_is_fast_data,
144-
unsigned int* skip_dtmf_blanking_frames
143+
unsigned int& voice_sync_data_len,
144+
bool& next_frame_is_fast_data,
145+
unsigned int& skip_dtmf_blanking_frames
145146
)
146147
{
147148
unsigned int errors = 0U;
@@ -151,37 +152,40 @@ unsigned int CDStarControl::maybeFixupVoiceFrame(
151152

152153
if (n == 0U) {
153154
::memcpy(voice_sync_data, data, DSTAR_MODEM_DATA_LEN);
154-
*voice_sync_data_len = len;
155+
voice_sync_data_len = len;
155156
} else if ((n % 2U != 0U) &&
156157
((mini_header_type == DSTAR_SLOW_DATA_TYPE_FASTDATA01) ||
157158
(mini_header_type == DSTAR_SLOW_DATA_TYPE_FASTDATA16))) {
158-
*next_frame_is_fast_data = true;
159+
next_frame_is_fast_data = true;
159160
if (blank_dtmf)
160-
*skip_dtmf_blanking_frames = FAST_DATA_BEEP_GRACE_FRAMES;
161+
skip_dtmf_blanking_frames = FAST_DATA_BEEP_GRACE_FRAMES;
161162
if (n == 1U)
162-
LogDebug("D-Star, %s fastdata sequence no. 0", log_prefix);
163+
LogDebug("D-Star, %s fastdata sequence no. 0", log_prefix);
163164
LogDebug("D-Star, %s fastdata sequence no. %2u", log_prefix, n);
164-
} else if (*next_frame_is_fast_data == true) {
165-
*next_frame_is_fast_data = false;
165+
} else if (next_frame_is_fast_data) {
166+
next_frame_is_fast_data = false;
166167
if (blank_dtmf)
167-
*skip_dtmf_blanking_frames = FAST_DATA_BEEP_GRACE_FRAMES;
168+
skip_dtmf_blanking_frames = FAST_DATA_BEEP_GRACE_FRAMES;
168169
LogDebug("D-Star, %s fastdata sequence no. %2u", log_prefix, n);
169170
} else {
170171
bool voice_sync_data_is_null_ambe_data = false;
171172
bool data_is_null_ambe_data = false;
173+
172174
if ((n == 1U) && (::memcmp(voice_sync_data + offset, DSTAR_NULL_AMBE_DATA_BYTES_SCRAMBLED, DSTAR_VOICE_FRAME_LENGTH_BYTES) == 0))
173175
voice_sync_data_is_null_ambe_data = true;
176+
174177
if (::memcmp(data + offset, DSTAR_NULL_AMBE_DATA_BYTES_SCRAMBLED, DSTAR_VOICE_FRAME_LENGTH_BYTES) == 0)
175178
data_is_null_ambe_data = true;
176179

177180
if ((n == 1U) && !voice_sync_data_is_null_ambe_data)
178181
voice_sync_errors += m_fec.regenerateDStar(voice_sync_data + offset);
182+
179183
if (!data_is_null_ambe_data)
180184
errors += m_fec.regenerateDStar(data + offset);
181185

182-
if (blank_dtmf && (*skip_dtmf_blanking_frames > 0U)) {
183-
(*skip_dtmf_blanking_frames)--;
184-
} else if (blank_dtmf && (*skip_dtmf_blanking_frames == 0U)) {
186+
if (blank_dtmf && skip_dtmf_blanking_frames > 0U) {
187+
skip_dtmf_blanking_frames--;
188+
} else if (blank_dtmf && skip_dtmf_blanking_frames == 0U) {
185189
if ((n == 1U) && !voice_sync_data_is_null_ambe_data)
186190
blankDTMF(voice_sync_data + offset);
187191
if (!data_is_null_ambe_data)
@@ -190,17 +194,16 @@ unsigned int CDStarControl::maybeFixupVoiceFrame(
190194

191195
if (n == 1U) {
192196
if (voice_sync_data_is_null_ambe_data)
193-
LogDebug("D-Star, %s nullaudio sequence no. 0", log_prefix);
197+
LogDebug("D-Star, %s nullaudio sequence no. 0", log_prefix);
194198
else
195-
LogDebug("D-Star, %s audio sequence no. 0, errs: %2u/48 (%5.1f%%)", log_prefix, voice_sync_errors,
196-
float(voice_sync_errors) / 0.48F);
199+
LogDebug("D-Star, %s audio sequence no. 0, errs: %2u/48 (%5.1f%%)", log_prefix, voice_sync_errors, float(voice_sync_errors) / 0.48F);
197200
}
201+
198202
if (data_is_null_ambe_data)
199203
LogDebug("D-Star, %s nullaudio sequence no. %2u", log_prefix, n);
200204
else
201-
LogDebug("D-Star, %s audio sequence no. %2u, errs: %2u/48 (%5.1f%%)", log_prefix, n, errors,
202-
float(errors) / 0.48F);
203-
}
205+
LogDebug("D-Star, %s audio sequence no. %2u, errs: %2u/48 (%5.1f%%)", log_prefix, n, errors, float(errors) / 0.48F);
206+
}
204207

205208
return voice_sync_errors + errors;
206209
}
@@ -455,8 +458,7 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len)
455458

456459
unsigned int errors = 0U;
457460
if (!m_rfHeader.isDataPacket()) {
458-
errors = maybeFixupVoiceFrame(data, len, 1U, "RF", m_rfN, m_duplex, m_rfVoiceSyncData, &m_rfVoiceSyncDataLen,
459-
&m_rfNextFrameIsFastData, &m_rfSkipDTMFBlankingFrames);
461+
errors = maybeFixupVoiceFrame(data, len, 1U, "RF", m_rfN, m_duplex, m_rfVoiceSyncData, m_rfVoiceSyncDataLen, m_rfNextFrameIsFastData, m_rfSkipDTMFBlankingFrames);
460462
m_display->writeDStarBER(float(errors) / 0.48F);
461463
m_rfErrs += errors;
462464
}
@@ -588,8 +590,7 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len)
588590

589591
unsigned int errors = 0U;
590592
if (!m_rfHeader.isDataPacket()) {
591-
errors = maybeFixupVoiceFrame(data, len, 1U, "RF", m_rfN, m_duplex, m_rfVoiceSyncData, &m_rfVoiceSyncDataLen,
592-
&m_rfNextFrameIsFastData, &m_rfSkipDTMFBlankingFrames);
593+
errors = maybeFixupVoiceFrame(data, len, 1U, "RF", m_rfN, m_duplex, m_rfVoiceSyncData, m_rfVoiceSyncDataLen, m_rfNextFrameIsFastData, m_rfSkipDTMFBlankingFrames);
593594
m_rfErrs += errors;
594595
}
595596

@@ -789,8 +790,7 @@ void CDStarControl::writeNetwork()
789790

790791
unsigned int errors = 0U;
791792
if (!m_netHeader.isDataPacket())
792-
errors = maybeFixupVoiceFrame(data, length, 2U, "Net", n, true, m_netVoiceSyncData, &m_netVoiceSyncDataLen,
793-
&m_netNextFrameIsFastData, &m_netSkipDTMFBlankingFrames);
793+
errors = maybeFixupVoiceFrame(data, length, 2U, "Net", n, true, m_netVoiceSyncData, m_netVoiceSyncDataLen, m_netNextFrameIsFastData, m_netSkipDTMFBlankingFrames);
794794

795795
// Insert silence and reject if in the past
796796
bool ret = insertSilence(data + 1U, n);
@@ -1182,18 +1182,33 @@ void CDStarControl::sendAck()
11821182
m_network->getStatus(status, reflector);
11831183

11841184
char text[40U];
1185-
if (m_ackMessage && m_rssi != 0) {
1185+
if (m_ackMessage == DSTAR_ACK_RSSI && m_rssi != 0) {
1186+
if (status == LS_LINKED_DEXTRA || status == LS_LINKED_DPLUS || status == LS_LINKED_DCS || status == LS_LINKED_CCS || status == LS_LINKED_LOOPBACK) {
1187+
CUtils::removeChar(reflector, ' ');//remove space from reflector so all nicely fits onto 20 chars in case rssi < 99dBm
1188+
::sprintf(text, "%-8.8s %.1f%% -%udBm ", reflector, float(m_rfErrs * 100U) / float(m_rfBits), m_aveRSSI / m_rssiCount);
1189+
} else {
1190+
::sprintf(text, "BER:%.1f%% -%udBm ", float(m_rfErrs * 100U) / float(m_rfBits), m_aveRSSI / m_rssiCount);
1191+
}
1192+
} else if (m_ackMessage == DSTAR_ACK_SMETER && m_rssi != 0) {
1193+
unsigned int signal, plus;
1194+
char signalText[10U];
1195+
CSMeter::getSignal(m_aveRSSI / m_rssiCount, signal, plus);
1196+
if (plus != 0U)
1197+
::sprintf(signalText, "S%u+%02u", signal, plus);
1198+
else
1199+
::sprintf(signalText, "S%u", signal);
1200+
11861201
if (status == LS_LINKED_DEXTRA || status == LS_LINKED_DPLUS || status == LS_LINKED_DCS || status == LS_LINKED_CCS || status == LS_LINKED_LOOPBACK)
1187-
::sprintf(text, "%-8.8s -%udBm ", reflector, m_aveRSSI / m_rssiCount);
1202+
::sprintf(text, "%-8.8s %.1f%% %s ", reflector, float(m_rfErrs * 100U) / float(m_rfBits), signalText);
11881203
else
1189-
::sprintf(text, "BER:%.1f%% -%udBm ", float(m_rfErrs * 100U) / float(m_rfBits), m_aveRSSI / m_rssiCount);
1190-
}
1191-
else {
1204+
::sprintf(text, "BER:%.1f%% %s ", float(m_rfErrs * 100U) / float(m_rfBits), signalText);
1205+
} else {
11921206
if (status == LS_LINKED_DEXTRA || status == LS_LINKED_DPLUS || status == LS_LINKED_DCS || status == LS_LINKED_CCS || status == LS_LINKED_LOOPBACK)
11931207
::sprintf(text, "%-8.8s BER: %.1f%% ", reflector, float(m_rfErrs * 100U) / float(m_rfBits));
11941208
else
11951209
::sprintf(text, "BER: %.1f%% ", float(m_rfErrs * 100U) / float(m_rfBits));
11961210
}
1211+
11971212
m_slowData.setText(text);
11981213

11991214
::memcpy(data, DSTAR_NULL_FRAME_DATA_BYTES, DSTAR_FRAME_LENGTH_BYTES + 1U);
@@ -1232,18 +1247,33 @@ void CDStarControl::sendError()
12321247
m_network->getStatus(status, reflector);
12331248

12341249
char text[40U];
1235-
if (m_ackMessage && m_rssi != 0) {
1250+
if (m_ackMessage == DSTAR_ACK_RSSI && m_rssi != 0) {
1251+
if (status == LS_LINKED_DEXTRA || status == LS_LINKED_DPLUS || status == LS_LINKED_DCS || status == LS_LINKED_CCS || status == LS_LINKED_LOOPBACK) {
1252+
CUtils::removeChar(reflector, ' ');//remove space from reflector so all nicely fits onto 20 chars in case rssi < 99dBm
1253+
::sprintf(text, "%-8.8s %.1f%% -%udBm ", reflector, float(m_rfErrs * 100U) / float(m_rfBits), m_aveRSSI / m_rssiCount);
1254+
} else {
1255+
::sprintf(text, "BER:%.1f%% -%udBm ", float(m_rfErrs * 100U) / float(m_rfBits), m_aveRSSI / m_rssiCount);
1256+
}
1257+
} else if (m_ackMessage == DSTAR_ACK_SMETER && m_rssi != 0) {
1258+
unsigned int signal, plus;
1259+
char signalText[10U];
1260+
CSMeter::getSignal(m_aveRSSI / m_rssiCount, signal, plus);
1261+
if (plus != 0U)
1262+
::sprintf(signalText, "S%u+%02u", signal, plus);
1263+
else
1264+
::sprintf(signalText, "S%u", signal);
1265+
12361266
if (status == LS_LINKED_DEXTRA || status == LS_LINKED_DPLUS || status == LS_LINKED_DCS || status == LS_LINKED_CCS || status == LS_LINKED_LOOPBACK)
1237-
::sprintf(text, "%-8.8s -%udBm ", reflector, m_aveRSSI / m_rssiCount);
1267+
::sprintf(text, "%-8.8s %.1f%% %s ", reflector, float(m_rfErrs * 100U) / float(m_rfBits), signalText);
12381268
else
1239-
::sprintf(text, "BER:%.1f%% -%udBm ", float(m_rfErrs * 100U) / float(m_rfBits), m_aveRSSI / m_rssiCount);
1240-
}
1241-
else {
1269+
::sprintf(text, "BER:%.1f%% %s ", float(m_rfErrs * 100U) / float(m_rfBits), signalText);
1270+
} else {
12421271
if (status == LS_LINKED_DEXTRA || status == LS_LINKED_DPLUS || status == LS_LINKED_DCS || status == LS_LINKED_CCS || status == LS_LINKED_LOOPBACK)
12431272
::sprintf(text, "%-8.8s BER: %.1f%% ", reflector, float(m_rfErrs * 100U) / float(m_rfBits));
12441273
else
12451274
::sprintf(text, "BER: %.1f%% ", float(m_rfErrs * 100U) / float(m_rfBits));
12461275
}
1276+
12471277
m_slowData.setText(text);
12481278

12491279
::memcpy(data, DSTAR_NULL_FRAME_DATA_BYTES, DSTAR_FRAME_LENGTH_BYTES + 1U);

‎DStarControl.h

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737

3838
class CDStarControl {
3939
public:
40-
CDStarControl(const std::string& callsign, const std::string& module, bool selfOnly, bool ackReply, unsigned int ackTime, bool ackMessage, bool errorReply, const std::vector<std::string>& blackList, const std::vector<std::string>& whiteList, CDStarNetwork* network, CDisplay* display, unsigned int timeout, bool duplex, bool remoteGateway, CRSSIInterpolator* rssiMapper);
40+
CDStarControl(const std::string& callsign, const std::string& module, bool selfOnly, bool ackReply, unsigned int ackTime, DSTAR_ACK_MESSAGE ackMessage, bool errorReply, const std::vector<std::string>& blackList, const std::vector<std::string>& whiteList, CDStarNetwork* network, CDisplay* display, unsigned int timeout, bool duplex, bool remoteGateway, CRSSIInterpolator* rssiMapper);
4141
~CDStarControl();
4242

4343
bool writeModem(unsigned char* data, unsigned int len);
@@ -55,7 +55,7 @@ class CDStarControl {
5555
unsigned char* m_gateway;
5656
bool m_selfOnly;
5757
bool m_ackReply;
58-
bool m_ackMessage;
58+
DSTAR_ACK_MESSAGE m_ackMessage;
5959
bool m_errorReply;
6060
bool m_remoteGateway;
6161
std::vector<std::string> m_blackList;
@@ -107,7 +107,6 @@ class CDStarControl {
107107
unsigned int m_rfSkipDTMFBlankingFrames;
108108
unsigned int m_netSkipDTMFBlankingFrames;
109109

110-
111110
unsigned int maybeFixupVoiceFrame(
112111
unsigned char* data,
113112
unsigned int len,
@@ -116,9 +115,9 @@ class CDStarControl {
116115
unsigned char n,
117116
bool blank_dtmf,
118117
unsigned char* voice_sync_data,
119-
unsigned int* voice_sync_data_len,
120-
bool* next_frame_is_fast_data,
121-
unsigned int* skip_dtmf_blanking_frames
118+
unsigned int& voice_sync_data_len,
119+
bool& next_frame_is_fast_data,
120+
unsigned int& skip_dtmf_blanking_frames
122121
);
123122

124123
void writeNetwork();

‎Defines.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,4 +87,10 @@ enum DMR_OVCM_TYPES {
8787
DMR_OVCM_FORCE_OFF
8888
};
8989

90+
enum DSTAR_ACK_MESSAGE {
91+
DSTAR_ACK_BER,
92+
DSTAR_ACK_RSSI,
93+
DSTAR_ACK_SMETER
94+
};
95+
9096
#endif

‎MMDVMHost.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,7 @@ int CMMDVMHost::run()
488488
std::vector<std::string> whiteList = m_conf.getDStarWhiteList();
489489
bool ackReply = m_conf.getDStarAckReply();
490490
unsigned int ackTime = m_conf.getDStarAckTime();
491-
bool ackMessage = m_conf.getDStarAckMessage();
491+
DSTAR_ACK_MESSAGE ackMessage = m_conf.getDStarAckMessage();
492492
bool errorReply = m_conf.getDStarErrorReply();
493493
bool remoteGateway = m_conf.getDStarRemoteGateway();
494494
m_dstarRFModeHang = m_conf.getDStarModeHang();
@@ -497,7 +497,7 @@ int CMMDVMHost::run()
497497
LogInfo(" Module: %s", module.c_str());
498498
LogInfo(" Self Only: %s", selfOnly ? "yes" : "no");
499499
LogInfo(" Ack Reply: %s", ackReply ? "yes" : "no");
500-
LogInfo(" Ack message: %s", ackMessage ? "RSSI" : "BER");
500+
LogInfo(" Ack message: %s", ackMessage == DSTAR_ACK_RSSI? "RSSI" : (ackMessage == DSTAR_ACK_SMETER ? "SMETER" : "BER"));
501501
LogInfo(" Ack Time: %ums", ackTime);
502502
LogInfo(" Error Reply: %s", errorReply ? "yes" : "no");
503503
LogInfo(" Remote Gateway: %s", remoteGateway ? "yes" : "no");

‎MMDVMHost.vcxproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,7 @@
247247
<ClInclude Include="Modem.h" />
248248
<ClInclude Include="SerialPort.h" />
249249
<ClInclude Include="SHA256.h" />
250+
<ClInclude Include="SMeter.h" />
250251
<ClInclude Include="StopWatch.h" />
251252
<ClInclude Include="Sync.h" />
252253
<ClInclude Include="TFTSurenoo.h" />
@@ -352,6 +353,7 @@
352353
<ClCompile Include="Modem.cpp" />
353354
<ClCompile Include="SerialPort.cpp" />
354355
<ClCompile Include="SHA256.cpp" />
356+
<ClCompile Include="SMeter.cpp" />
355357
<ClCompile Include="StopWatch.cpp" />
356358
<ClCompile Include="Sync.cpp" />
357359
<ClCompile Include="TFTSurenoo.cpp" />

‎MMDVMHost.vcxproj.filters

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -347,6 +347,9 @@
347347
<ClInclude Include="ModemPort.h">
348348
<Filter>Header Files</Filter>
349349
</ClInclude>
350+
<ClInclude Include="SMeter.h">
351+
<Filter>Header Files</Filter>
352+
</ClInclude>
350353
</ItemGroup>
351354
<ItemGroup>
352355
<ClCompile Include="BPTC19696.cpp">
@@ -652,5 +655,8 @@
652655
<ClCompile Include="ModemPort.cpp">
653656
<Filter>Source Files</Filter>
654657
</ClCompile>
658+
<ClCompile Include="SMeter.cpp">
659+
<Filter>Source Files</Filter>
660+
</ClCompile>
655661
</ItemGroup>
656662
</Project>

‎Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ OBJECTS = \
1414
Modem.o ModemPort.o ModemSerialPort.o Mutex.o NetworkInfo.o Nextion.o NullController.o NullDisplay.o NXDNAudio.o NXDNControl.o \
1515
NXDNConvolution.o NXDNCRC.o NXDNFACCH1.o NXDNIcomNetwork.o NXDNKenwoodNetwork.o NXDNLayer3.o NXDNLICH.o NXDNLookup.o NXDNNetwork.o NXDNSACCH.o \
1616
NXDNUDCH.o P25Audio.o P25Control.o P25Data.o P25LowSpeedData.o P25Network.o P25NID.o P25Trellis.o P25Utils.o PseudoTTYController.o POCSAGControl.o \
17-
POCSAGNetwork.o QR1676.o RemoteControl.o RS129.o RS241213.o RSSIInterpolator.o SerialPort.o StopWatch.o Sync.o SHA256.o TFTSurenoo.o Thread.o Timer.o \
18-
UARTController.o UDPController.o UDPSocket.o UserDB.o UserDBentry.o Utils.o YSFControl.o YSFConvolution.o YSFFICH.o YSFNetwork.o YSFPayload.o
17+
POCSAGNetwork.o QR1676.o RemoteControl.o RS129.o RS241213.o RSSIInterpolator.o SerialPort.o SMeter.o StopWatch.o Sync.o SHA256.o TFTSurenoo.o Thread.o \
18+
Timer.o UARTController.o UDPController.o UDPSocket.o UserDB.o UserDBentry.o Utils.o YSFControl.o YSFConvolution.o YSFFICH.o YSFNetwork.o YSFPayload.o
1919

2020
all: MMDVMHost RemoteCommand
2121

‎Makefile.Pi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ OBJECTS = \
1414
Modem.o ModemPort.o ModemSerialPort.o Mutex.o NetworkInfo.o Nextion.o NullController.o NullDisplay.o NXDNAudio.o NXDNControl.o \
1515
NXDNConvolution.o NXDNCRC.o NXDNFACCH1.o NXDNIcomNetwork.o NXDNKenwoodNetwork.o NXDNLayer3.o NXDNLICH.o NXDNLookup.o NXDNNetwork.o NXDNSACCH.o \
1616
NXDNUDCH.o P25Audio.o P25Control.o P25Data.o P25LowSpeedData.o P25Network.o P25NID.o P25Trellis.o P25Utils.o PseudoTTYController.o POCSAGControl.o \
17-
POCSAGNetwork.o QR1676.o RemoteControl.o RS129.o RS241213.o RSSIInterpolator.o SerialPort.o StopWatch.o Sync.o SHA256.o TFTSurenoo.o Thread.o Timer.o \
18-
UARTController.o UDPController.o UDPSocket.o UserDB.o UserDBentry.o Utils.o YSFControl.o YSFConvolution.o YSFFICH.o YSFNetwork.o YSFPayload.o
17+
POCSAGNetwork.o QR1676.o RemoteControl.o RS129.o RS241213.o RSSIInterpolator.o SerialPort.o SMeter.o StopWatch.o Sync.o SHA256.o TFTSurenoo.o Thread.o \
18+
Timer.o UARTController.o UDPController.o UDPSocket.o UserDB.o UserDBentry.o Utils.o YSFControl.o YSFConvolution.o YSFFICH.o YSFNetwork.o YSFPayload.o
1919

2020
all: MMDVMHost RemoteCommand
2121

0 commit comments

Comments
 (0)