Adjustments to settings page
This commit is contained in:
@@ -366,21 +366,13 @@ api:
|
||||
id(set_component_color).execute(btnicon.c_str(), btn_icon_font, btn_bg);
|
||||
id(set_component_color).execute(btntext.c_str(), btn_txt_font, btn_bg);
|
||||
id(set_component_color).execute(btnbri.c_str(), btn_bri_font, btn_bg);
|
||||
//id(disp1).set_component_background_color(btnicon.c_str(), btn_bg);
|
||||
//id(disp1).set_component_background_color(btntext.c_str(), btn_bg);
|
||||
//id(disp1).set_component_background_color(btnbri.c_str(), btn_bg);
|
||||
//id(disp1).set_component_font_color(btnicon.c_str(), btn_icon_font);
|
||||
//id(disp1).set_component_font_color(btntext.c_str(), btn_txt_font);
|
||||
//id(disp1).set_component_font_color(btnbri.c_str(), btn_bri_font);
|
||||
id(disp1).set_component_text_printf(btnicon.c_str(), "%s", btn_icon.c_str());
|
||||
//id(disp1).set_component_text_printf(btntext.c_str(), "%s", btn_label.c_str());
|
||||
id(display_wrapped_text).execute(btntext.c_str(), btn_label.c_str(), 10);
|
||||
// id(disp1).set_component_text_printf(btnbri.c_str(), "%s", btn_bri_txt.c_str());
|
||||
if (strcmp(btn_bri_txt.c_str(), "0") != 0) {
|
||||
if (strcmp(btn_bri_txt.c_str(), "0") != 0)
|
||||
id(disp1).set_component_text_printf(btnbri.c_str(), "%s", btn_bri_txt.c_str());
|
||||
} else {
|
||||
else
|
||||
id(disp1).set_component_text_printf(btnbri.c_str(), " ");
|
||||
}
|
||||
|
||||
|
||||
##### SERVICE TO WAKE UP THE DISPLAY #####
|
||||
- service: wake_up
|
||||
@@ -587,18 +579,21 @@ api:
|
||||
reboot: string
|
||||
sleep_mode: string
|
||||
brightness: string
|
||||
dimming: string
|
||||
bright: string
|
||||
dim: string
|
||||
then:
|
||||
- lambda: |-
|
||||
ESP_LOGV("service.page_settings", "Starting");
|
||||
ESP_LOGV("service.page_settings", "reboot: %s", reboot.c_str());
|
||||
ESP_LOGV("service.page_settings", "sleep_mode: %s", sleep_mode.c_str());
|
||||
ESP_LOGV("service.page_settings", "brightness: %s", brightness.c_str());
|
||||
ESP_LOGV("service.page_settings", "dimming: %s", dimming.c_str());
|
||||
ESP_LOGV("service.page_settings", "bright: %s", bright.c_str());
|
||||
ESP_LOGV("service.page_settings", "dim: %s", dim.c_str());
|
||||
if (not reboot.empty()) id(disp1).set_component_text_printf("settings.lbl_reboot", " %s", reboot.c_str());
|
||||
if (not sleep_mode.empty()) id(disp1).set_component_text_printf("settings.lbl_sleep", " %s", sleep_mode.c_str());
|
||||
if (not brightness.empty()) id(disp1).set_component_text_printf("settings.lbl_brightness", "%s", brightness.c_str());
|
||||
if (not dimming.empty()) id(disp1).set_component_text_printf("settings.lbl_dimming", "%s", dimming.c_str());
|
||||
id(display_wrapped_text).execute("settings.lbl_brightness", brightness.c_str(), id(display_mode) == 2 ? 25 : 10);
|
||||
id(display_wrapped_text).execute("settings.lbl_bright", bright.c_str(), id(display_mode) == 2 ? 25 : 10);
|
||||
id(display_wrapped_text).execute("settings.lbl_dim", dim.c_str(), id(display_mode) == 2 ? 25 : 10);
|
||||
|
||||
#### Service to populate the alarm settings page #####
|
||||
- service: alarm_settings
|
||||
@@ -1158,14 +1153,7 @@ text_sensor:
|
||||
else if (page=="buttonpage02" or page=="entitypage02") id(disp1).set_component_text_printf("page_index", "%s", "\uE765\uE764\uE765\uE765"); // 2/4
|
||||
else if (page=="buttonpage03" or page=="entitypage03") id(disp1).set_component_text_printf("page_index", "%s", "\uE765\uE765\uE764\uE765"); // 3/4
|
||||
else if (page=="buttonpage04" or page=="entitypage04") id(disp1).set_component_text_printf("page_index", "%s", "\uE765\uE765\uE765\uE764"); // 4/4
|
||||
else if (page=="settings")
|
||||
{
|
||||
ESP_LOGV("text_sensor.nspanelevent", "Construct settings page");
|
||||
//id(disp1).set_component_text_printf("bt_reboot", "%s", "\uE708"); //mdi:restart
|
||||
id(disp1).set_component_text_printf("bt_sleep", "%s", (id(sleep_mode).state) ? "\uEA19" : "\uEA18"); //mdi:toggle-switch-outline or mdi:toggle-switch-off-outline
|
||||
id(disp1).set_component_text_printf("icon_bright", "%s", "\uE0DD"); //mdi:brightness-5
|
||||
id(disp1).set_component_text_printf("icon_dim", "%s", "\uE0DE"); //mdi:brightness-5
|
||||
}
|
||||
else if (page=="settings") id(disp1).set_component_text_printf("bt_sleep", "%s", (id(sleep_mode).state) ? "\uEA19" : "\uEA18"); //mdi:toggle-switch-outline or mdi:toggle-switch-off-outline
|
||||
else if (page=="notification")
|
||||
{
|
||||
if (not id(confirmation_message).state)
|
||||
@@ -1290,11 +1278,11 @@ text_sensor:
|
||||
#name: ${device_name} touchevent
|
||||
component_name: touchevent
|
||||
internal: true
|
||||
filters:
|
||||
- lambda: |-
|
||||
x = x.c_str();
|
||||
x.shrink_to_fit();
|
||||
return x;
|
||||
#filters:
|
||||
# - lambda: |-
|
||||
# x = x.c_str();
|
||||
# x.shrink_to_fit();
|
||||
# return x;
|
||||
on_value:
|
||||
then:
|
||||
- lambda: |-
|
||||
|
||||
Reference in New Issue
Block a user