From 5c331e9698d35ee2e5ecf423398fe34f7e25c146 Mon Sep 17 00:00:00 2001 From: Oliver Kleinecke Date: Sun, 9 Feb 2025 19:32:29 +0100 Subject: [PATCH 1/4] Update mcp4461.cpp --- esphome/components/mcp4461/mcp4461.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esphome/components/mcp4461/mcp4461.cpp b/esphome/components/mcp4461/mcp4461.cpp index 36b2c245f2..419489acbe 100644 --- a/esphome/components/mcp4461/mcp4461.cpp +++ b/esphome/components/mcp4461/mcp4461.cpp @@ -116,7 +116,7 @@ void Mcp4461Component::dump_config() { ESP_LOGCONFIG(TAG, " ├── Nonvolatile wiper [%" PRIu8 "] level: %" PRIu16 "", i, this->reg_[i].state); } } - + uint8_t status_register_value; status_register_value = this->get_status_register_(); ESP_LOGCONFIG(TAG, From a57fc77327b4befd951d52a3d50e8c39f864f57d Mon Sep 17 00:00:00 2001 From: Oliver Kleinecke Date: Sun, 9 Feb 2025 19:33:37 +0100 Subject: [PATCH 2/4] Update mcp4461.cpp --- esphome/components/mcp4461/mcp4461.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/esphome/components/mcp4461/mcp4461.cpp b/esphome/components/mcp4461/mcp4461.cpp index 419489acbe..f75ed5a387 100644 --- a/esphome/components/mcp4461/mcp4461.cpp +++ b/esphome/components/mcp4461/mcp4461.cpp @@ -149,8 +149,7 @@ void Mcp4461Component::loop() { Mcp4461TerminalIdx terminal_connector; if (i < 2) { terminal_connector = Mcp4461TerminalIdx::MCP4461_TERMINAL_0; - } - else { + } else { terminal_connector = Mcp4461TerminalIdx::MCP4461_TERMINAL_1; } uint8_t new_terminal_value = this->calc_terminal_connector_byte_(terminal_connector); From 9fd850d3e8fd9eaaa496fd463e438c37c10818a3 Mon Sep 17 00:00:00 2001 From: Oliver Kleinecke Date: Sun, 9 Feb 2025 19:35:19 +0100 Subject: [PATCH 3/4] Update mcp4461_output.cpp --- .../mcp4461/output/mcp4461_output.cpp | 20 +++++++------------ 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/esphome/components/mcp4461/output/mcp4461_output.cpp b/esphome/components/mcp4461/output/mcp4461_output.cpp index 232fe17328..0389beccf3 100644 --- a/esphome/components/mcp4461/output/mcp4461_output.cpp +++ b/esphome/components/mcp4461/output/mcp4461_output.cpp @@ -15,20 +15,18 @@ void Mcp4461Wiper::write_state(float state) { } } -float Mcp4461Wiper::read_state() { return (static_cast(this->parent_->get_wiper_level_(this->wiper_)) / 1000.0); } +float Mcp4461Wiper::read_state() { + return (static_cast(this->parent_->get_wiper_level_(this->wiper_)) / 1000.0); +} float Mcp4461Wiper::update_state() { this->state_ = this->read_state(); return this->state_; } -void Mcp4461Wiper::enable_wiper() { - this->parent_->enable_wiper_(this->wiper_); -} +void Mcp4461Wiper::enable_wiper() { this->parent_->enable_wiper_(this->wiper_); } -void Mcp4461Wiper::disable_wiper() { - this->parent_->disable_wiper_(this->wiper_); -} +void Mcp4461Wiper::disable_wiper() { this->parent_->disable_wiper_(this->wiper_); } void Mcp4461Wiper::increase_wiper() { if (this->parent_->increase_wiper_(this->wiper_)) { @@ -42,13 +40,9 @@ void Mcp4461Wiper::decrease_wiper() { } } -void Mcp4461Wiper::enable_terminal(char terminal) { - this->parent_->enable_terminal_(this->wiper_, terminal); -} +void Mcp4461Wiper::enable_terminal(char terminal) { this->parent_->enable_terminal_(this->wiper_, terminal); } -void Mcp4461Wiper::disable_terminal(char terminal) { - this->parent_->disable_terminal_(this->wiper_, terminal); -} +void Mcp4461Wiper::disable_terminal(char terminal) { this->parent_->disable_terminal_(this->wiper_, terminal); } } // namespace mcp4461 } // namespace esphome From fd1f82004f943b096ab8fd7d17a54b720bd83b6a Mon Sep 17 00:00:00 2001 From: Oliver Kleinecke Date: Sun, 9 Feb 2025 19:35:48 +0100 Subject: [PATCH 4/4] Update mcp4461_output.h --- esphome/components/mcp4461/output/mcp4461_output.h | 1 - 1 file changed, 1 deletion(-) diff --git a/esphome/components/mcp4461/output/mcp4461_output.h b/esphome/components/mcp4461/output/mcp4461_output.h index 226d01849e..fe7560650d 100644 --- a/esphome/components/mcp4461/output/mcp4461_output.h +++ b/esphome/components/mcp4461/output/mcp4461_output.h @@ -14,7 +14,6 @@ class Mcp4461Wiper : public output::FloatOutput, public Parented