sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-03-26 04:28:17 +00:00
Code Issues Releases Wiki Activity

Merge pull request #11 from p1ngb4ck/dev

Browse Source 
Dev
This commit is contained in:
Oliver Kleinecke 2025-02-09 19:36:21 +01:00 committed by GitHub
commit 0c7177a6bd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
esphome/components/mcp4461/mcp4461.cpp
View File

@ -116,7 +116,7 @@ void Mcp4461Component::dump_config() {
ESP_LOGCONFIG(TAG, " ├── Nonvolatile wiper [%" PRIu8 "] level: %" PRIu16 "", i, this->reg_[i].state); ESP_LOGCONFIG(TAG, " ├── Nonvolatile wiper [%" PRIu8 "] level: %" PRIu16 "", i, this->reg_[i].state);
} }
} }
uint8_t status_register_value; uint8_t status_register_value;
status_register_value = this->get_status_register_(); status_register_value = this->get_status_register_();
ESP_LOGCONFIG(TAG, ESP_LOGCONFIG(TAG,
@ -149,8 +149,7 @@ void Mcp4461Component::loop() {
Mcp4461TerminalIdx terminal_connector; Mcp4461TerminalIdx terminal_connector;
if (i < 2) { if (i < 2) {
terminal_connector = Mcp4461TerminalIdx::MCP4461_TERMINAL_0; terminal_connector = Mcp4461TerminalIdx::MCP4461_TERMINAL_0;
} } else {
else {
terminal_connector = Mcp4461TerminalIdx::MCP4461_TERMINAL_1; terminal_connector = Mcp4461TerminalIdx::MCP4461_TERMINAL_1;
} }
uint8_t new_terminal_value = this->calc_terminal_connector_byte_(terminal_connector); uint8_t new_terminal_value = this->calc_terminal_connector_byte_(terminal_connector);

20
esphome/components/mcp4461/output/mcp4461_output.cpp
View File

@ -15,20 +15,18 @@ void Mcp4461Wiper::write_state(float state) {
} }
} }
float Mcp4461Wiper::read_state() { return (static_cast<float>(this->parent_->get_wiper_level_(this->wiper_)) / 1000.0); } float Mcp4461Wiper::read_state() {
return (static_cast<float>(this->parent_->get_wiper_level_(this->wiper_)) / 1000.0);
}
float Mcp4461Wiper::update_state() { float Mcp4461Wiper::update_state() {
this->state_ = this->read_state(); this->state_ = this->read_state();
return this->state_; return this->state_;
} }
void Mcp4461Wiper::enable_wiper() { void Mcp4461Wiper::enable_wiper() { this->parent_->enable_wiper_(this->wiper_); }
this->parent_->enable_wiper_(this->wiper_);
}
void Mcp4461Wiper::disable_wiper() { void Mcp4461Wiper::disable_wiper() { this->parent_->disable_wiper_(this->wiper_); }
this->parent_->disable_wiper_(this->wiper_);
}
void Mcp4461Wiper::increase_wiper() { void Mcp4461Wiper::increase_wiper() {
if (this->parent_->increase_wiper_(this->wiper_)) { if (this->parent_->increase_wiper_(this->wiper_)) {
@ -42,13 +40,9 @@ void Mcp4461Wiper::decrease_wiper() {
} }
} }
void Mcp4461Wiper::enable_terminal(char terminal) { void Mcp4461Wiper::enable_terminal(char terminal) { this->parent_->enable_terminal_(this->wiper_, terminal); }
this->parent_->enable_terminal_(this->wiper_, terminal);
}
void Mcp4461Wiper::disable_terminal(char terminal) { void Mcp4461Wiper::disable_terminal(char terminal) { this->parent_->disable_terminal_(this->wiper_, terminal); }
this->parent_->disable_terminal_(this->wiper_, terminal);
}
} // namespace mcp4461 } // namespace mcp4461
} // namespace esphome } // namespace esphome

1
esphome/components/mcp4461/output/mcp4461_output.h
View File

@ -14,7 +14,6 @@ class Mcp4461Wiper : public output::FloatOutput, public Parented<Mcp4461Componen
float read_state(); float read_state();
float update_state(); float update_state();
//void save_level();
void enable_wiper(); void enable_wiper();
void disable_wiper(); void disable_wiper();
void increase_wiper(); void increase_wiper();