From 6c92e284c7ad1317fe963fd09a42071cdda6f8cd Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Fri, 20 Feb 2026 23:35:40 -0600 Subject: [PATCH] tweaks --- esphome/components/esp32/core.cpp | 1 - esphome/components/esp8266/core.cpp | 3 --- esphome/components/host/core.cpp | 1 - esphome/components/libretiny/core.cpp | 1 - esphome/components/rp2040/core.cpp | 3 --- esphome/components/zephyr/core.cpp | 1 - esphome/core/hal.h | 1 - 7 files changed, 11 deletions(-) diff --git a/esphome/components/esp32/core.cpp b/esphome/components/esp32/core.cpp index f399cf8172..9105b74c5d 100644 --- a/esphome/components/esp32/core.cpp +++ b/esphome/components/esp32/core.cpp @@ -47,7 +47,6 @@ void arch_init() { void HOT arch_feed_wdt() { esp_task_wdt_reset(); } uint8_t progmem_read_byte(const uint8_t *addr) { return *addr; } -uint16_t progmem_read_word(const uint16_t *addr) { return *addr; } const char *progmem_read_ptr(const char *const *addr) { return *addr; } uint32_t arch_get_cpu_cycle_count() { return esp_cpu_get_cycle_count(); } uint32_t arch_get_cpu_freq_hz() { diff --git a/esphome/components/esp8266/core.cpp b/esphome/components/esp8266/core.cpp index db56dcbcae..12d0536dc1 100644 --- a/esphome/components/esp8266/core.cpp +++ b/esphome/components/esp8266/core.cpp @@ -32,9 +32,6 @@ void HOT arch_feed_wdt() { system_soft_wdt_feed(); } uint8_t progmem_read_byte(const uint8_t *addr) { return pgm_read_byte(addr); // NOLINT } -uint16_t progmem_read_word(const uint16_t *addr) { - return pgm_read_word(addr); // NOLINT -} const char *progmem_read_ptr(const char *const *addr) { return reinterpret_cast(pgm_read_ptr(addr)); // NOLINT } diff --git a/esphome/components/host/core.cpp b/esphome/components/host/core.cpp index 85d9f0b530..7a9ff120eb 100644 --- a/esphome/components/host/core.cpp +++ b/esphome/components/host/core.cpp @@ -53,7 +53,6 @@ void HOT arch_feed_wdt() { } uint8_t progmem_read_byte(const uint8_t *addr) { return *addr; } -uint16_t progmem_read_word(const uint16_t *addr) { return *addr; } const char *progmem_read_ptr(const char *const *addr) { return *addr; } uint32_t arch_get_cpu_cycle_count() { struct timespec spec; diff --git a/esphome/components/libretiny/core.cpp b/esphome/components/libretiny/core.cpp index ae48d5fc33..d5e0937cba 100644 --- a/esphome/components/libretiny/core.cpp +++ b/esphome/components/libretiny/core.cpp @@ -34,7 +34,6 @@ void HOT arch_feed_wdt() { lt_wdt_feed(); } uint32_t arch_get_cpu_cycle_count() { return lt_cpu_get_cycle_count(); } uint32_t arch_get_cpu_freq_hz() { return lt_cpu_get_freq(); } uint8_t progmem_read_byte(const uint8_t *addr) { return *addr; } -uint16_t progmem_read_word(const uint16_t *addr) { return *addr; } const char *progmem_read_ptr(const char *const *addr) { return *addr; } } // namespace esphome diff --git a/esphome/components/rp2040/core.cpp b/esphome/components/rp2040/core.cpp index feda41a962..65b4390472 100644 --- a/esphome/components/rp2040/core.cpp +++ b/esphome/components/rp2040/core.cpp @@ -32,9 +32,6 @@ void HOT arch_feed_wdt() { watchdog_update(); } uint8_t progmem_read_byte(const uint8_t *addr) { return pgm_read_byte(addr); // NOLINT } -uint16_t progmem_read_word(const uint16_t *addr) { - return pgm_read_word(addr); // NOLINT -} const char *progmem_read_ptr(const char *const *addr) { return reinterpret_cast(pgm_read_ptr(addr)); // NOLINT } diff --git a/esphome/components/zephyr/core.cpp b/esphome/components/zephyr/core.cpp index 1eef66aa73..e80f3d0c9c 100644 --- a/esphome/components/zephyr/core.cpp +++ b/esphome/components/zephyr/core.cpp @@ -59,7 +59,6 @@ void arch_restart() { sys_reboot(SYS_REBOOT_COLD); } uint32_t arch_get_cpu_cycle_count() { return k_cycle_get_32(); } uint32_t arch_get_cpu_freq_hz() { return sys_clock_hw_cycles_per_sec(); } uint8_t progmem_read_byte(const uint8_t *addr) { return *addr; } -uint16_t progmem_read_word(const uint16_t *addr) { return *addr; } const char *progmem_read_ptr(const char *const *addr) { return *addr; } Mutex::Mutex() { diff --git a/esphome/core/hal.h b/esphome/core/hal.h index d6c7695895..b328528f3a 100644 --- a/esphome/core/hal.h +++ b/esphome/core/hal.h @@ -41,7 +41,6 @@ void arch_feed_wdt(); uint32_t arch_get_cpu_cycle_count(); uint32_t arch_get_cpu_freq_hz(); uint8_t progmem_read_byte(const uint8_t *addr); -uint16_t progmem_read_word(const uint16_t *addr); const char *progmem_read_ptr(const char *const *addr); } // namespace esphome