Upstream/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-11-24 12:06:26 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2199 from esphome/bump-2021.8.1

Browse Source 
2021.8.1
This commit is contained in:
Jesse Hills 2021-08-24 14:40:24 +12:00 committed by GitHub
commit 1fac91a659
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
esphome/components/light/addressable_light.cpp
View File

@ -46,9 +46,14 @@ void AddressableLight::write_state(LightState *state) {
// don't use LightState helper, gamma correction+brightness is handled by ESPColorView // don't use LightState helper, gamma correction+brightness is handled by ESPColorView
this->all() = esp_color_from_light_color_values(val); this->all() = esp_color_from_light_color_values(val);
this->schedule_show();
} }
void AddressableLightTransformer::start() { void AddressableLightTransformer::start() {
// don't try to transition over running effects.
if (this->light_.is_effect_active())
return;
auto end_values = this->target_values_; auto end_values = this->target_values_;
this->target_color_ = esp_color_from_light_color_values(end_values); this->target_color_ = esp_color_from_light_color_values(end_values);

2
esphome/components/light/color_mode.h
View File

@ -52,7 +52,7 @@ enum class ColorMode : uint8_t {
/// Only on/off control. /// Only on/off control.
ON_OFF = (uint8_t) ColorCapability::ON_OFF, ON_OFF = (uint8_t) ColorCapability::ON_OFF,
/// Dimmable light. /// Dimmable light.
BRIGHTNESS = (uint8_t) ColorCapability::BRIGHTNESS, BRIGHTNESS = (uint8_t)(ColorCapability::ON_OFF | ColorCapability::BRIGHTNESS),
/// White output only (use only if the light also has another color mode such as RGB). /// White output only (use only if the light also has another color mode such as RGB).
WHITE = (uint8_t)(ColorCapability::ON_OFF | ColorCapability::BRIGHTNESS | ColorCapability::WHITE), WHITE = (uint8_t)(ColorCapability::ON_OFF | ColorCapability::BRIGHTNESS | ColorCapability::WHITE),
/// Controllable color temperature output. /// Controllable color temperature output.

2
esphome/components/mqtt/mqtt_climate.cpp
View File

@ -60,6 +60,8 @@ void MQTTClimateComponent::send_discovery(JsonObject &root, mqtt::SendDiscoveryC
root["max_temp"] = traits.get_visual_max_temperature(); root["max_temp"] = traits.get_visual_max_temperature();
// temp_step // temp_step
root["temp_step"] = traits.get_visual_temperature_step(); root["temp_step"] = traits.get_visual_temperature_step();
// temperature units are always coerced to Celsius internally
root["temp_unit"] = "C";
if (traits.supports_preset(CLIMATE_PRESET_AWAY)) { if (traits.supports_preset(CLIMATE_PRESET_AWAY)) {
// away_mode_command_topic // away_mode_command_topic

6
esphome/components/mqtt/mqtt_light.cpp
View File

@ -54,12 +54,6 @@ void MQTTJSONLightComponent::send_discovery(JsonObject &root, mqtt::SendDiscover
// legacy API // legacy API
if (traits.supports_color_capability(ColorCapability::BRIGHTNESS)) if (traits.supports_color_capability(ColorCapability::BRIGHTNESS))
root["brightness"] = true; root["brightness"] = true;
if (traits.supports_color_capability(ColorCapability::RGB))
root["rgb"] = true;
if (traits.supports_color_capability(ColorCapability::COLOR_TEMPERATURE))
root["color_temp"] = true;
if (traits.supports_color_capability(ColorCapability::WHITE))
root["white_value"] = true;
if (this->state_->supports_effects()) { if (this->state_->supports_effects()) {
root["effect"] = true; root["effect"] = true;

2
esphome/components/template/select/__init__.py
View File

@ -55,7 +55,7 @@ async def to_code(config):
if CONF_LAMBDA in config: if CONF_LAMBDA in config:
template_ = await cg.process_lambda( template_ = await cg.process_lambda(
config[CONF_LAMBDA], [], return_type=cg.optional.template(str) config[CONF_LAMBDA], [], return_type=cg.optional.template(cg.std_string)
) )
cg.add(var.set_template(template_)) cg.add(var.set_template(template_))

2
esphome/components/tuya/fan/tuya_fan.cpp
View File

@ -80,7 +80,7 @@ void TuyaFan::write_state() {
} }
if (this->speed_id_.has_value()) { if (this->speed_id_.has_value()) {
ESP_LOGV(TAG, "Setting speed: %d", this->fan_->speed); ESP_LOGV(TAG, "Setting speed: %d", this->fan_->speed);
this->parent_->set_integer_datapoint_value(*this->speed_id_, this->fan_->speed - 1); this->parent_->set_enum_datapoint_value(*this->speed_id_, this->fan_->speed - 1);
} }
} }

2
esphome/const.py
View File

@ -1,6 +1,6 @@
"""Constants used by esphome.""" """Constants used by esphome."""
__version__ = "2021.8.0" __version__ = "2021.8.1"
ESP_PLATFORM_ESP32 = "ESP32" ESP_PLATFORM_ESP32 = "ESP32"
ESP_PLATFORM_ESP8266 = "ESP8266" ESP_PLATFORM_ESP8266 = "ESP8266"

2
setup.py
View File

@ -21,7 +21,7 @@ PYPI_URL = "https://pypi.python.org/pypi/{}".format(PROJECT_PACKAGE_NAME)
GITHUB_PATH = "{}/{}".format(PROJECT_GITHUB_USERNAME, PROJECT_GITHUB_REPOSITORY) GITHUB_PATH = "{}/{}".format(PROJECT_GITHUB_USERNAME, PROJECT_GITHUB_REPOSITORY)
GITHUB_URL = "https://github.com/{}".format(GITHUB_PATH) GITHUB_URL = "https://github.com/{}".format(GITHUB_PATH)
DOWNLOAD_URL = "{}/archive/v{}.zip".format(GITHUB_URL, const.__version__) DOWNLOAD_URL = "{}/archive/{}.zip".format(GITHUB_URL, const.__version__)
here = os.path.abspath(os.path.dirname(__file__)) here = os.path.abspath(os.path.dirname(__file__))