Add POCSAG processing and display code.

alistairuk · Jun 11, 2018 · b398bba · b398bba
1 parent 27c7342
commit b398bba
Show file tree

Hide file tree

Showing 33 changed files with 355 additions and 15 deletions.
diff --git a/Display.cpp b/Display.cpp
@@ -298,6 +298,25 @@ void CDisplay::clearNXDN()
 	}
 }
 
+void CDisplay::writePOCSAG(uint32_t ric, const std::string& message)
+{
+	m_timer1.start();
+	m_mode1 = MODE_POCSAG;
+
+	writePOCSAGInt(ric, message);
+}
+
+void CDisplay::clearPOCSAG()
+{
+	if (m_timer1.hasExpired()) {
+		clearPOCSAGInt();
+		m_timer1.stop();
+		m_mode1 = MODE_IDLE;
+	} else {
+		m_mode1 = MODE_POCSAG;
+	}
+}
+
 void CDisplay::writeCW()
 {
 	m_timer1.start();
@@ -336,6 +355,11 @@ void CDisplay::clock(unsigned int ms)
 			m_mode1 = MODE_IDLE;
 			m_timer1.stop();
 			break;
+		case MODE_POCSAG:
+			clearPOCSAGInt();
+			m_mode1 = MODE_IDLE;
+			m_timer1.stop();
+			break;
 		case MODE_CW:
 			clearCWInt();
 			m_mode1 = MODE_IDLE;

diff --git a/Display.h b/Display.h
@@ -23,6 +23,8 @@
 
 #include <string>
 
+#include <cstdint>
+
 class CDisplay
 {
 public:
@@ -61,8 +63,10 @@ class CDisplay
 	void writeNXDNBER(float ber);
 	void clearNXDN();
 
+	void writePOCSAG(uint32_t ric, const std::string& message);
+	void clearPOCSAG();
+
 	void writeCW();
-	void clearCW();
 
 	virtual void close() = 0;
 
@@ -99,6 +103,9 @@ class CDisplay
 	virtual void writeNXDNBERInt(float ber);
 	virtual void clearNXDNInt() = 0;
 
+	virtual void writePOCSAGInt(uint32_t ric, const std::string& message) = 0;
+	virtual void clearPOCSAGInt() = 0;
+
 	virtual void writeCWInt() = 0;
 	virtual void clearCWInt() = 0;
 

diff --git a/HD44780.cpp b/HD44780.cpp
@@ -995,6 +995,18 @@ void CHD44780::clearNXDNInt()
 	}
 }
 
+void CHD44780::writePOCSAGInt(uint32_t ric, const std::string& message)
+{
+	::lcdPosition(m_fd, m_cols - 5, m_rows - 1);
+	::lcdPuts(m_fd, "POCSAG TX");
+}
+
+void CHD44780::clearPOCSAGInt()
+{
+	::lcdPosition(m_fd, m_cols - 5, m_rows - 1);
+	::lcdPuts(m_fd, " Idle");
+}
+
 void CHD44780::writeCWInt()
 {
 	::lcdPosition(m_fd, m_cols - 5, m_rows - 1);

diff --git a/HD44780.h b/HD44780.h
@@ -121,6 +121,9 @@ class CHD44780 : public CDisplay
   virtual void writeNXDNRSSIInt(unsigned char rssi); 
   virtual void clearNXDNInt();
 
+  virtual void writePOCSAG(uint32_t ric, const std::string& message);
+  virtual void clearPOCSAGInt();
+
   virtual void writeCWInt();
   virtual void clearCWInt();
 

diff --git a/Images/POCSAG.bmp b/Images/POCSAG.bmp
diff --git a/LCDproc.cpp b/LCDproc.cpp
@@ -514,6 +514,14 @@ void CLCDproc::clearNXDNInt()
 	socketPrintf(m_socketfd, "output 16"); // Set LED5 color green
 }
 
+void CLCDproc::writePOCSAGInt(uint32_t ric, const std::string& message)
+{
+}
+
+void CLCDproc::clearPOCSAGInt()
+{
+}
+
 void CLCDproc::writeCWInt()
 {
 }

diff --git a/LCDproc.h b/LCDproc.h
@@ -60,6 +60,9 @@ class CLCDproc : public CDisplay
   virtual void writeNXDNRSSIInt(unsigned char rssi);
   virtual void clearNXDNInt();
 
+  virtual void writePOCSAGInt(uint32_t ric, const std::string& message);
+  virtual void clearPOCSAGInt();
+
   virtual void writeCWInt();
   virtual void clearCWInt();
 

diff --git a/Nextion.cpp b/Nextion.cpp
@@ -616,7 +616,7 @@ void CNextion::writeNXDNInt(const char* source, bool group, unsigned int dest, c
 
 	if (m_mode != MODE_NXDN) {
 		sendCommand("page NXDN");
-		sendCommandAction(6U);
+		sendCommandAction(7U);
 	}
 
 	char text[30U];
@@ -679,6 +679,36 @@ void CNextion::clearNXDNInt()
 	sendCommand("t3.txt=\"\"");
 }
 
+void CNextion::writePOCSAGInt(uint32_t ric, const std::string& message)
+{
+	if (m_mode != MODE_POCSAG) {
+		sendCommand("page POCSAG");
+		sendCommandAction(6U);
+	}
+
+	char text[30U];
+	::sprintf(text, "dim=%u", m_brightness);
+	sendCommand(text);
+
+	::sprintf(text, "t0.txt=\"RIC: %u\"", ric);
+	sendCommand(text);
+	sendCommandAction(132U);
+
+	::sprintf(text, "t1.txt=\"MSG: %s\"", message.c_str());
+	sendCommand(text);
+	sendCommandAction(133U);
+
+	m_clockDisplayTimer.stop();
+
+	m_mode = MODE_POCSAG;
+}
+
+void CNextion::clearPOCSAGInt()
+{
+	sendCommand("t1.txt=\"MMDVM IDLE\"");
+	sendCommandAction(134U);
+}
+
 void CNextion::writeCWInt()
 {
 	sendCommand("t1.txt=\"Sending CW Ident\"");

diff --git a/Nextion.h b/Nextion.h
@@ -68,6 +68,9 @@ class CNextion : public CDisplay
   virtual void writeNXDNBERInt(float ber);
   virtual void clearNXDNInt();
 
+  virtual void writePOCSAGInt(uint32_t ric, const std::string& message);
+  virtual void clearPOCSAGInt();
+
   virtual void writeCWInt();
   virtual void clearCWInt();
 

diff --git a/Nextion_G4KLX/NX3224K024.HMI b/Nextion_G4KLX/NX3224K024.HMI
diff --git a/Nextion_G4KLX/NX3224K024.tft b/Nextion_G4KLX/NX3224K024.tft
diff --git a/Nextion_G4KLX/NX3224K028.HMI b/Nextion_G4KLX/NX3224K028.HMI
diff --git a/Nextion_G4KLX/NX3224K028.tft b/Nextion_G4KLX/NX3224K028.tft
diff --git a/Nextion_G4KLX/NX3224T024.HMI b/Nextion_G4KLX/NX3224T024.HMI
diff --git a/Nextion_G4KLX/NX3224T024.tft b/Nextion_G4KLX/NX3224T024.tft
diff --git a/Nextion_G4KLX/NX3224T028.HMI b/Nextion_G4KLX/NX3224T028.HMI
diff --git a/Nextion_G4KLX/NX3224T028.tft b/Nextion_G4KLX/NX3224T028.tft
diff --git a/Nextion_G4KLX/NX4024K032.HMI b/Nextion_G4KLX/NX4024K032.HMI
diff --git a/Nextion_G4KLX/NX4024K032.tft b/Nextion_G4KLX/NX4024K032.tft
diff --git a/Nextion_G4KLX/NX4024T032.HMI b/Nextion_G4KLX/NX4024T032.HMI
diff --git a/Nextion_G4KLX/NX4024T032.tft b/Nextion_G4KLX/NX4024T032.tft
diff --git a/Nextion_G4KLX/NX4832K035.HMI b/Nextion_G4KLX/NX4832K035.HMI
diff --git a/Nextion_G4KLX/NX4832K035.tft b/Nextion_G4KLX/NX4832K035.tft
diff --git a/Nextion_G4KLX/NX4832T035.HMI b/Nextion_G4KLX/NX4832T035.HMI
diff --git a/Nextion_G4KLX/NX4832T035.tft b/Nextion_G4KLX/NX4832T035.tft
diff --git a/NullDisplay.cpp b/NullDisplay.cpp
@@ -126,6 +126,20 @@ void CNullDisplay::clearNXDNInt()
 #endif
 }
 
+void CNullDisplay::writePOCSAGInt(uint32_t ric, const std::string& message)
+{
+#if defined(RASPBERRY_PI)
+	::digitalWrite(LED_STATUS, 1);
+#endif
+}
+
+void CNullDisplay::clearPOCSAGInt()
+{
+#if defined(RASPBERRY_PI)
+	::digitalWrite(LED_STATUS, 0);
+#endif
+}
+
 void CNullDisplay::writeCWInt()
 {
 }

diff --git a/NullDisplay.h b/NullDisplay.h
@@ -53,6 +53,9 @@ class CNullDisplay : public CDisplay
 	virtual void writeNXDNInt(const char* source, bool group, unsigned int dest, const char* type);
 	virtual void clearNXDNInt();
 
+	virtual void writePOCSAGInt(uint32_t ric, const std::string& message);
+	virtual void clearPOCSAGInt();
+
 	virtual void writeCWInt();
 	virtual void clearCWInt();