g4klx/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost.git synced 2026-01-05 16:10:03 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #166 from g0wfv/develop

Browse source 
Add mode clarification to DMRNetwork.cpp log output and add 2.8" Nextion to README.md
This commit is contained in:
Jonathan Naylor 2016-09-29 22:02:20 +01:00 committed by GitHub
parent fc884179c3 795d8d60a1
commit 597f8ae663
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
DMRNetwork.cpp
View file

@ -114,7 +114,7 @@ void CDMRNetwork::setConfig(const std::string& callsign, unsigned int rxFrequenc
bool CDMRNetwork::open()
{
LogMessage("Opening DMR Network");
LogMessage("DMR, Opening DMR Network");
bool ret = m_socket.open();
if (!ret)
@ -282,7 +282,7 @@ bool CDMRNetwork::write(const CDMRData& data)
void CDMRNetwork::close()
{
LogMessage("Closing DMR Network");
LogMessage("DMR, Closing DMR Network");
if (m_status == RUNNING) {
unsigned char buffer[9U];
@ -314,7 +314,7 @@ void CDMRNetwork::clock(unsigned int ms)
unsigned int port;
int length = m_socket.read(m_buffer, BUFFER_LENGTH, address, port);
if (length < 0) {
LogError("Socket has failed, retrying connection to the master");
LogError("DMR, Socket has failed, retrying connection to the master");
close();
m_status = WAITING_CONNECT;
m_retryTimer.start();
@ -336,7 +336,7 @@ void CDMRNetwork::clock(unsigned int ms)
}
} else if (::memcmp(m_buffer, "MSTNAK", 6U) == 0) {
if (m_status == RUNNING) {
LogWarning("The master is restarting, logging back in");
LogWarning("DMR, The master is restarting, logging back in");
m_status = WAITING_LOGIN;
m_timeoutTimer.start();
m_retryTimer.start();
@ -344,7 +344,7 @@ void CDMRNetwork::clock(unsigned int ms)
/* Once the modem death spiral has been prevented in Modem.cpp
the Network sometimes times out and reaches here.
We want it to reconnect so... */
LogError("Login to the master has failed, retrying ...");
LogError("DMR, Login to the master has failed, retrying ...");
close();
m_status = WAITING_CONNECT;
m_retryTimer.start();
@ -366,7 +366,7 @@ void CDMRNetwork::clock(unsigned int ms)
m_retryTimer.start();
break;
case WAITING_CONFIG:
LogMessage("Logged into the master successfully");
LogMessage("DMR, Logged into the master successfully");
m_status = RUNNING;
m_timeoutTimer.start();
m_retryTimer.start();
@ -375,7 +375,7 @@ void CDMRNetwork::clock(unsigned int ms)
break;
}
} else if (::memcmp(m_buffer, "MSTCL", 5U) == 0) {
LogError("Master is closing down");
LogError("DMR, Master is closing down");
close();
m_status = WAITING_CONNECT;
m_retryTimer.start();
@ -412,7 +412,7 @@ void CDMRNetwork::clock(unsigned int ms)
m_timeoutTimer.clock(ms);
if (m_timeoutTimer.isRunning() && m_timeoutTimer.hasExpired()) {
LogError("Connection to the master has timed out, retrying connection");
LogError("DMR, Connection to the master has timed out, retrying connection");
close();
m_status = WAITING_CONNECT;
m_retryTimer.start();
@ -524,7 +524,7 @@ bool CDMRNetwork::write(const unsigned char* data, unsigned int length)
bool ret = m_socket.write(data, length, m_address, m_port);
if (!ret) {
LogError("Socket has failed when writing data to the master, retrying connection");
LogError("DMR, Socket has failed when writing data to the master, retrying connection");
close();
m_status = WAITING_CONNECT;
m_retryTimer.start();

2
README.md
View file

@ -8,7 +8,7 @@ It builds on 32-bit and 64-bit Linux as well as on Windows using VS2015 on x86 a
- Support for HD44780 via 4 bit GPIO connection (user selectable pins)
- Adafruit 16x2 LCD+Keypad Kits (I2C)
- Connection via PCF8574 GPIO Extender (I2C)
- Nextion TFTs (sizes 2.4", 3.2" and 3.5")
- Nextion TFTs (sizes 2.4", 2.8", 3.2" and 3.5")
- TFT displays sold by Hobbytronics in UK
- OLED 128x64 (SSD1306)