mirror of
https://github.com/esphome/esphome.git
synced 2026-05-27 11:56:11 +08:00
[nrf52] Move toolchain to platform (#13498)
Co-authored-by: Jonathan Swoboda <154711427+swoboda1337@users.noreply.github.com>
This commit is contained in:
+1
-1
@@ -1 +1 @@
|
|||||||
08c21fa4c044fd80c8f3296371f30c4f5ff3418f1bc1efe63c5bad938301f122
|
cf3d341206b4184ec8b7fe85141aef4fe4696aa720c3f8a06d4e57930574bdab
|
||||||
|
|||||||
@@ -69,9 +69,21 @@ def set_core_data(config: ConfigType) -> ConfigType:
|
|||||||
|
|
||||||
|
|
||||||
def set_framework(config: ConfigType) -> ConfigType:
|
def set_framework(config: ConfigType) -> ConfigType:
|
||||||
version = cv.Version.parse(cv.version_number(config[CONF_FRAMEWORK][CONF_VERSION]))
|
framework_ver = cv.Version.parse(
|
||||||
CORE.data[KEY_CORE][KEY_FRAMEWORK_VERSION] = version
|
cv.version_number(config[CONF_FRAMEWORK][CONF_VERSION])
|
||||||
return config
|
)
|
||||||
|
CORE.data[KEY_CORE][KEY_FRAMEWORK_VERSION] = framework_ver
|
||||||
|
if framework_ver < cv.Version(2, 9, 2):
|
||||||
|
return cv.require_framework_version(
|
||||||
|
nrf52_zephyr=cv.Version(2, 6, 1, "a"),
|
||||||
|
)(config)
|
||||||
|
if framework_ver < cv.Version(3, 2, 0):
|
||||||
|
return cv.require_framework_version(
|
||||||
|
nrf52_zephyr=cv.Version(2, 9, 2, "2"),
|
||||||
|
)(config)
|
||||||
|
return cv.require_framework_version(
|
||||||
|
nrf52_zephyr=cv.Version(3, 2, 0, "1"),
|
||||||
|
)(config)
|
||||||
|
|
||||||
|
|
||||||
BOOTLOADERS = [
|
BOOTLOADERS = [
|
||||||
@@ -140,7 +152,7 @@ CONFIG_SCHEMA = cv.All(
|
|||||||
cv.Optional(CONF_UICR_ERASE, default=False): cv.boolean,
|
cv.Optional(CONF_UICR_ERASE, default=False): cv.boolean,
|
||||||
}
|
}
|
||||||
),
|
),
|
||||||
cv.Optional(CONF_FRAMEWORK, default={CONF_VERSION: "2.6.1-7"}): cv.Schema(
|
cv.Optional(CONF_FRAMEWORK, default={CONF_VERSION: "2.6.1-a"}): cv.Schema(
|
||||||
{
|
{
|
||||||
cv.Required(CONF_VERSION): cv.string_strict,
|
cv.Required(CONF_VERSION): cv.string_strict,
|
||||||
}
|
}
|
||||||
@@ -181,13 +193,12 @@ async def to_code(config: ConfigType) -> None:
|
|||||||
cg.add_platformio_option(CONF_FRAMEWORK, CORE.data[KEY_CORE][KEY_TARGET_FRAMEWORK])
|
cg.add_platformio_option(CONF_FRAMEWORK, CORE.data[KEY_CORE][KEY_TARGET_FRAMEWORK])
|
||||||
cg.add_platformio_option(
|
cg.add_platformio_option(
|
||||||
"platform",
|
"platform",
|
||||||
"https://github.com/tomaszduda23/platform-nordicnrf52/archive/refs/tags/v10.3.0-1.zip",
|
"https://github.com/tomaszduda23/platform-nordicnrf52/archive/refs/tags/v10.3.0-5.zip",
|
||||||
)
|
)
|
||||||
cg.add_platformio_option(
|
cg.add_platformio_option(
|
||||||
"platform_packages",
|
"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.data[KEY_CORE][KEY_FRAMEWORK_VERSION]}.zip",
|
||||||
"platformio/toolchain-gccarmnoneeabi@https://github.com/tomaszduda23/toolchain-sdk-ng/archive/refs/tags/v0.17.4-0.zip",
|
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
+2
-3
@@ -230,11 +230,10 @@ build_src_flags = -include Arduino.h
|
|||||||
; This is the common settings for the nRF52 using Zephyr.
|
; This is the common settings for the nRF52 using Zephyr.
|
||||||
[common:nrf52-zephyr]
|
[common:nrf52-zephyr]
|
||||||
extends = common
|
extends = common
|
||||||
platform = https://github.com/tomaszduda23/platform-nordicnrf52/archive/refs/tags/v10.3.0-1.zip
|
platform = https://github.com/tomaszduda23/platform-nordicnrf52/archive/refs/tags/v10.3.0-5.zip
|
||||||
framework = zephyr
|
framework = zephyr
|
||||||
platform_packages =
|
platform_packages =
|
||||||
platformio/framework-zephyr @ https://github.com/tomaszduda23/framework-sdk-nrf/archive/refs/tags/v2.6.1-7.zip
|
platformio/framework-zephyr @ https://github.com/tomaszduda23/framework-sdk-nrf/archive/refs/tags/v2.6.1-a.zip
|
||||||
platformio/toolchain-gccarmnoneeabi@https://github.com/tomaszduda23/toolchain-sdk-ng/archive/refs/tags/v0.17.4-0.zip
|
|
||||||
build_flags =
|
build_flags =
|
||||||
${common.build_flags}
|
${common.build_flags}
|
||||||
-DUSE_ZEPHYR
|
-DUSE_ZEPHYR
|
||||||
|
|||||||
@@ -20,4 +20,4 @@ nrf52:
|
|||||||
voltage: 2.1V
|
voltage: 2.1V
|
||||||
uicr_erase: true
|
uicr_erase: true
|
||||||
framework:
|
framework:
|
||||||
version: "2.6.1-7"
|
version: "2.6.1-a"
|
||||||
|
|||||||
Reference in New Issue
Block a user