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

Add the optional System Fusion Parrot.

This commit is contained in:
Jonathan Naylor 2016-02-22 21:13:48 +00:00
parent 7852bd53b5
commit e2c7a28fb9
11 changed files with 206 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Conf.cpp
View File

@ -75,6 +75,7 @@ m_dmrBeacons(false),
m_dmrId(0U),
m_dmrColorCode(2U),
m_fusionEnabled(true),
m_fusionParrotEnabled(false),
m_dstarNetworkEnabled(true),
m_dstarGatewayAddress(),
m_dstarGatewayPort(0U),
@ -222,6 +223,8 @@ bool CConf::read()
} else if (section == SECTION_FUSION) {
if (::strcmp(key, "Enable") == 0)
m_fusionEnabled = ::atoi(value) == 1;
else if (::strcmp(key, "Parrot") == 0)
m_fusionParrotEnabled = ::atoi(value) == 1;
} else if (section == SECTION_DSTAR_NETWORK) {
if (::strcmp(key, "Enable") == 0)
m_dstarNetworkEnabled = ::atoi(value) == 1;
@ -435,6 +438,11 @@ bool CConf::getFusionEnabled() const
return m_fusionEnabled;
}
bool CConf::getFusionParrotEnabled() const
{
return m_fusionParrotEnabled;
}
bool CConf::getDStarNetworkEnabled() const
{
return m_dstarNetworkEnabled;

2
Conf.h
View File

@ -75,6 +75,7 @@ public:
// The System Fusion section
bool getFusionEnabled() const;
bool getFusionParrotEnabled() const;
// The D-Star Network section
bool getDStarNetworkEnabled() const;
@ -143,6 +144,7 @@ private:
unsigned int m_dmrColorCode;
bool m_fusionEnabled;
bool m_fusionParrotEnabled;
bool m_dstarNetworkEnabled;
std::string m_dstarGatewayAddress;

1
MMDVM.ini
View File

@ -46,6 +46,7 @@ ColorCode=1
[System Fusion]
Enable=1
Parrot=1
[D-Star Network]
Enable=1

4
MMDVMHost.cpp
View File

@ -171,12 +171,14 @@ int CMMDVMHost::run()
std::string callsign = m_conf.getCallsign();
unsigned int timeout = m_conf.getTimeout();
bool duplex = m_conf.getDuplex();
bool parrot = m_conf.getFusionParrotEnabled();
LogInfo("System Fusion Parameters");
LogInfo(" Callsign: %s", callsign.c_str());
LogInfo(" Timeout: %us", timeout);
LogInfo(" Parrot: %s", parrot ? "enabled" : "disabled");
ysf = new CYSFControl(callsign, m_display, timeout, duplex);
ysf = new CYSFControl(callsign, m_display, timeout, duplex, parrot);
}
m_modeTimer.setTimeout(m_conf.getModeHang());

2
MMDVMHost.vcxproj
View File

@ -193,6 +193,7 @@
<ClInclude Include="YSFConvolution.h" />
<ClInclude Include="YSFDefines.h" />
<ClInclude Include="YSFFICH.h" />
<ClInclude Include="YSFParrot.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="AMBEFEC.cpp" />
@ -236,6 +237,7 @@
<ClCompile Include="YSFControl.cpp" />
<ClCompile Include="YSFConvolution.cpp" />
<ClCompile Include="YSFFICH.cpp" />
<ClCompile Include="YSFParrot.cpp" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">

6
MMDVMHost.vcxproj.filters
View File

@ -152,6 +152,9 @@
<ClInclude Include="YSFControl.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="YSFParrot.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="BPTC19696.cpp">
@ -277,5 +280,8 @@
<ClCompile Include="YSFControl.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="YSFParrot.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
</Project>

2
Makefile
View File

@ -7,7 +7,7 @@ LDFLAGS = -g
OBJECTS = \
AMBEFEC.o BPTC19696.o Conf.o CRC.o Display.o DMRControl.o DMRCSBK.o DMRData.o DMRDataHeader.o DMREMB.o DMREmbeddedLC.o DMRFullLC.o DMRIPSC.o DMRLC.o DMRShortLC.o \
DMRSlot.o DMRSlotType.o DStarControl.o DStarHeader.o DStarNetwork.o DStarSlowData.o Golay2087.o Golay24128.o Hamming.o Log.o MMDVMHost.o Modem.o NullDisplay.o \
QR1676.o RS129.o SerialController.o SHA256.o StopWatch.o Sync.o TFTSerial.o Timer.o UDPSocket.o Utils.o YSFControl.o YSFConvolution.o YSFFICH.o
QR1676.o RS129.o SerialController.o SHA256.o StopWatch.o Sync.o TFTSerial.o Timer.o UDPSocket.o Utils.o YSFControl.o YSFConvolution.o YSFFICH.o YSFParrot.o
all: MMDVMHost

43
YSFControl.cpp
View File

@ -29,20 +29,25 @@
* Uplink and downlink callsign addition.
*/
CYSFControl::CYSFControl(const std::string& callsign, IDisplay* display, unsigned int timeout, bool duplex) :
CYSFControl::CYSFControl(const std::string& callsign, IDisplay* display, unsigned int timeout, bool duplex, bool parrot) :
m_display(display),
m_duplex(duplex),
m_queue(1000U, "YSF Control"),
m_state(RS_LISTENING),
m_timeoutTimer(1000U, timeout),
m_frames(0U),
m_parrot(NULL),
m_fp(NULL)
{
assert(display != NULL);
if (parrot)
m_parrot = new CYSFParrot(timeout);
}
CYSFControl::~CYSFControl()
{
delete m_parrot;
}
bool CYSFControl::writeModem(unsigned char *data)
@ -87,12 +92,17 @@ bool CYSFControl::writeModem(unsigned char *data)
writeQueue(data);
}
if (m_parrot != NULL) {
data[0U] = TAG_EOT;
data[1U] = 0x00U;
writeParrot(data);
}
#if defined(DUMP_YSF)
writeFile(data + 2U);
#endif
LogMessage("YSF, received RF end of transmission, %.1f seconds", float(m_frames) / 10.0F);
writeEndOfTransmission();
return false;
@ -107,6 +117,12 @@ bool CYSFControl::writeModem(unsigned char *data)
writeQueue(data);
}
if (m_parrot != NULL) {
data[0U] = TAG_DATA;
data[1U] = 0x00U;
writeParrot(data);
}
#if defined(DUMP_YSF)
writeFile(data + 2U);
#endif
@ -144,6 +160,19 @@ void CYSFControl::writeEndOfTransmission()
void CYSFControl::clock(unsigned int ms)
{
m_timeoutTimer.clock(ms);
if (m_parrot != NULL) {
m_parrot->clock(ms);
unsigned int space = m_queue.freeSpace();
bool hasData = m_parrot->hasData();
if (space > (YSF_FRAME_LENGTH_BYTES + 2U) && hasData) {
unsigned char data[YSF_FRAME_LENGTH_BYTES + 2U];
m_parrot->read(data);
writeQueue(data);
}
}
}
void CYSFControl::writeQueue(const unsigned char *data)
@ -159,6 +188,16 @@ void CYSFControl::writeQueue(const unsigned char *data)
m_queue.addData(data, len);
}
void CYSFControl::writeParrot(const unsigned char *data)
{
assert(data != NULL);
if (m_timeoutTimer.isRunning() && m_timeoutTimer.hasExpired())
return;
m_parrot->write(data);
}
bool CYSFControl::openFile()
{
if (m_fp != NULL)

5
YSFControl.h
View File

@ -21,6 +21,7 @@
#include "YSFDefines.h"
#include "RingBuffer.h"
#include "YSFParrot.h"
#include "Display.h"
#include "Defines.h"
#include "Timer.h"
@ -30,7 +31,7 @@
class CYSFControl {
public:
CYSFControl(const std::string& callsign, IDisplay* display, unsigned int timeout, bool duplex);
CYSFControl(const std::string& callsign, IDisplay* display, unsigned int timeout, bool duplex, bool parrot);
~CYSFControl();
bool writeModem(unsigned char* data);
@ -46,9 +47,11 @@ private:
RPT_STATE m_state;
CTimer m_timeoutTimer;
unsigned int m_frames;
CYSFParrot* m_parrot;
FILE* m_fp;
void writeQueue(const unsigned char* data);
void writeParrot(const unsigned char* data);
void writeEndOfTransmission();

92
YSFParrot.cpp Normal file
View File

@ -0,0 +1,92 @@
/*
* Copyright (C) 2016 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
* 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 "YSFParrot.h"
#include "YSFDefines.h"
#include "Defines.h"
#include <cstdio>
#include <cassert>
#include <cstring>
CYSFParrot::CYSFParrot(unsigned int timeout) :
m_data(NULL),
m_length(timeout * 1220U + 1000U),
m_used(0U),
m_ptr(0U),
m_timer(1000U, 2U)
{
assert(timeout > 0U);
m_data = new unsigned char[m_length];
}
CYSFParrot::~CYSFParrot()
{
delete[] m_data;
}
bool CYSFParrot::write(const unsigned char* data)
{
assert(data != NULL);
if ((m_length - m_used) < 1000U)
return false;
::memcpy(m_data + m_used, data, YSF_FRAME_LENGTH_BYTES + 2U);
m_used += YSF_FRAME_LENGTH_BYTES + 2U;
if (data[0U] == TAG_EOT) {
m_timer.start();
m_ptr = 0U;
}
return true;
}
void CYSFParrot::read(unsigned char* data)
{
assert(data != NULL);
if (m_used == 0U)
return;
::memcpy(data, m_data + m_ptr, YSF_FRAME_LENGTH_BYTES + 2U);
m_ptr += YSF_FRAME_LENGTH_BYTES + 2U;
if (m_ptr >= m_used) {
m_timer.stop();
m_used = 0U;
}
}
bool CYSFParrot::hasData()
{
if (m_timer.isRunning() && m_timer.hasExpired())
return true;
if (m_used == 0U)
return false;
return false;
}
void CYSFParrot::clock(unsigned int ms)
{
m_timer.clock(ms);
}

46
YSFParrot.h Normal file
View File

@ -0,0 +1,46 @@
/*
* Copyright (C) 2016 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
* 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.
*/
#if !defined(YAFParrot_H)
#define YSFParrot_H
#include "Timer.h"
class CYSFParrot
{
public:
CYSFParrot(unsigned int timeout);
~CYSFParrot();
bool write(const unsigned char* data);
void read(unsigned char* data);
bool hasData();
void clock(unsigned int ms);
private:
unsigned char* m_data;
unsigned int m_length;
unsigned int m_used;
unsigned int m_ptr;
CTimer m_timer;
};
#endif