esphome 2024.8.2__py3-none-any.whl → 2024.9.0__py3-none-any.whl

esphome/components/st7701s/display.py

@@ -1,47 +1,39 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
 from esphome import pins
-from esphome.components import (
-    spi,
-    display,
+import esphome.codegen as cg
+from esphome.components import display, spi
+from esphome.components.esp32 import const, only_on_variant
+from esphome.components.rpi_dpi_rgb.display import (
+    CONF_PCLK_FREQUENCY,
+    CONF_PCLK_INVERTED,
 )
+import esphome.config_validation as cv
 from esphome.const import (
-    CONF_DC_PIN,
-    CONF_HSYNC_PIN,
-    CONF_RESET_PIN,
+    CONF_BLUE,
+    CONF_COLOR_ORDER,
     CONF_DATA_PINS,
-    CONF_ID,
+    CONF_DC_PIN,
     CONF_DIMENSIONS,
-    CONF_VSYNC_PIN,
-    CONF_WIDTH,
+    CONF_GREEN,
     CONF_HEIGHT,
+    CONF_HSYNC_PIN,
+    CONF_ID,
+    CONF_IGNORE_STRAPPING_WARNING,
+    CONF_INVERT_COLORS,
     CONF_LAMBDA,
     CONF_MIRROR_X,
     CONF_MIRROR_Y,
-    CONF_COLOR_ORDER,
-    CONF_TRANSFORM,
+    CONF_NUMBER,
     CONF_OFFSET_HEIGHT,
     CONF_OFFSET_WIDTH,
-    CONF_INVERT_COLORS,
     CONF_RED,
-    CONF_GREEN,
-    CONF_BLUE,
-    CONF_NUMBER,
-    CONF_IGNORE_STRAPPING_WARNING,
+    CONF_RESET_PIN,
+    CONF_TRANSFORM,
+    CONF_VSYNC_PIN,
+    CONF_WIDTH,
 )
+from esphome.core import TimePeriod
 
-from esphome.components.esp32 import (
-    only_on_variant,
-    const,
-)
-from esphome.components.rpi_dpi_rgb.display import (
-    CONF_PCLK_FREQUENCY,
-    CONF_PCLK_INVERTED,
-)
-from .init_sequences import (
-    ST7701S_INITS,
-    cmd,
-)
+from .init_sequences import ST7701S_INITS, cmd
 
 CONF_INIT_SEQUENCE = "init_sequence"
 CONF_DE_PIN = "de_pin"
@@ -59,6 +51,7 @@ DEPENDENCIES = ["spi", "esp32"]
 st7701s_ns = cg.esphome_ns.namespace("st7701s")
 ST7701S = st7701s_ns.class_("ST7701S", display.Display, cg.Component, spi.SPIDevice)
 ColorOrder = display.display_ns.enum("ColorMode")
+ST7701S_DELAY_FLAG = 0xFF
 
 COLOR_ORDERS = {
     "RGB": ColorOrder.COLOR_ORDER_RGB,
@@ -93,18 +86,23 @@ def map_sequence(value):
     """
     An initialisation sequence can be selected from one of the pre-defined sequences in init_sequences.py,
     or can be a literal array of data bytes.
-    The format is a repeated sequence of [CMD, LEN, <data>] where <data> is LEN bytes.
+    The format is a repeated sequence of [CMD, <data>] where <data> is s a sequence of bytes. The length is inferred
+    from the length of the sequence and should not be explicit.
+    A delay can be inserted by specifying "- delay N" where N is in ms
     """
+    if isinstance(value, str) and value.lower().startswith("delay "):
+        value = value.lower()[6:]
+        delay = cv.All(
+            cv.positive_time_period_milliseconds,
+            cv.Range(TimePeriod(milliseconds=1), TimePeriod(milliseconds=255)),
+        )(value)
+        return [delay, ST7701S_DELAY_FLAG]
     if not isinstance(value, list):
         value = cv.int_(value)
         value = cv.one_of(*ST7701S_INITS)(value)
         return ST7701S_INITS[value]
-    # value = cv.ensure_list(cv.uint8_t)(value)
-    data_length = len(value)
-    if data_length == 0:
-        raise cv.Invalid("Empty sequence")
-    value = cmd(*value)
-    return value
+    value = cv.Length(min=1, max=254)(value)
+    return cmd(*value)
 
 
 CONFIG_SCHEMA = cv.All(

esphome/components/st7701s/st7701s.cpp

@@ -138,11 +138,16 @@ void ST7701S::write_init_sequence_() {
   for (size_t i = 0; i != this->init_sequence_.size();) {
     uint8_t cmd = this->init_sequence_[i++];
     size_t len = this->init_sequence_[i++];
-    this->write_sequence_(cmd, len, &this->init_sequence_[i]);
-    i += len;
-    esph_log_v(TAG, "Command %X, %d bytes", cmd, len);
-    if (cmd == SW_RESET_CMD)
-      delay(6);
+    if (len == ST7701S_DELAY_FLAG) {
+      ESP_LOGV(TAG, "Delay %dms", cmd);
+      delay(cmd);
+    } else {
+      this->write_sequence_(cmd, len, &this->init_sequence_[i]);
+      i += len;
+      ESP_LOGV(TAG, "Command %X, %d bytes", cmd, len);
+      if (cmd == SW_RESET_CMD)
+        delay(6);
+    }
   }
   // st7701 does not appear to support axis swapping
   this->write_sequence_(CMD2_BKSEL, sizeof(CMD2_BK0), CMD2_BK0);
@@ -153,7 +158,7 @@ void ST7701S::write_init_sequence_() {
     val |= 0x10;
   this->write_command_(MADCTL_CMD);
   this->write_data_(val);
-  esph_log_d(TAG, "write MADCTL %X", val);
+  ESP_LOGD(TAG, "write MADCTL %X", val);
   this->write_command_(this->invert_colors_ ? INVERT_ON : INVERT_OFF);
   this->set_timeout(120, [this] {
     this->write_command_(SLEEP_OUT);

esphome/components/st7701s/st7701s.h

@@ -25,6 +25,7 @@ const uint8_t INVERT_ON = 0x21;
 const uint8_t DISPLAY_ON = 0x29;
 const uint8_t CMD2_BKSEL = 0xFF;
 const uint8_t CMD2_BK0[5] = {0x77, 0x01, 0x00, 0x00, 0x10};
+const uint8_t ST7701S_DELAY_FLAG = 0xFF;
 
 class ST7701S : public display::Display,
                 public spi::SPIDevice<spi::BIT_ORDER_MSB_FIRST, spi::CLOCK_POLARITY_LOW, spi::CLOCK_PHASE_LEADING,

esphome/components/statsd/__init__.py

@@ -0,0 +1,65 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import sensor, binary_sensor
+from esphome.const import (
+    CONF_ID,
+    CONF_PORT,
+    CONF_NAME,
+    CONF_SENSORS,
+    CONF_BINARY_SENSORS,
+)
+
+AUTO_LOAD = ["socket"]
+CODEOWNERS = ["@Links2004"]
+DEPENDENCIES = ["network"]
+
+CONF_HOST = "host"
+CONF_PREFIX = "prefix"
+
+statsd_component_ns = cg.esphome_ns.namespace("statsd")
+StatsdComponent = statsd_component_ns.class_("StatsdComponent", cg.PollingComponent)
+
+CONFIG_SENSORS_SCHEMA = cv.Schema(
+    {
+        cv.Required(CONF_ID): cv.use_id(sensor.Sensor),
+        cv.Required(CONF_NAME): cv.string_strict,
+    }
+)
+
+CONFIG_BINARY_SENSORS_SCHEMA = cv.Schema(
+    {
+        cv.Required(CONF_ID): cv.use_id(binary_sensor.BinarySensor),
+        cv.Required(CONF_NAME): cv.string_strict,
+    }
+)
+
+CONFIG_SCHEMA = cv.Schema(
+    {
+        cv.GenerateID(): cv.declare_id(StatsdComponent),
+        cv.Required(CONF_HOST): cv.string_strict,
+        cv.Optional(CONF_PORT, default=8125): cv.port,
+        cv.Optional(CONF_PREFIX, default=""): cv.string_strict,
+        cv.Optional(CONF_SENSORS): cv.ensure_list(CONFIG_SENSORS_SCHEMA),
+        cv.Optional(CONF_BINARY_SENSORS): cv.ensure_list(CONFIG_BINARY_SENSORS_SCHEMA),
+    }
+).extend(cv.polling_component_schema("10s"))
+
+
+async def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    await cg.register_component(var, config)
+    cg.add(
+        var.configure(
+            config.get(CONF_HOST),
+            config.get(CONF_PORT),
+            config.get(CONF_PREFIX),
+        )
+    )
+
+    for sensor_cfg in config.get(CONF_SENSORS, []):
+        s = await cg.get_variable(sensor_cfg[CONF_ID])
+        cg.add(var.register_sensor(sensor_cfg[CONF_NAME], s))
+
+    for sensor_cfg in config.get(CONF_BINARY_SENSORS, []):
+        s = await cg.get_variable(sensor_cfg[CONF_ID])
+        cg.add(var.register_binary_sensor(sensor_cfg[CONF_NAME], s))

esphome/components/statsd/statsd.cpp

@@ -0,0 +1,156 @@
+#include "esphome/core/log.h"
+
+#include "statsd.h"
+
+namespace esphome {
+namespace statsd {
+
+// send UDP packet if we reach 1Kb packed size
+// this is needed since statsD does not support fragmented UDP packets
+static const uint16_t SEND_THRESHOLD = 1024;
+
+static const char *const TAG = "statsD";
+
+void StatsdComponent::setup() {
+#ifndef USE_ESP8266
+  this->sock_ = esphome::socket::socket(AF_INET, SOCK_DGRAM, 0);
+
+  struct sockaddr_in source;
+  source.sin_family = AF_INET;
+  source.sin_addr.s_addr = htonl(INADDR_ANY);
+  source.sin_port = htons(this->port_);
+  this->sock_->bind((struct sockaddr *) &source, sizeof(source));
+
+  this->destination_.sin_family = AF_INET;
+  this->destination_.sin_port = htons(this->port_);
+  this->destination_.sin_addr.s_addr = inet_addr(this->host_);
+#endif
+}
+
+StatsdComponent::~StatsdComponent() {
+#ifndef USE_ESP8266
+  if (!this->sock_) {
+    return;
+  }
+  this->sock_->close();
+#endif
+}
+
+void StatsdComponent::dump_config() {
+  ESP_LOGCONFIG(TAG, "statsD:");
+  ESP_LOGCONFIG(TAG, "  host: %s", this->host_);
+  ESP_LOGCONFIG(TAG, "  port: %d", this->port_);
+  if (this->prefix_) {
+    ESP_LOGCONFIG(TAG, "  prefix: %s", this->prefix_);
+  }
+
+  ESP_LOGCONFIG(TAG, "  metrics:");
+  for (sensors_t s : this->sensors_) {
+    ESP_LOGCONFIG(TAG, "    - name: %s", s.name);
+    ESP_LOGCONFIG(TAG, "      type: %d", s.type);
+  }
+}
+
+float StatsdComponent::get_setup_priority() const { return esphome::setup_priority::AFTER_WIFI; }
+
+#ifdef USE_SENSOR
+void StatsdComponent::register_sensor(const char *name, esphome::sensor::Sensor *sensor) {
+  sensors_t s;
+  s.name = name;
+  s.sensor = sensor;
+  s.type = TYPE_SENSOR;
+  this->sensors_.push_back(s);
+}
+#endif
+
+#ifdef USE_BINARY_SENSOR
+void StatsdComponent::register_binary_sensor(const char *name, esphome::binary_sensor::BinarySensor *binary_sensor) {
+  sensors_t s;
+  s.name = name;
+  s.binary_sensor = binary_sensor;
+  s.type = TYPE_BINARY_SENSOR;
+  this->sensors_.push_back(s);
+}
+#endif
+
+void StatsdComponent::update() {
+  std::string out;
+  out.reserve(SEND_THRESHOLD);
+
+  for (sensors_t s : this->sensors_) {
+    double val = 0;
+    switch (s.type) {
+#ifdef USE_SENSOR
+      case TYPE_SENSOR:
+        if (!s.sensor->has_state()) {
+          continue;
+        }
+        val = s.sensor->state;
+        break;
+#endif
+#ifdef USE_BINARY_SENSOR
+      case TYPE_BINARY_SENSOR:
+        if (!s.binary_sensor->has_state()) {
+          continue;
+        }
+        // map bool to double
+        if (s.binary_sensor->state) {
+          val = 1;
+        }
+        break;
+#endif
+      default:
+        ESP_LOGE(TAG, "type not known, name: %s type: %d", s.name, s.type);
+        continue;
+    }
+
+    // statsD gauge:
+    // https://github.com/statsd/statsd/blob/master/docs/metric_types.md
+    // This implies you can't explicitly set a gauge to a negative number without first setting it to zero.
+    if (val < 0) {
+      if (this->prefix_) {
+        out.append(str_sprintf("%s.", this->prefix_));
+      }
+      out.append(str_sprintf("%s:0|g\n", s.name));
+    }
+    if (this->prefix_) {
+      out.append(str_sprintf("%s.", this->prefix_));
+    }
+    out.append(str_sprintf("%s:%f|g\n", s.name, val));
+
+    if (out.length() > SEND_THRESHOLD) {
+      this->send_(&out);
+      out.clear();
+    }
+  }
+
+  this->send_(&out);
+}
+
+void StatsdComponent::send_(std::string *out) {
+  if (out->empty()) {
+    return;
+  }
+#ifdef USE_ESP8266
+  IPAddress ip;
+  ip.fromString(this->host_);
+
+  this->sock_.beginPacket(ip, this->port_);
+  this->sock_.write((const uint8_t *) out->c_str(), out->length());
+  this->sock_.endPacket();
+
+#else
+  if (!this->sock_) {
+    return;
+  }
+
+  int n_bytes = this->sock_->sendto(out->c_str(), out->length(), 0, reinterpret_cast<sockaddr *>(&this->destination_),
+                                    sizeof(this->destination_));
+  if (n_bytes != out->length()) {
+    ESP_LOGE(TAG, "Failed to send UDP packed (%d of %d)", n_bytes, out->length());
+  }
+#endif
+}
+
+}  // namespace statsd
+}  // namespace esphome

esphome/components/statsd/statsd.h

@@ -0,0 +1,86 @@
+#pragma once
+
+#include <vector>
+
+#include "esphome/core/defines.h"
+#include "esphome/core/component.h"
+#include "esphome/components/socket/socket.h"
+#include "esphome/components/network/ip_address.h"
+
+#ifdef USE_SENSOR
+#include "esphome/components/sensor/sensor.h"
+#endif
+
+#ifdef USE_BINARY_SENSOR
+#include "esphome/components/binary_sensor/binary_sensor.h"
+#endif
+
+#ifdef USE_LOGGER
+#include "esphome/components/logger/logger.h"
+#endif
+
+#ifdef USE_ESP8266
+#include "WiFiUdp.h"
+#include "IPAddress.h"
+#endif
+
+namespace esphome {
+namespace statsd {
+
+using sensor_type_t = enum { TYPE_SENSOR, TYPE_BINARY_SENSOR };
+
+using sensors_t = struct {
+  const char *name;
+  sensor_type_t type;
+  union {
+#ifdef USE_SENSOR
+    esphome::sensor::Sensor *sensor;
+#endif
+#ifdef USE_BINARY_SENSOR
+    esphome::binary_sensor::BinarySensor *binary_sensor;
+#endif
+  };
+};
+
+class StatsdComponent : public PollingComponent {
+ public:
+  ~StatsdComponent();
+
+  void setup() override;
+  void dump_config() override;
+  void update() override;
+  float get_setup_priority() const override;
+
+  void configure(const char *host, uint16_t port, const char *prefix) {
+    this->host_ = host;
+    this->port_ = port;
+    this->prefix_ = prefix;
+  }
+
+#ifdef USE_SENSOR
+  void register_sensor(const char *name, esphome::sensor::Sensor *sensor);
+#endif
+
+#ifdef USE_BINARY_SENSOR
+  void register_binary_sensor(const char *name, esphome::binary_sensor::BinarySensor *binary_sensor);
+#endif
+
+ private:
+  const char *host_;
+  const char *prefix_;
+  uint16_t port_;
+
+  std::vector<sensors_t> sensors_;
+
+#ifdef USE_ESP8266
+  WiFiUDP sock_;
+#else
+  std::unique_ptr<esphome::socket::Socket> sock_;
+  struct sockaddr_in destination_;
+#endif
+
+  void send_(std::string *out);
+};
+
+}  // namespace statsd
+}  // namespace esphome

esphome/components/tuya/__init__.py

@@ -15,6 +15,7 @@ CONF_DATAPOINT_TYPE = "datapoint_type"
 CONF_STATUS_PIN = "status_pin"
 
 tuya_ns = cg.esphome_ns.namespace("tuya")
+TuyaDatapointType = tuya_ns.enum("TuyaDatapointType", is_class=True)
 Tuya = tuya_ns.class_("Tuya", cg.Component, uart.UARTDevice)
 
 DPTYPE_ANY = "any"

esphome/components/tuya/number/__init__.py

@@ -8,18 +8,37 @@ from esphome.const import (
     CONF_MIN_VALUE,
     CONF_MULTIPLY,
     CONF_STEP,
+    CONF_INITIAL_VALUE,
+    CONF_RESTORE_VALUE,
 )
-from .. import tuya_ns, CONF_TUYA_ID, Tuya
+from .. import tuya_ns, CONF_TUYA_ID, Tuya, TuyaDatapointType
 
 DEPENDENCIES = ["tuya"]
 CODEOWNERS = ["@frankiboy1"]
 
+CONF_DATAPOINT_HIDDEN = "datapoint_hidden"
+CONF_DATAPOINT_TYPE = "datapoint_type"
+
 TuyaNumber = tuya_ns.class_("TuyaNumber", number.Number, cg.Component)
 
+DATAPOINT_TYPES = {
+    "int": TuyaDatapointType.INTEGER,
+    "uint": TuyaDatapointType.INTEGER,
+    "enum": TuyaDatapointType.ENUM,
+}
+
 
 def validate_min_max(config):
-    if config[CONF_MAX_VALUE] <= config[CONF_MIN_VALUE]:
+    max_value = config[CONF_MAX_VALUE]
+    min_value = config[CONF_MIN_VALUE]
+    if max_value <= min_value:
         raise cv.Invalid("max_value must be greater than min_value")
+    if hidden_config := config.get(CONF_DATAPOINT_HIDDEN):
+        if (initial_value := hidden_config.get(CONF_INITIAL_VALUE, None)) is not None:
+            if (initial_value > max_value) or (initial_value < min_value):
+                raise cv.Invalid(
+                    f"{CONF_INITIAL_VALUE} must be a value between {CONF_MAX_VALUE} and {CONF_MIN_VALUE}"
+                )
     return config
 
 
@@ -33,6 +52,17 @@ CONFIG_SCHEMA = cv.All(
             cv.Required(CONF_MIN_VALUE): cv.float_,
             cv.Required(CONF_STEP): cv.positive_float,
             cv.Optional(CONF_MULTIPLY, default=1.0): cv.float_,
+            cv.Optional(CONF_DATAPOINT_HIDDEN): cv.All(
+                cv.Schema(
+                    {
+                        cv.Required(CONF_DATAPOINT_TYPE): cv.enum(
+                            DATAPOINT_TYPES, lower=True
+                        ),
+                        cv.Optional(CONF_INITIAL_VALUE): cv.float_,
+                        cv.Optional(CONF_RESTORE_VALUE, default=False): cv.boolean,
+                    }
+                )
+            ),
         }
     )
     .extend(cv.COMPONENT_SCHEMA),
@@ -56,3 +86,10 @@ async def to_code(config):
     cg.add(var.set_tuya_parent(parent))
 
     cg.add(var.set_number_id(config[CONF_NUMBER_DATAPOINT]))
+    if hidden_config := config.get(CONF_DATAPOINT_HIDDEN):
+        cg.add(var.set_datapoint_type(hidden_config[CONF_DATAPOINT_TYPE]))
+        if (
+            hidden_init_value := hidden_config.get(CONF_INITIAL_VALUE, None)
+        ) is not None:
+            cg.add(var.set_datapoint_initial_value(hidden_init_value))
+        cg.add(var.set_restore_value(hidden_config[CONF_RESTORE_VALUE]))

esphome/components/tuya/number/tuya_number.cpp

@@ -7,16 +7,58 @@ namespace tuya {
 static const char *const TAG = "tuya.number";
 
 void TuyaNumber::setup() {
+  if (this->restore_value_) {
+    this->pref_ = global_preferences->make_preference<float>(this->get_object_id_hash());
+  }
+
   this->parent_->register_listener(this->number_id_, [this](const TuyaDatapoint &datapoint) {
     if (datapoint.type == TuyaDatapointType::INTEGER) {
       ESP_LOGV(TAG, "MCU reported number %u is: %d", datapoint.id, datapoint.value_int);
-      this->publish_state(datapoint.value_int / multiply_by_);
+      float value = datapoint.value_int / multiply_by_;
+      this->publish_state(value);
+      if (this->restore_value_)
+        this->pref_.save(&value);
     } else if (datapoint.type == TuyaDatapointType::ENUM) {
       ESP_LOGV(TAG, "MCU reported number %u is: %u", datapoint.id, datapoint.value_enum);
-      this->publish_state(datapoint.value_enum);
+      float value = datapoint.value_enum;
+      this->publish_state(value);
+      if (this->restore_value_)
+        this->pref_.save(&value);
+    } else {
+      ESP_LOGW(TAG, "Reported type (%d) is not a number!", static_cast<int>(datapoint.type));
+      return;
+    }
+
+    if ((this->type_) && (this->type_ != datapoint.type)) {
+      ESP_LOGW(TAG, "Reported type (%d) different than previously set (%d)!", static_cast<int>(datapoint.type),
+               static_cast<int>(*this->type_));
     }
     this->type_ = datapoint.type;
   });
+
+  this->parent_->add_on_initialized_callback([this] {
+    if (this->type_) {
+      float value;
+      if (!this->restore_value_) {
+        if (this->initial_value_) {
+          value = *this->initial_value_;
+        } else {
+          return;
+        }
+      } else {
+        if (!this->pref_.load(&value)) {
+          if (this->initial_value_) {
+            value = *this->initial_value_;
+          } else {
+            value = this->traits.get_min_value();
+            ESP_LOGW(TAG, "Failed to restore and there is no initial value defined. Setting min_value (%f)", value);
+          }
+        }
+      }
+
+      this->control(value);
+    }
+  });
 }
 
 void TuyaNumber::control(float value) {
@@ -28,11 +70,25 @@ void TuyaNumber::control(float value) {
     this->parent_->set_enum_datapoint_value(this->number_id_, value);
   }
   this->publish_state(value);
+
+  if (this->restore_value_)
+    this->pref_.save(&value);
 }
 
 void TuyaNumber::dump_config() {
   LOG_NUMBER("", "Tuya Number", this);
   ESP_LOGCONFIG(TAG, "  Number has datapoint ID %u", this->number_id_);
+  if (this->type_) {
+    ESP_LOGCONFIG(TAG, "  Datapoint type is %d", static_cast<int>(*this->type_));
+  } else {
+    ESP_LOGCONFIG(TAG, "  Datapoint type is unknown");
+  }
+
+  if (this->initial_value_) {
+    ESP_LOGCONFIG(TAG, "  Initial Value: %f", *this->initial_value_);
+  }
+
+  ESP_LOGCONFIG(TAG, "  Restore Value: %s", YESNO(this->restore_value_));
 }
 
 }  // namespace tuya

esphome/components/tuya/number/tuya_number.h

@@ -1,8 +1,10 @@
 #pragma once
 
-#include "esphome/core/component.h"
-#include "esphome/components/tuya/tuya.h"
 #include "esphome/components/number/number.h"
+#include "esphome/components/tuya/tuya.h"
+#include "esphome/core/component.h"
+#include "esphome/core/optional.h"
+#include "esphome/core/preferences.h"
 
 namespace esphome {
 namespace tuya {
@@ -13,6 +15,9 @@ class TuyaNumber : public number::Number, public Component {
   void dump_config() override;
   void set_number_id(uint8_t number_id) { this->number_id_ = number_id; }
   void set_write_multiply(float factor) { multiply_by_ = factor; }
+  void set_datapoint_type(TuyaDatapointType type) { type_ = type; }
+  void set_datapoint_initial_value(float value) { this->initial_value_ = value; }
+  void set_restore_value(bool restore_value) { this->restore_value_ = restore_value; }
 
   void set_tuya_parent(Tuya *parent) { this->parent_ = parent; }
 
@@ -22,7 +27,11 @@ class TuyaNumber : public number::Number, public Component {
   Tuya *parent_;
   uint8_t number_id_{0};
   float multiply_by_{1.0};
-  TuyaDatapointType type_{};
+  optional<TuyaDatapointType> type_{};
+  optional<float> initial_value_{};
+  bool restore_value_{false};
+
+  ESPPreferenceObject pref_;
 };
 
 }  // namespace tuya