mirror of
https://github.com/esphome/esphome.git
synced 2026-11-19 03:25:57 +00:00
Compare commits
6
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
79b3aa8e47 | ||
|
|
77cbac2b61 | ||
|
|
4dca82e9c2 | ||
|
|
a7dffa3f2f | ||
|
|
c2e364d7bf | ||
|
|
1ff447f4e6 |
No files matched your search
@@ -1,128 +0,0 @@
|
||||
// Requests a Copilot code review on a pull request. A failed request only
|
||||
// warns: Copilot review is advisory and must never block the PR.
|
||||
//
|
||||
// GitHub answers a request it will not act on (one made by an identity without
|
||||
// a Copilot seat, which includes GITHUB_TOKEN and GitHub Apps when the PR
|
||||
// author has no Copilot access) with a success and no review, so the timeline
|
||||
// is read back to confirm the request was recorded.
|
||||
|
||||
const COPILOT_REVIEWER = "copilot-pull-request-reviewer[bot]";
|
||||
// The timeline names the reviewer by its display login; the reviews API uses
|
||||
// the bot account.
|
||||
const COPILOT_LOGINS = new Set(["Copilot", COPILOT_REVIEWER]);
|
||||
|
||||
module.exports = async ({ github, context, core }) => {
|
||||
const pull = context.payload.pull_request;
|
||||
if (pull.user?.type === "Bot") {
|
||||
core.info(`#${pull.number} was opened by a bot; skipping the Copilot review.`);
|
||||
return;
|
||||
}
|
||||
await requestCopilotReview({ github, core, ...context.repo, prNumber: pull.number });
|
||||
};
|
||||
|
||||
async function requestCopilotReview({ github, core, owner, repo, prNumber }) {
|
||||
const readTimeline = () =>
|
||||
github.paginate(github.rest.issues.listEventsForTimeline, {
|
||||
owner,
|
||||
repo,
|
||||
issue_number: prNumber,
|
||||
per_page: 100,
|
||||
});
|
||||
const { login: requester, stop } = await identify({ github, core });
|
||||
if (stop) return;
|
||||
let before = null;
|
||||
if (requester) {
|
||||
try {
|
||||
before = await readTimeline();
|
||||
} catch (err) {
|
||||
core.warning(
|
||||
`Could not read the timeline of #${prNumber}, so the request goes unconfirmed: ${err.message}`
|
||||
);
|
||||
}
|
||||
}
|
||||
try {
|
||||
await github.rest.pulls.requestReviewers({
|
||||
owner,
|
||||
repo,
|
||||
pull_number: prNumber,
|
||||
reviewers: [COPILOT_REVIEWER],
|
||||
});
|
||||
} catch (err) {
|
||||
core.warning(`Could not request a Copilot review on #${prNumber}: ${err.message}`);
|
||||
return;
|
||||
}
|
||||
if (!before) return;
|
||||
let events;
|
||||
try {
|
||||
events = await readTimeline();
|
||||
} catch (err) {
|
||||
core.warning(
|
||||
`Requested a Copilot review on #${prNumber} but could not confirm it: ${err.message}`
|
||||
);
|
||||
return;
|
||||
}
|
||||
const seen = new Set(before.map((event) => event.id));
|
||||
const copilotRequests = events.filter(
|
||||
(event) =>
|
||||
event.event === "review_requested" &&
|
||||
COPILOT_LOGINS.has(event.requested_reviewer?.login)
|
||||
);
|
||||
// Ours is a request this token's account filed that was not there before.
|
||||
if (
|
||||
copilotRequests.some(
|
||||
(event) => event.actor?.login === requester && !seen.has(event.id)
|
||||
)
|
||||
) {
|
||||
core.info(`Requested a Copilot review on #${prNumber}.`);
|
||||
return;
|
||||
}
|
||||
// The latest request or removal decides whether a review is still queued.
|
||||
const last = events
|
||||
.filter(
|
||||
(event) =>
|
||||
(event.event === "review_requested" ||
|
||||
event.event === "review_request_removed") &&
|
||||
COPILOT_LOGINS.has(event.requested_reviewer?.login)
|
||||
)
|
||||
.at(-1);
|
||||
if (last?.event === "review_requested" && !reviewedSince(events, last.created_at)) {
|
||||
core.info(
|
||||
`A Copilot review requested by ${last.actor?.login} is still pending on #${prNumber}.`
|
||||
);
|
||||
return;
|
||||
}
|
||||
core.warning(
|
||||
`GitHub accepted the Copilot review request on #${prNumber} but recorded none; ` +
|
||||
`${requester} likely has no Copilot seat.`
|
||||
);
|
||||
}
|
||||
|
||||
// The account the token belongs to: { login }, {} when it can't be told
|
||||
// (the request goes ahead unconfirmed), or { stop: true } when the token is rejected.
|
||||
async function identify({ github, core }) {
|
||||
try {
|
||||
const { data } = await github.rest.users.getAuthenticated();
|
||||
return { login: data.login };
|
||||
} catch (err) {
|
||||
// An expired or revoked token fails loudly so someone rotates it.
|
||||
if (err.status === 401) {
|
||||
core.setFailed(
|
||||
`COPILOT_REVIEW_TOKEN was rejected (${err.message}); rotate esphome-review-bot's token.`
|
||||
);
|
||||
return { stop: true };
|
||||
}
|
||||
core.warning(
|
||||
`Could not identify the requesting account, so the request goes unconfirmed: ${err.message}`
|
||||
);
|
||||
return {};
|
||||
}
|
||||
}
|
||||
|
||||
function reviewedSince(events, since) {
|
||||
return events.some(
|
||||
(event) =>
|
||||
event.event === "reviewed" &&
|
||||
COPILOT_LOGINS.has(event.user?.login) &&
|
||||
Date.parse(event.submitted_at) >= Date.parse(since)
|
||||
);
|
||||
}
|
||||
@@ -1,7 +0,0 @@
|
||||
{
|
||||
"name": "request-copilot-review",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
"test": "node --test tests/*.test.js"
|
||||
}
|
||||
}
|
||||
@@ -1,174 +0,0 @@
|
||||
const { test } = require('node:test');
|
||||
const assert = require('node:assert/strict');
|
||||
const requestCopilotReview = require('../index');
|
||||
|
||||
const REPO = { owner: 'esphome', repo: 'esphome' };
|
||||
|
||||
const OLD = '2020-01-01T00:00:00Z';
|
||||
const LATER = '2020-01-01T00:05:00Z';
|
||||
// The account the workflow's token belongs to.
|
||||
const REQUESTER = 'esphome-review-bot';
|
||||
// "ours" is a request filed by REQUESTER; anything else stands for the ruleset or a maintainer.
|
||||
const copilotRequest = (id, by, createdAt = LATER) => ({
|
||||
id,
|
||||
event: 'review_requested',
|
||||
actor: { login: by === 'ours' ? REQUESTER : 'someone', type: 'User' },
|
||||
requested_reviewer: { login: 'Copilot' },
|
||||
created_at: createdAt,
|
||||
});
|
||||
const copilotReview = (id, submittedAt, login = 'Copilot') => ({
|
||||
id,
|
||||
event: 'reviewed',
|
||||
user: { login },
|
||||
submitted_at: submittedAt,
|
||||
});
|
||||
const copilotRemoval = (id) => ({
|
||||
id,
|
||||
event: 'review_request_removed',
|
||||
requested_reviewer: { login: 'Copilot' },
|
||||
created_at: LATER,
|
||||
});
|
||||
|
||||
// `before` and `after` are the timeline reads around the request, `timeline` sets both, and
|
||||
// `timelineError` makes that read throw.
|
||||
function makeGithub(opts = {}) {
|
||||
const calls = [];
|
||||
const reads = [
|
||||
{ name: 'before', events: opts.timeline ?? opts.before ?? [] },
|
||||
{ name: 'after', events: opts.timeline ?? opts.after ?? [copilotRequest(1, 'ours')] },
|
||||
];
|
||||
const listEventsForTimeline = () => {};
|
||||
return {
|
||||
calls,
|
||||
github: {
|
||||
paginate: async (fn) => {
|
||||
assert.equal(fn, listEventsForTimeline);
|
||||
const read = reads.shift();
|
||||
assert.ok(read, 'the timeline is read at most twice');
|
||||
if (opts.timelineError === read.name) throw new Error('secondary rate limit');
|
||||
return read.events;
|
||||
},
|
||||
rest: {
|
||||
users: {
|
||||
getAuthenticated: async () => {
|
||||
if (opts.whoamiStatus) {
|
||||
throw Object.assign(new Error('Bad credentials'), { status: opts.whoamiStatus });
|
||||
}
|
||||
return { data: { login: REQUESTER } };
|
||||
},
|
||||
},
|
||||
issues: { listEventsForTimeline },
|
||||
pulls: {
|
||||
requestReviewers: async (args) => {
|
||||
if (opts.fail) throw new Error('Reviews may only be requested from collaborators');
|
||||
calls.push(args);
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
function makeCore() {
|
||||
const warnings = [];
|
||||
const infos = [];
|
||||
const failures = [];
|
||||
return {
|
||||
warnings,
|
||||
infos,
|
||||
failures,
|
||||
core: {
|
||||
info: (m) => void infos.push(m),
|
||||
warning: (m) => void warnings.push(m),
|
||||
setFailed: (m) => void failures.push(m),
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
async function run(githubOpts, type = 'User') {
|
||||
const { github, calls } = makeGithub(githubOpts);
|
||||
const { core, infos, warnings, failures } = makeCore();
|
||||
const context = { repo: REPO, payload: { pull_request: { number: 9, user: { type } } } };
|
||||
await requestCopilotReview({ github, context, core });
|
||||
return { calls, infos, warnings, failures };
|
||||
}
|
||||
|
||||
test('a PR event requests a Copilot review', async () => {
|
||||
const { calls, infos, warnings } = await run();
|
||||
assert.deepEqual(calls, [{ ...REPO, pull_number: 9, reviewers: ['copilot-pull-request-reviewer[bot]'] }]);
|
||||
assert.deepEqual(warnings, []);
|
||||
assert.match(infos[0], /Requested a Copilot review on #9/);
|
||||
});
|
||||
|
||||
test('bot PRs are skipped', async () => {
|
||||
const { calls } = await run({}, 'Bot');
|
||||
assert.deepEqual(calls, []);
|
||||
});
|
||||
|
||||
test('a failed request warns instead of failing', async () => {
|
||||
const { warnings, failures } = await run({ fail: true });
|
||||
assert.match(warnings[0], /Could not request a Copilot review on #9/);
|
||||
assert.deepEqual(failures, []);
|
||||
});
|
||||
|
||||
test('an accepted request GitHub never recorded warns', async () => {
|
||||
const { warnings } = await run({ after: [{ id: 1, event: 'labeled' }] });
|
||||
assert.match(warnings[0], /recorded none/);
|
||||
});
|
||||
|
||||
test('a request filed by another account does not confirm ours', async () => {
|
||||
const { warnings } = await run({ after: [copilotRequest(1, 'other'), copilotReview(2, LATER)] });
|
||||
assert.match(warnings[0], /recorded none/);
|
||||
});
|
||||
|
||||
test('an earlier request by the same account does not confirm this one', async () => {
|
||||
const { warnings } = await run({ timeline: [copilotRequest(1, 'ours', OLD), copilotReview(2, LATER)] });
|
||||
assert.match(warnings[0], /recorded none/);
|
||||
});
|
||||
|
||||
test('a Copilot review still pending is logged, not warned', async () => {
|
||||
const { infos, warnings } = await run({ timeline: [copilotReview(1, OLD), copilotRequest(2, 'other')] });
|
||||
assert.deepEqual(warnings, []);
|
||||
assert.match(infos[0], /requested by someone is still pending on #9/);
|
||||
});
|
||||
|
||||
test('a Copilot request that was removed is not pending', async () => {
|
||||
const { warnings } = await run({ timeline: [copilotRequest(1, 'other'), copilotRemoval(2)] });
|
||||
assert.match(warnings[0], /recorded none/);
|
||||
});
|
||||
|
||||
test('a completed review under the bot account login ends the pending request', async () => {
|
||||
const timeline = [
|
||||
copilotRequest(1, 'other', OLD),
|
||||
copilotReview(2, LATER, 'copilot-pull-request-reviewer[bot]'),
|
||||
];
|
||||
const { warnings } = await run({ timeline });
|
||||
assert.match(warnings[0], /recorded none/);
|
||||
});
|
||||
|
||||
test('a failed timeline read after the request warns instead of failing', async () => {
|
||||
const { calls, warnings } = await run({ timelineError: 'after' });
|
||||
assert.equal(calls.length, 1);
|
||||
assert.match(warnings[0], /could not confirm it: secondary rate limit/);
|
||||
});
|
||||
|
||||
test('a failed baseline read still requests the review, unconfirmed', async () => {
|
||||
const { calls, warnings } = await run({ timelineError: 'before' });
|
||||
assert.equal(calls.length, 1);
|
||||
assert.equal(warnings.length, 1);
|
||||
assert.match(warnings[0], /goes unconfirmed: secondary rate limit/);
|
||||
});
|
||||
|
||||
test('a rejected token fails the run so it gets rotated', async () => {
|
||||
const { calls, failures } = await run({ whoamiStatus: 401 });
|
||||
assert.equal(calls.length, 0);
|
||||
assert.match(failures[0], /COPILOT_REVIEW_TOKEN was rejected/);
|
||||
});
|
||||
|
||||
test('a failed account lookup still requests the review, unconfirmed', async () => {
|
||||
const { calls, warnings, failures } = await run({ whoamiStatus: 502 });
|
||||
assert.equal(calls.length, 1);
|
||||
assert.deepEqual(failures, []);
|
||||
assert.equal(warnings.length, 1);
|
||||
assert.match(warnings[0], /Could not identify the requesting account/);
|
||||
});
|
||||
@@ -74,9 +74,6 @@ workflows:
|
||||
- 'docker/login-action@v4.8.0'
|
||||
- 'docker/setup-buildx-action@v4.4.1'
|
||||
- 'pypa/gh-action-pypi-publish@v1.14.3'
|
||||
'.github/workflows/request-copilot-review.yml':
|
||||
- 'actions/checkout@v7.0.1'
|
||||
- 'actions/github-script@v9.0.0'
|
||||
'.github/workflows/stale.yml': []
|
||||
'.github/workflows/status-check-labels.yml':
|
||||
- 'actions/github-script@v9.0.0'
|
||||
|
||||
@@ -25,14 +25,3 @@ jobs:
|
||||
- name: Run tests
|
||||
working-directory: .github/scripts/auto-label-pr
|
||||
run: npm test
|
||||
|
||||
test-request-copilot-review:
|
||||
name: Test request-copilot-review script
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Check out code from GitHub
|
||||
uses: actions/checkout@v7.0.1
|
||||
|
||||
- name: Run tests
|
||||
working-directory: .github/scripts/request-copilot-review
|
||||
run: npm test
|
||||
@@ -1,56 +0,0 @@
|
||||
name: Request Copilot review
|
||||
|
||||
# Requests a Copilot code review when a ready pull request against dev is
|
||||
# opened, reopened or marked ready for review; like the ruleset, not on every
|
||||
# push. The ruleset reviews these too, but it runs the review as the PR author
|
||||
# (or whoever marked it ready), so a contributor without Copilot access gets
|
||||
# none. This runs it as esphome-review-bot, which needs a Copilot seat and
|
||||
# Triage on this repo. COPILOT_REVIEW_TOKEN is an org secret holding its
|
||||
# fine-grained token (Pull requests read and write) and expires: when it is
|
||||
# rejected the run fails, and an org owner signs in as the bot, creates a new
|
||||
# one and replaces the secret.
|
||||
|
||||
on:
|
||||
pull_request_target:
|
||||
types:
|
||||
- opened
|
||||
- reopened
|
||||
- ready_for_review
|
||||
branches:
|
||||
- dev
|
||||
|
||||
permissions: {}
|
||||
|
||||
# Overlapping runs could each take the other's request as their own confirmation.
|
||||
concurrency:
|
||||
group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
|
||||
cancel-in-progress: true
|
||||
|
||||
jobs:
|
||||
request:
|
||||
name: Request Copilot review
|
||||
runs-on: ubuntu-latest
|
||||
# Forks have no review bot token, bot PRs (Dependabot) get no repo secrets,
|
||||
# and drafts are not reviewed.
|
||||
if: >-
|
||||
github.repository == 'esphome/esphome'
|
||||
&& github.event.pull_request.user.type != 'Bot'
|
||||
&& !github.event.pull_request.draft
|
||||
permissions:
|
||||
contents: read # to check out the script below
|
||||
steps:
|
||||
# Checks out the base repo (trusted) only to load the script below,
|
||||
# never the PR's code - this job holds the review bot's token.
|
||||
- name: Checkout scripts
|
||||
uses: actions/checkout@v7.0.1
|
||||
with:
|
||||
sparse-checkout: .github/scripts/request-copilot-review
|
||||
persist-credentials: false
|
||||
|
||||
- name: Request Copilot review
|
||||
uses: actions/github-script@v9.0.0
|
||||
with:
|
||||
github-token: ${{ secrets.COPILOT_REVIEW_TOKEN }}
|
||||
script: |
|
||||
const script = require('./.github/scripts/request-copilot-review/index.js');
|
||||
await script({ github, context, core });
|
||||
@@ -10,12 +10,7 @@ from typing import TYPE_CHECKING
|
||||
from esphome.build_helpers.ccache import resolve_absolute_ccache_path
|
||||
from esphome.build_helpers.native import warn_ignored_platformio_options
|
||||
from esphome.build_helpers.ninja import refresh_compile_commands
|
||||
from esphome.const import (
|
||||
CONF_COMPILE_PROCESS_LIMIT,
|
||||
CONF_ESPHOME,
|
||||
KEY_CORE,
|
||||
KEY_FRAMEWORK_VERSION,
|
||||
)
|
||||
from esphome.const import CONF_COMPILE_PROCESS_LIMIT, CONF_ESPHOME
|
||||
from esphome.core import CORE
|
||||
from esphome.types import ConfigType
|
||||
|
||||
@@ -73,7 +68,7 @@ def run_compile(config: ConfigType, verbose: bool) -> int:
|
||||
from esphome.core.config import NATIVE_ARDUINO_CONSUMED_PIO_OPTIONS
|
||||
|
||||
warn_ignored_platformio_options(NATIVE_ARDUINO_CONSUMED_PIO_OPTIONS)
|
||||
paths = framework.check_and_install(CORE.data[KEY_CORE][KEY_FRAMEWORK_VERSION])
|
||||
paths = framework.check_and_install(CORE.framework_version)
|
||||
# Resolved once: the probe is not free and three consumers need it
|
||||
ccache = resolve_absolute_ccache_path()
|
||||
ninja_changed = build_gen.write_project(paths, ccache)
|
||||
|
||||
@@ -36,8 +36,6 @@ from esphome.const import (
|
||||
CONF_ESPHOME,
|
||||
CONF_ID,
|
||||
CONF_PLATFORMIO_OPTIONS,
|
||||
KEY_CORE,
|
||||
KEY_FRAMEWORK_VERSION,
|
||||
)
|
||||
from esphome.core import CORE, EsphomeError
|
||||
import esphome.final_validate as fv
|
||||
@@ -128,7 +126,7 @@ def _final_validate(config: ConfigType) -> None:
|
||||
_LOGGER.warning("%s (this configuration cannot compile)", msg)
|
||||
options = fv.full_config.get()[CONF_ESPHOME].get(CONF_PLATFORMIO_OPTIONS) or {}
|
||||
check_bdk_version(options.get(BEKEN_BDK_VERSION_OPTION))
|
||||
check_libretiny_version(CORE.data[KEY_CORE][KEY_FRAMEWORK_VERSION])
|
||||
check_libretiny_version(CORE.framework_version)
|
||||
|
||||
|
||||
FINAL_VALIDATE_SCHEMA = _final_validate
|
||||
|
||||
@@ -3001,7 +3001,7 @@ async def _finalize_arduino_aware_flags():
|
||||
|
||||
|
||||
async def to_code(config):
|
||||
framework_ver: cv.Version = CORE.data[KEY_CORE][KEY_FRAMEWORK_VERSION]
|
||||
framework_ver = CORE.framework_version
|
||||
conf = config[CONF_FRAMEWORK]
|
||||
|
||||
# Check if using ESP-IDF toolchain
|
||||
@@ -3838,9 +3838,8 @@ def _write_sdkconfig():
|
||||
# version switch that happens to leave the option set unchanged still
|
||||
# bumps this file's content -- which is what has_outdated_files()
|
||||
# uses to decide whether to reconfigure.
|
||||
framework_version = CORE.data[KEY_CORE][KEY_FRAMEWORK_VERSION]
|
||||
contents = (
|
||||
f"# ESPHOME_IDF_VERSION={framework_version}\n"
|
||||
f"# ESPHOME_IDF_VERSION={CORE.framework_version}\n"
|
||||
+ "\n".join(
|
||||
f"{name}={_format_sdkconfig_val(value)}"
|
||||
for name, value in sorted(want_opts.items())
|
||||
@@ -3991,7 +3990,7 @@ def _write_idf_component_yml():
|
||||
if CORE.using_toolchain_esp_idf:
|
||||
add_idf_component(
|
||||
name=ARDUINO_ESP32_COMPONENT_NAME,
|
||||
ref=str(CORE.data[KEY_CORE][KEY_FRAMEWORK_VERSION]),
|
||||
ref=str(CORE.framework_version),
|
||||
)
|
||||
|
||||
for component in converted:
|
||||
|
||||
@@ -529,7 +529,7 @@ async def to_code(config: ConfigType) -> None:
|
||||
# keeping one source of truth
|
||||
cg.add_platformio_option("board_build.flash_mode", config[CONF_BOARD_FLASH_MODE])
|
||||
|
||||
ver: cv.Version = CORE.data[KEY_CORE][KEY_FRAMEWORK_VERSION]
|
||||
ver = CORE.framework_version
|
||||
cg.add_define(
|
||||
"USE_ARDUINO_VERSION_CODE",
|
||||
cg.RawExpression(f"VERSION_CODE({ver.major}, {ver.minor}, {ver.patch})"),
|
||||
|
||||
@@ -46,8 +46,6 @@ from esphome.const import (
|
||||
CONF_USE_ADDRESS,
|
||||
CONF_VALUE,
|
||||
CONF_WIFI,
|
||||
KEY_CORE,
|
||||
KEY_FRAMEWORK_VERSION,
|
||||
Platform,
|
||||
PlatformFramework,
|
||||
)
|
||||
@@ -347,13 +345,13 @@ def _validate(config: ConfigType) -> ConfigType:
|
||||
if CONF_POLLING_INTERVAL in config:
|
||||
raise cv.Invalid(
|
||||
"In this version of the framework "
|
||||
f"({CORE.target_framework} {CORE.data[KEY_CORE][KEY_FRAMEWORK_VERSION]}), "
|
||||
f"({CORE.target_framework} {CORE.framework_version}), "
|
||||
f"'{CONF_POLLING_INTERVAL}' is not supported."
|
||||
)
|
||||
if CONF_INTERRUPT_PIN not in config:
|
||||
raise cv.Invalid(
|
||||
"In this version of the framework "
|
||||
f"({CORE.target_framework} {CORE.data[KEY_CORE][KEY_FRAMEWORK_VERSION]}), "
|
||||
f"({CORE.target_framework} {CORE.framework_version}), "
|
||||
f"'{CONF_INTERRUPT_PIN}' is a required option for [ethernet]."
|
||||
)
|
||||
elif config[CONF_TYPE] in ("GENERIC", "YT8531"):
|
||||
|
||||
@@ -241,7 +241,7 @@ def has_software_serial() -> bool:
|
||||
|
||||
def can_choose_uart_pins() -> bool:
|
||||
"""True when SerialClass::begin() takes the pins, which LibreTiny added in 1.12.0."""
|
||||
return CORE.data[KEY_CORE][KEY_FRAMEWORK_VERSION] >= cv.Version(1, 12, 0)
|
||||
return CORE.framework_version >= cv.Version(1, 12, 0)
|
||||
|
||||
|
||||
def only_on_family(*, supported=None, unsupported=None):
|
||||
@@ -643,8 +643,7 @@ async def component_to_code(config):
|
||||
build_src_flags += " -Os"
|
||||
cg.add_platformio_option("build_src_flags", build_src_flags)
|
||||
# LibreTiny before 1.14.0 breaks under SCons 4.11 without this script; see the script
|
||||
version = CORE.data[KEY_CORE][KEY_FRAMEWORK_VERSION]
|
||||
if (version.major, version.minor, version.patch) < (1, 14, 0):
|
||||
if CORE.framework_version < cv.Version(1, 14, 0):
|
||||
cg.add_platformio_option("extra_scripts", ["pre:scons_dont_inherit.py"])
|
||||
cg.add_platformio_option("extra_scripts", ["pre:ccache.py"])
|
||||
# IRAM_ATTR is a no-op on BK72xx (SDK masks FIQ+IRQ around flash ops).
|
||||
|
||||
@@ -151,8 +151,7 @@ Color color_from_light_color_values(LightColorValues val) {
|
||||
auto r = to_uint8_scale(val.get_color_brightness() * val.get_red());
|
||||
auto g = to_uint8_scale(val.get_color_brightness() * val.get_green());
|
||||
auto b = to_uint8_scale(val.get_color_brightness() * val.get_blue());
|
||||
// White keeps its default of 100% in RGB mode, where it must not count as the strongest channel
|
||||
uint8_t w = val.get_color_mode() == ColorMode::RGB ? 0 : to_uint8_scale(val.get_white());
|
||||
auto w = to_uint8_scale(val.get_white());
|
||||
return Color(r, g, b, w);
|
||||
}
|
||||
|
||||
|
||||
@@ -12,45 +12,6 @@ uint8_t ESPColorCorrection::gamma_correct_(uint8_t value) const {
|
||||
return result;
|
||||
}
|
||||
|
||||
uint16_t ESPColorCorrection::gamma_level_(uint8_t value) const {
|
||||
if (this->gamma_table_ == nullptr)
|
||||
return value * 257;
|
||||
return progmem_read_uint16(&this->gamma_table_[value]);
|
||||
}
|
||||
|
||||
uint8_t ESPColorCorrection::gamma_round_(uint8_t value) const {
|
||||
if (this->gamma_table_ == nullptr)
|
||||
return value;
|
||||
return (progmem_read_uint16(&this->gamma_table_[value]) + 128) / 257;
|
||||
}
|
||||
|
||||
// Lighting every non-zero channel instead would turn a dim red with a trace of green into yellow
|
||||
Color ESPColorCorrection::correct_dark_pixel_(Color color) const {
|
||||
// Compared without the local brightness, which is the same for every channel: the scaled 8-bit
|
||||
// values are too coarse to compare at the lowest brightness
|
||||
uint16_t strengths[4];
|
||||
uint16_t max_strength = 0;
|
||||
bool lit = false;
|
||||
for (uint8_t i = 0; i < 4; i++) {
|
||||
strengths[i] = color[i] * this->max_brightness_[i];
|
||||
max_strength = std::max(max_strength, strengths[i]);
|
||||
lit |= esp_scale8_twice(color[i], this->max_brightness_[i], this->local_brightness_) != 0;
|
||||
}
|
||||
Color res;
|
||||
if (!lit)
|
||||
return res;
|
||||
// Stretch the strongest channel to full scale and round the others against it; the table is too
|
||||
// coarse to compare its lowest levels
|
||||
for (uint8_t i = 0; i < 4; i++) {
|
||||
if (strengths[i] == max_strength) {
|
||||
res[i] = 1;
|
||||
} else if (strengths[i] != 0) {
|
||||
res[i] = this->gamma_level_(strengths[i] * 255 / max_strength) >= 0x8000 ? 1 : 0;
|
||||
}
|
||||
}
|
||||
return res;
|
||||
}
|
||||
|
||||
uint8_t ESPColorCorrection::gamma_uncorrect_(uint8_t value) const {
|
||||
if (this->gamma_table_ == nullptr)
|
||||
return value;
|
||||
|
||||
@@ -40,13 +40,10 @@ class ESPColorCorrection {
|
||||
#endif
|
||||
void set_gamma_table(const uint16_t *table) { this->gamma_table_ = table; }
|
||||
|
||||
/// corrected = (uncorrected * max_brightness * local_brightness) ^ gamma, keeping a lit pixel lit
|
||||
inline Color color_correct(Color color) const ESPHOME_ALWAYS_INLINE {
|
||||
Color res(this->round_channel_(COLOR_CHANNEL_R, color.red), this->round_channel_(COLOR_CHANNEL_G, color.green),
|
||||
this->round_channel_(COLOR_CHANNEL_B, color.blue), this->round_channel_(COLOR_CHANNEL_W, color.white));
|
||||
if (res.raw_32 == 0 && color.raw_32 != 0)
|
||||
res = this->correct_dark_pixel_(color);
|
||||
return Color(this->limit_(res.red), this->limit_(res.green), this->limit_(res.blue), this->limit_(res.white));
|
||||
// corrected = (uncorrected * max_brightness * local_brightness) ^ gamma
|
||||
return Color(this->color_correct_red(color.red), this->color_correct_green(color.green),
|
||||
this->color_correct_blue(color.blue), this->color_correct_white(color.white));
|
||||
}
|
||||
inline uint8_t color_correct_red(uint8_t red) const ESPHOME_ALWAYS_INLINE {
|
||||
return this->color_correct_channel(COLOR_CHANNEL_R, red);
|
||||
@@ -93,15 +90,6 @@ class ESPColorCorrection {
|
||||
#endif
|
||||
return res;
|
||||
}
|
||||
inline uint8_t round_channel_(uint8_t channel, uint8_t value) const ESPHOME_ALWAYS_INLINE {
|
||||
return this->gamma_round_(esp_scale8_twice(value, this->max_brightness_[channel], this->local_brightness_));
|
||||
}
|
||||
/// Forward gamma as the table's 16-bit level
|
||||
uint16_t gamma_level_(uint8_t value) const;
|
||||
/// Forward gamma rounded to uint8, where a low level becomes 0
|
||||
uint8_t gamma_round_(uint8_t value) const;
|
||||
/// The levels of a pixel whose channels all round to 0: 1 for its strongest channels, unless it is black
|
||||
Color correct_dark_pixel_(Color color) const;
|
||||
/// Forward gamma: read uint16 PROGMEM table, convert to uint8
|
||||
uint8_t gamma_correct_(uint8_t value) const;
|
||||
/// Reverse gamma and limit for one stored level
|
||||
|
||||
@@ -36,10 +36,6 @@ class ESPColorAccessor {
|
||||
#if defined(USE_LIGHT_PARTITION) && defined(USE_LIGHT_POWER_ESTIMATION)
|
||||
virtual const ESPColorCorrection *get_color_correction_internal(int32_t index) const { return nullptr; }
|
||||
#endif
|
||||
#ifdef USE_LIGHT_PARTITION
|
||||
// For internal use only: whether the LED at `index` stores a white level.
|
||||
virtual bool has_white_internal(int32_t index) const { return true; }
|
||||
#endif
|
||||
};
|
||||
|
||||
/// Color accessor that is completely at peace with the void of nothingness.
|
||||
@@ -82,10 +78,6 @@ class BufferColorAccessor : public ESPColorAccessor {
|
||||
}
|
||||
void set_effect_data(int32_t index, uint8_t value) override { this->effect_data[index] = value; }
|
||||
|
||||
#ifdef USE_LIGHT_PARTITION
|
||||
bool has_white_internal(int32_t index) const override { return this->channel_colors.has_white(); }
|
||||
#endif
|
||||
|
||||
/// Allocate a zeroed block of buffer_bytes() plus `extra_bytes` for the caller, which start at
|
||||
/// `effect_data + num_leds`, and pass it to set_buffer(). Returns false if it failed.
|
||||
bool allocate(RAMAllocator<uint8_t> &allocator, size_t num_leds, size_t extra_bytes = 0) {
|
||||
@@ -159,12 +151,7 @@ class CorrectedBufferColorAccessor final : public BufferColorAccessor {
|
||||
return this->color_correction->color_uncorrect_channel(channel, this->get_channel_raw(index, channel));
|
||||
}
|
||||
|
||||
void set(int32_t index, Color color) override {
|
||||
// A white level the strip cannot show must not count as the pixel's strongest channel
|
||||
if (!this->channel_colors.has_white())
|
||||
color.white = 0;
|
||||
this->set_raw(index, this->color_correction->color_correct(color));
|
||||
}
|
||||
void set(int32_t index, Color color) override { this->set_raw(index, this->color_correction->color_correct(color)); }
|
||||
void set_channel(int32_t index, uint8_t channel, uint8_t value) override {
|
||||
this->set_channel_raw(index, channel, this->color_correction->color_correct_channel(channel, value));
|
||||
}
|
||||
@@ -286,10 +273,6 @@ class ESPColorView final : public ESPColorSettable {
|
||||
return this->accessor_->get_color_correction_internal(this->index_);
|
||||
}
|
||||
#endif
|
||||
#ifdef USE_LIGHT_PARTITION
|
||||
// This method is for internal use only.
|
||||
bool has_white_internal() const { return this->accessor_->has_white_internal(this->index_); }
|
||||
#endif
|
||||
|
||||
protected:
|
||||
ESPColorAccessor *const accessor_;
|
||||
|
||||
@@ -588,7 +588,7 @@ async def to_code(config: ConfigType) -> None:
|
||||
cg.add_platformio_option(
|
||||
"platform_packages",
|
||||
[
|
||||
f"platformio/framework-zephyr@https://github.com/tomaszduda23/framework-sdk-nrf/archive/refs/tags/v{CORE.data[KEY_CORE][KEY_FRAMEWORK_VERSION]}.zip",
|
||||
f"platformio/framework-zephyr@https://github.com/tomaszduda23/framework-sdk-nrf/archive/refs/tags/v{CORE.framework_version}.zip",
|
||||
],
|
||||
)
|
||||
if config[KEY_BOOTLOADER] != BOOTLOADER_MCUBOOT:
|
||||
@@ -634,7 +634,7 @@ async def to_code(config: ConfigType) -> None:
|
||||
|
||||
if dfu_config := config.get(CONF_DFU):
|
||||
CORE.add_job(_dfu_to_code, dfu_config)
|
||||
framework_ver: cv.Version = CORE.data[KEY_CORE][KEY_FRAMEWORK_VERSION]
|
||||
framework_ver = CORE.framework_version
|
||||
if (dcdc := config.get(CONF_DCDC)) is not None:
|
||||
if framework_ver < cv.Version(2, 9, 2):
|
||||
zephyr_add_prj_conf("BOARD_ENABLE_DCDC", dcdc)
|
||||
@@ -1298,13 +1298,13 @@ def _write_pch_checksum(build_dir: Path, source_dir: Path) -> None:
|
||||
The app image dir follows the SDK version, like get_elf_path;
|
||||
2.9.2+ always wraps the build in sysbuild."""
|
||||
app_dir = build_dir
|
||||
if CORE.data[KEY_CORE][KEY_FRAMEWORK_VERSION] >= cv.Version(2, 9, 2):
|
||||
if CORE.framework_version >= cv.Version(2, 9, 2):
|
||||
app_dir = build_dir / "zephyr"
|
||||
checksum = pch.pch_checksum(
|
||||
CORE.relative_src_path(),
|
||||
pch.PCH_DEFAULT_HEADERS,
|
||||
(
|
||||
str(CORE.data[KEY_CORE][KEY_FRAMEWORK_VERSION]),
|
||||
str(CORE.framework_version),
|
||||
zephyr_data()[KEY_BOARD],
|
||||
# Kconfig inputs that reach autoconf.h without a .conf line
|
||||
",".join(sorted(wanted_west_projects())),
|
||||
@@ -1552,7 +1552,7 @@ def run_compile(args, config: ConfigType) -> bool:
|
||||
raise EsphomeError("nRF52 native build failed")
|
||||
|
||||
zephyr_dir = build_dir / "zephyr"
|
||||
framework_ver = CORE.data[KEY_CORE][KEY_FRAMEWORK_VERSION]
|
||||
framework_ver = CORE.framework_version
|
||||
bootloader = zephyr_data()[KEY_BOOTLOADER]
|
||||
|
||||
# (dev_type, sd_req) per bootloader — values from Nordic SoftDevice release notes.
|
||||
|
||||
@@ -8,7 +8,7 @@ import subprocess
|
||||
import sys
|
||||
|
||||
import esphome.config_validation as cv
|
||||
from esphome.const import CONF_OTA, CONF_PLATFORM, KEY_CORE, KEY_FRAMEWORK_VERSION
|
||||
from esphome.const import CONF_OTA, CONF_PLATFORM
|
||||
from esphome.core import CORE, EsphomeError
|
||||
from esphome.framework_helpers import run_command_ok
|
||||
|
||||
@@ -82,7 +82,7 @@ def can_upload_using_cmsis_dap() -> bool:
|
||||
if (
|
||||
CORE.using_toolchain_platformio
|
||||
or variant not in _PYOCD_TARGETS
|
||||
or CORE.data[KEY_CORE][KEY_FRAMEWORK_VERSION] < cv.Version(2, 9, 2)
|
||||
or CORE.framework_version < cv.Version(2, 9, 2)
|
||||
):
|
||||
return False
|
||||
if (target_file := _PYOCD_TARGET_FILES.get(variant)) is None:
|
||||
@@ -113,7 +113,7 @@ def _images(build_dir: Path) -> list[Path]:
|
||||
Chosen by SDK version and by whether MCUboot is built, so a file left by another build is
|
||||
never picked and a missing part is an error rather than a partial flash.
|
||||
"""
|
||||
framework_ver = CORE.data[KEY_CORE][KEY_FRAMEWORK_VERSION]
|
||||
framework_ver = CORE.framework_version
|
||||
if framework_ver < cv.Version(2, 9, 2):
|
||||
raise EsphomeError(
|
||||
"Flashing with pyOCD needs nRF52 framework version 2.9.2 or newer"
|
||||
|
||||
@@ -24,7 +24,6 @@ from esphome.components.zephyr.sdk_install import (
|
||||
sdk_toolchain_path,
|
||||
)
|
||||
import esphome.config_validation as cv
|
||||
from esphome.const import KEY_CORE, KEY_FRAMEWORK_VERSION
|
||||
from esphome.core import CORE, EsphomeError
|
||||
from esphome.framework_helpers import (
|
||||
create_venv,
|
||||
@@ -48,7 +47,7 @@ _TOOLCHAIN_VERSIONS = (TOOLCHAIN_VERSION, _TOOLCHAIN_VERSION_NCS_3_4_0)
|
||||
|
||||
def _uses_sdk_ng_1_toolchain() -> bool:
|
||||
"""True when the framework needs Zephyr SDK 1.0+."""
|
||||
return CORE.data[KEY_CORE][KEY_FRAMEWORK_VERSION] >= cv.Version(3, 4, 0)
|
||||
return CORE.framework_version >= cv.Version(3, 4, 0)
|
||||
|
||||
|
||||
def _get_toolchain_version() -> str:
|
||||
@@ -97,7 +96,7 @@ def toolchain_tool(name: str) -> Path:
|
||||
|
||||
|
||||
def _get_version_str() -> str:
|
||||
framework_ver = CORE.data[KEY_CORE][KEY_FRAMEWORK_VERSION]
|
||||
framework_ver = CORE.framework_version
|
||||
return f"v{framework_ver.major}.{framework_ver.minor}.{framework_ver.patch}"
|
||||
|
||||
|
||||
@@ -390,7 +389,7 @@ def include_west_project(name: str) -> None:
|
||||
|
||||
def bluetooth_west_projects() -> tuple[str, ...]:
|
||||
"""Bluetooth's crypto: TinyCrypt up to SDK 3.1, PSA (mbedtls, Oberon) from 3.2."""
|
||||
if CORE.data[KEY_CORE][KEY_FRAMEWORK_VERSION] >= cv.Version(3, 2, 0):
|
||||
if CORE.framework_version >= cv.Version(3, 2, 0):
|
||||
return ("mbedtls", "oberon-psa-crypto")
|
||||
return ("tinycrypt",)
|
||||
|
||||
@@ -398,7 +397,7 @@ def bluetooth_west_projects() -> tuple[str, ...]:
|
||||
def wanted_west_projects() -> set[str]:
|
||||
projects = set(_get_data().west_projects)
|
||||
# Zephyr 4.1 moved the Cortex-M core headers to cmsis_6
|
||||
if CORE.data[KEY_CORE][KEY_FRAMEWORK_VERSION] >= cv.Version(3, 1, 0):
|
||||
if CORE.framework_version >= cv.Version(3, 1, 0):
|
||||
projects.add("cmsis_6")
|
||||
# Sysbuild builds the MCUboot image with any bootloader
|
||||
if CORE.data.get(KEY_ZEPHYR, {}).get(KEY_SYSBUILD):
|
||||
@@ -580,8 +579,7 @@ def _check_and_install(version: str) -> None:
|
||||
projects = wanted_west_projects()
|
||||
if not sentinel.exists() or not zephyr_reqs.exists():
|
||||
_install_framework(env_python_path, framework_path, version, projects)
|
||||
framework_ver = CORE.data[KEY_CORE][KEY_FRAMEWORK_VERSION]
|
||||
if framework_ver < cv.Version(2, 9, 2):
|
||||
if CORE.framework_version < cv.Version(2, 9, 2):
|
||||
_patch_uf2conv_escape_sequences(framework_path)
|
||||
sentinel.touch()
|
||||
else:
|
||||
|
||||
@@ -7,7 +7,6 @@ gives the binutils, the linked image and idedata of that build.
|
||||
from pathlib import Path
|
||||
|
||||
import esphome.config_validation as cv
|
||||
from esphome.const import KEY_CORE, KEY_FRAMEWORK_VERSION
|
||||
from esphome.core import CORE
|
||||
|
||||
from .framework import toolchain_tool
|
||||
@@ -27,7 +26,7 @@ def get_elf_path() -> Path:
|
||||
Chosen by version rather than by probing so a leftover image from another
|
||||
SDK layout is never analyzed in place of the current build.
|
||||
"""
|
||||
if CORE.data[KEY_CORE][KEY_FRAMEWORK_VERSION] < cv.Version(2, 9, 2):
|
||||
if CORE.framework_version < cv.Version(2, 9, 2):
|
||||
return CORE.relative_pioenvs_path(CORE.name, "zephyr", "zephyr.elf")
|
||||
return CORE.relative_pioenvs_path(CORE.name, "zephyr", "zephyr", "zephyr.elf")
|
||||
|
||||
|
||||
@@ -56,8 +56,6 @@ from esphome.const import (
|
||||
CONF_TX_PIN,
|
||||
CONF_USE_ADDRESS,
|
||||
CONF_WIFI,
|
||||
KEY_CORE,
|
||||
KEY_FRAMEWORK_VERSION,
|
||||
PLATFORM_ESP32,
|
||||
PlatformFramework,
|
||||
)
|
||||
@@ -584,7 +582,7 @@ async def to_code(config: ConfigType) -> None:
|
||||
# Crypto through PSA: mbedtls, plus Oberon from SDK 2.7
|
||||
include_west_project("mbedtls")
|
||||
include_west_project("openthread")
|
||||
if CORE.data[KEY_CORE][KEY_FRAMEWORK_VERSION] >= cv.Version(2, 7, 0):
|
||||
if CORE.framework_version >= cv.Version(2, 7, 0):
|
||||
include_west_project("oberon-psa-crypto")
|
||||
zephyr_add_prj_conf("NET_L2_OPENTHREAD", True)
|
||||
zephyr_add_prj_conf(
|
||||
|
||||
@@ -83,9 +83,6 @@ class PartitionLightOutput final : public light::AddressableLight {
|
||||
|
||||
void set(int32_t index, Color color) override {
|
||||
light::ESPColorView color_view = this->parent_->get_color_view_(index);
|
||||
// A white level the LED cannot show must not count as the pixel's strongest channel
|
||||
if (!color_view.has_white_internal()) // NOLINT
|
||||
color.white = 0;
|
||||
color_view.set_raw(this->parent_->get_color_correction_(color_view)->color_correct(color));
|
||||
}
|
||||
void set_channel(int32_t index, uint8_t channel, uint8_t value) override {
|
||||
@@ -101,10 +98,6 @@ class PartitionLightOutput final : public light::AddressableLight {
|
||||
this->parent_->get_color_view_(index).set_effect_data(value);
|
||||
}
|
||||
|
||||
bool has_white_internal(int32_t index) const override { // NOLINT
|
||||
return this->parent_->get_color_view_(index).has_white_internal();
|
||||
}
|
||||
|
||||
#ifdef USE_LIGHT_POWER_ESTIMATION
|
||||
const light::ESPColorCorrection *get_color_correction_internal(int32_t index) const override { // NOLINT
|
||||
return this->parent_->get_color_correction_(this->parent_->get_color_view_(index));
|
||||
|
||||
@@ -382,7 +382,7 @@ async def to_code(config: ConfigType) -> None:
|
||||
"board_build.filesystem_size", "0m" if CORE.testing_mode else "1m"
|
||||
)
|
||||
|
||||
ver: cv.Version = CORE.data[KEY_CORE][KEY_FRAMEWORK_VERSION]
|
||||
ver = CORE.framework_version
|
||||
cg.add_define(
|
||||
"USE_ARDUINO_VERSION_CODE",
|
||||
cg.RawExpression(f"VERSION_CODE({ver.major}, {ver.minor}, {ver.patch})"),
|
||||
|
||||
@@ -98,7 +98,7 @@ CONFIG_SCHEMA = cv.All(
|
||||
cv.positive_time_period_milliseconds,
|
||||
cv.Range(max=cv.TimePeriod(milliseconds=5000)),
|
||||
),
|
||||
cv.Optional(CONF_STATIC_DELAY_ADJUSTABLE, default=True): cv.boolean,
|
||||
cv.Optional(CONF_STATIC_DELAY_ADJUSTABLE, default=False): cv.boolean,
|
||||
cv.Optional(CONF_FIXED_DELAY, default="0us"): cv.All(
|
||||
cv.positive_time_period_microseconds,
|
||||
cv.Range(max=cv.TimePeriod(microseconds=10000)),
|
||||
|
||||
@@ -61,7 +61,7 @@ class SendspinMediaSource final : public SendspinChild,
|
||||
|
||||
bool cached_muted_{false};
|
||||
bool pending_start_{false};
|
||||
bool static_delay_adjustable_{true};
|
||||
bool static_delay_adjustable_{false};
|
||||
};
|
||||
|
||||
} // namespace esphome::sendspin_
|
||||
|
||||
@@ -26,8 +26,6 @@ from esphome.const import (
|
||||
CONF_SECONDS,
|
||||
CONF_TIMEZONE,
|
||||
CONF_TRIGGER_ID,
|
||||
KEY_CORE,
|
||||
KEY_FRAMEWORK_VERSION,
|
||||
PLATFORM_BK72XX,
|
||||
PLATFORM_ESP32,
|
||||
PLATFORM_ESP8266,
|
||||
@@ -473,7 +471,7 @@ async def to_code(config):
|
||||
# From sdk-nrf 2.8.0 newlib time() gets the clock through gettimeofday(),
|
||||
# which Zephyr only provides with XSI_SINGLE_PROCESS. Without it time()
|
||||
# always returns -1.
|
||||
if CORE.data[KEY_CORE][KEY_FRAMEWORK_VERSION] >= cv.Version(2, 8, 0):
|
||||
if CORE.framework_version >= cv.Version(2, 8, 0):
|
||||
zephyr_add_prj_conf("POSIX_SINGLE_PROCESS", True)
|
||||
zephyr_add_prj_conf("XSI_SINGLE_PROCESS", True)
|
||||
cg.add_define("USE_TIME")
|
||||
|
||||
@@ -5,7 +5,7 @@ from typing import Literal, NamedTuple, TypedDict
|
||||
|
||||
import esphome.codegen as cg
|
||||
import esphome.config_validation as cv
|
||||
from esphome.const import CONF_BOARD, KEY_CORE, KEY_FRAMEWORK_VERSION
|
||||
from esphome.const import CONF_BOARD
|
||||
from esphome.core import CORE, CoroPriority, coroutine_with_priority
|
||||
from esphome.helpers import copy_file_if_changed, write_file_if_changed
|
||||
from esphome.types import ConfigType
|
||||
@@ -281,8 +281,7 @@ def zephyr_use_usb_device_next() -> bool:
|
||||
The new stack (device_next) is used from nRF Connect SDK 3.4.1, where the
|
||||
legacy stack is deprecated. Older SDKs keep the legacy stack.
|
||||
"""
|
||||
framework_ver: cv.Version = CORE.data[KEY_CORE][KEY_FRAMEWORK_VERSION]
|
||||
return CORE.is_nrf52 and framework_ver >= cv.Version(3, 4, 1)
|
||||
return CORE.is_nrf52 and CORE.framework_version >= cv.Version(3, 4, 1)
|
||||
|
||||
|
||||
def _disable_board_cdc_acm_overlay() -> str:
|
||||
|
||||
@@ -17,7 +17,7 @@ from esphome.components.zephyr.const import (
|
||||
KEY_PM_STATIC,
|
||||
)
|
||||
import esphome.config_validation as cv
|
||||
from esphome.const import CONF_ID, KEY_CORE, KEY_FRAMEWORK_VERSION
|
||||
from esphome.const import CONF_ID
|
||||
from esphome.core import CORE, CoroPriority, coroutine_with_priority
|
||||
from esphome.types import ConfigType
|
||||
|
||||
@@ -40,10 +40,6 @@ CONFIG_SCHEMA = cv.All(
|
||||
)
|
||||
|
||||
|
||||
def _framework_version() -> cv.Version:
|
||||
return CORE.data[KEY_CORE][KEY_FRAMEWORK_VERSION]
|
||||
|
||||
|
||||
def _partition_address() -> int:
|
||||
"""Place the partition below the lowest section reserved above the SoftDevice
|
||||
(the bootloader), or at the end of flash with MCUboot, on an erase page boundary."""
|
||||
@@ -91,7 +87,7 @@ async def to_code(config: ConfigType) -> None:
|
||||
cg.add_define("USE_CRASH_HANDLER")
|
||||
zephyr_add_prj_conf("DEBUG_COREDUMP", True)
|
||||
zephyr_add_prj_conf("DEBUG_COREDUMP_BACKEND_FLASH_PARTITION", True)
|
||||
framework_ver = _framework_version()
|
||||
framework_ver = CORE.framework_version
|
||||
if framework_ver >= DUMP_THREADS_MIN_VERSION:
|
||||
zephyr_add_prj_conf("DEBUG_COREDUMP_MEMORY_DUMP_THREADS", True)
|
||||
else:
|
||||
|
||||
@@ -36,8 +36,6 @@ from esphome.const import (
|
||||
CONF_NUMBER,
|
||||
CONF_PIN,
|
||||
CONF_STATUS,
|
||||
KEY_CORE,
|
||||
KEY_FRAMEWORK_VERSION,
|
||||
Framework,
|
||||
)
|
||||
from esphome.core import CORE, coroutine_with_priority
|
||||
@@ -133,8 +131,7 @@ def _validate_bootloader(config: ConfigType) -> None:
|
||||
return
|
||||
if bootloader not in MCUMGR_OTA_BOOTLOADERS:
|
||||
raise cv.Invalid(f"{bootloader} does not support OTA")
|
||||
framework_ver: cv.Version = CORE.data[KEY_CORE][KEY_FRAMEWORK_VERSION]
|
||||
if framework_ver < cv.Version(2, 9, 2):
|
||||
if CORE.framework_version < cv.Version(2, 9, 2):
|
||||
raise cv.Invalid(
|
||||
"OTA with Adafruit_nRF52_Bootloader requires at least SDK 2.9.2"
|
||||
)
|
||||
@@ -252,8 +249,7 @@ async def to_code(config: ConfigType) -> None:
|
||||
""",
|
||||
image="mcuboot",
|
||||
)
|
||||
framework_ver = CORE.data[KEY_CORE][KEY_FRAMEWORK_VERSION]
|
||||
if framework_ver >= cv.Version(2, 9, 2):
|
||||
if CORE.framework_version >= cv.Version(2, 9, 2):
|
||||
zephyr_data()[KEY_SYSBUILD] = True
|
||||
|
||||
bootloader = zephyr_data()[KEY_BOOTLOADER]
|
||||
|
||||
@@ -68,9 +68,6 @@ from esphome.const import (
|
||||
ENTITY_CATEGORY_CONFIG,
|
||||
ENTITY_CATEGORY_DIAGNOSTIC,
|
||||
ENTITY_CATEGORY_NONE,
|
||||
KEY_CORE,
|
||||
KEY_FRAMEWORK_VERSION,
|
||||
KEY_TARGET_FRAMEWORK,
|
||||
PLATFORM_ESP32,
|
||||
PLATFORM_ESP8266,
|
||||
PLATFORM_NRF52,
|
||||
@@ -2937,8 +2934,7 @@ def require_framework_version(
|
||||
"""
|
||||
|
||||
def validator(value):
|
||||
core_data = CORE.data[KEY_CORE]
|
||||
framework = core_data[KEY_TARGET_FRAMEWORK]
|
||||
framework = CORE.target_framework
|
||||
|
||||
keys_to_try: list[str] = []
|
||||
if CORE.is_host and framework == "host":
|
||||
@@ -2984,14 +2980,14 @@ def require_framework_version(
|
||||
required = kwargs[key]
|
||||
|
||||
if max_version:
|
||||
if core_data[KEY_FRAMEWORK_VERSION] > required:
|
||||
if CORE.framework_version > required:
|
||||
msg = f"This feature requires framework version {required} or lower"
|
||||
if extra_message:
|
||||
msg += f". {extra_message}"
|
||||
raise Invalid(msg)
|
||||
return value
|
||||
|
||||
if core_data[KEY_FRAMEWORK_VERSION] < required:
|
||||
if CORE.framework_version < required:
|
||||
msg = f"This feature requires at least framework version {required}"
|
||||
if extra_message:
|
||||
msg += f". {extra_message}"
|
||||
|
||||
@@ -20,6 +20,7 @@ from esphome.const import (
|
||||
CONF_WEB_SERVER,
|
||||
CONF_WIFI,
|
||||
KEY_CORE,
|
||||
KEY_FRAMEWORK_VERSION,
|
||||
KEY_TARGET_FRAMEWORK,
|
||||
KEY_TARGET_PLATFORM,
|
||||
NATIVE_TOOLCHAINS,
|
||||
@@ -1035,6 +1036,11 @@ class EsphomeCore:
|
||||
def target_framework(self):
|
||||
return self.data[KEY_CORE][KEY_TARGET_FRAMEWORK]
|
||||
|
||||
@property
|
||||
def framework_version(self) -> Version:
|
||||
"""The version of the target platform's framework, set by the platform component."""
|
||||
return self.data[KEY_CORE][KEY_FRAMEWORK_VERSION]
|
||||
|
||||
@property
|
||||
def using_arduino(self):
|
||||
return self.target_framework == "arduino"
|
||||
|
||||
@@ -214,7 +214,7 @@ class StorageJSON:
|
||||
hardware = esp32.get_esp32_variant(esph)
|
||||
framework_version = str(esp32.idf_version())
|
||||
elif esph.is_nrf52:
|
||||
framework_version = str(esph.data[KEY_CORE][KEY_FRAMEWORK_VERSION])
|
||||
framework_version = str(esph.framework_version)
|
||||
return StorageJSON(
|
||||
storage_version=1,
|
||||
name=esph.name,
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
#include <cstdint>
|
||||
|
||||
#include "esphome/components/light/esp_color_correction.h"
|
||||
#include "esphome/components/light/esp_color_view.h"
|
||||
|
||||
namespace esphome::light::testing {
|
||||
|
||||
@@ -68,69 +67,6 @@ TEST(GammaCorrection, DeadZoneFixedAtGamma28) {
|
||||
}
|
||||
}
|
||||
|
||||
// A whole pixel keeps its colour when dim: only the strongest channel is lifted to 1.
|
||||
TEST(GammaCorrection, DimPixelKeepsDominantChannel) {
|
||||
GammaFixture fixture(2.8);
|
||||
fixture.correction.set_local_brightness(13);
|
||||
EXPECT_EQ(fixture.correction.color_correct(Color(255, 30, 0, 0)), Color(1, 0, 0, 0));
|
||||
EXPECT_EQ(fixture.correction.color_correct(Color(0, 0, 255, 30)), Color(0, 0, 1, 0));
|
||||
}
|
||||
|
||||
// Orange at 2% brightness and below: the table reads 1 for both channels there, and at the lowest
|
||||
// step both scale to the same 8-bit value, so neither can be used to compare them.
|
||||
TEST(GammaCorrection, VeryDimPixelKeepsDominantChannel) {
|
||||
GammaFixture fixture(2.8);
|
||||
for (uint8_t brightness : {1, 2, 3, 4, 5, 6}) {
|
||||
fixture.correction.set_local_brightness(brightness);
|
||||
EXPECT_EQ(fixture.correction.color_correct(Color(255, 130, 0, 0)), Color(1, 0, 0, 0))
|
||||
<< "brightness=" << int(brightness);
|
||||
}
|
||||
}
|
||||
|
||||
TEST(GammaCorrection, DimPixelKeepsSimilarChannels) {
|
||||
GammaFixture fixture(2.8);
|
||||
fixture.correction.set_local_brightness(13);
|
||||
EXPECT_EQ(fixture.correction.color_correct(Color(255, 255, 255, 0)), Color(1, 1, 1, 0));
|
||||
EXPECT_EQ(fixture.correction.color_correct(Color(255, 230, 0, 0)), Color(1, 1, 0, 0));
|
||||
fixture.correction.set_local_brightness(1);
|
||||
EXPECT_EQ(fixture.correction.color_correct(Color(255, 250, 250, 0)), Color(1, 1, 1, 0));
|
||||
}
|
||||
|
||||
// A channel that color_correct sets to 0% stays dark even when it is the strongest in the pixel.
|
||||
TEST(GammaCorrection, DimPixelLeavesDisabledChannelDark) {
|
||||
GammaFixture fixture(2.8);
|
||||
fixture.correction.set_max_brightness(Color(255, 0, 255, 255));
|
||||
EXPECT_EQ(fixture.correction.color_correct(Color(1, 255, 0, 0)), Color(1, 0, 0, 0));
|
||||
}
|
||||
|
||||
// A strip without white drops the white level before the pixel is rounded, so it cannot outrank red.
|
||||
TEST(GammaCorrection, UnusedWhiteDoesNotDarkenRgbStrip) {
|
||||
GammaFixture fixture(2.8);
|
||||
fixture.correction.set_local_brightness(13);
|
||||
std::array<uint8_t, 3> color_data{};
|
||||
std::array<uint8_t, 1> effect_data{};
|
||||
CorrectedBufferColorAccessor accessor(color_data.data(), effect_data.data(), ChannelColors{0, 1, 2},
|
||||
&fixture.correction);
|
||||
accessor.set(0, Color(128, 0, 0, 255));
|
||||
EXPECT_EQ(color_data, (std::array<uint8_t, 3>{1, 0, 0}));
|
||||
}
|
||||
|
||||
TEST(GammaCorrection, LitPixelDropsChannelThatRoundsToZero) {
|
||||
GammaFixture fixture(2.8);
|
||||
EXPECT_EQ(fixture.correction.color_correct(Color(255, 5, 0, 0)), Color(255, 0, 0, 0));
|
||||
}
|
||||
|
||||
// The pixel-level form of esphome/esphome#18842: a non-zero pixel never goes fully dark.
|
||||
TEST(GammaCorrection, NonZeroPixelStaysLit) {
|
||||
for (double gamma : {1.0, 2.2, 2.8, 4.0}) {
|
||||
GammaFixture fixture(gamma);
|
||||
for (int i = 1; i < 256; i++) {
|
||||
EXPECT_GE(fixture.correction.color_correct(Color(i, 0, 0, 0)).red, 1) << "gamma=" << gamma << " index=" << i;
|
||||
}
|
||||
EXPECT_EQ(fixture.correction.color_correct(Color(0, 0, 0, 0)), Color(0, 0, 0, 0)) << "gamma=" << gamma;
|
||||
}
|
||||
}
|
||||
|
||||
TEST(GammaCorrection, ReverseSearchFindsLargestIndexLessEqualTarget) {
|
||||
auto table = build_gamma_table(2.8);
|
||||
for (uint16_t target : {0, 128, 129, 135, 1000, 32768, 65535}) {
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
import esphome.codegen as cg
|
||||
from tests.testing_helpers import ComponentManifestOverride
|
||||
|
||||
|
||||
def override_manifest(manifest: ComponentManifestOverride) -> None:
|
||||
async def to_code_testing(config):
|
||||
# The accessor hooks that partitions use, and the gamma table of the light under test
|
||||
cg.add_define("USE_LIGHT_PARTITION")
|
||||
cg.add_define("USE_LIGHT_GAMMA_LUT")
|
||||
|
||||
manifest.to_code = to_code_testing
|
||||
manifest.dependencies = manifest.dependencies + ["light"]
|
||||
@@ -1,56 +0,0 @@
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
#include <array>
|
||||
#include <cmath>
|
||||
#include <cstdint>
|
||||
|
||||
#include "esphome/components/light/addressable_light.h"
|
||||
#include "esphome/components/light/light_state.h"
|
||||
#include "esphome/components/partition/light_partition.h"
|
||||
|
||||
namespace esphome::partition::testing {
|
||||
|
||||
namespace {
|
||||
|
||||
// One RGB pixel in memory
|
||||
class RgbStrip : public light::AddressableLight {
|
||||
public:
|
||||
RgbStrip()
|
||||
: internal_accessor_(this->buffer_.data(), this->buffer_.data() + 3, light::ChannelColors{0, 1, 2},
|
||||
&this->correction_) {
|
||||
this->accessor_ = &this->internal_accessor_;
|
||||
}
|
||||
int32_t size() const override { return 1; }
|
||||
void clear_effect_data() override {}
|
||||
light::LightTraits get_traits() override { return {}; }
|
||||
void write_state(light::LightState *state) override {}
|
||||
|
||||
protected:
|
||||
std::array<uint8_t, 4> buffer_{};
|
||||
light::CorrectedBufferColorAccessor internal_accessor_;
|
||||
};
|
||||
|
||||
} // namespace
|
||||
|
||||
// The partition corrects a pixel before the strip drops its white level, so it has to drop it first.
|
||||
TEST(PartitionWhite, UnusedWhiteDoesNotDarkenRgbSegment) {
|
||||
light::GammaTable table{};
|
||||
for (int i = 1; i < 256; i++)
|
||||
table.lut[i] = std::max(1.0, std::round(std::pow(i / 255.0, 2.8) * 65535.0));
|
||||
table.gamma_x100 = 280;
|
||||
|
||||
RgbStrip strip;
|
||||
light::LightState strip_state(&strip);
|
||||
PartitionLightOutput partition({AddressableSegment(&strip_state, 0, 1, false)});
|
||||
light::LightState partition_state(&partition);
|
||||
partition_state.set_gamma_table(&table);
|
||||
partition.setup_state(&partition_state);
|
||||
partition_state.current_values.set_state(1.0f);
|
||||
partition_state.current_values.set_brightness(13 / 255.0f);
|
||||
partition.update_state(&partition_state);
|
||||
|
||||
partition[0] = Color(128, 0, 0, 255);
|
||||
EXPECT_EQ(strip[0].get_raw(), Color(1, 0, 0, 0));
|
||||
}
|
||||
|
||||
} // namespace esphome::partition::testing
|
||||
@@ -15,13 +15,7 @@ from esphome.components.nrf52.const import (
|
||||
)
|
||||
from esphome.components.nrf52.framework import get_nrf52_variant, set_nrf52_variant
|
||||
import esphome.config_validation as cv
|
||||
from esphome.const import (
|
||||
CONF_BOARD,
|
||||
CONF_FRAMEWORK,
|
||||
CONF_VERSION,
|
||||
KEY_CORE,
|
||||
KEY_FRAMEWORK_VERSION,
|
||||
)
|
||||
from esphome.const import CONF_BOARD, CONF_FRAMEWORK, CONF_VERSION, KEY_CORE
|
||||
from esphome.core import CORE, EsphomeCore
|
||||
from esphome.types import ConfigType
|
||||
|
||||
@@ -79,7 +73,7 @@ def test_default_sdk_version(variant: str, default: str) -> None:
|
||||
set_nrf52_variant(variant)
|
||||
config = _set_framework(None)
|
||||
assert config[CONF_FRAMEWORK][CONF_VERSION] == default
|
||||
assert CORE.data[KEY_CORE][KEY_FRAMEWORK_VERSION] == cv.Version.parse(default)
|
||||
assert CORE.framework_version == cv.Version.parse(default)
|
||||
|
||||
|
||||
@pytest.mark.usefixtures("platformio")
|
||||
|
||||
@@ -582,6 +582,11 @@ class TestEsphomeCore:
|
||||
|
||||
assert t == other
|
||||
|
||||
def test_framework_version(self, target: core.EsphomeCore) -> None:
|
||||
version = core.Version(1, 12, 0)
|
||||
target.data[const.KEY_CORE] = {const.KEY_FRAMEWORK_VERSION: version}
|
||||
assert target.framework_version is version
|
||||
|
||||
def test_address__none(self, target):
|
||||
target.config = {}
|
||||
assert target.address is None
|
||||
|
||||
@@ -369,8 +369,6 @@ def test_storage_json_from_esphome_core_mdns_enabled(setup_core: Path) -> None:
|
||||
|
||||
def test_storage_json_from_esphome_core_nrf52(setup_core: Path) -> None:
|
||||
"""Test from_esphome_core captures the framework version on nRF52."""
|
||||
from esphome.const import KEY_CORE, KEY_FRAMEWORK_VERSION
|
||||
|
||||
mock_core = MagicMock()
|
||||
mock_core.name = "nrf_device"
|
||||
mock_core.friendly_name = "nRF Device"
|
||||
@@ -380,7 +378,7 @@ def test_storage_json_from_esphome_core_nrf52(setup_core: Path) -> None:
|
||||
mock_core.target_platform = "nrf52"
|
||||
mock_core.is_esp32 = False
|
||||
mock_core.is_nrf52 = True
|
||||
mock_core.data = {KEY_CORE: {KEY_FRAMEWORK_VERSION: cv.Version(2, 9, 2)}}
|
||||
mock_core.framework_version = cv.Version(2, 9, 2)
|
||||
mock_core.build_path = "/build/nrf_device"
|
||||
mock_core.firmware_bin = "/build/nrf_device/firmware.bin"
|
||||
mock_core.loaded_integrations = set()
|
||||
@@ -842,7 +840,6 @@ def _make_nrf52_storage(
|
||||
|
||||
def test_storage_json_nrf52_framework_version_round_trip(setup_core: Path) -> None:
|
||||
"""Sidecar framework_version restores CORE.data[KEY_CORE][KEY_FRAMEWORK_VERSION]."""
|
||||
from esphome.const import KEY_CORE, KEY_FRAMEWORK_VERSION
|
||||
|
||||
storage = _make_nrf52_storage("2.9.2")
|
||||
path = setup_core / "storage.json"
|
||||
@@ -855,7 +852,7 @@ def test_storage_json_nrf52_framework_version_round_trip(setup_core: Path) -> No
|
||||
assert loaded.framework_version == "2.9.2"
|
||||
|
||||
loaded.apply_to_core()
|
||||
assert CORE.data[KEY_CORE][KEY_FRAMEWORK_VERSION] == cv.Version(2, 9, 2)
|
||||
assert CORE.framework_version == cv.Version(2, 9, 2)
|
||||
|
||||
|
||||
def test_storage_json_nrf52_apply_to_core_without_framework_version(
|
||||
|
||||
Reference in new issue
Block a user