mirror of
https://github.com/esphome/esphome.git
synced 2024-11-22 23:18:10 +01:00
commit
b723728177
7 changed files with 39 additions and 4 deletions
|
@ -932,6 +932,8 @@ def run_esphome(argv):
|
||||||
_LOGGER.error(e, exc_info=args.verbose)
|
_LOGGER.error(e, exc_info=args.verbose)
|
||||||
return 1
|
return 1
|
||||||
|
|
||||||
|
safe_print(f"ESPHome {const.__version__}")
|
||||||
|
|
||||||
for conf_path in args.configuration:
|
for conf_path in args.configuration:
|
||||||
if any(os.path.basename(conf_path) == x for x in SECRETS_FILES):
|
if any(os.path.basename(conf_path) == x for x in SECRETS_FILES):
|
||||||
_LOGGER.warning("Skipping secrets file %s", conf_path)
|
_LOGGER.warning("Skipping secrets file %s", conf_path)
|
||||||
|
|
|
@ -140,8 +140,9 @@ class Cover : public EntityBase, public EntityBase_DeviceClass {
|
||||||
/** Stop the cover.
|
/** Stop the cover.
|
||||||
*
|
*
|
||||||
* This is a legacy method and may be removed later, please use `.make_call()` instead.
|
* This is a legacy method and may be removed later, please use `.make_call()` instead.
|
||||||
|
* As per solution from issue #2885 the call should include perform()
|
||||||
*/
|
*/
|
||||||
ESPDEPRECATED("stop() is deprecated, use make_call().set_command_stop() instead.", "2021.9")
|
ESPDEPRECATED("stop() is deprecated, use make_call().set_command_stop().perform() instead.", "2021.9")
|
||||||
void stop();
|
void stop();
|
||||||
|
|
||||||
void add_on_state_callback(std::function<void()> &&f);
|
void add_on_state_callback(std::function<void()> &&f);
|
||||||
|
|
|
@ -34,7 +34,7 @@ class ESP32RMTLEDStripLightOutput : public light::AddressableLight {
|
||||||
light::LightTraits get_traits() override {
|
light::LightTraits get_traits() override {
|
||||||
auto traits = light::LightTraits();
|
auto traits = light::LightTraits();
|
||||||
if (this->is_rgbw_) {
|
if (this->is_rgbw_) {
|
||||||
traits.set_supported_color_modes({light::ColorMode::RGB, light::ColorMode::RGB_WHITE});
|
traits.set_supported_color_modes({light::ColorMode::RGB_WHITE, light::ColorMode::WHITE});
|
||||||
} else {
|
} else {
|
||||||
traits.set_supported_color_modes({light::ColorMode::RGB});
|
traits.set_supported_color_modes({light::ColorMode::RGB});
|
||||||
}
|
}
|
||||||
|
|
|
@ -33,6 +33,10 @@ void InternalTemperatureSensor::update() {
|
||||||
temp_sensor_config_t tsens = TSENS_CONFIG_DEFAULT();
|
temp_sensor_config_t tsens = TSENS_CONFIG_DEFAULT();
|
||||||
temp_sensor_set_config(tsens);
|
temp_sensor_set_config(tsens);
|
||||||
temp_sensor_start();
|
temp_sensor_start();
|
||||||
|
#if defined(USE_ESP32_VARIANT_ESP32S3) && (ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(4, 4, 3))
|
||||||
|
#error \
|
||||||
|
"ESP32-S3 internal temperature sensor requires ESP IDF V4.4.3 or higher. See https://github.com/esphome/issues/issues/4271"
|
||||||
|
#endif
|
||||||
esp_err_t result = temp_sensor_read_celsius(&temperature);
|
esp_err_t result = temp_sensor_read_celsius(&temperature);
|
||||||
temp_sensor_stop();
|
temp_sensor_stop();
|
||||||
success = (result == ESP_OK);
|
success = (result == ESP_OK);
|
||||||
|
|
|
@ -1,18 +1,45 @@
|
||||||
import esphome.codegen as cg
|
import esphome.codegen as cg
|
||||||
import esphome.config_validation as cv
|
import esphome.config_validation as cv
|
||||||
from esphome.components import sensor
|
from esphome.components import sensor
|
||||||
|
from esphome.components.esp32 import get_esp32_variant
|
||||||
|
from esphome.components.esp32.const import (
|
||||||
|
VARIANT_ESP32S3,
|
||||||
|
)
|
||||||
from esphome.const import (
|
from esphome.const import (
|
||||||
STATE_CLASS_MEASUREMENT,
|
STATE_CLASS_MEASUREMENT,
|
||||||
UNIT_CELSIUS,
|
UNIT_CELSIUS,
|
||||||
DEVICE_CLASS_TEMPERATURE,
|
DEVICE_CLASS_TEMPERATURE,
|
||||||
ENTITY_CATEGORY_DIAGNOSTIC,
|
ENTITY_CATEGORY_DIAGNOSTIC,
|
||||||
|
KEY_CORE,
|
||||||
|
KEY_FRAMEWORK_VERSION,
|
||||||
)
|
)
|
||||||
|
from esphome.core import CORE
|
||||||
|
|
||||||
internal_temperature_ns = cg.esphome_ns.namespace("internal_temperature")
|
internal_temperature_ns = cg.esphome_ns.namespace("internal_temperature")
|
||||||
InternalTemperatureSensor = internal_temperature_ns.class_(
|
InternalTemperatureSensor = internal_temperature_ns.class_(
|
||||||
"InternalTemperatureSensor", sensor.Sensor, cg.PollingComponent
|
"InternalTemperatureSensor", sensor.Sensor, cg.PollingComponent
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def validate_config(config):
|
||||||
|
if CORE.is_esp32:
|
||||||
|
variant = get_esp32_variant()
|
||||||
|
if variant == VARIANT_ESP32S3:
|
||||||
|
if CORE.using_arduino and CORE.data[KEY_CORE][
|
||||||
|
KEY_FRAMEWORK_VERSION
|
||||||
|
] < cv.Version(2, 0, 6):
|
||||||
|
raise cv.Invalid(
|
||||||
|
"ESP32-S3 Internal Temperature Sensor requires framework version 2.0.6 or higher. See <https://github.com/esphome/issues/issues/4271>."
|
||||||
|
)
|
||||||
|
if CORE.using_esp_idf and CORE.data[KEY_CORE][
|
||||||
|
KEY_FRAMEWORK_VERSION
|
||||||
|
] < cv.Version(4, 4, 3):
|
||||||
|
raise cv.Invalid(
|
||||||
|
"ESP32-S3 Internal Temperature Sensor requires framework version 4.4.3 or higher. See <https://github.com/esphome/issues/issues/4271>."
|
||||||
|
)
|
||||||
|
return config
|
||||||
|
|
||||||
|
|
||||||
CONFIG_SCHEMA = cv.All(
|
CONFIG_SCHEMA = cv.All(
|
||||||
sensor.sensor_schema(
|
sensor.sensor_schema(
|
||||||
InternalTemperatureSensor,
|
InternalTemperatureSensor,
|
||||||
|
@ -23,6 +50,7 @@ CONFIG_SCHEMA = cv.All(
|
||||||
entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
|
entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
|
||||||
).extend(cv.polling_component_schema("60s")),
|
).extend(cv.polling_component_schema("60s")),
|
||||||
cv.only_on(["esp32", "rp2040"]),
|
cv.only_on(["esp32", "rp2040"]),
|
||||||
|
validate_config,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -506,12 +506,12 @@ void number_to_payload(std::vector<uint16_t> &data, int64_t value, SensorValueTy
|
||||||
case SensorValueType::U_DWORD:
|
case SensorValueType::U_DWORD:
|
||||||
case SensorValueType::S_DWORD:
|
case SensorValueType::S_DWORD:
|
||||||
case SensorValueType::FP32:
|
case SensorValueType::FP32:
|
||||||
case SensorValueType::FP32_R:
|
|
||||||
data.push_back((value & 0xFFFF0000) >> 16);
|
data.push_back((value & 0xFFFF0000) >> 16);
|
||||||
data.push_back(value & 0xFFFF);
|
data.push_back(value & 0xFFFF);
|
||||||
break;
|
break;
|
||||||
case SensorValueType::U_DWORD_R:
|
case SensorValueType::U_DWORD_R:
|
||||||
case SensorValueType::S_DWORD_R:
|
case SensorValueType::S_DWORD_R:
|
||||||
|
case SensorValueType::FP32_R:
|
||||||
data.push_back(value & 0xFFFF);
|
data.push_back(value & 0xFFFF);
|
||||||
data.push_back((value & 0xFFFF0000) >> 16);
|
data.push_back((value & 0xFFFF0000) >> 16);
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
"""Constants used by esphome."""
|
"""Constants used by esphome."""
|
||||||
|
|
||||||
__version__ = "2023.5.3"
|
__version__ = "2023.5.4"
|
||||||
|
|
||||||
ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
|
ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue