Merge remote-tracking branch 'upstream/dev' into integration

esphome/components/http_request/http_request.h

@@ -242,9 +242,7 @@ template<typename... Ts> class HttpRequestSendAction : public Action<Ts...> {
       return;
     }
 
-    size_t content_length = container->content_length;
-    size_t max_length = std::min(content_length, this->max_response_buffer_size_);
-
+    size_t max_length = this->max_response_buffer_size_;
 #ifdef USE_HTTP_REQUEST_RESPONSE
     if (this->capture_response_.value(x...)) {
       std::string response_body;

esphome/components/http_request/http_request_idf.cpp

@@ -213,18 +213,12 @@ int HttpContainerIDF::read(uint8_t *buf, size_t max_len) {
   const uint32_t start = millis();
   watchdog::WatchdogManager wdm(this->parent_->get_watchdog_timeout());
 
-  int bufsize = std::min(max_len, this->content_length - this->bytes_read_);
-
-  if (bufsize == 0) {
-    this->duration_ms += (millis() - start);
-    return 0;
+  this->feed_wdt();
+  int read_len = esp_http_client_read(this->client_, (char *) buf, max_len);
+  this->feed_wdt();
+  if (read_len > 0) {
+    this->bytes_read_ += read_len;
   }
-
-  this->feed_wdt();
-  int read_len = esp_http_client_read(this->client_, (char *) buf, bufsize);
-  this->feed_wdt();
-  this->bytes_read_ += read_len;
-
   this->duration_ms += (millis() - start);
 
   return read_len;

esphome/components/hub75/display.py

@@ -1,3 +1,4 @@
+import logging
 from typing import Any
 
 from esphome import automation, pins
@@ -18,13 +19,16 @@ from esphome.const import (
     CONF_ROTATION,
     CONF_UPDATE_INTERVAL,
 )
-from esphome.core import ID
+from esphome.core import ID, EnumValue
 from esphome.cpp_generator import MockObj, TemplateArgsType
 import esphome.final_validate as fv
+from esphome.helpers import add_class_to_obj
 from esphome.types import ConfigType
 
 from . import boards, hub75_ns
 
+_LOGGER = logging.getLogger(__name__)
+
 DEPENDENCIES = ["esp32"]
 CODEOWNERS = ["@stuartparmenter"]
 
@@ -120,13 +124,51 @@ PANEL_LAYOUTS = {
 }
 
 Hub75ScanWiring = cg.global_ns.enum("Hub75ScanWiring", is_class=True)
-SCAN_PATTERNS = {
+SCAN_WIRINGS = {
     "STANDARD_TWO_SCAN": Hub75ScanWiring.STANDARD_TWO_SCAN,
-    "FOUR_SCAN_16PX_HIGH": Hub75ScanWiring.FOUR_SCAN_16PX_HIGH,
-    "FOUR_SCAN_32PX_HIGH": Hub75ScanWiring.FOUR_SCAN_32PX_HIGH,
-    "FOUR_SCAN_64PX_HIGH": Hub75ScanWiring.FOUR_SCAN_64PX_HIGH,
+    "SCAN_1_4_16PX_HIGH": Hub75ScanWiring.SCAN_1_4_16PX_HIGH,
+    "SCAN_1_8_32PX_HIGH": Hub75ScanWiring.SCAN_1_8_32PX_HIGH,
+    "SCAN_1_8_40PX_HIGH": Hub75ScanWiring.SCAN_1_8_40PX_HIGH,
+    "SCAN_1_8_64PX_HIGH": Hub75ScanWiring.SCAN_1_8_64PX_HIGH,
 }
 
+# Deprecated scan wiring names - mapped to new names
+DEPRECATED_SCAN_WIRINGS = {
+    "FOUR_SCAN_16PX_HIGH": "SCAN_1_4_16PX_HIGH",
+    "FOUR_SCAN_32PX_HIGH": "SCAN_1_8_32PX_HIGH",
+    "FOUR_SCAN_64PX_HIGH": "SCAN_1_8_64PX_HIGH",
+}
+
+
+def _validate_scan_wiring(value):
+    """Validate scan_wiring with deprecation warnings for old names."""
+    value = cv.string(value).upper().replace(" ", "_")
+
+    # Check if using deprecated name
+    # Remove deprecated names in 2026.7.0
+    if value in DEPRECATED_SCAN_WIRINGS:
+        new_name = DEPRECATED_SCAN_WIRINGS[value]
+        _LOGGER.warning(
+            "Scan wiring '%s' is deprecated and will be removed in ESPHome 2026.7.0. "
+            "Please use '%s' instead.",
+            value,
+            new_name,
+        )
+        value = new_name
+
+    # Validate against allowed values
+    if value not in SCAN_WIRINGS:
+        raise cv.Invalid(
+            f"Unknown scan wiring '{value}'. "
+            f"Valid options are: {', '.join(sorted(SCAN_WIRINGS.keys()))}"
+        )
+
+    # Return as EnumValue like cv.enum does
+    result = add_class_to_obj(value, EnumValue)
+    result.enum_value = SCAN_WIRINGS[value]
+    return result
+
+
 Hub75ClockSpeed = cg.global_ns.enum("Hub75ClockSpeed", is_class=True)
 CLOCK_SPEEDS = {
     "8MHZ": Hub75ClockSpeed.HZ_8M,
@@ -382,9 +424,7 @@ CONFIG_SCHEMA = cv.All(
             cv.Optional(CONF_LAYOUT_COLS): cv.positive_int,
             cv.Optional(CONF_LAYOUT): cv.enum(PANEL_LAYOUTS, upper=True, space="_"),
             # Panel hardware configuration
-            cv.Optional(CONF_SCAN_WIRING): cv.enum(
-                SCAN_PATTERNS, upper=True, space="_"
-            ),
+            cv.Optional(CONF_SCAN_WIRING): _validate_scan_wiring,
             cv.Optional(CONF_SHIFT_DRIVER): cv.enum(SHIFT_DRIVERS, upper=True),
             # Display configuration
             cv.Optional(CONF_DOUBLE_BUFFER): cv.boolean,
@@ -547,7 +587,7 @@ def _build_config_struct(
 async def to_code(config: ConfigType) -> None:
     add_idf_component(
         name="esphome/esp-hub75",
-        ref="0.2.2",
+        ref="0.3.0",
     )
 
     # Set compile-time configuration via build flags (so external library sees them)

esphome/core/helpers.cpp

@@ -692,55 +692,6 @@ bool base64_decode_int32_vector(const std::string &base64, std::vector<int32_t>
   return !out.empty();
 }
 
-/// Encode int32 to 5 base85 characters + null terminator
-/// Standard ASCII85 alphabet: '!' (33) = 0 through 'u' (117) = 84
-inline void base85_encode_int32(int32_t value, std::span<char, BASE85_INT32_ENCODED_SIZE> output) {
-  uint32_t v = static_cast<uint32_t>(value);
-  // Encode least significant digit first, then reverse
-  for (int i = 4; i >= 0; i--) {
-    output[i] = static_cast<char>('!' + (v % 85));
-    v /= 85;
-  }
-  output[5] = '\0';
-}
-
-/// Decode 5 base85 characters to int32
-inline bool base85_decode_int32(const char *input, int32_t &out) {
-  uint8_t c0 = static_cast<uint8_t>(input[0] - '!');
-  uint8_t c1 = static_cast<uint8_t>(input[1] - '!');
-  uint8_t c2 = static_cast<uint8_t>(input[2] - '!');
-  uint8_t c3 = static_cast<uint8_t>(input[3] - '!');
-  uint8_t c4 = static_cast<uint8_t>(input[4] - '!');
-
-  // Each digit must be 0-84. Since uint8_t wraps, chars below '!' become > 84
-  if (c0 > 84 || c1 > 84 || c2 > 84 || c3 > 84 || c4 > 84)
-    return false;
-
-  // 85^4 = 52200625, 85^3 = 614125, 85^2 = 7225, 85^1 = 85
-  out = static_cast<int32_t>(c0 * 52200625u + c1 * 614125u + c2 * 7225u + c3 * 85u + c4);
-  return true;
-}
-
-/// Decode base85 string directly into vector (no intermediate buffer)
-bool base85_decode_int32_vector(const std::string &base85, std::vector<int32_t> &out) {
-  size_t len = base85.size();
-  if (len % 5 != 0)
-    return false;
-
-  out.clear();
-  const char *ptr = base85.data();
-  const char *end = ptr + len;
-
-  while (ptr < end) {
-    int32_t value;
-    if (!base85_decode_int32(ptr, value))
-      return false;
-    out.push_back(value);
-    ptr += 5;
-  }
-  return true;
-}
-
 // Colors
 
 float gamma_correct(float value, float gamma) {

esphome/core/helpers.h

@@ -1308,14 +1308,6 @@ size_t base64_decode(const uint8_t *encoded_data, size_t encoded_len, uint8_t *b
 /// @return true if successful, false if decode failed or invalid size
 bool base64_decode_int32_vector(const std::string &base64, std::vector<int32_t> &out);
 
-/// Size of buffer needed for base85 encoded int32 (5 chars + null terminator)
-static constexpr size_t BASE85_INT32_ENCODED_SIZE = 6;
-
-void base85_encode_int32(int32_t value, std::span<char, BASE85_INT32_ENCODED_SIZE> output);
-
-bool base85_decode_int32(const char *input, int32_t &out);
-bool base85_decode_int32_vector(const std::string &base85, std::vector<int32_t> &out);
-
 ///@}
 
 /// @name Colors

esphome/idf_component.yml

@@ -28,8 +28,8 @@ dependencies:
     rules:
       - if: "target in [esp32s2, esp32s3, esp32p4]"
   esphome/esp-hub75:
-    version: 0.2.2
+    version: 0.3.0
     rules:
-      - if: "target in [esp32, esp32s2, esp32s3, esp32p4]"
+      - if: "target in [esp32, esp32s2, esp32s3, esp32c6, esp32p4]"
   esp32async/asynctcp:
     version: 3.4.91