From 585f633de568538ced3b56238e85e9d2ae30dc78 Mon Sep 17 00:00:00 2001 From: openshwprojects <85486843+openshwprojects@users.noreply.github.com> Date: Fri, 7 Oct 2022 08:07:59 +0200 Subject: [PATCH] better yaml https://github.com/openshwprojects/OpenBK7231T_App/issues/252 --- src/httpserver/http_fns.c | 52 ++++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/src/httpserver/http_fns.c b/src/httpserver/http_fns.c index 1f88ca99d..692fd6081 100644 --- a/src/httpserver/http_fns.c +++ b/src/httpserver/http_fns.c @@ -1350,20 +1350,21 @@ int http_fn_ha_cfg(http_request_t *request) { hass_print_unique_id(request," - unique_id: \"%s\"\n", ENTITY_LIGHT,i); hprintf128(request," name: \"%s %i\"\n",shortDeviceName,i); - hprintf128(request," rgb_command_template: \"{{ '#%%02x%%02x%%02x0000' | format(red, green, blue)}}\"\n"); - hprintf128(request," rgb_state_topic: \"%s/led_basecolor_rgb/get\"\n",clientId); - hprintf128(request," rgb_command_topic: \"cmnd/%s/led_basecolor_rgb\"\n",clientId); - hprintf128(request," command_topic: \"cmnd/%s/led_enableAll\"\n",clientId); - hprintf128(request," state_topic: \"%s/led_enableAll/get\"\n",clientId); - hprintf128(request," availability_topic: \"%s/connected\"\n",clientId); - hprintf128(request," payload_on: 1\n"); - hprintf128(request," payload_off: 0\n"); - hprintf128(request," brightness_command_topic: \"cmnd/%s/led_dimmer\"\n",clientId); - hprintf128(request," brightness_scale: 100\n"); - hprintf128(request," brightness_value_template: \"{{ value }}\"\n"); - hprintf128(request," color_temp_command_topic: \"cmnd/%s/led_temperature\"\n",clientId); - hprintf128(request," color_temp_state_topic: \"%s/led_temperature/get\"\n",clientId); - hprintf128(request," #color_temp_value_template: \"{{ value }}\"\n"); + hprintf128(request," rgb_command_template: \"{{ '#%%02x%%02x%%02x0000' | format(red, green, blue)}}\"\n"); + hprintf128(request," rgb_value_template: \"{{ value[1:3] | int(base=16) }},{{ value[3:5] | int(base=16) }},{{ value[5:7] | int(base=16) }}\"\n"); + hprintf128(request," rgb_state_topic: \"%s/led_basecolor_rgb/get\"\n",clientId); + hprintf128(request," rgb_command_topic: \"cmnd/%s/led_basecolor_rgb\"\n",clientId); + hprintf128(request," command_topic: \"cmnd/%s/led_enableAll\"\n",clientId); + hprintf128(request," state_topic: \"%s/led_enableAll/get\"\n",clientId); + hprintf128(request," availability_topic: \"%s/connected\"\n",clientId); + hprintf128(request," payload_on: 1\n"); + hprintf128(request," payload_off: 0\n"); + hprintf128(request," brightness_command_topic: \"cmnd/%s/led_dimmer\"\n",clientId); + hprintf128(request," brightness_scale: 100\n"); + hprintf128(request," #brightness_value_template: \"{{ value }}\"\n"); + hprintf128(request," color_temp_command_topic: \"cmnd/%s/led_temperature\"\n",clientId); + hprintf128(request," color_temp_state_topic: \"%s/led_temperature/get\"\n",clientId); + hprintf128(request," #color_temp_value_template: \"{{ value }}\"\n"); } else if(pwmCount == 3) { // Enable + RGB control @@ -1378,17 +1379,18 @@ int http_fn_ha_cfg(http_request_t *request) { hass_print_unique_id(request," - unique_id: \"%s\"\n", ENTITY_LIGHT,i); hprintf128(request," name: \"%s %i\"\n",shortDeviceName,i); - hprintf128(request," rgb_command_template: \"{{ '#%%02x%%02x%%02x0000' | format(red, green, blue)}}\"\n"); - hprintf128(request," rgb_state_topic: \"%s/led_basecolor_rgb/get\"\n",clientId); - hprintf128(request," rgb_command_topic: \"cmnd/%s/led_basecolor_rgb\"\n",clientId); - hprintf128(request," command_topic: \"cmnd/%s/led_enableAll\"\n",clientId); - hprintf128(request," state_topic: \"%s/led_enableAll/get\"\n",clientId); - hprintf128(request," availability_topic: \"%s/connected\"\n",clientId); - hprintf128(request," payload_on: 1\n"); - hprintf128(request," payload_off: 0\n"); - hprintf128(request," brightness_command_topic: \"cmnd/%s/led_dimmer\"\n",clientId); - hprintf128(request," brightness_scale: 100\n"); - hprintf128(request," brightness_value_template: \"{{ value }}\"\n"); + hprintf128(request," rgb_command_template: \"{{ '#%%02x%%02x%%02x0000' | format(red, green, blue)}}\"\n"); + hprintf128(request," rgb_value_template: \"{{ value[1:3] | int(base=16) }},{{ value[3:5] | int(base=16) }},{{ value[5:7] | int(base=16) }}\"\n"); + hprintf128(request," rgb_state_topic: \"%s/led_basecolor_rgb/get\"\n",clientId); + hprintf128(request," rgb_command_topic: \"cmnd/%s/led_basecolor_rgb\"\n",clientId); + hprintf128(request," command_topic: \"cmnd/%s/led_enableAll\"\n",clientId); + hprintf128(request," state_topic: \"%s/led_enableAll/get\"\n",clientId); + hprintf128(request," availability_topic: \"%s/connected\"\n",clientId); + hprintf128(request," payload_on: 1\n"); + hprintf128(request," payload_off: 0\n"); + hprintf128(request," brightness_command_topic: \"cmnd/%s/led_dimmer\"\n",clientId); + hprintf128(request," brightness_scale: 100\n"); + hprintf128(request," #brightness_value_template: \"{{ value }}\"\n"); } else if(pwmCount > 0) {