1 files changed, 91 insertions, 81 deletions

diff --git a/oliver/dr_desk/src/main.cpp b/oliver/dr_desk/src/main.cpp
index 6f31b76..8791c80 100644
--- a/oliver/dr_desk/src/main.cpp
+++ b/oliver/dr_desk/src/main.cpp
@@ -1,22 +1,17 @@
 #include <Arduino.h>
 #include <ESP8266mDNS.h>
-#include <PubSubClient.h>
 #include <WiFiManager.h>
 #include <FastLED.h>
+#include <PubSubClient.h>
 #include <ESP8266httpUpdate.h>
-#include "secrets.h"
 
-#define _STR(s) #s
-#define STR(s) _STR(s)
-
-const char* mqtt_server = "192.168.1.2"; //MQTT Server IP, your home MQTT server eg Mosquitto on RPi, or some public MQTT
-const int mqtt_port     = 1883; //MQTT Server PORT, default is 1883 but can be anything.
-
-const char* mqtt_pingall_sub = "home/pingall";
-const char* mqtt_pingall_pub = "home/pingall/response";
+#include "secrets.h"
 
-#define MQTT_BASE "home/diningroom/desk"
-const char* mqtt_device_boot = MQTT_BASE "/device";
+#define MQTT_BROKER       "192.168.1.5"
+#define MQTT_BROKER_PORT  1883
+//#define MQTT_USERNAME   ""
+//#define MQTT_PASSWORD   ""
+#define MQTT_BASE         "home/diningroom/desk"
 
 const char* mqtt_mode_sub = MQTT_BASE;
 const char* mqtt_mode_pub = MQTT_BASE "/status";
@@ -33,16 +28,25 @@ const char* mqtt_brightness_pub = MQTT_BASE "/brightness/status";
 #define RGB_COLOR_ORDER GRB
 #define NUM(a) (sizeof(a) / sizeof(*a))
 
-#define FIRMWARE_VERSION  1
-//#define FIRMWARE_URL    ""
+// fw update
+// - increment number + build
+// - scp .pio/build/$ENV/firmware.bin manuel@mausz.at:public_html/coding/.firmware/olidrdesk.bin
+// - reboot device or send "fwupdate" to mqtt_topic_cmd
+// - fw update state is published in mqtt_topic_state
+#define FIRMWARE_VERSION 1
+//#define FIRMWARE_URL   ""
 
-WiFiClient espClient;
-PubSubClient client(espClient);
-char convBuffer[10];
-CRGB leds[RGB_NUM_LEDS];
+#define _STR(s) #s
+#define STR(s) _STR(s)
 
-void callback(char *topic, uint8_t *payload, unsigned int length);
-void blink();
+const String mqtt_clientId = "DrDesk-" + String(ESP.getChipId())
+                               + "/v" + STR(FIRMWARE_VERSION);
+const char* mqtt_topic_ping  = MQTT_BASE "/ping";
+const char* mqtt_topic_cmd = MQTT_BASE "/command";
+const String mqtt_topic_state = String(MQTT_BASE) + "/" + String(ESP.getChipId());
+
+bool mqttLoop();
+void mqttCallback(char *topic, byte *payload, unsigned int length);
 void checkFirmwareUpdate();
 
 void switchMode(struct mode *mode);
@@ -52,6 +56,11 @@ void modeRainbow();
 void modeRainbowFast();
 void modeStrobo();
 
+WiFiClient wifi_client;
+PubSubClient mqtt(wifi_client);
+char convBuffer[10];
+CRGB leds[RGB_NUM_LEDS];
+
 struct mode {
   const char *name;
   void (*func)();
@@ -92,7 +101,9 @@ void setup()
   WiFiManager wifiManager;
   wifiManager.setConfigPortalTimeout(600);
   Serial.printf_P(PSTR("Setting up WiFi\n"));
-  if (!wifiManager.autoConnect("ESP8266_DR_DESK")) {
+  WiFi.hostname("drdesk");
+  if (!wifiManager.autoConnect("ESP8266_DR_DESK"))
+  {
     Serial.printf_P(PSTR("Failed to connect and hit timeout\n"));
     delay(5000);
     ESP.restart();
@@ -102,63 +113,71 @@ void setup()
   checkFirmwareUpdate();
   yield();
 
-  client.setServer(mqtt_server, mqtt_port);
-  client.setCallback(callback);
+  mqtt.setServer(MQTT_BROKER, MQTT_BROKER_PORT);
+  mqtt.setCallback(mqttCallback);
 
   digitalWrite(LED_BUILTIN, HIGH);  //Turn off led as default
 }
 
-void reconnect()
+bool mqttLoop()
 {
-  // Loop until we're reconnected
-  while (!client.connected())
+  if (!mqtt.connected())
   {
-    // Create a random client ID
-    String clientId = "ESP8266Client-";
-    clientId += String(random(0xffff), HEX);
+    Serial.printf_P(PSTR("Connecting to MQTT\n"));
+    if (!mqtt.connect(mqtt_clientId.c_str(), MQTT_USERNAME, MQTT_PASSWORD))
+      return false;
+
+    Serial.printf_P(PSTR("MQTT connected\n"));
+    mqtt.publish(mqtt_topic_ping, mqtt_clientId.c_str());
+    mqtt.subscribe(mqtt_topic_ping);
+    mqtt.subscribe(mqtt_topic_cmd);
+
+    // publish states
+    Serial.println(mqtt_mode_sub);
+    mqtt.subscribe(mqtt_mode_sub);
+    mqtt.publish(mqtt_mode_pub, set.mode->name, true);
+
+    Serial.println(mqtt_color_sub);
+    mqtt.subscribe(mqtt_color_sub);
+    itoa(set.color, convBuffer, 10);
+    mqtt.publish(mqtt_color_pub, convBuffer, true);
 
-    // Attempt to connect
-    if (client.connect(clientId.c_str()))
-    {
-      // Once connected, publish an announcement...
-      client.publish(mqtt_device_boot, "connected");
-      // ... and resubscribe
-      client.subscribe(mqtt_pingall_sub);
-
-      // publish states
-      Serial.println(mqtt_mode_sub);
-      client.subscribe(mqtt_mode_sub);
-      client.publish(mqtt_mode_pub, set.mode->name, true);
-
-      Serial.println(mqtt_color_sub);
-      client.subscribe(mqtt_color_sub);
-      itoa(set.color, convBuffer, 10);
-      client.publish(mqtt_color_pub, convBuffer, true);
-
-      Serial.println(mqtt_brightness_sub);
-      client.subscribe(mqtt_brightness_sub);
-      itoa(map(set.brightness, 0, 255, 0, 100), convBuffer, 10);
-      client.publish(mqtt_brightness_pub, convBuffer, true);
-    }
-    else
-    {
-      // Wait 5 seconds before retrying
-      delay(5000);
-    }
+    Serial.println(mqtt_brightness_sub);
+    mqtt.subscribe(mqtt_brightness_sub);
+    itoa(map(set.brightness, 0, 255, 0, 100), convBuffer, 10);
+    mqtt.publish(mqtt_brightness_pub, convBuffer, true);
   }
+
+  yield();
+  mqtt.loop();
+  return true;
 }
 
-void callback(char *topic, uint8_t *payload, unsigned int length)
+void mqttCallback(char *topic, byte *payload, unsigned int length)
 {
-  uint8_t c_payload[length];
+  char c_payload[length + 1];
   memcpy(c_payload, payload, length);
   c_payload[length] = '\0';
 
-  if (strcmp(topic, mqtt_pingall_sub) == 0)
+  if (!strcmp(topic, mqtt_topic_ping))
+  {
+    if (!strcmp(c_payload, "ping"))
+      mqtt.publish(mqtt_topic_ping, mqtt_clientId.c_str());
+    return;
+  }
+  else if (!strcmp(topic, mqtt_topic_cmd))
   {
-    blink();
-    client.publish(mqtt_pingall_pub,
-      "{\"diningroom_desk\":\"connected\"}");
+    if (!strcmp(c_payload, "fwupdate"))
+    {
+      checkFirmwareUpdate();
+      return;
+    }
+    else if (!strcmp(c_payload, "reset"))
+    {
+      Serial.printf_P(PSTR("Resetting\n"));
+      ESP.reset();
+      return;
+    }
   }
   else if (strcmp(topic, mqtt_mode_sub) == 0)
   {
@@ -179,25 +198,17 @@ void callback(char *topic, uint8_t *payload, unsigned int length)
     set.color = atoi((char *)c_payload);
     current.idle = false;
     itoa(set.color, convBuffer, 10);
-    client.publish(mqtt_color_pub, convBuffer, true);
+    mqtt.publish(mqtt_color_pub, convBuffer, true);
   }
   else if (strcmp(topic, mqtt_brightness_sub) == 0)
   {
     set.brightness = map(atoi((char *)c_payload), 0, 100, 0, 255);
     current.idle = false;
     itoa(map(set.brightness, 0, 255, 0, 100), convBuffer, 10);
-    client.publish(mqtt_brightness_pub, convBuffer, true);
+    mqtt.publish(mqtt_brightness_pub, convBuffer, true);
   }
 }
 
-void blink()
-{
-  //Blink on received MQTT message
-  digitalWrite(LED_BUILTIN, LOW);
-  delay(25);
-  digitalWrite(LED_BUILTIN, HIGH);
-}
-
 void calcBrightness()
 {
   #define FADE_STEP 10
@@ -217,7 +228,7 @@ void switchMode(struct mode *mode)
   Serial.println(mode->name);
   set.mode = mode;
   current.idle = false;
-  client.publish(mqtt_mode_pub, set.mode->name, true);
+  mqtt.publish(mqtt_mode_pub, set.mode->name, true);
 }
 
 void modeOff()
@@ -270,7 +281,7 @@ void checkFirmwareUpdate()
   BearSSL::WiFiClientSecure update_client;
   update_client.setInsecure();
 
-  client.publish(mqtt_device_boot, "fwupdate running");
+  mqtt.publish(mqtt_topic_state.c_str(), "fwupdate running");
   ESPhttpUpdate.setLedPin(LED_BUILTIN, HIGH);
   ESPhttpUpdate.rebootOnUpdate(true);
   t_httpUpdate_return ret = ESPhttpUpdate.update(update_client, FIRMWARE_URL, STR(FIRMWARE_VERSION));
@@ -281,27 +292,26 @@ void checkFirmwareUpdate()
         Serial.printf_P(PSTR("HTTP_UPDATE_FAILED Error (%d): %s\n"),
           ESPhttpUpdate.getLastError(), ESPhttpUpdate.getLastErrorString().c_str());
         String tmp = String("fwupdate error: ") + ESPhttpUpdate.getLastErrorString();
-        client.publish(mqtt_device_boot, tmp.c_str());
+        mqtt.publish(mqtt_topic_state.c_str(), tmp.c_str());
       }
       break;
 
     case HTTP_UPDATE_NO_UPDATES:
       Serial.printf_P(PSTR("HTTP_UPDATE_NO_UPDATES\n"));
-      client.publish(mqtt_device_boot, "fwupdate noupdates");
+      mqtt.publish(mqtt_topic_state.c_str(), "fwupdate noupdates");
       break;
 
     case HTTP_UPDATE_OK:
       Serial.printf_P(PSTR("HTTP_UPDATE_OK\n"));
-      client.publish(mqtt_device_boot, "fwupdate ok");
+      mqtt.publish(mqtt_topic_state.c_str(), "fwupdate ok");
       break;
   }
 }
 
 void loop()
 {
-  if (!client.connected())
-    reconnect();
-  client.loop();
+  if (!mqttLoop())
+    delay(5000);
 
   EVERY_N_MILLISECONDS(100)
   {