g4klx/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost.git synced 2025-12-06 05:32:00 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove the location information from the new config message.

Browse source
This commit is contained in:
Jonathan Naylor 2020-08-27 10:13:02 +01:00
parent 01da0ded7f
commit 2349520964
10 changed files with 16 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Conf.cpp
View file

@ -71,7 +71,6 @@ m_daemon(false),
m_rxFrequency(0U), m_rxFrequency(0U),
m_txFrequency(0U), m_txFrequency(0U),
m_power(0U), m_power(0U),
m_location(),
m_logDisplayLevel(0U), m_logDisplayLevel(0U),
m_logFileLevel(0U), m_logFileLevel(0U),
m_logFilePath(), m_logFilePath(),
@ -421,8 +420,6 @@ bool CConf::read()
m_rxFrequency = (unsigned int)::atoi(value); m_rxFrequency = (unsigned int)::atoi(value);
else if (::strcmp(key, "Power") == 0) else if (::strcmp(key, "Power") == 0)
m_power = (unsigned int)::atoi(value); m_power = (unsigned int)::atoi(value);
else if (::strcmp(key, "Location") == 0)
m_location = value;
} else if (section == SECTION_LOG) { } else if (section == SECTION_LOG) {
if (::strcmp(key, "FilePath") == 0) if (::strcmp(key, "FilePath") == 0)
m_logFilePath = value; m_logFilePath = value;
@ -996,11 +993,6 @@ unsigned int CConf::getPower() const
return m_power; return m_power;
} }
std::string CConf::getLocation() const
{
return m_location;
}
unsigned int CConf::getLogDisplayLevel() const unsigned int CConf::getLogDisplayLevel() const
{ {
return m_logDisplayLevel; return m_logDisplayLevel;

2
Conf.h
View file

@ -42,7 +42,6 @@ public:
unsigned int getRXFrequency() const; unsigned int getRXFrequency() const;
unsigned int getTXFrequency() const; unsigned int getTXFrequency() const;
unsigned int getPower() const; unsigned int getPower() const;
std::string getLocation() const;
// The Log section // The Log section
unsigned int getLogDisplayLevel() const; unsigned int getLogDisplayLevel() const;
@ -316,7 +315,6 @@ private:
unsigned int m_rxFrequency; unsigned int m_rxFrequency;
unsigned int m_txFrequency; unsigned int m_txFrequency;
unsigned int m_power; unsigned int m_power;
std::string m_location;
unsigned int m_logDisplayLevel; unsigned int m_logDisplayLevel;
unsigned int m_logFileLevel; unsigned int m_logFileLevel;

16
DMRNetwork.cpp
View file

@ -55,7 +55,6 @@ m_rxFrequency(0U),
m_txFrequency(0U), m_txFrequency(0U),
m_power(0U), m_power(0U),
m_colorCode(0U), m_colorCode(0U),
m_location(),
m_pingTimer(1000U, 10U) m_pingTimer(1000U, 10U)
{ {
assert(!address.empty()); assert(!address.empty());
@ -89,14 +88,13 @@ CDMRNetwork::~CDMRNetwork()
delete[] m_id; delete[] m_id;
} }
void CDMRNetwork::setConfig(const std::string & callsign, unsigned int rxFrequency, unsigned int txFrequency, unsigned int power, unsigned int colorCode, const std::string& location) void CDMRNetwork::setConfig(const std::string & callsign, unsigned int rxFrequency, unsigned int txFrequency, unsigned int power, unsigned int colorCode)
{ {
m_callsign = callsign; m_callsign = callsign;
m_rxFrequency = rxFrequency; m_rxFrequency = rxFrequency;
m_txFrequency = txFrequency; m_txFrequency = txFrequency;
m_power = power; m_power = power;
m_colorCode = colorCode; m_colorCode = colorCode;
m_location = location;
} }
bool CDMRNetwork::open() bool CDMRNetwork::open()
@ -401,15 +399,15 @@ bool CDMRNetwork::writeConfig()
if (power > 99U) if (power > 99U)
power = 99U; power = 99U;
char buffer[200U]; char buffer[150U];
::memcpy(buffer + 0U, "DMRC", 4U); ::memcpy(buffer + 0U, "DMRC", 4U);
::memcpy(buffer + 4U, m_id, 4U); ::memcpy(buffer + 4U, m_id, 4U);
::sprintf(buffer + 8U, "%-8.8s%09u%09u%02u%02u%-20.20s%c%-40.40s%-40.40s", ::sprintf(buffer + 8U, "%-8.8s%09u%09u%02u%02u%c%-40.40s%-40.40s",
m_callsign.c_str(), m_rxFrequency, m_txFrequency, power, m_colorCode, m_location.c_str(), slots, m_version, m_callsign.c_str(), m_rxFrequency, m_txFrequency, power, m_colorCode, slots, m_version,
software); software);
return write((unsigned char*)buffer, 139U); return write((unsigned char*)buffer, 119U);
} }
bool CDMRNetwork::wantsBeacon() bool CDMRNetwork::wantsBeacon()
@ -426,8 +424,8 @@ bool CDMRNetwork::write(const unsigned char* data, unsigned int length)
assert(data != NULL); assert(data != NULL);
assert(length > 0U); assert(length > 0U);
// if (m_debug) if (m_debug)
// CUtils::dump(1U, "Network Transmitted", data, length); CUtils::dump(1U, "Network Transmitted", data, length);
bool ret = m_socket.write(data, length, m_address, m_port); bool ret = m_socket.write(data, length, m_address, m_port);
if (!ret) { if (!ret) {

3
DMRNetwork.h
View file

@ -35,7 +35,7 @@ public:
CDMRNetwork(const std::string& address, unsigned int port, unsigned int local, unsigned int id, bool duplex, const char* version, bool debug, bool slot1, bool slot2, HW_TYPE hwType); CDMRNetwork(const std::string& address, unsigned int port, unsigned int local, unsigned int id, bool duplex, const char* version, bool debug, bool slot1, bool slot2, HW_TYPE hwType);
~CDMRNetwork(); ~CDMRNetwork();
void setConfig(const std::string& callsign, unsigned int rxFrequency, unsigned int txFrequency, unsigned int power, unsigned int colorCode, const std::string& location); void setConfig(const std::string& callsign, unsigned int rxFrequency, unsigned int txFrequency, unsigned int power, unsigned int colorCode);
bool open(); bool open();
@ -78,7 +78,6 @@ private:
unsigned int m_txFrequency; unsigned int m_txFrequency;
unsigned int m_power; unsigned int m_power;
unsigned int m_colorCode; unsigned int m_colorCode;
std::string m_location;
CTimer m_pingTimer; CTimer m_pingTimer;
bool writeConfig(); bool writeConfig();

6
Display.cpp
View file

@ -556,10 +556,10 @@ CDisplay* CDisplay::createDisplay(const CConf& conf, CUMP* ump, CModem* modem)
if (port == "modem") { if (port == "modem") {
ISerialPort* serial = new CModemSerialPort(modem); ISerialPort* serial = new CModemSerialPort(modem);
display = new CNextion(conf.getCallsign(), dmrid, serial, brightness, displayClock, utc, idleBrightness, screenLayout, txFrequency, rxFrequency, displayTempInF, conf.getLocation()); display = new CNextion(conf.getCallsign(), dmrid, serial, brightness, displayClock, utc, idleBrightness, screenLayout, txFrequency, rxFrequency, displayTempInF);
} else if (port == "ump") { } else if (port == "ump") {
if (ump != NULL) { if (ump != NULL) {
display = new CNextion(conf.getCallsign(), dmrid, ump, brightness, displayClock, utc, idleBrightness, screenLayout, txFrequency, rxFrequency, displayTempInF, conf.getLocation()); display = new CNextion(conf.getCallsign(), dmrid, ump, brightness, displayClock, utc, idleBrightness, screenLayout, txFrequency, rxFrequency, displayTempInF);
} else { } else {
LogInfo(" NullDisplay loaded"); LogInfo(" NullDisplay loaded");
display = new CNullDisplay; display = new CNullDisplay;
@ -571,7 +571,7 @@ CDisplay* CDisplay::createDisplay(const CConf& conf, CUMP* ump, CModem* modem)
LogInfo(" Display baudrate: %u ",baudrate); LogInfo(" Display baudrate: %u ",baudrate);
ISerialPort* serial = new CSerialController(port, baudrate); ISerialPort* serial = new CSerialController(port, baudrate);
display = new CNextion(conf.getCallsign(), dmrid, serial, brightness, displayClock, utc, idleBrightness, screenLayout, txFrequency, rxFrequency, displayTempInF, conf.getLocation()); display = new CNextion(conf.getCallsign(), dmrid, serial, brightness, displayClock, utc, idleBrightness, screenLayout, txFrequency, rxFrequency, displayTempInF);
} }
} else if (type == "LCDproc") { } else if (type == "LCDproc") {
std::string address = conf.getLCDprocAddress(); std::string address = conf.getLCDprocAddress();

1
MMDVM.ini
View file

@ -13,7 +13,6 @@ Daemon=0
RXFrequency=435000000 RXFrequency=435000000
TXFrequency=435000000 TXFrequency=435000000
Power=1 Power=1
Location=Nowhere
[Log] [Log]
# Logging levels, 0=No logging # Logging levels, 0=No logging

4
MMDVMHost.cpp
View file

@ -1345,16 +1345,14 @@ bool CMMDVMHost::createDMRNetwork()
unsigned int txFrequency = m_conf.getTXFrequency(); unsigned int txFrequency = m_conf.getTXFrequency();
unsigned int power = m_conf.getPower(); unsigned int power = m_conf.getPower();
unsigned int colorCode = m_conf.getDMRColorCode(); unsigned int colorCode = m_conf.getDMRColorCode();
std::string location = m_conf.getLocation();
LogInfo("Info Parameters"); LogInfo("Info Parameters");
LogInfo(" Callsign: %s", m_callsign.c_str()); LogInfo(" Callsign: %s", m_callsign.c_str());
LogInfo(" RX Frequency: %uHz", rxFrequency); LogInfo(" RX Frequency: %uHz", rxFrequency);
LogInfo(" TX Frequency: %uHz", txFrequency); LogInfo(" TX Frequency: %uHz", txFrequency);
LogInfo(" Power: %uW", power); LogInfo(" Power: %uW", power);
LogInfo(" Location: \"%s\"", location.c_str());
m_dmrNetwork->setConfig(m_callsign, rxFrequency, txFrequency, power, colorCode, location); m_dmrNetwork->setConfig(m_callsign, rxFrequency, txFrequency, power, colorCode);
bool ret = m_dmrNetwork->open(); bool ret = m_dmrNetwork->open();
if (!ret) { if (!ret) {

9
Nextion.cpp
View file

@ -47,7 +47,7 @@ const unsigned int NXDN_BER_COUNT = 28U; // 28 * 40ms = 1120ms
// 00:low, others:high-speed. bit[2] is overlapped with LAYOUT_COMPAT_MASK. // 00:low, others:high-speed. bit[2] is overlapped with LAYOUT_COMPAT_MASK.
#define LAYOUT_HIGHSPEED (3 << 2) #define LAYOUT_HIGHSPEED (3 << 2)
CNextion::CNextion(const std::string& callsign, unsigned int dmrid, ISerialPort* serial, unsigned int brightness, bool displayClock, bool utc, unsigned int idleBrightness, unsigned int screenLayout, unsigned int txFrequency, unsigned int rxFrequency, bool displayTempInF, const std::string& location) : CNextion::CNextion(const std::string& callsign, unsigned int dmrid, ISerialPort* serial, unsigned int brightness, bool displayClock, bool utc, unsigned int idleBrightness, unsigned int screenLayout, unsigned int txFrequency, unsigned int rxFrequency, bool displayTempInF) :
CDisplay(), CDisplay(),
m_callsign(callsign), m_callsign(callsign),
m_ipaddress("(ip unknown)"), m_ipaddress("(ip unknown)"),
@ -72,8 +72,7 @@ m_txFrequency(txFrequency),
m_rxFrequency(rxFrequency), m_rxFrequency(rxFrequency),
m_fl_txFrequency(0.0F), m_fl_txFrequency(0.0F),
m_fl_rxFrequency(0.0F), m_fl_rxFrequency(0.0F),
m_displayTempInF(displayTempInF), m_displayTempInF(displayTempInF)
m_location(location)
{ {
assert(serial != NULL); assert(serial != NULL);
assert(brightness >= 0U && brightness <= 100U); assert(brightness >= 0U && brightness <= 100U);
@ -178,10 +177,6 @@ void CNextion::setIdleInt()
sendCommandAction(22U); sendCommandAction(22U);
} }
} }
::sprintf(command, "t31.txt=\"%s\"", m_location.c_str()); // location
sendCommand(command);
sendCommandAction(23U);
} else { } else {
sendCommandAction(17U); sendCommandAction(17U);
} }

3
Nextion.h
View file

@ -29,7 +29,7 @@
class CNextion : public CDisplay class CNextion : public CDisplay
{ {
public: public:
CNextion(const std::string& callsign, unsigned int dmrid, ISerialPort* serial, unsigned int brightness, bool displayClock, bool utc, unsigned int idleBrightness, unsigned int screenLayout, unsigned int txFrequency, unsigned int rxFrequency, bool displayTempInF, const std::string& location); CNextion(const std::string& callsign, unsigned int dmrid, ISerialPort* serial, unsigned int brightness, bool displayClock, bool utc, unsigned int idleBrightness, unsigned int screenLayout, unsigned int txFrequency, unsigned int rxFrequency, bool displayTempInF);
virtual ~CNextion(); virtual ~CNextion();
virtual bool open(); virtual bool open();
@ -103,7 +103,6 @@ private:
double m_fl_txFrequency; double m_fl_txFrequency;
double m_fl_rxFrequency; double m_fl_rxFrequency;
bool m_displayTempInF; bool m_displayTempInF;
std::string m_location;
void sendCommand(const char* command); void sendCommand(const char* command);
void sendCommandAction(unsigned int status); void sendCommandAction(unsigned int status);

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