Merge branch 'master' of github.com:g4klx/YSFClients
This commit is contained in:
commit
2a7d4c8f06
4 changed files with 17 additions and 13 deletions
14
README.md
14
README.md
|
@ -1,9 +1,15 @@
|
|||
These programs represent simple clients for the System Fusion networking now built into the MMDVM Host. The parrot can be used as a functional replacement for the built-in parrot that was removed when the networking was added.
|
||||
These programs are clients for the System Fusion networking now built into the MMDVM Host.
|
||||
|
||||
The reflector is a simple minded reflector that retransmits any received System Fusion data to other MMDVM Hosts logged into the reflector at the time.
|
||||
The Parrot can be used as a functional replacement for the built-in parrot that was removed from the MMDVM Host when the networking was added. The Parrot is very simple minded and can only handle one client at a time and is therefore not suitable for use as a shared resource via the Internet.
|
||||
|
||||
Both programs take the UDP port number to listen on as an argument. The MMDVM .ini file should have the IP address and port number of the client in the [System Fusion Network] settings.
|
||||
The Gateway allows for use of Yaesu Wires-X commands from the radio to control the listing and access to the various reflectors (rooms in Wires-X parlance). It optionally sends System Fusion GPS information to aprs.fi.
|
||||
|
||||
It builds on 32-bit and 64-bit Linux as well as on Windows using VS2015 on x86 and x64. It can optionally control various Displays. Currently these are:
|
||||
The Reflector retransmits any received System Fusion data to other MMDVM Hosts or Gateways logged into the reflector at the time. It also provides status information to potential clients.
|
||||
|
||||
The Gateway and Reflector have ini files that contain the parameters for running the software. The filename of the ini file is passed as a parameter on the command line. The Parrot takes the UDP port number to listen on as an argument.
|
||||
|
||||
The MMDVM .ini file should have the IP address and port number of the client in the [System Fusion Network] settings.
|
||||
|
||||
They build on 32-bit and 64-bit Linux as well as on Windows using VS2015 on x86 and x64.
|
||||
|
||||
This software is licenced under the GPL v2 and is intended for amateur and educational use only. Use of this software for commercial purposes is strictly forbidden.
|
||||
|
|
|
@ -162,7 +162,7 @@ int CYSFGateway::run()
|
|||
|
||||
m_callsign = m_conf.getCallsign();
|
||||
|
||||
bool debug = m_conf.getNetworkDebug();
|
||||
bool debug = m_conf.getNetworkDebug();
|
||||
in_addr rptAddress = CUDPSocket::lookup(m_conf.getRptAddress());
|
||||
unsigned int rptPort = m_conf.getRptPort();
|
||||
std::string myAddress = m_conf.getMyAddress();
|
||||
|
@ -189,11 +189,11 @@ int CYSFGateway::run()
|
|||
bool networkEnabled = m_conf.getNetworkEnabled();
|
||||
if (networkEnabled) {
|
||||
std::string fileName = m_conf.getNetworkHosts();
|
||||
unsigned int port = m_conf.getNetworkStatusPort();
|
||||
unsigned int port = m_conf.getNetworkStatusPort();
|
||||
|
||||
m_wiresX = new CWiresX(m_callsign, &rptNetwork, fileName, port);
|
||||
|
||||
std::string name = m_conf.getName();
|
||||
std::string name = m_conf.getName();
|
||||
unsigned int txFrequency = m_conf.getTxFrequency();
|
||||
unsigned int rxFrequency = m_conf.getRxFrequency();
|
||||
|
||||
|
@ -214,8 +214,7 @@ int CYSFGateway::run()
|
|||
for (;;) {
|
||||
unsigned char buffer[200U];
|
||||
|
||||
unsigned int len = rptNetwork.read(buffer);
|
||||
if (len > 0U) {
|
||||
while (rptNetwork.read(buffer) > 0U) {
|
||||
watchdogTimer.start();
|
||||
|
||||
CYSFFICH fich;
|
||||
|
@ -263,8 +262,7 @@ int CYSFGateway::run()
|
|||
}
|
||||
}
|
||||
|
||||
len = m_netNetwork->read(buffer);
|
||||
if (len > 0U) {
|
||||
while (m_netNetwork->read(buffer) > 0U) {
|
||||
if (networkEnabled && m_linked)
|
||||
rptNetwork.write(buffer);
|
||||
}
|
||||
|
|
|
@ -19,6 +19,6 @@
|
|||
#if !defined(VERSION_H)
|
||||
#define VERSION_H
|
||||
|
||||
const char* VERSION = "20160517";
|
||||
const char* VERSION = "20160609";
|
||||
|
||||
#endif
|
||||
|
|
|
@ -19,6 +19,6 @@
|
|||
#if !defined(VERSION_H)
|
||||
#define VERSION_H
|
||||
|
||||
const char* VERSION = "20160517";
|
||||
const char* VERSION = "20160609";
|
||||
|
||||
#endif
|
||||
|
|
Loading…
Reference in a new issue