From e0501cff0f9f819c6f69f354a7fe03a23617face Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Thu, 9 Jan 2020 15:12:51 +0100
Subject: [PATCH] add owrx message passing and frontend

---
 csdr/csdr.py             |  2 ++
 htdocs/css/openwebrx.css | 27 +++++++++++++++++++--------
 htdocs/index.html        |  7 +++++++
 htdocs/openwebrx.js      | 15 +++++++++++++++
 owrx/connection.py       |  3 +++
 5 files changed, 46 insertions(+), 8 deletions(-)

diff --git a/csdr/csdr.py b/csdr/csdr.py
index 29946ae..c80d15e 100644
--- a/csdr/csdr.py
+++ b/csdr/csdr.py
@@ -355,6 +355,8 @@ class dsp(object):
             # we best get the ax25 packets from the kiss socket
             kiss = KissClient(self.direwolf_port)
             self.output.send_output("packet_demod", kiss.read)
+        elif self.isPocsag():
+            self.output.send_output("pocsag_demod", self.secondary_process_demod.stdout.readline)
         else:
             self.output.send_output("secondary_demod", partial(self.secondary_process_demod.stdout.read, 1))
 
diff --git a/htdocs/css/openwebrx.css b/htdocs/css/openwebrx.css
index 12d42e2..f59e197 100644
--- a/htdocs/css/openwebrx.css
+++ b/htdocs/css/openwebrx.css
@@ -939,13 +939,15 @@ img.openwebrx-mirror-img
 }
 
 #openwebrx-panel-wsjt-message,
-#openwebrx-panel-packet-message
+#openwebrx-panel-packet-message,
+#openwebrx-panel-pocsag-message
 {
     height: 180px;
 }
 
 #openwebrx-panel-wsjt-message tbody,
-#openwebrx-panel-packet-message tbody
+#openwebrx-panel-packet-message tbody,
+#openwebrx-panel-pocsag-message tbody
 {
     display: block;
     overflow: auto;
@@ -954,7 +956,8 @@ img.openwebrx-mirror-img
 }
 
 #openwebrx-panel-wsjt-message thead tr,
-#openwebrx-panel-packet-message thead tr
+#openwebrx-panel-packet-message thead tr,
+#openwebrx-panel-pocsag-message thead tr
 {
     display: block;
 }
@@ -962,7 +965,9 @@ img.openwebrx-mirror-img
 #openwebrx-panel-wsjt-message th,
 #openwebrx-panel-wsjt-message td,
 #openwebrx-panel-packet-message th,
-#openwebrx-panel-packet-message td
+#openwebrx-panel-packet-message td,
+#openwebrx-panel-pocsag-message th,
+#openwebrx-panel-pocsag-message td
 {
     width: 50px;
     text-align: left;
@@ -995,6 +1000,14 @@ img.openwebrx-mirror-img
     text-align: center;
 }
 
+#openwebrx-panel-pocsag-message .address {
+    width: 100px;
+}
+
+#openwebrx-panel-pocsag-message .message {
+    width: 400px;
+}
+
 .aprs-symbol {
     display: inline-block;
     width: 15px;
@@ -1076,6 +1089,7 @@ img.openwebrx-mirror-img
 #openwebrx-panel-digimodes[data-mode="jt9"]    #openwebrx-digimode-content-container,
 #openwebrx-panel-digimodes[data-mode="ft4"]    #openwebrx-digimode-content-container,
 #openwebrx-panel-digimodes[data-mode="packet"] #openwebrx-digimode-content-container,
+#openwebrx-panel-digimodes[data-mode="pocsag"] #openwebrx-digimode-content-container,
 #openwebrx-panel-digimodes[data-mode="ft8"]    #openwebrx-digimode-select-channel,
 #openwebrx-panel-digimodes[data-mode="wspr"]   #openwebrx-digimode-select-channel,
 #openwebrx-panel-digimodes[data-mode="jt65"]   #openwebrx-digimode-select-channel,
@@ -1087,16 +1101,13 @@ img.openwebrx-mirror-img
     display: none;
 }
 
-#openwebrx-panel-digimodes[data-mode="pocsag"]    #openwebrx-digimode-content-container {
-    height: 200px;
-}
-
 #openwebrx-panel-digimodes[data-mode="ft8"]    #openwebrx-digimode-canvas-container,
 #openwebrx-panel-digimodes[data-mode="wspr"]   #openwebrx-digimode-canvas-container,
 #openwebrx-panel-digimodes[data-mode="jt65"]   #openwebrx-digimode-canvas-container,
 #openwebrx-panel-digimodes[data-mode="jt9"]    #openwebrx-digimode-canvas-container,
 #openwebrx-panel-digimodes[data-mode="ft4"]    #openwebrx-digimode-canvas-container,
 #openwebrx-panel-digimodes[data-mode="packet"] #openwebrx-digimode-canvas-container,
+#openwebrx-panel-digimodes[data-mode="pocsag"] #openwebrx-digimode-canvas-container
 {
     height: 200px;
     margin: -10px;
diff --git a/htdocs/index.html b/htdocs/index.html
index 12f1cf1..282b59d 100644
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -87,6 +87,13 @@
                 </tr></thead>
                 <tbody></tbody>
             </table>
+            <table class="openwebrx-panel" id="openwebrx-panel-pocsag-message" style="display: none; width: 619px;" data-panel-name="pocsag-message">
+                <thead><tr>
+                    <th class="address">Address</th>
+                    <th class="message">Message</th>
+                </tr></thead>
+                <tbody></tbody>
+            </table>
             <div class="openwebrx-panel openwebrx-meta-panel" id="openwebrx-panel-metadata-ysf" style="display: none;" data-panel-name="metadata-ysf">
                 <div class="openwebrx-meta-frame">
                     <div class="openwebrx-meta-slot">
diff --git a/htdocs/openwebrx.js b/htdocs/openwebrx.js
index 9def988..1288d6d 100644
--- a/htdocs/openwebrx.js
+++ b/htdocs/openwebrx.js
@@ -1146,6 +1146,9 @@ function on_ws_recv(evt) {
                     case 'log_message':
                         divlog(json['value'], true);
                         break;
+                    case 'pocsag_data':
+                        update_pocsag_panel(json['value']);
+                        break
                     default:
                         console.warn('received message of unknown type: ' + json['type']);
                 }
@@ -1389,6 +1392,17 @@ function update_packet_panel(msg) {
     $b.scrollTop($b[0].scrollHeight);
 }
 
+function update_pocsag_panel(msg) {
+    var $b = $('#openwebrx-panel-pocsag-message').find('tbody');
+    $b.append($(
+        '<tr>' +
+        '<td class="address">' + msg.address + '</td>' +
+        '<td class="message">' + msg.message + '</td>' +
+        '</tr>'
+    ));
+    $b.scrollTop($b[0].scrollHeight);
+}
+
 function update_digitalvoice_panels(showing) {
     $(".openwebrx-meta-panel").each(function (_, p) {
         toggle_panel(p.id, p.id === showing);
@@ -2176,6 +2190,7 @@ function demodulator_digital_replace(subtype) {
     toggle_panel("openwebrx-panel-digimodes", true);
     toggle_panel("openwebrx-panel-wsjt-message", ['ft8', 'wspr', 'jt65', 'jt9', 'ft4'].indexOf(subtype) >= 0);
     toggle_panel("openwebrx-panel-packet-message", subtype === "packet");
+    toggle_panel("openwebrx-panel-pocsag-message", subtype === "pocsag");
 }
 
 function secondary_demod_create_canvas() {
diff --git a/owrx/connection.py b/owrx/connection.py
index 81d939f..612815e 100644
--- a/owrx/connection.py
+++ b/owrx/connection.py
@@ -316,6 +316,9 @@ class OpenWebRxReceiverClient(Client):
     def write_sdr_error(self, message):
         self.send({"type": "sdr_error", "value": message})
 
+    def write_pocsag_data(self, data):
+        self.send({"type": "pocsag_data", "value": data})
+
 
 class MapConnection(Client):
     def __init__(self, conn):