diff --git a/docker/MQTTManager/include/cover/cover.cpp b/docker/MQTTManager/include/cover/cover.cpp index 8090b4707..c0373a034 100644 --- a/docker/MQTTManager/include/cover/cover.cpp +++ b/docker/MQTTManager/include/cover/cover.cpp @@ -5,6 +5,7 @@ #include "mqtt_manager/mqtt_manager.hpp" #include "mqtt_manager_config/mqtt_manager_config.hpp" #include +#include #include #include #include @@ -28,6 +29,30 @@ void CoverEntity::_load_common_config() { this->_entity_page_slot = cover.room_view_position; nlohmann::json entity_data = cover.get_entity_data_json(); + if (entity_data.contains("invert_positions") && entity_data["invert_positions"].is_boolean()) { + this->_invert_positions = entity_data["invert_positions"]; + } + + if (entity_data.contains("position_preset1") && entity_data["position_preset1"].is_number()) { + this->_position_preset1 = entity_data["position_preset1"]; + } + if (entity_data.contains("position_preset2") && entity_data["position_preset2"].is_number()) { + this->_position_preset2 = entity_data["position_preset2"]; + } + if (entity_data.contains("position_preset3") && entity_data["position_preset3"].is_number()) { + this->_position_preset3 = entity_data["position_preset3"]; + } + + if (entity_data.contains("tilt_preset1") && entity_data["tilt_preset1"].is_number()) { + this->_tilt_preset1 = entity_data["tilt_preset1"]; + } + if (entity_data.contains("tilt_preset2") && entity_data["tilt_preset2"].is_number()) { + this->_tilt_preset2 = entity_data["tilt_preset2"]; + } + if (entity_data.contains("tilt_preset3") && entity_data["tilt_preset3"].is_number()) { + this->_tilt_preset3 = entity_data["tilt_preset3"]; + } + if (entity_data.contains("controller") && entity_data["controller"].is_string()) { std::string controller = entity_data["controller"]; if (controller.compare("home_assistant") == 0) { @@ -117,15 +142,25 @@ std::string CoverEntity::get_device_class() { } void CoverEntity::send_state_update_to_nspanel() { + int position = this->_position; + if (this->_invert_positions) { + position = 100 - this->_position; + } + + int tilt_position = this->_tilt_position; + if (this->_invert_positions) { + tilt_position = 100 - this->_tilt_position; + } + NSPanelEntityState state; NSPanelEntityState_Cover *cover_state = state.mutable_cover(); cover_state->set_cover_id(this->_id); cover_state->set_name(this->_name); cover_state->set_state(this->_state); cover_state->set_has_position(this->_has_position); - cover_state->set_position(this->_has_position ? this->_position : 0); + cover_state->set_position(this->_has_position ? position : 0); cover_state->set_has_tilt_position(this->_has_tilt_position); - cover_state->set_tilt_position(this->_has_tilt_position ? this->_tilt_position : 0); + cover_state->set_tilt_position(this->_has_tilt_position ? tilt_position : 0); cover_state->set_can_open(this->_can_open); cover_state->set_can_close(this->_can_close); cover_state->set_can_stop(this->_can_stop); @@ -136,6 +171,14 @@ void CoverEntity::send_state_update_to_nspanel() { cover_state->set_can_set_tilt_position(this->_can_set_tilt_position); cover_state->set_device_class(this->_device_class); + cover_state->set_position_preset1(this->_position_preset1); + cover_state->set_position_preset2(this->_position_preset2); + cover_state->set_position_preset3(this->_position_preset3); + + cover_state->set_tilt_preset1(this->_tilt_preset1); + cover_state->set_tilt_preset2(this->_tilt_preset2); + cover_state->set_tilt_preset3(this->_tilt_preset3); + google::protobuf::util::MessageDifferencer differencer; if (!differencer.Equals(this->_last_cover_state, state)) { SPDLOG_DEBUG("Sending updated state for cover {}::{} over MQTT.", this->_id, this->_name); @@ -182,10 +225,20 @@ void CoverEntity::command_callback(NSPanelMQTTManagerCommand &command) { } if (cover_command.has_position()) { - this->set_position(static_cast(std::clamp(cover_command.position(), 0, 100))); + int requested_pos = std::clamp(cover_command.position(), 0, 100); + if (this->_invert_positions) { + requested_pos = 100 - std::clamp(cover_command.position(), 0, 100); + } + + this->set_position(static_cast(requested_pos)); } if (cover_command.has_tilt_position()) { - this->set_tilt_position(static_cast(std::clamp(cover_command.tilt_position(), 0, 100))); + int requested_pos = std::clamp(cover_command.tilt_position(), 0, 100); + if (this->_invert_positions) { + requested_pos = 100 - std::clamp(cover_command.tilt_position(), 0, 100); + } + + this->set_tilt_position(requested_pos); } } @@ -220,9 +273,7 @@ void CoverEntity::toggle() { } std::string_view CoverEntity::get_icon() { - bool open = this->_state != NSPanelEntityState_Cover_CoverState_UNAVAILABLE && this->_state != NSPanelEntityState_Cover_CoverState_UNKNOWN && - (this->_has_position ? this->_position > 0 : this->_state == NSPanelEntityState_Cover_CoverState_OPEN); - return open ? EntityIcons::entity_icon_cover_open : EntityIcons::entity_icon_cover_closed; + return EntityIcons::entity_icon_blinds; } uint16_t CoverEntity::get_icon_color() { diff --git a/docker/MQTTManager/include/cover/cover.hpp b/docker/MQTTManager/include/cover/cover.hpp index 2aa0c3def..19ea5a6ef 100644 --- a/docker/MQTTManager/include/cover/cover.hpp +++ b/docker/MQTTManager/include/cover/cover.hpp @@ -103,6 +103,7 @@ class CoverEntity : public MqttManagerEntity { uint8_t _entity_page_slot; NSPanelEntityState_Cover_CoverState _state = NSPanelEntityState_Cover_CoverState_UNKNOWN; + NSPanelEntityState_Cover_CoverState _tilt_state = NSPanelEntityState_Cover_CoverState_UNKNOWN; bool _has_position = false; uint8_t _position = 0; bool _has_tilt_position = false; @@ -116,6 +117,14 @@ class CoverEntity : public MqttManagerEntity { bool _can_close_tilt = false; bool _can_stop_tilt = false; bool _can_set_tilt_position = false; + bool _invert_positions = false; + + int32_t _position_preset1 = 0; + int32_t _position_preset2 = 0; + int32_t _position_preset3 = 0; + int32_t _tilt_preset1 = 0; + int32_t _tilt_preset2 = 0; + int32_t _tilt_preset3 = 0; std::string _device_class; diff --git a/docker/MQTTManager/include/cover/home_assistant_cover.cpp b/docker/MQTTManager/include/cover/home_assistant_cover.cpp index 4c637858b..6f24663f4 100644 --- a/docker/MQTTManager/include/cover/home_assistant_cover.cpp +++ b/docker/MQTTManager/include/cover/home_assistant_cover.cpp @@ -115,6 +115,7 @@ void HomeAssistantCover::set_position(uint8_t position) { SPDLOG_WARN("Asked to set position of cover {}::{} but Home Assistant does not report the set position feature.", this->_id, this->_name); return; } + SPDLOG_DEBUG("Setting cover {}::{} to position {}%", this->_id, this->_name, position); this->_call_service("set_cover_position", {{"position", position}}); } @@ -147,6 +148,7 @@ void HomeAssistantCover::set_tilt_position(uint8_t position) { SPDLOG_WARN("Asked to set tilt position of cover {}::{} but Home Assistant does not report the set tilt position feature.", this->_id, this->_name); return; } + SPDLOG_DEBUG("Setting cover {}::{} to tilt {}%", this->_id, this->_name, position); this->_call_service("set_cover_tilt_position", {{"tilt_position", position}}); } diff --git a/docker/MQTTManager/include/cover/openhab_cover.cpp b/docker/MQTTManager/include/cover/openhab_cover.cpp index 132dc56ac..721291017 100644 --- a/docker/MQTTManager/include/cover/openhab_cover.cpp +++ b/docker/MQTTManager/include/cover/openhab_cover.cpp @@ -21,6 +21,16 @@ OpenhabCover::OpenhabCover(uint32_t cover_id) : CoverEntity(cover_id) { return; } + this->_can_open = !this->_openhab_item.empty(); + this->_can_close = !this->_openhab_item.empty(); + this->_can_stop = !this->_openhab_item.empty(); + this->_has_position = !this->_openhab_item.empty(); + + this->_can_open_tilt = !this->_openhab_tilt_item.empty(); + this->_can_close_tilt = !this->_openhab_tilt_item.empty(); + this->_can_stop_tilt = !this->_openhab_tilt_item.empty(); // + this->_has_tilt_position = !this->_openhab_tilt_item.empty(); // + SPDLOG_DEBUG("Loaded cover {}::{}, OpenHAB item: {}", this->_id, this->_name, this->_openhab_item); OpenhabManager::attach_event_observer(this->_openhab_item, boost::bind(&OpenhabCover::openhab_event_callback, this, _1)); @@ -57,10 +67,15 @@ void OpenhabCover::reload_config() { CoverEntity::reload_config(); std::string previous_item = this->_openhab_item; + std::string previous_tilt_item = this->_openhab_tilt_item; if (!this->_load_openhab_config()) { if (!previous_item.empty()) { OpenhabManager::detach_event_observer(previous_item, boost::bind(&OpenhabCover::openhab_event_callback, this, _1)); } + if (!previous_tilt_item.empty()) { + OpenhabManager::detach_event_observer(previous_tilt_item, boost::bind(&OpenhabCover::openhab_tilt_event_callback, this, _1)); + } + this->send_state_update_to_nspanel(); return; } @@ -69,7 +84,14 @@ void OpenhabCover::reload_config() { if (!previous_item.empty()) { OpenhabManager::detach_event_observer(previous_item, boost::bind(&OpenhabCover::openhab_event_callback, this, _1)); } - OpenhabManager::attach_event_observer(this->_openhab_item, boost::bind(&OpenhabCover::openhab_event_callback, this, _1)); + OpenhabManager::attach_event_observer(this->_openhab_item, boost::bind(&OpenhabCover::openhab_tilt_event_callback, this, _1)); + } + + if (previous_tilt_item != this->_openhab_tilt_item) { + if (!previous_tilt_item.empty()) { + OpenhabManager::detach_event_observer(previous_tilt_item, boost::bind(&OpenhabCover::openhab_event_callback, this, _1)); + } + OpenhabManager::attach_event_observer(this->_openhab_tilt_item, boost::bind(&OpenhabCover::openhab_tilt_event_callback, this, _1)); } this->send_state_update_to_nspanel(); @@ -86,13 +108,23 @@ void OpenhabCover::_send_command(const std::string &type, const std::string &val OpenhabManager::send_json(event_data); } +void OpenhabCover::_send_tilt_command(const std::string &type, const std::string &value) { + nlohmann::json event_data; + event_data["type"] = "ItemCommandEvent"; + event_data["topic"] = fmt::format("openhab/items/{}/command", this->_openhab_tilt_item); + nlohmann::json payload; + payload["type"] = type; + payload["value"] = value; + event_data["payload"] = payload.dump(); + OpenhabManager::send_json(event_data); +} + void OpenhabCover::open() { - // OpenHAB Rollershutter percentages run from 0 (open) to 100 (closed). - this->_send_command("Percent", "0"); + this->_send_command("UpDown", "UP"); } void OpenhabCover::close() { - this->_send_command("Percent", "100"); + this->_send_command("UpDown", "DOWN"); } void OpenhabCover::stop() { @@ -105,19 +137,20 @@ void OpenhabCover::set_position(uint8_t position) { } void OpenhabCover::open_tilt() { - SPDLOG_WARN("OpenHAB cover {}::{} does not support tilt.", this->_id, this->_name); + this->_send_tilt_command("UpDown", "UP"); } void OpenhabCover::close_tilt() { - SPDLOG_WARN("OpenHAB cover {}::{} does not support tilt.", this->_id, this->_name); + this->_send_tilt_command("UpDown", "DOWN"); } void OpenhabCover::stop_tilt() { - SPDLOG_WARN("OpenHAB cover {}::{} does not support tilt.", this->_id, this->_name); + this->_send_tilt_command("StopMove", "STOP"); } void OpenhabCover::set_tilt_position(uint8_t position) { SPDLOG_WARN("OpenHAB cover {}::{} does not support tilt.", this->_id, this->_name); + this->_send_tilt_command("Percent", std::to_string(100 - position)); } void OpenhabCover::_update_from_state(const nlohmann::json &state) { @@ -128,7 +161,6 @@ void OpenhabCover::_update_from_state(const nlohmann::json &state) { if (value.compare("NULL") == 0 || value.compare("UNDEF") == 0) { this->_state = NSPanelEntityState_Cover_CoverState_UNAVAILABLE; this->_has_position = false; - this->_has_tilt_position = false; this->send_state_update_to_nspanel(); if (previous_icon_color != this->get_icon_color()) { this->_signal_entity_changed(); @@ -150,14 +182,8 @@ void OpenhabCover::_update_from_state(const nlohmann::json &state) { } else { this->_state = NSPanelEntityState_Cover_CoverState_OPEN; } - this->_can_open = true; - this->_can_close = true; this->_can_stop = true; this->_can_set_position = true; - this->_can_open_tilt = false; - this->_can_close_tilt = false; - this->_can_stop_tilt = false; - this->_can_set_tilt_position = false; this->_device_class = "shutter"; } catch (std::exception &e) { SPDLOG_ERROR("Could not parse OpenHAB cover state '{}' for {}::{}: {}", value, this->_id, this->_name, e.what()); @@ -177,6 +203,47 @@ void OpenhabCover::_update_from_state(const nlohmann::json &state) { } } +void OpenhabCover::_update_from_tilt_state(const nlohmann::json &state) { + + if (state.is_string()) { + std::string value = state; + if (value.compare("NULL") == 0 || value.compare("UNDEF") == 0) { + this->_state = NSPanelEntityState_Cover_CoverState_UNAVAILABLE; + this->_has_tilt_position = false; + this->send_state_update_to_nspanel(); + return; + } + + try { + double percentage = std::stod(value); + percentage = std::clamp(percentage, 0.0, 100.0); + uint8_t openness = static_cast(std::clamp(std::lround(100.0 - percentage), 0, 100)); + + this->_has_tilt_position = true; + this->_tilt_position = openness; + if (percentage <= 0.0) { + this->_tilt_state = NSPanelEntityState_Cover_CoverState_OPEN; + } else if (percentage >= 100.0) { + this->_tilt_state = NSPanelEntityState_Cover_CoverState_CLOSED; + } else { + this->_tilt_state = NSPanelEntityState_Cover_CoverState_OPEN; + } + this->_can_set_tilt_position = true; + } catch (std::exception &e) { + SPDLOG_ERROR("Could not parse OpenHAB cover state '{}' for {}::{}: {}", value, this->_id, this->_name, e.what()); + return; + } + } else if (state.is_number()) { + this->_update_from_tilt_state(nlohmann::json(std::to_string(state.get()))); + return; + } else { + SPDLOG_WARN("Unsupported OpenHAB cover state for {}::{}: {}", this->_id, this->_name, state.dump()); + return; + } + + this->send_state_update_to_nspanel(); +} + void OpenhabCover::openhab_event_callback(nlohmann::json data) { if (!data.contains("type")) { return; @@ -212,3 +279,39 @@ void OpenhabCover::openhab_event_callback(nlohmann::json data) { this->_update_from_state(data["payload"]["state"]); } } + +void OpenhabCover::openhab_tilt_event_callback(nlohmann::json data) { + if (!data.contains("type")) { + return; + } + + std::string type = data["type"]; + if (type.compare("ItemStateChangedEvent") == 0) { + if (!data.contains("topic") || !data.contains("payload")) { + return; + } + std::string topic = data["topic"]; + std::vector topic_parts; + boost::split(topic_parts, topic, boost::is_any_of("/")); + if (topic_parts.size() < 3 || topic_parts[2].compare(this->_openhab_item) != 0) { + return; + } + + try { + nlohmann::json payload = nlohmann::json::parse(std::string(data["payload"])); + if (payload.contains("value")) { + this->_update_from_state(payload["value"]); + } + } catch (std::exception &e) { + SPDLOG_ERROR("Could not parse OpenHAB state event for cover {}::{}: {}", this->_id, this->_name, e.what()); + } + } else if (type.compare("ItemStateFetched") == 0) { + if (!data.contains("payload") || !data["payload"].contains("name") || !data["payload"].contains("state")) { + return; + } + if (std::string(data["payload"]["name"]).compare(this->_openhab_item) != 0) { + return; + } + this->_update_from_state(data["payload"]["state"]); + } +} diff --git a/docker/MQTTManager/include/cover/openhab_cover.hpp b/docker/MQTTManager/include/cover/openhab_cover.hpp index 8a2603169..57dd0f6f1 100644 --- a/docker/MQTTManager/include/cover/openhab_cover.hpp +++ b/docker/MQTTManager/include/cover/openhab_cover.hpp @@ -11,6 +11,7 @@ class OpenhabCover : public CoverEntity { ~OpenhabCover(); void reload_config(); void openhab_event_callback(nlohmann::json event_data); + void openhab_tilt_event_callback(nlohmann::json event_data); void open(); void close(); @@ -33,12 +34,23 @@ class OpenhabCover : public CoverEntity { */ void _send_command(const std::string &type, const std::string &value); + /** + * Send an ItemCommandEvent to OpenHAB. + */ + void _send_tilt_command(const std::string &type, const std::string &value); + /** * Update the panel state from a Rollershutter percentage state. */ void _update_from_state(const nlohmann::json &state); + /** + * Update the panel state from a Rollershutter percentage state. + */ + void _update_from_tilt_state(const nlohmann::json &state); + std::string _openhab_item; + std::string _openhab_tilt_item; }; #endif // !MQTT_MANAGER_OPENHAB_COVER_HPP diff --git a/docker/MQTTManager/include/protobuf/protobuf_nspanel_entity.pb.cc b/docker/MQTTManager/include/protobuf/protobuf_nspanel_entity.pb.cc index e9d3efae5..0eed186fa 100644 --- a/docker/MQTTManager/include/protobuf/protobuf_nspanel_entity.pb.cc +++ b/docker/MQTTManager/include/protobuf/protobuf_nspanel_entity.pb.cc @@ -123,6 +123,12 @@ inline constexpr NSPanelEntityState_Cover::Impl_::Impl_( can_close_tilt_{false}, can_stop_tilt_{false}, can_set_tilt_position_{false}, + position_preset1_{0}, + position_preset2_{0}, + position_preset3_{0}, + tilt_preset1_{0}, + tilt_preset2_{0}, + tilt_preset3_{0}, _cached_size_{0} {} template @@ -412,6 +418,12 @@ const ::uint32_t PROTOBUF_FIELD_OFFSET(::NSPanelEntityState_Cover, _impl_.can_stop_tilt_), PROTOBUF_FIELD_OFFSET(::NSPanelEntityState_Cover, _impl_.can_set_tilt_position_), PROTOBUF_FIELD_OFFSET(::NSPanelEntityState_Cover, _impl_.device_class_), + PROTOBUF_FIELD_OFFSET(::NSPanelEntityState_Cover, _impl_.position_preset1_), + PROTOBUF_FIELD_OFFSET(::NSPanelEntityState_Cover, _impl_.position_preset2_), + PROTOBUF_FIELD_OFFSET(::NSPanelEntityState_Cover, _impl_.position_preset3_), + PROTOBUF_FIELD_OFFSET(::NSPanelEntityState_Cover, _impl_.tilt_preset1_), + PROTOBUF_FIELD_OFFSET(::NSPanelEntityState_Cover, _impl_.tilt_preset2_), + PROTOBUF_FIELD_OFFSET(::NSPanelEntityState_Cover, _impl_.tilt_preset3_), ~0u, // no _has_bits_ PROTOBUF_FIELD_OFFSET(::NSPanelEntityState, _internal_metadata_), ~0u, // no _extensions_ @@ -436,7 +448,7 @@ static const ::_pbi::MigrationSchema {55, -1, -1, sizeof(::NSPanelEntityState_MediaPlayer_SourceSelection)}, {66, 97, -1, sizeof(::NSPanelEntityState_MediaPlayer)}, {120, -1, -1, sizeof(::NSPanelEntityState_Cover)}, - {144, -1, -1, sizeof(::NSPanelEntityState)}, + {150, -1, -1, sizeof(::NSPanelEntityState)}, }; static const ::_pb::Message* const file_default_instances[] = { &::_NSPanelEntityState_Light_default_instance_._instance, @@ -450,7 +462,7 @@ static const ::_pb::Message* const file_default_instances[] = { }; const char descriptor_table_protodef_protobuf_5fnspanel_5fentity_2eproto[] ABSL_ATTRIBUTE_SECTION_VARIABLE( protodesc_cold) = { - "\n\035protobuf_nspanel_entity.proto\"\364\021\n\022NSPa" + "\n\035protobuf_nspanel_entity.proto\"\204\023\n\022NSPa" "nelEntityState\022*\n\005light\030\001 \001(\0132\031.NSPanelE" "ntityState.LightH\000\0224\n\nthermostat\030\002 \001(\0132\036" ".NSPanelEntityState.ThermostatH\000\0227\n\014medi" @@ -495,7 +507,7 @@ const char descriptor_table_protodef_protobuf_5fnspanel_5fentity_2eproto[] ABSL_ "\007sources\030\001 \003(\t\022\026\n\016current_source\030\002 \001(\t\022\022" "\n\ncan_select\030\003 \001(\010\"_\n\rPlaybackState\022\013\n\007U" "NKNOWN\020\000\022\007\n\003OFF\020\001\022\006\n\002ON\020\002\022\010\n\004IDLE\020\003\022\013\n\007P" - "LAYING\020\004\022\n\n\006PAUSED\020\005\022\r\n\tBUFFERING\020\006\032\336\003\n\005" + "LAYING\020\004\022\n\n\006PAUSED\020\005\022\r\n\tBUFFERING\020\006\032\356\004\n\005" "Cover\022\020\n\010cover_id\030\001 \001(\005\022\014\n\004name\030\002 \001(\t\0223\n" "\005state\030\003 \001(\0162$.NSPanelEntityState.Cover." "CoverState\022\024\n\014has_position\030\004 \001(\010\022\020\n\010posi" @@ -505,16 +517,19 @@ const char descriptor_table_protodef_protobuf_5fnspanel_5fentity_2eproto[] ABSL_ "an_set_position\030\013 \001(\010\022\025\n\rcan_open_tilt\030\014" " \001(\010\022\026\n\016can_close_tilt\030\r \001(\010\022\025\n\rcan_stop" "_tilt\030\016 \001(\010\022\035\n\025can_set_tilt_position\030\017 \001" - "(\010\022\024\n\014device_class\030\020 \001(\t\"Z\n\nCoverState\022\013" - "\n\007UNKNOWN\020\000\022\010\n\004OPEN\020\001\022\n\n\006CLOSED\020\002\022\013\n\007OPE" - "NING\020\003\022\013\n\007CLOSING\020\004\022\017\n\013UNAVAILABLE\020\005B\010\n\006" - "entityb\006proto3" + "(\010\022\024\n\014device_class\030\020 \001(\t\022\030\n\020position_pre" + "set1\030\021 \001(\005\022\030\n\020position_preset2\030\022 \001(\005\022\030\n\020" + "position_preset3\030\023 \001(\005\022\024\n\014tilt_preset1\030\024" + " \001(\005\022\024\n\014tilt_preset2\030\025 \001(\005\022\024\n\014tilt_prese" + "t3\030\026 \001(\005\"Z\n\nCoverState\022\013\n\007UNKNOWN\020\000\022\010\n\004O" + "PEN\020\001\022\n\n\006CLOSED\020\002\022\013\n\007OPENING\020\003\022\013\n\007CLOSIN" + "G\020\004\022\017\n\013UNAVAILABLE\020\005B\010\n\006entityb\006proto3" }; static ::absl::once_flag descriptor_table_protobuf_5fnspanel_5fentity_2eproto_once; PROTOBUF_CONSTINIT const ::_pbi::DescriptorTable descriptor_table_protobuf_5fnspanel_5fentity_2eproto = { false, false, - 2334, + 2478, descriptor_table_protodef_protobuf_5fnspanel_5fentity_2eproto, "protobuf_nspanel_entity.proto", &descriptor_table_protobuf_5fnspanel_5fentity_2eproto_once, @@ -2951,9 +2966,9 @@ NSPanelEntityState_Cover::NSPanelEntityState_Cover( offsetof(Impl_, cover_id_), reinterpret_cast(&from._impl_) + offsetof(Impl_, cover_id_), - offsetof(Impl_, can_set_tilt_position_) - + offsetof(Impl_, tilt_preset3_) - offsetof(Impl_, cover_id_) + - sizeof(Impl_::can_set_tilt_position_)); + sizeof(Impl_::tilt_preset3_)); // @@protoc_insertion_point(copy_constructor:NSPanelEntityState.Cover) } @@ -2969,9 +2984,9 @@ inline void NSPanelEntityState_Cover::SharedCtor(::_pb::Arena* arena) { ::memset(reinterpret_cast(&_impl_) + offsetof(Impl_, cover_id_), 0, - offsetof(Impl_, can_set_tilt_position_) - + offsetof(Impl_, tilt_preset3_) - offsetof(Impl_, cover_id_) + - sizeof(Impl_::can_set_tilt_position_)); + sizeof(Impl_::tilt_preset3_)); } NSPanelEntityState_Cover::~NSPanelEntityState_Cover() { // @@protoc_insertion_point(destructor:NSPanelEntityState.Cover) @@ -3006,15 +3021,15 @@ NSPanelEntityState_Cover::GetClassData() const { return _data_.base(); } PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 -const ::_pbi::TcParseTable<4, 16, 0, 65, 2> NSPanelEntityState_Cover::_table_ = { +const ::_pbi::TcParseTable<5, 22, 0, 65, 2> NSPanelEntityState_Cover::_table_ = { { 0, // no _has_bits_ 0, // no _extensions_ - 16, 120, // max_field_number, fast_idx_mask + 22, 248, // max_field_number, fast_idx_mask offsetof(decltype(_table_), field_lookup_table), - 4294901760, // skipmap + 4290772992, // skipmap offsetof(decltype(_table_), field_entries), - 16, // num_field_entries + 22, // num_field_entries 0, // num_aux_entries offsetof(decltype(_table_), field_names), // no aux_entries &_NSPanelEntityState_Cover_default_instance_._instance, @@ -3024,9 +3039,7 @@ const ::_pbi::TcParseTable<4, 16, 0, 65, 2> NSPanelEntityState_Cover::_table_ = ::_pbi::TcParser::GetTable<::NSPanelEntityState_Cover>(), // to_prefetch #endif // PROTOBUF_PREFETCH_PARSE_TABLE }, {{ - // string device_class = 16; - {::_pbi::TcParser::FastUS2, - {386, 63, 0, PROTOBUF_FIELD_OFFSET(NSPanelEntityState_Cover, _impl_.device_class_)}}, + {::_pbi::TcParser::MiniParse, {}}, // int32 cover_id = 1; {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(NSPanelEntityState_Cover, _impl_.cover_id_), 63>(), {8, 63, 0, PROTOBUF_FIELD_OFFSET(NSPanelEntityState_Cover, _impl_.cover_id_)}}, @@ -3072,6 +3085,36 @@ const ::_pbi::TcParseTable<4, 16, 0, 65, 2> NSPanelEntityState_Cover::_table_ = // bool can_set_tilt_position = 15; {::_pbi::TcParser::SingularVarintNoZag1(), {120, 63, 0, PROTOBUF_FIELD_OFFSET(NSPanelEntityState_Cover, _impl_.can_set_tilt_position_)}}, + // string device_class = 16; + {::_pbi::TcParser::FastUS2, + {386, 63, 0, PROTOBUF_FIELD_OFFSET(NSPanelEntityState_Cover, _impl_.device_class_)}}, + // int32 position_preset1 = 17; + {::_pbi::TcParser::FastV32S2, + {392, 63, 0, PROTOBUF_FIELD_OFFSET(NSPanelEntityState_Cover, _impl_.position_preset1_)}}, + // int32 position_preset2 = 18; + {::_pbi::TcParser::FastV32S2, + {400, 63, 0, PROTOBUF_FIELD_OFFSET(NSPanelEntityState_Cover, _impl_.position_preset2_)}}, + // int32 position_preset3 = 19; + {::_pbi::TcParser::FastV32S2, + {408, 63, 0, PROTOBUF_FIELD_OFFSET(NSPanelEntityState_Cover, _impl_.position_preset3_)}}, + // int32 tilt_preset1 = 20; + {::_pbi::TcParser::FastV32S2, + {416, 63, 0, PROTOBUF_FIELD_OFFSET(NSPanelEntityState_Cover, _impl_.tilt_preset1_)}}, + // int32 tilt_preset2 = 21; + {::_pbi::TcParser::FastV32S2, + {424, 63, 0, PROTOBUF_FIELD_OFFSET(NSPanelEntityState_Cover, _impl_.tilt_preset2_)}}, + // int32 tilt_preset3 = 22; + {::_pbi::TcParser::FastV32S2, + {432, 63, 0, PROTOBUF_FIELD_OFFSET(NSPanelEntityState_Cover, _impl_.tilt_preset3_)}}, + {::_pbi::TcParser::MiniParse, {}}, + {::_pbi::TcParser::MiniParse, {}}, + {::_pbi::TcParser::MiniParse, {}}, + {::_pbi::TcParser::MiniParse, {}}, + {::_pbi::TcParser::MiniParse, {}}, + {::_pbi::TcParser::MiniParse, {}}, + {::_pbi::TcParser::MiniParse, {}}, + {::_pbi::TcParser::MiniParse, {}}, + {::_pbi::TcParser::MiniParse, {}}, }}, {{ 65535, 65535 }}, {{ @@ -3123,6 +3166,24 @@ const ::_pbi::TcParseTable<4, 16, 0, 65, 2> NSPanelEntityState_Cover::_table_ = // string device_class = 16; {PROTOBUF_FIELD_OFFSET(NSPanelEntityState_Cover, _impl_.device_class_), 0, 0, (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)}, + // int32 position_preset1 = 17; + {PROTOBUF_FIELD_OFFSET(NSPanelEntityState_Cover, _impl_.position_preset1_), 0, 0, + (0 | ::_fl::kFcSingular | ::_fl::kInt32)}, + // int32 position_preset2 = 18; + {PROTOBUF_FIELD_OFFSET(NSPanelEntityState_Cover, _impl_.position_preset2_), 0, 0, + (0 | ::_fl::kFcSingular | ::_fl::kInt32)}, + // int32 position_preset3 = 19; + {PROTOBUF_FIELD_OFFSET(NSPanelEntityState_Cover, _impl_.position_preset3_), 0, 0, + (0 | ::_fl::kFcSingular | ::_fl::kInt32)}, + // int32 tilt_preset1 = 20; + {PROTOBUF_FIELD_OFFSET(NSPanelEntityState_Cover, _impl_.tilt_preset1_), 0, 0, + (0 | ::_fl::kFcSingular | ::_fl::kInt32)}, + // int32 tilt_preset2 = 21; + {PROTOBUF_FIELD_OFFSET(NSPanelEntityState_Cover, _impl_.tilt_preset2_), 0, 0, + (0 | ::_fl::kFcSingular | ::_fl::kInt32)}, + // int32 tilt_preset3 = 22; + {PROTOBUF_FIELD_OFFSET(NSPanelEntityState_Cover, _impl_.tilt_preset3_), 0, 0, + (0 | ::_fl::kFcSingular | ::_fl::kInt32)}, }}, // no aux_entries {{ @@ -3143,8 +3204,8 @@ PROTOBUF_NOINLINE void NSPanelEntityState_Cover::Clear() { _impl_.name_.ClearToEmpty(); _impl_.device_class_.ClearToEmpty(); ::memset(&_impl_.cover_id_, 0, static_cast<::size_t>( - reinterpret_cast(&_impl_.can_set_tilt_position_) - - reinterpret_cast(&_impl_.cover_id_)) + sizeof(_impl_.can_set_tilt_position_)); + reinterpret_cast(&_impl_.tilt_preset3_) - + reinterpret_cast(&_impl_.cover_id_)) + sizeof(_impl_.tilt_preset3_)); _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } @@ -3269,6 +3330,48 @@ ::uint8_t* NSPanelEntityState_Cover::_InternalSerialize( target = stream->WriteStringMaybeAliased(16, _s, target); } + // int32 position_preset1 = 17; + if (this->_internal_position_preset1() != 0) { + target = stream->EnsureSpace(target); + target = ::_pbi::WireFormatLite::WriteInt32ToArray( + 17, this->_internal_position_preset1(), target); + } + + // int32 position_preset2 = 18; + if (this->_internal_position_preset2() != 0) { + target = stream->EnsureSpace(target); + target = ::_pbi::WireFormatLite::WriteInt32ToArray( + 18, this->_internal_position_preset2(), target); + } + + // int32 position_preset3 = 19; + if (this->_internal_position_preset3() != 0) { + target = stream->EnsureSpace(target); + target = ::_pbi::WireFormatLite::WriteInt32ToArray( + 19, this->_internal_position_preset3(), target); + } + + // int32 tilt_preset1 = 20; + if (this->_internal_tilt_preset1() != 0) { + target = stream->EnsureSpace(target); + target = ::_pbi::WireFormatLite::WriteInt32ToArray( + 20, this->_internal_tilt_preset1(), target); + } + + // int32 tilt_preset2 = 21; + if (this->_internal_tilt_preset2() != 0) { + target = stream->EnsureSpace(target); + target = ::_pbi::WireFormatLite::WriteInt32ToArray( + 21, this->_internal_tilt_preset2(), target); + } + + // int32 tilt_preset3 = 22; + if (this->_internal_tilt_preset3() != 0) { + target = stream->EnsureSpace(target); + target = ::_pbi::WireFormatLite::WriteInt32ToArray( + 22, this->_internal_tilt_preset3(), target); + } + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( @@ -3373,6 +3476,42 @@ ::size_t NSPanelEntityState_Cover::ByteSizeLong() const { total_size += 2; } + // int32 position_preset1 = 17; + if (this->_internal_position_preset1() != 0) { + total_size += 2 + ::_pbi::WireFormatLite::Int32Size( + this->_internal_position_preset1()); + } + + // int32 position_preset2 = 18; + if (this->_internal_position_preset2() != 0) { + total_size += 2 + ::_pbi::WireFormatLite::Int32Size( + this->_internal_position_preset2()); + } + + // int32 position_preset3 = 19; + if (this->_internal_position_preset3() != 0) { + total_size += 2 + ::_pbi::WireFormatLite::Int32Size( + this->_internal_position_preset3()); + } + + // int32 tilt_preset1 = 20; + if (this->_internal_tilt_preset1() != 0) { + total_size += 2 + ::_pbi::WireFormatLite::Int32Size( + this->_internal_tilt_preset1()); + } + + // int32 tilt_preset2 = 21; + if (this->_internal_tilt_preset2() != 0) { + total_size += 2 + ::_pbi::WireFormatLite::Int32Size( + this->_internal_tilt_preset2()); + } + + // int32 tilt_preset3 = 22; + if (this->_internal_tilt_preset3() != 0) { + total_size += 2 + ::_pbi::WireFormatLite::Int32Size( + this->_internal_tilt_preset3()); + } + return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_); } @@ -3433,6 +3572,24 @@ void NSPanelEntityState_Cover::MergeImpl(::google::protobuf::MessageLite& to_msg if (from._internal_can_set_tilt_position() != 0) { _this->_impl_.can_set_tilt_position_ = from._impl_.can_set_tilt_position_; } + if (from._internal_position_preset1() != 0) { + _this->_impl_.position_preset1_ = from._impl_.position_preset1_; + } + if (from._internal_position_preset2() != 0) { + _this->_impl_.position_preset2_ = from._impl_.position_preset2_; + } + if (from._internal_position_preset3() != 0) { + _this->_impl_.position_preset3_ = from._impl_.position_preset3_; + } + if (from._internal_tilt_preset1() != 0) { + _this->_impl_.tilt_preset1_ = from._impl_.tilt_preset1_; + } + if (from._internal_tilt_preset2() != 0) { + _this->_impl_.tilt_preset2_ = from._impl_.tilt_preset2_; + } + if (from._internal_tilt_preset3() != 0) { + _this->_impl_.tilt_preset3_ = from._impl_.tilt_preset3_; + } _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_); } @@ -3452,8 +3609,8 @@ void NSPanelEntityState_Cover::InternalSwap(NSPanelEntityState_Cover* PROTOBUF_R ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.name_, &other->_impl_.name_, arena); ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.device_class_, &other->_impl_.device_class_, arena); ::google::protobuf::internal::memswap< - PROTOBUF_FIELD_OFFSET(NSPanelEntityState_Cover, _impl_.can_set_tilt_position_) - + sizeof(NSPanelEntityState_Cover::_impl_.can_set_tilt_position_) + PROTOBUF_FIELD_OFFSET(NSPanelEntityState_Cover, _impl_.tilt_preset3_) + + sizeof(NSPanelEntityState_Cover::_impl_.tilt_preset3_) - PROTOBUF_FIELD_OFFSET(NSPanelEntityState_Cover, _impl_.cover_id_)>( reinterpret_cast(&_impl_.cover_id_), reinterpret_cast(&other->_impl_.cover_id_)); diff --git a/docker/MQTTManager/include/protobuf/protobuf_nspanel_entity.pb.h b/docker/MQTTManager/include/protobuf/protobuf_nspanel_entity.pb.h index 05d6dc446..2978062c8 100644 --- a/docker/MQTTManager/include/protobuf/protobuf_nspanel_entity.pb.h +++ b/docker/MQTTManager/include/protobuf/protobuf_nspanel_entity.pb.h @@ -1074,6 +1074,12 @@ class NSPanelEntityState_Cover final : public ::google::protobuf::Message kCanCloseTiltFieldNumber = 13, kCanStopTiltFieldNumber = 14, kCanSetTiltPositionFieldNumber = 15, + kPositionPreset1FieldNumber = 17, + kPositionPreset2FieldNumber = 18, + kPositionPreset3FieldNumber = 19, + kTiltPreset1FieldNumber = 20, + kTiltPreset2FieldNumber = 21, + kTiltPreset3FieldNumber = 22, }; // string name = 2; void clear_name() ; @@ -1246,13 +1252,73 @@ class NSPanelEntityState_Cover final : public ::google::protobuf::Message bool _internal_can_set_tilt_position() const; void _internal_set_can_set_tilt_position(bool value); + public: + // int32 position_preset1 = 17; + void clear_position_preset1() ; + ::int32_t position_preset1() const; + void set_position_preset1(::int32_t value); + + private: + ::int32_t _internal_position_preset1() const; + void _internal_set_position_preset1(::int32_t value); + + public: + // int32 position_preset2 = 18; + void clear_position_preset2() ; + ::int32_t position_preset2() const; + void set_position_preset2(::int32_t value); + + private: + ::int32_t _internal_position_preset2() const; + void _internal_set_position_preset2(::int32_t value); + + public: + // int32 position_preset3 = 19; + void clear_position_preset3() ; + ::int32_t position_preset3() const; + void set_position_preset3(::int32_t value); + + private: + ::int32_t _internal_position_preset3() const; + void _internal_set_position_preset3(::int32_t value); + + public: + // int32 tilt_preset1 = 20; + void clear_tilt_preset1() ; + ::int32_t tilt_preset1() const; + void set_tilt_preset1(::int32_t value); + + private: + ::int32_t _internal_tilt_preset1() const; + void _internal_set_tilt_preset1(::int32_t value); + + public: + // int32 tilt_preset2 = 21; + void clear_tilt_preset2() ; + ::int32_t tilt_preset2() const; + void set_tilt_preset2(::int32_t value); + + private: + ::int32_t _internal_tilt_preset2() const; + void _internal_set_tilt_preset2(::int32_t value); + + public: + // int32 tilt_preset3 = 22; + void clear_tilt_preset3() ; + ::int32_t tilt_preset3() const; + void set_tilt_preset3(::int32_t value); + + private: + ::int32_t _internal_tilt_preset3() const; + void _internal_set_tilt_preset3(::int32_t value); + public: // @@protoc_insertion_point(class_scope:NSPanelEntityState.Cover) private: class _Internal; friend class ::google::protobuf::internal::TcParser; static const ::google::protobuf::internal::TcParseTable< - 4, 16, 0, + 5, 22, 0, 65, 2> _table_; @@ -1289,6 +1355,12 @@ class NSPanelEntityState_Cover final : public ::google::protobuf::Message bool can_close_tilt_; bool can_stop_tilt_; bool can_set_tilt_position_; + ::int32_t position_preset1_; + ::int32_t position_preset2_; + ::int32_t position_preset3_; + ::int32_t tilt_preset1_; + ::int32_t tilt_preset2_; + ::int32_t tilt_preset3_; mutable ::google::protobuf::internal::CachedSize _cached_size_; PROTOBUF_TSAN_DECLARE_MEMBER }; @@ -4692,6 +4764,138 @@ inline void NSPanelEntityState_Cover::set_allocated_device_class(std::string* va // @@protoc_insertion_point(field_set_allocated:NSPanelEntityState.Cover.device_class) } +// int32 position_preset1 = 17; +inline void NSPanelEntityState_Cover::clear_position_preset1() { + ::google::protobuf::internal::TSanWrite(&_impl_); + _impl_.position_preset1_ = 0; +} +inline ::int32_t NSPanelEntityState_Cover::position_preset1() const { + // @@protoc_insertion_point(field_get:NSPanelEntityState.Cover.position_preset1) + return _internal_position_preset1(); +} +inline void NSPanelEntityState_Cover::set_position_preset1(::int32_t value) { + _internal_set_position_preset1(value); + // @@protoc_insertion_point(field_set:NSPanelEntityState.Cover.position_preset1) +} +inline ::int32_t NSPanelEntityState_Cover::_internal_position_preset1() const { + ::google::protobuf::internal::TSanRead(&_impl_); + return _impl_.position_preset1_; +} +inline void NSPanelEntityState_Cover::_internal_set_position_preset1(::int32_t value) { + ::google::protobuf::internal::TSanWrite(&_impl_); + _impl_.position_preset1_ = value; +} + +// int32 position_preset2 = 18; +inline void NSPanelEntityState_Cover::clear_position_preset2() { + ::google::protobuf::internal::TSanWrite(&_impl_); + _impl_.position_preset2_ = 0; +} +inline ::int32_t NSPanelEntityState_Cover::position_preset2() const { + // @@protoc_insertion_point(field_get:NSPanelEntityState.Cover.position_preset2) + return _internal_position_preset2(); +} +inline void NSPanelEntityState_Cover::set_position_preset2(::int32_t value) { + _internal_set_position_preset2(value); + // @@protoc_insertion_point(field_set:NSPanelEntityState.Cover.position_preset2) +} +inline ::int32_t NSPanelEntityState_Cover::_internal_position_preset2() const { + ::google::protobuf::internal::TSanRead(&_impl_); + return _impl_.position_preset2_; +} +inline void NSPanelEntityState_Cover::_internal_set_position_preset2(::int32_t value) { + ::google::protobuf::internal::TSanWrite(&_impl_); + _impl_.position_preset2_ = value; +} + +// int32 position_preset3 = 19; +inline void NSPanelEntityState_Cover::clear_position_preset3() { + ::google::protobuf::internal::TSanWrite(&_impl_); + _impl_.position_preset3_ = 0; +} +inline ::int32_t NSPanelEntityState_Cover::position_preset3() const { + // @@protoc_insertion_point(field_get:NSPanelEntityState.Cover.position_preset3) + return _internal_position_preset3(); +} +inline void NSPanelEntityState_Cover::set_position_preset3(::int32_t value) { + _internal_set_position_preset3(value); + // @@protoc_insertion_point(field_set:NSPanelEntityState.Cover.position_preset3) +} +inline ::int32_t NSPanelEntityState_Cover::_internal_position_preset3() const { + ::google::protobuf::internal::TSanRead(&_impl_); + return _impl_.position_preset3_; +} +inline void NSPanelEntityState_Cover::_internal_set_position_preset3(::int32_t value) { + ::google::protobuf::internal::TSanWrite(&_impl_); + _impl_.position_preset3_ = value; +} + +// int32 tilt_preset1 = 20; +inline void NSPanelEntityState_Cover::clear_tilt_preset1() { + ::google::protobuf::internal::TSanWrite(&_impl_); + _impl_.tilt_preset1_ = 0; +} +inline ::int32_t NSPanelEntityState_Cover::tilt_preset1() const { + // @@protoc_insertion_point(field_get:NSPanelEntityState.Cover.tilt_preset1) + return _internal_tilt_preset1(); +} +inline void NSPanelEntityState_Cover::set_tilt_preset1(::int32_t value) { + _internal_set_tilt_preset1(value); + // @@protoc_insertion_point(field_set:NSPanelEntityState.Cover.tilt_preset1) +} +inline ::int32_t NSPanelEntityState_Cover::_internal_tilt_preset1() const { + ::google::protobuf::internal::TSanRead(&_impl_); + return _impl_.tilt_preset1_; +} +inline void NSPanelEntityState_Cover::_internal_set_tilt_preset1(::int32_t value) { + ::google::protobuf::internal::TSanWrite(&_impl_); + _impl_.tilt_preset1_ = value; +} + +// int32 tilt_preset2 = 21; +inline void NSPanelEntityState_Cover::clear_tilt_preset2() { + ::google::protobuf::internal::TSanWrite(&_impl_); + _impl_.tilt_preset2_ = 0; +} +inline ::int32_t NSPanelEntityState_Cover::tilt_preset2() const { + // @@protoc_insertion_point(field_get:NSPanelEntityState.Cover.tilt_preset2) + return _internal_tilt_preset2(); +} +inline void NSPanelEntityState_Cover::set_tilt_preset2(::int32_t value) { + _internal_set_tilt_preset2(value); + // @@protoc_insertion_point(field_set:NSPanelEntityState.Cover.tilt_preset2) +} +inline ::int32_t NSPanelEntityState_Cover::_internal_tilt_preset2() const { + ::google::protobuf::internal::TSanRead(&_impl_); + return _impl_.tilt_preset2_; +} +inline void NSPanelEntityState_Cover::_internal_set_tilt_preset2(::int32_t value) { + ::google::protobuf::internal::TSanWrite(&_impl_); + _impl_.tilt_preset2_ = value; +} + +// int32 tilt_preset3 = 22; +inline void NSPanelEntityState_Cover::clear_tilt_preset3() { + ::google::protobuf::internal::TSanWrite(&_impl_); + _impl_.tilt_preset3_ = 0; +} +inline ::int32_t NSPanelEntityState_Cover::tilt_preset3() const { + // @@protoc_insertion_point(field_get:NSPanelEntityState.Cover.tilt_preset3) + return _internal_tilt_preset3(); +} +inline void NSPanelEntityState_Cover::set_tilt_preset3(::int32_t value) { + _internal_set_tilt_preset3(value); + // @@protoc_insertion_point(field_set:NSPanelEntityState.Cover.tilt_preset3) +} +inline ::int32_t NSPanelEntityState_Cover::_internal_tilt_preset3() const { + ::google::protobuf::internal::TSanRead(&_impl_); + return _impl_.tilt_preset3_; +} +inline void NSPanelEntityState_Cover::_internal_set_tilt_preset3(::int32_t value) { + ::google::protobuf::internal::TSanWrite(&_impl_); + _impl_.tilt_preset3_ = value; +} + // ------------------------------------------------------------------- // NSPanelEntityState diff --git a/docker/MQTTManager/tests/openhab_test.cpp b/docker/MQTTManager/tests/openhab_test.cpp index 8ec16ab7e..4c3973401 100644 --- a/docker/MQTTManager/tests/openhab_test.cpp +++ b/docker/MQTTManager/tests/openhab_test.cpp @@ -2,9 +2,9 @@ #include "test_helpers.hpp" #include #include -#include #include #include +#include #include #include @@ -35,8 +35,8 @@ static std::vector> item_commands() { std::vector> commands; for (auto &message : OpenhabManager::test_take_sent_messages()) { if (message.value("type", "") == "ItemCommandEvent") { - std::string topic = message["topic"]; // openhab/items//command - std::string item = topic.substr(14, topic.size() - 14 - 8); // Strip "openhab/items/" and "/command". + std::string topic = message["topic"]; // openhab/items//command + std::string item = topic.substr(14, topic.size() - 14 - 8); // Strip "openhab/items/" and "/command". commands.emplace_back(item, nlohmann::json::parse(std::string(message["payload"]))); } } @@ -197,8 +197,8 @@ TEST_F(OpenhabCoverTest, commands_use_rollershutter_percent_and_stop) { auto commands = item_commands(); ASSERT_EQ(commands.size(), 4); - EXPECT_EQ(commands[0], std::make_pair(std::string("LivingRoom_Shutter"), nlohmann::json({{"type", "Percent"}, {"value", "0"}}))); - EXPECT_EQ(commands[1], std::make_pair(std::string("LivingRoom_Shutter"), nlohmann::json({{"type", "Percent"}, {"value", "100"}}))); + EXPECT_EQ(commands[0], std::make_pair(std::string("LivingRoom_Shutter"), nlohmann::json({{"type", "UpDown"}, {"value", "UP"}}))); + EXPECT_EQ(commands[1], std::make_pair(std::string("LivingRoom_Shutter"), nlohmann::json({{"type", "UpDown"}, {"value", "DOWN"}}))); EXPECT_EQ(commands[2], std::make_pair(std::string("LivingRoom_Shutter"), nlohmann::json({{"type", "StopMove"}, {"value", "STOP"}}))); EXPECT_EQ(commands[3], std::make_pair(std::string("LivingRoom_Shutter"), nlohmann::json({{"type", "Percent"}, {"value", "75"}}))); } diff --git a/docker/protobuf/protobuf_nspanel_entity.proto b/docker/protobuf/protobuf_nspanel_entity.proto index 695304d5f..f08301b42 100644 --- a/docker/protobuf/protobuf_nspanel_entity.proto +++ b/docker/protobuf/protobuf_nspanel_entity.proto @@ -146,6 +146,14 @@ message NSPanelEntityState { // Optional hint for the panel icon, for example "blind" or "garage". string device_class = 16; + + // Preset position numbers. + int32 position_preset1 = 17; + int32 position_preset2 = 18; + int32 position_preset3 = 19; + int32 tilt_preset1 = 20; + int32 tilt_preset2 = 21; + int32 tilt_preset3 = 22; } oneof entity { diff --git a/docker/web/nspanelmanager/firmware/custom/data_file.bin b/docker/web/nspanelmanager/firmware/custom/data_file.bin index 346bf6a4c..e9a14a89b 100644 Binary files a/docker/web/nspanelmanager/firmware/custom/data_file.bin and b/docker/web/nspanelmanager/firmware/custom/data_file.bin differ diff --git a/docker/web/nspanelmanager/firmware/custom/firmware.bin b/docker/web/nspanelmanager/firmware/custom/firmware.bin index b802b74bb..86f3ea90f 100644 Binary files a/docker/web/nspanelmanager/firmware/custom/firmware.bin and b/docker/web/nspanelmanager/firmware/custom/firmware.bin differ diff --git a/docker/web/nspanelmanager/firmware/custom/merged_flash.bin b/docker/web/nspanelmanager/firmware/custom/merged_flash.bin index 10ac72c9d..0e5466aff 100644 Binary files a/docker/web/nspanelmanager/firmware/custom/merged_flash.bin and b/docker/web/nspanelmanager/firmware/custom/merged_flash.bin differ diff --git a/docker/web/nspanelmanager/firmware/sonoff/data_file.bin b/docker/web/nspanelmanager/firmware/sonoff/data_file.bin index 80fe08c38..9b7447f7a 100644 Binary files a/docker/web/nspanelmanager/firmware/sonoff/data_file.bin and b/docker/web/nspanelmanager/firmware/sonoff/data_file.bin differ diff --git a/docker/web/nspanelmanager/firmware/sonoff/firmware.bin b/docker/web/nspanelmanager/firmware/sonoff/firmware.bin index 12a5c10db..d6b60bcdd 100644 Binary files a/docker/web/nspanelmanager/firmware/sonoff/firmware.bin and b/docker/web/nspanelmanager/firmware/sonoff/firmware.bin differ diff --git a/docker/web/nspanelmanager/firmware/sonoff/merged_flash.bin b/docker/web/nspanelmanager/firmware/sonoff/merged_flash.bin index 0c21e96f3..2bf28531b 100644 Binary files a/docker/web/nspanelmanager/firmware/sonoff/merged_flash.bin and b/docker/web/nspanelmanager/firmware/sonoff/merged_flash.bin differ diff --git a/docker/web/nspanelmanager/web/react-components/.vitest/junit/output.xml b/docker/web/nspanelmanager/web/react-components/.vitest/junit/output.xml new file mode 100644 index 000000000..21c0158e0 --- /dev/null +++ b/docker/web/nspanelmanager/web/react-components/.vitest/junit/output.xml @@ -0,0 +1,780 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +<ref *1> HTMLInputElement { + '__reactFiber$7o0o9phk2i': <ref *2> FiberNode { + tag: 5, + key: null, + elementType: 'input', + type: 'input', + stateNode: [Circular *1], + return: FiberNode { + tag: 5, + key: null, + elementType: 'div', + type: 'div', + stateNode: [HTMLDivElement], + return: [FiberNode], + child: [Circular *2], + sibling: null, + index: 1, + ref: null, + refCleanup: null, + pendingProps: [Object], + memoizedProps: [Object], + updateQueue: null, + memoizedState: null, + dependencies: null, + mode: 3, + flags: 4, + subtreeFlags: 4194308, + deletions: null, + lanes: 0, + childLanes: 0, + alternate: [FiberNode], + actualDuration: 0.0033670000002530287, + actualStartTime: 989.866452, + selfBaseDuration: 0.0015030000000706423, + treeBaseDuration: 0.002736000000140848, + _debugInfo: null, + _debugOwner: [FiberNode], + _debugStack: Error: react-stack-top-frame + at Object.process.env.NODE_ENV.exports.createElement (/usr/src/app/nspanelmanager/web/react-components/node_modules/react/cjs/react.development.js:1053:20) + at /usr/src/app/nspanelmanager/web/react-components/node_modules/@emotion/react/dist/emotion-element-e8f4cc37.development.cjs.js:298:37 + at EmotionCssPropInternal (/usr/src/app/nspanelmanager/web/react-components/node_modules/@emotion/react/dist/emotion-element-e8f4cc37.development.cjs.js:61:12) + at Object.react_stack_bottom_frame (/usr/src/app/nspanelmanager/web/react-components/node_modules/react-dom/cjs/react-dom-client.development.js:25904:20) + at renderWithHooks (/usr/src/app/nspanelmanager/web/react-components/node_modules/react-dom/cjs/react-dom-client.development.js:7662:22) + at updateForwardRef (/usr/src/app/nspanelmanager/web/react-components/node_modules/react-dom/cjs/react-dom-client.development.js:9724:19) + at beginWork (/usr/src/app/nspanelmanager/web/react-components/node_modules/react-dom/cjs/react-dom-client.development.js:12117:18) + at runWithFiberInDEV (/usr/src/app/nspanelmanager/web/react-components/node_modules/react-dom/cjs/react-dom-client.development.js:874:13) + at performUnitOfWork (/usr/src/app/nspanelmanager/web/react-components/node_modules/react-dom/cjs/react-dom-client.development.js:17641:22) + at workLoopSync (/usr/src/app/nspanelmanager/web/react-components/node_modules/react-dom/cjs/react-dom-client.development.js:17469:41), + _debugTask: null, + _debugNeedsRemount: false, + _debugHookTypes: null + }, + child: null, + sibling: null, + index: 0, + ref: [Function (anonymous)], + refCleanup: undefined, + pendingProps: { + className: '', + ref: [Function (anonymous)], + style: [Object], + disabled: false, + autoCapitalize: 'none', + autoComplete: 'off', + autoCorrect: 'off', + id: 'react-select-7-input', + onBlur: [Function (anonymous)], + onChange: [Function (anonymous)], + onFocus: [Function (anonymous)], + spellCheck: 'false', + tabIndex: 0, + form: undefined, + type: 'text', + value: '', + 'aria-autocomplete': 'list', + 'aria-expanded': false, + 'aria-haspopup': true, + 'aria-errormessage': undefined, + 'aria-invalid': undefined, + 'aria-label': undefined, + 'aria-labelledby': undefined, + 'aria-required': undefined, + role: 'combobox', + 'aria-activedescendant': '', + 'aria-describedby': 'react-select-7-placeholder' + }, + memoizedProps: { + className: '', + ref: [Function (anonymous)], + style: [Object], + disabled: false, + autoCapitalize: 'none', + autoComplete: 'off', + autoCorrect: 'off', + id: 'react-select-7-input', + onBlur: [Function (anonymous)], + onChange: [Function (anonymous)], + onFocus: [Function (anonymous)], + spellCheck: 'false', + tabIndex: 0, + form: undefined, + type: 'text', + value: '', + 'aria-autocomplete': 'list', + 'aria-expanded': false, + 'aria-haspopup': true, + 'aria-errormessage': undefined, + 'aria-invalid': undefined, + 'aria-label': undefined, + 'aria-labelledby': undefined, + 'aria-required': undefined, + role: 'combobox', + 'aria-activedescendant': '', + 'aria-describedby': 'react-select-7-placeholder' + }, + updateQueue: null, + memoizedState: null, + dependencies: null, + mode: 3, + flags: 4194308, + subtreeFlags: 0, + deletions: null, + lanes: 0, + childLanes: 0, + alternate: FiberNode { + tag: 5, + key: null, + elementType: 'input', + type: 'input', + stateNode: [Circular *1], + return: [FiberNode], + child: null, + sibling: null, + index: 0, + ref: [Function (anonymous)], + refCleanup: undefined, + pendingProps: [Object], + memoizedProps: [Object], + updateQueue: null, + memoizedState: null, + dependencies: null, + mode: 3, + flags: 4194308, + subtreeFlags: 0, + deletions: null, + lanes: 0, + childLanes: 0, + alternate: [Circular *2], + actualDuration: 0.0009619999999586071, + actualStartTime: 991.704556, + selfBaseDuration: 0.0007409999999481443, + treeBaseDuration: 0.0007409999999481443, + _debugInfo: null, + _debugOwner: [FiberNode], + _debugStack: Error: react-stack-top-frame + at process.env.NODE_ENV.exports.createElement (/usr/src/app/nspanelmanager/web/react-components/node_modules/react/cjs/react.development.js:1053:20) + at Object.jsx (/usr/src/app/nspanelmanager/web/react-components/node_modules/@emotion/react/dist/emotion-react.development.cjs.js:362:43) + at Input (/usr/src/app/nspanelmanager/web/react-components/node_modules/react-select/dist/index-42b266b1.cjs.dev.js:1160:13) + at Object.react_stack_bottom_frame (/usr/src/app/nspanelmanager/web/react-components/node_modules/react-dom/cjs/react-dom-client.development.js:25904:20) + at renderWithHooks (/usr/src/app/nspanelmanager/web/react-components/node_modules/react-dom/cjs/react-dom-client.development.js:7662:22) + at updateFunctionComponent (/usr/src/app/nspanelmanager/web/react-components/node_modules/react-dom/cjs/react-dom-client.development.js:10166:19) + at beginWork (/usr/src/app/nspanelmanager/web/react-components/node_modules/react-dom/cjs/react-dom-client.development.js:11778:18) + at runWithFiberInDEV (/usr/src/app/nspanelmanager/web/react-components/node_modules/react-dom/cjs/react-dom-client.development.js:874:13) + at performUnitOfWork (/usr/src/app/nspanelmanager/web/react-components/node_modules/react-dom/cjs/react-dom-client.development.js:17641:22) + at workLoopSync (/usr/src/app/nspanelmanager/web/react-components/node_modules/react-dom/cjs/react-dom-client.development.js:17469:41), + _debugTask: null, + _debugNeedsRemount: false, + _debugHookTypes: null + }, + actualDuration: 0.0017140000001063527, + actualStartTime: 989.867995, + selfBaseDuration: 0.0012330000000702057, + treeBaseDuration: 0.0012330000000702057, + _debugInfo: null, + _debugOwner: FiberNode { + tag: 0, + key: null, + elementType: [Function: Input], + type: [Function: Input], + stateNode: null, + return: [FiberNode], + child: [FiberNode], + sibling: null, + index: 1, + ref: null, + refCleanup: null, + pendingProps: [Object], + memoizedProps: [Object], + updateQueue: null, + memoizedState: null, + dependencies: null, + mode: 3, + flags: 1, + subtreeFlags: 4718597, + deletions: null, + lanes: 0, + childLanes: 0, + alternate: [FiberNode], + actualDuration: 0.0805240000000822, + actualStartTime: 989.789185, + selfBaseDuration: 0.05884200000002693, + treeBaseDuration: 0.07957300000009582, + _debugInfo: null, + _debugOwner: [FiberNode], + _debugStack: Error: react-stack-top-frame + at Object.process.env.NODE_ENV.exports.createElement (/usr/src/app/nspanelmanager/web/react-components/node_modules/react/cjs/react.development.js:1053:20) + at Select.renderInput (/usr/src/app/nspanelmanager/web/react-components/node_modules/react-select/dist/Select-1b9abbe3.cjs.dev.js:2185:44) + at Select.render (/usr/src/app/nspanelmanager/web/react-components/node_modules/react-select/dist/Select-1b9abbe3.cjs.dev.js:2625:49) + at Object.react_stack_bottom_frame (/usr/src/app/nspanelmanager/web/react-components/node_modules/react-dom/cjs/react-dom-client.development.js:25917:29) + at updateClassComponent (/usr/src/app/nspanelmanager/web/react-components/node_modules/react-dom/cjs/react-dom-client.development.js:10719:25) + at beginWork (/usr/src/app/nspanelmanager/web/react-components/node_modules/react-dom/cjs/react-dom-client.development.js:11792:13) + at runWithFiberInDEV (/usr/src/app/nspanelmanager/web/react-components/node_modules/react-dom/cjs/react-dom-client.development.js:874:13) + at performUnitOfWork (/usr/src/app/nspanelmanager/web/react-components/node_modules/react-dom/cjs/react-dom-client.development.js:17641:22) + at workLoopSync (/usr/src/app/nspanelmanager/web/react-components/node_modules/react-dom/cjs/react-dom-client.development.js:17469:41) + at renderRootSync (/usr/src/app/nspanelmanager/web/react-components/node_modules/react-dom/cjs/react-dom-client.development.js:17450:11), + _debugTask: null, + _debugNeedsRemount: false, + _debugHookTypes: null + }, + _debugStack: Error: react-stack-top-frame + at process.env.NODE_ENV.exports.createElement (/usr/src/app/nspanelmanager/web/react-components/node_modules/react/cjs/react.development.js:1053:20) + at Object.jsx (/usr/src/app/nspanelmanager/web/react-components/node_modules/@emotion/react/dist/emotion-react.development.cjs.js:362:43) + at Input (/usr/src/app/nspanelmanager/web/react-components/node_modules/react-select/dist/index-42b266b1.cjs.dev.js:1160:13) + at Object.react_stack_bottom_frame (/usr/src/app/nspanelmanager/web/react-components/node_modules/react-dom/cjs/react-dom-client.development.js:25904:20) + at renderWithHooks (/usr/src/app/nspanelmanager/web/react-components/node_modules/react-dom/cjs/react-dom-client.development.js:7662:22) + at updateFunctionComponent (/usr/src/app/nspanelmanager/web/react-components/node_modules/react-dom/cjs/react-dom-client.development.js:10166:19) + at beginWork (/usr/src/app/nspanelmanager/web/react-components/node_modules/react-dom/cjs/react-dom-client.development.js:11778:18) + at runWithFiberInDEV (/usr/src/app/nspanelmanager/web/react-components/node_modules/react-dom/cjs/react-dom-client.development.js:874:13) + at performUnitOfWork (/usr/src/app/nspanelmanager/web/react-components/node_modules/react-dom/cjs/react-dom-client.development.js:17641:22) + at workLoopSync (/usr/src/app/nspanelmanager/web/react-components/node_modules/react-dom/cjs/react-dom-client.development.js:17469:41), + _debugTask: null, + _debugNeedsRemount: false, + _debugHookTypes: null + }, + '__reactProps$7o0o9phk2i': { + className: '', + ref: [Function (anonymous)], + style: { + label: 'input', + color: 'inherit', + background: 0, + opacity: 1, + width: '100%', + gridArea: '1 / 2', + font: 'inherit', + minWidth: '2px', + border: 0, + margin: 0, + outline: 0, + padding: 0 + }, + disabled: false, + autoCapitalize: 'none', + autoComplete: 'off', + autoCorrect: 'off', + id: 'react-select-7-input', + onBlur: [Function (anonymous)], + onChange: [Function (anonymous)], + onFocus: [Function (anonymous)], + spellCheck: 'false', + tabIndex: 0, + form: undefined, + type: 'text', + value: '', + 'aria-autocomplete': 'list', + 'aria-expanded': false, + 'aria-haspopup': true, + 'aria-errormessage': undefined, + 'aria-invalid': undefined, + 'aria-label': undefined, + 'aria-labelledby': undefined, + 'aria-required': undefined, + role: 'combobox', + 'aria-activedescendant': '', + 'aria-describedby': 'react-select-7-placeholder' + }, + '__reactEvents$7o0o9phk2i': Set(1) { 'invalid__bubble' }, + value: [Getter/Setter], + _valueTracker: { + getValue: [Function: getValue], + setValue: [Function: setValue], + stopTracking: [Function: stopTracking] + }, + Symbol(SameObject caches): [Object: null prototype] { + style: CSSStyleDeclaration { + '0': 'color', + '1': 'background-image', + '2': 'background-position', + '3': 'background-size', + '4': 'background-repeat', + '5': 'background-origin', + '6': 'background-clip', + '7': 'background-attachment', + '8': 'background-color', + '9': 'background', + '10': 'opacity', + '11': 'width', + '12': 'grid-area', + '13': 'font-style', + '14': 'font-variant', + '15': 'font-weight', + '16': 'font-size', + '17': 'line-height', + '18': 'font-family', + '19': 'font', + '20': 'min-width', + '21': 'border', + '22': 'border-width', + '23': 'border-style', + '24': 'border-color', + '25': 'border-top', + '26': 'border-top-width', + '27': 'border-top-style', + '28': 'border-top-color', + '29': 'border-right', + '30': 'border-right-width', + '31': 'border-right-style', + '32': 'border-right-color', + '33': 'border-bottom', + '34': 'border-bottom-width', + '35': 'border-bottom-style', + '36': 'border-bottom-color', + '37': 'border-left', + '38': 'border-left-width', + '39': 'border-left-style', + '40': 'border-left-color', + '41': 'border-image', + '42': 'margin-top', + '43': 'margin-right', + '44': 'margin-bottom', + '45': 'margin-left', + '46': 'margin', + '47': 'outline', + '48': 'padding-top', + '49': 'padding-right', + '50': 'padding-bottom', + '51': 'padding-left', + '52': 'padding', + _global: [Object [global]], + _onChange: [Function (anonymous)], + _computed: false, + _ownerNode: null, + _parentRule: null, + _readonly: false, + _updating: false, + _length: 53, + _propertyIndices: [Map], + _priorities: Map(0) {}, + _values: [Map], + label: 'input' + }, + attributes: Proxy(NamedNodeMap {}), + classList: Proxy(DOMTokenList {}), + childNodes: Proxy(NodeList {}) + } +} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docker/web/nspanelmanager/web/react-components/dist/.vite/manifest.json b/docker/web/nspanelmanager/web/react-components/dist/.vite/manifest.json index 0825ef92c..8db2bd578 100755 --- a/docker/web/nspanelmanager/web/react-components/dist/.vite/manifest.json +++ b/docker/web/nspanelmanager/web/react-components/dist/.vite/manifest.json @@ -1,249 +1,249 @@ { - "_AnimatePresence-T1u1JdBO.js": { - "file": "AnimatePresence-T1u1JdBO.js", + "_AnimatePresence-Dqu00Wbg.js": { + "file": "AnimatePresence-Dqu00Wbg.js", "name": "AnimatePresence", "imports": [ "src/main.tsx", - "_proxy-CM7hds_Z.js" + "_proxy-DUfbqFkY.js" ] }, - "_EntityStore-t3NedZTI.js": { - "file": "EntityStore-t3NedZTI.js", + "_EntityStore-BkKCiqU6.js": { + "file": "EntityStore-BkKCiqU6.js", "name": "EntityStore", "imports": [ - "_react-BZEnDPAj.js", - "_NSPanelToastContainer-KbJyV6eL.js", - "_StompStore-Cb7LWQdV.js" + "_react-Dmrhcfpd.js", + "_NSPanelToastContainer-DX4VftN1.js", + "_StompStore-YH4Dqjwd.js" ] }, - "_MultiStep_AddEditEntity-0_f1p5eS.js": { - "file": "MultiStep_AddEditEntity-0_f1p5eS.js", + "_MultiStep_AddEditEntity-KDtbEBBY.js": { + "file": "MultiStep_AddEditEntity-KDtbEBBY.js", "name": "MultiStep_AddEditEntity", "imports": [ "src/main.tsx", - "_react-BZEnDPAj.js", - "_SettingsStore-Bhq0N_Vz.js", - "_react-select.esm-BOOv53_-.js", - "_index.esm-mYyDCATx.js", - "_NSPanelToastContainer-KbJyV6eL.js", - "_proxy-CM7hds_Z.js", - "_AnimatePresence-T1u1JdBO.js" + "_react-Dmrhcfpd.js", + "_SettingsStore-B_b5mu_f.js", + "_react-select.esm-DIB_MQU9.js", + "_index.esm-OPyB-aE8.js", + "_NSPanelToastContainer-DX4VftN1.js", + "_proxy-DUfbqFkY.js", + "_AnimatePresence-Dqu00Wbg.js" ] }, - "_NSPanelToastContainer-KbJyV6eL.js": { - "file": "NSPanelToastContainer-KbJyV6eL.js", + "_NSPanelToastContainer-DX4VftN1.js": { + "file": "NSPanelToastContainer-DX4VftN1.js", "name": "NSPanelToastContainer", "imports": [ "src/main.tsx" ] }, - "_SettingsStore-Bhq0N_Vz.js": { - "file": "SettingsStore-Bhq0N_Vz.js", + "_SettingsStore-B_b5mu_f.js": { + "file": "SettingsStore-B_b5mu_f.js", "name": "SettingsStore", "imports": [ - "_react-BZEnDPAj.js" + "_react-Dmrhcfpd.js" ] }, - "_StompStore-Cb7LWQdV.js": { - "file": "StompStore-Cb7LWQdV.js", + "_StompStore-YH4Dqjwd.js": { + "file": "StompStore-YH4Dqjwd.js", "name": "StompStore", "imports": [ "src/main.tsx", - "_react-BZEnDPAj.js", - "_NSPanelToastContainer-KbJyV6eL.js" + "_react-Dmrhcfpd.js", + "_NSPanelToastContainer-DX4VftN1.js" ] }, - "_index.esm-mYyDCATx.js": { - "file": "index.esm-mYyDCATx.js", + "_index.esm-OPyB-aE8.js": { + "file": "index.esm-OPyB-aE8.js", "name": "index.esm", "imports": [ "src/main.tsx" ] }, - "_layout-DaQaV5-g.js": { - "file": "layout-DaQaV5-g.js", + "_layout-MHz_8kDh.js": { + "file": "layout-MHz_8kDh.js", "name": "layout", "imports": [ "src/main.tsx", - "_index.esm-mYyDCATx.js" + "_index.esm-OPyB-aE8.js" ] }, - "_mdi-C6etIfwv.js": { - "file": "mdi-C6etIfwv.js", + "_mdi-gqrDBoHO.js": { + "file": "mdi-gqrDBoHO.js", "name": "mdi", "imports": [ "src/main.tsx" ] }, - "_proxy-CM7hds_Z.js": { - "file": "proxy-CM7hds_Z.js", + "_proxy-DUfbqFkY.js": { + "file": "proxy-DUfbqFkY.js", "name": "proxy", "imports": [ "src/main.tsx" ] }, - "_react-BZEnDPAj.js": { - "file": "react-BZEnDPAj.js", + "_react-Dmrhcfpd.js": { + "file": "react-Dmrhcfpd.js", "name": "react", "imports": [ "src/main.tsx" ] }, - "_react-select.esm-BOOv53_-.js": { - "file": "react-select.esm-BOOv53_-.js", + "_react-select.esm-DIB_MQU9.js": { + "file": "react-select.esm-DIB_MQU9.js", "name": "react-select.esm", "imports": [ "src/main.tsx" ] }, - "_sortable-BTXnRivy.js": { - "file": "sortable-BTXnRivy.js", + "_sortable-DCj6uSpL.js": { + "file": "sortable-DCj6uSpL.js", "name": "sortable", "imports": [ "src/main.tsx" ] }, - "_use-spring-Drz06wdx.js": { - "file": "use-spring-Drz06wdx.js", + "_use-spring-BVI2O33U.js": { + "file": "use-spring-BVI2O33U.js", "name": "use-spring", "imports": [ "src/main.tsx", - "_proxy-CM7hds_Z.js" + "_proxy-DUfbqFkY.js" ] }, "src/components/EntitiesPage/EntitiesPagesView.tsx": { - "file": "EntitiesPagesView-DwsNv8f0.js", + "file": "EntitiesPagesView-s7wQbHCc.js", "name": "EntitiesPagesView", "src": "src/components/EntitiesPage/EntitiesPagesView.tsx", "isDynamicEntry": true, "imports": [ "src/main.tsx", - "_sortable-BTXnRivy.js", - "_react-BZEnDPAj.js", - "_MultiStep_AddEditEntity-0_f1p5eS.js" + "_sortable-DCj6uSpL.js", + "_react-Dmrhcfpd.js", + "_MultiStep_AddEditEntity-KDtbEBBY.js" ] }, "src/components/IndexPage/NSPanelsView.tsx": { - "file": "NSPanelsView-DI1-iREY.js", + "file": "NSPanelsView-CVnckJ-l.js", "name": "NSPanelsView", "src": "src/components/IndexPage/NSPanelsView.tsx", "isDynamicEntry": true, "imports": [ "src/main.tsx", - "_react-select.esm-BOOv53_-.js", - "_NSPanelToastContainer-KbJyV6eL.js", - "_proxy-CM7hds_Z.js", - "_use-spring-Drz06wdx.js", - "_StompStore-Cb7LWQdV.js", - "_EntityStore-t3NedZTI.js", - "_mdi-C6etIfwv.js" + "_react-select.esm-DIB_MQU9.js", + "_NSPanelToastContainer-DX4VftN1.js", + "_proxy-DUfbqFkY.js", + "_use-spring-BVI2O33U.js", + "_StompStore-YH4Dqjwd.js", + "_EntityStore-BkKCiqU6.js", + "_mdi-gqrDBoHO.js" ] }, "src/components/InitialSetup/InitialSetup.tsx": { - "file": "InitialSetup-DPF_19eC.js", + "file": "InitialSetup-qFecaEyr.js", "name": "InitialSetup", "src": "src/components/InitialSetup/InitialSetup.tsx", "isDynamicEntry": true, "imports": [ "src/main.tsx", - "_SettingsStore-Bhq0N_Vz.js", - "_NSPanelToastContainer-KbJyV6eL.js", - "_proxy-CM7hds_Z.js", - "_AnimatePresence-T1u1JdBO.js", - "_mdi-C6etIfwv.js" + "_SettingsStore-B_b5mu_f.js", + "_NSPanelToastContainer-DX4VftN1.js", + "_proxy-DUfbqFkY.js", + "_AnimatePresence-Dqu00Wbg.js", + "_mdi-gqrDBoHO.js" ] }, "src/components/NSPanelPage/Logs.tsx": { - "file": "Logs-BqKb7kxV.js", + "file": "Logs-fyKfGB-i.js", "name": "Logs", "src": "src/components/NSPanelPage/Logs.tsx", "isDynamicEntry": true, "imports": [ "src/main.tsx", - "_SettingsStore-Bhq0N_Vz.js", - "_StompStore-Cb7LWQdV.js" + "_SettingsStore-B_b5mu_f.js", + "_StompStore-YH4Dqjwd.js" ] }, "src/components/NSPanelPage/Sidebar.tsx": { - "file": "Sidebar-1_VtMBHH.js", + "file": "Sidebar-Ck5FumSR.js", "name": "Sidebar", "src": "src/components/NSPanelPage/Sidebar.tsx", "isDynamicEntry": true, "imports": [ "src/main.tsx", - "_NSPanelToastContainer-KbJyV6eL.js", - "_StompStore-Cb7LWQdV.js", - "_EntityStore-t3NedZTI.js", - "_mdi-C6etIfwv.js" + "_NSPanelToastContainer-DX4VftN1.js", + "_StompStore-YH4Dqjwd.js", + "_EntityStore-BkKCiqU6.js", + "_mdi-gqrDBoHO.js" ] }, "src/components/NSPanelPage/Warnings.tsx": { - "file": "Warnings-ByGXWb99.js", + "file": "Warnings-B4Wyiqy9.js", "name": "Warnings", "src": "src/components/NSPanelPage/Warnings.tsx", "isDynamicEntry": true, "imports": [ "src/main.tsx", - "_EntityStore-t3NedZTI.js", - "_mdi-C6etIfwv.js" + "_EntityStore-BkKCiqU6.js", + "_mdi-gqrDBoHO.js" ] }, "src/components/RoomPage/RoomPage.tsx": { - "file": "RoomPage-Cz1Mvs-G.js", + "file": "RoomPage-DatvtqhE.js", "name": "RoomPage", "src": "src/components/RoomPage/RoomPage.tsx", "isDynamicEntry": true, "imports": [ "src/main.tsx", - "_MultiStep_AddEditEntity-0_f1p5eS.js", - "_react-select.esm-BOOv53_-.js", - "_index.esm-mYyDCATx.js", - "_NSPanelToastContainer-KbJyV6eL.js", + "_MultiStep_AddEditEntity-KDtbEBBY.js", + "_react-select.esm-DIB_MQU9.js", + "_index.esm-OPyB-aE8.js", + "_NSPanelToastContainer-DX4VftN1.js", "src/components/EntitiesPage/EntitiesPagesView.tsx", - "_StompStore-Cb7LWQdV.js", - "_EntityStore-t3NedZTI.js", - "_mdi-C6etIfwv.js" + "_StompStore-YH4Dqjwd.js", + "_EntityStore-BkKCiqU6.js", + "_mdi-gqrDBoHO.js" ] }, "src/components/RoomsPage/RoomsView.tsx": { - "file": "RoomsView-CkKS7e2E.js", + "file": "RoomsView-CmYCbfLH.js", "name": "RoomsView", "src": "src/components/RoomsPage/RoomsView.tsx", "isDynamicEntry": true, "imports": [ "src/main.tsx", - "_sortable-BTXnRivy.js", - "_index.esm-mYyDCATx.js", - "_NSPanelToastContainer-KbJyV6eL.js", - "_proxy-CM7hds_Z.js", - "_use-spring-Drz06wdx.js", - "_EntityStore-t3NedZTI.js", - "_mdi-C6etIfwv.js", - "_layout-DaQaV5-g.js" + "_sortable-DCj6uSpL.js", + "_index.esm-OPyB-aE8.js", + "_NSPanelToastContainer-DX4VftN1.js", + "_proxy-DUfbqFkY.js", + "_use-spring-BVI2O33U.js", + "_EntityStore-BkKCiqU6.js", + "_mdi-gqrDBoHO.js", + "_layout-MHz_8kDh.js" ] }, "src/components/SettingsPage/SettingsPage.tsx": { - "file": "SettingsPage-BFZWNceS.js", + "file": "SettingsPage-DP7xWhAz.js", "name": "SettingsPage", "src": "src/components/SettingsPage/SettingsPage.tsx", "isDynamicEntry": true, "imports": [ "src/main.tsx", - "_index.esm-mYyDCATx.js", - "_NSPanelToastContainer-KbJyV6eL.js", - "_layout-DaQaV5-g.js" + "_index.esm-OPyB-aE8.js", + "_NSPanelToastContainer-DX4VftN1.js", + "_layout-MHz_8kDh.js" ] }, "src/main.tsx": { - "file": "main-Ce1xTlTP.js", + "file": "main-GTPFHy3s.js", "name": "main", "src": "src/main.tsx", "isEntry": true, "dynamicImports": [ - "_MultiStep_AddEditEntity-0_f1p5eS.js", + "_MultiStep_AddEditEntity-KDtbEBBY.js", "src/components/EntitiesPage/EntitiesPagesView.tsx", "src/components/IndexPage/NSPanelsView.tsx", - "_NSPanelToastContainer-KbJyV6eL.js", + "_NSPanelToastContainer-DX4VftN1.js", "src/components/InitialSetup/InitialSetup.tsx", "src/components/NSPanelPage/Sidebar.tsx", "src/components/NSPanelPage/Warnings.tsx", diff --git a/docker/web/nspanelmanager/web/react-components/dist/AnimatePresence-T1u1JdBO.js b/docker/web/nspanelmanager/web/react-components/dist/AnimatePresence-Dqu00Wbg.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/AnimatePresence-T1u1JdBO.js rename to docker/web/nspanelmanager/web/react-components/dist/AnimatePresence-Dqu00Wbg.js index 813396bf8..34f97a47c 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/AnimatePresence-T1u1JdBO.js +++ b/docker/web/nspanelmanager/web/react-components/dist/AnimatePresence-Dqu00Wbg.js @@ -1,5 +1,5 @@ -import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-Ce1xTlTP.js"; -import { f as PresenceContext, h as LayoutGroupContext, i as isHTMLElement, m as useConstant, n as usePresence, p as useIsomorphicLayoutEffect, r as MotionConfigContext } from "./proxy-CM7hds_Z.js"; +import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-GTPFHy3s.js"; +import { f as PresenceContext, h as LayoutGroupContext, i as isHTMLElement, m as useConstant, n as usePresence, p as useIsomorphicLayoutEffect, r as MotionConfigContext } from "./proxy-DUfbqFkY.js"; //#region node_modules/framer-motion/dist/es/utils/use-composed-ref.mjs var import_jsx_runtime = require_jsx_runtime(); var import_react = /* @__PURE__ */ __toESM(require_react(), 1); diff --git a/docker/web/nspanelmanager/web/react-components/dist/EntitiesPagesView-DwsNv8f0.js b/docker/web/nspanelmanager/web/react-components/dist/EntitiesPagesView-s7wQbHCc.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/EntitiesPagesView-DwsNv8f0.js rename to docker/web/nspanelmanager/web/react-components/dist/EntitiesPagesView-s7wQbHCc.js index d8d56ecf7..8c2fef7b7 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/EntitiesPagesView-DwsNv8f0.js +++ b/docker/web/nspanelmanager/web/react-components/dist/EntitiesPagesView-s7wQbHCc.js @@ -1,7 +1,7 @@ -import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-Ce1xTlTP.js"; -import { a as useDroppable, i as useDraggable, n as isSortable, r as DragDropProvider, t as useSortable } from "./sortable-BTXnRivy.js"; -import { t as create } from "./react-BZEnDPAj.js"; -import { i as useEntitiesPagesStore, n as MultiStep_AddOrEditEntity } from "./MultiStep_AddEditEntity-0_f1p5eS.js"; +import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-GTPFHy3s.js"; +import { a as useDroppable, i as useDraggable, n as isSortable, r as DragDropProvider, t as useSortable } from "./sortable-DCj6uSpL.js"; +import { t as create } from "./react-Dmrhcfpd.js"; +import { i as useEntitiesPagesStore, n as MultiStep_AddOrEditEntity } from "./MultiStep_AddEditEntity-KDtbEBBY.js"; //#region src/components/EntitiesPage/GenericEntityBox.tsx var import_react = /* @__PURE__ */ __toESM(require_react(), 1); var import_jsx_runtime = require_jsx_runtime(); diff --git a/docker/web/nspanelmanager/web/react-components/dist/EntityStore-t3NedZTI.js b/docker/web/nspanelmanager/web/react-components/dist/EntityStore-BkKCiqU6.js similarity index 92% rename from docker/web/nspanelmanager/web/react-components/dist/EntityStore-t3NedZTI.js rename to docker/web/nspanelmanager/web/react-components/dist/EntityStore-BkKCiqU6.js index 7d201e859..2d46bb5cd 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/EntityStore-t3NedZTI.js +++ b/docker/web/nspanelmanager/web/react-components/dist/EntityStore-BkKCiqU6.js @@ -1,6 +1,6 @@ -import { t as create } from "./react-BZEnDPAj.js"; -import { n as Notify } from "./NSPanelToastContainer-KbJyV6eL.js"; -import { t as useStompStore } from "./StompStore-Cb7LWQdV.js"; +import { t as create } from "./react-Dmrhcfpd.js"; +import { n as Notify } from "./NSPanelToastContainer-DX4VftN1.js"; +import { t as useStompStore } from "./StompStore-YH4Dqjwd.js"; //#region src/stores/EntityStore.ts var nspanel_stomp_status_update_callback = (message) => { const json_data = JSON.parse(message.body); diff --git a/docker/web/nspanelmanager/web/react-components/dist/InitialSetup-DPF_19eC.js b/docker/web/nspanelmanager/web/react-components/dist/InitialSetup-qFecaEyr.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/InitialSetup-DPF_19eC.js rename to docker/web/nspanelmanager/web/react-components/dist/InitialSetup-qFecaEyr.js index 590581e01..160288210 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/InitialSetup-DPF_19eC.js +++ b/docker/web/nspanelmanager/web/react-components/dist/InitialSetup-qFecaEyr.js @@ -1,9 +1,9 @@ -import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-Ce1xTlTP.js"; -import { t as useSettingsStore } from "./SettingsStore-Bhq0N_Vz.js"; -import { n as Notify } from "./NSPanelToastContainer-KbJyV6eL.js"; -import { t as motion } from "./proxy-CM7hds_Z.js"; -import { t as AnimatePresence } from "./AnimatePresence-T1u1JdBO.js"; -import { i as mdiInformationOutline, x as require_Icon } from "./mdi-C6etIfwv.js"; +import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-GTPFHy3s.js"; +import { t as useSettingsStore } from "./SettingsStore-B_b5mu_f.js"; +import { n as Notify } from "./NSPanelToastContainer-DX4VftN1.js"; +import { t as motion } from "./proxy-DUfbqFkY.js"; +import { t as AnimatePresence } from "./AnimatePresence-Dqu00Wbg.js"; +import { i as mdiInformationOutline, x as require_Icon } from "./mdi-gqrDBoHO.js"; //#region src/components/InitialSetup/Step1_Welcome.tsx var import_react = /* @__PURE__ */ __toESM(require_react(), 1); var import_jsx_runtime = require_jsx_runtime(); diff --git a/docker/web/nspanelmanager/web/react-components/dist/Logs-BqKb7kxV.js b/docker/web/nspanelmanager/web/react-components/dist/Logs-fyKfGB-i.js similarity index 97% rename from docker/web/nspanelmanager/web/react-components/dist/Logs-BqKb7kxV.js rename to docker/web/nspanelmanager/web/react-components/dist/Logs-fyKfGB-i.js index cf8a95fbf..7d2193e26 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/Logs-BqKb7kxV.js +++ b/docker/web/nspanelmanager/web/react-components/dist/Logs-fyKfGB-i.js @@ -1,6 +1,6 @@ -import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-Ce1xTlTP.js"; -import { t as useSettingsStore } from "./SettingsStore-Bhq0N_Vz.js"; -import { t as useStompStore } from "./StompStore-Cb7LWQdV.js"; +import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-GTPFHy3s.js"; +import { t as useSettingsStore } from "./SettingsStore-B_b5mu_f.js"; +import { t as useStompStore } from "./StompStore-YH4Dqjwd.js"; //#region src/components/NSPanelPage/Logs.tsx var import_react = /* @__PURE__ */ __toESM(require_react(), 1); var import_jsx_runtime = require_jsx_runtime(); diff --git a/docker/web/nspanelmanager/web/react-components/dist/MultiStep_AddEditEntity-0_f1p5eS.js b/docker/web/nspanelmanager/web/react-components/dist/MultiStep_AddEditEntity-KDtbEBBY.js similarity index 98% rename from docker/web/nspanelmanager/web/react-components/dist/MultiStep_AddEditEntity-0_f1p5eS.js rename to docker/web/nspanelmanager/web/react-components/dist/MultiStep_AddEditEntity-KDtbEBBY.js index 1cc69a586..201cf8fc4 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/MultiStep_AddEditEntity-0_f1p5eS.js +++ b/docker/web/nspanelmanager/web/react-components/dist/MultiStep_AddEditEntity-KDtbEBBY.js @@ -1,11 +1,11 @@ -import { c as __toESM, o as __exportAll, r as require_react, t as require_jsx_runtime } from "./main-Ce1xTlTP.js"; -import { t as create } from "./react-BZEnDPAj.js"; -import { t as useSettingsStore } from "./SettingsStore-Bhq0N_Vz.js"; -import { t as StateManagedSelect$1 } from "./react-select.esm-BOOv53_-.js"; -import { a as set, i as get, o as useFieldArray, r as appendErrors, s as useForm } from "./index.esm-mYyDCATx.js"; -import { n as Notify } from "./NSPanelToastContainer-KbJyV6eL.js"; -import { t as motion } from "./proxy-CM7hds_Z.js"; -import { t as AnimatePresence } from "./AnimatePresence-T1u1JdBO.js"; +import { c as __toESM, o as __exportAll, r as require_react, t as require_jsx_runtime } from "./main-GTPFHy3s.js"; +import { t as create } from "./react-Dmrhcfpd.js"; +import { t as useSettingsStore } from "./SettingsStore-B_b5mu_f.js"; +import { t as StateManagedSelect$1 } from "./react-select.esm-DIB_MQU9.js"; +import { a as set, i as get, o as useFieldArray, r as appendErrors, s as useForm } from "./index.esm-OPyB-aE8.js"; +import { n as Notify } from "./NSPanelToastContainer-DX4VftN1.js"; +import { t as motion } from "./proxy-DUfbqFkY.js"; +import { t as AnimatePresence } from "./AnimatePresence-Dqu00Wbg.js"; //#region src/stores/EntitiesPagesStore.ts function getCookie$1(name) { let cookieValue = ""; @@ -8138,7 +8138,15 @@ var schema = object({ friendly_name: string().min(1), controller: string(), home_assistant_name: string(), - openhab_item: string() + openhab_item: string(), + openhab_tilt_item: string(), + invert_positions: boolean().optional(), + position_preset1: number(), + position_preset2: number(), + position_preset3: number(), + tilt_preset1: number(), + tilt_preset2: number(), + tilt_preset3: number() }).superRefine((data, ctx) => { if (data.controller == "home_assistant") { if (!data.home_assistant_name.startsWith("cover.")) ctx.addIssue({ @@ -8189,7 +8197,15 @@ var MultiStep_AddEditEntity_Step3_Cover = ({ controller, room_id, entities_page_ entities_page_id, room_view_position, home_assistant_name: "", - openhab_item: "" + openhab_item: "", + openhab_tilt_item: "", + invert_positions: false, + position_preset1: 0, + position_preset2: 0, + position_preset3: 0, + tilt_preset1: 0, + tilt_preset2: 0, + tilt_preset3: 0 }; const { handleSubmit, register, reset, setValue, watch, formState: { isValid, errors } } = useForm({ resolver: u(schema), @@ -8198,6 +8214,13 @@ var MultiStep_AddEditEntity_Step3_Cover = ({ controller, room_id, entities_page_ }); const home_assistant_name = watch("home_assistant_name"); const openhab_item = watch("openhab_item"); + const openhab_tilt_item = watch("openhab_tilt_item"); + watch("position_preset1"); + watch("position_preset2"); + watch("position_preset3"); + watch("tilt_preset1"); + watch("tilt_preset2"); + watch("tilt_preset3"); function getCookie(name) { let cookieValue = ""; if (document.cookie && document.cookie !== "") { @@ -8212,15 +8235,14 @@ var MultiStep_AddEditEntity_Step3_Cover = ({ controller, room_id, entities_page_ } return cookieValue; } + const entity = useEntitiesPagesStore((s) => s.entities.find((e) => e.id == id)); (0, import_react.useEffect)(() => { - if (id != null) { - const entityData = useEntitiesPagesStore.getState().entities.find((entity) => entity.id == id); - reset({ - ...defaultValues, - ...entityData - }); - } - }, [id, useEntitiesPagesStore.getState().entities]); + if (!entity) return; + reset({ + ...defaultValues, + ...entity + }); + }, [entity?.id]); function saveEntity(data) { fetch("/rest/entities/covers", { credentials: "same-origin", @@ -8261,7 +8283,7 @@ var MultiStep_AddEditEntity_Step3_Cover = ({ controller, room_id, entities_page_ menu: () => "bg-base-300 p-2.5 rounded-box", option: (state) => `p-1 ${state.isSelected ? "bg-primary/20 rounded-sm" : ""} ${state.isFocused ? "bg-primary/20 rounded-sm" : ""}` }; - const text_input_class = "outline-none bg-base-300 border-neutral rounded-md border focus:ring-0 focus:border-accent block flex-1 min-w-0 w-full text-sm p-2.5"; + const text_input_class = "outline-none bg-base-300 border-neutral first:rounded-l-md last:rounded-r-md border focus:ring-0 focus:border-accent block flex-1 min-w-0 w-full text-sm p-2.5"; return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("form", { onSubmit: handleSubmit(saveEntity), children: [ @@ -8362,8 +8384,103 @@ var MultiStep_AddEditEntity_Step3_Cover = ({ controller, room_id, entities_page_ errors.openhab_item && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "block mt-1 text-xs text-error", children: "Select an OpenHAB Rollershutter item." + }), + /* @__PURE__ */ (0, import_jsx_runtime.jsx)("label", { + className: "block mb-2 text-sm font-medium", + children: "OpenHAB Tilt item" + }), + /* @__PURE__ */ (0, import_jsx_runtime.jsx)(StateManagedSelect$1, { + options: openhab_cover_options, + classNames, + onChange: (newValue) => setValue("openhab_tilt_item", newValue ? newValue.value : "", { shouldValidate: true }), + unstyled: true, + components: select_components, + value: openhab_cover_options.find((option) => option.value === openhab_tilt_item) ?? null, + styles: selectStyles + }), + errors.openhab_tilt_item && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { + className: "block mt-1 text-xs text-error", + children: "Select an OpenHAB Rollershutter item." }) - ] }) + ] }), + /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { + className: "form-control mt-4", + children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("label", { + className: "label cursor-pointer justify-start gap-2", + children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("input", { + type: "checkbox", + className: "checkbox checkbox-sm checkbox-accent", + ...register("invert_positions") + }), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { + className: "label-text", + children: "Invert positions" + })] + }) + }), + (controller == "home_assistant" && supports_position || controller == "openhab") && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { + className: "mt-4", + children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { + className: "label", + children: "Position presets" + }), /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { + className: "join w-full", + children: [ + /* @__PURE__ */ (0, import_jsx_runtime.jsx)("input", { + type: "number", + ...register("position_preset1", { valueAsNumber: true }), + min: 0, + max: 100, + className: `join-item ${text_input_class}` + }), + /* @__PURE__ */ (0, import_jsx_runtime.jsx)("input", { + type: "number", + ...register("position_preset2", { valueAsNumber: true }), + min: 0, + max: 100, + className: `join-item ${text_input_class}` + }), + /* @__PURE__ */ (0, import_jsx_runtime.jsx)("input", { + type: "number", + ...register("position_preset3", { valueAsNumber: true }), + min: 0, + max: 100, + className: `join-item ${text_input_class}` + }) + ] + })] + }), + (controller == "home_assistant" && supports_tilt || controller == "openhab" && openhab_tilt_item != "") && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { + className: "mt-4", + children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { + className: "label", + children: "Tilt presets" + }), /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { + className: "join w-full", + children: [ + /* @__PURE__ */ (0, import_jsx_runtime.jsx)("input", { + type: "number", + ...register("tilt_preset1", { valueAsNumber: true }), + min: 0, + max: 100, + className: `join-item ${text_input_class}` + }), + /* @__PURE__ */ (0, import_jsx_runtime.jsx)("input", { + type: "number", + ...register("tilt_preset2", { valueAsNumber: true }), + min: 0, + max: 100, + className: `join-item ${text_input_class}` + }), + /* @__PURE__ */ (0, import_jsx_runtime.jsx)("input", { + type: "number", + ...register("tilt_preset3", { valueAsNumber: true }), + min: 0, + max: 100, + className: `join-item ${text_input_class}` + }) + ] + })] + }) ] }), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { diff --git a/docker/web/nspanelmanager/web/react-components/dist/NSPanelToastContainer-KbJyV6eL.js b/docker/web/nspanelmanager/web/react-components/dist/NSPanelToastContainer-DX4VftN1.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/NSPanelToastContainer-KbJyV6eL.js rename to docker/web/nspanelmanager/web/react-components/dist/NSPanelToastContainer-DX4VftN1.js index a17eb10ad..67d05c87a 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/NSPanelToastContainer-KbJyV6eL.js +++ b/docker/web/nspanelmanager/web/react-components/dist/NSPanelToastContainer-DX4VftN1.js @@ -1,4 +1,4 @@ -import { c as __toESM, o as __exportAll, r as require_react, t as require_jsx_runtime } from "./main-Ce1xTlTP.js"; +import { c as __toESM, o as __exportAll, r as require_react, t as require_jsx_runtime } from "./main-GTPFHy3s.js"; //#region node_modules/clsx/dist/clsx.mjs var import_react = /* @__PURE__ */ __toESM(require_react(), 1); function r(e) { diff --git a/docker/web/nspanelmanager/web/react-components/dist/NSPanelsView-DI1-iREY.js b/docker/web/nspanelmanager/web/react-components/dist/NSPanelsView-CVnckJ-l.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/NSPanelsView-DI1-iREY.js rename to docker/web/nspanelmanager/web/react-components/dist/NSPanelsView-CVnckJ-l.js index ea3aea8dd..44bd1f39b 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/NSPanelsView-DI1-iREY.js +++ b/docker/web/nspanelmanager/web/react-components/dist/NSPanelsView-CVnckJ-l.js @@ -1,11 +1,11 @@ -import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-Ce1xTlTP.js"; -import { t as StateManagedSelect$1 } from "./react-select.esm-BOOv53_-.js"; -import { n as Notify } from "./NSPanelToastContainer-KbJyV6eL.js"; -import { t as motion } from "./proxy-CM7hds_Z.js"; -import { n as useMotionTemplate, r as useMotionValue, t as useSpring } from "./use-spring-Drz06wdx.js"; -import { t as useStompStore } from "./StompStore-Cb7LWQdV.js"; -import { t as useEntityStatesStore } from "./EntityStore-t3NedZTI.js"; -import { _ as mdiWifiStrength2, a as mdiMemory, b as mdiWifiStrengthAlertOutline, c as mdiMinusCircle, f as mdiThermometer, g as mdiWifiStrength1Alert, h as mdiWeb, l as mdiRestart, n as mdiCog, p as mdiUpload, s as mdiMenuDownOutline, u as mdiTableArrowUp, v as mdiWifiStrength3, x as require_Icon, y as mdiWifiStrength4 } from "./mdi-C6etIfwv.js"; +import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-GTPFHy3s.js"; +import { t as StateManagedSelect$1 } from "./react-select.esm-DIB_MQU9.js"; +import { n as Notify } from "./NSPanelToastContainer-DX4VftN1.js"; +import { t as motion } from "./proxy-DUfbqFkY.js"; +import { n as useMotionTemplate, r as useMotionValue, t as useSpring } from "./use-spring-BVI2O33U.js"; +import { t as useStompStore } from "./StompStore-YH4Dqjwd.js"; +import { t as useEntityStatesStore } from "./EntityStore-BkKCiqU6.js"; +import { _ as mdiWifiStrength2, a as mdiMemory, b as mdiWifiStrengthAlertOutline, c as mdiMinusCircle, f as mdiThermometer, g as mdiWifiStrength1Alert, h as mdiWeb, l as mdiRestart, n as mdiCog, p as mdiUpload, s as mdiMenuDownOutline, u as mdiTableArrowUp, v as mdiWifiStrength3, x as require_Icon, y as mdiWifiStrength4 } from "./mdi-gqrDBoHO.js"; //#region src/components/IndexPage/NSPanelBox.tsx var import_react = /* @__PURE__ */ __toESM(require_react(), 1); var import_Icon = require_Icon(); diff --git a/docker/web/nspanelmanager/web/react-components/dist/RoomPage-Cz1Mvs-G.js b/docker/web/nspanelmanager/web/react-components/dist/RoomPage-DatvtqhE.js similarity index 95% rename from docker/web/nspanelmanager/web/react-components/dist/RoomPage-Cz1Mvs-G.js rename to docker/web/nspanelmanager/web/react-components/dist/RoomPage-DatvtqhE.js index 40cc1abc4..c2842f605 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/RoomPage-Cz1Mvs-G.js +++ b/docker/web/nspanelmanager/web/react-components/dist/RoomPage-DatvtqhE.js @@ -1,12 +1,12 @@ -import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-Ce1xTlTP.js"; -import { r as useAvailableEntitiesStore } from "./MultiStep_AddEditEntity-0_f1p5eS.js"; -import { t as StateManagedSelect$1 } from "./react-select.esm-BOOv53_-.js"; -import { l as useWatch, s as useForm } from "./index.esm-mYyDCATx.js"; -import { n as Notify } from "./NSPanelToastContainer-KbJyV6eL.js"; -import EntitiesPagesView from "./EntitiesPagesView-DwsNv8f0.js"; -import { t as useStompStore } from "./StompStore-Cb7LWQdV.js"; -import { t as useEntityStatesStore } from "./EntityStore-t3NedZTI.js"; -import { d as mdiTextShort, x as require_Icon } from "./mdi-C6etIfwv.js"; +import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-GTPFHy3s.js"; +import { r as useAvailableEntitiesStore } from "./MultiStep_AddEditEntity-KDtbEBBY.js"; +import { t as StateManagedSelect$1 } from "./react-select.esm-DIB_MQU9.js"; +import { l as useWatch, s as useForm } from "./index.esm-OPyB-aE8.js"; +import { n as Notify } from "./NSPanelToastContainer-DX4VftN1.js"; +import EntitiesPagesView from "./EntitiesPagesView-s7wQbHCc.js"; +import { t as useStompStore } from "./StompStore-YH4Dqjwd.js"; +import { t as useEntityStatesStore } from "./EntityStore-BkKCiqU6.js"; +import { d as mdiTextShort, x as require_Icon } from "./mdi-gqrDBoHO.js"; //#region src/components/RoomPage/RoomPage.tsx var import_react = /* @__PURE__ */ __toESM(require_react(), 1); var import_Icon = require_Icon(); diff --git a/docker/web/nspanelmanager/web/react-components/dist/RoomsView-CkKS7e2E.js b/docker/web/nspanelmanager/web/react-components/dist/RoomsView-CmYCbfLH.js similarity index 98% rename from docker/web/nspanelmanager/web/react-components/dist/RoomsView-CkKS7e2E.js rename to docker/web/nspanelmanager/web/react-components/dist/RoomsView-CmYCbfLH.js index f05067d50..0cb8eff8b 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/RoomsView-CkKS7e2E.js +++ b/docker/web/nspanelmanager/web/react-components/dist/RoomsView-CmYCbfLH.js @@ -1,12 +1,12 @@ -import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-Ce1xTlTP.js"; -import { r as DragDropProvider, t as useSortable } from "./sortable-BTXnRivy.js"; -import { n as FormProvider, s as useForm } from "./index.esm-mYyDCATx.js"; -import { n as Notify } from "./NSPanelToastContainer-KbJyV6eL.js"; -import { t as motion } from "./proxy-CM7hds_Z.js"; -import { n as useMotionTemplate, r as useMotionValue, t as useSpring } from "./use-spring-Drz06wdx.js"; -import { t as useEntityStatesStore } from "./EntityStore-t3NedZTI.js"; -import { o as mdiMenu, x as require_Icon } from "./mdi-C6etIfwv.js"; -import { c as TextInput, l as api, t as Alert } from "./layout-DaQaV5-g.js"; +import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-GTPFHy3s.js"; +import { r as DragDropProvider, t as useSortable } from "./sortable-DCj6uSpL.js"; +import { n as FormProvider, s as useForm } from "./index.esm-OPyB-aE8.js"; +import { n as Notify } from "./NSPanelToastContainer-DX4VftN1.js"; +import { t as motion } from "./proxy-DUfbqFkY.js"; +import { n as useMotionTemplate, r as useMotionValue, t as useSpring } from "./use-spring-BVI2O33U.js"; +import { t as useEntityStatesStore } from "./EntityStore-BkKCiqU6.js"; +import { o as mdiMenu, x as require_Icon } from "./mdi-gqrDBoHO.js"; +import { c as TextInput, l as api, t as Alert } from "./layout-MHz_8kDh.js"; //#region src/components/RoomsPage/RoomBox.tsx var import_react = /* @__PURE__ */ __toESM(require_react(), 1); var import_Icon = require_Icon(); diff --git a/docker/web/nspanelmanager/web/react-components/dist/SettingsPage-BFZWNceS.js b/docker/web/nspanelmanager/web/react-components/dist/SettingsPage-DP7xWhAz.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/SettingsPage-BFZWNceS.js rename to docker/web/nspanelmanager/web/react-components/dist/SettingsPage-DP7xWhAz.js index a341dc53a..f217e89db 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/SettingsPage-BFZWNceS.js +++ b/docker/web/nspanelmanager/web/react-components/dist/SettingsPage-DP7xWhAz.js @@ -1,7 +1,7 @@ -import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-Ce1xTlTP.js"; -import { c as useFormContext, i as get, l as useWatch, n as FormProvider, s as useForm } from "./index.esm-mYyDCATx.js"; -import { n as Notify } from "./NSPanelToastContainer-KbJyV6eL.js"; -import { a as RadioGroup$1, c as TextInput$1, i as NumberInput$1, l as api, n as Card, o as SecretInput$1, r as Row, s as Select$1, t as Alert, u as getCookie } from "./layout-DaQaV5-g.js"; +import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-GTPFHy3s.js"; +import { c as useFormContext, i as get, l as useWatch, n as FormProvider, s as useForm } from "./index.esm-OPyB-aE8.js"; +import { n as Notify } from "./NSPanelToastContainer-DX4VftN1.js"; +import { a as RadioGroup$1, c as TextInput$1, i as NumberInput$1, l as api, n as Card, o as SecretInput$1, r as Row, s as Select$1, t as Alert, u as getCookie } from "./layout-MHz_8kDh.js"; //#region src/api/connectionTests.ts var import_react = /* @__PURE__ */ __toESM(require_react(), 1); async function errorMessage(response) { diff --git a/docker/web/nspanelmanager/web/react-components/dist/SettingsStore-Bhq0N_Vz.js b/docker/web/nspanelmanager/web/react-components/dist/SettingsStore-B_b5mu_f.js similarity index 95% rename from docker/web/nspanelmanager/web/react-components/dist/SettingsStore-Bhq0N_Vz.js rename to docker/web/nspanelmanager/web/react-components/dist/SettingsStore-B_b5mu_f.js index dae5eaa7e..4ac5ef3c6 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/SettingsStore-Bhq0N_Vz.js +++ b/docker/web/nspanelmanager/web/react-components/dist/SettingsStore-B_b5mu_f.js @@ -1,4 +1,4 @@ -import { t as create } from "./react-BZEnDPAj.js"; +import { t as create } from "./react-Dmrhcfpd.js"; //#region src/stores/SettingsStore.ts function getCookie(name) { let cookieValue = ""; diff --git a/docker/web/nspanelmanager/web/react-components/dist/Sidebar-1_VtMBHH.js b/docker/web/nspanelmanager/web/react-components/dist/Sidebar-Ck5FumSR.js similarity index 98% rename from docker/web/nspanelmanager/web/react-components/dist/Sidebar-1_VtMBHH.js rename to docker/web/nspanelmanager/web/react-components/dist/Sidebar-Ck5FumSR.js index 43dccfce4..0f38fcf78 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/Sidebar-1_VtMBHH.js +++ b/docker/web/nspanelmanager/web/react-components/dist/Sidebar-Ck5FumSR.js @@ -1,8 +1,8 @@ -import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-Ce1xTlTP.js"; -import { n as Notify } from "./NSPanelToastContainer-KbJyV6eL.js"; -import { t as useStompStore } from "./StompStore-Cb7LWQdV.js"; -import { t as useEntityStatesStore } from "./EntityStore-t3NedZTI.js"; -import { _ as mdiWifiStrength2, a as mdiMemory, b as mdiWifiStrengthAlertOutline, c as mdiMinusCircle, f as mdiThermometer, g as mdiWifiStrength1Alert, h as mdiWeb, i as mdiInformationOutline, l as mdiRestart, m as mdiWaterPercent, p as mdiUpload, u as mdiTableArrowUp, v as mdiWifiStrength3, x as require_Icon, y as mdiWifiStrength4 } from "./mdi-C6etIfwv.js"; +import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-GTPFHy3s.js"; +import { n as Notify } from "./NSPanelToastContainer-DX4VftN1.js"; +import { t as useStompStore } from "./StompStore-YH4Dqjwd.js"; +import { t as useEntityStatesStore } from "./EntityStore-BkKCiqU6.js"; +import { _ as mdiWifiStrength2, a as mdiMemory, b as mdiWifiStrengthAlertOutline, c as mdiMinusCircle, f as mdiThermometer, g as mdiWifiStrength1Alert, h as mdiWeb, i as mdiInformationOutline, l as mdiRestart, m as mdiWaterPercent, p as mdiUpload, u as mdiTableArrowUp, v as mdiWifiStrength3, x as require_Icon, y as mdiWifiStrength4 } from "./mdi-gqrDBoHO.js"; //#region src/components/NSPanelPage/Sidebar.tsx var import_react = /* @__PURE__ */ __toESM(require_react(), 1); var import_Icon = require_Icon(); diff --git a/docker/web/nspanelmanager/web/react-components/dist/StompStore-Cb7LWQdV.js b/docker/web/nspanelmanager/web/react-components/dist/StompStore-YH4Dqjwd.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/StompStore-Cb7LWQdV.js rename to docker/web/nspanelmanager/web/react-components/dist/StompStore-YH4Dqjwd.js index 99b35ddc9..4160bf5ff 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/StompStore-Cb7LWQdV.js +++ b/docker/web/nspanelmanager/web/react-components/dist/StompStore-YH4Dqjwd.js @@ -1,6 +1,6 @@ -import { i as __commonJSMin } from "./main-Ce1xTlTP.js"; -import { t as create } from "./react-BZEnDPAj.js"; -import { n as Notify, r as RemoveNotification } from "./NSPanelToastContainer-KbJyV6eL.js"; +import { i as __commonJSMin } from "./main-GTPFHy3s.js"; +import { t as create } from "./react-Dmrhcfpd.js"; +import { n as Notify, r as RemoveNotification } from "./NSPanelToastContainer-DX4VftN1.js"; //#region node_modules/tslib/tslib.es6.mjs /****************************************************************************** Copyright (c) Microsoft Corporation. diff --git a/docker/web/nspanelmanager/web/react-components/dist/Warnings-ByGXWb99.js b/docker/web/nspanelmanager/web/react-components/dist/Warnings-B4Wyiqy9.js similarity index 95% rename from docker/web/nspanelmanager/web/react-components/dist/Warnings-ByGXWb99.js rename to docker/web/nspanelmanager/web/react-components/dist/Warnings-B4Wyiqy9.js index a90f56069..8dfe173bd 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/Warnings-ByGXWb99.js +++ b/docker/web/nspanelmanager/web/react-components/dist/Warnings-B4Wyiqy9.js @@ -1,6 +1,6 @@ -import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-Ce1xTlTP.js"; -import { t as useEntityStatesStore } from "./EntityStore-t3NedZTI.js"; -import { x as require_Icon } from "./mdi-C6etIfwv.js"; +import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-GTPFHy3s.js"; +import { t as useEntityStatesStore } from "./EntityStore-BkKCiqU6.js"; +import { x as require_Icon } from "./mdi-gqrDBoHO.js"; //#region src/components/NSPanelPage/Warnings.tsx var import_react = /* @__PURE__ */ __toESM(require_react(), 1); var import_Icon = require_Icon(); diff --git a/docker/web/nspanelmanager/web/react-components/dist/index.esm-mYyDCATx.js b/docker/web/nspanelmanager/web/react-components/dist/index.esm-OPyB-aE8.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/index.esm-mYyDCATx.js rename to docker/web/nspanelmanager/web/react-components/dist/index.esm-OPyB-aE8.js index 8900e6436..30d67dcbd 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/index.esm-mYyDCATx.js +++ b/docker/web/nspanelmanager/web/react-components/dist/index.esm-OPyB-aE8.js @@ -1,4 +1,4 @@ -import { c as __toESM, r as require_react } from "./main-Ce1xTlTP.js"; +import { c as __toESM, r as require_react } from "./main-GTPFHy3s.js"; //#region node_modules/react-hook-form/dist/index.esm.mjs var import_react = /* @__PURE__ */ __toESM(require_react(), 1); var isCheckBoxInput = (element) => element.type === "checkbox"; diff --git a/docker/web/nspanelmanager/web/react-components/dist/layout-DaQaV5-g.js b/docker/web/nspanelmanager/web/react-components/dist/layout-MHz_8kDh.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/layout-DaQaV5-g.js rename to docker/web/nspanelmanager/web/react-components/dist/layout-MHz_8kDh.js index a1b3af331..eb5dfc0c2 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/layout-DaQaV5-g.js +++ b/docker/web/nspanelmanager/web/react-components/dist/layout-MHz_8kDh.js @@ -1,5 +1,5 @@ -import { r as require_react, t as require_jsx_runtime } from "./main-Ce1xTlTP.js"; -import { c as useFormContext, i as get, l as useWatch, t as Controller } from "./index.esm-mYyDCATx.js"; +import { r as require_react, t as require_jsx_runtime } from "./main-GTPFHy3s.js"; +import { c as useFormContext, i as get, l as useWatch, t as Controller } from "./index.esm-OPyB-aE8.js"; //#region node_modules/openapi-fetch/dist/index.mjs var PATH_PARAM_RE = /\{[^{}]+\}/g; var supportsRequestInitExt = () => { diff --git a/docker/web/nspanelmanager/web/react-components/dist/main-Ce1xTlTP.js b/docker/web/nspanelmanager/web/react-components/dist/main-GTPFHy3s.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/main-Ce1xTlTP.js rename to docker/web/nspanelmanager/web/react-components/dist/main-GTPFHy3s.js index 4aa5a622c..d15159593 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/main-Ce1xTlTP.js +++ b/docker/web/nspanelmanager/web/react-components/dist/main-GTPFHy3s.js @@ -1,4 +1,4 @@ -const __vite__mapDeps=(i,m=__vite__mapDeps,d=(m.f||(m.f=["MultiStep_AddEditEntity-0_f1p5eS.js","react-BZEnDPAj.js","SettingsStore-Bhq0N_Vz.js","react-select.esm-BOOv53_-.js","index.esm-mYyDCATx.js","NSPanelToastContainer-KbJyV6eL.js","proxy-CM7hds_Z.js","AnimatePresence-T1u1JdBO.js","EntitiesPagesView-DwsNv8f0.js","sortable-BTXnRivy.js","NSPanelsView-DI1-iREY.js","use-spring-Drz06wdx.js","StompStore-Cb7LWQdV.js","EntityStore-t3NedZTI.js","mdi-C6etIfwv.js","InitialSetup-DPF_19eC.js","Sidebar-1_VtMBHH.js","Warnings-ByGXWb99.js","Logs-BqKb7kxV.js","RoomPage-Cz1Mvs-G.js","SettingsPage-BFZWNceS.js","layout-DaQaV5-g.js","RoomsView-CkKS7e2E.js"])))=>i.map(i=>d[i]); +const __vite__mapDeps=(i,m=__vite__mapDeps,d=(m.f||(m.f=["MultiStep_AddEditEntity-KDtbEBBY.js","react-Dmrhcfpd.js","SettingsStore-B_b5mu_f.js","react-select.esm-DIB_MQU9.js","index.esm-OPyB-aE8.js","NSPanelToastContainer-DX4VftN1.js","proxy-DUfbqFkY.js","AnimatePresence-Dqu00Wbg.js","EntitiesPagesView-s7wQbHCc.js","sortable-DCj6uSpL.js","NSPanelsView-CVnckJ-l.js","use-spring-BVI2O33U.js","StompStore-YH4Dqjwd.js","EntityStore-BkKCiqU6.js","mdi-gqrDBoHO.js","InitialSetup-qFecaEyr.js","Sidebar-Ck5FumSR.js","Warnings-B4Wyiqy9.js","Logs-fyKfGB-i.js","RoomPage-DatvtqhE.js","SettingsPage-DP7xWhAz.js","layout-MHz_8kDh.js","RoomsView-CmYCbfLH.js"])))=>i.map(i=>d[i]); //#region \0rolldown/runtime.js var __create = Object.create; var __defProp = Object.defineProperty; @@ -10204,16 +10204,16 @@ var __vitePreload = function preload(baseModule, deps, importerUrl) { }; //#endregion //#region src/componentMap.tsx -var MultiStep_AddEditEntity = (0, import_react.lazy)(() => __vitePreload(() => import("./MultiStep_AddEditEntity-0_f1p5eS.js").then((n) => n.t), __vite__mapDeps([0,1,2,3,4,5,6,7]))); -var EntitiesPagesView = (0, import_react.lazy)(() => __vitePreload(() => import("./EntitiesPagesView-DwsNv8f0.js"), __vite__mapDeps([8,9,1,0,2,3,4,5,6,7]))); -var NSPanelsIndexView = (0, import_react.lazy)(() => __vitePreload(() => import("./NSPanelsView-DI1-iREY.js"), __vite__mapDeps([10,3,5,6,11,12,1,13,14]))); -var NSPanelToastContainer = (0, import_react.lazy)(() => __vitePreload(() => import("./NSPanelToastContainer-KbJyV6eL.js").then((n) => n.t), [])); -var InitialSetup = (0, import_react.lazy)(() => __vitePreload(() => import("./InitialSetup-DPF_19eC.js"), __vite__mapDeps([15,2,1,5,6,7,14]))); -var NSPanelSideBar = (0, import_react.lazy)(() => __vitePreload(() => import("./Sidebar-1_VtMBHH.js"), __vite__mapDeps([16,5,12,1,13,14]))); -var NSPanelWarnings = (0, import_react.lazy)(() => __vitePreload(() => import("./Warnings-ByGXWb99.js"), __vite__mapDeps([17,13,1,5,12,14]))); -var NSPanelLogs = (0, import_react.lazy)(() => __vitePreload(() => import("./Logs-BqKb7kxV.js"), __vite__mapDeps([18,2,1,12,5]))); -var RoomPage = (0, import_react.lazy)(() => __vitePreload(() => import("./RoomPage-Cz1Mvs-G.js"), __vite__mapDeps([19,0,1,2,3,4,5,6,7,8,9,12,13,14]))); -var SettingsPage = (0, import_react.lazy)(() => __vitePreload(() => import("./SettingsPage-BFZWNceS.js"), __vite__mapDeps([20,4,5,21]))); +var MultiStep_AddEditEntity = (0, import_react.lazy)(() => __vitePreload(() => import("./MultiStep_AddEditEntity-KDtbEBBY.js").then((n) => n.t), __vite__mapDeps([0,1,2,3,4,5,6,7]))); +var EntitiesPagesView = (0, import_react.lazy)(() => __vitePreload(() => import("./EntitiesPagesView-s7wQbHCc.js"), __vite__mapDeps([8,9,1,0,2,3,4,5,6,7]))); +var NSPanelsIndexView = (0, import_react.lazy)(() => __vitePreload(() => import("./NSPanelsView-CVnckJ-l.js"), __vite__mapDeps([10,3,5,6,11,12,1,13,14]))); +var NSPanelToastContainer = (0, import_react.lazy)(() => __vitePreload(() => import("./NSPanelToastContainer-DX4VftN1.js").then((n) => n.t), [])); +var InitialSetup = (0, import_react.lazy)(() => __vitePreload(() => import("./InitialSetup-qFecaEyr.js"), __vite__mapDeps([15,2,1,5,6,7,14]))); +var NSPanelSideBar = (0, import_react.lazy)(() => __vitePreload(() => import("./Sidebar-Ck5FumSR.js"), __vite__mapDeps([16,5,12,1,13,14]))); +var NSPanelWarnings = (0, import_react.lazy)(() => __vitePreload(() => import("./Warnings-B4Wyiqy9.js"), __vite__mapDeps([17,13,1,5,12,14]))); +var NSPanelLogs = (0, import_react.lazy)(() => __vitePreload(() => import("./Logs-fyKfGB-i.js"), __vite__mapDeps([18,2,1,12,5]))); +var RoomPage = (0, import_react.lazy)(() => __vitePreload(() => import("./RoomPage-DatvtqhE.js"), __vite__mapDeps([19,0,1,2,3,4,5,6,7,8,9,12,13,14]))); +var SettingsPage = (0, import_react.lazy)(() => __vitePreload(() => import("./SettingsPage-DP7xWhAz.js"), __vite__mapDeps([20,4,5,21]))); var componentMap = { MultiStep_AddEditEntity, EntitiesPagesView, @@ -10224,7 +10224,7 @@ var componentMap = { NSPanelWarnings, NSPanelLogs, RoomPage, - RoomsView: (0, import_react.lazy)(() => __vitePreload(() => import("./RoomsView-CkKS7e2E.js"), __vite__mapDeps([22,9,4,5,6,11,13,1,12,14,21]))), + RoomsView: (0, import_react.lazy)(() => __vitePreload(() => import("./RoomsView-CmYCbfLH.js"), __vite__mapDeps([22,9,4,5,6,11,13,1,12,14,21]))), SettingsPage }; //#endregion diff --git a/docker/web/nspanelmanager/web/react-components/dist/mdi-C6etIfwv.js b/docker/web/nspanelmanager/web/react-components/dist/mdi-gqrDBoHO.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/mdi-C6etIfwv.js rename to docker/web/nspanelmanager/web/react-components/dist/mdi-gqrDBoHO.js index 81448c2dc..7d622ae8f 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/mdi-C6etIfwv.js +++ b/docker/web/nspanelmanager/web/react-components/dist/mdi-gqrDBoHO.js @@ -1,4 +1,4 @@ -import { i as __commonJSMin, r as require_react } from "./main-Ce1xTlTP.js"; +import { i as __commonJSMin, r as require_react } from "./main-GTPFHy3s.js"; //#region node_modules/prop-types/lib/ReactPropTypesSecret.js /** * Copyright (c) 2013-present, Facebook, Inc. diff --git a/docker/web/nspanelmanager/web/react-components/dist/proxy-CM7hds_Z.js b/docker/web/nspanelmanager/web/react-components/dist/proxy-DUfbqFkY.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/proxy-CM7hds_Z.js rename to docker/web/nspanelmanager/web/react-components/dist/proxy-DUfbqFkY.js index b8a7a8f12..27cfca5fa 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/proxy-CM7hds_Z.js +++ b/docker/web/nspanelmanager/web/react-components/dist/proxy-DUfbqFkY.js @@ -1,4 +1,4 @@ -import { a as __esmMin, c as __toESM, o as __exportAll, r as require_react, s as __toCommonJS, t as require_jsx_runtime } from "./main-Ce1xTlTP.js"; +import { a as __esmMin, c as __toESM, o as __exportAll, r as require_react, s as __toCommonJS, t as require_jsx_runtime } from "./main-GTPFHy3s.js"; //#region node_modules/framer-motion/dist/es/context/LayoutGroupContext.mjs var import_jsx_runtime = require_jsx_runtime(); var import_react = /* @__PURE__ */ __toESM(require_react(), 1); diff --git a/docker/web/nspanelmanager/web/react-components/dist/react-BZEnDPAj.js b/docker/web/nspanelmanager/web/react-components/dist/react-Dmrhcfpd.js similarity index 96% rename from docker/web/nspanelmanager/web/react-components/dist/react-BZEnDPAj.js rename to docker/web/nspanelmanager/web/react-components/dist/react-Dmrhcfpd.js index aa706ca15..c6d493b27 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/react-BZEnDPAj.js +++ b/docker/web/nspanelmanager/web/react-components/dist/react-Dmrhcfpd.js @@ -1,4 +1,4 @@ -import { c as __toESM, r as require_react } from "./main-Ce1xTlTP.js"; +import { c as __toESM, r as require_react } from "./main-GTPFHy3s.js"; //#region node_modules/zustand/esm/vanilla.mjs var import_react = /* @__PURE__ */ __toESM(require_react(), 1); var createStoreImpl = (createState) => { diff --git a/docker/web/nspanelmanager/web/react-components/dist/react-select.esm-BOOv53_-.js b/docker/web/nspanelmanager/web/react-components/dist/react-select.esm-DIB_MQU9.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/react-select.esm-BOOv53_-.js rename to docker/web/nspanelmanager/web/react-components/dist/react-select.esm-DIB_MQU9.js index 79aa8d0cd..5c300d182 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/react-select.esm-BOOv53_-.js +++ b/docker/web/nspanelmanager/web/react-components/dist/react-select.esm-DIB_MQU9.js @@ -1,4 +1,4 @@ -import { c as __toESM, i as __commonJSMin, n as require_react_dom, r as require_react } from "./main-Ce1xTlTP.js"; +import { c as __toESM, i as __commonJSMin, n as require_react_dom, r as require_react } from "./main-GTPFHy3s.js"; //#region node_modules/@babel/runtime/helpers/esm/typeof.js function _typeof(o) { "@babel/helpers - typeof"; diff --git a/docker/web/nspanelmanager/web/react-components/dist/sortable-BTXnRivy.js b/docker/web/nspanelmanager/web/react-components/dist/sortable-DCj6uSpL.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/sortable-BTXnRivy.js rename to docker/web/nspanelmanager/web/react-components/dist/sortable-DCj6uSpL.js index f192fc469..1d3b32775 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/sortable-BTXnRivy.js +++ b/docker/web/nspanelmanager/web/react-components/dist/sortable-DCj6uSpL.js @@ -1,4 +1,4 @@ -import { c as __toESM, n as require_react_dom, r as require_react, t as require_jsx_runtime } from "./main-Ce1xTlTP.js"; +import { c as __toESM, n as require_react_dom, r as require_react, t as require_jsx_runtime } from "./main-GTPFHy3s.js"; //#region node_modules/@preact/signals-core/dist/signals-core.module.js var import_react = /* @__PURE__ */ __toESM(require_react(), 1); var i = Symbol.for("preact-signals"); diff --git a/docker/web/nspanelmanager/web/react-components/dist/use-spring-Drz06wdx.js b/docker/web/nspanelmanager/web/react-components/dist/use-spring-BVI2O33U.js similarity index 98% rename from docker/web/nspanelmanager/web/react-components/dist/use-spring-Drz06wdx.js rename to docker/web/nspanelmanager/web/react-components/dist/use-spring-BVI2O33U.js index 6599c054d..e587e8f21 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/use-spring-Drz06wdx.js +++ b/docker/web/nspanelmanager/web/react-components/dist/use-spring-BVI2O33U.js @@ -1,5 +1,5 @@ -import { c as __toESM, r as require_react } from "./main-Ce1xTlTP.js"; -import { a as isMotionValue, c as JSAnimation, d as frame, l as interpolate, m as useConstant, o as collectMotionValues, p as useIsomorphicLayoutEffect, r as MotionConfigContext, s as motionValue, u as cancelFrame } from "./proxy-CM7hds_Z.js"; +import { c as __toESM, r as require_react } from "./main-GTPFHy3s.js"; +import { a as isMotionValue, c as JSAnimation, d as frame, l as interpolate, m as useConstant, o as collectMotionValues, p as useIsomorphicLayoutEffect, r as MotionConfigContext, s as motionValue, u as cancelFrame } from "./proxy-DUfbqFkY.js"; //#region node_modules/motion-dom/dist/es/utils/transform.mjs function transform(...args) { const useImmediate = !Array.isArray(args[0]); diff --git a/docker/web/nspanelmanager/web/react-components/src/components/MultiStep_AddEditEntity/entity_types/step3_edit_cover.test.tsx b/docker/web/nspanelmanager/web/react-components/src/components/MultiStep_AddEditEntity/entity_types/step3_edit_cover.test.tsx index fe953adb3..e87cc3a0d 100644 --- a/docker/web/nspanelmanager/web/react-components/src/components/MultiStep_AddEditEntity/entity_types/step3_edit_cover.test.tsx +++ b/docker/web/nspanelmanager/web/react-components/src/components/MultiStep_AddEditEntity/entity_types/step3_edit_cover.test.tsx @@ -34,6 +34,13 @@ const openhab_items = [ item_id: "LivingRoom_Shutter", item: { name: "LivingRoom_Shutter", type: "Rollershutter", state: "0" }, }, + { + type: "openhab", + openhab_type: "item", + label: "Living room tilt", + item_id: "LivingRoom_Tilt", + item: { name: "LivingRoom_Tilt", type: "Rollershutter", state: "0" }, + }, { type: "openhab", openhab_type: "item", @@ -78,7 +85,12 @@ beforeEach(() => { useAvailableEntitiesStore.setState({ status: "loaded", home_assistant_entities: home_assistant_entities, - home_assistant_options: home_assistant_entities.map((entity) => ({ value: entity.item_id, label: entity.label, icon: "mdi-window-shutter", type: entity.type })), + home_assistant_options: home_assistant_entities.map((entity) => ({ + value: entity.item_id, + label: entity.label, + icon: "mdi-window-shutter", + type: entity.type, + })), openhab_items: openhab_items, openhab_options: openhab_items.map((item) => ({ value: item.item_id, label: item.label, icon: "mdi-window-shutter", type: item.type })), }); @@ -146,7 +158,15 @@ describe("cover form", () => { room_view_position: 3, friendly_name: "Living room blind", home_assistant_name: "cover.living_room_blind", + invert_positions: false, openhab_item: "", + openhab_tilt_item: "", + position_preset1: 0, + position_preset2: 0, + position_preset3: 0, + tilt_preset1: 0, + tilt_preset2: 0, + tilt_preset3: 0, }); }); @@ -156,18 +176,38 @@ describe("cover form", () => { renderForm({ controller: "openhab", onComplete }); await user.type(screen.getByLabelText("Name"), "Living room shutter"); - await user.click(screen.getByRole("combobox")); + await user.click(screen.getAllByRole("combobox")[0]); expect(await screen.findByText("Living room shutter")).toBeInTheDocument(); expect(screen.queryByText("Kitchen light")).not.toBeInTheDocument(); await user.click(screen.getByText("Living room shutter")); + console.log(screen.getAllByRole("combobox")[1]); + await user.click(screen.getAllByRole("combobox")[1]); + expect(await screen.findByText("Living room tilt")).toBeInTheDocument(); + expect(screen.queryByText("Kitchen light")).not.toBeInTheDocument(); + await user.click(screen.getByText("Living room tilt")); await waitFor(() => expect(saveButton()).toBeEnabled()); await user.click(saveButton()); await waitFor(() => expect(onComplete).toHaveBeenCalled()); expect(sentBody()).toMatchObject({ + id: null, + type: "entity", + entity_type: "cover", controller: "openhab", + room_id: 1, + entities_page_id: 2, + room_view_position: 3, + friendly_name: "Living room shutter", home_assistant_name: "", + invert_positions: false, openhab_item: "LivingRoom_Shutter", + openhab_tilt_item: "LivingRoom_Tilt", + position_preset1: 0, + position_preset2: 0, + position_preset3: 0, + tilt_preset1: 0, + tilt_preset2: 0, + tilt_preset3: 0, }); }); diff --git a/docker/web/nspanelmanager/web/react-components/src/components/MultiStep_AddEditEntity/entity_types/step3_edit_cover.tsx b/docker/web/nspanelmanager/web/react-components/src/components/MultiStep_AddEditEntity/entity_types/step3_edit_cover.tsx index 65da8f063..56e953bb2 100644 --- a/docker/web/nspanelmanager/web/react-components/src/components/MultiStep_AddEditEntity/entity_types/step3_edit_cover.tsx +++ b/docker/web/nspanelmanager/web/react-components/src/components/MultiStep_AddEditEntity/entity_types/step3_edit_cover.tsx @@ -21,6 +21,15 @@ const schema = z controller: z.string(), home_assistant_name: z.string(), openhab_item: z.string(), + openhab_tilt_item: z.string(), + invert_positions: z.boolean().optional(), + + position_preset1: z.number(), + position_preset2: z.number(), + position_preset3: z.number(), + tilt_preset1: z.number(), + tilt_preset2: z.number(), + tilt_preset3: z.number(), }) .superRefine((data, ctx) => { if (data.controller == "home_assistant") { @@ -96,6 +105,14 @@ const MultiStep_AddEditEntity_Step3_Cover = ({ room_view_position: room_view_position, home_assistant_name: "", openhab_item: "", + openhab_tilt_item: "", + invert_positions: false, + position_preset1: 0, + position_preset2: 0, + position_preset3: 0, + tilt_preset1: 0, + tilt_preset2: 0, + tilt_preset3: 0, }; const { @@ -113,6 +130,13 @@ const MultiStep_AddEditEntity_Step3_Cover = ({ const home_assistant_name = watch("home_assistant_name"); const openhab_item = watch("openhab_item"); + const openhab_tilt_item = watch("openhab_tilt_item"); + watch("position_preset1"); + watch("position_preset2"); + watch("position_preset3"); + watch("tilt_preset1"); + watch("tilt_preset2"); + watch("tilt_preset3"); function getCookie(name: string) { let cookieValue = ""; @@ -129,12 +153,11 @@ const MultiStep_AddEditEntity_Step3_Cover = ({ return cookieValue; } + const entity = useEntitiesPagesStore((s) => s.entities.find((e) => e.id == id)); useEffect(() => { - if (id != null) { - const entityData = useEntitiesPagesStore.getState().entities.find((entity) => entity.id == id); - reset({ ...defaultValues, ...entityData }); - } - }, [id, useEntitiesPagesStore.getState().entities]); + if (!entity) return; + reset({ ...defaultValues, ...entity }); + }, [entity?.id]); function saveEntity(data: CoverFormData) { fetch("/rest/entities/covers", { @@ -176,7 +199,7 @@ const MultiStep_AddEditEntity_Step3_Cover = ({ }; const text_input_class = - "outline-none bg-base-300 border-neutral rounded-md border focus:ring-0 focus:border-accent block flex-1 min-w-0 w-full text-sm p-2.5"; + "outline-none bg-base-300 border-neutral first:rounded-l-md last:rounded-r-md border focus:ring-0 focus:border-accent block flex-1 min-w-0 w-full text-sm p-2.5"; return (
@@ -237,8 +260,67 @@ const MultiStep_AddEditEntity_Step3_Cover = ({ styles={selectStyles} /> {errors.openhab_item && Select an OpenHAB Rollershutter item.} + + + + options={openhab_cover_options} + classNames={classNames} + onChange={(newValue) => setValue("openhab_tilt_item", newValue ? newValue.value : "", { shouldValidate: true })} + unstyled + components={select_components} + value={openhab_cover_options.find((option) => option.value === openhab_tilt_item) ?? null} + styles={selectStyles} + /> + {errors.openhab_tilt_item && Select an OpenHAB Rollershutter item.} )} + +
+ +
+ + {((controller == "home_assistant" && supports_position) || controller == "openhab") && ( +
+ Position presets +
+ + + +
+
+ )} + + {((controller == "home_assistant" && supports_tilt) || (controller == "openhab" && openhab_tilt_item != "")) && ( +
+ Tilt presets +
+ + + +
+
+ )}
diff --git a/docker/web/nspanelmanager/web/react-components/templates/scripts.html b/docker/web/nspanelmanager/web/react-components/templates/scripts.html index 525f7fd92..254bccac9 100644 --- a/docker/web/nspanelmanager/web/react-components/templates/scripts.html +++ b/docker/web/nspanelmanager/web/react-components/templates/scripts.html @@ -1,2 +1,2 @@ {% load static %} - + diff --git a/docker/web/nspanelmanager/web/rest.py b/docker/web/nspanelmanager/web/rest.py index 5c295663a..8da7442f1 100644 --- a/docker/web/nspanelmanager/web/rest.py +++ b/docker/web/nspanelmanager/web/rest.py @@ -1301,8 +1301,16 @@ def put_cover_entity(request): "room_view_position", "controller", "friendly_name", + "invert_positions", "home_assistant_name", "openhab_item", + "openhab_tilt_item", + "position_preset1", + "position_preset2", + "position_preset3", + "tilt_preset1", + "tilt_preset2", + "tilt_preset3", ] data = json.loads(request.body) @@ -1310,7 +1318,7 @@ def put_cover_entity(request): if field not in data: return JsonResponse({"status": "error", "message": f"Missing required field: {field}"}, status=400) - for field in ("controller", "friendly_name", "home_assistant_name", "openhab_item"): + for field in ("controller", "friendly_name", "home_assistant_name", "openhab_item", "openhab_tilt_item"): if not isinstance(data[field], str): return JsonResponse({"status": "error", "message": f"{field} must be a string."}, status=400) @@ -1320,6 +1328,8 @@ def put_cover_entity(request): home_assistant_name = data["home_assistant_name"].strip() openhab_item = data["openhab_item"].strip() + openhab_tilt_item = data["openhab_tilt_item"].strip() + invert_positions = data["invert_positions"] if "invert_positions" in data else False if data["controller"] == "home_assistant": if not home_assistant_name: return JsonResponse({"status": "error", "message": "home_assistant_name is required for a Home Assistant cover."}, status=400) @@ -1367,6 +1377,14 @@ def put_cover_entity(request): "controller": data["controller"], "home_assistant_name": home_assistant_name, "openhab_item": openhab_item, + "openhab_tilt_item": openhab_tilt_item, + "invert_positions": invert_positions, + "position_preset1": int(data["position_preset1"]), + "position_preset2": int(data["position_preset2"]), + "position_preset3": int(data["position_preset3"]), + "tilt_preset1": int(data["tilt_preset1"]), + "tilt_preset2": int(data["tilt_preset2"]), + "tilt_preset3": int(data["tilt_preset3"]), } new_cover.friendly_name = data["friendly_name"].strip() if not new_cover.friendly_name: diff --git a/docker/web/nspanelmanager/web/static/css/main.css b/docker/web/nspanelmanager/web/static/css/main.css index e2f2bf3fe..ef4ee45a8 100644 --- a/docker/web/nspanelmanager/web/static/css/main.css +++ b/docker/web/nspanelmanager/web/static/css/main.css @@ -80,7 +80,6 @@ --font-weight-medium: 500; --font-weight-semibold: 600; --font-weight-bold: 700; - --tracking-wide: 0.025em; --radius-sm: 0.25rem; --radius-md: 0.375rem; --radius-lg: 0.5rem; @@ -5227,9 +5226,6 @@ .ml-2 { margin-left: calc(var(--spacing) * 2); } - .ml-4 { - margin-left: calc(var(--spacing) * 4); - } .carousel-item { box-sizing: content-box; display: flex; @@ -5820,14 +5816,6 @@ width: var(--size); height: var(--size); } - .size-10 { - width: calc(var(--spacing) * 10); - height: calc(var(--spacing) * 10); - } - .size-\[1\.2em\] { - width: 1.2em; - height: 1.2em; - } .size-auto { width: auto; height: auto; @@ -6792,6 +6780,9 @@ .gap-2 { gap: calc(var(--spacing) * 2); } + .gap-3 { + gap: calc(var(--spacing) * 3); + } .gap-4 { gap: calc(var(--spacing) * 4); } @@ -6872,11 +6863,6 @@ --tw-divide-y-reverse: 1; } } - .divide-accent { - :where(& > :not(:last-child)) { - border-color: var(--color-accent); - } - } .divide-neutral { :where(& > :not(:last-child)) { border-color: var(--color-neutral); @@ -7377,6 +7363,10 @@ border-inline-style: var(--tw-border-style); border-inline-width: 0px; } + .border-x-2 { + border-inline-style: var(--tw-border-style); + border-inline-width: 2px; + } .border-y { border-block-style: var(--tw-border-style); border-block-width: 1px; @@ -7397,26 +7387,6 @@ border-top-style: var(--tw-border-style); border-top-width: 0px; } - .border-t-1 { - border-top-style: var(--tw-border-style); - border-top-width: 1px; - } - .border-t-2 { - border-top-style: var(--tw-border-style); - border-top-width: 2px; - } - .border-t-3 { - border-top-style: var(--tw-border-style); - border-top-width: 3px; - } - .border-t-\[0\.25rem\] { - border-top-style: var(--tw-border-style); - border-top-width: 0.25rem; - } - .border-t-\[3px\] { - border-top-style: var(--tw-border-style); - border-top-width: 3px; - } .border-r { border-right-style: var(--tw-border-style); border-right-width: 1px; @@ -7591,9 +7561,6 @@ .border-gray-700 { border-color: var(--color-gray-700); } - .border-info { - border-color: var(--color-info); - } .border-neutral { border-color: var(--color-neutral); } @@ -7606,9 +7573,6 @@ .border-primary { border-color: var(--color-primary); } - .border-success { - border-color: var(--color-success); - } .border-transparent { border-color: transparent; } @@ -7738,9 +7702,6 @@ .bg-base-300 { background-color: var(--color-base-300); } - .bg-base-300\/0\.75 { - background-color: color-mix(in oklab, var(--color-base-300) 0.75%, transparent); - } .bg-base-content { background-color: var(--color-base-content); } @@ -8321,9 +8282,6 @@ .pb-1 { padding-bottom: calc(var(--spacing) * 1); } - .pb-2 { - padding-bottom: calc(var(--spacing) * 2); - } .pb-4 { padding-bottom: calc(var(--spacing) * 4); } @@ -8572,10 +8530,6 @@ --tw-font-weight: var(--font-weight-thin); font-weight: var(--font-weight-thin); } - .tracking-wide { - --tw-tracking: var(--tracking-wide); - letter-spacing: var(--tracking-wide); - } .text-balance { text-wrap: balance; } @@ -9212,15 +9166,9 @@ .opacity-0 { opacity: 0%; } - .opacity-50 { - opacity: 50%; - } .opacity-60 { opacity: 60%; } - .opacity-75 { - opacity: 75%; - } .opacity-80 { opacity: 80%; } @@ -10466,6 +10414,23 @@ content: var(--tw-content); } } + .first\:rounded-l-md { + &:first-child { + border-top-left-radius: var(--radius-md); + border-bottom-left-radius: var(--radius-md); + } + } + .last\:rounded-md { + &:last-child { + border-radius: var(--radius-md); + } + } + .last\:rounded-r-md { + &:last-child { + border-top-right-radius: var(--radius-md); + border-bottom-right-radius: var(--radius-md); + } + } .checked\:bg-success { &:checked { background-color: var(--color-success); @@ -12859,10 +12824,6 @@ syntax: "*"; inherits: false; } -@property --tw-tracking { - syntax: "*"; - inherits: false; -} @property --tw-ordinal { syntax: "*"; inherits: false; diff --git a/docker/web/nspanelmanager/web/tests/test_entities.py b/docker/web/nspanelmanager/web/tests/test_entities.py index 40fdff8aa..05217cda4 100644 --- a/docker/web/nspanelmanager/web/tests/test_entities.py +++ b/docker/web/nspanelmanager/web/tests/test_entities.py @@ -462,6 +462,14 @@ def payload(self, slot=0, **overrides): "friendly_name": "Living room blind", "home_assistant_name": "cover.living_room_blind", "openhab_item": "", + "openhab_tilt_item": "", + "invert_positions": False, + "position_preset1": 25, + "position_preset2": 30, + "position_preset3": 35, + "tilt_preset1": 50, + "tilt_preset2": 55, + "tilt_preset3": 60, } | overrides def form_payload(self, **overrides): @@ -481,13 +489,21 @@ def test_add_home_assistant_cover(self): "controller": "home_assistant", "home_assistant_name": "cover.living_room_blind", "openhab_item": "", + "openhab_tilt_item": "", + "invert_positions": False, + "position_preset1": 25, + "position_preset2": 30, + "position_preset3": 35, + "tilt_preset1": 50, + "tilt_preset2": 55, + "tilt_preset3": 60, }, ) self.assertLoadableByManager(cover) self.assertManagerReloaded(times=1) def test_add_openhab_cover(self): - response = self.save(self.payload(controller="openhab", home_assistant_name="", openhab_item="LivingRoom_Shutter")) + response = self.save(self.payload(controller="openhab", home_assistant_name="", openhab_item="LivingRoom_Shutter", openhab_tilt_item="LivingRoom_Tilt_Shutter")) self.assertEqual(response.status_code, 200) cover = Entity.objects.get() @@ -497,6 +513,14 @@ def test_add_openhab_cover(self): "controller": "openhab", "home_assistant_name": "", "openhab_item": "LivingRoom_Shutter", + "openhab_tilt_item": "LivingRoom_Tilt_Shutter", + "invert_positions": False, + "position_preset1": 25, + "position_preset2": 30, + "position_preset3": 35, + "tilt_preset1": 50, + "tilt_preset2": 55, + "tilt_preset3": 60, }, ) self.assertLoadableByManager(cover) diff --git a/protobuf_firmware/protobuf_nspanel_entity.pb-c.c b/protobuf_firmware/protobuf_nspanel_entity.pb-c.c index f943d3105..6abe97b75 100644 --- a/protobuf_firmware/protobuf_nspanel_entity.pb-c.c +++ b/protobuf_firmware/protobuf_nspanel_entity.pb-c.c @@ -983,7 +983,7 @@ const ProtobufCEnumDescriptor nspanel_entity_state__cover__cover_state__descript nspanel_entity_state__cover__cover_state__value_ranges, NULL,NULL,NULL,NULL /* reserved[1234] */ }; -static const ProtobufCFieldDescriptor nspanel_entity_state__cover__field_descriptors[16] = +static const ProtobufCFieldDescriptor nspanel_entity_state__cover__field_descriptors[22] = { { "cover_id", @@ -1177,6 +1177,78 @@ static const ProtobufCFieldDescriptor nspanel_entity_state__cover__field_descrip 0, /* flags */ 0,NULL,NULL /* reserved1,reserved2, etc */ }, + { + "position_preset1", + 17, + PROTOBUF_C_LABEL_NONE, + PROTOBUF_C_TYPE_INT32, + 0, /* quantifier_offset */ + offsetof(NSPanelEntityState__Cover, position_preset1), + NULL, + NULL, + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, + { + "position_preset2", + 18, + PROTOBUF_C_LABEL_NONE, + PROTOBUF_C_TYPE_INT32, + 0, /* quantifier_offset */ + offsetof(NSPanelEntityState__Cover, position_preset2), + NULL, + NULL, + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, + { + "position_preset3", + 19, + PROTOBUF_C_LABEL_NONE, + PROTOBUF_C_TYPE_INT32, + 0, /* quantifier_offset */ + offsetof(NSPanelEntityState__Cover, position_preset3), + NULL, + NULL, + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, + { + "tilt_preset1", + 20, + PROTOBUF_C_LABEL_NONE, + PROTOBUF_C_TYPE_INT32, + 0, /* quantifier_offset */ + offsetof(NSPanelEntityState__Cover, tilt_preset1), + NULL, + NULL, + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, + { + "tilt_preset2", + 21, + PROTOBUF_C_LABEL_NONE, + PROTOBUF_C_TYPE_INT32, + 0, /* quantifier_offset */ + offsetof(NSPanelEntityState__Cover, tilt_preset2), + NULL, + NULL, + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, + { + "tilt_preset3", + 22, + PROTOBUF_C_LABEL_NONE, + PROTOBUF_C_TYPE_INT32, + 0, /* quantifier_offset */ + offsetof(NSPanelEntityState__Cover, tilt_preset3), + NULL, + NULL, + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, }; static const unsigned nspanel_entity_state__cover__field_indices_by_name[] = { 8, /* field[8] = can_close */ @@ -1193,13 +1265,19 @@ static const unsigned nspanel_entity_state__cover__field_indices_by_name[] = { 5, /* field[5] = has_tilt_position */ 1, /* field[1] = name */ 4, /* field[4] = position */ + 16, /* field[16] = position_preset1 */ + 17, /* field[17] = position_preset2 */ + 18, /* field[18] = position_preset3 */ 2, /* field[2] = state */ 6, /* field[6] = tilt_position */ + 19, /* field[19] = tilt_preset1 */ + 20, /* field[20] = tilt_preset2 */ + 21, /* field[21] = tilt_preset3 */ }; static const ProtobufCIntRange nspanel_entity_state__cover__number_ranges[1 + 1] = { { 1, 0 }, - { 0, 16 } + { 0, 22 } }; const ProtobufCMessageDescriptor nspanel_entity_state__cover__descriptor = { @@ -1209,7 +1287,7 @@ const ProtobufCMessageDescriptor nspanel_entity_state__cover__descriptor = "NSPanelEntityState__Cover", "", sizeof(NSPanelEntityState__Cover), - 16, + 22, nspanel_entity_state__cover__field_descriptors, nspanel_entity_state__cover__field_indices_by_name, 1, nspanel_entity_state__cover__number_ranges, diff --git a/protobuf_firmware/protobuf_nspanel_entity.pb-c.h b/protobuf_firmware/protobuf_nspanel_entity.pb-c.h index 3f8276662..5b6885d7e 100644 --- a/protobuf_firmware/protobuf_nspanel_entity.pb-c.h +++ b/protobuf_firmware/protobuf_nspanel_entity.pb-c.h @@ -240,10 +240,19 @@ struct NSPanelEntityState__Cover * Optional hint for the panel icon, for example "blind" or "garage". */ char *device_class; + /* + * Preset position numbers. + */ + int32_t position_preset1; + int32_t position_preset2; + int32_t position_preset3; + int32_t tilt_preset1; + int32_t tilt_preset2; + int32_t tilt_preset3; }; #define NSPANEL_ENTITY_STATE__COVER__INIT \ { PROTOBUF_C_MESSAGE_INIT (&nspanel_entity_state__cover__descriptor) \ - , 0, (char *)protobuf_c_empty_string, NSPANEL_ENTITY_STATE__COVER__COVER_STATE__UNKNOWN, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, (char *)protobuf_c_empty_string } + , 0, (char *)protobuf_c_empty_string, NSPANEL_ENTITY_STATE__COVER__COVER_STATE__UNKNOWN, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, (char *)protobuf_c_empty_string, 0, 0, 0, 0, 0, 0 } typedef enum {