mirror of
https://github.com/esphome/esphome.git
synced 2025-09-06 21:32:21 +01:00
Merge branch 'cover_logging' into integration
This commit is contained in:
2
.github/actions/restore-python/action.yml
vendored
2
.github/actions/restore-python/action.yml
vendored
@@ -22,7 +22,7 @@ runs:
|
|||||||
python-version: ${{ inputs.python-version }}
|
python-version: ${{ inputs.python-version }}
|
||||||
- name: Restore Python virtual environment
|
- name: Restore Python virtual environment
|
||||||
id: cache-venv
|
id: cache-venv
|
||||||
uses: actions/cache/restore@v4.2.3
|
uses: actions/cache/restore@v4.2.4
|
||||||
with:
|
with:
|
||||||
path: venv
|
path: venv
|
||||||
# yamllint disable-line rule:line-length
|
# yamllint disable-line rule:line-length
|
||||||
|
10
.github/workflows/ci.yml
vendored
10
.github/workflows/ci.yml
vendored
@@ -47,7 +47,7 @@ jobs:
|
|||||||
python-version: ${{ env.DEFAULT_PYTHON }}
|
python-version: ${{ env.DEFAULT_PYTHON }}
|
||||||
- name: Restore Python virtual environment
|
- name: Restore Python virtual environment
|
||||||
id: cache-venv
|
id: cache-venv
|
||||||
uses: actions/cache@v4.2.3
|
uses: actions/cache@v4.2.4
|
||||||
with:
|
with:
|
||||||
path: venv
|
path: venv
|
||||||
# yamllint disable-line rule:line-length
|
# yamllint disable-line rule:line-length
|
||||||
@@ -161,7 +161,7 @@ jobs:
|
|||||||
token: ${{ secrets.CODECOV_TOKEN }}
|
token: ${{ secrets.CODECOV_TOKEN }}
|
||||||
- name: Save Python virtual environment cache
|
- name: Save Python virtual environment cache
|
||||||
if: github.ref == 'refs/heads/dev'
|
if: github.ref == 'refs/heads/dev'
|
||||||
uses: actions/cache/save@v4.2.3
|
uses: actions/cache/save@v4.2.4
|
||||||
with:
|
with:
|
||||||
path: venv
|
path: venv
|
||||||
key: ${{ runner.os }}-${{ steps.restore-python.outputs.python-version }}-venv-${{ needs.common.outputs.cache-key }}
|
key: ${{ runner.os }}-${{ steps.restore-python.outputs.python-version }}-venv-${{ needs.common.outputs.cache-key }}
|
||||||
@@ -222,7 +222,7 @@ jobs:
|
|||||||
python-version: "3.13"
|
python-version: "3.13"
|
||||||
- name: Restore Python virtual environment
|
- name: Restore Python virtual environment
|
||||||
id: cache-venv
|
id: cache-venv
|
||||||
uses: actions/cache@v4.2.3
|
uses: actions/cache@v4.2.4
|
||||||
with:
|
with:
|
||||||
path: venv
|
path: venv
|
||||||
key: ${{ runner.os }}-${{ steps.python.outputs.python-version }}-venv-${{ needs.common.outputs.cache-key }}
|
key: ${{ runner.os }}-${{ steps.python.outputs.python-version }}-venv-${{ needs.common.outputs.cache-key }}
|
||||||
@@ -300,14 +300,14 @@ jobs:
|
|||||||
|
|
||||||
- name: Cache platformio
|
- name: Cache platformio
|
||||||
if: github.ref == 'refs/heads/dev'
|
if: github.ref == 'refs/heads/dev'
|
||||||
uses: actions/cache@v4.2.3
|
uses: actions/cache@v4.2.4
|
||||||
with:
|
with:
|
||||||
path: ~/.platformio
|
path: ~/.platformio
|
||||||
key: platformio-${{ matrix.pio_cache_key }}-${{ hashFiles('platformio.ini') }}
|
key: platformio-${{ matrix.pio_cache_key }}-${{ hashFiles('platformio.ini') }}
|
||||||
|
|
||||||
- name: Cache platformio
|
- name: Cache platformio
|
||||||
if: github.ref != 'refs/heads/dev'
|
if: github.ref != 'refs/heads/dev'
|
||||||
uses: actions/cache/restore@v4.2.3
|
uses: actions/cache/restore@v4.2.4
|
||||||
with:
|
with:
|
||||||
path: ~/.platformio
|
path: ~/.platformio
|
||||||
key: platformio-${{ matrix.pio_cache_key }}-${{ hashFiles('platformio.ini') }}
|
key: platformio-${{ matrix.pio_cache_key }}-${{ hashFiles('platformio.ini') }}
|
||||||
|
@@ -11,7 +11,7 @@ ci:
|
|||||||
repos:
|
repos:
|
||||||
- repo: https://github.com/astral-sh/ruff-pre-commit
|
- repo: https://github.com/astral-sh/ruff-pre-commit
|
||||||
# Ruff version.
|
# Ruff version.
|
||||||
rev: v0.12.7
|
rev: v0.12.8
|
||||||
hooks:
|
hooks:
|
||||||
# Run the linter.
|
# Run the linter.
|
||||||
- id: ruff
|
- id: ruff
|
||||||
|
@@ -99,43 +99,39 @@ const optional<float> &CoverCall::get_tilt() const { return this->tilt_; }
|
|||||||
const optional<bool> &CoverCall::get_toggle() const { return this->toggle_; }
|
const optional<bool> &CoverCall::get_toggle() const { return this->toggle_; }
|
||||||
void CoverCall::validate_() {
|
void CoverCall::validate_() {
|
||||||
auto traits = this->parent_->get_traits();
|
auto traits = this->parent_->get_traits();
|
||||||
|
const char *name = this->parent_->get_name().c_str();
|
||||||
|
|
||||||
if (this->position_.has_value()) {
|
if (this->position_.has_value()) {
|
||||||
auto pos = *this->position_;
|
auto pos = *this->position_;
|
||||||
if (!traits.get_supports_position() && pos != COVER_OPEN && pos != COVER_CLOSED) {
|
if (!traits.get_supports_position() && pos != COVER_OPEN && pos != COVER_CLOSED) {
|
||||||
ESP_LOGW(TAG, "'%s' - This cover device does not support setting position!", this->parent_->get_name().c_str());
|
ESP_LOGW(TAG, "'%s': position unsupported", name);
|
||||||
this->position_.reset();
|
this->position_.reset();
|
||||||
} else if (pos < 0.0f || pos > 1.0f) {
|
} else if (pos < 0.0f || pos > 1.0f) {
|
||||||
ESP_LOGW(TAG, "'%s' - Position %.2f is out of range [0.0 - 1.0]", this->parent_->get_name().c_str(), pos);
|
ESP_LOGW(TAG, "'%s': position %.2f out of range", name, pos);
|
||||||
this->position_ = clamp(pos, 0.0f, 1.0f);
|
this->position_ = clamp(pos, 0.0f, 1.0f);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (this->tilt_.has_value()) {
|
if (this->tilt_.has_value()) {
|
||||||
auto tilt = *this->tilt_;
|
auto tilt = *this->tilt_;
|
||||||
if (!traits.get_supports_tilt()) {
|
if (!traits.get_supports_tilt()) {
|
||||||
ESP_LOGW(TAG, "'%s' - This cover device does not support tilt!", this->parent_->get_name().c_str());
|
ESP_LOGW(TAG, "'%s': tilt unsupported", name);
|
||||||
this->tilt_.reset();
|
this->tilt_.reset();
|
||||||
} else if (tilt < 0.0f || tilt > 1.0f) {
|
} else if (tilt < 0.0f || tilt > 1.0f) {
|
||||||
ESP_LOGW(TAG, "'%s' - Tilt %.2f is out of range [0.0 - 1.0]", this->parent_->get_name().c_str(), tilt);
|
ESP_LOGW(TAG, "'%s': tilt %.2f out of range", name, tilt);
|
||||||
this->tilt_ = clamp(tilt, 0.0f, 1.0f);
|
this->tilt_ = clamp(tilt, 0.0f, 1.0f);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (this->toggle_.has_value()) {
|
if (this->toggle_.has_value()) {
|
||||||
if (!traits.get_supports_toggle()) {
|
if (!traits.get_supports_toggle()) {
|
||||||
ESP_LOGW(TAG, "'%s' - This cover device does not support toggle!", this->parent_->get_name().c_str());
|
ESP_LOGW(TAG, "'%s': toggle unsupported", name);
|
||||||
this->toggle_.reset();
|
this->toggle_.reset();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (this->stop_) {
|
if (this->stop_) {
|
||||||
if (this->position_.has_value()) {
|
if (this->position_.has_value() || this->tilt_.has_value() || this->toggle_.has_value()) {
|
||||||
ESP_LOGW(TAG, "Cannot set position when stopping a cover!");
|
ESP_LOGW(TAG, "'%s': cannot position/tilt/toggle when stopping", name);
|
||||||
this->position_.reset();
|
this->position_.reset();
|
||||||
}
|
|
||||||
if (this->tilt_.has_value()) {
|
|
||||||
ESP_LOGW(TAG, "Cannot set tilt when stopping a cover!");
|
|
||||||
this->tilt_.reset();
|
this->tilt_.reset();
|
||||||
}
|
|
||||||
if (this->toggle_.has_value()) {
|
|
||||||
ESP_LOGW(TAG, "Cannot set toggle when stopping a cover!");
|
|
||||||
this->toggle_.reset();
|
this->toggle_.reset();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
pylint==3.3.7
|
pylint==3.3.7
|
||||||
flake8==7.3.0 # also change in .pre-commit-config.yaml when updating
|
flake8==7.3.0 # also change in .pre-commit-config.yaml when updating
|
||||||
ruff==0.12.7 # also change in .pre-commit-config.yaml when updating
|
ruff==0.12.8 # also change in .pre-commit-config.yaml when updating
|
||||||
pyupgrade==3.20.0 # also change in .pre-commit-config.yaml when updating
|
pyupgrade==3.20.0 # also change in .pre-commit-config.yaml when updating
|
||||||
pre-commit
|
pre-commit
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user