Direct controls on wide cards, weather/climate cards, spinner busy state (0.2.23)
App 0.2.23 / firmware 0.2.19. - Wide cards of climate, switch, light, fan, vacuum, cover, media_player, number, select, timer, scene, script and button show Home Assistant style controls on the right (keys, -/+ pill with debounced send, slider with handle, toggle, run key); per-tile choice `options.controls` in the editor with mockup preview; the add-on sends only the set a card really shows. - Weather card: now + next hours and coming days with rain, from daily and hourly forecasts; scenes/scripts/buttons show when they last ran. - Climate card: power key, tap-to-toggle option, fan and swing rows in a redesigned mode picker (grey backdrop, white chips, accent selection). - Busy state as a spinner on a translucent sheet; render guards so only changed styles reach LVGL; dark theme removed from the runtime code. - supported_features above 1e6 reaches the screen; middle dot in text fonts; 18 control glyphs in the icon fonts; diagnostics services preview_climate_picker and preview_busy; demo layout --controls. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
This commit is contained in:
Max Gramser
@@ -0,0 +1,104 @@
|
||||
// c++ -std=c++17 -Wall -Wextra -pedantic tests/test_tile_controls.cpp -o /tmp/test_tile_controls && /tmp/test_tile_controls
|
||||
#include "../components/smart_display/tile_controls.h"
|
||||
#include <cassert>
|
||||
#include <cmath>
|
||||
#include <cstring>
|
||||
|
||||
using namespace tile_controls;
|
||||
using runtime_tiles::Tile;
|
||||
|
||||
static Tile make(const char *entity, const char *state, uint32_t supported = 0) {
|
||||
Tile t; t.entity = entity; t.state = state; t.supported = supported; t.received = true; return t;
|
||||
}
|
||||
|
||||
int main() {
|
||||
// -/+ steps snap to the entity's grid and stay inside its range.
|
||||
assert(step_value(20.0f, 0.5f, 16, 32, 1) == 20.5f);
|
||||
assert(step_value(20.3f, 0.5f, 16, 32, -1) == 20.0f);
|
||||
assert(step_value(31.8f, 1.0f, 16, 32, 1) == 32.0f);
|
||||
assert(step_value(16.0f, 1.0f, 16, 32, -1) == 16.0f);
|
||||
assert(step_value(NAN, 1.0f, 16, 32, 1) == 17.0f);
|
||||
assert(step_value(5.0f, 0.0f, NAN, NAN, 1) == 6.0f);
|
||||
assert(format_value(20.0f, 1.0f, "°") == "20°");
|
||||
assert(format_value(20.5f, 0.5f, "°") == "20.5°");
|
||||
assert(format_value(NAN, 0.5f, "°") == "--");
|
||||
|
||||
// Curtain: horizontal arrows, open disabled when fully open, stop only when supported.
|
||||
Tile curtain = make("cover.gordijnen", "open", 15); curtain.device_class = "curtain"; curtain.position = 100; curtain.controls = "buttons";
|
||||
std::array<Key, 3> keys;
|
||||
assert(keys_for(curtain, keys) == 3);
|
||||
assert(!strcmp(keys[0].icon, glyph::EXPAND) && keys[0].command == COVER_OPEN && keys[0].disabled);
|
||||
assert(keys[1].command == COVER_STOP && !keys[1].disabled);
|
||||
assert(!strcmp(keys[2].icon, glyph::COLLAPSE) && keys[2].command == COVER_CLOSE && !keys[2].disabled);
|
||||
assert(key_action(curtain, COVER_CLOSE).service == "cover.close_cover");
|
||||
Tile shutter = make("cover.rolluik", "closed", 3); shutter.controls = "buttons";
|
||||
assert(keys_for(shutter, keys) == 2 && !strcmp(keys[0].icon, glyph::UP) && keys[1].disabled);
|
||||
assert(status_text(curtain) == "Open · 100%");
|
||||
assert(status_text(shutter) == "Dicht");
|
||||
|
||||
// Vacuum: play while docked, pause while cleaning, dock disabled in the dock.
|
||||
Tile robot = make("vacuum.s8", "docked", 30524); robot.controls = "buttons";
|
||||
assert(keys_for(robot, keys) == 3);
|
||||
assert(!strcmp(keys[0].icon, glyph::PLAY) && keys[0].command == VACUUM_START && !keys[0].disabled);
|
||||
assert(keys[1].command == VACUUM_STOP && keys[1].disabled);
|
||||
assert(keys[2].command == VACUUM_DOCK && keys[2].disabled);
|
||||
assert(key_action(robot, VACUUM_START).service == "vacuum.start");
|
||||
robot.state = "cleaning";
|
||||
assert(keys_for(robot, keys) == 3 && keys[0].command == VACUUM_PAUSE && !keys[1].disabled && !keys[2].disabled);
|
||||
Tile old_robot = make("vacuum.old", "docked", feature::VACUUM_TURN_ON | feature::VACUUM_RETURN); old_robot.controls = "buttons";
|
||||
assert(keys_for(old_robot, keys) == 2 && key_action(old_robot, VACUUM_START).service == "vacuum.turn_on");
|
||||
|
||||
// Media: playback keys follow supported_features; mute flips is_volume_muted.
|
||||
Tile sonos = make("media_player.sonos", "playing", 8321599); sonos.volume = 0.17f; sonos.media_title = "TV"; sonos.controls = "playback";
|
||||
assert(keys_for(sonos, keys) == 3 && !strcmp(keys[1].icon, glyph::PAUSE) && keys[1].command == MEDIA_PLAY_PAUSE);
|
||||
assert(status_text(sonos) == "TV · 17%");
|
||||
Action mute = key_action(sonos, MEDIA_MUTE);
|
||||
assert(mute.service == "media_player.volume_mute" && mute.key == "is_volume_muted" && mute.value == "true");
|
||||
sonos.muted = true; assert(key_action(sonos, MEDIA_MUTE).value == "false");
|
||||
Tile radio = make("media_player.radio", "idle", feature::MEDIA_PLAY | feature::MEDIA_PAUSE); radio.controls = "playback";
|
||||
assert(keys_for(radio, keys) == 1 && !strcmp(keys[0].icon, glyph::PLAY));
|
||||
assert(status_text(radio) == "Inactief");
|
||||
|
||||
// Climate: mode keys in priority order, at most three, the active one checked.
|
||||
Tile ac = make("climate.airco", "cool"); ac.hvac_modes = "[\"off\",\"heat_cool\",\"cool\",\"heat\",\"fan_only\",\"dry\"]"; ac.controls = "mode"; ac.current = 21.5f; ac.target = 20; ac.step = 1;
|
||||
assert(keys_for(ac, keys) == 3);
|
||||
assert(keys[0].arg == "off" && keys[1].arg == "heat" && keys[2].arg == "cool" && keys[2].checked && !keys[1].checked);
|
||||
Action mode = key_action(ac, HVAC_MODE, keys[1].arg);
|
||||
assert(mode.service == "climate.set_hvac_mode" && mode.key == "hvac_mode" && mode.value == "heat");
|
||||
assert(status_text(ac) == "Koelen · 21.5°");
|
||||
ac.hvac_action = "cooling"; assert(status_text(ac) == "Koelt · 21.5°");
|
||||
assert(edit_target(ac) == 20 && edit_step(ac) == 1);
|
||||
Action set = edit_action(ac, step_value(edit_target(ac), edit_step(ac), ac.minimum, ac.maximum, 1));
|
||||
assert(set.service == "climate.set_temperature" && set.key == "temperature" && set.value == "21");
|
||||
assert(edit_action(ac, 20.5f).value == "20.5");
|
||||
|
||||
// Numbers edit their own state; selects step through their options with wrap-around.
|
||||
Tile number = make("number.doel", "55"); number.minimum = 0; number.maximum = 100; number.step = 5;
|
||||
assert(edit_target(number) == 55 && edit_action(number, step_value(55, 5, 0, 100, -1)).value == "50");
|
||||
assert(edit_action(number, 50).service == "number.set_value");
|
||||
Tile select = make("select.stand", "Comfort"); select.options = {"Eco", "Comfort", "Boost"}; select.option_count = 3; select.controls = "stepper";
|
||||
assert(panel_kind(select) == "chevrons");
|
||||
assert(keys_for(select, keys) == 2 && !keys[0].disabled);
|
||||
assert(key_action(select, SELECT_NEXT).value == "Boost" && key_action(select, SELECT_PREVIOUS).value == "Eco");
|
||||
select.state = "Boost"; assert(key_action(select, SELECT_NEXT).value == "Eco");
|
||||
select.option_count = 1; assert(keys_for(select, keys) == 2 && keys[0].disabled);
|
||||
|
||||
// Timer, run buttons and toggles.
|
||||
Tile timer = make("timer.eieren", "active"); timer.controls = "buttons";
|
||||
assert(keys_for(timer, keys) == 2 && keys[0].command == TIMER_PAUSE && !keys[1].disabled);
|
||||
timer.state = "idle"; assert(keys_for(timer, keys) == 2 && keys[0].command == TIMER_START && keys[1].disabled);
|
||||
assert(key_action(make("scene.avond", "unknown"), RUN).service == "scene.turn_on");
|
||||
assert(key_action(make("script.alles", "off"), RUN).service == "script.turn_on");
|
||||
assert(key_action(make("input_button.bel", "unknown"), RUN).service == "input_button.press");
|
||||
assert(!strcmp(run_label("scene"), "Activeren") && !strcmp(run_label("button"), "Indrukken"));
|
||||
assert(key_action(make("switch.bureau", "on"), TOGGLE).service == "switch.turn_off");
|
||||
assert(key_action(make("light.lamp", "off"), TOGGLE).service == "light.turn_on");
|
||||
assert(!key_action(make("sensor.x", "1"), TOGGLE).valid());
|
||||
assert(!key_action(make("sensor.x", "1"), RUN).valid());
|
||||
|
||||
// Panel kinds.
|
||||
Tile lamp = make("light.lamp", "on"); lamp.controls = "brightness";
|
||||
assert(is_slider(panel_kind(lamp)) && !is_key_row(panel_kind(lamp)));
|
||||
assert(is_key_row("playback") && is_key_row("mode") && !is_key_row("setpoint"));
|
||||
return 0;
|
||||
}
|
||||
Reference in New Issue
Block a user