Remove MAX17043 component and update to MAX17048 in configuration

.gitignore

@@ -22,8 +22,6 @@
 !blueprints/
 !esphome/
 !esphome/ha-remote/
-!esphome/ha-remote/components/
-!esphome/ha-remote/components/**
 !custom_components/
 # !packages/
 # !themes/

esphome/ha-remote-1.yaml

@@ -43,13 +43,6 @@ wifi:
 
 captive_portal:
 
-external_components:
-  - source:
-      type: local
-      path: ha-remote/components
-    components: [max17043]
-
-
 packages:
   base: !include ha-remote/ha-remote-1.base.yaml
   bindings: !include ha-remote/ha-remote-1.bindings.yaml

esphome/ha-remote/components/max17043/__init__.py

@@ -1 +0,0 @@
-CODEOWNERS = ["@blacknell"]

esphome/ha-remote/components/max17043/automation.h

@@ -1,20 +0,0 @@
-
-#pragma once
-#include "esphome/core/automation.h"
-#include "max17043.h"
-
-namespace esphome {
-namespace max17043 {
-
-template<typename... Ts> class SleepAction : public Action<Ts...> {
- public:
-  explicit SleepAction(MAX17043Component *max17043) : max17043_(max17043) {}
-
-  void play(Ts... x) override { this->max17043_->sleep_mode(); }
-
- protected:
-  MAX17043Component *max17043_;
-};
-
-}  // namespace max17043
-}  // namespace esphome

esphome/ha-remote/components/max17043/max17043.cpp

@@ -1,96 +0,0 @@
-#include "max17043.h"
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace max17043 {
-
-// MAX174043 is a 1-Cell Fuel Gauge with ModelGauge and Low-Battery Alert
-// Consult the datasheet at https://www.analog.com/en/products/max17043.html
-
-static const char *const TAG = "max17043";
-
-static const uint8_t MAX17043_VCELL = 0x02;
-static const uint8_t MAX17043_SOC = 0x04;
-static const uint8_t MAX17043_CONFIG = 0x0c;
-
-static const uint16_t MAX17043_CONFIG_POWER_UP_DEFAULT = 0x971C;
-static const uint16_t MAX17043_CONFIG_SAFE_MASK = 0xFF1F;  // mask out sleep bit (7), unused bit (6) and alert bit (4)
-static const uint16_t MAX17043_CONFIG_SLEEP_MASK = 0x0080;
-
-void MAX17043Component::update() {
-  uint16_t raw_voltage, raw_percent;
-
-  if (this->voltage_sensor_ != nullptr) {
-    if (!this->read_byte_16(MAX17043_VCELL, &raw_voltage)) {
-      this->status_set_warning("Unable to read MAX17043_VCELL");
-    } else {
-      float voltage = (1.25 * (float) (raw_voltage >> 4)) / 1000.0;
-      this->voltage_sensor_->publish_state(voltage);
-      this->status_clear_warning();
-    }
-  }
-  if (this->battery_remaining_sensor_ != nullptr) {
-    if (!this->read_byte_16(MAX17043_SOC, &raw_percent)) {
-      this->status_set_warning("Unable to read MAX17043_SOC");
-    } else {
-      float percent = (float) ((raw_percent >> 8) + 0.003906f * (raw_percent & 0x00ff));
-      this->battery_remaining_sensor_->publish_state(percent);
-      this->status_clear_warning();
-    }
-  }
-}
-
-void MAX17043Component::setup() {
-  ESP_LOGCONFIG(TAG, "Setting up MAX17043...");
-
-  uint16_t config_reg;
-  if (this->write(&MAX17043_CONFIG, 1) != i2c::ERROR_OK) {
-    this->status_set_warning();
-    return;
-  }
-
-  if (this->read(reinterpret_cast<uint8_t *>(&config_reg), 2) != i2c::ERROR_OK) {
-    this->status_set_warning();
-    return;
-  }
-
-  config_reg = i2c::i2ctohs(config_reg) & MAX17043_CONFIG_SAFE_MASK;
-  ESP_LOGV(TAG, "MAX17043 CONFIG register reads 0x%X", config_reg);
-
-  if (config_reg != MAX17043_CONFIG_POWER_UP_DEFAULT) {
-    ESP_LOGW(TAG, "Non-standard CONFIG register 0x%X at 0x36; continuing in compatible mode", config_reg);
-    return;
-  }
-
-  // need to write back to config register to reset the sleep bit
-  if (!this->write_byte_16(MAX17043_CONFIG, MAX17043_CONFIG_POWER_UP_DEFAULT)) {
-    this->status_set_error("sleep reset failed");
-    this->mark_failed();
-    return;
-  }
-}
-
-void MAX17043Component::dump_config() {
-  ESP_LOGCONFIG(TAG, "MAX17043:");
-  LOG_I2C_DEVICE(this);
-  if (this->is_failed()) {
-    ESP_LOGE(TAG, "Communication with MAX17043 failed");
-  }
-  LOG_UPDATE_INTERVAL(this);
-  LOG_SENSOR("  ", "Battery Voltage", this->voltage_sensor_);
-  LOG_SENSOR("  ", "Battery Level", this->battery_remaining_sensor_);
-}
-
-float MAX17043Component::get_setup_priority() const { return setup_priority::DATA; }
-
-void MAX17043Component::sleep_mode() {
-  if (!this->is_failed()) {
-    if (!this->write_byte_16(MAX17043_CONFIG, MAX17043_CONFIG_POWER_UP_DEFAULT | MAX17043_CONFIG_SLEEP_MASK)) {
-      ESP_LOGW(TAG, "Unable to write the sleep bit to config register");
-      this->status_set_warning();
-    }
-  }
-}
-
-}  // namespace max17043
-}  // namespace esphome

esphome/ha-remote/components/max17043/max17043.h

@@ -1,29 +0,0 @@
-#pragma once
-
-#include "esphome/core/component.h"
-#include "esphome/components/sensor/sensor.h"
-#include "esphome/components/i2c/i2c.h"
-
-namespace esphome {
-namespace max17043 {
-
-class MAX17043Component : public PollingComponent, public i2c::I2CDevice {
- public:
-  void setup() override;
-  void dump_config() override;
-  float get_setup_priority() const override;
-  void update() override;
-  void sleep_mode();
-
-  void set_voltage_sensor(sensor::Sensor *voltage_sensor) { voltage_sensor_ = voltage_sensor; }
-  void set_battery_remaining_sensor(sensor::Sensor *battery_remaining_sensor) {
-    battery_remaining_sensor_ = battery_remaining_sensor;
-  }
-
- protected:
-  sensor::Sensor *voltage_sensor_{nullptr};
-  sensor::Sensor *battery_remaining_sensor_{nullptr};
-};
-
-}  // namespace max17043
-}  // namespace esphome

esphome/ha-remote/components/max17043/sensor.py

@@ -1,77 +0,0 @@
-from esphome import automation
-from esphome.automation import maybe_simple_id
-import esphome.codegen as cg
-from esphome.components import i2c, sensor
-import esphome.config_validation as cv
-from esphome.const import (
-    CONF_BATTERY_LEVEL,
-    CONF_BATTERY_VOLTAGE,
-    CONF_ID,
-    DEVICE_CLASS_BATTERY,
-    DEVICE_CLASS_VOLTAGE,
-    ENTITY_CATEGORY_DIAGNOSTIC,
-    STATE_CLASS_MEASUREMENT,
-    UNIT_PERCENT,
-    UNIT_VOLT,
-)
-
-DEPENDENCIES = ["i2c"]
-
-max17043_ns = cg.esphome_ns.namespace("max17043")
-MAX17043Component = max17043_ns.class_(
-    "MAX17043Component", cg.PollingComponent, i2c.I2CDevice
-)
-
-# Actions
-SleepAction = max17043_ns.class_("SleepAction", automation.Action)
-
-CONFIG_SCHEMA = (
-    cv.Schema(
-        {
-            cv.GenerateID(): cv.declare_id(MAX17043Component),
-            cv.Optional(CONF_BATTERY_VOLTAGE): sensor.sensor_schema(
-                unit_of_measurement=UNIT_VOLT,
-                accuracy_decimals=3,
-                device_class=DEVICE_CLASS_VOLTAGE,
-                state_class=STATE_CLASS_MEASUREMENT,
-                entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
-            ),
-            cv.Optional(CONF_BATTERY_LEVEL): sensor.sensor_schema(
-                unit_of_measurement=UNIT_PERCENT,
-                accuracy_decimals=3,
-                device_class=DEVICE_CLASS_BATTERY,
-                state_class=STATE_CLASS_MEASUREMENT,
-                entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
-            ),
-        }
-    )
-    .extend(cv.polling_component_schema("60s"))
-    .extend(i2c.i2c_device_schema(0x36))
-)
-
-
-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)
-
-    if voltage_config := config.get(CONF_BATTERY_VOLTAGE):
-        sens = await sensor.new_sensor(voltage_config)
-        cg.add(var.set_voltage_sensor(sens))
-
-    if CONF_BATTERY_LEVEL in config:
-        sens = await sensor.new_sensor(config[CONF_BATTERY_LEVEL])
-        cg.add(var.set_battery_remaining_sensor(sens))
-
-
-MAX17043_ACTION_SCHEMA = maybe_simple_id(
-    {
-        cv.Required(CONF_ID): cv.use_id(MAX17043Component),
-    }
-)
-
-
-@automation.register_action("max17043.sleep_mode", SleepAction, MAX17043_ACTION_SCHEMA)
-async def max17043_sleep_mode_to_code(config, action_id, template_arg, args):
-    paren = await cg.get_variable(config[CONF_ID])
-    return cg.new_Pvariable(action_id, template_arg, paren)

esphome/ha-remote/ha-remote-1.base.yaml

@@ -50,14 +50,6 @@ globals:
     type: uint32_t
     restore_value: no
     initial_value: '0'
-  - id: last_battery_level_pct
-    type: float
-    restore_value: no
-    initial_value: '-1.0'
-  - id: battery_charging_inferred
-    type: bool
-    restore_value: no
-    initial_value: 'false'
 
 interval:
   - interval: 1s
@@ -139,9 +131,9 @@ font:
 # Note: On ESP32-S3-Touch-LCD-7, GPIO14 is used by the RGB display bus,
 # so it cannot be reused as ADC for battery telemetry in this display mode.
 
-# --- Battery fuel gauge (Adafruit MAX17048 via MAX17043-compatible driver) ---
+# --- Battery fuel gauge (Adafruit MAX17048) ---
 sensor:
-  - platform: max17043
+  - platform: max17048
     id: max17048_battery
     i2c_id: i2c_main
     update_interval: 120s
@@ -168,49 +160,3 @@ sensor:
           - lambda: |-
               const float pct = x;
               ESP_LOGI("battery", "Level: %.0f%%", pct);
-              const bool valid = pct >= 0.0f && pct <= 100.0f;
-
-              // Infer charging from SOC trend when no dedicated charge-detect pin exists.
-              if (valid) {
-                  if (id(last_battery_level_pct) >= 0.0f) {
-                      if (pct > id(last_battery_level_pct) + 0.2f) {
-                          id(battery_charging_inferred) = true;
-                      } else if (pct < id(last_battery_level_pct) - 0.2f) {
-                          id(battery_charging_inferred) = false;
-                      }
-                  }
-                  id(last_battery_level_pct) = pct;
-              }
-
-              const char *icon = "\U000F0091";  // mdi:battery-unknown
-              if (!valid) {
-                  icon = "\U000F0091";  // mdi:battery-unknown
-              } else if (pct >= 99.0f) {
-                  icon = "\U000F0079";  // mdi:battery (full)
-              } else if (id(battery_charging_inferred)) {
-                  if (pct < 40.0f) {
-                      icon = "\U000F12A4";  // mdi:battery-charging-low
-                  } else if (pct < 80.0f) {
-                      icon = "\U000F12A5";  // mdi:battery-charging-medium
-                  } else {
-                      icon = "\U000F12A6";  // mdi:battery-charging-high
-                  }
-              } else {
-                  if (pct < 15.0f) {
-                      icon = "\U000F10CD";  // mdi:battery-alert-variant-outline
-                  } else if (pct < 40.0f) {
-                      icon = "\U000F12A1";  // mdi:battery-low
-                  } else if (pct < 80.0f) {
-                      icon = "\U000F12A2";  // mdi:battery-medium
-                  } else {
-                      icon = "\U000F12A3";  // mdi:battery-high
-                  }
-              }
-
-              lv_label_set_text(id(nav_battery_icon_home), icon);
-              lv_label_set_text(id(nav_battery_icon_living_room), icon);
-              lv_label_set_text(id(nav_battery_icon_kitchen), icon);
-              lv_label_set_text(id(nav_battery_icon_upstairs), icon);
-              lv_label_set_text(id(nav_battery_icon_office), icon);
-              lv_label_set_text(id(nav_battery_icon_garage), icon);
-              lv_label_set_text(id(nav_battery_icon_outside), icon);