From 6bc5179e206c28f1013dde06a3f4f9465a85cfd5 Mon Sep 17 00:00:00 2001 From: Oliver Kleinecke Date: Mon, 3 Feb 2025 23:21:14 +0100 Subject: [PATCH] Update mcp4461.cpp --- esphome/components/mcp4461/mcp4461.cpp | 78 +++++++++++++------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/esphome/components/mcp4461/mcp4461.cpp b/esphome/components/mcp4461/mcp4461.cpp index eb55c37aa5..d3274bffda 100644 --- a/esphome/components/mcp4461/mcp4461.cpp +++ b/esphome/components/mcp4461/mcp4461.cpp @@ -96,16 +96,16 @@ uint8_t Mcp4461Component::get_wiper_address_(uint8_t wiper) { } switch (wiper) { case 0: - addr = static_castMcp4461Addresses::MCP4461_VW0; + addr = static_cast Mcp4461Addresses::MCP4461_VW0; break; case 1: - addr = static_castMcp4461Addresses::MCP4461_VW1; + addr = static_cast Mcp4461Addresses::MCP4461_VW1; break; case 2: - addr = static_castMcp4461Addresses::MCP4461_VW2; + addr = static_cast Mcp4461Addresses::MCP4461_VW2; break; case 3: - addr = static_castMcp4461Addresses::MCP4461_VW3; + addr = static_cast Mcp4461Addresses::MCP4461_VW3; break; default: ESP_LOGE(TAG, "unknown wiper specified"); @@ -118,7 +118,7 @@ uint8_t Mcp4461Component::get_wiper_address_(uint8_t wiper) { } uint16_t Mcp4461Component::get_wiper_level(MCP4461WiperIdx wiper) { - uint8_t wiper_idx = static_castwiper; + uint8_t wiper_idx = static_cast wiper; return this->read_wiper_level_(wiper_idx); } @@ -126,7 +126,7 @@ uint16_t Mcp4461Component::read_wiper_level_(uint8_t wiper) { uint8_t reg = 0; uint16_t buf = 0; reg |= this->get_wiper_address_(wiper); - reg |= static_castMcp4461Commands::READ; + reg |= static_cast Mcp4461Commands::READ; if (wiper > 3) { while (this->is_writing_()) { ESP_LOGVV(TAG, "delaying during eeprom write"); @@ -142,7 +142,7 @@ uint16_t Mcp4461Component::read_wiper_level_(uint8_t wiper) { } void Mcp4461Component::update_wiper_level(MCP4461WiperIdx wiper) { - uint8_t wiper_idx = static_castwiper; + uint8_t wiper_idx = static_cast wiper; uint16_t data; data = this->get_wiper_level(wiper); ESP_LOGV(TAG, "Got value %" PRIu16 " from wiper %" PRIu8, data, wiper_idx); @@ -161,7 +161,7 @@ void Mcp4461Component::set_wiper_level(MCP4461WiperIdx wiper, uint16_t value) { } void Mcp4461Component::write_wiper_level_(uint8_t wiper, uint16_t value) { - uint8_t wiper_idx = static_castwiper; + uint8_t wiper_idx = static_cast wiper; bool nonvolatile = false; if (wiper_idx > 3) { nonvolatile = true; @@ -170,75 +170,75 @@ void Mcp4461Component::write_wiper_level_(uint8_t wiper, uint16_t value) { } void Mcp4461Component::enable_wiper(MCP4461WiperIdx wiper) { - uint8_t wiper_idx = static_castwiper; + uint8_t wiper_idx = static_cast wiper; ESP_LOGV(TAG, "Enabling wiper %" PRIu8, wiper_idx); this->reg_[wiper_idx].terminal_hw = true; this->update_ = true; } void Mcp4461Component::disable_wiper(MCP4461WiperIdx wiper) { - uint8_t wiper_idx = static_castwiper; + uint8_t wiper_idx = static_cast wiper; ESP_LOGV(TAG, "Disabling wiper %" PRIu8, wiper_idx); this->reg_[wiper_idx].terminal_hw = false; this->update_ = true; } void Mcp4461Component::increase_wiper(MCP4461WiperIdx wiper) { - uint8_t wiper_idx = static_castwiper; + uint8_t wiper_idx = static_cast wiper; ESP_LOGV(TAG, "Increasing wiper %" PRIu8 "", wiper_idx); uint8_t reg = 0; uint8_t addr; addr = this->get_wiper_address_(wiper_idx); reg |= addr; - reg |= static_castMcp4461Commands::INCREMENT; + reg |= static_cast Mcp4461Commands::INCREMENT; this->write(&this->address_, reg, sizeof(reg)); this->reg_[wiper_idx].state++; } void Mcp4461Component::decrease_wiper(MCP4461WiperIdx wiper) { - uint8_t wiper_idx = static_castwiper; + uint8_t wiper_idx = static_cast wiper; ESP_LOGV(TAG, "Decreasing wiper %" PRIu8 "", wiper_idx); uint8_t reg = 0; uint8_t addr; addr = this->get_wiper_address_(wiper_idx); reg |= addr; - reg |= static_castMcp4461Commands::DECREMENT; + reg |= static_cast Mcp4461Commands::DECREMENT; this->write(&this->address_, reg, sizeof(reg)); this->reg_[wiper_idx].state--; } uint8_t Mcp4461Component::calc_terminal_connector_byte_(Mcp4461TerminalIdx terminal_connector) { uint8_t i; - if ((static_castterminal_connector == 0 || static_castterminal_connector == 1)) { + if ((static_cast(terminal_connector) == 0 || static_cast(terminal_connector) == 1)) { i = 0; } else { i = 2; } uint8_t new_value_byte_array[8]; - new_value_byte_array[0] = static_castthis->reg_[i].terminal_b; - new_value_byte_array[1] = static_castthis->reg_[i].terminal_w; - new_value_byte_array[2] = static_castthis->reg_[i].terminal_a; - new_value_byte_array[3] = static_castthis->reg_[i].terminal_hw; - new_value_byte_array[4] = static_castthis->reg_[(i + 1)].terminal_b; - new_value_byte_array[5] = static_castthis->reg_[(i + 1)].terminal_w; - new_value_byte_array[6] = static_castthis->reg_[(i + 1)].terminal_a; - new_value_byte_array[7] = static_castthis->reg_[(i + 1)].terminal_hw; + new_value_byte_array[0] = static_cast this->reg_[i].terminal_b; + new_value_byte_array[1] = static_cast this->reg_[i].terminal_w; + new_value_byte_array[2] = static_cast this->reg_[i].terminal_a; + new_value_byte_array[3] = static_cast this->reg_[i].terminal_hw; + new_value_byte_array[4] = static_cast this->reg_[(i + 1)].terminal_b; + new_value_byte_array[5] = static_cast this->reg_[(i + 1)].terminal_w; + new_value_byte_array[6] = static_cast this->reg_[(i + 1)].terminal_a; + new_value_byte_array[7] = static_cast this->reg_[(i + 1)].terminal_hw; unsigned char new_value_byte = 0; uint8_t b; for (b = 0; b < 8; b++) { new_value_byte += (new_value_byte_array[b] << (7 - b)); } - return static_castnew_value_byte; + return static_cast(new_value_byte); } uint8_t Mcp4461Component::get_terminal_register(Mcp4461TerminalIdx terminal_connector) { uint8_t reg = 0; if (static_castterminal_connector == 0) { - reg |= static_castMcp4461Addresses::MCP4461_TCON0; + reg |= static_cast Mcp4461Addresses::MCP4461_TCON0; } else { - reg |= static_castMcp4461Addresses::MCP4461_TCON1; + reg |= static_cast Mcp4461Addresses::MCP4461_TCON1; } - reg |= static_castMcp4461Commands::READ; + reg |= static_cast Mcp4461Commands::READ; uint16_t buf; if (!this->read_byte_16(reg, &buf)) { this->status_set_warning(); @@ -249,7 +249,7 @@ uint8_t Mcp4461Component::get_terminal_register(Mcp4461TerminalIdx terminal_conn } void Mcp4461Component::update_terminal_register(Mcp4461TerminalIdx terminal_connector) { - if ((static_castterminal_connector != 0 && static_castterminal_connector != 1)) { + if ((static_cast(terminal_connector) != 0 && static_cast(terminal_connector) != 1)) { return; } uint8_t terminal_data; @@ -257,7 +257,7 @@ void Mcp4461Component::update_terminal_register(Mcp4461TerminalIdx terminal_conn if (terminal_data == 0) { return; } - ESP_LOGV(TAG, "Got terminal register %" PRIu8 " data %0xh", static_castterminal_connector, + ESP_LOGV(TAG, "Got terminal register %" PRIu8 " data %0xh", static_cast(terminal_connector), terminal_data); uint8_t wiper_index = 0; if (static_castterminal_connector == 1) { @@ -275,20 +275,20 @@ void Mcp4461Component::update_terminal_register(Mcp4461TerminalIdx terminal_conn void Mcp4461Component::set_terminal_register(Mcp4461TerminalIdx terminal_connector, uint8_t data) { uint8_t addr; - if (static_castterminal_connector == 0) { - addr = static_castMcp4461Addresses::MCP4461_TCON0; - } else if (static_castterminal_connector == 1) { - addr = static_castMcp4461Addresses::MCP4461_TCON1; + if (static_cast(terminal_connector) == 0) { + addr = static_cast Mcp4461Addresses::MCP4461_TCON0; + } else if (static_cast(terminal_connector) == 1) { + addr = static_cast Mcp4461Addresses::MCP4461_TCON1; } else { ESP_LOGW(TAG, "Invalid terminal connector id %" PRIu8 " specified", - static_castterminal_connector); + static_cast(terminal_connector)); return; } this->mcp4461_write_(addr, data); } void Mcp4461Component::enable_terminal(MCP4461WiperIdx wiper, char terminal) { - uint8_t wiper_idx = static_castwiper; + uint8_t wiper_idx = static_cast wiper; if (wiper_idx > 3) { return; } @@ -315,7 +315,7 @@ void Mcp4461Component::enable_terminal(MCP4461WiperIdx wiper, char terminal) { } void Mcp4461Component::disable_terminal(MCP4461WiperIdx wiper, char terminal) { - uint8_t wiper_idx = static_castwiper; + uint8_t wiper_idx = static_cast wiper; if (wiper_idx > 3) { return; } @@ -344,7 +344,7 @@ void Mcp4461Component::disable_terminal(MCP4461WiperIdx wiper, char terminal) { uint16_t Mcp4461Component::get_eeprom_value(MCP4461EEPRomLocation location) { uint8_t reg = 0; reg |= static_cast(MCP4461_EEPROM_1 + (static_castlocation * 0x10)); - reg |= static_castMcp4461Commands::READ; + reg |= static_cast Mcp4461Commands::READ; uint16_t buf; if (!this->read_byte_16(reg, &buf)) { this->status_set_warning(); @@ -362,7 +362,7 @@ void Mcp4461Component::set_eeprom_value(MCP4461EEPRomLocation location, uint16_t if (value > 256) { addr = 1; } - addr |= static_cast(MCP4461_EEPROM_1 + (static_castlocation * 0x10)); + addr |= static_cast(MCP4461_EEPROM_1 + (static_cast(location) * 0x10)); this->mcp4461_write_(addr, value, true); } @@ -375,7 +375,7 @@ void Mcp4461Component::mcp4461_write_(uint8_t addr, uint16_t data, bool nonvolat value_byte = static_cast(data & 0x00ff); ESP_LOGV(TAG, "Writing value %" PRIu16 " to address %" PRIu8 "", data, addr); reg |= addr; - reg |= static_castMcp4461Commands::WRITE; + reg |= static_cast Mcp4461Commands::WRITE; if (nonvolatile) { while (this->is_writing_()) { ESP_LOGV(TAG, "Waiting while eeprom busy");