Merge pull request #3219 from esphome/bump-2022.2.2

2022.2.2

docker/Dockerfile

@@ -43,7 +43,7 @@ RUN \
     # Ubuntu python3-pip is missing wheel
     pip3 install --no-cache-dir \
         wheel==0.37.1 \
-        platformio==5.2.4 \
+        platformio==5.2.5 \
     # Change some platformio settings
     && platformio settings set enable_telemetry No \
     && platformio settings set check_libraries_interval 1000000 \

esphome/components/debug/debug_component.cpp

@@ -53,9 +53,9 @@ void DebugComponent::dump_config() {
 #ifdef USE_SENSOR
   LOG_SENSOR("  ", "Free space on heap", this->free_sensor_);
   LOG_SENSOR("  ", "Largest free heap block", this->block_sensor_);
-#if defined(USE_ESP8266) && ARDUINO_VERSION_CODE >= VERSION_CODE(2, 5, 2)
+#if defined(USE_ESP8266) && USE_ARDUINO_VERSION_CODE >= VERSION_CODE(2, 5, 2)
   LOG_SENSOR("  ", "Heap fragmentation", this->fragmentation_sensor_);
-#endif  // defined(USE_ESP8266) && ARDUINO_VERSION_CODE >= VERSION_CODE(2, 5, 2)
+#endif  // defined(USE_ESP8266) && USE_ARDUINO_VERSION_CODE >= VERSION_CODE(2, 5, 2)
 #endif  // USE_SENSOR
 
   ESP_LOGD(TAG, "ESPHome version %s", ESPHOME_VERSION);
@@ -316,7 +316,7 @@ void DebugComponent::update() {
 #endif
   }
 
-#if defined(USE_ESP8266) && ARDUINO_VERSION_CODE >= VERSION_CODE(2, 5, 2)
+#if defined(USE_ESP8266) && USE_ARDUINO_VERSION_CODE >= VERSION_CODE(2, 5, 2)
   if (this->fragmentation_sensor_ != nullptr) {
     // NOLINTNEXTLINE(readability-static-accessed-through-instance)
     this->fragmentation_sensor_->publish_state(ESP.getHeapFragmentation());

esphome/components/debug/debug_component.h

@@ -28,7 +28,7 @@ class DebugComponent : public PollingComponent {
 #ifdef USE_SENSOR
   void set_free_sensor(sensor::Sensor *free_sensor) { free_sensor_ = free_sensor; }
   void set_block_sensor(sensor::Sensor *block_sensor) { block_sensor_ = block_sensor; }
-#if defined(USE_ESP8266) && ARDUINO_VERSION_CODE >= VERSION_CODE(2, 5, 2)
+#if defined(USE_ESP8266) && USE_ARDUINO_VERSION_CODE >= VERSION_CODE(2, 5, 2)
   void set_fragmentation_sensor(sensor::Sensor *fragmentation_sensor) { fragmentation_sensor_ = fragmentation_sensor; }
 #endif
   void set_loop_time_sensor(sensor::Sensor *loop_time_sensor) { loop_time_sensor_ = loop_time_sensor; }
@@ -42,7 +42,7 @@ class DebugComponent : public PollingComponent {
 
   sensor::Sensor *free_sensor_{nullptr};
   sensor::Sensor *block_sensor_{nullptr};
-#if defined(USE_ESP8266) && ARDUINO_VERSION_CODE >= VERSION_CODE(2, 5, 2)
+#if defined(USE_ESP8266) && USE_ARDUINO_VERSION_CODE >= VERSION_CODE(2, 5, 2)
   sensor::Sensor *fragmentation_sensor_{nullptr};
 #endif
   sensor::Sensor *loop_time_sensor_{nullptr};

esphome/components/debug/sensor.py

@@ -6,6 +6,7 @@ from esphome.const import (
     CONF_FRAGMENTATION,
     CONF_BLOCK,
     CONF_LOOP_TIME,
+    ENTITY_CATEGORY_DIAGNOSTIC,
     UNIT_MILLISECOND,
     UNIT_PERCENT,
     UNIT_BYTES,
@@ -18,14 +19,34 @@ DEPENDENCIES = ["debug"]
 
 CONFIG_SCHEMA = {
     cv.GenerateID(CONF_DEBUG_ID): cv.use_id(DebugComponent),
-    cv.Optional(CONF_FREE): sensor.sensor_schema(UNIT_BYTES, ICON_COUNTER, 0),
-    cv.Optional(CONF_BLOCK): sensor.sensor_schema(UNIT_BYTES, ICON_COUNTER, 0),
+    cv.Optional(CONF_FREE): sensor.sensor_schema(
+        unit_of_measurement=UNIT_BYTES,
+        icon=ICON_COUNTER,
+        accuracy_decimals=0,
+        entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
+    ),
+    cv.Optional(CONF_BLOCK): sensor.sensor_schema(
+        unit_of_measurement=UNIT_BYTES,
+        icon=ICON_COUNTER,
+        accuracy_decimals=0,
+        entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
+    ),
     cv.Optional(CONF_FRAGMENTATION): cv.All(
         cv.only_on_esp8266,
         cv.require_framework_version(esp8266_arduino=cv.Version(2, 5, 2)),
-        sensor.sensor_schema(UNIT_PERCENT, ICON_COUNTER, 1),
+        sensor.sensor_schema(
+            unit_of_measurement=UNIT_PERCENT,
+            icon=ICON_COUNTER,
+            accuracy_decimals=1,
+            entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
+        ),
+    ),
+    cv.Optional(CONF_LOOP_TIME): sensor.sensor_schema(
+        unit_of_measurement=UNIT_MILLISECOND,
+        icon=ICON_TIMER,
+        accuracy_decimals=0,
+        entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
     ),
-    cv.Optional(CONF_LOOP_TIME): sensor.sensor_schema(UNIT_MILLISECOND, ICON_TIMER, 0),
 }
 
 

esphome/components/debug/text_sensor.py

@@ -1,7 +1,7 @@
 from esphome.components import text_sensor
 import esphome.config_validation as cv
 import esphome.codegen as cg
-from esphome.const import CONF_DEVICE
+from esphome.const import CONF_DEVICE, ENTITY_CATEGORY_DIAGNOSTIC
 
 from . import CONF_DEBUG_ID, DebugComponent
 
@@ -11,7 +11,9 @@ DEPENDENCIES = ["debug"]
 CONFIG_SCHEMA = cv.Schema(
     {
         cv.GenerateID(CONF_DEBUG_ID): cv.use_id(DebugComponent),
-        cv.Optional(CONF_DEVICE): text_sensor.text_sensor_schema(),
+        cv.Optional(CONF_DEVICE): text_sensor.text_sensor_schema(
+            entity_category=ENTITY_CATEGORY_DIAGNOSTIC
+        ),
     }
 )
 

esphome/components/json/json_util.h

@@ -4,9 +4,10 @@
 
 #include "esphome/core/helpers.h"
 
-#undef ARDUINOJSON_ENABLE_STD_STRING
 #define ARDUINOJSON_ENABLE_STD_STRING 1  // NOLINT
 
+#define ARDUINOJSON_USE_LONG_LONG 1  // NOLINT
+
 #include <ArduinoJson.h>
 
 namespace esphome {

esphome/components/ota/ota_backend_arduino_esp8266.h

@@ -17,7 +17,7 @@ class ArduinoESP8266OTABackend : public OTABackend {
   OTAResponseTypes write(uint8_t *data, size_t len) override;
   OTAResponseTypes end() override;
   void abort() override;
-#if ARDUINO_VERSION_CODE >= VERSION_CODE(2, 7, 0)
+#if USE_ARDUINO_VERSION_CODE >= VERSION_CODE(2, 7, 0)
   bool supports_compression() override { return true; }
 #else
   bool supports_compression() override { return false; }

esphome/const.py

@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2022.2.0b3"
+__version__ = "2022.2.2"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"