diff --git a/README.md b/README.md index 14b2432..1dc0118 100644 --- a/README.md +++ b/README.md @@ -160,6 +160,8 @@ Need to look at sub panel (combined panels) when serial port is wrong, can't edit config. --> +## Release 3.0.5 (dev) +* added device power to watts in MQTT discovery for power monitoring ## Release 3.0.4 (March 2026) * Fixed AqualinkD not starting when IP not assigned and MQTT enabled. diff --git a/release/aqualinkd-arm64 b/release/aqualinkd-arm64 index 39baff4..ed6fe8d 100755 Binary files a/release/aqualinkd-arm64 and b/release/aqualinkd-arm64 differ diff --git a/release/aqualinkd-armhf b/release/aqualinkd-armhf index 73ec1ff..cd58efa 100755 Binary files a/release/aqualinkd-armhf and b/release/aqualinkd-armhf differ diff --git a/source/mqtt_discovery.c b/source/mqtt_discovery.c index 04adfd6..c5701ec 100644 --- a/source/mqtt_discovery.c +++ b/source/mqtt_discovery.c @@ -289,6 +289,20 @@ const char *HASSIO_PUMP_SENSOR_DISCOVER = "{" "\"icon\": \"mdi:pump\"" "}"; +const char *HASSIO_PUMP_WATT_DISCOVER = "{" + "\"device\": {" HASS_DEVICE "}," + "\"availability\": {" HASS_AVAILABILITY "}," + "\"type\": \"sensor\"," + "\"state_class\": \"measurement\"," + "\"unique_id\": \"aqualinkd_%s%d_%s\"," + "\"name\": \"%s %s %s\"," + "\"state_topic\": \"%s/%s%s\"," + "\"value_template\": \"{{ value_json }}\"," + "\"device_class\": \"power\"," + "\"unit_of_measurement\": \"W\"," + "\"icon\": \"mdi:pump\"" +"}"; + const char *HASSIO_BATTERY_SENSOR_DISCOVER = "{" "\"device\": {" HASS_DEVICE "}," "\"availability\": {" HASS_AVAILABILITY "}," @@ -692,13 +706,21 @@ void publish_mqtt_discovery(struct aqualinkdata *aqdata, struct mg_connection *n sprintf(topic, "%s/sensor/aqualinkd/aqualinkd_%s%d_%s/config", _aqconfig_.mqtt_discovery_topic, "Pump",pn,"RPM"); send_mqtt(nc, topic, msg); - sprintf(msg, HASSIO_PUMP_SENSOR_DISCOVER, + /* + sprintf(msg, HASSIO_PUMP_SENSOR_DISCOVER, connections, _aqconfig_.mqtt_aq_topic, "Pump",pn,"Watts", aqdata->pumps[i].button->label,(rsm_strncasestr(aqdata->pumps[i].button->label,"pump",strlen(aqdata->pumps[i].button->label))!=NULL)?"":"Pump","Watts", _aqconfig_.mqtt_aq_topic,aqdata->pumps[i].button->name ,PUMP_WATTS_TOPIC, - "W"); + "W");*/ + sprintf(msg, HASSIO_PUMP_WATT_DISCOVER, + connections, + _aqconfig_.mqtt_aq_topic, + "Pump",pn,"Watts", + aqdata->pumps[i].button->label,(rsm_strncasestr(aqdata->pumps[i].button->label,"pump",strlen(aqdata->pumps[i].button->label))!=NULL)?"":"Pump","Watts", + _aqconfig_.mqtt_aq_topic,aqdata->pumps[i].button->name ,PUMP_WATTS_TOPIC); + sprintf(topic, "%s/sensor/aqualinkd/aqualinkd_%s%d_%s/config", _aqconfig_.mqtt_discovery_topic, "Pump",pn,"Watts"); send_mqtt(nc, topic, msg); } diff --git a/source/version.h b/source/version.h index a11e277..ad1f36b 100644 --- a/source/version.h +++ b/source/version.h @@ -4,5 +4,5 @@ #define AQUALINKD_SHORT_NAME "AqualinkD" // Use Magor . Minor . Patch -#define AQUALINKD_VERSION "3.0.4" +#define AQUALINKD_VERSION "3.0.5 (dev)" \ No newline at end of file diff --git a/web/config.json b/web/config.json index 7e62487..3094d79 100644 --- a/web/config.json +++ b/web/config.json @@ -56,7 +56,9 @@ "tile_icon_background_color_cool": "rgb(4, 159, 248)", "tile_icon_background_color_enabled": "rgb(78, 196, 0)", "tile_icon_background_color_disabled": "rgb(110, 110, 110)", - "tile_off_opacity": "0.90" + "tile_off_opacity": "0.90", + "csinputcell_background": "#555555", + "options_button_background": "#555555" }, "devices": { "Filter_Pump": {