Merge branch 'master' into mqtt

DMRCSBK.cpp

@@ -147,6 +147,15 @@ bool CDMRCSBK::put(const unsigned char* bytes)
 		m_CBF   = 0U;
 		break;
 
+	case CSBKO_CALL_EMERGENCY:
+		m_GI    = true;
+		m_dstId = m_data[4U] << 16 | m_data[5U] << 8 | m_data[6U];
+		m_srcId = m_data[7U] << 16 | m_data[8U] << 8 | m_data[9U];
+		m_dataContent = false;
+		m_CBF   = 0U;
+		CUtils::dump(1U, "Call Emergency CSBK", m_data, 12U);
+		break;
+
 	default:
 		m_GI    = false;
 		m_srcId = 0U;

DMRCSBK.h

@@ -30,6 +30,7 @@ enum CSBKO {
 	CSBKO_CALL_ALERT_ACK = 0x20,
 	CSBKO_RADIO_CHECK    = 0x24,
 	CSBKO_NACKRSP        = 0x26,
+	CSBKO_CALL_EMERGENCY = 0x27,
 	CSBKO_BSDWNACT       = 0x38,
 	CSBKO_PRECCSBK       = 0x3D
 };

DMRSlot.cpp

@@ -510,6 +510,9 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len)
 			case CSBKO_RADIO_CHECK:
 				LogMessage("DMR Slot %u, received RF Radio Check %s CSBK from %s to %s%s", m_slotNo, /* TBD */ 1 ? "Req" : "Ack", src.c_str(), gi ? "TG " : "", dst.c_str());
 				break;
+			case CSBKO_CALL_EMERGENCY:
+				LogMessage("DMR Slot %u, received RF Call Emergency CSBK from %s to %s%s", m_slotNo, src.c_str(), gi ? "TG " : "", dst.c_str());
+				break;
 			default:
 				LogWarning("DMR Slot %u, unhandled RF CSBK type - 0x%02X", m_slotNo, csbko);
 				break;

MMDVMHost.cpp

@@ -1261,6 +1261,8 @@ int CMMDVMHost::run()
 							setMode(MODE_DMR);
 						dmrBeaconIntervalTimer.start();
 						dmrBeaconDurationTimer.start();
+						if (m_duplex)
+							LogDebug("sending DMR Roaming Beacon (timed mode)");
 					}
 				}
 				break;
@@ -1272,6 +1274,8 @@ int CMMDVMHost::run()
 							if (!m_fixedMode && m_mode == MODE_IDLE)
 								setMode(MODE_DMR);
 							dmrBeaconDurationTimer.start();
+							if (m_duplex)
+								LogDebug("sending DMR Roaming Beacon (network mode)");
 						}
 					}
 				}