Add NXDN to the display code.

Display.cpp

@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2016,2017 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2016,2017,2018 by Jonathan Naylor G4KLX
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -265,6 +265,39 @@ void CDisplay::clearP25()
 	}
 }
 
+void CDisplay::writeNXDN(const char* source, bool group, unsigned int dest, const char* type)
+{
+	assert(source != NULL);
+	assert(type != NULL);
+
+	m_timer1.start();
+	m_mode1 = MODE_IDLE;
+
+	writeNXDNInt(source, group, dest, type);
+}
+
+void CDisplay::writeNXDNRSSI(unsigned char rssi)
+{
+	if (rssi != 0U)
+		writeNXDNRSSIInt(rssi);
+}
+
+void CDisplay::writeNXDNBER(float ber)
+{
+	writeNXDNBERInt(ber);
+}
+
+void CDisplay::clearNXDN()
+{
+	if (m_timer1.hasExpired()) {
+		clearNXDNInt();
+		m_timer1.stop();
+		m_mode1 = MODE_IDLE;
+	} else {
+		m_mode1 = MODE_NXDN;
+	}
+}
+
 void CDisplay::writeCW()
 {
 	m_timer1.start();
@@ -298,6 +331,11 @@ void CDisplay::clock(unsigned int ms)
 			m_mode1 = MODE_IDLE;
 			m_timer1.stop();
 			break;
+		case MODE_NXDN:
+			clearNXDNInt();
+			m_mode1 = MODE_IDLE;
+			m_timer1.stop();
+			break;
 		case MODE_CW:
 			clearCWInt();
 			m_mode1 = MODE_IDLE;
@@ -360,3 +398,11 @@ void CDisplay::writeP25RSSIInt(unsigned char rssi)
 void CDisplay::writeP25BERInt(float ber)
 {
 }
+
+void CDisplay::writeNXDNRSSIInt(unsigned char rssi)
+{
+}
+
+void CDisplay::writeNXDNBERInt(float ber)
+{
+}

Display.h

@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2016,2017 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2016,2017,2018 by Jonathan Naylor G4KLX
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -56,6 +56,11 @@ class CDisplay
 	void writeP25BER(float ber);
 	void clearP25();
 
+	void writeNXDN(const char* source, bool group, unsigned int dest, const char* type);
+	void writeNXDNRSSI(unsigned char rssi);
+	void writeNXDNBER(float ber);
+	void clearNXDN();
+
 	void writeCW();
 	void clearCW();
 
@@ -89,6 +94,11 @@ class CDisplay
 	virtual void writeP25BERInt(float ber);
 	virtual void clearP25Int() = 0;
 
+	virtual void writeNXDNInt(const char* source, bool group, unsigned int dest, const char* type) = 0;
+	virtual void writeNXDNRSSIInt(unsigned char rssi);
+	virtual void writeNXDNBERInt(float ber);
+	virtual void clearNXDNInt() = 0;
+
 	virtual void writeCWInt() = 0;
 	virtual void clearCWInt() = 0;
 

HD44780.cpp

@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2016, 2017 by Jonathan Naylor G4KLX & Tony Corbett G0WFV
+ *   Copyright (C) 2016,2017,2018 by Jonathan Naylor G4KLX & Tony Corbett G0WFV
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -38,8 +38,9 @@ char        m_buffer4[128U];
 
 const unsigned int DSTAR_RSSI_COUNT = 3U;    // 3 * 420ms = 1260ms 
 const unsigned int DMR_RSSI_COUNT   = 4U;    // 4 * 360ms = 1440ms 
-const unsigned int YSF_RSSI_COUNT   = 13U;    // 13 * 100ms = 1300ms 
+const unsigned int YSF_RSSI_COUNT   = 13U;   // 13 * 100ms = 1300ms 
 const unsigned int P25_RSSI_COUNT   = 7U;    // 7 * 180ms = 1260ms
+const unsigned int NXDN_RSSI_COUNT  = 28U;   // 28 * 40ms = 1120ms
 
 CHD44780::CHD44780(unsigned int rows, unsigned int cols, const std::string& callsign, unsigned int dmrid, const std::vector<unsigned int>& pins, unsigned int i2cAddress, bool pwm, unsigned int pwmPin, unsigned int pwmBright, unsigned int pwmDim, bool displayClock, bool utc, bool duplex) :
 CDisplay(),
@@ -890,6 +891,110 @@ void CHD44780::clearP25Int()
 	}
 }
 
+void CHD44780::writeNXDNInt(const char* source, bool group, unsigned int dest, const char* type)
+{
+	assert(source != NULL);
+	assert(type != NULL);
+
+#ifdef ADAFRUIT_DISPLAY
+		adafruitLCDColour(AC_RED);
+#endif
+
+	m_clockDisplayTimer.stop();           // Stop the clock display
+	::lcdClear(m_fd);
+
+	if (m_pwm) {
+		if (m_pwmPin != 1U)
+			::softPwmWrite(m_pwmPin, m_pwmBright);
+		else
+			::pwmWrite(m_pwmPin, (m_pwmBright / 100) * 1024);
+	}
+
+	::lcdPosition(m_fd, 0, 0);
+	::lcdPuts(m_fd, "NXDN");
+
+	if (m_rows == 2U && m_cols == 16U) {
+		char m_buffer1[16U];
+		::sprintf(m_buffer1, "%.10s >", source);
+		::lcdPosition(m_fd, 0, 1);
+		::lcdPrintf(m_fd, "%.*s", m_cols, m_buffer1);
+	} else if (m_rows == 4U && m_cols == 16U) {
+		char m_buffer1[16U];
+		::sprintf(m_buffer1, "%.10s >", source);
+		::lcdPosition(m_fd, 0, 1);
+		::lcdPrintf(m_fd, "%.*s", m_cols, m_buffer1);
+
+		::sprintf(m_buffer1, "%s%u", group ? "TG" : "", dest);
+		::lcdPosition(m_fd, 0, 2);
+		::lcdPrintf(m_fd, "%.*s", m_cols, m_buffer1);
+	} else if (m_rows == 4U && m_cols == 20U) {
+		char m_buffer1[20U];
+		::sprintf(m_buffer1, "%.10s >", source);
+		::lcdPosition(m_fd, 0, 1);
+		::lcdPrintf(m_fd, "%.*s", m_cols, m_buffer1);
+
+		::sprintf(m_buffer1, "%s%u", group ? "TG" : "", dest);
+		::lcdPosition(m_fd, 0, 2);
+		::lcdPrintf(m_fd, "%.*s", m_cols, m_buffer1);
+	} else if (m_rows == 2 && m_cols == 40U) {
+		char m_buffer1[40U];
+		::sprintf(m_buffer1, "%.10s > %s%u", source, group ? "TG" : "", dest);
+
+		::lcdPosition(m_fd, 0, 1);
+		::lcdPrintf(m_fd, "%.*s", m_cols, m_buffer1);
+	}
+
+	m_dmr = false;
+  m_rssiCount1 = 0U; 
+} 
+
+void CHD44780::writeNXDNRSSIInt(unsigned char rssi) 
+{ 
+  if (m_rssiCount1 == 0U && m_rows > 2) { 
+		::lcdPosition(m_fd, 0, 3);
+		::lcdPrintf(m_fd, "-%3udBm", rssi);
+  } 
+
+  m_rssiCount1++; 
+  if (m_rssiCount1 >= NXDN_RSSI_COUNT) 
+    m_rssiCount1 = 0U; 
+}
+
+void CHD44780::clearNXDNInt()
+{
+#ifdef ADAFRUIT_DISPLAY
+	adafruitLCDColour(AC_PURPLE);
+#endif
+
+	m_clockDisplayTimer.stop();           // Stop the clock display
+
+	if (m_rows == 2U && m_cols == 16U) {
+		::lcdPosition(m_fd, 0, 1);
+		::lcdPrintf(m_fd, "%.*s", m_cols, LISTENING);
+	} else if (m_rows == 4U && m_cols == 16U) {
+		::lcdPosition(m_fd, 0, 1);
+		::lcdPrintf(m_fd, "%.*s", m_cols, LISTENING);
+
+		::lcdPosition(m_fd, 0, 2);
+		::lcdPrintf(m_fd, "%.*s", m_cols, "                    ");
+
+		::lcdPosition(m_fd, 0, 3);
+		::lcdPrintf(m_fd, "%.*s", m_cols, "                    ");
+	} else if (m_rows == 4U && m_cols == 20U) {
+		::lcdPosition(m_fd, 0, 1);
+		::lcdPrintf(m_fd, "%.*s", m_cols, LISTENING);
+
+		::lcdPosition(m_fd, 0, 2);
+		::lcdPrintf(m_fd, "%.*s", m_cols, "                    ");
+
+		::lcdPosition(m_fd, 0, 3);
+		::lcdPrintf(m_fd, "%.*s", m_cols, "                    ");
+	} else if (m_rows == 2 && m_cols == 40U) {
+		::lcdPosition(m_fd, 0, 1);
+		::lcdPrintf(m_fd, "%.*s", m_cols, LISTENING);
+	}
+}
+
 void CHD44780::writeCWInt()
 {
 	::lcdPosition(m_fd, m_cols - 5, m_rows - 1);

HD44780.h

@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2016, 2017 by Jonathan Naylor G4KLX & Tony Corbett G0WFV
+ *   Copyright (C) 2016,2017,2018 by Jonathan Naylor G4KLX & Tony Corbett G0WFV
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -117,6 +117,10 @@ class CHD44780 : public CDisplay
   virtual void writeP25RSSIInt(unsigned char rssi); 
   virtual void clearP25Int();
 
+  virtual void writeNXDNInt(const char* source, bool group, unsigned int dest, const char* type);
+  virtual void writeNXDNRSSIInt(unsigned char rssi); 
+  virtual void clearNXDNInt();
+
   virtual void writeCWInt();
   virtual void clearCWInt();
 

LCDproc.cpp

@@ -1,5 +1,6 @@
 /*
- *   Copyright (C) 2016, 2017 by Tony Corbett G0WFV
+ *   Copyright (C) 2016,2017 by Tony Corbett G0WFV
+ *   Copyright (C) 2018 by Jonathan Naylor G4KLX
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -43,6 +44,11 @@
 *    Red 128		1000 0000
 *    Yellow 136		1000 1000
 
+*    LED 5 (NXDN)
+*    Green 16		0001 0000
+*    Red 255		1111 1111
+*    Yellow 255		1111 1111
+
 */
 
 #include "LCDproc.h"
@@ -88,6 +94,7 @@ const unsigned int DSTAR_RSSI_COUNT = 3U;		// 3 * 420ms = 1260ms
 const unsigned int DMR_RSSI_COUNT   = 4U;		// 4 * 360ms = 1440ms
 const unsigned int YSF_RSSI_COUNT   = 13U;		// 13 * 100ms = 1300ms
 const unsigned int P25_RSSI_COUNT   = 7U;		// 7 * 180ms = 1260ms
+const unsigned int NXDN_RSSI_COUNT  = 28U;		// 28 * 40ms = 1120ms
 
 CLCDproc::CLCDproc(std::string address, unsigned int port, unsigned int localPort, const std::string& callsign, unsigned int dmrid, bool displayClock, bool utc, bool duplex, bool dimOnIdle) :
 CDisplay(),
@@ -171,6 +178,7 @@ void CLCDproc::setIdleInt()
 		socketPrintf(m_socketfd, "screen_set DMR -priority hidden");
 		socketPrintf(m_socketfd, "screen_set YSF -priority hidden");
 		socketPrintf(m_socketfd, "screen_set P25 -priority hidden");
+		socketPrintf(m_socketfd, "screen_set NXDN -priority hidden");
 		socketPrintf(m_socketfd, "widget_set Status Status %u %u Idle", m_cols - 3, m_rows);
 		socketPrintf(m_socketfd, "output 0");   // Clear all LEDs
 	}
@@ -189,6 +197,7 @@ void CLCDproc::setErrorInt(const char* text)
 		socketPrintf(m_socketfd, "screen_set DMR -priority hidden");
 		socketPrintf(m_socketfd, "screen_set YSF -priority hidden");
 		socketPrintf(m_socketfd, "screen_set P25 -priority hidden");
+		socketPrintf(m_socketfd, "screen_set NXDN -priority hidden");
 		socketPrintf(m_socketfd, "widget_set Status Status %u %u Error", m_cols - 4, m_rows);
 		socketPrintf(m_socketfd, "output 0");   // Clear all LEDs
 	}
@@ -205,6 +214,7 @@ void CLCDproc::setLockoutInt()
 		socketPrintf(m_socketfd, "screen_set DMR -priority hidden");
 		socketPrintf(m_socketfd, "screen_set YSF -priority hidden");
 		socketPrintf(m_socketfd, "screen_set P25 -priority hidden");
+		socketPrintf(m_socketfd, "screen_set NXDN -priority hidden");
 		socketPrintf(m_socketfd, "widget_set Status Status %u %u Lockout", m_cols - 6, m_rows);
 		socketPrintf(m_socketfd, "output 0");   // Clear all LEDs
 	}
@@ -459,6 +469,51 @@ void CLCDproc::clearP25Int()
 	socketPrintf(m_socketfd, "output 2"); // Set LED2 color green
 }
 
+// LED 5 Green 16 Red 255 Yellow 255
+
+void CLCDproc::writeNXDNInt(const char* source, bool group, unsigned int dest, const char* type)
+{
+	assert(source != NULL);
+	assert(type != NULL);
+
+	m_clockDisplayTimer.stop();           // Stop the clock display
+
+	socketPrintf(m_socketfd, "screen_set NXDN -priority foreground");
+	socketPrintf(m_socketfd, "widget_set NXDN Mode 1 1 NXDN");
+
+	if (m_rows == 2U) {
+		socketPrintf(m_socketfd, "widget_set NXDN Line2 1 2 15 2 h 3 \"%.10s > %s%u\"", source, group ? "TG" : "", dest);
+	} else {
+		socketPrintf(m_socketfd, "widget_set NXDN Line2 1 2 15 2 h 3 \"%.10s >\"", source);
+		socketPrintf(m_socketfd, "widget_set NXDN Line3 1 3 15 3 h 3 \"%s%u\"", group ? "TG" : "", dest);
+		socketPrintf(m_socketfd, "output 255"); // Set LED5 color red
+	}
+
+	m_dmr = false;
+	m_rssiCount1 = 0U;
+}
+
+void CLCDproc::writeNXDNRSSIInt(unsigned char rssi)
+{
+	if (m_rssiCount1 == 0U) {
+		socketPrintf(m_socketfd, "widget_set NXDN Line4 1 4 %u 4 h 3 \"-%3udBm\"", m_cols - 1, rssi);
+	}
+
+	m_rssiCount1++;
+	if (m_rssiCount1 >= NXDN_RSSI_COUNT)
+		m_rssiCount1 = 0U;
+}
+
+void CLCDproc::clearNXDNInt()
+{
+	m_clockDisplayTimer.stop();           // Stop the clock display
+
+	socketPrintf(m_socketfd, "widget_set NXDN Line3 1 2 15 2 h 3 Listening");
+	socketPrintf(m_socketfd, "widget_set NXDN Line3 1 3 15 3 h 3 \"\"");
+	socketPrintf(m_socketfd, "widget_set NXDN Line4 1 4 15 4 h 3 \"\"");
+	socketPrintf(m_socketfd, "output 16"); // Set LED5 color green
+}
+
 void CLCDproc::writeCWInt()
 {
 }
@@ -729,5 +784,21 @@ void CLCDproc::defineScreens()
 	socketPrintf(m_socketfd, "widget_set P25 Line4 4 2 15 2 h 3 \" \"");
 */
 
+	// The NXDN Screen
+
+	socketPrintf(m_socketfd, "screen_add NXDN");
+	socketPrintf(m_socketfd, "screen_set NXDN -name NXDN -heartbeat on -priority hidden -backlight on");
+
+	socketPrintf(m_socketfd, "widget_add NXDN Mode string");
+	socketPrintf(m_socketfd, "widget_add NXDN Line2 scroller");
+	socketPrintf(m_socketfd, "widget_add NXDN Line3 scroller");
+	socketPrintf(m_socketfd, "widget_add NXDN Line4 scroller");
+
+/* Do we need to pre-populate the values??
+	socketPrintf(m_socketfd, "widget_set NXDN Line3 2 1 15 1 h 3 Listening");
+	socketPrintf(m_socketfd, "widget_set NXDN Line3 3 1 15 1 h 3 \" \"");
+	socketPrintf(m_socketfd, "widget_set NXDN Line4 4 2 15 2 h 3 \" \"");
+*/
+
 	m_screensDefined = true;
 }

LCDproc.h

@@ -1,5 +1,6 @@
 /*
- *   Copyright (C) 2016, 2017 by Tony Corbett G0WFV
+ *   Copyright (C) 2016,2017 by Tony Corbett G0WFV
+ *   Copyright (C) 2018 by Jonathan Naylor G4KLX
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -55,6 +56,10 @@ class CLCDproc : public CDisplay
   virtual void writeP25RSSIInt(unsigned char rssi); 
   virtual void clearP25Int();
 
+  virtual void writeNXDNInt(const char* source, bool group, unsigned int dest, const char* type);
+  virtual void writeNXDNRSSIInt(unsigned char rssi);
+  virtual void clearNXDNInt();
+
   virtual void writeCWInt();
   virtual void clearCWInt();