Display the RSSI on the Nextion screen.

This commit is contained in:
Jonathan Naylor
2017-01-05 19:44:52 +00:00
parent af721f89e2
commit 3c9666e780
10 changed files with 164 additions and 9 deletions

View File

@@ -227,6 +227,7 @@ void CDMRSlot::writeModem(unsigned char *data, unsigned int len)
if (m_netState == RS_NET_IDLE) {
setShortLC(m_slotNo, dstId, flco, true);
m_display->writeDMR(m_slotNo, src, flco == FLCO_GROUP, dst, "R");
m_display->writeDMRRSSI(m_slotNo, m_rssi);
}
LogMessage("DMR Slot %u, received RF voice header from %s to %s%s", m_slotNo, src.c_str(), flco == FLCO_GROUP ? "TG " : "", dst.c_str());
@@ -337,6 +338,7 @@ void CDMRSlot::writeModem(unsigned char *data, unsigned int len)
if (m_netState == RS_NET_IDLE) {
setShortLC(m_slotNo, dstId, gi ? FLCO_GROUP : FLCO_USER_USER, false);
m_display->writeDMR(m_slotNo, src, gi, dst, "R");
m_display->writeDMRRSSI(m_slotNo, m_rssi);
}
LogMessage("DMR Slot %u, received RF data header from %s to %s%s, %u blocks", m_slotNo, src.c_str(), gi ? "TG ": "", dst.c_str(), m_rfFrames);
@@ -475,6 +477,8 @@ void CDMRSlot::writeModem(unsigned char *data, unsigned int len)
writeQueueRF(data);
writeNetworkRF(data, DT_VOICE_SYNC, errors);
m_display->writeDMRRSSI(m_slotNo, m_rssi);
} else if (m_rfState == RS_RF_LISTENING) {
m_rfEmbeddedLC.reset();
m_rfState = RS_RF_LATE_ENTRY;
@@ -614,6 +618,7 @@ void CDMRSlot::writeModem(unsigned char *data, unsigned int len)
if (m_netState == RS_NET_IDLE) {
setShortLC(m_slotNo, dstId, flco, true);
m_display->writeDMR(m_slotNo, src, flco == FLCO_GROUP, dst, "R");
m_display->writeDMRRSSI(m_slotNo, m_rssi);
}
LogMessage("DMR Slot %u, received RF late entry from %s to %s%s", m_slotNo, src.c_str(), flco == FLCO_GROUP ? "TG " : "", dst.c_str());