MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2025-12-21 23:45:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "YSF updated from msraya."

Browse Source 
This reverts commit 7a1b71ecf5.
This commit is contained in:
Jonathan Naylor
2020-08-04 10:34:18 +01:00
parent 34c759df5f
commit c57a313677
2 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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 = "20200713"; const char* VERSION = "20200804";
#endif #endif

33
YSFControl.cpp
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2015-2019 Jonathan Naylor, G4KLX * Copyright (C) 2015-2020 Jonathan Naylor, G4KLX
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@@ -243,6 +243,8 @@ bool CYSFControl::processVWData(bool valid, unsigned char *data)
CYSFFICH fich = m_lastFICH; CYSFFICH fich = m_lastFICH;
// Remove any DG-ID information
fich.setDGId(0U);
fich.encode(data + 2U); fich.encode(data + 2U);
data[0U] = TAG_DATA; data[0U] = TAG_DATA;
@@ -253,7 +255,6 @@ bool CYSFControl::processVWData(bool valid, unsigned char *data)
#if defined(DUMP_YSF) #if defined(DUMP_YSF)
writeFile(data + 2U); writeFile(data + 2U);
#endif #endif
if (m_duplex) { if (m_duplex) {
fich.setMR(m_remoteGateway ? YSF_MR_NOT_BUSY : YSF_MR_BUSY); fich.setMR(m_remoteGateway ? YSF_MR_NOT_BUSY : YSF_MR_BUSY);
fich.setDev(m_lowDeviation); fich.setDev(m_lowDeviation);
@@ -280,6 +281,8 @@ bool CYSFControl::processVWData(bool valid, unsigned char *data)
CYSFFICH fich = m_lastFICH; CYSFFICH fich = m_lastFICH;
// Remove any DG-ID information
fich.setDGId(0U);
fich.encode(data + 2U); fich.encode(data + 2U);
data[0U] = TAG_EOT; data[0U] = TAG_EOT;
@@ -290,7 +293,6 @@ bool CYSFControl::processVWData(bool valid, unsigned char *data)
#if defined(DUMP_YSF) #if defined(DUMP_YSF)
writeFile(data + 2U); writeFile(data + 2U);
#endif #endif
if (m_duplex) { if (m_duplex) {
fich.setMR(m_remoteGateway ? YSF_MR_NOT_BUSY : YSF_MR_BUSY); fich.setMR(m_remoteGateway ? YSF_MR_NOT_BUSY : YSF_MR_BUSY);
fich.setDev(m_lowDeviation); fich.setDev(m_lowDeviation);
@@ -332,6 +334,8 @@ bool CYSFControl::processVWData(bool valid, unsigned char *data)
LogDebug("YSF, V Mode 3, seq %u, AMBE FEC %u/720 (%.1f%%)", m_rfFrames % 128, errors, float(errors) / 7.2F); LogDebug("YSF, V Mode 3, seq %u, AMBE FEC %u/720 (%.1f%%)", m_rfFrames % 128, errors, float(errors) / 7.2F);
} }
// Remove any DG-ID information
fich.setDGId(0U);
fich.encode(data + 2U); fich.encode(data + 2U);
data[0U] = TAG_DATA; data[0U] = TAG_DATA;
@@ -349,7 +353,6 @@ bool CYSFControl::processVWData(bool valid, unsigned char *data)
#if defined(DUMP_YSF) #if defined(DUMP_YSF)
writeFile(data + 2U); writeFile(data + 2U);
#endif #endif
m_rfFrames++; m_rfFrames++;
m_display->writeFusionRSSI(m_rssi); m_display->writeFusionRSSI(m_rssi);
@@ -408,6 +411,8 @@ bool CYSFControl::processDNData(bool valid, unsigned char *data)
CYSFFICH fich = m_lastFICH; CYSFFICH fich = m_lastFICH;
// Remove any DG-ID information
fich.setDGId(0U);
fich.encode(data + 2U); fich.encode(data + 2U);
data[0U] = TAG_DATA; data[0U] = TAG_DATA;
@@ -418,7 +423,6 @@ bool CYSFControl::processDNData(bool valid, unsigned char *data)
#if defined(DUMP_YSF) #if defined(DUMP_YSF)
writeFile(data + 2U); writeFile(data + 2U);
#endif #endif
if (m_duplex) { if (m_duplex) {
fich.setMR(m_remoteGateway ? YSF_MR_NOT_BUSY : YSF_MR_BUSY); fich.setMR(m_remoteGateway ? YSF_MR_NOT_BUSY : YSF_MR_BUSY);
fich.setDev(m_lowDeviation); fich.setDev(m_lowDeviation);
@@ -445,6 +449,8 @@ bool CYSFControl::processDNData(bool valid, unsigned char *data)
CYSFFICH fich = m_lastFICH; CYSFFICH fich = m_lastFICH;
// Remove any DG-ID information
fich.setDGId(0U);
fich.encode(data + 2U); fich.encode(data + 2U);
data[0U] = TAG_EOT; data[0U] = TAG_EOT;
@@ -455,7 +461,6 @@ bool CYSFControl::processDNData(bool valid, unsigned char *data)
#if defined(DUMP_YSF) #if defined(DUMP_YSF)
writeFile(data + 2U); writeFile(data + 2U);
#endif #endif
if (m_duplex) { if (m_duplex) {
fich.setMR(m_remoteGateway ? YSF_MR_NOT_BUSY : YSF_MR_BUSY); fich.setMR(m_remoteGateway ? YSF_MR_NOT_BUSY : YSF_MR_BUSY);
fich.setDev(m_lowDeviation); fich.setDev(m_lowDeviation);
@@ -517,6 +522,8 @@ bool CYSFControl::processDNData(bool valid, unsigned char *data)
CYSFFICH fich = m_lastFICH; CYSFFICH fich = m_lastFICH;
// Remove any DG-ID information
fich.setDGId(0U);
fich.encode(data + 2U); fich.encode(data + 2U);
data[0U] = TAG_DATA; data[0U] = TAG_DATA;
@@ -534,7 +541,6 @@ bool CYSFControl::processDNData(bool valid, unsigned char *data)
#if defined(DUMP_YSF) #if defined(DUMP_YSF)
writeFile(data + 2U); writeFile(data + 2U);
#endif #endif
m_rfFrames++; m_rfFrames++;
m_display->writeFusionRSSI(m_rssi); m_display->writeFusionRSSI(m_rssi);
@@ -603,6 +609,7 @@ bool CYSFControl::processDNData(bool valid, unsigned char *data)
CYSFFICH fich = m_lastFICH; CYSFFICH fich = m_lastFICH;
fich.setFI(YSF_FI_HEADER); fich.setFI(YSF_FI_HEADER);
fich.setDGId(0U);
fich.encode(buffer + 2U); fich.encode(buffer + 2U);
unsigned char csd1[20U], csd2[20U]; unsigned char csd1[20U], csd2[20U];
@@ -632,7 +639,6 @@ bool CYSFControl::processDNData(bool valid, unsigned char *data)
#if defined(DUMP_YSF) #if defined(DUMP_YSF)
writeFile(buffer + 2U); writeFile(buffer + 2U);
#endif #endif
m_display->writeFusion((char*)m_rfSource, (char*)m_rfDest, "R", " "); m_display->writeFusion((char*)m_rfSource, (char*)m_rfDest, "R", " ");
LogMessage("YSF, received RF late entry from %10.10s to %10.10s", m_rfSource, m_rfDest); LogMessage("YSF, received RF late entry from %10.10s to %10.10s", m_rfSource, m_rfDest);
@@ -640,6 +646,8 @@ bool CYSFControl::processDNData(bool valid, unsigned char *data)
fich = m_lastFICH; fich = m_lastFICH;
// Remove any DG-ID information
fich.setDGId(0U);
fich.encode(data + 2U); fich.encode(data + 2U);
data[0U] = TAG_DATA; data[0U] = TAG_DATA;
@@ -657,7 +665,6 @@ bool CYSFControl::processDNData(bool valid, unsigned char *data)
#if defined(DUMP_YSF) #if defined(DUMP_YSF)
writeFile(data + 2U); writeFile(data + 2U);
#endif #endif
m_rfFrames++; m_rfFrames++;
m_display->writeFusionRSSI(m_rssi); m_display->writeFusionRSSI(m_rssi);
@@ -713,6 +720,8 @@ bool CYSFControl::processFRData(bool valid, unsigned char *data)
CYSFFICH fich = m_lastFICH; CYSFFICH fich = m_lastFICH;
// Remove any DG-ID information
fich.setDGId(0U);
fich.encode(data + 2U); fich.encode(data + 2U);
data[0U] = TAG_DATA; data[0U] = TAG_DATA;
@@ -723,7 +732,6 @@ bool CYSFControl::processFRData(bool valid, unsigned char *data)
#if defined(DUMP_YSF) #if defined(DUMP_YSF)
writeFile(data + 2U); writeFile(data + 2U);
#endif #endif
if (m_duplex) { if (m_duplex) {
fich.setMR(m_remoteGateway ? YSF_MR_NOT_BUSY : YSF_MR_BUSY); fich.setMR(m_remoteGateway ? YSF_MR_NOT_BUSY : YSF_MR_BUSY);
fich.setDev(m_lowDeviation); fich.setDev(m_lowDeviation);
@@ -750,6 +758,8 @@ bool CYSFControl::processFRData(bool valid, unsigned char *data)
CYSFFICH fich = m_lastFICH; CYSFFICH fich = m_lastFICH;
// Remove any DG-ID information
fich.setDGId(0U);
fich.encode(data + 2U); fich.encode(data + 2U);
data[0U] = TAG_EOT; data[0U] = TAG_EOT;
@@ -760,7 +770,6 @@ bool CYSFControl::processFRData(bool valid, unsigned char *data)
#if defined(DUMP_YSF) #if defined(DUMP_YSF)
writeFile(data + 2U); writeFile(data + 2U);
#endif #endif
if (m_duplex) { if (m_duplex) {
fich.setMR(m_remoteGateway ? YSF_MR_NOT_BUSY : YSF_MR_BUSY); fich.setMR(m_remoteGateway ? YSF_MR_NOT_BUSY : YSF_MR_BUSY);
fich.setDev(m_lowDeviation); fich.setDev(m_lowDeviation);
@@ -798,6 +807,8 @@ bool CYSFControl::processFRData(bool valid, unsigned char *data)
CYSFFICH fich = m_lastFICH; CYSFFICH fich = m_lastFICH;
// Remove any DG-ID information
fich.setDGId(0U);
fich.encode(data + 2U); fich.encode(data + 2U);
data[0U] = TAG_DATA; data[0U] = TAG_DATA;