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

Merge branch 'master' into M17_AX25_FM

Browse source
This commit is contained in:
Jonathan Naylor 2020-12-15 10:20:12 +00:00
parent 9811bb7d4d b22d9084c8
commit 2ad4a2abfc
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
POCSAGControl.cpp
View file

@ -173,11 +173,12 @@ bool CPOCSAGControl::readNetwork()
packNumeric(output->m_text, output->m_buffer);
break;
case FUNCTIONAL_ALERT1:
output->m_display = "Func alert 1";
LogDebug("Message to %07u, func Alert 1", output->m_ric);
break;
case FUNCTIONAL_ALERT2:
output->m_text = std::string((char*)(data + 4U), length - 4U);
output->m_display = output->m_text;
output->m_display = "Func alert 2: " + output->m_text;
LogDebug("Message to %07u, func Alert 2: \"%s\"", output->m_ric, output->m_display.c_str());
packASCII(output->m_text, output->m_buffer);
break;

2
Version.h
View file

@ -19,6 +19,6 @@
#if !defined(VERSION_H)
#define VERSION_H
const char* VERSION = "20201214";
const char* VERSION = "20201215";
#endif