mirror of
https://github.com/esphome/esphome.git
synced 2024-11-09 16:57:47 +01:00
Merge branch 'dev' into hbridge-switch
This commit is contained in:
commit
8c01ebd4a1
55 changed files with 1425 additions and 162 deletions
2
.github/workflows/sync-device-classes.yml
vendored
2
.github/workflows/sync-device-classes.yml
vendored
|
@ -36,7 +36,7 @@ jobs:
|
|||
python ./script/sync-device_class.py
|
||||
|
||||
- name: Commit changes
|
||||
uses: peter-evans/create-pull-request@v7.0.2
|
||||
uses: peter-evans/create-pull-request@v7.0.3
|
||||
with:
|
||||
commit-message: "Synchronise Device Classes from Home Assistant"
|
||||
committer: esphomebot <esphome@nabucasa.com>
|
||||
|
|
|
@ -166,6 +166,7 @@ esphome/components/haier/* @paveldn
|
|||
esphome/components/haier/binary_sensor/* @paveldn
|
||||
esphome/components/haier/button/* @paveldn
|
||||
esphome/components/haier/sensor/* @paveldn
|
||||
esphome/components/haier/switch/* @paveldn
|
||||
esphome/components/haier/text_sensor/* @paveldn
|
||||
esphome/components/havells_solar/* @sourabhjaiswal
|
||||
esphome/components/hbridge/fan/* @WeekendWarrior
|
||||
|
@ -398,6 +399,7 @@ esphome/components/sun_gtil2/* @Mat931
|
|||
esphome/components/switch/* @esphome/core
|
||||
esphome/components/t6615/* @tylermenezes
|
||||
esphome/components/tca9548a/* @andreashergert1984
|
||||
esphome/components/tca9555/* @mobrembski
|
||||
esphome/components/tcl112/* @glmnet
|
||||
esphome/components/tee501/* @Stock-M
|
||||
esphome/components/teleinfo/* @0hax
|
||||
|
|
|
@ -62,6 +62,8 @@ service APIConnection {
|
|||
rpc unsubscribe_bluetooth_le_advertisements(UnsubscribeBluetoothLEAdvertisementsRequest) returns (void) {}
|
||||
|
||||
rpc subscribe_voice_assistant(SubscribeVoiceAssistantRequest) returns (void) {}
|
||||
rpc voice_assistant_get_configuration(VoiceAssistantConfigurationRequest) returns (VoiceAssistantConfigurationResponse) {}
|
||||
rpc voice_assistant_set_configuration(VoiceAssistantSetConfiguration) returns (void) {}
|
||||
|
||||
rpc alarm_control_panel_command (AlarmControlPanelCommandRequest) returns (void) {}
|
||||
}
|
||||
|
@ -1572,7 +1574,7 @@ message VoiceAssistantAnnounceFinished {
|
|||
}
|
||||
|
||||
message VoiceAssistantWakeWord {
|
||||
uint32 id = 1;
|
||||
string id = 1;
|
||||
string wake_word = 2;
|
||||
repeated string trained_languages = 3;
|
||||
}
|
||||
|
@ -1589,7 +1591,7 @@ message VoiceAssistantConfigurationResponse {
|
|||
option (ifdef) = "USE_VOICE_ASSISTANT";
|
||||
|
||||
repeated VoiceAssistantWakeWord available_wake_words = 1;
|
||||
repeated uint32 active_wake_words = 2;
|
||||
repeated string active_wake_words = 2;
|
||||
uint32 max_active_wake_words = 3;
|
||||
}
|
||||
|
||||
|
@ -1598,7 +1600,7 @@ message VoiceAssistantSetConfiguration {
|
|||
option (source) = SOURCE_CLIENT;
|
||||
option (ifdef) = "USE_VOICE_ASSISTANT";
|
||||
|
||||
repeated uint32 active_wake_words = 1;
|
||||
repeated string active_wake_words = 1;
|
||||
}
|
||||
|
||||
// ==================== ALARM CONTROL PANEL ====================
|
||||
|
|
|
@ -1224,6 +1224,39 @@ void APIConnection::on_voice_assistant_announce_request(const VoiceAssistantAnno
|
|||
}
|
||||
}
|
||||
|
||||
VoiceAssistantConfigurationResponse APIConnection::voice_assistant_get_configuration(
|
||||
const VoiceAssistantConfigurationRequest &msg) {
|
||||
VoiceAssistantConfigurationResponse resp;
|
||||
if (voice_assistant::global_voice_assistant != nullptr) {
|
||||
if (voice_assistant::global_voice_assistant->get_api_connection() != this) {
|
||||
return resp;
|
||||
}
|
||||
|
||||
auto &config = voice_assistant::global_voice_assistant->get_configuration();
|
||||
for (auto &wake_word : config.available_wake_words) {
|
||||
VoiceAssistantWakeWord resp_wake_word;
|
||||
resp_wake_word.id = wake_word.id;
|
||||
resp_wake_word.wake_word = wake_word.wake_word;
|
||||
for (const auto &lang : wake_word.trained_languages) {
|
||||
resp_wake_word.trained_languages.push_back(lang);
|
||||
}
|
||||
resp.available_wake_words.push_back(std::move(resp_wake_word));
|
||||
}
|
||||
resp.max_active_wake_words = config.max_active_wake_words;
|
||||
}
|
||||
return resp;
|
||||
}
|
||||
|
||||
void APIConnection::voice_assistant_set_configuration(const VoiceAssistantSetConfiguration &msg) {
|
||||
if (voice_assistant::global_voice_assistant != nullptr) {
|
||||
if (voice_assistant::global_voice_assistant->get_api_connection() != this) {
|
||||
return;
|
||||
}
|
||||
|
||||
voice_assistant::global_voice_assistant->on_set_configuration(msg.active_wake_words);
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
#ifdef USE_ALARM_CONTROL_PANEL
|
||||
|
|
|
@ -152,6 +152,9 @@ class APIConnection : public APIServerConnection {
|
|||
void on_voice_assistant_audio(const VoiceAssistantAudio &msg) override;
|
||||
void on_voice_assistant_timer_event_response(const VoiceAssistantTimerEventResponse &msg) override;
|
||||
void on_voice_assistant_announce_request(const VoiceAssistantAnnounceRequest &msg) override;
|
||||
VoiceAssistantConfigurationResponse voice_assistant_get_configuration(
|
||||
const VoiceAssistantConfigurationRequest &msg) override;
|
||||
void voice_assistant_set_configuration(const VoiceAssistantSetConfiguration &msg) override;
|
||||
#endif
|
||||
|
||||
#ifdef USE_ALARM_CONTROL_PANEL
|
||||
|
|
|
@ -7124,18 +7124,12 @@ void VoiceAssistantAnnounceFinished::dump_to(std::string &out) const {
|
|||
out.append("}");
|
||||
}
|
||||
#endif
|
||||
bool VoiceAssistantWakeWord::decode_varint(uint32_t field_id, ProtoVarInt value) {
|
||||
switch (field_id) {
|
||||
case 1: {
|
||||
this->id = value.as_uint32();
|
||||
return true;
|
||||
}
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
}
|
||||
bool VoiceAssistantWakeWord::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
|
||||
switch (field_id) {
|
||||
case 1: {
|
||||
this->id = value.as_string();
|
||||
return true;
|
||||
}
|
||||
case 2: {
|
||||
this->wake_word = value.as_string();
|
||||
return true;
|
||||
|
@ -7149,7 +7143,7 @@ bool VoiceAssistantWakeWord::decode_length(uint32_t field_id, ProtoLengthDelimit
|
|||
}
|
||||
}
|
||||
void VoiceAssistantWakeWord::encode(ProtoWriteBuffer buffer) const {
|
||||
buffer.encode_uint32(1, this->id);
|
||||
buffer.encode_string(1, this->id);
|
||||
buffer.encode_string(2, this->wake_word);
|
||||
for (auto &it : this->trained_languages) {
|
||||
buffer.encode_string(3, it, true);
|
||||
|
@ -7160,8 +7154,7 @@ void VoiceAssistantWakeWord::dump_to(std::string &out) const {
|
|||
__attribute__((unused)) char buffer[64];
|
||||
out.append("VoiceAssistantWakeWord {\n");
|
||||
out.append(" id: ");
|
||||
sprintf(buffer, "%" PRIu32, this->id);
|
||||
out.append(buffer);
|
||||
out.append("'").append(this->id).append("'");
|
||||
out.append("\n");
|
||||
|
||||
out.append(" wake_word: ");
|
||||
|
@ -7184,10 +7177,6 @@ void VoiceAssistantConfigurationRequest::dump_to(std::string &out) const {
|
|||
#endif
|
||||
bool VoiceAssistantConfigurationResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
|
||||
switch (field_id) {
|
||||
case 2: {
|
||||
this->active_wake_words.push_back(value.as_uint32());
|
||||
return true;
|
||||
}
|
||||
case 3: {
|
||||
this->max_active_wake_words = value.as_uint32();
|
||||
return true;
|
||||
|
@ -7202,6 +7191,10 @@ bool VoiceAssistantConfigurationResponse::decode_length(uint32_t field_id, Proto
|
|||
this->available_wake_words.push_back(value.as_message<VoiceAssistantWakeWord>());
|
||||
return true;
|
||||
}
|
||||
case 2: {
|
||||
this->active_wake_words.push_back(value.as_string());
|
||||
return true;
|
||||
}
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
|
@ -7211,7 +7204,7 @@ void VoiceAssistantConfigurationResponse::encode(ProtoWriteBuffer buffer) const
|
|||
buffer.encode_message<VoiceAssistantWakeWord>(1, it, true);
|
||||
}
|
||||
for (auto &it : this->active_wake_words) {
|
||||
buffer.encode_uint32(2, it, true);
|
||||
buffer.encode_string(2, it, true);
|
||||
}
|
||||
buffer.encode_uint32(3, this->max_active_wake_words);
|
||||
}
|
||||
|
@ -7227,8 +7220,7 @@ void VoiceAssistantConfigurationResponse::dump_to(std::string &out) const {
|
|||
|
||||
for (const auto &it : this->active_wake_words) {
|
||||
out.append(" active_wake_words: ");
|
||||
sprintf(buffer, "%" PRIu32, it);
|
||||
out.append(buffer);
|
||||
out.append("'").append(it).append("'");
|
||||
out.append("\n");
|
||||
}
|
||||
|
||||
|
@ -7239,10 +7231,10 @@ void VoiceAssistantConfigurationResponse::dump_to(std::string &out) const {
|
|||
out.append("}");
|
||||
}
|
||||
#endif
|
||||
bool VoiceAssistantSetConfiguration::decode_varint(uint32_t field_id, ProtoVarInt value) {
|
||||
bool VoiceAssistantSetConfiguration::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
|
||||
switch (field_id) {
|
||||
case 1: {
|
||||
this->active_wake_words.push_back(value.as_uint32());
|
||||
this->active_wake_words.push_back(value.as_string());
|
||||
return true;
|
||||
}
|
||||
default:
|
||||
|
@ -7251,7 +7243,7 @@ bool VoiceAssistantSetConfiguration::decode_varint(uint32_t field_id, ProtoVarIn
|
|||
}
|
||||
void VoiceAssistantSetConfiguration::encode(ProtoWriteBuffer buffer) const {
|
||||
for (auto &it : this->active_wake_words) {
|
||||
buffer.encode_uint32(1, it, true);
|
||||
buffer.encode_string(1, it, true);
|
||||
}
|
||||
}
|
||||
#ifdef HAS_PROTO_MESSAGE_DUMP
|
||||
|
@ -7260,8 +7252,7 @@ void VoiceAssistantSetConfiguration::dump_to(std::string &out) const {
|
|||
out.append("VoiceAssistantSetConfiguration {\n");
|
||||
for (const auto &it : this->active_wake_words) {
|
||||
out.append(" active_wake_words: ");
|
||||
sprintf(buffer, "%" PRIu32, it);
|
||||
out.append(buffer);
|
||||
out.append("'").append(it).append("'");
|
||||
out.append("\n");
|
||||
}
|
||||
out.append("}");
|
||||
|
|
|
@ -1851,7 +1851,7 @@ class VoiceAssistantAnnounceFinished : public ProtoMessage {
|
|||
};
|
||||
class VoiceAssistantWakeWord : public ProtoMessage {
|
||||
public:
|
||||
uint32_t id{0};
|
||||
std::string id{};
|
||||
std::string wake_word{};
|
||||
std::vector<std::string> trained_languages{};
|
||||
void encode(ProtoWriteBuffer buffer) const override;
|
||||
|
@ -1861,7 +1861,6 @@ class VoiceAssistantWakeWord : public ProtoMessage {
|
|||
|
||||
protected:
|
||||
bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
|
||||
bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
|
||||
};
|
||||
class VoiceAssistantConfigurationRequest : public ProtoMessage {
|
||||
public:
|
||||
|
@ -1875,7 +1874,7 @@ class VoiceAssistantConfigurationRequest : public ProtoMessage {
|
|||
class VoiceAssistantConfigurationResponse : public ProtoMessage {
|
||||
public:
|
||||
std::vector<VoiceAssistantWakeWord> available_wake_words{};
|
||||
std::vector<uint32_t> active_wake_words{};
|
||||
std::vector<std::string> active_wake_words{};
|
||||
uint32_t max_active_wake_words{0};
|
||||
void encode(ProtoWriteBuffer buffer) const override;
|
||||
#ifdef HAS_PROTO_MESSAGE_DUMP
|
||||
|
@ -1888,14 +1887,14 @@ class VoiceAssistantConfigurationResponse : public ProtoMessage {
|
|||
};
|
||||
class VoiceAssistantSetConfiguration : public ProtoMessage {
|
||||
public:
|
||||
std::vector<uint32_t> active_wake_words{};
|
||||
std::vector<std::string> active_wake_words{};
|
||||
void encode(ProtoWriteBuffer buffer) const override;
|
||||
#ifdef HAS_PROTO_MESSAGE_DUMP
|
||||
void dump_to(std::string &out) const override;
|
||||
#endif
|
||||
|
||||
protected:
|
||||
bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
|
||||
bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
|
||||
};
|
||||
class ListEntitiesAlarmControlPanelResponse : public ProtoMessage {
|
||||
public:
|
||||
|
|
|
@ -1681,6 +1681,35 @@ void APIServerConnection::on_subscribe_voice_assistant_request(const SubscribeVo
|
|||
this->subscribe_voice_assistant(msg);
|
||||
}
|
||||
#endif
|
||||
#ifdef USE_VOICE_ASSISTANT
|
||||
void APIServerConnection::on_voice_assistant_configuration_request(const VoiceAssistantConfigurationRequest &msg) {
|
||||
if (!this->is_connection_setup()) {
|
||||
this->on_no_setup_connection();
|
||||
return;
|
||||
}
|
||||
if (!this->is_authenticated()) {
|
||||
this->on_unauthenticated_access();
|
||||
return;
|
||||
}
|
||||
VoiceAssistantConfigurationResponse ret = this->voice_assistant_get_configuration(msg);
|
||||
if (!this->send_voice_assistant_configuration_response(ret)) {
|
||||
this->on_fatal_error();
|
||||
}
|
||||
}
|
||||
#endif
|
||||
#ifdef USE_VOICE_ASSISTANT
|
||||
void APIServerConnection::on_voice_assistant_set_configuration(const VoiceAssistantSetConfiguration &msg) {
|
||||
if (!this->is_connection_setup()) {
|
||||
this->on_no_setup_connection();
|
||||
return;
|
||||
}
|
||||
if (!this->is_authenticated()) {
|
||||
this->on_unauthenticated_access();
|
||||
return;
|
||||
}
|
||||
this->voice_assistant_set_configuration(msg);
|
||||
}
|
||||
#endif
|
||||
#ifdef USE_ALARM_CONTROL_PANEL
|
||||
void APIServerConnection::on_alarm_control_panel_command_request(const AlarmControlPanelCommandRequest &msg) {
|
||||
if (!this->is_connection_setup()) {
|
||||
|
|
|
@ -434,6 +434,13 @@ class APIServerConnection : public APIServerConnectionBase {
|
|||
#ifdef USE_VOICE_ASSISTANT
|
||||
virtual void subscribe_voice_assistant(const SubscribeVoiceAssistantRequest &msg) = 0;
|
||||
#endif
|
||||
#ifdef USE_VOICE_ASSISTANT
|
||||
virtual VoiceAssistantConfigurationResponse voice_assistant_get_configuration(
|
||||
const VoiceAssistantConfigurationRequest &msg) = 0;
|
||||
#endif
|
||||
#ifdef USE_VOICE_ASSISTANT
|
||||
virtual void voice_assistant_set_configuration(const VoiceAssistantSetConfiguration &msg) = 0;
|
||||
#endif
|
||||
#ifdef USE_ALARM_CONTROL_PANEL
|
||||
virtual void alarm_control_panel_command(const AlarmControlPanelCommandRequest &msg) = 0;
|
||||
#endif
|
||||
|
@ -535,6 +542,12 @@ class APIServerConnection : public APIServerConnectionBase {
|
|||
#ifdef USE_VOICE_ASSISTANT
|
||||
void on_subscribe_voice_assistant_request(const SubscribeVoiceAssistantRequest &msg) override;
|
||||
#endif
|
||||
#ifdef USE_VOICE_ASSISTANT
|
||||
void on_voice_assistant_configuration_request(const VoiceAssistantConfigurationRequest &msg) override;
|
||||
#endif
|
||||
#ifdef USE_VOICE_ASSISTANT
|
||||
void on_voice_assistant_set_configuration(const VoiceAssistantSetConfiguration &msg) override;
|
||||
#endif
|
||||
#ifdef USE_ALARM_CONTROL_PANEL
|
||||
void on_alarm_control_panel_command_request(const AlarmControlPanelCommandRequest &msg) override;
|
||||
#endif
|
||||
|
|
|
@ -59,6 +59,7 @@ ETHERNET_TYPES = {
|
|||
"KSZ8081": EthernetType.ETHERNET_TYPE_KSZ8081,
|
||||
"KSZ8081RNA": EthernetType.ETHERNET_TYPE_KSZ8081RNA,
|
||||
"W5500": EthernetType.ETHERNET_TYPE_W5500,
|
||||
"OPENETH": EthernetType.ETHERNET_TYPE_OPENETH,
|
||||
}
|
||||
|
||||
SPI_ETHERNET_TYPES = ["W5500"]
|
||||
|
@ -171,6 +172,7 @@ CONFIG_SCHEMA = cv.All(
|
|||
"KSZ8081": RMII_SCHEMA,
|
||||
"KSZ8081RNA": RMII_SCHEMA,
|
||||
"W5500": SPI_SCHEMA,
|
||||
"OPENETH": BASE_SCHEMA,
|
||||
},
|
||||
upper=True,
|
||||
),
|
||||
|
@ -240,6 +242,9 @@ async def to_code(config):
|
|||
if CORE.using_esp_idf:
|
||||
add_idf_sdkconfig_option("CONFIG_ETH_USE_SPI_ETHERNET", True)
|
||||
add_idf_sdkconfig_option("CONFIG_ETH_SPI_ETHERNET_W5500", True)
|
||||
elif config[CONF_TYPE] == "OPENETH":
|
||||
cg.add_define("USE_ETHERNET_OPENETH")
|
||||
add_idf_sdkconfig_option("CONFIG_ETH_USE_OPENETH", True)
|
||||
else:
|
||||
cg.add(var.set_phy_addr(config[CONF_PHY_ADDR]))
|
||||
cg.add(var.set_mdc_pin(config[CONF_MDC_PIN]))
|
||||
|
|
|
@ -120,6 +120,8 @@ void EthernetComponent::setup() {
|
|||
phy_config.reset_gpio_num = this->reset_pin_;
|
||||
|
||||
esp_eth_mac_t *mac = esp_eth_mac_new_w5500(&w5500_config, &mac_config);
|
||||
#elif defined(USE_ETHERNET_OPENETH)
|
||||
esp_eth_mac_t *mac = esp_eth_mac_new_openeth(&mac_config);
|
||||
#else
|
||||
phy_config.phy_addr = this->phy_addr_;
|
||||
phy_config.reset_gpio_num = this->power_pin_;
|
||||
|
@ -143,6 +145,13 @@ void EthernetComponent::setup() {
|
|||
#endif
|
||||
|
||||
switch (this->type_) {
|
||||
#ifdef USE_ETHERNET_OPENETH
|
||||
case ETHERNET_TYPE_OPENETH: {
|
||||
phy_config.autonego_timeout_ms = 1000;
|
||||
this->phy_ = esp_eth_phy_new_dp83848(&phy_config);
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
#if CONFIG_ETH_USE_ESP32_EMAC
|
||||
case ETHERNET_TYPE_LAN8720: {
|
||||
this->phy_ = esp_eth_phy_new_lan87xx(&phy_config);
|
||||
|
@ -302,6 +311,10 @@ void EthernetComponent::dump_config() {
|
|||
eth_type = "W5500";
|
||||
break;
|
||||
|
||||
case ETHERNET_TYPE_OPENETH:
|
||||
eth_type = "OPENETH";
|
||||
break;
|
||||
|
||||
default:
|
||||
eth_type = "Unknown";
|
||||
break;
|
||||
|
|
|
@ -25,6 +25,7 @@ enum EthernetType {
|
|||
ETHERNET_TYPE_KSZ8081,
|
||||
ETHERNET_TYPE_KSZ8081RNA,
|
||||
ETHERNET_TYPE_W5500,
|
||||
ETHERNET_TYPE_OPENETH,
|
||||
};
|
||||
|
||||
struct ManualIP {
|
||||
|
|
0
esphome/components/gpio_expander/__init__.py
Normal file
0
esphome/components/gpio_expander/__init__.py
Normal file
38
esphome/components/gpio_expander/cached_gpio.h
Normal file
38
esphome/components/gpio_expander/cached_gpio.h
Normal file
|
@ -0,0 +1,38 @@
|
|||
#pragma once
|
||||
|
||||
#include <array>
|
||||
#include <cstdint>
|
||||
#include "esphome/core/hal.h"
|
||||
|
||||
namespace esphome {
|
||||
namespace gpio_expander {
|
||||
|
||||
/// @brief A class to cache the read state of a GPIO expander.
|
||||
template<typename T, T N> class CachedGpioExpander {
|
||||
public:
|
||||
bool digital_read(T pin) {
|
||||
if (!this->read_cache_invalidated_[pin]) {
|
||||
this->read_cache_invalidated_[pin] = true;
|
||||
return this->digital_read_cache(pin);
|
||||
}
|
||||
return this->digital_read_hw(pin);
|
||||
}
|
||||
|
||||
void digital_write(T pin, bool value) { this->digital_write_hw(pin, value); }
|
||||
|
||||
protected:
|
||||
virtual bool digital_read_hw(T pin) = 0;
|
||||
virtual bool digital_read_cache(T pin) = 0;
|
||||
virtual void digital_write_hw(T pin, bool value) = 0;
|
||||
|
||||
void reset_pin_cache_() {
|
||||
for (T i = 0; i < N; i++) {
|
||||
this->read_cache_invalidated_[i] = false;
|
||||
}
|
||||
}
|
||||
|
||||
std::array<bool, N> read_cache_invalidated_{};
|
||||
};
|
||||
|
||||
} // namespace gpio_expander
|
||||
} // namespace esphome
|
|
@ -114,7 +114,6 @@ SUPPORTED_CLIMATE_PRESETS_SMARTAIR2_OPTIONS = {
|
|||
SUPPORTED_CLIMATE_PRESETS_HON_OPTIONS = {
|
||||
"AWAY": ClimatePreset.CLIMATE_PRESET_AWAY,
|
||||
"BOOST": ClimatePreset.CLIMATE_PRESET_BOOST,
|
||||
"ECO": ClimatePreset.CLIMATE_PRESET_ECO,
|
||||
"SLEEP": ClimatePreset.CLIMATE_PRESET_SLEEP,
|
||||
}
|
||||
|
||||
|
@ -240,7 +239,9 @@ CONFIG_SCHEMA = cv.All(
|
|||
): cv.ensure_list(
|
||||
cv.enum(SUPPORTED_HON_CONTROL_METHODS, upper=True)
|
||||
),
|
||||
cv.Optional(CONF_BEEPER, default=True): cv.boolean,
|
||||
cv.Optional(CONF_BEEPER): cv.invalid(
|
||||
f"The {CONF_BEEPER} option is deprecated, use beeper_on/beeper_off actions or beeper switch for a haier platform instead"
|
||||
),
|
||||
cv.Optional(
|
||||
CONF_CONTROL_PACKET_SIZE, default=PROTOCOL_CONTROL_PACKET_SIZE
|
||||
): cv.int_range(min=PROTOCOL_CONTROL_PACKET_SIZE, max=50),
|
||||
|
@ -254,7 +255,7 @@ CONFIG_SCHEMA = cv.All(
|
|||
): cv.int_range(min=PROTOCOL_STATUS_MESSAGE_HEADER_SIZE),
|
||||
cv.Optional(
|
||||
CONF_SUPPORTED_PRESETS,
|
||||
default=["BOOST", "ECO", "SLEEP"], # No AWAY by default
|
||||
default=["BOOST", "SLEEP"], # No AWAY by default
|
||||
): cv.ensure_list(
|
||||
cv.enum(SUPPORTED_CLIMATE_PRESETS_HON_OPTIONS, upper=True)
|
||||
),
|
||||
|
|
|
@ -52,8 +52,6 @@ bool check_timeout(std::chrono::steady_clock::time_point now, std::chrono::stead
|
|||
HaierClimateBase::HaierClimateBase()
|
||||
: haier_protocol_(*this),
|
||||
protocol_phase_(ProtocolPhases::SENDING_INIT_1),
|
||||
display_status_(true),
|
||||
health_mode_(false),
|
||||
force_send_control_(false),
|
||||
forced_request_status_(false),
|
||||
reset_protocol_request_(false),
|
||||
|
@ -127,21 +125,34 @@ haier_protocol::HaierMessage HaierClimateBase::get_wifi_signal_message_() {
|
|||
}
|
||||
#endif
|
||||
|
||||
bool HaierClimateBase::get_display_state() const { return this->display_status_; }
|
||||
|
||||
void HaierClimateBase::set_display_state(bool state) {
|
||||
if (this->display_status_ != state) {
|
||||
this->display_status_ = state;
|
||||
this->force_send_control_ = true;
|
||||
void HaierClimateBase::save_settings() {
|
||||
HaierBaseSettings settings{this->get_health_mode(), this->get_display_state()};
|
||||
if (!this->base_rtc_.save(&settings)) {
|
||||
ESP_LOGW(TAG, "Failed to save settings");
|
||||
}
|
||||
}
|
||||
|
||||
bool HaierClimateBase::get_health_mode() const { return this->health_mode_; }
|
||||
bool HaierClimateBase::get_display_state() const {
|
||||
return (this->display_status_ == SwitchState::ON) || (this->display_status_ == SwitchState::PENDING_ON);
|
||||
}
|
||||
|
||||
void HaierClimateBase::set_display_state(bool state) {
|
||||
if (state != this->get_display_state()) {
|
||||
this->display_status_ = state ? SwitchState::PENDING_ON : SwitchState::PENDING_OFF;
|
||||
this->force_send_control_ = true;
|
||||
this->save_settings();
|
||||
}
|
||||
}
|
||||
|
||||
bool HaierClimateBase::get_health_mode() const {
|
||||
return (this->health_mode_ == SwitchState::ON) || (this->health_mode_ == SwitchState::PENDING_ON);
|
||||
}
|
||||
|
||||
void HaierClimateBase::set_health_mode(bool state) {
|
||||
if (this->health_mode_ != state) {
|
||||
this->health_mode_ = state;
|
||||
if (state != this->get_health_mode()) {
|
||||
this->health_mode_ = state ? SwitchState::PENDING_ON : SwitchState::PENDING_OFF;
|
||||
this->force_send_control_ = true;
|
||||
this->save_settings();
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -287,6 +298,14 @@ void HaierClimateBase::loop() {
|
|||
}
|
||||
this->process_phase(now);
|
||||
this->haier_protocol_.loop();
|
||||
#ifdef USE_SWITCH
|
||||
if ((this->display_switch_ != nullptr) && (this->display_switch_->state != this->get_display_state())) {
|
||||
this->display_switch_->publish_state(this->get_display_state());
|
||||
}
|
||||
if ((this->health_mode_switch_ != nullptr) && (this->health_mode_switch_->state != this->get_health_mode())) {
|
||||
this->health_mode_switch_->publish_state(this->get_health_mode());
|
||||
}
|
||||
#endif // USE_SWITCH
|
||||
}
|
||||
|
||||
void HaierClimateBase::process_protocol_reset() {
|
||||
|
@ -329,6 +348,26 @@ bool HaierClimateBase::prepare_pending_action() {
|
|||
|
||||
ClimateTraits HaierClimateBase::traits() { return traits_; }
|
||||
|
||||
void HaierClimateBase::initialization() {
|
||||
constexpr uint32_t restore_settings_version = 0xA77D21EF;
|
||||
this->base_rtc_ =
|
||||
global_preferences->make_preference<HaierBaseSettings>(this->get_object_id_hash() ^ restore_settings_version);
|
||||
HaierBaseSettings recovered;
|
||||
if (!this->base_rtc_.load(&recovered)) {
|
||||
recovered = {false, true};
|
||||
}
|
||||
this->display_status_ = recovered.display_state ? SwitchState::PENDING_ON : SwitchState::PENDING_OFF;
|
||||
this->health_mode_ = recovered.health_mode ? SwitchState::PENDING_ON : SwitchState::PENDING_OFF;
|
||||
#ifdef USE_SWITCH
|
||||
if (this->display_switch_ != nullptr) {
|
||||
this->display_switch_->publish_state(this->get_display_state());
|
||||
}
|
||||
if (this->health_mode_switch_ != nullptr) {
|
||||
this->health_mode_switch_->publish_state(this->get_health_mode());
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
void HaierClimateBase::control(const ClimateCall &call) {
|
||||
ESP_LOGD("Control", "Control call");
|
||||
if (!this->valid_connection()) {
|
||||
|
@ -353,6 +392,22 @@ void HaierClimateBase::control(const ClimateCall &call) {
|
|||
}
|
||||
}
|
||||
|
||||
#ifdef USE_SWITCH
|
||||
void HaierClimateBase::set_display_switch(switch_::Switch *sw) {
|
||||
this->display_switch_ = sw;
|
||||
if ((this->display_switch_ != nullptr) && (this->valid_connection())) {
|
||||
this->display_switch_->publish_state(this->get_display_state());
|
||||
}
|
||||
}
|
||||
|
||||
void HaierClimateBase::set_health_mode_switch(switch_::Switch *sw) {
|
||||
this->health_mode_switch_ = sw;
|
||||
if ((this->health_mode_switch_ != nullptr) && (this->valid_connection())) {
|
||||
this->health_mode_switch_->publish_state(this->get_health_mode());
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
void HaierClimateBase::HvacSettings::reset() {
|
||||
this->valid = false;
|
||||
this->mode.reset();
|
||||
|
|
|
@ -8,6 +8,10 @@
|
|||
// HaierProtocol
|
||||
#include <protocol/haier_protocol.h>
|
||||
|
||||
#ifdef USE_SWITCH
|
||||
#include "esphome/components/switch/switch.h"
|
||||
#endif
|
||||
|
||||
namespace esphome {
|
||||
namespace haier {
|
||||
|
||||
|
@ -20,10 +24,24 @@ enum class ActionRequest : uint8_t {
|
|||
START_STERI_CLEAN = 5, // only hOn
|
||||
};
|
||||
|
||||
struct HaierBaseSettings {
|
||||
bool health_mode;
|
||||
bool display_state;
|
||||
};
|
||||
|
||||
class HaierClimateBase : public esphome::Component,
|
||||
public esphome::climate::Climate,
|
||||
public esphome::uart::UARTDevice,
|
||||
public haier_protocol::ProtocolStream {
|
||||
#ifdef USE_SWITCH
|
||||
public:
|
||||
void set_display_switch(switch_::Switch *sw);
|
||||
void set_health_mode_switch(switch_::Switch *sw);
|
||||
|
||||
protected:
|
||||
switch_::Switch *display_switch_{nullptr};
|
||||
switch_::Switch *health_mode_switch_{nullptr};
|
||||
#endif
|
||||
public:
|
||||
HaierClimateBase();
|
||||
HaierClimateBase(const HaierClimateBase &) = delete;
|
||||
|
@ -82,7 +100,8 @@ class HaierClimateBase : public esphome::Component,
|
|||
virtual void process_phase(std::chrono::steady_clock::time_point now) = 0;
|
||||
virtual haier_protocol::HaierMessage get_control_message() = 0; // NOLINT(readability-identifier-naming)
|
||||
virtual haier_protocol::HaierMessage get_power_message(bool state) = 0; // NOLINT(readability-identifier-naming)
|
||||
virtual void initialization(){};
|
||||
virtual void save_settings();
|
||||
virtual void initialization();
|
||||
virtual bool prepare_pending_action();
|
||||
virtual void process_protocol_reset();
|
||||
esphome::climate::ClimateTraits traits() override;
|
||||
|
@ -127,13 +146,19 @@ class HaierClimateBase : public esphome::Component,
|
|||
ActionRequest action;
|
||||
esphome::optional<haier_protocol::HaierMessage> message;
|
||||
};
|
||||
enum class SwitchState {
|
||||
OFF = 0b00,
|
||||
ON = 0b01,
|
||||
PENDING_OFF = 0b10,
|
||||
PENDING_ON = 0b11,
|
||||
};
|
||||
haier_protocol::ProtocolHandler haier_protocol_;
|
||||
ProtocolPhases protocol_phase_;
|
||||
esphome::optional<PendingAction> action_request_;
|
||||
uint8_t fan_mode_speed_;
|
||||
uint8_t other_modes_fan_speed_;
|
||||
bool display_status_;
|
||||
bool health_mode_;
|
||||
SwitchState display_status_{SwitchState::ON};
|
||||
SwitchState health_mode_{SwitchState::OFF};
|
||||
bool force_send_control_;
|
||||
bool forced_request_status_;
|
||||
bool reset_protocol_request_;
|
||||
|
@ -148,6 +173,7 @@ class HaierClimateBase : public esphome::Component,
|
|||
std::chrono::steady_clock::time_point last_status_request_; // To request AC status
|
||||
std::chrono::steady_clock::time_point last_signal_request_; // To send WiFI signal level
|
||||
CallbackManager<void(const char *, size_t)> status_message_callback_{};
|
||||
ESPPreferenceObject base_rtc_;
|
||||
};
|
||||
|
||||
class StatusMessageTrigger : public Trigger<const char *, size_t> {
|
||||
|
|
|
@ -31,9 +31,32 @@ HonClimate::HonClimate()
|
|||
|
||||
HonClimate::~HonClimate() {}
|
||||
|
||||
void HonClimate::set_beeper_state(bool state) { this->beeper_status_ = state; }
|
||||
void HonClimate::set_beeper_state(bool state) {
|
||||
if (state != this->settings_.beeper_state) {
|
||||
this->settings_.beeper_state = state;
|
||||
#ifdef USE_SWITCH
|
||||
this->beeper_switch_->publish_state(state);
|
||||
#endif
|
||||
this->hon_rtc_.save(&this->settings_);
|
||||
}
|
||||
}
|
||||
|
||||
bool HonClimate::get_beeper_state() const { return this->beeper_status_; }
|
||||
bool HonClimate::get_beeper_state() const { return this->settings_.beeper_state; }
|
||||
|
||||
void HonClimate::set_quiet_mode_state(bool state) {
|
||||
if (state != this->get_quiet_mode_state()) {
|
||||
this->quiet_mode_state_ = state ? SwitchState::PENDING_ON : SwitchState::PENDING_OFF;
|
||||
this->settings_.quiet_mode_state = state;
|
||||
#ifdef USE_SWITCH
|
||||
this->quiet_mode_switch_->publish_state(state);
|
||||
#endif
|
||||
this->hon_rtc_.save(&this->settings_);
|
||||
}
|
||||
}
|
||||
|
||||
bool HonClimate::get_quiet_mode_state() const {
|
||||
return (this->quiet_mode_state_ == SwitchState::ON) || (this->quiet_mode_state_ == SwitchState::PENDING_ON);
|
||||
}
|
||||
|
||||
esphome::optional<hon_protocol::VerticalSwingMode> HonClimate::get_vertical_airflow() const {
|
||||
return this->current_vertical_swing_;
|
||||
|
@ -474,16 +497,19 @@ haier_protocol::HaierMessage HonClimate::get_power_message(bool state) {
|
|||
}
|
||||
|
||||
void HonClimate::initialization() {
|
||||
constexpr uint32_t restore_settings_version = 0xE834D8DCUL;
|
||||
this->rtc_ = global_preferences->make_preference<HonSettings>(this->get_object_id_hash() ^ restore_settings_version);
|
||||
HaierClimateBase::initialization();
|
||||
constexpr uint32_t restore_settings_version = 0x57EB59DDUL;
|
||||
this->hon_rtc_ =
|
||||
global_preferences->make_preference<HonSettings>(this->get_object_id_hash() ^ restore_settings_version);
|
||||
HonSettings recovered;
|
||||
if (this->rtc_.load(&recovered)) {
|
||||
if (this->hon_rtc_.load(&recovered)) {
|
||||
this->settings_ = recovered;
|
||||
} else {
|
||||
this->settings_ = {hon_protocol::VerticalSwingMode::CENTER, hon_protocol::HorizontalSwingMode::CENTER};
|
||||
this->settings_ = {hon_protocol::VerticalSwingMode::CENTER, hon_protocol::HorizontalSwingMode::CENTER, true, false};
|
||||
}
|
||||
this->current_vertical_swing_ = this->settings_.last_vertiacal_swing;
|
||||
this->current_horizontal_swing_ = this->settings_.last_horizontal_swing;
|
||||
this->quiet_mode_state_ = this->settings_.quiet_mode_state ? SwitchState::PENDING_ON : SwitchState::PENDING_OFF;
|
||||
}
|
||||
|
||||
haier_protocol::HaierMessage HonClimate::get_control_message() {
|
||||
|
@ -519,8 +545,7 @@ haier_protocol::HaierMessage HonClimate::get_control_message() {
|
|||
out_data->ac_power = 1;
|
||||
out_data->ac_mode = (uint8_t) hon_protocol::ConditioningMode::FAN;
|
||||
out_data->fan_mode = this->fan_mode_speed_; // Auto doesn't work in fan only mode
|
||||
// Disabling boost and eco mode for Fan only
|
||||
out_data->quiet_mode = 0;
|
||||
// Disabling boost for Fan only
|
||||
out_data->fast_mode = 0;
|
||||
break;
|
||||
case CLIMATE_MODE_COOL:
|
||||
|
@ -582,47 +607,34 @@ haier_protocol::HaierMessage HonClimate::get_control_message() {
|
|||
}
|
||||
if (out_data->ac_power == 0) {
|
||||
// If AC is off - no presets allowed
|
||||
out_data->quiet_mode = 0;
|
||||
out_data->fast_mode = 0;
|
||||
out_data->sleep_mode = 0;
|
||||
} else if (climate_control.preset.has_value()) {
|
||||
switch (climate_control.preset.value()) {
|
||||
case CLIMATE_PRESET_NONE:
|
||||
out_data->quiet_mode = 0;
|
||||
out_data->fast_mode = 0;
|
||||
out_data->sleep_mode = 0;
|
||||
out_data->ten_degree = 0;
|
||||
break;
|
||||
case CLIMATE_PRESET_ECO:
|
||||
// Eco is not supported in Fan only mode
|
||||
out_data->quiet_mode = (this->mode != CLIMATE_MODE_FAN_ONLY) ? 1 : 0;
|
||||
out_data->fast_mode = 0;
|
||||
out_data->sleep_mode = 0;
|
||||
out_data->ten_degree = 0;
|
||||
break;
|
||||
case CLIMATE_PRESET_BOOST:
|
||||
out_data->quiet_mode = 0;
|
||||
// Boost is not supported in Fan only mode
|
||||
out_data->fast_mode = (this->mode != CLIMATE_MODE_FAN_ONLY) ? 1 : 0;
|
||||
out_data->sleep_mode = 0;
|
||||
out_data->ten_degree = 0;
|
||||
break;
|
||||
case CLIMATE_PRESET_AWAY:
|
||||
out_data->quiet_mode = 0;
|
||||
out_data->fast_mode = 0;
|
||||
out_data->sleep_mode = 0;
|
||||
// 10 degrees allowed only in heat mode
|
||||
out_data->ten_degree = (this->mode == CLIMATE_MODE_HEAT) ? 1 : 0;
|
||||
break;
|
||||
case CLIMATE_PRESET_SLEEP:
|
||||
out_data->quiet_mode = 0;
|
||||
out_data->fast_mode = 0;
|
||||
out_data->sleep_mode = 1;
|
||||
out_data->ten_degree = 0;
|
||||
break;
|
||||
default:
|
||||
ESP_LOGE("Control", "Unsupported preset");
|
||||
out_data->quiet_mode = 0;
|
||||
out_data->fast_mode = 0;
|
||||
out_data->sleep_mode = 0;
|
||||
out_data->ten_degree = 0;
|
||||
|
@ -638,10 +650,23 @@ haier_protocol::HaierMessage HonClimate::get_control_message() {
|
|||
out_data->horizontal_swing_mode = (uint8_t) this->pending_horizontal_direction_.value();
|
||||
this->pending_horizontal_direction_.reset();
|
||||
}
|
||||
out_data->beeper_status = ((!this->beeper_status_) || (!has_hvac_settings)) ? 1 : 0;
|
||||
{
|
||||
// Quiet mode
|
||||
if ((out_data->ac_power == 0) || (out_data->ac_mode == (uint8_t) hon_protocol::ConditioningMode::FAN)) {
|
||||
// If AC is off or in fan only mode - no quiet mode allowed
|
||||
out_data->quiet_mode = 0;
|
||||
} else {
|
||||
out_data->quiet_mode = this->get_quiet_mode_state() ? 1 : 0;
|
||||
}
|
||||
// Clean quiet mode state pending flag
|
||||
this->quiet_mode_state_ = (SwitchState) ((uint8_t) this->quiet_mode_state_ & 0b01);
|
||||
}
|
||||
out_data->beeper_status = ((!this->get_beeper_state()) || (!has_hvac_settings)) ? 1 : 0;
|
||||
control_out_buffer[4] = 0; // This byte should be cleared before setting values
|
||||
out_data->display_status = this->display_status_ ? 1 : 0;
|
||||
out_data->health_mode = this->health_mode_ ? 1 : 0;
|
||||
out_data->display_status = this->get_display_state() ? 1 : 0;
|
||||
this->display_status_ = (SwitchState) ((uint8_t) this->display_status_ & 0b01);
|
||||
out_data->health_mode = this->get_health_mode() ? 1 : 0;
|
||||
this->health_mode_ = (SwitchState) ((uint8_t) this->health_mode_ & 0b01);
|
||||
return haier_protocol::HaierMessage(haier_protocol::FrameType::CONTROL,
|
||||
(uint16_t) hon_protocol::SubcommandsControl::SET_GROUP_PARAMETERS,
|
||||
control_out_buffer, this->real_control_packet_size_);
|
||||
|
@ -765,6 +790,22 @@ void HonClimate::update_sub_text_sensor_(SubTextSensorType type, const std::stri
|
|||
}
|
||||
#endif // USE_TEXT_SENSOR
|
||||
|
||||
#ifdef USE_SWITCH
|
||||
void HonClimate::set_beeper_switch(switch_::Switch *sw) {
|
||||
this->beeper_switch_ = sw;
|
||||
if (this->beeper_switch_ != nullptr) {
|
||||
this->beeper_switch_->publish_state(this->get_beeper_state());
|
||||
}
|
||||
}
|
||||
|
||||
void HonClimate::set_quiet_mode_switch(switch_::Switch *sw) {
|
||||
this->quiet_mode_switch_ = sw;
|
||||
if (this->quiet_mode_switch_ != nullptr) {
|
||||
this->quiet_mode_switch_->publish_state(this->settings_.quiet_mode_state);
|
||||
}
|
||||
}
|
||||
#endif // USE_SWITCH
|
||||
|
||||
haier_protocol::HandlerError HonClimate::process_status_message_(const uint8_t *packet_buffer, uint8_t size) {
|
||||
size_t expected_size =
|
||||
2 + this->status_message_header_size_ + this->real_control_packet_size_ + this->real_sensors_packet_size_;
|
||||
|
@ -827,9 +868,7 @@ haier_protocol::HandlerError HonClimate::process_status_message_(const uint8_t *
|
|||
{
|
||||
// Extra modes/presets
|
||||
optional<ClimatePreset> old_preset = this->preset;
|
||||
if (packet.control.quiet_mode != 0) {
|
||||
this->preset = CLIMATE_PRESET_ECO;
|
||||
} else if (packet.control.fast_mode != 0) {
|
||||
if (packet.control.fast_mode != 0) {
|
||||
this->preset = CLIMATE_PRESET_BOOST;
|
||||
} else if (packet.control.sleep_mode != 0) {
|
||||
this->preset = CLIMATE_PRESET_SLEEP;
|
||||
|
@ -883,28 +922,26 @@ haier_protocol::HandlerError HonClimate::process_status_message_(const uint8_t *
|
|||
}
|
||||
should_publish = should_publish || (!old_fan_mode.has_value()) || (old_fan_mode.value() != fan_mode.value());
|
||||
}
|
||||
{
|
||||
// Display status
|
||||
// should be before "Climate mode" because it is changing this->mode
|
||||
if (packet.control.ac_power != 0) {
|
||||
// if AC is off display status always ON so process it only when AC is on
|
||||
bool disp_status = packet.control.display_status != 0;
|
||||
if (disp_status != this->display_status_) {
|
||||
// Do something only if display status changed
|
||||
if (this->mode == CLIMATE_MODE_OFF) {
|
||||
// AC just turned on from remote need to turn off display
|
||||
this->force_send_control_ = true;
|
||||
} else {
|
||||
this->display_status_ = disp_status;
|
||||
}
|
||||
// Display status
|
||||
// should be before "Climate mode" because it is changing this->mode
|
||||
if (packet.control.ac_power != 0) {
|
||||
// if AC is off display status always ON so process it only when AC is on
|
||||
bool disp_status = packet.control.display_status != 0;
|
||||
if (disp_status != this->get_display_state()) {
|
||||
// Do something only if display status changed
|
||||
if (this->mode == CLIMATE_MODE_OFF) {
|
||||
// AC just turned on from remote need to turn off display
|
||||
this->force_send_control_ = true;
|
||||
} else if ((((uint8_t) this->health_mode_) & 0b10) == 0) {
|
||||
this->display_status_ = disp_status ? SwitchState::ON : SwitchState::OFF;
|
||||
}
|
||||
}
|
||||
}
|
||||
{
|
||||
// Health mode
|
||||
bool old_health_mode = this->health_mode_;
|
||||
this->health_mode_ = packet.control.health_mode == 1;
|
||||
should_publish = should_publish || (old_health_mode != this->health_mode_);
|
||||
// Health mode
|
||||
if ((((uint8_t) this->health_mode_) & 0b10) == 0) {
|
||||
bool old_health_mode = this->get_health_mode();
|
||||
this->health_mode_ = packet.control.health_mode == 1 ? SwitchState::ON : SwitchState::OFF;
|
||||
should_publish = should_publish || (old_health_mode != this->get_health_mode());
|
||||
}
|
||||
{
|
||||
CleaningState new_cleaning;
|
||||
|
@ -958,17 +995,36 @@ haier_protocol::HandlerError HonClimate::process_status_message_(const uint8_t *
|
|||
}
|
||||
should_publish = should_publish || (old_mode != this->mode);
|
||||
}
|
||||
{
|
||||
// Quiet mode, should be after climate mode
|
||||
if ((this->mode != CLIMATE_MODE_FAN_ONLY) && (this->mode != CLIMATE_MODE_OFF) &&
|
||||
((((uint8_t) this->quiet_mode_state_) & 0b10) == 0)) {
|
||||
// In proper mode and not in pending state
|
||||
bool new_quiet_mode = packet.control.quiet_mode != 0;
|
||||
if (new_quiet_mode != this->get_quiet_mode_state()) {
|
||||
this->quiet_mode_state_ = new_quiet_mode ? SwitchState::ON : SwitchState::OFF;
|
||||
this->settings_.quiet_mode_state = new_quiet_mode;
|
||||
this->hon_rtc_.save(&this->settings_);
|
||||
}
|
||||
}
|
||||
}
|
||||
{
|
||||
// Swing mode
|
||||
ClimateSwingMode old_swing_mode = this->swing_mode;
|
||||
if (packet.control.horizontal_swing_mode == (uint8_t) hon_protocol::HorizontalSwingMode::AUTO) {
|
||||
if (packet.control.vertical_swing_mode == (uint8_t) hon_protocol::VerticalSwingMode::AUTO) {
|
||||
const std::set<ClimateSwingMode> &swing_modes = traits_.get_supported_swing_modes();
|
||||
bool vertical_swing_supported = swing_modes.find(CLIMATE_SWING_VERTICAL) != swing_modes.end();
|
||||
bool horizontal_swing_supported = swing_modes.find(CLIMATE_SWING_HORIZONTAL) != swing_modes.end();
|
||||
if (horizontal_swing_supported &&
|
||||
(packet.control.horizontal_swing_mode == (uint8_t) hon_protocol::HorizontalSwingMode::AUTO)) {
|
||||
if (vertical_swing_supported &&
|
||||
(packet.control.vertical_swing_mode == (uint8_t) hon_protocol::VerticalSwingMode::AUTO)) {
|
||||
this->swing_mode = CLIMATE_SWING_BOTH;
|
||||
} else {
|
||||
this->swing_mode = CLIMATE_SWING_HORIZONTAL;
|
||||
}
|
||||
} else {
|
||||
if (packet.control.vertical_swing_mode == (uint8_t) hon_protocol::VerticalSwingMode::AUTO) {
|
||||
if (vertical_swing_supported &&
|
||||
(packet.control.vertical_swing_mode == (uint8_t) hon_protocol::VerticalSwingMode::AUTO)) {
|
||||
this->swing_mode = CLIMATE_SWING_VERTICAL;
|
||||
} else {
|
||||
this->swing_mode = CLIMATE_SWING_OFF;
|
||||
|
@ -985,7 +1041,7 @@ haier_protocol::HandlerError HonClimate::process_status_message_(const uint8_t *
|
|||
if (save_settings) {
|
||||
this->settings_.last_vertiacal_swing = this->current_vertical_swing_.value();
|
||||
this->settings_.last_horizontal_swing = this->current_horizontal_swing_.value();
|
||||
this->rtc_.save(&this->settings_);
|
||||
this->hon_rtc_.save(&this->settings_);
|
||||
}
|
||||
should_publish = should_publish || (old_swing_mode != this->swing_mode);
|
||||
}
|
||||
|
@ -1017,7 +1073,7 @@ void HonClimate::fill_control_messages_queue_() {
|
|||
haier_protocol::HaierMessage(haier_protocol::FrameType::CONTROL,
|
||||
(uint16_t) hon_protocol::SubcommandsControl::SET_SINGLE_PARAMETER +
|
||||
(uint8_t) hon_protocol::DataParameters::BEEPER_STATUS,
|
||||
this->beeper_status_ ? ZERO_BUF : ONE_BUF, 2));
|
||||
this->get_beeper_state() ? ZERO_BUF : ONE_BUF, 2));
|
||||
}
|
||||
// Health mode
|
||||
{
|
||||
|
@ -1025,13 +1081,16 @@ void HonClimate::fill_control_messages_queue_() {
|
|||
haier_protocol::HaierMessage(haier_protocol::FrameType::CONTROL,
|
||||
(uint16_t) hon_protocol::SubcommandsControl::SET_SINGLE_PARAMETER +
|
||||
(uint8_t) hon_protocol::DataParameters::HEALTH_MODE,
|
||||
this->health_mode_ ? ONE_BUF : ZERO_BUF, 2));
|
||||
this->get_health_mode() ? ONE_BUF : ZERO_BUF, 2));
|
||||
this->health_mode_ = (SwitchState) ((uint8_t) this->health_mode_ & 0b01);
|
||||
}
|
||||
// Climate mode
|
||||
ClimateMode climate_mode = this->mode;
|
||||
bool new_power = this->mode != CLIMATE_MODE_OFF;
|
||||
uint8_t fan_mode_buf[] = {0x00, 0xFF};
|
||||
uint8_t quiet_mode_buf[] = {0x00, 0xFF};
|
||||
if (climate_control.mode.has_value()) {
|
||||
climate_mode = climate_control.mode.value();
|
||||
uint8_t buffer[2] = {0x00, 0x00};
|
||||
switch (climate_control.mode.value()) {
|
||||
case CLIMATE_MODE_OFF:
|
||||
|
@ -1076,8 +1135,6 @@ void HonClimate::fill_control_messages_queue_() {
|
|||
(uint8_t) hon_protocol::DataParameters::AC_MODE,
|
||||
buffer, 2));
|
||||
fan_mode_buf[1] = this->other_modes_fan_speed_; // Auto doesn't work in fan only mode
|
||||
// Disabling eco mode for Fan only
|
||||
quiet_mode_buf[1] = 0;
|
||||
break;
|
||||
case CLIMATE_MODE_COOL:
|
||||
new_power = true;
|
||||
|
@ -1108,30 +1165,20 @@ void HonClimate::fill_control_messages_queue_() {
|
|||
uint8_t away_mode_buf[] = {0x00, 0xFF};
|
||||
if (!new_power) {
|
||||
// If AC is off - no presets allowed
|
||||
quiet_mode_buf[1] = 0x00;
|
||||
fast_mode_buf[1] = 0x00;
|
||||
away_mode_buf[1] = 0x00;
|
||||
} else if (climate_control.preset.has_value()) {
|
||||
switch (climate_control.preset.value()) {
|
||||
case CLIMATE_PRESET_NONE:
|
||||
quiet_mode_buf[1] = 0x00;
|
||||
fast_mode_buf[1] = 0x00;
|
||||
away_mode_buf[1] = 0x00;
|
||||
break;
|
||||
case CLIMATE_PRESET_ECO:
|
||||
// Eco is not supported in Fan only mode
|
||||
quiet_mode_buf[1] = (this->mode != CLIMATE_MODE_FAN_ONLY) ? 0x01 : 0x00;
|
||||
fast_mode_buf[1] = 0x00;
|
||||
away_mode_buf[1] = 0x00;
|
||||
break;
|
||||
case CLIMATE_PRESET_BOOST:
|
||||
quiet_mode_buf[1] = 0x00;
|
||||
// Boost is not supported in Fan only mode
|
||||
fast_mode_buf[1] = (this->mode != CLIMATE_MODE_FAN_ONLY) ? 0x01 : 0x00;
|
||||
away_mode_buf[1] = 0x00;
|
||||
break;
|
||||
case CLIMATE_PRESET_AWAY:
|
||||
quiet_mode_buf[1] = 0x00;
|
||||
fast_mode_buf[1] = 0x00;
|
||||
away_mode_buf[1] = (this->mode == CLIMATE_MODE_HEAT) ? 0x01 : 0x00;
|
||||
break;
|
||||
|
@ -1140,8 +1187,18 @@ void HonClimate::fill_control_messages_queue_() {
|
|||
break;
|
||||
}
|
||||
}
|
||||
{
|
||||
// Quiet mode
|
||||
if (new_power && (climate_mode != CLIMATE_MODE_FAN_ONLY) && this->get_quiet_mode_state()) {
|
||||
quiet_mode_buf[1] = 0x01;
|
||||
} else {
|
||||
quiet_mode_buf[1] = 0x00;
|
||||
}
|
||||
// Clean quiet mode state pending flag
|
||||
this->quiet_mode_state_ = (SwitchState) ((uint8_t) this->quiet_mode_state_ & 0b01);
|
||||
}
|
||||
auto presets = this->traits_.get_supported_presets();
|
||||
if ((quiet_mode_buf[1] != 0xFF) && ((presets.find(climate::ClimatePreset::CLIMATE_PRESET_ECO) != presets.end()))) {
|
||||
if (quiet_mode_buf[1] != 0xFF) {
|
||||
this->control_messages_queue_.push(
|
||||
haier_protocol::HaierMessage(haier_protocol::FrameType::CONTROL,
|
||||
(uint16_t) hon_protocol::SubcommandsControl::SET_SINGLE_PARAMETER +
|
||||
|
|
|
@ -10,6 +10,9 @@
|
|||
#ifdef USE_TEXT_SENSOR
|
||||
#include "esphome/components/text_sensor/text_sensor.h"
|
||||
#endif
|
||||
#ifdef USE_SWITCH
|
||||
#include "esphome/components/switch/switch.h"
|
||||
#endif
|
||||
#include "esphome/core/automation.h"
|
||||
#include "haier_base.h"
|
||||
#include "hon_packet.h"
|
||||
|
@ -28,6 +31,8 @@ enum class HonControlMethod { MONITOR_ONLY = 0, SET_GROUP_PARAMETERS, SET_SINGLE
|
|||
struct HonSettings {
|
||||
hon_protocol::VerticalSwingMode last_vertiacal_swing;
|
||||
hon_protocol::HorizontalSwingMode last_horizontal_swing;
|
||||
bool beeper_state;
|
||||
bool quiet_mode_state;
|
||||
};
|
||||
|
||||
class HonClimate : public HaierClimateBase {
|
||||
|
@ -86,6 +91,15 @@ class HonClimate : public HaierClimateBase {
|
|||
protected:
|
||||
void update_sub_text_sensor_(SubTextSensorType type, const std::string &value);
|
||||
text_sensor::TextSensor *sub_text_sensors_[(size_t) SubTextSensorType::SUB_TEXT_SENSOR_TYPE_COUNT]{nullptr};
|
||||
#endif
|
||||
#ifdef USE_SWITCH
|
||||
public:
|
||||
void set_beeper_switch(switch_::Switch *sw);
|
||||
void set_quiet_mode_switch(switch_::Switch *sw);
|
||||
|
||||
protected:
|
||||
switch_::Switch *beeper_switch_{nullptr};
|
||||
switch_::Switch *quiet_mode_switch_{nullptr};
|
||||
#endif
|
||||
public:
|
||||
HonClimate();
|
||||
|
@ -95,6 +109,8 @@ class HonClimate : public HaierClimateBase {
|
|||
void dump_config() override;
|
||||
void set_beeper_state(bool state);
|
||||
bool get_beeper_state() const;
|
||||
void set_quiet_mode_state(bool state);
|
||||
bool get_quiet_mode_state() const;
|
||||
esphome::optional<hon_protocol::VerticalSwingMode> get_vertical_airflow() const;
|
||||
void set_vertical_airflow(hon_protocol::VerticalSwingMode direction);
|
||||
esphome::optional<hon_protocol::HorizontalSwingMode> get_horizontal_airflow() const;
|
||||
|
@ -153,7 +169,6 @@ class HonClimate : public HaierClimateBase {
|
|||
bool functions_[5];
|
||||
};
|
||||
|
||||
bool beeper_status_;
|
||||
CleaningState cleaning_status_;
|
||||
bool got_valid_outdoor_temp_;
|
||||
esphome::optional<hon_protocol::VerticalSwingMode> pending_vertical_direction_{};
|
||||
|
@ -175,7 +190,8 @@ class HonClimate : public HaierClimateBase {
|
|||
esphome::optional<hon_protocol::VerticalSwingMode> current_vertical_swing_{};
|
||||
esphome::optional<hon_protocol::HorizontalSwingMode> current_horizontal_swing_{};
|
||||
HonSettings settings_;
|
||||
ESPPreferenceObject rtc_;
|
||||
ESPPreferenceObject hon_rtc_;
|
||||
SwitchState quiet_mode_state_{SwitchState::OFF};
|
||||
};
|
||||
|
||||
class HaierAlarmStartTrigger : public Trigger<uint8_t, const char *> {
|
||||
|
|
|
@ -376,8 +376,10 @@ haier_protocol::HaierMessage Smartair2Climate::get_control_message() {
|
|||
}
|
||||
}
|
||||
}
|
||||
out_data->display_status = this->display_status_ ? 0 : 1;
|
||||
out_data->health_mode = this->health_mode_ ? 1 : 0;
|
||||
out_data->display_status = this->get_display_state() ? 0 : 1;
|
||||
this->display_status_ = (SwitchState) ((uint8_t) this->display_status_ & 0b01);
|
||||
out_data->health_mode = this->get_health_mode() ? 1 : 0;
|
||||
this->health_mode_ = (SwitchState) ((uint8_t) this->health_mode_ & 0b01);
|
||||
return haier_protocol::HaierMessage(haier_protocol::FrameType::CONTROL, 0x4D5F, control_out_buffer,
|
||||
sizeof(smartair2_protocol::HaierPacketControl));
|
||||
}
|
||||
|
@ -446,28 +448,26 @@ haier_protocol::HandlerError Smartair2Climate::process_status_message_(const uin
|
|||
}
|
||||
should_publish = should_publish || (!old_fan_mode.has_value()) || (old_fan_mode.value() != fan_mode.value());
|
||||
}
|
||||
{
|
||||
// Display status
|
||||
// should be before "Climate mode" because it is changing this->mode
|
||||
if (packet.control.ac_power != 0) {
|
||||
// if AC is off display status always ON so process it only when AC is on
|
||||
bool disp_status = packet.control.display_status == 0;
|
||||
if (disp_status != this->display_status_) {
|
||||
// Do something only if display status changed
|
||||
if (this->mode == CLIMATE_MODE_OFF) {
|
||||
// AC just turned on from remote need to turn off display
|
||||
this->force_send_control_ = true;
|
||||
} else {
|
||||
this->display_status_ = disp_status;
|
||||
}
|
||||
// Display status
|
||||
// should be before "Climate mode" because it is changing this->mode
|
||||
if (packet.control.ac_power != 0) {
|
||||
// if AC is off display status always ON so process it only when AC is on
|
||||
bool disp_status = packet.control.display_status == 0;
|
||||
if (disp_status != this->get_display_state()) {
|
||||
// Do something only if display status changed
|
||||
if (this->mode == CLIMATE_MODE_OFF) {
|
||||
// AC just turned on from remote need to turn off display
|
||||
this->force_send_control_ = true;
|
||||
} else if ((((uint8_t) this->health_mode_) & 0b10) == 0) {
|
||||
this->display_status_ = disp_status ? SwitchState::ON : SwitchState::OFF;
|
||||
}
|
||||
}
|
||||
}
|
||||
{
|
||||
// Health mode
|
||||
bool old_health_mode = this->health_mode_;
|
||||
this->health_mode_ = packet.control.health_mode == 1;
|
||||
should_publish = should_publish || (old_health_mode != this->health_mode_);
|
||||
// Health mode
|
||||
if ((((uint8_t) this->health_mode_) & 0b10) == 0) {
|
||||
bool old_health_mode = this->get_health_mode();
|
||||
this->health_mode_ = packet.control.health_mode == 1 ? SwitchState::ON : SwitchState::OFF;
|
||||
should_publish = should_publish || (old_health_mode != this->get_health_mode());
|
||||
}
|
||||
{
|
||||
// Climate mode
|
||||
|
|
91
esphome/components/haier/switch/__init__.py
Normal file
91
esphome/components/haier/switch/__init__.py
Normal file
|
@ -0,0 +1,91 @@
|
|||
import esphome.codegen as cg
|
||||
import esphome.config_validation as cv
|
||||
import esphome.final_validate as fv
|
||||
from esphome.components import switch
|
||||
from esphome.const import (
|
||||
CONF_BEEPER,
|
||||
CONF_DISPLAY,
|
||||
ENTITY_CATEGORY_CONFIG,
|
||||
)
|
||||
from ..climate import (
|
||||
CONF_HAIER_ID,
|
||||
CONF_PROTOCOL,
|
||||
HaierClimateBase,
|
||||
haier_ns,
|
||||
PROTOCOL_HON,
|
||||
)
|
||||
|
||||
CODEOWNERS = ["@paveldn"]
|
||||
BeeperSwitch = haier_ns.class_("BeeperSwitch", switch.Switch)
|
||||
HealthModeSwitch = haier_ns.class_("HealthModeSwitch", switch.Switch)
|
||||
DisplaySwitch = haier_ns.class_("DisplaySwitch", switch.Switch)
|
||||
QuietModeSwitch = haier_ns.class_("QuietModeSwitch", switch.Switch)
|
||||
|
||||
# Haier switches
|
||||
CONF_HEALTH_MODE = "health_mode"
|
||||
CONF_QUIET_MODE = "quiet_mode"
|
||||
|
||||
# Additional icons
|
||||
ICON_LEAF = "mdi:leaf"
|
||||
ICON_LED_ON = "mdi:led-on"
|
||||
ICON_VOLUME_HIGH = "mdi:volume-high"
|
||||
ICON_VOLUME_OFF = "mdi:volume-off"
|
||||
|
||||
CONFIG_SCHEMA = cv.Schema(
|
||||
{
|
||||
cv.GenerateID(CONF_HAIER_ID): cv.use_id(HaierClimateBase),
|
||||
cv.Optional(CONF_DISPLAY): switch.switch_schema(
|
||||
DisplaySwitch,
|
||||
icon=ICON_LED_ON,
|
||||
entity_category=ENTITY_CATEGORY_CONFIG,
|
||||
default_restore_mode="DISABLED",
|
||||
),
|
||||
cv.Optional(CONF_HEALTH_MODE): switch.switch_schema(
|
||||
HealthModeSwitch,
|
||||
icon=ICON_LEAF,
|
||||
default_restore_mode="DISABLED",
|
||||
),
|
||||
# Beeper switch is only supported for HonClimate
|
||||
cv.Optional(CONF_BEEPER): switch.switch_schema(
|
||||
BeeperSwitch,
|
||||
icon=ICON_VOLUME_HIGH,
|
||||
entity_category=ENTITY_CATEGORY_CONFIG,
|
||||
default_restore_mode="DISABLED",
|
||||
),
|
||||
# Quiet mode is only supported for HonClimate
|
||||
cv.Optional(CONF_QUIET_MODE): switch.switch_schema(
|
||||
QuietModeSwitch,
|
||||
icon=ICON_VOLUME_OFF,
|
||||
entity_category=ENTITY_CATEGORY_CONFIG,
|
||||
default_restore_mode="DISABLED",
|
||||
),
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
def _final_validate(config):
|
||||
full_config = fv.full_config.get()
|
||||
for switch_type in [CONF_BEEPER, CONF_QUIET_MODE]:
|
||||
# Check switches that are only supported for HonClimate
|
||||
if config.get(switch_type):
|
||||
climate_path = full_config.get_path_for_id(config[CONF_HAIER_ID])[:-1]
|
||||
climate_conf = full_config.get_config_for_path(climate_path)
|
||||
protocol_type = climate_conf.get(CONF_PROTOCOL)
|
||||
if protocol_type.casefold() != PROTOCOL_HON.casefold():
|
||||
raise cv.Invalid(
|
||||
f"{switch_type} switch is only supported for hon climate"
|
||||
)
|
||||
return config
|
||||
|
||||
|
||||
FINAL_VALIDATE_SCHEMA = _final_validate
|
||||
|
||||
|
||||
async def to_code(config):
|
||||
parent = await cg.get_variable(config[CONF_HAIER_ID])
|
||||
|
||||
for switch_type in [CONF_DISPLAY, CONF_HEALTH_MODE, CONF_BEEPER, CONF_QUIET_MODE]:
|
||||
if conf := config.get(switch_type):
|
||||
sw_var = await switch.new_switch(conf)
|
||||
await cg.register_parented(sw_var, parent)
|
||||
cg.add(getattr(parent, f"set_{switch_type}_switch")(sw_var))
|
14
esphome/components/haier/switch/beeper.cpp
Normal file
14
esphome/components/haier/switch/beeper.cpp
Normal file
|
@ -0,0 +1,14 @@
|
|||
#include "beeper.h"
|
||||
|
||||
namespace esphome {
|
||||
namespace haier {
|
||||
|
||||
void BeeperSwitch::write_state(bool state) {
|
||||
if (this->parent_->get_beeper_state() != state) {
|
||||
this->parent_->set_beeper_state(state);
|
||||
}
|
||||
this->publish_state(state);
|
||||
}
|
||||
|
||||
} // namespace haier
|
||||
} // namespace esphome
|
18
esphome/components/haier/switch/beeper.h
Normal file
18
esphome/components/haier/switch/beeper.h
Normal file
|
@ -0,0 +1,18 @@
|
|||
#pragma once
|
||||
|
||||
#include "esphome/components/switch/switch.h"
|
||||
#include "../hon_climate.h"
|
||||
|
||||
namespace esphome {
|
||||
namespace haier {
|
||||
|
||||
class BeeperSwitch : public switch_::Switch, public Parented<HonClimate> {
|
||||
public:
|
||||
BeeperSwitch() = default;
|
||||
|
||||
protected:
|
||||
void write_state(bool state) override;
|
||||
};
|
||||
|
||||
} // namespace haier
|
||||
} // namespace esphome
|
14
esphome/components/haier/switch/display.cpp
Normal file
14
esphome/components/haier/switch/display.cpp
Normal file
|
@ -0,0 +1,14 @@
|
|||
#include "display.h"
|
||||
|
||||
namespace esphome {
|
||||
namespace haier {
|
||||
|
||||
void DisplaySwitch::write_state(bool state) {
|
||||
if (this->parent_->get_display_state() != state) {
|
||||
this->parent_->set_display_state(state);
|
||||
}
|
||||
this->publish_state(state);
|
||||
}
|
||||
|
||||
} // namespace haier
|
||||
} // namespace esphome
|
18
esphome/components/haier/switch/display.h
Normal file
18
esphome/components/haier/switch/display.h
Normal file
|
@ -0,0 +1,18 @@
|
|||
#pragma once
|
||||
|
||||
#include "esphome/components/switch/switch.h"
|
||||
#include "../haier_base.h"
|
||||
|
||||
namespace esphome {
|
||||
namespace haier {
|
||||
|
||||
class DisplaySwitch : public switch_::Switch, public Parented<HaierClimateBase> {
|
||||
public:
|
||||
DisplaySwitch() = default;
|
||||
|
||||
protected:
|
||||
void write_state(bool state) override;
|
||||
};
|
||||
|
||||
} // namespace haier
|
||||
} // namespace esphome
|
14
esphome/components/haier/switch/health_mode.cpp
Normal file
14
esphome/components/haier/switch/health_mode.cpp
Normal file
|
@ -0,0 +1,14 @@
|
|||
#include "health_mode.h"
|
||||
|
||||
namespace esphome {
|
||||
namespace haier {
|
||||
|
||||
void HealthModeSwitch::write_state(bool state) {
|
||||
if (this->parent_->get_health_mode() != state) {
|
||||
this->parent_->set_health_mode(state);
|
||||
}
|
||||
this->publish_state(state);
|
||||
}
|
||||
|
||||
} // namespace haier
|
||||
} // namespace esphome
|
18
esphome/components/haier/switch/health_mode.h
Normal file
18
esphome/components/haier/switch/health_mode.h
Normal file
|
@ -0,0 +1,18 @@
|
|||
#pragma once
|
||||
|
||||
#include "esphome/components/switch/switch.h"
|
||||
#include "../haier_base.h"
|
||||
|
||||
namespace esphome {
|
||||
namespace haier {
|
||||
|
||||
class HealthModeSwitch : public switch_::Switch, public Parented<HaierClimateBase> {
|
||||
public:
|
||||
HealthModeSwitch() = default;
|
||||
|
||||
protected:
|
||||
void write_state(bool state) override;
|
||||
};
|
||||
|
||||
} // namespace haier
|
||||
} // namespace esphome
|
14
esphome/components/haier/switch/quiet_mode.cpp
Normal file
14
esphome/components/haier/switch/quiet_mode.cpp
Normal file
|
@ -0,0 +1,14 @@
|
|||
#include "quiet_mode.h"
|
||||
|
||||
namespace esphome {
|
||||
namespace haier {
|
||||
|
||||
void QuietModeSwitch::write_state(bool state) {
|
||||
if (this->parent_->get_quiet_mode_state() != state) {
|
||||
this->parent_->set_quiet_mode_state(state);
|
||||
}
|
||||
this->publish_state(state);
|
||||
}
|
||||
|
||||
} // namespace haier
|
||||
} // namespace esphome
|
18
esphome/components/haier/switch/quiet_mode.h
Normal file
18
esphome/components/haier/switch/quiet_mode.h
Normal file
|
@ -0,0 +1,18 @@
|
|||
#pragma once
|
||||
|
||||
#include "esphome/components/switch/switch.h"
|
||||
#include "../hon_climate.h"
|
||||
|
||||
namespace esphome {
|
||||
namespace haier {
|
||||
|
||||
class QuietModeSwitch : public switch_::Switch, public Parented<HonClimate> {
|
||||
public:
|
||||
QuietModeSwitch() = default;
|
||||
|
||||
protected:
|
||||
void write_state(bool state) override;
|
||||
};
|
||||
|
||||
} // namespace haier
|
||||
} // namespace esphome
|
|
@ -25,6 +25,7 @@ I2SAudioSpeaker = i2s_audio_ns.class_(
|
|||
|
||||
|
||||
CONF_DAC_TYPE = "dac_type"
|
||||
CONF_I2S_COMM_FMT = "i2s_comm_fmt"
|
||||
|
||||
i2s_dac_mode_t = cg.global_ns.enum("i2s_dac_mode_t")
|
||||
INTERNAL_DAC_OPTIONS = {
|
||||
|
@ -33,6 +34,20 @@ INTERNAL_DAC_OPTIONS = {
|
|||
CONF_STEREO: i2s_dac_mode_t.I2S_DAC_CHANNEL_BOTH_EN,
|
||||
}
|
||||
|
||||
i2s_comm_format_t = cg.global_ns.enum("i2s_comm_format_t")
|
||||
I2C_COMM_FMT_OPTIONS = {
|
||||
"stand_i2s": i2s_comm_format_t.I2S_COMM_FORMAT_STAND_I2S,
|
||||
"stand_msb": i2s_comm_format_t.I2S_COMM_FORMAT_STAND_MSB,
|
||||
"stand_pcm_short": i2s_comm_format_t.I2S_COMM_FORMAT_STAND_PCM_SHORT,
|
||||
"stand_pcm_long": i2s_comm_format_t.I2S_COMM_FORMAT_STAND_PCM_LONG,
|
||||
"stand_max": i2s_comm_format_t.I2S_COMM_FORMAT_STAND_MAX,
|
||||
"i2s_msb": i2s_comm_format_t.I2S_COMM_FORMAT_I2S_MSB,
|
||||
"i2s_lsb": i2s_comm_format_t.I2S_COMM_FORMAT_I2S_LSB,
|
||||
"pcm": i2s_comm_format_t.I2S_COMM_FORMAT_PCM,
|
||||
"pcm_short": i2s_comm_format_t.I2S_COMM_FORMAT_PCM_SHORT,
|
||||
"pcm_long": i2s_comm_format_t.I2S_COMM_FORMAT_PCM_LONG,
|
||||
}
|
||||
|
||||
NO_INTERNAL_DAC_VARIANTS = [esp32.const.VARIANT_ESP32S2]
|
||||
|
||||
|
||||
|
@ -77,6 +92,9 @@ CONFIG_SCHEMA = cv.All(
|
|||
cv.Required(
|
||||
CONF_I2S_DOUT_PIN
|
||||
): pins.internal_gpio_output_pin_number,
|
||||
cv.Optional(CONF_I2S_COMM_FMT, default="stand_i2s"): cv.enum(
|
||||
I2C_COMM_FMT_OPTIONS, lower=True
|
||||
),
|
||||
}
|
||||
),
|
||||
},
|
||||
|
@ -96,4 +114,5 @@ async def to_code(config):
|
|||
cg.add(var.set_internal_dac_mode(config[CONF_CHANNEL]))
|
||||
else:
|
||||
cg.add(var.set_dout_pin(config[CONF_I2S_DOUT_PIN]))
|
||||
cg.add(var.set_i2s_comm_fmt(config[CONF_I2S_COMM_FMT]))
|
||||
cg.add(var.set_timeout(config[CONF_TIMEOUT]))
|
||||
|
|
|
@ -83,7 +83,7 @@ void I2SAudioSpeaker::player_task(void *params) {
|
|||
.sample_rate = this_speaker->sample_rate_,
|
||||
.bits_per_sample = this_speaker->bits_per_sample_,
|
||||
.channel_format = this_speaker->channel_,
|
||||
.communication_format = I2S_COMM_FORMAT_STAND_I2S,
|
||||
.communication_format = this_speaker->i2s_comm_fmt_,
|
||||
.intr_alloc_flags = ESP_INTR_FLAG_LEVEL1,
|
||||
.dma_buf_count = 8,
|
||||
.dma_buf_len = 256,
|
||||
|
|
|
@ -49,6 +49,7 @@ class I2SAudioSpeaker : public I2SAudioOut, public speaker::Speaker, public Comp
|
|||
#if SOC_I2S_SUPPORTS_DAC
|
||||
void set_internal_dac_mode(i2s_dac_mode_t mode) { this->internal_dac_mode_ = mode; }
|
||||
#endif
|
||||
void set_i2s_comm_fmt(i2s_comm_format_t mode) { this->i2s_comm_fmt_ = mode; }
|
||||
|
||||
void start() override;
|
||||
void stop() override;
|
||||
|
@ -76,6 +77,7 @@ class I2SAudioSpeaker : public I2SAudioOut, public speaker::Speaker, public Comp
|
|||
#if SOC_I2S_SUPPORTS_DAC
|
||||
i2s_dac_mode_t internal_dac_mode_{I2S_DAC_CHANNEL_DISABLE};
|
||||
#endif
|
||||
i2s_comm_format_t i2s_comm_fmt_;
|
||||
};
|
||||
|
||||
} // namespace i2s_audio
|
||||
|
|
|
@ -22,9 +22,10 @@ from esphome.helpers import write_file_if_changed
|
|||
|
||||
from . import defines as df, helpers, lv_validation as lvalid
|
||||
from .automation import disp_update, focused_widgets, update_to_code
|
||||
from .defines import add_define
|
||||
from .defines import CONF_WIDGETS, add_define
|
||||
from .encoders import ENCODERS_CONFIG, encoders_to_code, initial_focus_to_code
|
||||
from .gradient import GRADIENT_SCHEMA, gradients_to_code
|
||||
from .hello_world import get_hello_world
|
||||
from .lv_validation import lv_bool, lv_images_used
|
||||
from .lvcode import LvContext, LvglComponent
|
||||
from .schemas import (
|
||||
|
@ -32,7 +33,7 @@ from .schemas import (
|
|||
FLEX_OBJ_SCHEMA,
|
||||
GRID_CELL_SCHEMA,
|
||||
LAYOUT_SCHEMAS,
|
||||
STYLE_SCHEMA,
|
||||
STATE_SCHEMA,
|
||||
WIDGET_TYPES,
|
||||
any_widget_schema,
|
||||
container_schema,
|
||||
|
@ -292,6 +293,13 @@ def display_schema(config):
|
|||
return value or [cv.use_id(Display)(config)]
|
||||
|
||||
|
||||
def add_hello_world(config):
|
||||
if CONF_WIDGETS not in config and CONF_PAGES not in config:
|
||||
LOGGER.info("No pages or widgets configured, creating default hello_world page")
|
||||
config[CONF_WIDGETS] = cv.ensure_list(WIDGET_SCHEMA)(get_hello_world())
|
||||
return config
|
||||
|
||||
|
||||
FINAL_VALIDATE_SCHEMA = final_validation
|
||||
|
||||
CONFIG_SCHEMA = (
|
||||
|
@ -313,7 +321,7 @@ CONFIG_SCHEMA = (
|
|||
),
|
||||
cv.Optional(df.CONF_STYLE_DEFINITIONS): cv.ensure_list(
|
||||
cv.Schema({cv.Required(CONF_ID): cv.declare_id(lv_style_t)})
|
||||
.extend(STYLE_SCHEMA)
|
||||
.extend(STATE_SCHEMA)
|
||||
.extend(
|
||||
{
|
||||
cv.Optional(df.CONF_GRID_CELL_X_ALIGN): grid_alignments,
|
||||
|
@ -349,4 +357,5 @@ CONFIG_SCHEMA = (
|
|||
}
|
||||
)
|
||||
.extend(DISP_BG_SCHEMA)
|
||||
).add_extra(cv.has_at_least_one_key(CONF_PAGES, df.CONF_WIDGETS))
|
||||
.add_extra(add_hello_world)
|
||||
)
|
||||
|
|
64
esphome/components/lvgl/hello_world.py
Normal file
64
esphome/components/lvgl/hello_world.py
Normal file
|
@ -0,0 +1,64 @@
|
|||
from io import StringIO
|
||||
|
||||
from esphome.yaml_util import parse_yaml
|
||||
|
||||
CONFIG = """
|
||||
- obj:
|
||||
radius: 0
|
||||
pad_all: 12
|
||||
bg_color: 0xFFFFFF
|
||||
height: 100%
|
||||
width: 100%
|
||||
widgets:
|
||||
- spinner:
|
||||
id: hello_world_spinner_
|
||||
align: center
|
||||
indicator:
|
||||
arc_color: tomato
|
||||
height: 100
|
||||
width: 100
|
||||
spin_time: 2s
|
||||
arc_length: 60deg
|
||||
- label:
|
||||
id: hello_world_label_
|
||||
text: "Hello World!"
|
||||
align: center
|
||||
on_click:
|
||||
lvgl.spinner.update:
|
||||
id: hello_world_spinner_
|
||||
arc_color: springgreen
|
||||
- checkbox:
|
||||
pad_all: 8
|
||||
text: Checkbox
|
||||
align: top_right
|
||||
on_click:
|
||||
lvgl.label.update:
|
||||
id: hello_world_label_
|
||||
text: "Checked!"
|
||||
- button:
|
||||
pad_all: 8
|
||||
checkable: true
|
||||
align: top_left
|
||||
text_font: montserrat_20
|
||||
on_click:
|
||||
lvgl.label.update:
|
||||
id: hello_world_label_
|
||||
text: "Clicked!"
|
||||
widgets:
|
||||
- label:
|
||||
text: "Button"
|
||||
- slider:
|
||||
width: 80%
|
||||
align: bottom_mid
|
||||
on_value:
|
||||
lvgl.label.update:
|
||||
id: hello_world_label_
|
||||
text:
|
||||
format: "%.0f%%"
|
||||
args: [x]
|
||||
"""
|
||||
|
||||
|
||||
def get_hello_world():
|
||||
with StringIO(CONFIG) as fp:
|
||||
return parse_yaml("hello_world", fp)
|
|
@ -49,17 +49,172 @@ def opacity_validator(value):
|
|||
|
||||
opacity = LValidator(opacity_validator, uint32, retmapper=literal)
|
||||
|
||||
COLOR_NAMES = {
|
||||
"aliceblue": 0xF0F8FF,
|
||||
"antiquewhite": 0xFAEBD7,
|
||||
"aqua": 0x00FFFF,
|
||||
"aquamarine": 0x7FFFD4,
|
||||
"azure": 0xF0FFFF,
|
||||
"beige": 0xF5F5DC,
|
||||
"bisque": 0xFFE4C4,
|
||||
"black": 0x000000,
|
||||
"blanchedalmond": 0xFFEBCD,
|
||||
"blue": 0x0000FF,
|
||||
"blueviolet": 0x8A2BE2,
|
||||
"brown": 0xA52A2A,
|
||||
"burlywood": 0xDEB887,
|
||||
"cadetblue": 0x5F9EA0,
|
||||
"chartreuse": 0x7FFF00,
|
||||
"chocolate": 0xD2691E,
|
||||
"coral": 0xFF7F50,
|
||||
"cornflowerblue": 0x6495ED,
|
||||
"cornsilk": 0xFFF8DC,
|
||||
"crimson": 0xDC143C,
|
||||
"cyan": 0x00FFFF,
|
||||
"darkblue": 0x00008B,
|
||||
"darkcyan": 0x008B8B,
|
||||
"darkgoldenrod": 0xB8860B,
|
||||
"darkgray": 0xA9A9A9,
|
||||
"darkgreen": 0x006400,
|
||||
"darkgrey": 0xA9A9A9,
|
||||
"darkkhaki": 0xBDB76B,
|
||||
"darkmagenta": 0x8B008B,
|
||||
"darkolivegreen": 0x556B2F,
|
||||
"darkorange": 0xFF8C00,
|
||||
"darkorchid": 0x9932CC,
|
||||
"darkred": 0x8B0000,
|
||||
"darksalmon": 0xE9967A,
|
||||
"darkseagreen": 0x8FBC8F,
|
||||
"darkslateblue": 0x483D8B,
|
||||
"darkslategray": 0x2F4F4F,
|
||||
"darkslategrey": 0x2F4F4F,
|
||||
"darkturquoise": 0x00CED1,
|
||||
"darkviolet": 0x9400D3,
|
||||
"deeppink": 0xFF1493,
|
||||
"deepskyblue": 0x00BFFF,
|
||||
"dimgray": 0x696969,
|
||||
"dimgrey": 0x696969,
|
||||
"dodgerblue": 0x1E90FF,
|
||||
"firebrick": 0xB22222,
|
||||
"floralwhite": 0xFFFAF0,
|
||||
"forestgreen": 0x228B22,
|
||||
"fuchsia": 0xFF00FF,
|
||||
"gainsboro": 0xDCDCDC,
|
||||
"ghostwhite": 0xF8F8FF,
|
||||
"goldenrod": 0xDAA520,
|
||||
"gold": 0xFFD700,
|
||||
"gray": 0x808080,
|
||||
"green": 0x008000,
|
||||
"greenyellow": 0xADFF2F,
|
||||
"grey": 0x808080,
|
||||
"honeydew": 0xF0FFF0,
|
||||
"hotpink": 0xFF69B4,
|
||||
"indianred": 0xCD5C5C,
|
||||
"indigo": 0x4B0082,
|
||||
"ivory": 0xFFFFF0,
|
||||
"khaki": 0xF0E68C,
|
||||
"lavenderblush": 0xFFF0F5,
|
||||
"lavender": 0xE6E6FA,
|
||||
"lawngreen": 0x7CFC00,
|
||||
"lemonchiffon": 0xFFFACD,
|
||||
"lightblue": 0xADD8E6,
|
||||
"lightcoral": 0xF08080,
|
||||
"lightcyan": 0xE0FFFF,
|
||||
"lightgoldenrodyellow": 0xFAFAD2,
|
||||
"lightgray": 0xD3D3D3,
|
||||
"lightgreen": 0x90EE90,
|
||||
"lightgrey": 0xD3D3D3,
|
||||
"lightpink": 0xFFB6C1,
|
||||
"lightsalmon": 0xFFA07A,
|
||||
"lightseagreen": 0x20B2AA,
|
||||
"lightskyblue": 0x87CEFA,
|
||||
"lightslategray": 0x778899,
|
||||
"lightslategrey": 0x778899,
|
||||
"lightsteelblue": 0xB0C4DE,
|
||||
"lightyellow": 0xFFFFE0,
|
||||
"lime": 0x00FF00,
|
||||
"limegreen": 0x32CD32,
|
||||
"linen": 0xFAF0E6,
|
||||
"magenta": 0xFF00FF,
|
||||
"maroon": 0x800000,
|
||||
"mediumaquamarine": 0x66CDAA,
|
||||
"mediumblue": 0x0000CD,
|
||||
"mediumorchid": 0xBA55D3,
|
||||
"mediumpurple": 0x9370DB,
|
||||
"mediumseagreen": 0x3CB371,
|
||||
"mediumslateblue": 0x7B68EE,
|
||||
"mediumspringgreen": 0x00FA9A,
|
||||
"mediumturquoise": 0x48D1CC,
|
||||
"mediumvioletred": 0xC71585,
|
||||
"midnightblue": 0x191970,
|
||||
"mintcream": 0xF5FFFA,
|
||||
"mistyrose": 0xFFE4E1,
|
||||
"moccasin": 0xFFE4B5,
|
||||
"navajowhite": 0xFFDEAD,
|
||||
"navy": 0x000080,
|
||||
"oldlace": 0xFDF5E6,
|
||||
"olive": 0x808000,
|
||||
"olivedrab": 0x6B8E23,
|
||||
"orange": 0xFFA500,
|
||||
"orangered": 0xFF4500,
|
||||
"orchid": 0xDA70D6,
|
||||
"palegoldenrod": 0xEEE8AA,
|
||||
"palegreen": 0x98FB98,
|
||||
"paleturquoise": 0xAFEEEE,
|
||||
"palevioletred": 0xDB7093,
|
||||
"papayawhip": 0xFFEFD5,
|
||||
"peachpuff": 0xFFDAB9,
|
||||
"peru": 0xCD853F,
|
||||
"pink": 0xFFC0CB,
|
||||
"plum": 0xDDA0DD,
|
||||
"powderblue": 0xB0E0E6,
|
||||
"purple": 0x800080,
|
||||
"rebeccapurple": 0x663399,
|
||||
"red": 0xFF0000,
|
||||
"rosybrown": 0xBC8F8F,
|
||||
"royalblue": 0x4169E1,
|
||||
"saddlebrown": 0x8B4513,
|
||||
"salmon": 0xFA8072,
|
||||
"sandybrown": 0xF4A460,
|
||||
"seagreen": 0x2E8B57,
|
||||
"seashell": 0xFFF5EE,
|
||||
"sienna": 0xA0522D,
|
||||
"silver": 0xC0C0C0,
|
||||
"skyblue": 0x87CEEB,
|
||||
"slateblue": 0x6A5ACD,
|
||||
"slategray": 0x708090,
|
||||
"slategrey": 0x708090,
|
||||
"snow": 0xFFFAFA,
|
||||
"springgreen": 0x00FF7F,
|
||||
"steelblue": 0x4682B4,
|
||||
"tan": 0xD2B48C,
|
||||
"teal": 0x008080,
|
||||
"thistle": 0xD8BFD8,
|
||||
"tomato": 0xFF6347,
|
||||
"turquoise": 0x40E0D0,
|
||||
"violet": 0xEE82EE,
|
||||
"wheat": 0xF5DEB3,
|
||||
"white": 0xFFFFFF,
|
||||
"whitesmoke": 0xF5F5F5,
|
||||
"yellow": 0xFFFF00,
|
||||
"yellowgreen": 0x9ACD32,
|
||||
}
|
||||
|
||||
|
||||
@schema_extractor("one_of")
|
||||
def color(value):
|
||||
if value == SCHEMA_EXTRACT:
|
||||
return ["hex color value", "color ID"]
|
||||
return cv.Any(cv.int_, cv.use_id(ColorStruct))(value)
|
||||
return cv.Any(cv.int_, cv.one_of(*COLOR_NAMES, lower=True), cv.use_id(ColorStruct))(
|
||||
value
|
||||
)
|
||||
|
||||
|
||||
def color_retmapper(value):
|
||||
if isinstance(value, cv.Lambda):
|
||||
return cv.returning_lambda(value)
|
||||
if isinstance(value, str) and value in COLOR_NAMES:
|
||||
value = COLOR_NAMES[value]
|
||||
if isinstance(value, int):
|
||||
return literal(
|
||||
f"lv_color_make({(value >> 16) & 0xFF}, {(value >> 8) & 0xFF}, {value & 0xFF})"
|
||||
|
|
|
@ -27,6 +27,7 @@ CONF_BACKGROUND_PRESSED_COLOR = "background_pressed_color"
|
|||
CONF_FOREGROUND_PRESSED_COLOR = "foreground_pressed_color"
|
||||
CONF_FONT_ID = "font_id"
|
||||
CONF_EXIT_REPARSE_ON_START = "exit_reparse_on_start"
|
||||
CONF_SKIP_CONNECTION_HANDSHAKE = "skip_connection_handshake"
|
||||
|
||||
|
||||
def NextionName(value):
|
||||
|
|
|
@ -23,6 +23,7 @@ from .base_component import (
|
|||
CONF_START_UP_PAGE,
|
||||
CONF_AUTO_WAKE_ON_TOUCH,
|
||||
CONF_EXIT_REPARSE_ON_START,
|
||||
CONF_SKIP_CONNECTION_HANDSHAKE,
|
||||
)
|
||||
|
||||
CODEOWNERS = ["@senexcrenshaw", "@edwardtfn"]
|
||||
|
@ -72,6 +73,7 @@ CONFIG_SCHEMA = (
|
|||
cv.Optional(CONF_START_UP_PAGE): cv.uint8_t,
|
||||
cv.Optional(CONF_AUTO_WAKE_ON_TOUCH, default=True): cv.boolean,
|
||||
cv.Optional(CONF_EXIT_REPARSE_ON_START, default=False): cv.boolean,
|
||||
cv.Optional(CONF_SKIP_CONNECTION_HANDSHAKE, default=False): cv.boolean,
|
||||
}
|
||||
)
|
||||
.extend(cv.polling_component_schema("5s"))
|
||||
|
@ -118,6 +120,8 @@ async def to_code(config):
|
|||
|
||||
cg.add(var.set_exit_reparse_on_start_internal(config[CONF_EXIT_REPARSE_ON_START]))
|
||||
|
||||
cg.add(var.set_skip_connection_handshake(config[CONF_SKIP_CONNECTION_HANDSHAKE]))
|
||||
|
||||
await display.register_display(var, config)
|
||||
|
||||
for conf in config.get(CONF_ON_SETUP, []):
|
||||
|
|
|
@ -43,6 +43,16 @@ bool Nextion::check_connect_() {
|
|||
if (this->get_is_connected_())
|
||||
return true;
|
||||
|
||||
// Check if the handshake should be skipped for the Nextion connection
|
||||
if (this->skip_connection_handshake_) {
|
||||
// Log the connection status without handshake
|
||||
ESP_LOGW(TAG, "Nextion display set as connected without performing handshake");
|
||||
// Set the connection status to true
|
||||
this->is_connected_ = true;
|
||||
// Return true indicating the connection is set
|
||||
return true;
|
||||
}
|
||||
|
||||
if (this->comok_sent_ == 0) {
|
||||
this->reset_(false);
|
||||
|
||||
|
@ -126,10 +136,14 @@ void Nextion::reset_(bool reset_nextion) {
|
|||
|
||||
void Nextion::dump_config() {
|
||||
ESP_LOGCONFIG(TAG, "Nextion:");
|
||||
ESP_LOGCONFIG(TAG, " Device Model: %s", this->device_model_.c_str());
|
||||
ESP_LOGCONFIG(TAG, " Firmware Version: %s", this->firmware_version_.c_str());
|
||||
ESP_LOGCONFIG(TAG, " Serial Number: %s", this->serial_number_.c_str());
|
||||
ESP_LOGCONFIG(TAG, " Flash Size: %s", this->flash_size_.c_str());
|
||||
if (this->skip_connection_handshake_) {
|
||||
ESP_LOGCONFIG(TAG, " Skip handshake: %s", YESNO(this->skip_connection_handshake_));
|
||||
} else {
|
||||
ESP_LOGCONFIG(TAG, " Device Model: %s", this->device_model_.c_str());
|
||||
ESP_LOGCONFIG(TAG, " Firmware Version: %s", this->firmware_version_.c_str());
|
||||
ESP_LOGCONFIG(TAG, " Serial Number: %s", this->serial_number_.c_str());
|
||||
ESP_LOGCONFIG(TAG, " Flash Size: %s", this->flash_size_.c_str());
|
||||
}
|
||||
ESP_LOGCONFIG(TAG, " Wake On Touch: %s", YESNO(this->auto_wake_on_touch_));
|
||||
ESP_LOGCONFIG(TAG, " Exit reparse: %s", YESNO(this->exit_reparse_on_start_));
|
||||
|
||||
|
@ -262,6 +276,7 @@ void Nextion::loop() {
|
|||
this->goto_page(this->start_up_page_);
|
||||
}
|
||||
|
||||
// This could probably be removed from the loop area, as those are redundant.
|
||||
this->set_auto_wake_on_touch(this->auto_wake_on_touch_);
|
||||
this->set_exit_reparse_on_start(this->exit_reparse_on_start_);
|
||||
|
||||
|
|
|
@ -926,6 +926,21 @@ class Nextion : public NextionBase, public PollingComponent, public uart::UARTDe
|
|||
*/
|
||||
void set_exit_reparse_on_start(bool exit_reparse);
|
||||
|
||||
/**
|
||||
* Sets whether the Nextion display should skip the connection handshake process.
|
||||
* @param skip_handshake True or false. When skip_connection_handshake is true,
|
||||
* the connection will be established without performing the handshake.
|
||||
* This can be useful when using Nextion Simulator.
|
||||
*
|
||||
* Example:
|
||||
* ```cpp
|
||||
* it.set_skip_connection_handshake(true);
|
||||
* ```
|
||||
*
|
||||
* When set to true, the display will be marked as connected without performing a handshake.
|
||||
*/
|
||||
void set_skip_connection_handshake(bool skip_handshake) { this->skip_connection_handshake_ = skip_handshake; }
|
||||
|
||||
/**
|
||||
* Sets Nextion mode between sleep and awake
|
||||
* @param True or false. Sleep=true to enter sleep mode or sleep=false to exit sleep mode.
|
||||
|
@ -1221,6 +1236,7 @@ class Nextion : public NextionBase, public PollingComponent, public uart::UARTDe
|
|||
int16_t start_up_page_ = -1;
|
||||
bool auto_wake_on_touch_ = true;
|
||||
bool exit_reparse_on_start_ = false;
|
||||
bool skip_connection_handshake_ = false;
|
||||
|
||||
/**
|
||||
* Manually send a raw command to the display and don't wait for an acknowledgement packet.
|
||||
|
|
|
@ -9,14 +9,6 @@ void ST7701S::setup() {
|
|||
esph_log_config(TAG, "Setting up ST7701S");
|
||||
this->spi_setup();
|
||||
this->write_init_sequence_();
|
||||
}
|
||||
|
||||
// called after a delay after writing the init sequence
|
||||
void ST7701S::complete_setup_() {
|
||||
this->write_command_(SLEEP_OUT);
|
||||
this->write_command_(DISPLAY_ON);
|
||||
this->spi_teardown(); // SPI not needed after this
|
||||
delay(10);
|
||||
|
||||
esp_lcd_rgb_panel_config_t config{};
|
||||
config.flags.fb_in_psram = 1;
|
||||
|
@ -179,7 +171,12 @@ void ST7701S::write_init_sequence_() {
|
|||
this->write_data_(val);
|
||||
ESP_LOGD(TAG, "write MADCTL %X", val);
|
||||
this->write_command_(this->invert_colors_ ? INVERT_ON : INVERT_OFF);
|
||||
this->set_timeout(120, [this] { this->complete_setup_(); });
|
||||
// can't avoid this inline delay due to the need to complete setup before anything else tries to draw.
|
||||
delay(120); // NOLINT
|
||||
this->write_command_(SLEEP_OUT);
|
||||
this->write_command_(DISPLAY_ON);
|
||||
this->spi_teardown(); // SPI not needed after this
|
||||
delay(10);
|
||||
}
|
||||
|
||||
void ST7701S::dump_config() {
|
||||
|
|
72
esphome/components/tca9555/__init__.py
Normal file
72
esphome/components/tca9555/__init__.py
Normal file
|
@ -0,0 +1,72 @@
|
|||
from esphome import pins
|
||||
import esphome.codegen as cg
|
||||
from esphome.components import i2c
|
||||
import esphome.config_validation as cv
|
||||
from esphome.const import (
|
||||
CONF_ID,
|
||||
CONF_INPUT,
|
||||
CONF_INVERTED,
|
||||
CONF_MODE,
|
||||
CONF_NUMBER,
|
||||
CONF_OUTPUT,
|
||||
)
|
||||
|
||||
CODEOWNERS = ["@mobrembski"]
|
||||
|
||||
AUTO_LOAD = ["gpio_expander"]
|
||||
DEPENDENCIES = ["i2c"]
|
||||
MULTI_CONF = True
|
||||
|
||||
tca9555_ns = cg.esphome_ns.namespace("tca9555")
|
||||
|
||||
TCA9555Component = tca9555_ns.class_("TCA9555Component", cg.Component, i2c.I2CDevice)
|
||||
TCA9555GPIOPin = tca9555_ns.class_("TCA9555GPIOPin", cg.GPIOPin)
|
||||
|
||||
CONF_TCA9555 = "tca9555"
|
||||
CONFIG_SCHEMA = (
|
||||
cv.Schema(
|
||||
{
|
||||
cv.Required(CONF_ID): cv.declare_id(TCA9555Component),
|
||||
}
|
||||
)
|
||||
.extend(cv.COMPONENT_SCHEMA)
|
||||
.extend(i2c.i2c_device_schema(0x21))
|
||||
)
|
||||
|
||||
|
||||
async def to_code(config):
|
||||
var = cg.new_Pvariable(config[CONF_ID])
|
||||
await cg.register_component(var, config)
|
||||
await i2c.register_i2c_device(var, config)
|
||||
|
||||
|
||||
def validate_mode(value):
|
||||
if not (value[CONF_INPUT] or value[CONF_OUTPUT]):
|
||||
raise cv.Invalid("Mode must be either input or output")
|
||||
if value[CONF_INPUT] and value[CONF_OUTPUT]:
|
||||
raise cv.Invalid("Mode must be either input or output")
|
||||
return value
|
||||
|
||||
|
||||
TCA9555_PIN_SCHEMA = pins.gpio_base_schema(
|
||||
TCA9555GPIOPin,
|
||||
cv.int_range(min=0, max=15),
|
||||
modes=[CONF_INPUT, CONF_OUTPUT],
|
||||
mode_validator=validate_mode,
|
||||
invertable=True,
|
||||
).extend(
|
||||
{
|
||||
cv.Required(CONF_TCA9555): cv.use_id(TCA9555Component),
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
@pins.PIN_SCHEMA_REGISTRY.register(CONF_TCA9555, TCA9555_PIN_SCHEMA)
|
||||
async def tca9555_pin_to_code(config):
|
||||
var = cg.new_Pvariable(config[CONF_ID])
|
||||
await cg.register_parented(var, config[CONF_TCA9555])
|
||||
|
||||
cg.add(var.set_pin(config[CONF_NUMBER]))
|
||||
cg.add(var.set_inverted(config[CONF_INVERTED]))
|
||||
cg.add(var.set_flags(pins.gpio_flags_expr(config[CONF_MODE])))
|
||||
return var
|
140
esphome/components/tca9555/tca9555.cpp
Normal file
140
esphome/components/tca9555/tca9555.cpp
Normal file
|
@ -0,0 +1,140 @@
|
|||
#include "tca9555.h"
|
||||
#include "esphome/core/log.h"
|
||||
|
||||
static const uint8_t TCA9555_INPUT_PORT_REGISTER_0 = 0x00;
|
||||
static const uint8_t TCA9555_INPUT_PORT_REGISTER_1 = 0x01;
|
||||
static const uint8_t TCA9555_OUTPUT_PORT_REGISTER_0 = 0x02;
|
||||
static const uint8_t TCA9555_OUTPUT_PORT_REGISTER_1 = 0x03;
|
||||
static const uint8_t TCA9555_POLARITY_REGISTER_0 = 0x04;
|
||||
static const uint8_t TCA9555_POLARITY_REGISTER_1 = 0x05;
|
||||
static const uint8_t TCA9555_CONFIGURATION_PORT_0 = 0x06;
|
||||
static const uint8_t TCA9555_CONFIGURATION_PORT_1 = 0x07;
|
||||
|
||||
namespace esphome {
|
||||
namespace tca9555 {
|
||||
|
||||
static const char *const TAG = "tca9555";
|
||||
|
||||
void TCA9555Component::setup() {
|
||||
ESP_LOGCONFIG(TAG, "Setting up TCA9555...");
|
||||
if (!this->read_gpio_modes_()) {
|
||||
this->mark_failed();
|
||||
return;
|
||||
}
|
||||
if (!this->read_gpio_outputs_()) {
|
||||
this->mark_failed();
|
||||
return;
|
||||
}
|
||||
}
|
||||
void TCA9555Component::dump_config() {
|
||||
ESP_LOGCONFIG(TAG, "TCA9555:");
|
||||
LOG_I2C_DEVICE(this)
|
||||
if (this->is_failed()) {
|
||||
ESP_LOGE(TAG, "Communication with TCA9555 failed!");
|
||||
}
|
||||
}
|
||||
void TCA9555Component::pin_mode(uint8_t pin, gpio::Flags flags) {
|
||||
if (flags == gpio::FLAG_INPUT) {
|
||||
// Set mode mask bit
|
||||
this->mode_mask_ |= 1 << pin;
|
||||
} else if (flags == gpio::FLAG_OUTPUT) {
|
||||
// Clear mode mask bit
|
||||
this->mode_mask_ &= ~(1 << pin);
|
||||
}
|
||||
// Write GPIO to enable input mode
|
||||
this->write_gpio_modes_();
|
||||
}
|
||||
void TCA9555Component::loop() { this->reset_pin_cache_(); }
|
||||
|
||||
bool TCA9555Component::read_gpio_outputs_() {
|
||||
if (this->is_failed())
|
||||
return false;
|
||||
uint8_t data[2];
|
||||
if (!this->read_bytes(TCA9555_OUTPUT_PORT_REGISTER_0, data, 2)) {
|
||||
this->status_set_warning("Failed to read output register");
|
||||
return false;
|
||||
}
|
||||
this->output_mask_ = (uint16_t(data[1]) << 8) | (uint16_t(data[0]) << 0);
|
||||
this->status_clear_warning();
|
||||
return true;
|
||||
}
|
||||
|
||||
bool TCA9555Component::read_gpio_modes_() {
|
||||
if (this->is_failed())
|
||||
return false;
|
||||
uint8_t data[2];
|
||||
bool success = this->read_bytes(TCA9555_CONFIGURATION_PORT_0, data, 2);
|
||||
if (!success) {
|
||||
this->status_set_warning("Failed to read mode register");
|
||||
return false;
|
||||
}
|
||||
this->mode_mask_ = (uint16_t(data[1]) << 8) | (uint16_t(data[0]) << 0);
|
||||
|
||||
this->status_clear_warning();
|
||||
return true;
|
||||
}
|
||||
bool TCA9555Component::digital_read_hw(uint8_t pin) {
|
||||
if (this->is_failed())
|
||||
return false;
|
||||
bool success;
|
||||
uint8_t data[2];
|
||||
success = this->read_bytes(TCA9555_INPUT_PORT_REGISTER_0, data, 2);
|
||||
this->input_mask_ = (uint16_t(data[1]) << 8) | (uint16_t(data[0]) << 0);
|
||||
|
||||
if (!success) {
|
||||
this->status_set_warning("Failed to read input register");
|
||||
return false;
|
||||
}
|
||||
|
||||
this->status_clear_warning();
|
||||
return true;
|
||||
}
|
||||
|
||||
void TCA9555Component::digital_write_hw(uint8_t pin, bool value) {
|
||||
if (this->is_failed())
|
||||
return;
|
||||
|
||||
if (value) {
|
||||
this->output_mask_ |= (1 << pin);
|
||||
} else {
|
||||
this->output_mask_ &= ~(1 << pin);
|
||||
}
|
||||
|
||||
uint8_t data[2];
|
||||
data[0] = this->output_mask_;
|
||||
data[1] = this->output_mask_ >> 8;
|
||||
if (!this->write_bytes(TCA9555_OUTPUT_PORT_REGISTER_0, data, 2)) {
|
||||
this->status_set_warning("Failed to write output register");
|
||||
return;
|
||||
}
|
||||
|
||||
this->status_clear_warning();
|
||||
}
|
||||
|
||||
bool TCA9555Component::write_gpio_modes_() {
|
||||
if (this->is_failed())
|
||||
return false;
|
||||
uint8_t data[2];
|
||||
|
||||
data[0] = this->mode_mask_;
|
||||
data[1] = this->mode_mask_ >> 8;
|
||||
if (!this->write_bytes(TCA9555_CONFIGURATION_PORT_0, data, 2)) {
|
||||
this->status_set_warning("Failed to write mode register");
|
||||
return false;
|
||||
}
|
||||
this->status_clear_warning();
|
||||
return true;
|
||||
}
|
||||
|
||||
bool TCA9555Component::digital_read_cache(uint8_t pin) { return this->input_mask_ & (1 << pin); }
|
||||
|
||||
float TCA9555Component::get_setup_priority() const { return setup_priority::IO; }
|
||||
|
||||
void TCA9555GPIOPin::setup() { this->pin_mode(this->flags_); }
|
||||
void TCA9555GPIOPin::pin_mode(gpio::Flags flags) { this->parent_->pin_mode(this->pin_, flags); }
|
||||
bool TCA9555GPIOPin::digital_read() { return this->parent_->digital_read(this->pin_) != this->inverted_; }
|
||||
void TCA9555GPIOPin::digital_write(bool value) { this->parent_->digital_write(this->pin_, value != this->inverted_); }
|
||||
std::string TCA9555GPIOPin::dump_summary() const { return str_sprintf("%u via TCA9555", this->pin_); }
|
||||
|
||||
} // namespace tca9555
|
||||
} // namespace esphome
|
64
esphome/components/tca9555/tca9555.h
Normal file
64
esphome/components/tca9555/tca9555.h
Normal file
|
@ -0,0 +1,64 @@
|
|||
#pragma once
|
||||
|
||||
#include "esphome/components/gpio_expander/cached_gpio.h"
|
||||
#include "esphome/components/i2c/i2c.h"
|
||||
#include "esphome/core/component.h"
|
||||
#include "esphome/core/hal.h"
|
||||
|
||||
namespace esphome {
|
||||
namespace tca9555 {
|
||||
|
||||
class TCA9555Component : public Component,
|
||||
public i2c::I2CDevice,
|
||||
public gpio_expander::CachedGpioExpander<uint8_t, 16> {
|
||||
public:
|
||||
TCA9555Component() = default;
|
||||
|
||||
/// Check i2c availability and setup masks
|
||||
void setup() override;
|
||||
void pin_mode(uint8_t pin, gpio::Flags flags);
|
||||
|
||||
float get_setup_priority() const override;
|
||||
|
||||
void dump_config() override;
|
||||
|
||||
void loop() override;
|
||||
|
||||
protected:
|
||||
bool digital_read_hw(uint8_t pin) override;
|
||||
bool digital_read_cache(uint8_t pin) override;
|
||||
void digital_write_hw(uint8_t pin, bool value) override;
|
||||
|
||||
/// Mask for the pin mode - 1 means output, 0 means input
|
||||
uint16_t mode_mask_{0x00};
|
||||
/// The mask to write as output state - 1 means HIGH, 0 means LOW
|
||||
uint16_t output_mask_{0x00};
|
||||
/// The state read in digital_read_hw - 1 means HIGH, 0 means LOW
|
||||
uint16_t input_mask_{0x00};
|
||||
|
||||
bool read_gpio_modes_();
|
||||
bool write_gpio_modes_();
|
||||
bool read_gpio_outputs_();
|
||||
};
|
||||
|
||||
/// Helper class to expose a TCA9555 pin as an internal input GPIO pin.
|
||||
class TCA9555GPIOPin : public GPIOPin, public Parented<TCA9555Component> {
|
||||
public:
|
||||
void setup() override;
|
||||
void pin_mode(gpio::Flags flags) override;
|
||||
bool digital_read() override;
|
||||
void digital_write(bool value) override;
|
||||
std::string dump_summary() const override;
|
||||
|
||||
void set_pin(uint8_t pin) { this->pin_ = pin; }
|
||||
void set_inverted(bool inverted) { this->inverted_ = inverted; }
|
||||
void set_flags(gpio::Flags flags) { this->flags_ = flags; }
|
||||
|
||||
protected:
|
||||
uint8_t pin_;
|
||||
bool inverted_;
|
||||
gpio::Flags flags_;
|
||||
};
|
||||
|
||||
} // namespace tca9555
|
||||
} // namespace esphome
|
|
@ -77,6 +77,18 @@ struct Timer {
|
|||
}
|
||||
};
|
||||
|
||||
struct WakeWord {
|
||||
std::string id;
|
||||
std::string wake_word;
|
||||
std::vector<std::string> trained_languages;
|
||||
};
|
||||
|
||||
struct Configuration {
|
||||
std::vector<WakeWord> available_wake_words;
|
||||
std::vector<std::string> active_wake_words;
|
||||
uint32_t max_active_wake_words;
|
||||
};
|
||||
|
||||
class VoiceAssistant : public Component {
|
||||
public:
|
||||
void setup() override;
|
||||
|
@ -133,6 +145,8 @@ class VoiceAssistant : public Component {
|
|||
void on_audio(const api::VoiceAssistantAudio &msg);
|
||||
void on_timer_event(const api::VoiceAssistantTimerEventResponse &msg);
|
||||
void on_announce(const api::VoiceAssistantAnnounceRequest &msg);
|
||||
void on_set_configuration(const std::vector<std::string> &active_wake_words){};
|
||||
const Configuration &get_configuration() { return this->config_; };
|
||||
|
||||
bool is_running() const { return this->state_ != State::IDLE; }
|
||||
void set_continuous(bool continuous) { this->continuous_ = continuous; }
|
||||
|
@ -279,6 +293,8 @@ class VoiceAssistant : public Component {
|
|||
AudioMode audio_mode_{AUDIO_MODE_UDP};
|
||||
bool udp_socket_running_{false};
|
||||
bool start_udp_socket_();
|
||||
|
||||
Configuration config_{};
|
||||
};
|
||||
|
||||
template<typename... Ts> class StartAction : public Action<Ts...>, public Parented<VoiceAssistant> {
|
||||
|
|
2
tests/components/ethernet/common-openeth.yaml
Normal file
2
tests/components/ethernet/common-openeth.yaml
Normal file
|
@ -0,0 +1,2 @@
|
|||
ethernet:
|
||||
type: OPENETH
|
1
tests/components/ethernet/test-openeth.esp32-idf.yaml
Normal file
1
tests/components/ethernet/test-openeth.esp32-idf.yaml
Normal file
|
@ -0,0 +1 @@
|
|||
<<: !include common-openeth.yaml
|
|
@ -16,7 +16,6 @@ climate:
|
|||
name: Haier AC
|
||||
wifi_signal: true
|
||||
answer_timeout: 200ms
|
||||
beeper: true
|
||||
visual:
|
||||
min_temperature: 16 °C
|
||||
max_temperature: 30 °C
|
||||
|
@ -38,7 +37,6 @@ climate:
|
|||
supported_presets:
|
||||
- AWAY
|
||||
- BOOST
|
||||
- ECO
|
||||
- SLEEP
|
||||
on_alarm_start:
|
||||
then:
|
||||
|
@ -112,3 +110,15 @@ text_sensor:
|
|||
name: Haier cleaning status
|
||||
protocol_version:
|
||||
name: Haier protocol version
|
||||
|
||||
switch:
|
||||
- platform: haier
|
||||
haier_id: haier_ac
|
||||
beeper:
|
||||
name: Haier beeper
|
||||
display:
|
||||
name: Haier display
|
||||
health_mode:
|
||||
name: Haier health mode
|
||||
quiet_mode:
|
||||
name: Haier quiet mode
|
||||
|
|
|
@ -38,8 +38,8 @@ lvgl:
|
|||
border_width: 0
|
||||
radius: 0
|
||||
pad_all: 0
|
||||
border_color: 0x0077b3
|
||||
text_color: 0xFFFFFF
|
||||
border_color: tomato
|
||||
text_color: springgreen
|
||||
width: 100%
|
||||
height: 30
|
||||
border_side: [left, top]
|
||||
|
|
11
tests/components/lvgl/test.host.yaml
Normal file
11
tests/components/lvgl/test.host.yaml
Normal file
|
@ -0,0 +1,11 @@
|
|||
display:
|
||||
- platform: sdl
|
||||
auto_clear_enabled: false
|
||||
dimensions:
|
||||
width: 480
|
||||
height: 480
|
||||
|
||||
touchscreen:
|
||||
- platform: sdl
|
||||
|
||||
lvgl:
|
27
tests/components/tca9555/test.esp32-ard.yaml
Normal file
27
tests/components/tca9555/test.esp32-ard.yaml
Normal file
|
@ -0,0 +1,27 @@
|
|||
i2c:
|
||||
- id: i2c_tca9555
|
||||
scl: 16
|
||||
sda: 17
|
||||
|
||||
tca9555:
|
||||
- id: tca9555_hub
|
||||
address: 0x21
|
||||
|
||||
binary_sensor:
|
||||
- platform: gpio
|
||||
id: tca9555_binary_sensor
|
||||
name: TCA9555 Binary Sensor
|
||||
pin:
|
||||
tca9555: tca9555_hub
|
||||
number: 1
|
||||
mode: INPUT
|
||||
inverted: true
|
||||
|
||||
output:
|
||||
- platform: gpio
|
||||
id: tca9555_output
|
||||
pin:
|
||||
tca9555: tca9555_hub
|
||||
number: 0
|
||||
mode: OUTPUT
|
||||
inverted: false
|
27
tests/components/tca9555/test.esp32-c3-ard.yaml
Normal file
27
tests/components/tca9555/test.esp32-c3-ard.yaml
Normal file
|
@ -0,0 +1,27 @@
|
|||
i2c:
|
||||
- id: i2c_tca9555
|
||||
scl: 5
|
||||
sda: 4
|
||||
|
||||
tca9555:
|
||||
- id: tca9555_hub
|
||||
address: 0x21
|
||||
|
||||
binary_sensor:
|
||||
- platform: gpio
|
||||
id: tca9555_binary_sensor
|
||||
name: TCA9555 Binary Sensor
|
||||
pin:
|
||||
tca9555: tca9555_hub
|
||||
number: 1
|
||||
mode: INPUT
|
||||
inverted: true
|
||||
|
||||
output:
|
||||
- platform: gpio
|
||||
id: tca9555_output
|
||||
pin:
|
||||
tca9555: tca9555_hub
|
||||
number: 0
|
||||
mode: OUTPUT
|
||||
inverted: false
|
27
tests/components/tca9555/test.esp32-c3-idf.yaml
Normal file
27
tests/components/tca9555/test.esp32-c3-idf.yaml
Normal file
|
@ -0,0 +1,27 @@
|
|||
i2c:
|
||||
- id: i2c_tca9555
|
||||
scl: 5
|
||||
sda: 4
|
||||
|
||||
tca9555:
|
||||
- id: tca9555_hub
|
||||
address: 0x21
|
||||
|
||||
binary_sensor:
|
||||
- platform: gpio
|
||||
id: tca9555_binary_sensor
|
||||
name: TCA9555 Binary Sensor
|
||||
pin:
|
||||
tca9555: tca9555_hub
|
||||
number: 1
|
||||
mode: INPUT
|
||||
inverted: true
|
||||
|
||||
output:
|
||||
- platform: gpio
|
||||
id: tca9555_output
|
||||
pin:
|
||||
tca9555: tca9555_hub
|
||||
number: 0
|
||||
mode: OUTPUT
|
||||
inverted: false
|
27
tests/components/tca9555/test.esp32-idf.yaml
Normal file
27
tests/components/tca9555/test.esp32-idf.yaml
Normal file
|
@ -0,0 +1,27 @@
|
|||
i2c:
|
||||
- id: i2c_tca9555
|
||||
scl: 16
|
||||
sda: 17
|
||||
|
||||
tca9555:
|
||||
- id: tca9555_hub
|
||||
address: 0x21
|
||||
|
||||
binary_sensor:
|
||||
- platform: gpio
|
||||
id: tca9555_binary_sensor
|
||||
name: TCA9555 Binary Sensor
|
||||
pin:
|
||||
tca9555: tca9555_hub
|
||||
number: 1
|
||||
mode: INPUT
|
||||
inverted: true
|
||||
|
||||
output:
|
||||
- platform: gpio
|
||||
id: tca9555_output
|
||||
pin:
|
||||
tca9555: tca9555_hub
|
||||
number: 0
|
||||
mode: OUTPUT
|
||||
inverted: false
|
27
tests/components/tca9555/test.esp8266-ard.yaml
Normal file
27
tests/components/tca9555/test.esp8266-ard.yaml
Normal file
|
@ -0,0 +1,27 @@
|
|||
i2c:
|
||||
- id: i2c_tca9555
|
||||
scl: 5
|
||||
sda: 4
|
||||
|
||||
tca9555:
|
||||
- id: tca9555_hub
|
||||
address: 0x21
|
||||
|
||||
binary_sensor:
|
||||
- platform: gpio
|
||||
id: tca9555_binary_sensor
|
||||
name: TCA9555 Binary Sensor
|
||||
pin:
|
||||
tca9555: tca9555_hub
|
||||
number: 1
|
||||
mode: INPUT
|
||||
inverted: true
|
||||
|
||||
output:
|
||||
- platform: gpio
|
||||
id: tca9555_output
|
||||
pin:
|
||||
tca9555: tca9555_hub
|
||||
number: 0
|
||||
mode: OUTPUT
|
||||
inverted: false
|
27
tests/components/tca9555/test.rp2040-ard.yaml
Normal file
27
tests/components/tca9555/test.rp2040-ard.yaml
Normal file
|
@ -0,0 +1,27 @@
|
|||
i2c:
|
||||
- id: i2c_tca9555
|
||||
scl: 5
|
||||
sda: 4
|
||||
|
||||
tca9555:
|
||||
- id: tca9555_hub
|
||||
address: 0x21
|
||||
|
||||
binary_sensor:
|
||||
- platform: gpio
|
||||
id: tca9555_binary_sensor
|
||||
name: TCA9555 Binary Sensor
|
||||
pin:
|
||||
tca9555: tca9555_hub
|
||||
number: 1
|
||||
mode: INPUT
|
||||
inverted: true
|
||||
|
||||
output:
|
||||
- platform: gpio
|
||||
id: tca9555_output
|
||||
pin:
|
||||
tca9555: tca9555_hub
|
||||
number: 0
|
||||
mode: OUTPUT
|
||||
inverted: false
|
Loading…
Reference in a new issue