From ec57bad917ee331aa60afb4ed32d80429eb52e82 Mon Sep 17 00:00:00 2001 From: LuBeDa Date: Thu, 11 May 2023 17:47:56 +0200 Subject: [PATCH] naming and CI/CD 8 --- README.md | 10 +++++----- components/ehmtxv2/EHMTX.cpp | 8 ++++---- tests/ehtmxv2-template.yaml | 30 +++++++++++++++--------------- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index 8ebb33d..ffc72db 100644 --- a/README.md +++ b/README.md @@ -548,7 +548,7 @@ Numerous features are accessible with services from home assistant and lambdas y |service|parameter|result| |---|---|---| -|`status`|none|write some status information to the esphome logs| +|`get_status`|none|write some status information to the esphome logs| |`display_on`|none|turn display off| |`display_off`|none|turn display on| |`hold_screen`|none|show the screen that is currently displayed for the number of seconds longer| @@ -558,9 +558,9 @@ Numerous features are accessible with services from home assistant and lambdas y |`show_gauge"`|"percent", "r", "g", "b"|set the height of the gauge according to the percentage in the given color| |`show_alarm`|"r", "g", "b", "size"|shows the color with the given size in the upper-right corner| |`show_indicator`|"r", "g", "b", "size"|shows the color with the given size in the lower-right corner| -|`clock_color`|"r", "g", "b"|set the default color for the clock/date display| -|`today_color"`|"r", "g", "b"|set the special color for today in the day of week line| -|`weekday_color"`|"r", "g", "b"|set the default color in the day of week line| +|`set_clock_color`|"r", "g", "b"|set the default color for the clock/date display| +|`set_today_color"`|"r", "g", "b"|set the special color for today in the day of week line| +|`set_weekday_color"`|"r", "g", "b"|set the default color in the day of week line| |`del_screen`|"icon_name", "mode"|deletes the specified icon screen from the queue, the [mode](#modes) is a filter| |`force_screen`|"icon_name", "mode"|displays the selected the specified icon screen from the queue, the [mode](#modes) is a filter| |`full_screen`|"icon_name", "lifetime", "screen_time"|show the specified 8x32 icon as full screen| @@ -825,7 +825,7 @@ binary_sensor: id(rgb8x32)->hold_screen(120); ``` -**(D)** Service **status** +**(D)** Service **get_status** This service displays the running queue and a list of icons in the logs diff --git a/components/ehmtxv2/EHMTX.cpp b/components/ehmtxv2/EHMTX.cpp index a739f6f..522bac1 100644 --- a/components/ehmtxv2/EHMTX.cpp +++ b/components/ehmtxv2/EHMTX.cpp @@ -157,7 +157,7 @@ namespace esphome void EHMTX::setup() { ESP_LOGD(TAG, "Setting up services"); - register_service(&EHMTX::get_status, "status"); + register_service(&EHMTX::get_status, "get_status"); register_service(&EHMTX::set_display_on, "display_on"); register_service(&EHMTX::set_display_off, "display_off"); register_service(&EHMTX::hold_screen, "hold_screen", {"time"}); @@ -168,9 +168,9 @@ namespace esphome register_service(&EHMTX::show_alarm, "show_alarm", {"r", "g", "b", "size"}); register_service(&EHMTX::show_indicator, "show_indicator", {"r", "g", "b", "size"}); - register_service(&EHMTX::set_clock_color, "clock_color", {"r", "g", "b"}); - register_service(&EHMTX::set_today_color, "today_color", {"r", "g", "b"}); - register_service(&EHMTX::set_weekday_color, "weekday_color", {"r", "g", "b"}); + register_service(&EHMTX::set_clock_color, "set_clock_color", {"r", "g", "b"}); + register_service(&EHMTX::set_today_color, "set_today_color", {"r", "g", "b"}); + register_service(&EHMTX::set_weekday_color, "set_weekday_color", {"r", "g", "b"}); register_service(&EHMTX::del_screen, "del_screen", {"icon_name", "mode"}); register_service(&EHMTX::force_screen, "force_screen", {"icon_name", "mode"}); diff --git a/tests/ehtmxv2-template.yaml b/tests/ehtmxv2-template.yaml index 263b76d..4f8c1d1 100644 --- a/tests/ehtmxv2-template.yaml +++ b/tests/ehtmxv2-template.yaml @@ -7,7 +7,7 @@ substitutions: external_components: - source: type: local - path: ../components # e.g. /config/esphome/components + path: /config/esphome/EspHoMaTriXv2/components #../components components: [ ehmtxv2 ] esphome: @@ -15,24 +15,24 @@ esphome: name: $devicename on_boot: lambda: |- - if(rgb8x32)->show_indicator(255,100,50,2); - if(rgb8x32)->hide_indicator(); - if(rgb8x32)->show_alarm(255,0,150,3); - if(rgb8x32)->hide_alarm(); - if(rgb8x32)->icon_screen("error","Hallo Text",false,237,20,100,200,150); - if(rgb8x32)->force_screen("error"); - if(rgb8x32)->del_screen("error"); - if(rgb8x32)->del_screen("error",5); - if(rgb8x32)->rainbow_icon_screen("error","Hallo Text",true,237,20,100,200,150); - id(rgb8x32)->status()); + id(rgb8x32)->show_indicator(255,100,50,2); + id(rgb8x32)->hide_indicator(); + id(rgb8x32)->show_alarm(255,0,150,3); + id(rgb8x32)->hide_alarm(); + id(rgb8x32)->icon_screen("error","Hallo Text",false,237,20,100,200,150); + id(rgb8x32)->force_screen("error"); + id(rgb8x32)->del_screen("error"); + id(rgb8x32)->del_screen("error",5); + id(rgb8x32)->rainbow_icon_screen("error","Hallo Text",true,237,20); + id(rgb8x32)->get_status(); id(rgb8x32)->set_display_on(); id(rgb8x32)->set_display_off(); id(rgb8x32)->hold_screen(); id(rgb8x32)->show_gauge(100,0,200); id(rgb8x32)->hide_gauge(); - id(rgb8x32)->clock_color(200,100,50); - id(rgb8x32)->today_color(200,100,50); - id(rgb8x32)->weekday_color(200,100,50); + id(rgb8x32)->set_clock_color(200,100,50); + id(rgb8x32)->set_today_color(200,100,50); + id(rgb8x32)->set_weekday_color(200,100,50); id(rgb8x32)->full_screen("scale"); id(rgb8x32)->rainbow_icon_screen("error","Oh ein Text"); id(rgb8x32)->text_screen("text",30); @@ -41,7 +41,7 @@ esphome: id(rgb8x32)->rainbow_clock_screen(30,5); id(rgb8x32)->date_screen(30,5); id(rgb8x32)->rainbow_date_screen(30,5); - id(rgb8x32)->rainbow_blank_screen(30,5); + id(rgb8x32)->blank_screen(30,5); id(rgb8x32)->set_brightness(20); esp32: