Merge pull request #742 from iddq/master

Add Radio Check CSBK

Author: g4klx

DMRCSBK.cpp

@@ -129,6 +129,21 @@ bool CDMRCSBK::put(const unsigned char* bytes)
 		CUtils::dump(1U, "Call Alert Ack CSBK", m_data, 12U);
 		break;
 
+	case CSBKO_RADIO_CHECK:
+		m_GI    = false;
+		if (m_data[3U] == 0x80) {
+			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];
+			CUtils::dump(1U, "Radio Check Req CSBK", m_data, 12U);
+		} else {
+			m_srcId = m_data[4U] << 16 | m_data[5U] << 8 | m_data[6U];
+			m_dstId = m_data[7U] << 16 | m_data[8U] << 8 | m_data[9U];
+			CUtils::dump(1U, "Radio Check Ack CSBK", m_data, 12U);
+		}
+		m_dataContent = false;
+		m_CBF   = 0U;
+		break;
+
 	default:
 		m_GI    = false;
 		m_srcId = 0U;

DMRCSBK.h

@@ -28,6 +28,7 @@ enum CSBKO {
 	CSBKO_CTCSBK         = 0x07,
 	CSBKO_CALL_ALERT     = 0x1F,
 	CSBKO_CALL_ALERT_ACK = 0x20,
+	CSBKO_RADIO_CHECK    = 0x24,
 	CSBKO_NACKRSP        = 0x26,
 	CSBKO_BSDWNACT       = 0x38,
 	CSBKO_PRECCSBK       = 0x3D

DMRSlot.cpp

@@ -508,6 +508,9 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len)
 			case CSBKO_CALL_ALERT_ACK:
 				LogMessage("DMR Slot %u, received RF Call Alert Ack CSBK from %s to %s%s", m_slotNo, src.c_str(), gi ? "TG " : "", dst.c_str());
 				break;
+			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;
 			default:
 				LogWarning("DMR Slot %u, unhandled RF CSBK type - 0x%02X", m_slotNo, csbko);
 				break;
@@ -1695,6 +1698,9 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
 		case CSBKO_CALL_ALERT_ACK:
 			LogMessage("DMR Slot %u, received network Call Alert Ack CSBK from %s to %s%s", m_slotNo, src.c_str(), gi ? "TG " : "", dst.c_str());
 			break;
+		case CSBKO_RADIO_CHECK:
+			LogMessage("DMR Slot %u, received network Radio Check %s CSBK from %s to %s%s", m_slotNo, /* TBD */ 1 ? "Req" : "Ack", src.c_str(), gi ? "TG " : "", dst.c_str());
+			break;
 		default:
 			LogWarning("DMR Slot %u, unhandled network CSBK type - 0x%02X", m_slotNo, csbko);
 			break;