esphome 2024.7.0b3__py3-none-any.whl → 2024.7.0b4__py3-none-any.whl

esphome/components/ota/ota_backend_arduino_esp32.cpp

@@ -1,14 +1,17 @@
 #ifdef USE_ESP32_FRAMEWORK_ARDUINO
 #include "esphome/core/defines.h"
+#include "esphome/core/log.h"
 
-#include "ota_backend_arduino_esp32.h"
 #include "ota_backend.h"
+#include "ota_backend_arduino_esp32.h"
 
 #include <Update.h>
 
 namespace esphome {
 namespace ota {
 
+static const char *const TAG = "ota.arduino_esp32";
+
 std::unique_ptr<ota::OTABackend> make_ota_backend() { return make_unique<ota::ArduinoESP32OTABackend>(); }
 
 OTAResponseTypes ArduinoESP32OTABackend::begin(size_t image_size) {
@@ -20,6 +23,9 @@ OTAResponseTypes ArduinoESP32OTABackend::begin(size_t image_size) {
   uint8_t error = Update.getError();
   if (error == UPDATE_ERROR_SIZE)
     return OTA_RESPONSE_ERROR_ESP32_NOT_ENOUGH_SPACE;
+
+  ESP_LOGE(TAG, "Begin error: %d", error);
+
   return OTA_RESPONSE_ERROR_UNKNOWN;
 }
 
@@ -27,16 +33,25 @@ void ArduinoESP32OTABackend::set_update_md5(const char *md5) { Update.setMD5(md5
 
 OTAResponseTypes ArduinoESP32OTABackend::write(uint8_t *data, size_t len) {
   size_t written = Update.write(data, len);
-  if (written != len) {
-    return OTA_RESPONSE_ERROR_WRITING_FLASH;
+  if (written == len) {
+    return OTA_RESPONSE_OK;
   }
-  return OTA_RESPONSE_OK;
+
+  uint8_t error = Update.getError();
+  ESP_LOGE(TAG, "Write error: %d", error);
+
+  return OTA_RESPONSE_ERROR_WRITING_FLASH;
 }
 
 OTAResponseTypes ArduinoESP32OTABackend::end() {
-  if (!Update.end())
-    return OTA_RESPONSE_ERROR_UPDATE_END;
-  return OTA_RESPONSE_OK;
+  if (Update.end()) {
+    return OTA_RESPONSE_OK;
+  }
+
+  uint8_t error = Update.getError();
+  ESP_LOGE(TAG, "End error: %d", error);
+
+  return OTA_RESPONSE_ERROR_UPDATE_END;
 }
 
 void ArduinoESP32OTABackend::abort() { Update.abort(); }

esphome/components/ota/ota_backend_arduino_esp8266.cpp

@@ -1,16 +1,19 @@
 #ifdef USE_ARDUINO
 #ifdef USE_ESP8266
-#include "ota_backend.h"
 #include "ota_backend_arduino_esp8266.h"
+#include "ota_backend.h"
 
-#include "esphome/core/defines.h"
 #include "esphome/components/esp8266/preferences.h"
+#include "esphome/core/defines.h"
+#include "esphome/core/log.h"
 
 #include <Updater.h>
 
 namespace esphome {
 namespace ota {
 
+static const char *const TAG = "ota.arduino_esp8266";
+
 std::unique_ptr<ota::OTABackend> make_ota_backend() { return make_unique<ota::ArduinoESP8266OTABackend>(); }
 
 OTAResponseTypes ArduinoESP8266OTABackend::begin(size_t image_size) {
@@ -29,6 +32,9 @@ OTAResponseTypes ArduinoESP8266OTABackend::begin(size_t image_size) {
     return OTA_RESPONSE_ERROR_WRONG_CURRENT_FLASH_CONFIG;
   if (error == UPDATE_ERROR_SPACE)
     return OTA_RESPONSE_ERROR_ESP8266_NOT_ENOUGH_SPACE;
+
+  ESP_LOGE(TAG, "Begin error: %d", error);
+
   return OTA_RESPONSE_ERROR_UNKNOWN;
 }
 
@@ -36,16 +42,25 @@ void ArduinoESP8266OTABackend::set_update_md5(const char *md5) { Update.setMD5(m
 
 OTAResponseTypes ArduinoESP8266OTABackend::write(uint8_t *data, size_t len) {
   size_t written = Update.write(data, len);
-  if (written != len) {
-    return OTA_RESPONSE_ERROR_WRITING_FLASH;
+  if (written == len) {
+    return OTA_RESPONSE_OK;
   }
-  return OTA_RESPONSE_OK;
+
+  uint8_t error = Update.getError();
+  ESP_LOGE(TAG, "Write error: %d", error);
+
+  return OTA_RESPONSE_ERROR_WRITING_FLASH;
 }
 
 OTAResponseTypes ArduinoESP8266OTABackend::end() {
-  if (!Update.end())
-    return OTA_RESPONSE_ERROR_UPDATE_END;
-  return OTA_RESPONSE_OK;
+  if (Update.end()) {
+    return OTA_RESPONSE_OK;
+  }
+
+  uint8_t error = Update.getError();
+  ESP_LOGE(TAG, "End error: %d", error);
+
+  return OTA_RESPONSE_ERROR_UPDATE_END;
 }
 
 void ArduinoESP8266OTABackend::abort() {

esphome/components/ota/ota_backend_arduino_libretiny.cpp

@@ -1,14 +1,17 @@
 #ifdef USE_LIBRETINY
-#include "ota_backend.h"
 #include "ota_backend_arduino_libretiny.h"
+#include "ota_backend.h"
 
 #include "esphome/core/defines.h"
+#include "esphome/core/log.h"
 
 #include <Update.h>
 
 namespace esphome {
 namespace ota {
 
+static const char *const TAG = "ota.arduino_libretiny";
+
 std::unique_ptr<ota::OTABackend> make_ota_backend() { return make_unique<ota::ArduinoLibreTinyOTABackend>(); }
 
 OTAResponseTypes ArduinoLibreTinyOTABackend::begin(size_t image_size) {
@@ -20,6 +23,9 @@ OTAResponseTypes ArduinoLibreTinyOTABackend::begin(size_t image_size) {
   uint8_t error = Update.getError();
   if (error == UPDATE_ERROR_SIZE)
     return OTA_RESPONSE_ERROR_ESP32_NOT_ENOUGH_SPACE;
+
+  ESP_LOGE(TAG, "Begin error: %d", error);
+
   return OTA_RESPONSE_ERROR_UNKNOWN;
 }
 
@@ -27,16 +33,25 @@ void ArduinoLibreTinyOTABackend::set_update_md5(const char *md5) { Update.setMD5
 
 OTAResponseTypes ArduinoLibreTinyOTABackend::write(uint8_t *data, size_t len) {
   size_t written = Update.write(data, len);
-  if (written != len) {
-    return OTA_RESPONSE_ERROR_WRITING_FLASH;
+  if (written == len) {
+    return OTA_RESPONSE_OK;
   }
-  return OTA_RESPONSE_OK;
+
+  uint8_t error = Update.getError();
+  ESP_LOGE(TAG, "Write error: %d", error);
+
+  return OTA_RESPONSE_ERROR_WRITING_FLASH;
 }
 
 OTAResponseTypes ArduinoLibreTinyOTABackend::end() {
-  if (!Update.end())
-    return OTA_RESPONSE_ERROR_UPDATE_END;
-  return OTA_RESPONSE_OK;
+  if (Update.end()) {
+    return OTA_RESPONSE_OK;
+  }
+
+  uint8_t error = Update.getError();
+  ESP_LOGE(TAG, "End error: %d", error);
+
+  return OTA_RESPONSE_ERROR_UPDATE_END;
 }
 
 void ArduinoLibreTinyOTABackend::abort() { Update.abort(); }

esphome/components/ota/ota_backend_arduino_rp2040.cpp

@@ -1,16 +1,19 @@
 #ifdef USE_ARDUINO
 #ifdef USE_RP2040
-#include "ota_backend.h"
 #include "ota_backend_arduino_rp2040.h"
+#include "ota_backend.h"
 
 #include "esphome/components/rp2040/preferences.h"
 #include "esphome/core/defines.h"
+#include "esphome/core/log.h"
 
 #include <Updater.h>
 
 namespace esphome {
 namespace ota {
 
+static const char *const TAG = "ota.arduino_rp2040";
+
 std::unique_ptr<ota::OTABackend> make_ota_backend() { return make_unique<ota::ArduinoRP2040OTABackend>(); }
 
 OTAResponseTypes ArduinoRP2040OTABackend::begin(size_t image_size) {
@@ -29,6 +32,9 @@ OTAResponseTypes ArduinoRP2040OTABackend::begin(size_t image_size) {
     return OTA_RESPONSE_ERROR_WRONG_CURRENT_FLASH_CONFIG;
   if (error == UPDATE_ERROR_SPACE)
     return OTA_RESPONSE_ERROR_RP2040_NOT_ENOUGH_SPACE;
+
+  ESP_LOGE(TAG, "Begin error: %d", error);
+
   return OTA_RESPONSE_ERROR_UNKNOWN;
 }
 
@@ -36,16 +42,25 @@ void ArduinoRP2040OTABackend::set_update_md5(const char *md5) { Update.setMD5(md
 
 OTAResponseTypes ArduinoRP2040OTABackend::write(uint8_t *data, size_t len) {
   size_t written = Update.write(data, len);
-  if (written != len) {
-    return OTA_RESPONSE_ERROR_WRITING_FLASH;
+  if (written == len) {
+    return OTA_RESPONSE_OK;
   }
-  return OTA_RESPONSE_OK;
+
+  uint8_t error = Update.getError();
+  ESP_LOGE(TAG, "Write error: %d", error);
+
+  return OTA_RESPONSE_ERROR_WRITING_FLASH;
 }
 
 OTAResponseTypes ArduinoRP2040OTABackend::end() {
-  if (!Update.end())
-    return OTA_RESPONSE_ERROR_UPDATE_END;
-  return OTA_RESPONSE_OK;
+  if (Update.end()) {
+    return OTA_RESPONSE_OK;
+  }
+
+  uint8_t error = Update.getError();
+  ESP_LOGE(TAG, "End error: %d", error);
+
+  return OTA_RESPONSE_ERROR_UPDATE_END;
 }
 
 void ArduinoRP2040OTABackend::abort() {

esphome/const.py

@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2024.7.0b3"
+__version__ = "2024.7.0b4"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 VALID_SUBSTITUTIONS_CHARACTERS = (

{esphome-2024.7.0b3.dist-info → esphome-2024.7.0b4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: esphome
-Version: 2024.7.0b3
+Version: 2024.7.0b4
 Summary: Make creating custom firmwares for ESP32/ESP8266 super easy.
 Author-email: The ESPHome Authors <esphome@nabucasa.com>
 License: MIT

{esphome-2024.7.0b3.dist-info → esphome-2024.7.0b4.dist-info}/RECORD

@@ -5,7 +5,7 @@ esphome/codegen.py,sha256=LCJVpAwy1L9DTBsIvbgAbHj1TOXUSPgBoN--aio0gBk,1855
 esphome/config.py,sha256=wztK2UmO7-hc6HFDAi6YWtrPVy5mH0diKuqpsWp4-XA,39616
 esphome/config_helpers.py,sha256=MKf_wzO35nn41FvigXE0iYKDslPgL2ruf8R-EPtTT2I,3256
 esphome/config_validation.py,sha256=G79LGVIh5BdpGkzuehkm7Db_llpbC2of4dKqZEpHc3A,64838
-esphome/const.py,sha256=QXPuiRfzBxts2SEE3uaaOGfXjxCEcXvMgPpU5qwqNrA,38954
+esphome/const.py,sha256=SUZvcz_XkgCQ58OeMcC8KYw3HPgVbgho5Btk125vLtA,38954
 esphome/coroutine.py,sha256=IG2kC92OrenyiRm7Qo9uC-4qU4b4-Lmj0TkMIjRG2RY,9344
 esphome/cpp_generator.py,sha256=hW2EfubUiildhKXZIdV8Dr3Q9TM5oHybFwiTo5-vEUE,31203
 esphome/cpp_helpers.py,sha256=KadRBBoo4QRT-VwdWFtvxv_FYjqhZTkBhfMX-JhEMwg,4803
@@ -1775,13 +1775,13 @@ esphome/components/ota/__init__.py,sha256=EiXnjLtJX3CXeDGRsqLnp5I4xQiy3Yhcy24mqv
 esphome/components/ota/automation.h,sha256=UaasWG6gZG59MtC5DHHfMhRb7BXYmLlkOyYujZReEV0,2044
 esphome/components/ota/ota_backend.cpp,sha256=IfpR0mvzSs9ugJa2LRi4AtYHT4Ht6PoS9BY5Ydjs_eE,587
 esphome/components/ota/ota_backend.h,sha256=ILfnmlVzp0qhHFv13jZ6GQ7MLgKf5ICtL6xI4ojg4K8,2806
-esphome/components/ota/ota_backend_arduino_esp32.cpp,sha256=nq7hHkMqwwZRDrwgHq_yO3-fE_XiZYkricVEcomP0GU,1219
+esphome/components/ota/ota_backend_arduino_esp32.cpp,sha256=gEExNdFUN-iiOX3rVUXBiRZcE8cfEk0G3chGhTaPYr0,1514
 esphome/components/ota/ota_backend_arduino_esp32.h,sha256=h0oH0gREs7M6hW_BlGHHFFml14IJYx7IpKpsVaHJ554,610
-esphome/components/ota/ota_backend_arduino_esp8266.cpp,sha256=xM2zLeWGKB64Xk2qmYOipZArHSNrlYZVWpH7zl9Fu3Y,1650
+esphome/components/ota/ota_backend_arduino_esp8266.cpp,sha256=lJgvlbP3v6piuoE_klojKI7si_2g0pL3QN3CIU09lmY,1947
 esphome/components/ota/ota_backend_arduino_esp8266.h,sha256=PABg5GIPA75xe9KpcP2Jc_N_U0ygOu-KPGgVE-sNotU,712
-esphome/components/ota/ota_backend_arduino_libretiny.cpp,sha256=CjZduWnNBolKArayIWu6b3SwvRpv5c9Yu2UEOfDZIKU,1219
+esphome/components/ota/ota_backend_arduino_libretiny.cpp,sha256=4DEgWdOZQAeTNZiv0tKDyILZxpfj7i0hS37IvAKyXRw,1518
 esphome/components/ota/ota_backend_arduino_libretiny.h,sha256=7RnBge-XizF0KQtft_Naeh1-Gj0yO2Y_hJW6mCXO-gQ,552
-esphome/components/ota/ota_backend_arduino_rp2040.cpp,sha256=uoJnB6iCjW42Ykoxmsz22m6ieJyrKmz2EO3gkjWw0WQ,1669
+esphome/components/ota/ota_backend_arduino_rp2040.cpp,sha256=H2TUIWJMHCeArtr-0IcZPgyDI9DNOZfzP8F47lPeTZU,1965
 esphome/components/ota/ota_backend_arduino_rp2040.h,sha256=6E54dND3ToVbYVsWRsLPpZ8o3DytNhtZg1IVXTPyKx4,618
 esphome/components/ota/ota_backend_esp_idf.cpp,sha256=_TBWW23aHSFo5P8pHSqexR0LgnOB4z5b-3Lw0vliWvc,3328
 esphome/components/ota/ota_backend_esp_idf.h,sha256=aiHISZQjSxaRWuq_4ZGAEuP8kCG0BccYAbJ9kx6WvhQ,725
@@ -3119,9 +3119,9 @@ esphome/dashboard/util/itertools.py,sha256=8eLrWEWmICLtXNxkKdYPQV0c_N4GEz8m9Npnb
 esphome/dashboard/util/password.py,sha256=cQz3b9B-ijTe7zS6BeCW0hc3pWv6JjC78jmnycYYAh8,321
 esphome/dashboard/util/subprocess.py,sha256=T8EW6dbU4LPd2DG1dRrdh8li71tt6J1isn411poMhkk,1022
 esphome/dashboard/util/text.py,sha256=ENDnfN4O0NdA3CKVJjQYabFbwbrsIhVKrAMQe53qYu4,534
-esphome-2024.7.0b3.dist-info/LICENSE,sha256=HzEjkBInJe44L4WvAOPfhPJJDNj6YbnqFyvGWRzArGM,36664
-esphome-2024.7.0b3.dist-info/METADATA,sha256=e3LWrKNMO9xv3Y6LKKcJCnNzxGQVVig2aZ5AsGfou1c,3265
-esphome-2024.7.0b3.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-esphome-2024.7.0b3.dist-info/entry_points.txt,sha256=mIxVNuWtbYzeEcaWCl-AQ-97aBOWbnYBAK8nbF6P4M0,50
-esphome-2024.7.0b3.dist-info/top_level.txt,sha256=0GSXEW3cnITpgG3qnsSMz0qoqJHAFyfw7Y8MVtEf1Yk,8
-esphome-2024.7.0b3.dist-info/RECORD,,
+esphome-2024.7.0b4.dist-info/LICENSE,sha256=HzEjkBInJe44L4WvAOPfhPJJDNj6YbnqFyvGWRzArGM,36664
+esphome-2024.7.0b4.dist-info/METADATA,sha256=HBcaZkRTFrujwOsQdf8dccMWstRkQ4sQt-QIx91G-F4,3265
+esphome-2024.7.0b4.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+esphome-2024.7.0b4.dist-info/entry_points.txt,sha256=mIxVNuWtbYzeEcaWCl-AQ-97aBOWbnYBAK8nbF6P4M0,50
+esphome-2024.7.0b4.dist-info/top_level.txt,sha256=0GSXEW3cnITpgG3qnsSMz0qoqJHAFyfw7Y8MVtEf1Yk,8
+esphome-2024.7.0b4.dist-info/RECORD,,