Received data doesn't change the mode.
This commit is contained in:
parent
7c7515a636
commit
2e43624ea2
2 changed files with 6 additions and 20 deletions
4
Log.cpp
4
Log.cpp
|
@ -115,9 +115,9 @@ void Log(unsigned int level, const char* fmt, ...)
|
||||||
|
|
||||||
struct tm* tm = ::gmtime(&now.tv_sec);
|
struct tm* tm = ::gmtime(&now.tv_sec);
|
||||||
|
|
||||||
::fprintf(m_fpLog, "%c: %04d-%02d-%02d %02d:%02d:%02d.%03u ", LEVELS[level], tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec, now.tv_usec / 1000U);
|
::fprintf(m_fpLog, "%c: %04d-%02d-%02d %02d:%02d:%02d.%03lu ", LEVELS[level], tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec, now.tv_usec / 1000U);
|
||||||
if (m_display)
|
if (m_display)
|
||||||
::fprintf(stdout, "%c: %04d-%02d-%02d %02d:%02d:%02d.%03u ", LEVELS[level], tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec, now.tv_usec / 1000U);
|
::fprintf(stdout, "%c: %04d-%02d-%02d %02d:%02d:%02d.%03lu ", LEVELS[level], tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec, now.tv_usec / 1000U);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
va_list vl;
|
va_list vl;
|
||||||
|
|
|
@ -179,14 +179,8 @@ int CMMDVMHost::run()
|
||||||
|
|
||||||
len = m_modem->readDStarData(data);
|
len = m_modem->readDStarData(data);
|
||||||
if (dstar != NULL && len > 0U) {
|
if (dstar != NULL && len > 0U) {
|
||||||
if (mode == MODE_IDLE) {
|
if (mode == MODE_IDLE)
|
||||||
LogMessage("Mode set to D-Star");
|
dstar->writeModem(data);
|
||||||
mode = MODE_DSTAR;
|
|
||||||
m_display->setDStar();
|
|
||||||
m_modem->setMode(MODE_DSTAR);
|
|
||||||
if (m_dmrNetwork != NULL)
|
|
||||||
m_dmrNetwork->enable(false);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (mode == MODE_DSTAR) {
|
if (mode == MODE_DSTAR) {
|
||||||
dstar->writeModem(data);
|
dstar->writeModem(data);
|
||||||
|
@ -238,16 +232,8 @@ int CMMDVMHost::run()
|
||||||
|
|
||||||
len = m_modem->readYSFData(data);
|
len = m_modem->readYSFData(data);
|
||||||
if (ysf != NULL && len > 0U) {
|
if (ysf != NULL && len > 0U) {
|
||||||
if (mode == MODE_IDLE) {
|
if (mode == MODE_IDLE)
|
||||||
LogMessage("Mode set to System Fusion");
|
ysf->writeData(data, len);
|
||||||
mode = MODE_YSF;
|
|
||||||
m_display->setFusion();
|
|
||||||
m_modem->setMode(MODE_YSF);
|
|
||||||
if (m_dmrNetwork != NULL)
|
|
||||||
m_dmrNetwork->enable(false);
|
|
||||||
if (m_dstarNetwork != NULL)
|
|
||||||
m_dstarNetwork->enable(false);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (mode == MODE_YSF) {
|
if (mode == MODE_YSF) {
|
||||||
ysf->writeData(data, len);
|
ysf->writeData(data, len);
|
||||||
|
|
Loading…
Reference in a new issue