3 files changed, 15 insertions, 13 deletions

diff --git a/oliver/dr_desk/.gitignore b/oliver/dr_table/.gitignore
index 89cc49c..89cc49c 100644
--- a/oliver/dr_desk/.gitignore
+++ b/oliver/dr_table/.gitignore
diff --git a/oliver/dr_desk/platformio.ini b/oliver/dr_table/platformio.ini
index e5c54f1..e5c54f1 100644
--- a/oliver/dr_desk/platformio.ini
+++ b/oliver/dr_table/platformio.ini
diff --git a/oliver/dr_desk/src/main.cpp b/oliver/dr_table/src/main.cpp
index 8791c80..309c4a1 100644
--- a/oliver/dr_desk/src/main.cpp
+++ b/oliver/dr_table/src/main.cpp
@@ -11,10 +11,10 @@
 #define MQTT_BROKER_PORT  1883
 //#define MQTT_USERNAME   ""
 //#define MQTT_PASSWORD   ""
-#define MQTT_BASE         "home/diningroom/desk"
+#define MQTT_BASE         "home/diningroom/table"
 
-const char* mqtt_mode_sub = MQTT_BASE;
-const char* mqtt_mode_pub = MQTT_BASE "/status";
+const char* mqtt_mode_sub = MQTT_BASE "/mode";
+const char* mqtt_mode_pub = MQTT_BASE "/mode/status";
 
 const char* mqtt_color_sub = MQTT_BASE "/color";
 const char* mqtt_color_pub = MQTT_BASE "/color/status";
@@ -30,9 +30,9 @@ const char* mqtt_brightness_pub = MQTT_BASE "/brightness/status";
 
 // fw update
 // - increment number + build
-// - scp .pio/build/$ENV/firmware.bin manuel@mausz.at:public_html/coding/.firmware/olidrdesk.bin
+// - scp .pio/build/$ENV/firmware.bin manuel@mausz.at:public_html/coding/.firmware/olidrtable.bin
 // - reboot device or send "fwupdate" to mqtt_topic_cmd
-// - fw update state is published in mqtt_topic_state
+// - fw update state is published in mqtt_topic_status
 #define FIRMWARE_VERSION 1
 //#define FIRMWARE_URL   ""
 
@@ -41,9 +41,9 @@ const char* mqtt_brightness_pub = MQTT_BASE "/brightness/status";
 
 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());
+const char* mqtt_topic_ping   = MQTT_BASE "/ping";
+const char* mqtt_topic_status = MQTT_BASE "/status";
+const char* mqtt_topic_cmd    = MQTT_BASE "/command";
 
 bool mqttLoop();
 void mqttCallback(char *topic, byte *payload, unsigned int length);
@@ -124,11 +124,13 @@ bool mqttLoop()
   if (!mqtt.connected())
   {
     Serial.printf_P(PSTR("Connecting to MQTT\n"));
-    if (!mqtt.connect(mqtt_clientId.c_str(), MQTT_USERNAME, MQTT_PASSWORD))
+    if (!mqtt.connect(mqtt_clientId.c_str(), MQTT_USERNAME, MQTT_PASSWORD,
+        mqtt_topic_status, 0, true, "offline"))
       return false;
 
     Serial.printf_P(PSTR("MQTT connected\n"));
     mqtt.publish(mqtt_topic_ping, mqtt_clientId.c_str());
+    mqtt.publish(mqtt_topic_status, "online", true);
     mqtt.subscribe(mqtt_topic_ping);
     mqtt.subscribe(mqtt_topic_cmd);
 
@@ -281,7 +283,7 @@ void checkFirmwareUpdate()
   BearSSL::WiFiClientSecure update_client;
   update_client.setInsecure();
 
-  mqtt.publish(mqtt_topic_state.c_str(), "fwupdate running");
+  mqtt.publish(mqtt_topic_status, "fwupdate running");
   ESPhttpUpdate.setLedPin(LED_BUILTIN, HIGH);
   ESPhttpUpdate.rebootOnUpdate(true);
   t_httpUpdate_return ret = ESPhttpUpdate.update(update_client, FIRMWARE_URL, STR(FIRMWARE_VERSION));
@@ -292,18 +294,18 @@ 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();
-        mqtt.publish(mqtt_topic_state.c_str(), tmp.c_str());
+        mqtt.publish(mqtt_topic_status, tmp.c_str());
       }
       break;
 
     case HTTP_UPDATE_NO_UPDATES:
       Serial.printf_P(PSTR("HTTP_UPDATE_NO_UPDATES\n"));
-      mqtt.publish(mqtt_topic_state.c_str(), "fwupdate noupdates");
+      mqtt.publish(mqtt_topic_status, "fwupdate noupdates");
       break;
 
     case HTTP_UPDATE_OK:
       Serial.printf_P(PSTR("HTTP_UPDATE_OK\n"));
-      mqtt.publish(mqtt_topic_state.c_str(), "fwupdate ok");
+      mqtt.publish(mqtt_topic_status, "fwupdate ok");
       break;
   }
 }