change boot message

include/Telegram.h

@@ -31,5 +31,7 @@ public:
 
     void init();
     void cyclic(unsigned long now);
+
+    int sendMessage(const String& chat_id, const String& text);
 };
 

include/secrets.h_template

@@ -2,6 +2,7 @@
 
 #define TELEGRAM_BOT_TOKEN "123123123123:BBCeAAewGN_wayA123VnbqRNJL4l3dpXy2S"
 #define TELEGRAM_BOT_OWNER "321123321"
+//#define DEBUGGER_TELEGRAM_ID "32121321"       //address to send debugging information to via Telegram
 
 #define WIFI_SSID "Wifi_SSID"
 #define WIFI_PASSWORD "secretPassword"

platformio.ini

@@ -17,7 +17,7 @@ lib_deps =
     witnessmenow/UniversalTelegramBot @ ~1.3.0
     adafruit/Adafruit GFX Library @ ~1.12.3
     knolleary/PubSubClient @ ~2.8
-build_flags=-DTELEGRAM_DEBUG
+; build_flags=-DTELEGRAM_DEBUG
 ; OTA update path: hostname is flipdottelegram.fritz.box
 upload_protocol = espota
 upload_port = 172.30.30.50

src/Telegram.cpp

@@ -15,6 +15,12 @@ void Telegram::handleNewMessages(int numNewMessages)
         String chat_id = bot.messages[i].chat_id;
         String text = bot.messages[i].text;
 
+#ifdef DEBUGGER_TELEGRAM_ID
+        bot.sendMessage(DEBUGGER_TELEGRAM_ID, String("Ich habe von ") + bot.messages[i].from_name + "(" + bot.messages[i].from_id + ")" +
+                                                     "im Chat " + bot.messages[i].chat_title + "(" +  bot.messages[i].chat_id + ")" +
+                                                     "folgenden Text empfangen:\n\n" + text);
+#endif  
+
         String from_name = bot.messages[i].from_name;
         if (from_name == "")
             from_name = "Guest";
@@ -55,6 +61,9 @@ void Telegram::handleNewMessages(int numNewMessages)
                     if (DisplayText.isEmpty())
                     {
                         bot.sendMessage(chat_id, "Display text ist leer!!");
+#ifdef DEBUGGER_TELEGRAM_ID
+                        bot.sendMessage(DEBUGGER_TELEGRAM_ID, String("Ich habe an ") + chat_id + " folgenden Text geschrieben:\n\n" + "Display text ist leer!!");
+#endif
                     }
                     else
                     {
@@ -62,6 +71,9 @@ void Telegram::handleNewMessages(int numNewMessages)
                         Answer += DisplayText;
                         Answer += "\".";
                         bot.sendMessage(chat_id, Answer);
+#ifdef DEBUGGER_TELEGRAM_ID
+                        bot.sendMessage(DEBUGGER_TELEGRAM_ID, String("Ich habe an ") + chat_id + " folgenden Text geschrieben:\n\n" + Answer);
+#endif
                     }
                     break;
                 }
@@ -79,6 +91,9 @@ void Telegram::handleNewMessages(int numNewMessages)
             }
 
             bot.sendMessage(chat_id, welcome);
+#ifdef DEBUGGER_TELEGRAM_ID
+            bot.sendMessage(DEBUGGER_TELEGRAM_ID, String("Ich habe an ") + chat_id + " folgenden Text geschrieben:\n\n" + welcome);
+#endif
         }
     }
 }
@@ -141,7 +156,10 @@ void Telegram::init()
     serializeJson(doc, jsonString);
     bot.setMyCommands(jsonString);
 
-    bot.sendMessage(TELEGRAM_BOT_OWNER, "Hi, ich bin online.");
+    bot.sendMessage(TELEGRAM_BOT_OWNER, "Hi, ich bin online und brauche einen neuen Zustand.");
+#ifdef DEBUGGER_TELEGRAM_ID
+    bot.sendMessage(DEBUGGER_TELEGRAM_ID, "Hi DEBUGGER, ich bin online und brauche einen neuen Zustand.");
+#endif
     bot_lasttime = millis();
 }
 
@@ -166,4 +184,9 @@ void Telegram::cyclic(unsigned long now)
 
         bot_lasttime = now;
     }
-}
+}
+
+int Telegram::sendMessage(const String& chat_id, const String& text)
+{
+    return bot.sendMessage(chat_id, text);
+}

src/main.cpp

@@ -218,6 +218,7 @@ void loop()
   unsigned long now = millis();
   static unsigned long lastDisplayRefresh = now;
   static unsigned long lastTelegramRefresh = now;
+  static unsigned long lastWifiDisconnect = now;
 
   if (WiFi.status() == WL_CONNECTED)
   {
@@ -283,6 +284,9 @@ void loop()
     // if wifi is not connected wait for connection
     if (WiFi.status() != oldWifiStatus)
     {
+      /* remember las disconnection time to restart if needed */
+      lastWifiDisconnect = now;
+
       /* we freshly disconnected so tell everybody that we are offline */
       Text = "WLAN \"";
       Text += WIFI_SSID;
@@ -294,6 +298,14 @@ void loop()
 
       oldWifiStatus = WiFi.status();
     }
+
+    if ((now - lastWifiDisconnect) > (5 /* min */ * 60 /* sec/min */ * 1000 /* millisec/sec */))
+    {
+      Serial.println("Wifi disconnected - restarting now");
+
+      delay(2000);
+      esp_restart();
+    }
   }
 
   /* FlipDot Handling */
@@ -418,12 +430,23 @@ String printClose(String Args)
   return Text;
 }
 
+String replaceUTF8Char(const char * message, int &i, unsigned int length);
+
 String printText(String Args)
 {
+
+  auto message = Args.c_str();
+  auto len = Args.length();
+
+  Text = "";
+  for (int i = 0; i < len; i++)
+  {
+    Text += replaceUTF8Char(message, i, len);
+  }
+
   Serial.print("Display would show '");
-  Serial.print(Args);
+  Serial.print(Text);
   Serial.println("'");
-  Text = Args;
   publishClose();
 
   return Text;
@@ -445,6 +468,92 @@ String printLate30(String Args)
   return Text;
 }
 
+String replaceUTF8Char(const char * message, int &i, unsigned int length)
+{
+  String str = "_";
+
+  if ((message[i] < 0x7E))
+  {
+    //ASCII Char
+    str = message[i];
+  }
+  else if (((i + 1) < length) && (message[i] == 0xC3) && (message[i + 1] == 0xA4))
+  {
+    str = "ae";
+    i += 1;
+  }
+  else if (((i + 1) < length) && (message[i] == 0xC3) && (message[i + 1] == 0x84))
+  {
+    str = "Ae";
+    i += 1;
+  }
+  else if (((i + 1) < length) && (message[i] == 0xC3) && (message[i + 1] == 0xB6))
+  {
+    str = "oe";
+    i += 1;
+  }
+  else if (((i + 1) < length) && (message[i] == 0xC3) && (message[i + 1] == 0x96))
+  {
+    str = "Oe";
+    i += 1;
+  }
+  else if (((i + 1) < length) && (message[i] == 0xC3) && (message[i + 1] == 0xBC))
+  {
+    str = "ue";
+    i += 1;
+  }
+  else if (((i + 1) < length) && (message[i] == 0xC3) && (message[i + 1] == 0x9C))
+  {
+    str = "Ue";
+    i += 1;
+  }
+  else if (((i + 1) < length) && (message[i] == 0xC3) && (message[i + 1] == 0x9F))
+  {
+    str = "ss";
+    i += 1;
+  }
+  else if (((i + 1) < length) && (message[i] == 0xC2) && (message[i + 1] == 0xB2))
+  {
+    str = "2";
+    i += 1;
+  }
+  else if (((i + 1) < length) && (message[i] == 0xC2) && (message[i + 1] == 0xB3))
+  {
+    str = "3";
+    i += 1;
+  }
+  else if (((i + 1) < length) && (message[i] == 0xC2) && (message[i + 1] == 0xB4))
+  {
+    str = "'";
+    i += 1;
+  }
+  else if (((i + 1) < length) && (message[i] == 0xC2) && (message[i + 1] == 0xB5))
+  {
+    str = "u";
+    i += 1;
+  }
+  else if (((i + 2) < length) && (message[i] == 0xE2) && (message[i + 1] == 0x82) && (message[i + 2] == 0xAC))
+  {
+    str = "EUR";
+    i += 2;
+  }
+  else if (message[i] & 0xC0)
+  {
+    //if utf8 char was not handled above find end of utf8 char
+    while (i < length)
+    {
+      i++;
+      if (!(message[i] & 0x80) || ((message[i] & 0xC0) == 0xC0))
+      {
+        i--;
+        break;
+      }
+    }
+  }
+
+  return str;
+}
+
 void mqttCallback(char *topic, unsigned char *message, unsigned int length)
 {
   String MessageString;
@@ -452,7 +561,7 @@ void mqttCallback(char *topic, unsigned char *message, unsigned int length)
   /* Convert all char* to Strings for simpler handling */
   for (int i = 0; i < length; i++)
   {
-    MessageString += (char) message[i];
+    MessageString += replaceUTF8Char((const char*) message, i, length);
   }
   String ToppicString(topic);
 
@@ -471,6 +580,8 @@ void mqttCallback(char *topic, unsigned char *message, unsigned int length)
     {
       printClose(MessageString);
     }
+
+    tele.sendMessage(TELEGRAM_BOT_OWNER, String("Display zeigt \"") + Text + "\" via MQTT");
   }
 
   /* if topic is the text topic try deserializing the json text */
@@ -478,5 +589,7 @@ void mqttCallback(char *topic, unsigned char *message, unsigned int length)
   {
     Serial.println("Text topic received: " + MessageString);
     printText(MessageString);
+
+    tele.sendMessage(TELEGRAM_BOT_OWNER, String("Display zeigt \"") + Text + "\" via MQTT");
   }
 }