From 7e23ebf90f5038d3aa79173c35520f4863aaa950 Mon Sep 17 00:00:00 2001
From: Tony Corbett G0WFV <tonyc.uk@gmail.com>
Date: Sun, 8 Jan 2017 09:37:17 +0000
Subject: [PATCH] Still more LCD RSSI display fettling

LCDproc: rethink of how RSSI is displayed for DMR to match HD44780 version (all modes 4-line screens only).  Once it's working correctly, display on smaller screens can be revisited as scrolling should make display of RSSI feasible on smaller LCDs driven with LCDproc as opposed to directly by the host.

HD44780: Clean up and make displayed values uniform by specifying number of characters in value and inserting a missing minus for P25!
---
 HD44780.cpp |  6 +++---
 LCDproc.cpp | 34 ++++++++++++++++++----------------
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/HD44780.cpp b/HD44780.cpp
index 924f1c2..055e0fc 100644
--- a/HD44780.cpp
+++ b/HD44780.cpp
@@ -443,7 +443,7 @@ void CHD44780::writeDStarRSSIInt(unsigned char rssi)
 { 
   if (m_rssiCount1 == 0U && m_rows > 2) { 
 		::lcdPosition(m_fd, 0, 3);
-		::lcdPrintf(m_fd, "-%u dBm", rssi);
+		::lcdPrintf(m_fd, "-%3udBm", rssi);
   } 
  
   m_rssiCount1++; 
@@ -743,7 +743,7 @@ void CHD44780::writeFusionRSSIInt(unsigned char rssi)
 { 
   if (m_rssiCount1 == 0U && m_rows > 2) { 
 		::lcdPosition(m_fd, 0, 3);
-		::lcdPrintf(m_fd, "-%u dBm", rssi);
+		::lcdPrintf(m_fd, "-%3udBm", rssi);
   } 
  
   m_rssiCount1++; 
@@ -847,7 +847,7 @@ void CHD44780::writeP25RSSIInt(unsigned char rssi)
 { 
   if (m_rssiCount1 == 0U && m_rows > 2) { 
 		::lcdPosition(m_fd, 0, 3);
-		::lcdPrintf(m_fd, "%u", rssi);
+		::lcdPrintf(m_fd, "-%3udBm", rssi);
   } 
  
   m_rssiCount1++; 
diff --git a/LCDproc.cpp b/LCDproc.cpp
index 79d33ba..7c6c9fd 100644
--- a/LCDproc.cpp
+++ b/LCDproc.cpp
@@ -255,7 +255,7 @@ void CLCDproc::writeDStarInt(const char* my1, const char* my2, const char* your,
 void CLCDproc::writeDStarRSSIInt(unsigned char rssi)
 {
 	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++;
@@ -326,23 +326,25 @@ void CLCDproc::writeDMRInt(unsigned int slotNo, const std::string& src, bool gro
  
 void CLCDproc::writeDMRRSSIInt(unsigned int slotNo, unsigned char rssi) 
 { 
-  if (slotNo == 1U) {
-	  if (m_rssiCount1 == 0U)
-			socketPrintf(m_socketfd, "widget_set DMR Slot1RSSI %u %u %-u", m_rows / 2, m_cols - 3, rssi); 
+	if (m_rows > 2) {	
+	  if (slotNo == 1U) {
+		  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)
-			m_rssiCount1 = 0U; 
-	} else { 
-		if (m_rssiCount2 == 0U)
-			socketPrintf(m_socketfd, "widget_set DMR Slot2RSSI %u %u %-u", m_rows / 2 + 1, m_cols - 3, rssi); 
+			if (m_rssiCount1 >= DMR_RSSI_COUNT)
+				m_rssiCount1 = 0U; 
+		} else { 
+			if (m_rssiCount2 == 0U)
+				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)
-			m_rssiCount2 = 0U; 
-	} 
+			if (m_rssiCount2 >= DMR_RSSI_COUNT)
+				m_rssiCount2 = 0U; 
+		} 
+	}
 }
 
 void CLCDproc::clearDMRInt(unsigned int slotNo)
@@ -390,7 +392,7 @@ void CLCDproc::writeFusionInt(const char* source, const char* dest, const char*
 void CLCDproc::writeFusionRSSIInt(unsigned char rssi)
 {
 	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++;
@@ -435,7 +437,7 @@ void CLCDproc::writeP25Int(const char* source, bool group, unsigned int dest, co
 void CLCDproc::writeP25RSSIInt(unsigned char rssi)
 {
 	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++;