esphome 2025.8.4__py3-none-any.whl → 2025.9.0__py3-none-any.whl

esphome/components/light/light_state.h

@@ -164,6 +164,44 @@ class LightState : public EntityBase, public Component {
   /// Add effects for this light state.
   void add_effects(const std::vector<LightEffect *> &effects);
 
+  /// Get the total number of effects available for this light.
+  size_t get_effect_count() const { return this->effects_.size(); }
+
+  /// Get the currently active effect index (0 = no effect, 1+ = effect index).
+  uint32_t get_current_effect_index() const { return this->active_effect_index_; }
+
+  /// Get effect index by name. Returns 0 if effect not found.
+  uint32_t get_effect_index(const std::string &effect_name) const {
+    if (strcasecmp(effect_name.c_str(), "none") == 0) {
+      return 0;
+    }
+    for (size_t i = 0; i < this->effects_.size(); i++) {
+      if (strcasecmp(effect_name.c_str(), this->effects_[i]->get_name().c_str()) == 0) {
+        return i + 1;  // Effects are 1-indexed in active_effect_index_
+      }
+    }
+    return 0;  // Effect not found
+  }
+
+  /// Get effect by index. Returns nullptr if index is invalid.
+  LightEffect *get_effect_by_index(uint32_t index) const {
+    if (index == 0 || index > this->effects_.size()) {
+      return nullptr;
+    }
+    return this->effects_[index - 1];  // Effects are 1-indexed in active_effect_index_
+  }
+
+  /// Get effect name by index. Returns "None" for index 0, empty string for invalid index.
+  std::string get_effect_name_by_index(uint32_t index) const {
+    if (index == 0) {
+      return "None";
+    }
+    if (index > this->effects_.size()) {
+      return "";  // Invalid index
+    }
+    return this->effects_[index - 1]->get_name();
+  }
+
   /// The result of all the current_values_as_* methods have gamma correction applied.
   void current_values_as_binary(bool *binary);
 

esphome/components/lock/__init__.py

@@ -13,7 +13,7 @@ from esphome.const import (
     CONF_TRIGGER_ID,
     CONF_WEB_SERVER,
 )
-from esphome.core import CORE, coroutine_with_priority
+from esphome.core import CORE, CoroPriority, coroutine_with_priority
 from esphome.core.entity_helpers import entity_duplicate_validator, setup_entity
 from esphome.cpp_generator import MockObjClass
 
@@ -155,6 +155,6 @@ async def lock_is_off_to_code(config, condition_id, template_arg, args):
     return cg.new_Pvariable(condition_id, template_arg, paren, False)
 
 
-@coroutine_with_priority(100.0)
+@coroutine_with_priority(CoroPriority.CORE)
 async def to_code(config):
     cg.add_global(lock_ns.using)

esphome/components/lock/lock.h

@@ -15,8 +15,8 @@ class Lock;
 #define LOG_LOCK(prefix, type, obj) \
   if ((obj) != nullptr) { \
     ESP_LOGCONFIG(TAG, "%s%s '%s'", prefix, LOG_STR_LITERAL(type), (obj)->get_name().c_str()); \
-    if (!(obj)->get_icon().empty()) { \
-      ESP_LOGCONFIG(TAG, "%s  Icon: '%s'", prefix, (obj)->get_icon().c_str()); \
+    if (!(obj)->get_icon_ref().empty()) { \
+      ESP_LOGCONFIG(TAG, "%s  Icon: '%s'", prefix, (obj)->get_icon_ref().c_str()); \
     } \
     if ((obj)->traits.get_assumed_state()) { \
       ESP_LOGCONFIG(TAG, "%s  Assumed State: YES", prefix); \

esphome/components/logger/__init__.py

@@ -51,7 +51,7 @@ from esphome.const import (
     PLATFORM_RTL87XX,
     PlatformFramework,
 )
-from esphome.core import CORE, Lambda, coroutine_with_priority
+from esphome.core import CORE, CoroPriority, Lambda, coroutine_with_priority
 
 CODEOWNERS = ["@esphome/core"]
 logger_ns = cg.esphome_ns.namespace("logger")
@@ -275,7 +275,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-@coroutine_with_priority(90.0)
+@coroutine_with_priority(CoroPriority.DIAGNOSTICS)
 async def to_code(config):
     baud_rate = config[CONF_BAUD_RATE]
     level = config[CONF_LEVEL]

esphome/components/logger/logger.cpp

@@ -246,19 +246,40 @@ void Logger::add_on_log_callback(std::function<void(uint8_t, const char *, const
   this->log_callback_.add(std::move(callback));
 }
 float Logger::get_setup_priority() const { return setup_priority::BUS + 500.0f; }
+
+#ifdef USE_STORE_LOG_STR_IN_FLASH
+// ESP8266: PSTR() cannot be used in array initializers, so we need to declare
+// each string separately as a global constant first
+static const char LOG_LEVEL_NONE[] PROGMEM = "NONE";
+static const char LOG_LEVEL_ERROR[] PROGMEM = "ERROR";
+static const char LOG_LEVEL_WARN[] PROGMEM = "WARN";
+static const char LOG_LEVEL_INFO[] PROGMEM = "INFO";
+static const char LOG_LEVEL_CONFIG[] PROGMEM = "CONFIG";
+static const char LOG_LEVEL_DEBUG[] PROGMEM = "DEBUG";
+static const char LOG_LEVEL_VERBOSE[] PROGMEM = "VERBOSE";
+static const char LOG_LEVEL_VERY_VERBOSE[] PROGMEM = "VERY_VERBOSE";
+
+static const LogString *const LOG_LEVELS[] = {
+    reinterpret_cast<const LogString *>(LOG_LEVEL_NONE),    reinterpret_cast<const LogString *>(LOG_LEVEL_ERROR),
+    reinterpret_cast<const LogString *>(LOG_LEVEL_WARN),    reinterpret_cast<const LogString *>(LOG_LEVEL_INFO),
+    reinterpret_cast<const LogString *>(LOG_LEVEL_CONFIG),  reinterpret_cast<const LogString *>(LOG_LEVEL_DEBUG),
+    reinterpret_cast<const LogString *>(LOG_LEVEL_VERBOSE), reinterpret_cast<const LogString *>(LOG_LEVEL_VERY_VERBOSE),
+};
+#else
 static const char *const LOG_LEVELS[] = {"NONE", "ERROR", "WARN", "INFO", "CONFIG", "DEBUG", "VERBOSE", "VERY_VERBOSE"};
+#endif
 
 void Logger::dump_config() {
   ESP_LOGCONFIG(TAG,
                 "Logger:\n"
                 "  Max Level: %s\n"
                 "  Initial Level: %s",
-                LOG_LEVELS[ESPHOME_LOG_LEVEL], LOG_LEVELS[this->current_level_]);
+                LOG_STR_ARG(LOG_LEVELS[ESPHOME_LOG_LEVEL]), LOG_STR_ARG(LOG_LEVELS[this->current_level_]));
 #ifndef USE_HOST
   ESP_LOGCONFIG(TAG,
                 "  Log Baud Rate: %" PRIu32 "\n"
                 "  Hardware UART: %s",
-                this->baud_rate_, get_uart_selection_());
+                this->baud_rate_, LOG_STR_ARG(get_uart_selection_()));
 #endif
 #ifdef USE_ESPHOME_TASK_LOG_BUFFER
   if (this->log_buffer_) {
@@ -267,14 +288,14 @@ void Logger::dump_config() {
 #endif
 
   for (auto &it : this->log_levels_) {
-    ESP_LOGCONFIG(TAG, "  Level for '%s': %s", it.first.c_str(), LOG_LEVELS[it.second]);
+    ESP_LOGCONFIG(TAG, "  Level for '%s': %s", it.first.c_str(), LOG_STR_ARG(LOG_LEVELS[it.second]));
   }
 }
 
 void Logger::set_log_level(uint8_t level) {
   if (level > ESPHOME_LOG_LEVEL) {
     level = ESPHOME_LOG_LEVEL;
-    ESP_LOGW(TAG, "Cannot set log level higher than pre-compiled %s", LOG_LEVELS[ESPHOME_LOG_LEVEL]);
+    ESP_LOGW(TAG, "Cannot set log level higher than pre-compiled %s", LOG_STR_ARG(LOG_LEVELS[ESPHOME_LOG_LEVEL]));
   }
   this->current_level_ = level;
   this->level_callback_.call(level);

esphome/components/logger/logger.h

@@ -226,7 +226,7 @@ class Logger : public Component {
   }
 
 #ifndef USE_HOST
-  const char *get_uart_selection_();
+  const LogString *get_uart_selection_();
 #endif
 
   // Group 4-byte aligned members first

esphome/components/logger/logger_esp32.cpp

@@ -190,20 +190,28 @@ void HOT Logger::write_msg_(const char *msg) {
 void HOT Logger::write_msg_(const char *msg) { this->hw_serial_->println(msg); }
 #endif
 
-const char *const UART_SELECTIONS[] = {
-    "UART0",           "UART1",
+const LogString *Logger::get_uart_selection_() {
+  switch (this->uart_) {
+    case UART_SELECTION_UART0:
+      return LOG_STR("UART0");
+    case UART_SELECTION_UART1:
+      return LOG_STR("UART1");
 #ifdef USE_ESP32_VARIANT_ESP32
-    "UART2",
+    case UART_SELECTION_UART2:
+      return LOG_STR("UART2");
 #endif
 #ifdef USE_LOGGER_USB_CDC
-    "USB_CDC",
+    case UART_SELECTION_USB_CDC:
+      return LOG_STR("USB_CDC");
 #endif
 #ifdef USE_LOGGER_USB_SERIAL_JTAG
-    "USB_SERIAL_JTAG",
+    case UART_SELECTION_USB_SERIAL_JTAG:
+      return LOG_STR("USB_SERIAL_JTAG");
 #endif
-};
-
-const char *Logger::get_uart_selection_() { return UART_SELECTIONS[this->uart_]; }
+    default:
+      return LOG_STR("UNKNOWN");
+  }
+}
 
 }  // namespace esphome::logger
 #endif

esphome/components/logger/logger_esp8266.cpp

@@ -35,9 +35,17 @@ void Logger::pre_setup() {
 
 void HOT Logger::write_msg_(const char *msg) { this->hw_serial_->println(msg); }
 
-const char *const UART_SELECTIONS[] = {"UART0", "UART1", "UART0_SWAP"};
-
-const char *Logger::get_uart_selection_() { return UART_SELECTIONS[this->uart_]; }
+const LogString *Logger::get_uart_selection_() {
+  switch (this->uart_) {
+    case UART_SELECTION_UART0:
+      return LOG_STR("UART0");
+    case UART_SELECTION_UART1:
+      return LOG_STR("UART1");
+    case UART_SELECTION_UART0_SWAP:
+    default:
+      return LOG_STR("UART0_SWAP");
+  }
+}
 
 }  // namespace esphome::logger
 #endif

esphome/components/logger/logger_libretiny.cpp

@@ -51,9 +51,19 @@ void Logger::pre_setup() {
 
 void HOT Logger::write_msg_(const char *msg) { this->hw_serial_->println(msg); }
 
-const char *const UART_SELECTIONS[] = {"DEFAULT", "UART0", "UART1", "UART2"};
-
-const char *Logger::get_uart_selection_() { return UART_SELECTIONS[this->uart_]; }
+const LogString *Logger::get_uart_selection_() {
+  switch (this->uart_) {
+    case UART_SELECTION_DEFAULT:
+      return LOG_STR("DEFAULT");
+    case UART_SELECTION_UART0:
+      return LOG_STR("UART0");
+    case UART_SELECTION_UART1:
+      return LOG_STR("UART1");
+    case UART_SELECTION_UART2:
+    default:
+      return LOG_STR("UART2");
+  }
+}
 
 }  // namespace esphome::logger
 

esphome/components/logger/logger_rp2040.cpp

@@ -29,9 +29,20 @@ void Logger::pre_setup() {
 
 void HOT Logger::write_msg_(const char *msg) { this->hw_serial_->println(msg); }
 
-const char *const UART_SELECTIONS[] = {"UART0", "UART1", "USB_CDC"};
-
-const char *Logger::get_uart_selection_() { return UART_SELECTIONS[this->uart_]; }
+const LogString *Logger::get_uart_selection_() {
+  switch (this->uart_) {
+    case UART_SELECTION_UART0:
+      return LOG_STR("UART0");
+    case UART_SELECTION_UART1:
+      return LOG_STR("UART1");
+#ifdef USE_LOGGER_USB_CDC
+    case UART_SELECTION_USB_CDC:
+      return LOG_STR("USB_CDC");
+#endif
+    default:
+      return LOG_STR("UNKNOWN");
+  }
+}
 
 }  // namespace esphome::logger
 #endif  // USE_RP2040

esphome/components/logger/logger_zephyr.cpp

@@ -54,7 +54,7 @@ void Logger::pre_setup() {
 #endif
     }
     if (!device_is_ready(uart_dev)) {
-      ESP_LOGE(TAG, "%s is not ready.", get_uart_selection_());
+      ESP_LOGE(TAG, "%s is not ready.", LOG_STR_ARG(get_uart_selection_()));
     } else {
       this->uart_dev_ = uart_dev;
     }
@@ -77,9 +77,20 @@ void HOT Logger::write_msg_(const char *msg) {
   uart_poll_out(this->uart_dev_, '\n');
 }
 
-const char *const UART_SELECTIONS[] = {"UART0", "UART1", "USB_CDC"};
-
-const char *Logger::get_uart_selection_() { return UART_SELECTIONS[this->uart_]; }
+const LogString *Logger::get_uart_selection_() {
+  switch (this->uart_) {
+    case UART_SELECTION_UART0:
+      return LOG_STR("UART0");
+    case UART_SELECTION_UART1:
+      return LOG_STR("UART1");
+#ifdef USE_LOGGER_USB_CDC
+    case UART_SELECTION_USB_CDC:
+      return LOG_STR("USB_CDC");
+#endif
+    default:
+      return LOG_STR("UNKNOWN");
+  }
+}
 
 }  // namespace esphome::logger
 

esphome/components/lvgl/defines.py

@@ -451,6 +451,7 @@ CONF_GRID_ROWS = "grid_rows"
 CONF_HEADER_MODE = "header_mode"
 CONF_HOME = "home"
 CONF_INITIAL_FOCUS = "initial_focus"
+CONF_SELECTED_DIGIT = "selected_digit"
 CONF_KEY_CODE = "key_code"
 CONF_KEYPADS = "keypads"
 CONF_LAYOUT = "layout"

esphome/components/lvgl/hello_world.py

@@ -4,49 +4,112 @@ from esphome.yaml_util import parse_yaml
 
 CONFIG = """
 - obj:
-    radius: 0
+    id: hello_world_card_
     pad_all: 12
-    bg_color: 0xFFFFFF
+    bg_color: white
     height: 100%
     width: 100%
+    scrollable: false
     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!"
+    - obj:
+        align: top_mid
+        outline_width: 0
+        border_width: 0
+        pad_all: 4
+        scrollable: false
+        height: size_content
+        width: 100%
+        layout:
+            type: flex
+            flex_flow: row
+            flex_align_cross: center
+            flex_align_track: start
+            flex_align_main: space_between
+        widgets:
+        - button:
+            checkable: true
+            radius: 4
+            text_font: montserrat_20
+            on_click:
+              lvgl.label.update:
+                id: hello_world_label_
+                text: "Clicked!"
+            widgets:
+              - label:
+                  text: "Button"
+        - label:
+            id: hello_world_title_
+            text: ESPHome
+            text_font: montserrat_20
+            width: 100%
+            text_align: center
+            on_boot:
+                lvgl.widget.refresh: hello_world_title_
+            hidden: !lambda |-
+                return lv_obj_get_width(lv_scr_act()) < 400;
+        - checkbox:
+            text: Checkbox
+            id: hello_world_checkbox_
+            on_boot:
+                lvgl.widget.refresh: hello_world_checkbox_
+            hidden: !lambda |-
+                return lv_obj_get_width(lv_scr_act()) < 240;
+            on_click:
+              lvgl.label.update:
+                id: hello_world_label_
+                text: "Checked!"
+    - obj:
+        id: hello_world_container_
         align: center
+        y: 14
+        pad_all: 0
+        outline_width: 0
+        border_width: 0
+        width: 100%
+        height: size_content
+        scrollable: false
         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!"
+        layout:
+            type: flex
+            flex_flow: row_wrap
+            flex_align_cross: center
+            flex_align_track: center
+            flex_align_main: space_evenly
         widgets:
-          - label:
-              text: "Button"
+            - spinner:
+                id: hello_world_spinner_
+                indicator:
+                  arc_color: tomato
+                height: 100
+                width: 100
+                spin_time: 2s
+                arc_length: 60deg
+                widgets:
+                    - label:
+                        id: hello_world_label_
+                        text: "Hello World!"
+                        align: center
+            - obj:
+                id: hello_world_qrcode_
+                outline_width: 0
+                border_width: 0
+                hidden: !lambda |-
+                    return lv_obj_get_width(lv_scr_act()) < 300 && lv_obj_get_height(lv_scr_act()) < 400;
+                widgets:
+                - label:
+                    text_font: montserrat_14
+                    text: esphome.io
+                    align: top_mid
+                - qrcode:
+                    text: "https://esphome.io"
+                    size: 80
+                    align: bottom_mid
+                    on_boot:
+                        lvgl.widget.refresh: hello_world_qrcode_
+
     - slider:
         width: 80%
         align: bottom_mid

esphome/components/lvgl/number/lvgl_number.h

@@ -21,7 +21,7 @@ class LVGLNumber : public number::Number, public Component {
   void setup() override {
     float value = this->value_lambda_();
     if (this->restore_) {
-      this->pref_ = global_preferences->make_preference<float>(this->get_object_id_hash());
+      this->pref_ = global_preferences->make_preference<float>(this->get_preference_hash());
       if (this->pref_.load(&value)) {
         this->control_lambda_(value);
       }

esphome/components/lvgl/select/lvgl_select.h

@@ -20,7 +20,7 @@ class LVGLSelect : public select::Select, public Component {
     this->set_options_();
     if (this->restore_) {
       size_t index;
-      this->pref_ = global_preferences->make_preference<size_t>(this->get_object_id_hash());
+      this->pref_ = global_preferences->make_preference<size_t>(this->get_preference_hash());
       if (this->pref_.load(&index))
         this->widget_->set_selected_index(index, LV_ANIM_OFF);
     }

esphome/components/lvgl/widgets/__init__.py

@@ -67,7 +67,6 @@ class Widget:
         self.type = wtype
         self.config = config
         self.scale = 1.0
-        self.step = 1.0
         self.range_from = -sys.maxsize
         self.range_to = sys.maxsize
         if wtype.is_compound():

esphome/components/lvgl/widgets/spinbox.py

@@ -11,6 +11,7 @@ from ..defines import (
     CONF_ROLLOVER,
     CONF_SCROLLBAR,
     CONF_SELECTED,
+    CONF_SELECTED_DIGIT,
     CONF_TEXTAREA_PLACEHOLDER,
 )
 from ..lv_validation import lv_bool, lv_float
@@ -38,18 +39,24 @@ def validate_spinbox(config):
     min_val = -1 - max_val
     range_from = int(config[CONF_RANGE_FROM])
     range_to = int(config[CONF_RANGE_TO])
-    step = int(config[CONF_STEP])
+    step = config[CONF_SELECTED_DIGIT]
+    digits = config[CONF_DIGITS]
     if (
         range_from > max_val
         or range_from < min_val
         or range_to > max_val
         or range_to < min_val
     ):
-        raise cv.Invalid("Range outside allowed limits")
-    if step <= 0 or step >= (range_to - range_from) / 2:
-        raise cv.Invalid("Invalid step value")
-    if config[CONF_DIGITS] <= config[CONF_DECIMAL_PLACES]:
-        raise cv.Invalid("Number of digits must exceed number of decimal places")
+        raise cv.Invalid("Range outside allowed limits", path=[CONF_RANGE_FROM])
+    if digits <= config[CONF_DECIMAL_PLACES]:
+        raise cv.Invalid(
+            "Number of digits must exceed number of decimal places", path=[CONF_DIGITS]
+        )
+    if step >= digits:
+        raise cv.Invalid(
+            "Initial selected digit must be less than number of digits",
+            path=[CONF_SELECTED_DIGIT],
+        )
     return config
 
 
@@ -59,7 +66,10 @@ SPINBOX_SCHEMA = cv.Schema(
         cv.Optional(CONF_RANGE_FROM, default=0): cv.float_,
         cv.Optional(CONF_RANGE_TO, default=100): cv.float_,
         cv.Optional(CONF_DIGITS, default=4): cv.int_range(1, 10),
-        cv.Optional(CONF_STEP, default=1.0): cv.positive_float,
+        cv.Optional(CONF_STEP): cv.invalid(
+            f"{CONF_STEP} has been replaced by {CONF_SELECTED_DIGIT}"
+        ),
+        cv.Optional(CONF_SELECTED_DIGIT, default=0): cv.positive_int,
         cv.Optional(CONF_DECIMAL_PLACES, default=0): cv.int_range(0, 6),
         cv.Optional(CONF_ROLLOVER, default=False): lv_bool,
     }
@@ -93,13 +103,12 @@ class SpinboxType(WidgetType):
             scale = 10 ** config[CONF_DECIMAL_PLACES]
             range_from = int(config[CONF_RANGE_FROM]) * scale
             range_to = int(config[CONF_RANGE_TO]) * scale
-            step = int(config[CONF_STEP]) * scale
+            step = config[CONF_SELECTED_DIGIT]
             w.scale = scale
-            w.step = step
             w.range_to = range_to
             w.range_from = range_from
             lv.spinbox_set_range(w.obj, range_from, range_to)
-            await w.set_property(CONF_STEP, step)
+            await w.set_property("step", 10**step)
             await w.set_property(CONF_ROLLOVER, config)
             lv.spinbox_set_digit_format(
                 w.obj, digits, digits - config[CONF_DECIMAL_PLACES]
@@ -120,7 +129,7 @@ class SpinboxType(WidgetType):
         return config[CONF_RANGE_FROM]
 
     def get_step(self, config: dict):
-        return config[CONF_STEP]
+        return 10 ** config[CONF_SELECTED_DIGIT]
 
 
 spinbox_spec = SpinboxType()

esphome/components/m5stack_8angle/binary_sensor/m5stack_8angle_binary_sensor.cpp

@@ -6,7 +6,7 @@ namespace m5stack_8angle {
 void M5Stack8AngleSwitchBinarySensor::update() {
   int8_t out = this->parent_->read_switch();
   if (out == -1) {
-    this->status_set_warning("Could not read binary sensor state from M5Stack 8Angle.");
+    this->status_set_warning(LOG_STR("Could not read binary sensor state from M5Stack 8Angle."));
     return;
   }
   this->publish_state(out != 0);

esphome/components/m5stack_8angle/sensor/m5stack_8angle_sensor.cpp

@@ -7,7 +7,7 @@ void M5Stack8AngleKnobSensor::update() {
   if (this->parent_ != nullptr) {
     int32_t raw_pos = this->parent_->read_knob_pos_raw(this->channel_, this->bits_);
     if (raw_pos == -1) {
-      this->status_set_warning("Could not read knob position from M5Stack 8Angle.");
+      this->status_set_warning(LOG_STR("Could not read knob position from M5Stack 8Angle."));
       return;
     }
     if (this->raw_) {

esphome/components/mapping/__init__.py

@@ -10,7 +10,8 @@ from esphome.loader import get_component
 CODEOWNERS = ["@clydebarrow"]
 MULTI_CONF = True
 
-map_ = cg.std_ns.class_("map")
+mapping_ns = cg.esphome_ns.namespace("mapping")
+mapping_class = mapping_ns.class_("Mapping")
 
 CONF_ENTRIES = "entries"
 CONF_CLASS = "class"
@@ -29,7 +30,11 @@ class IndexType:
 
 INDEX_TYPES = {
     "int": IndexType(cv.int_, cg.int_, int),
-    "string": IndexType(cv.string, cg.std_string, str),
+    "string": IndexType(
+        cv.string,
+        cg.std_string,
+        str,
+    ),
 }
 
 
@@ -47,7 +52,7 @@ def to_schema(value):
 
 BASE_SCHEMA = cv.Schema(
     {
-        cv.Required(CONF_ID): cv.declare_id(map_),
+        cv.Required(CONF_ID): cv.declare_id(mapping_class),
         cv.Required(CONF_FROM): cv.one_of(*INDEX_TYPES, lower=True),
         cv.Required(CONF_TO): cv.string,
     },
@@ -123,12 +128,15 @@ async def to_code(config):
         if list(entries.values())[0].op != ".":
             value_type = value_type.operator("ptr")
     varid = config[CONF_ID]
-    varid.type = map_.template(index_type, value_type)
+    varid.type = mapping_class.template(
+        index_type,
+        value_type,
+    )
     var = MockObj(varid, ".")
     decl = VariableDeclarationExpression(varid.type, "", varid)
     add_global(decl)
     CORE.register_variable(varid, var)
 
     for key, value in entries.items():
-        cg.add(var.insert((key, value)))
+        cg.add(var.set(key, value))
     return var