g4klx/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost.git synced 2026-03-27 07:24:37 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #241 from g0wfv/develop

Browse source 
Still more LCD RSSI display fettling
This commit is contained in:
Jonathan Naylor 2017-01-08 10:11:51 +00:00 committed by GitHub
parent 78e0327dd3 7e23ebf90f
commit 8fc13bb9a1
2 changed files with 21 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
HD44780.cpp
View file

@ -443,7 +443,7 @@ void CHD44780::writeDStarRSSIInt(unsigned char rssi)
{ {
if (m_rssiCount1 == 0U && m_rows > 2) { if (m_rssiCount1 == 0U && m_rows > 2) {
::lcdPosition(m_fd, 0, 3); ::lcdPosition(m_fd, 0, 3);
::lcdPrintf(m_fd, "-%u dBm", rssi); ::lcdPrintf(m_fd, "-%3udBm", rssi);
} }
m_rssiCount1++; m_rssiCount1++;
@ -743,7 +743,7 @@ void CHD44780::writeFusionRSSIInt(unsigned char rssi)
{ {
if (m_rssiCount1 == 0U && m_rows > 2) { if (m_rssiCount1 == 0U && m_rows > 2) {
::lcdPosition(m_fd, 0, 3); ::lcdPosition(m_fd, 0, 3);
::lcdPrintf(m_fd, "-%u dBm", rssi); ::lcdPrintf(m_fd, "-%3udBm", rssi);
} }
m_rssiCount1++; m_rssiCount1++;
@ -847,7 +847,7 @@ void CHD44780::writeP25RSSIInt(unsigned char rssi)
{ {
if (m_rssiCount1 == 0U && m_rows > 2) { if (m_rssiCount1 == 0U && m_rows > 2) {
::lcdPosition(m_fd, 0, 3); ::lcdPosition(m_fd, 0, 3);
::lcdPrintf(m_fd, "%u", rssi); ::lcdPrintf(m_fd, "-%3udBm", rssi);
} }
m_rssiCount1++; m_rssiCount1++;

32
LCDproc.cpp
View file

@ -255,7 +255,7 @@ void CLCDproc::writeDStarInt(const char* my1, const char* my2, const char* your,
void CLCDproc::writeDStarRSSIInt(unsigned char rssi) void CLCDproc::writeDStarRSSIInt(unsigned char rssi)
{ {
if (m_rssiCount1 == 0U) { if (m_rssiCount1 == 0U) {
socketPrintf(m_socketfd, "widget_set DStar Line4 1 4 %u 4 h 3 \"-%udBm\"", m_cols - 1, rssi); socketPrintf(m_socketfd, "widget_set DStar Line4 1 4 %u 4 h 3 \"-%3udBm\"", m_cols - 1, rssi);
} }
m_rssiCount1++; m_rssiCount1++;
@ -326,22 +326,24 @@ void CLCDproc::writeDMRInt(unsigned int slotNo, const std::string& src, bool gro
void CLCDproc::writeDMRRSSIInt(unsigned int slotNo, unsigned char rssi) void CLCDproc::writeDMRRSSIInt(unsigned int slotNo, unsigned char rssi)
{ {
if (slotNo == 1U) { if (m_rows > 2) {
if (m_rssiCount1 == 0U) if (slotNo == 1U) {
socketPrintf(m_socketfd, "widget_set DMR Slot1RSSI %u %u %-u", m_rows / 2, m_cols - 3, rssi); if (m_rssiCount1 == 0U)
socketPrintf(m_socketfd, "widget_set DMR Slot1RSSI %u %u -%3udBm", 1, 4, rssi);
m_rssiCount1++; m_rssiCount1++;
if (m_rssiCount1 >= DMR_RSSI_COUNT) if (m_rssiCount1 >= DMR_RSSI_COUNT)
m_rssiCount1 = 0U; m_rssiCount1 = 0U;
} else { } else {
if (m_rssiCount2 == 0U) if (m_rssiCount2 == 0U)
socketPrintf(m_socketfd, "widget_set DMR Slot2RSSI %u %u %-u", m_rows / 2 + 1, m_cols - 3, rssi); socketPrintf(m_socketfd, "widget_set DMR Slot2RSSI %u %u -%3udBm", (m_cols / 2) + 1, 4, rssi);
m_rssiCount2++; m_rssiCount2++;
if (m_rssiCount2 >= DMR_RSSI_COUNT) if (m_rssiCount2 >= DMR_RSSI_COUNT)
m_rssiCount2 = 0U; m_rssiCount2 = 0U;
}
} }
} }
@ -390,7 +392,7 @@ void CLCDproc::writeFusionInt(const char* source, const char* dest, const char*
void CLCDproc::writeFusionRSSIInt(unsigned char rssi) void CLCDproc::writeFusionRSSIInt(unsigned char rssi)
{ {
if (m_rssiCount1 == 0U) { if (m_rssiCount1 == 0U) {
socketPrintf(m_socketfd, "widget_set YSF Line4 1 4 %u 4 h 3 \"-%udBm\"", m_cols - 1, rssi); socketPrintf(m_socketfd, "widget_set YSF Line4 1 4 %u 4 h 3 \"-%3udBm\"", m_cols - 1, rssi);
} }
m_rssiCount1++; m_rssiCount1++;
@ -435,7 +437,7 @@ void CLCDproc::writeP25Int(const char* source, bool group, unsigned int dest, co
void CLCDproc::writeP25RSSIInt(unsigned char rssi) void CLCDproc::writeP25RSSIInt(unsigned char rssi)
{ {
if (m_rssiCount1 == 0U) { if (m_rssiCount1 == 0U) {
socketPrintf(m_socketfd, "widget_set P25 Line4 1 4 %u 4 h 3 \"-%udBm\"", m_cols - 1, rssi); socketPrintf(m_socketfd, "widget_set P25 Line4 1 4 %u 4 h 3 \"-%3udBm\"", m_cols - 1, rssi);
} }
m_rssiCount1++; m_rssiCount1++;