diff --git a/DMRSlot.cpp b/DMRSlot.cpp index 8ea373c..c288241 100644 --- a/DMRSlot.cpp +++ b/DMRSlot.cpp @@ -155,7 +155,7 @@ void CDMRSlot::writeModem(unsigned char *data) if (m_netState == RS_NET_IDLE) { setShortLC(m_slotNo, m_rfLC->getDstId(), m_rfLC->getFLCO(), true); - m_display->writeDMR(m_slotNo, m_rfLC->getSrcId(), m_rfLC->getFLCO() == FLCO_GROUP, m_rfLC->getDstId(), "RV"); + m_display->writeDMR(m_slotNo, m_rfLC->getSrcId(), m_rfLC->getFLCO() == FLCO_GROUP, m_rfLC->getDstId(), "R"); } LogMessage("DMR Slot %u, received RF voice header from %u to %s%u", m_slotNo, m_rfLC->getSrcId(), m_rfLC->getFLCO() == FLCO_GROUP ? "TG " : "", m_rfLC->getDstId()); @@ -257,7 +257,7 @@ void CDMRSlot::writeModem(unsigned char *data) if (m_netState == RS_NET_IDLE) { setShortLC(m_slotNo, dstId, gi ? FLCO_GROUP : FLCO_USER_USER, false); - m_display->writeDMR(m_slotNo, srcId, gi, dstId, "RD"); + m_display->writeDMR(m_slotNo, srcId, gi, dstId, "R"); } LogMessage("DMR Slot %u, received RF data header from %u to %s%u, %u blocks", m_slotNo, srcId, gi ? "TG ": "", dstId, m_rfFrames); @@ -491,7 +491,7 @@ void CDMRSlot::writeModem(unsigned char *data) if (m_netState == RS_NET_IDLE) { setShortLC(m_slotNo, m_rfLC->getDstId(), m_rfLC->getFLCO(), true); - m_display->writeDMR(m_slotNo, m_rfLC->getSrcId(), m_rfLC->getFLCO() == FLCO_GROUP, m_rfLC->getDstId(), "RV"); + m_display->writeDMR(m_slotNo, m_rfLC->getSrcId(), m_rfLC->getFLCO() == FLCO_GROUP, m_rfLC->getDstId(), "R"); } LogMessage("DMR Slot %u, received RF late entry from %u to %s%u", m_slotNo, m_rfLC->getSrcId(), m_rfLC->getFLCO() == FLCO_GROUP ? "TG " : "", m_rfLC->getDstId()); @@ -664,7 +664,7 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData) setShortLC(m_slotNo, m_netLC->getDstId(), m_netLC->getFLCO(), true); - m_display->writeDMR(m_slotNo, m_netLC->getSrcId(), m_netLC->getFLCO() == FLCO_GROUP, m_netLC->getDstId(), "NV"); + m_display->writeDMR(m_slotNo, m_netLC->getSrcId(), m_netLC->getFLCO() == FLCO_GROUP, m_netLC->getDstId(), "N"); #if defined(DUMP_DMR) openFile(); @@ -779,7 +779,7 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData) setShortLC(m_slotNo, dmrData.getDstId(), gi ? FLCO_GROUP : FLCO_USER_USER, false); - m_display->writeDMR(m_slotNo, dmrData.getSrcId(), gi, dmrData.getDstId(), "ND"); + m_display->writeDMR(m_slotNo, dmrData.getSrcId(), gi, dmrData.getDstId(), "N"); LogMessage("DMR Slot %u, received network data header from %u to %s%u, %u blocks", m_slotNo, dmrData.getSrcId(), gi ? "TG ": "", dmrData.getDstId(), m_netFrames); } else if (dataType == DT_VOICE_SYNC) { @@ -804,7 +804,7 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData) setShortLC(m_slotNo, m_netLC->getDstId(), m_netLC->getFLCO(), true); - m_display->writeDMR(m_slotNo, m_netLC->getSrcId(), m_netLC->getFLCO() == FLCO_GROUP, m_netLC->getDstId(), "NV"); + m_display->writeDMR(m_slotNo, m_netLC->getSrcId(), m_netLC->getFLCO() == FLCO_GROUP, m_netLC->getDstId(), "N"); LogMessage("DMR Slot %u, received network late entry from %u to %s%u", m_slotNo, m_netLC->getSrcId(), m_netLC->getFLCO() == FLCO_GROUP ? "TG " : "", m_netLC->getDstId()); } diff --git a/Images/DMR_sm.bmp b/Images/DMR_sm.bmp index ff0bfe2..2fae46a 100644 Binary files a/Images/DMR_sm.bmp and b/Images/DMR_sm.bmp differ diff --git a/Images/DStar_sm.bmp b/Images/DStar_sm.bmp index cfe79f5..f4e2afc 100644 Binary files a/Images/DStar_sm.bmp and b/Images/DStar_sm.bmp differ diff --git a/Images/P25_sm.bmp b/Images/P25_sm.bmp index 938e83a..5ba24f6 100644 Binary files a/Images/P25_sm.bmp and b/Images/P25_sm.bmp differ diff --git a/Images/Tetra_sm.bmp b/Images/Tetra_sm.bmp index 846d7ef..f56f1cb 100644 Binary files a/Images/Tetra_sm.bmp and b/Images/Tetra_sm.bmp differ diff --git a/Images/YSF.bmp b/Images/YSF.bmp index 8a1c0af..a753134 100644 Binary files a/Images/YSF.bmp and b/Images/YSF.bmp differ diff --git a/Images/YSF_sm.bmp b/Images/YSF_sm.bmp index b12c98c..34cfb19 100644 Binary files a/Images/YSF_sm.bmp and b/Images/YSF_sm.bmp differ diff --git a/Images/dPMR_sm.bmp b/Images/dPMR_sm.bmp index f57a56a..8f57cd1 100644 Binary files a/Images/dPMR_sm.bmp and b/Images/dPMR_sm.bmp differ diff --git a/TFTSerial.cpp b/TFTSerial.cpp index d246be0..b5f8f08 100644 --- a/TFTSerial.cpp +++ b/TFTSerial.cpp @@ -85,13 +85,12 @@ void CTFTSerial::setIdle() // Clear the screen clearScreen(); + setFontSize(FONT_LARGE); + // Draw MMDVM logo displayBitmap(0U, 0U, "MMDVM_sm.bmp"); - // Draw all mode insignias - displayBitmap(0U, 30U, "ALL_sm.bmp"); - - gotoPosText(0U, 8U); + gotoPosPixel(45U, 60U); displayText("IDLE"); } @@ -100,13 +99,12 @@ void CTFTSerial::setLockout() // Clear the screen clearScreen(); + setFontSize(FONT_LARGE); + // Draw MMDVM logo displayBitmap(0U, 0U, "MMDVM_sm.bmp"); - // Draw all mode insignias - displayBitmap(0U, 30U, "ALL_sm.bmp"); - - gotoPosText(0U, 8U); + gotoPosPixel(20U, 60U); displayText("LOCKOUT"); } @@ -115,13 +113,12 @@ void CTFTSerial::setDStar() // Clear the screen clearScreen(); - // Draw MMDVM logo - displayBitmap(0U, 0U, "MMDVM_sm.bmp"); + setFontSize(FONT_MEDIUM); // Draw D-Star insignia - displayBitmap(0U, 30U, "DStar_sm.bmp"); + displayBitmap(0U, 0U, "DStar_sm.bmp"); - gotoPosText(0U, 8U); + gotoPosPixel(30U, 80U); displayText("Listening"); } @@ -132,22 +129,24 @@ void CTFTSerial::writeDStar(const char* my1, const char* my2, const char* your) assert(your != NULL); char text[30U]; - ::sprintf(text, "%8.8s/%4.4s -> %8.8s", my1, my2, your); + ::sprintf(text, "%.8s/%4.4s", my1, my2); - gotoPosText(0U, 8U); + gotoPosPixel(5U, 80U); + displayText(text); + + ::sprintf(text, "%.8s", your); + + gotoPosPixel(5U, 100U); displayText(text); } void CTFTSerial::clearDStar() { - // Draw MMDVM logo - displayBitmap(0U, 0U, "MMDVM_sm.bmp"); + gotoPosPixel(5U, 80U); + displayText(" Listening "); - // Draw D-Star insignia - displayBitmap(0U, 30U, "DStar_sm.bmp"); - - gotoPosText(0U, 8U); - displayText("Listening"); + gotoPosPixel(5U, 100U); + displayText(" "); } void CTFTSerial::setDMR() @@ -155,16 +154,15 @@ void CTFTSerial::setDMR() // Clear the screen clearScreen(); - // Draw MMDVM logo - displayBitmap(0U, 0U, "MMDVM_sm.bmp"); + setFontSize(FONT_MEDIUM); // Draw DMR insignia - displayBitmap(0U, 30U, "DMR_sm.bmp"); + displayBitmap(0U, 0U, "DMR_sm.bmp"); - gotoPosText(0U, 8U); + gotoPosPixel(5U, 55U); displayText("1: Listening"); - gotoPosText(0U, 9U); + gotoPosPixel(5U, 90U); displayText("2: Listening"); } @@ -174,13 +172,23 @@ void CTFTSerial::writeDMR(unsigned int slotNo, unsigned int srcId, bool group, u if (slotNo == 1U) { char text[30U]; - ::sprintf(text, "1: %s %u -> %s%u", type, srcId, group ? "TG" : "", dstId); - gotoPosText(0U, 8U); + + ::sprintf(text, "1: %s %u", type, srcId); + gotoPosPixel(5U, 55U); + displayText(text); + + ::sprintf(text, "%s%u", group ? "TG" : "", dstId); + gotoPosPixel(65U, 72U); displayText(text); } else { char text[30U]; - ::sprintf(text, "2: %s %u -> %s%u", type, srcId, group ? "TG" : "", dstId); - gotoPosText(0U, 9U); + + ::sprintf(text, "2: %s %u", type, srcId); + gotoPosPixel(5U, 90U); + displayText(text); + + ::sprintf(text, "%s%u", group ? "TG" : "", dstId); + gotoPosPixel(65U, 107U); displayText(text); } } @@ -188,11 +196,17 @@ void CTFTSerial::writeDMR(unsigned int slotNo, unsigned int srcId, bool group, u void CTFTSerial::clearDMR(unsigned int slotNo) { if (slotNo == 1U) { - gotoPosText(0U, 8U); - displayText("1: Listening"); + gotoPosPixel(5U, 55U); + displayText("1: Listening "); + + gotoPosPixel(65U, 72U); + displayText(" "); } else { - gotoPosText(0U, 9U); - displayText("2: Listening"); + gotoPosPixel(5U, 90U); + displayText("2: Listening "); + + gotoPosPixel(65U, 107U); + displayText(" "); } } @@ -201,13 +215,12 @@ void CTFTSerial::setFusion() // Clear the screen clearScreen(); - // Draw MMDVM logo - displayBitmap(0U, 0U, "MMDVM_sm.bmp"); + setFontSize(FONT_MEDIUM); // Draw the System Fusion insignia - displayBitmap(0U, 30U, "YSF_sm.bmp"); + displayBitmap(0U, 0U, "YSF_sm.bmp"); - gotoPosText(0U, 8U); + gotoPosPixel(30U, 80U); displayText("Listening"); } @@ -217,22 +230,24 @@ void CTFTSerial::writeFusion(const char* source, const char* dest) assert(dest != NULL); char text[30U]; - ::sprintf(text, "%10.10s -> %10.10s", source, dest); + ::sprintf(text, "%.10s", source); - gotoPosText(0U, 8U); + gotoPosPixel(5U, 80U); + displayText(text); + + ::sprintf(text, "%.10s", dest); + + gotoPosPixel(5U, 100U); displayText(text); } void CTFTSerial::clearFusion() { - // Draw MMDVM logo - displayBitmap(0U, 0U, "MMDVM_sm.bmp"); + gotoPosPixel(5U, 80U); + displayText(" Listening "); - // Draw the System Fusion insignia - displayBitmap(0U, 30U, "YSF_sm.bmp"); - - gotoPosText(0U, 8U); - displayText("Listening"); + gotoPosPixel(5U, 100U); + displayText(" "); } void CTFTSerial::close()