From d76d4b063c678da3cedee6e4a9757484c43de353 Mon Sep 17 00:00:00 2001
From: SASANO Takayoshi <uaa@uaa.org.uk>
Date: Wed, 16 Dec 2020 20:39:00 +0900
Subject: [PATCH] revise POCSAG layout for decoded ROT1 message

POCSAGControl.cpp has ROT1 decoder now and it sends
(rublic index) "message" format.

To display whole message, parse text to fit OLED.

- rublic index is after RIC
- discard leading/trailing double quote character
---
 OLED.cpp | 44 ++++++++++++++++++++++++++++++++++++++------
 1 file changed, 38 insertions(+), 6 deletions(-)

diff --git a/OLED.cpp b/OLED.cpp
index 562afde92..34365aaa7 100644
--- a/OLED.cpp
+++ b/OLED.cpp
@@ -568,6 +568,36 @@ void COLED::clearNXDNInt()
 
 void COLED::writePOCSAGInt(uint32_t ric, const std::string& message)
 {
+    int pos;
+    int length = message.length();
+    std::string rublic;
+
+    // extract rublic index "(xx-xx)"
+    switch (ric) {
+    case 4512U:
+    case 4520U:
+        if (length) {
+            std::string::size_type start = message.find("(");
+            std::string::size_type end = message.find(") ");
+            if (start != std::string::npos && end != std::string::npos) {
+                rublic = message.substr(start, end - start + 1);
+                pos = end + 2;
+                break;
+            }
+        }
+        /*FALLTHROUGH*/
+    default:
+        rublic = "";
+        pos = 0;
+        break;
+    }
+
+    // remove double-quotation leading/trailing message
+    if (length && message.at(pos) == '\"' && message.at(length - 1) == '\"') {
+        pos++;
+        length--;
+    }
+
     m_mode = MODE_POCSAG;
 
     m_display.clearDisplay();
@@ -575,6 +605,9 @@ void COLED::writePOCSAGInt(uint32_t ric, const std::string& message)
 
     m_display.setCursor(0,OLED_LINE2);
     m_display.printf("RIC: %u", ric);
+    if (!rublic.empty()) {
+        m_display.printf(" / %s", rublic.c_str());
+    }
 
     m_display.setTextWrap(true);    // text wrap temorally enable
     m_display.setCursor(0,OLED_LINE3);
@@ -583,12 +616,11 @@ void COLED::writePOCSAGInt(uint32_t ric, const std::string& message)
     // due to limitation of AdaFruit_GFX::vprintf() (in ArduiPi_OLED),
     // the maximum string length displayed by single printf() call is 63.
     // to avoid this, divide POCSAG (max 80 chars) message into some pieces.
-    int total = message.length();
-    for (int i = 0; i < total; ) {
-	int remain = total - i;
-	int len = (remain < 40) ? remain : 40;
-	m_display.printf("%s", message.substr(i, len).c_str());
-	i += len;
+    while (pos < length) {
+        int remain = length - pos;
+        int n = (remain < 40) ? remain : 40;
+        m_display.printf("%s", message.substr(pos, n).c_str());
+        pos += n;
     }
     m_display.setTextWrap(false);