mirror of
https://github.com/esphome/esphome.git
synced 2024-11-10 09:17:46 +01:00
Fix rp2040 pio tool download (#4994)
This commit is contained in:
parent
fc0e1a3cb9
commit
eb145757e5
4 changed files with 97 additions and 21 deletions
|
@ -16,8 +16,7 @@ from esphome.const import (
|
||||||
KEY_TARGET_PLATFORM,
|
KEY_TARGET_PLATFORM,
|
||||||
)
|
)
|
||||||
from esphome.core import CORE, coroutine_with_priority, EsphomeError
|
from esphome.core import CORE, coroutine_with_priority, EsphomeError
|
||||||
from esphome.helpers import mkdir_p, write_file
|
from esphome.helpers import mkdir_p, write_file, copy_file_if_changed
|
||||||
import esphome.platformio_api as api
|
|
||||||
|
|
||||||
from .const import KEY_BOARD, KEY_PIO_FILES, KEY_RP2040, rp2040_ns
|
from .const import KEY_BOARD, KEY_PIO_FILES, KEY_RP2040, rp2040_ns
|
||||||
|
|
||||||
|
@ -193,25 +192,20 @@ def generate_pio_files() -> bool:
|
||||||
pio_path = CORE.relative_build_path(f"src/pio/{key}.pio")
|
pio_path = CORE.relative_build_path(f"src/pio/{key}.pio")
|
||||||
mkdir_p(os.path.dirname(pio_path))
|
mkdir_p(os.path.dirname(pio_path))
|
||||||
write_file(pio_path, data)
|
write_file(pio_path, data)
|
||||||
_LOGGER.info("Assembling PIO assembly code")
|
|
||||||
retval = api.run_platformio_cli(
|
|
||||||
"pkg",
|
|
||||||
"exec",
|
|
||||||
"--package",
|
|
||||||
"earlephilhower/tool-pioasm-rp2040-earlephilhower",
|
|
||||||
"--",
|
|
||||||
"pioasm",
|
|
||||||
pio_path,
|
|
||||||
pio_path + ".h",
|
|
||||||
)
|
|
||||||
includes.append(f"pio/{key}.pio.h")
|
includes.append(f"pio/{key}.pio.h")
|
||||||
if retval != 0:
|
|
||||||
raise EsphomeError("PIO assembly failed")
|
|
||||||
|
|
||||||
write_file(
|
write_file(
|
||||||
CORE.relative_build_path("src/pio_includes.h"),
|
CORE.relative_build_path("src/pio_includes.h"),
|
||||||
"#pragma once\n" + "\n".join([f'#include "{include}"' for include in includes]),
|
"#pragma once\n" + "\n".join([f'#include "{include}"' for include in includes]),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
dir = os.path.dirname(__file__)
|
||||||
|
build_pio_file = os.path.join(dir, "build_pio.py.script")
|
||||||
|
copy_file_if_changed(
|
||||||
|
build_pio_file,
|
||||||
|
CORE.relative_build_path("build_pio.py"),
|
||||||
|
)
|
||||||
|
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
|
||||||
|
|
47
esphome/components/rp2040/build_pio.py.script
Normal file
47
esphome/components/rp2040/build_pio.py.script
Normal file
|
@ -0,0 +1,47 @@
|
||||||
|
"""
|
||||||
|
Custom pioasm compiler script for platformio.
|
||||||
|
(c) 2022 by P.Z.
|
||||||
|
|
||||||
|
Sourced 2023/06/23 from https://gist.github.com/hexeguitar/f4533bc697c956ac1245b6843e2ef438
|
||||||
|
|
||||||
|
Modified by jesserockz 2023/06/23
|
||||||
|
"""
|
||||||
|
|
||||||
|
from os.path import join
|
||||||
|
import glob
|
||||||
|
import sys
|
||||||
|
|
||||||
|
import subprocess
|
||||||
|
|
||||||
|
# pylint: disable=E0602
|
||||||
|
Import("env") # noqa
|
||||||
|
|
||||||
|
from SCons.Script import ARGUMENTS
|
||||||
|
|
||||||
|
|
||||||
|
platform = env.PioPlatform()
|
||||||
|
PROJ_SRC = env["PROJECT_SRC_DIR"]
|
||||||
|
PIO_FILES = glob.glob(join(PROJ_SRC, "**", "*.pio"), recursive=True)
|
||||||
|
|
||||||
|
verbose = bool(int(ARGUMENTS.get("PIOVERBOSE", "0")))
|
||||||
|
|
||||||
|
|
||||||
|
if PIO_FILES:
|
||||||
|
if verbose:
|
||||||
|
print("==============================================")
|
||||||
|
print("PIO ASSEMBLY COMPILER")
|
||||||
|
try:
|
||||||
|
PIOASM_DIR = platform.get_package_dir("tool-pioasm-rp2040-earlephilhower")
|
||||||
|
except:
|
||||||
|
print("tool-pioasm-rp2040-earlephilhower not supported on your system!")
|
||||||
|
sys.exit()
|
||||||
|
|
||||||
|
PIOASM_EXE = join(PIOASM_DIR, "pioasm")
|
||||||
|
if verbose:
|
||||||
|
print("PIO files found:")
|
||||||
|
for filename in PIO_FILES:
|
||||||
|
if verbose:
|
||||||
|
print(f" {filename}")
|
||||||
|
subprocess.run([PIOASM_EXE, "-o", "c-sdk", filename, f"{filename}.h"])
|
||||||
|
if verbose:
|
||||||
|
print("==============================================")
|
40
esphome/components/rp2040_pio/__init__.py
Normal file
40
esphome/components/rp2040_pio/__init__.py
Normal file
|
@ -0,0 +1,40 @@
|
||||||
|
import platform
|
||||||
|
|
||||||
|
import esphome.codegen as cg
|
||||||
|
|
||||||
|
|
||||||
|
DEPENDENCIES = ["rp2040"]
|
||||||
|
|
||||||
|
|
||||||
|
PIOASM_REPO_VERSION = "1.5.0-b"
|
||||||
|
PIOASM_REPO_BASE = f"https://github.com/earlephilhower/pico-quick-toolchain/releases/download/{PIOASM_REPO_VERSION}"
|
||||||
|
PIOASM_VERSION = "pioasm-2e6142b.230216"
|
||||||
|
PIOASM_DOWNLOADS = {
|
||||||
|
"linux": {
|
||||||
|
"aarch64": f"aarch64-linux-gnu.{PIOASM_VERSION}.tar.gz",
|
||||||
|
"armv7l": f"arm-linux-gnueabihf.{PIOASM_VERSION}.tar.gz",
|
||||||
|
"x86_64": f"x86_64-linux-gnu.{PIOASM_VERSION}.tar.gz",
|
||||||
|
},
|
||||||
|
"windows": {
|
||||||
|
"amd64": f"x86_64-w64-mingw32.{PIOASM_VERSION}.zip",
|
||||||
|
},
|
||||||
|
"darwin": {
|
||||||
|
"x86_64": f"x86_64-apple-darwin14.{PIOASM_VERSION}.tar.gz",
|
||||||
|
"arm64": f"x86_64-apple-darwin14.{PIOASM_VERSION}.tar.gz",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
async def to_code(config):
|
||||||
|
# cg.add_platformio_option(
|
||||||
|
# "platform_packages",
|
||||||
|
# [
|
||||||
|
# "earlephilhower/tool-pioasm-rp2040-earlephilhower",
|
||||||
|
# ],
|
||||||
|
# )
|
||||||
|
file = PIOASM_DOWNLOADS[platform.system().lower()][platform.machine().lower()]
|
||||||
|
cg.add_platformio_option(
|
||||||
|
"platform_packages",
|
||||||
|
[f"earlephilhower/tool-pioasm-rp2040-earlephilhower@{PIOASM_REPO_BASE}/{file}"],
|
||||||
|
)
|
||||||
|
cg.add_platformio_option("extra_scripts", ["pre:build_pio.py"])
|
|
@ -127,6 +127,7 @@ def time_to_cycles(time_us):
|
||||||
|
|
||||||
CONF_PIO = "pio"
|
CONF_PIO = "pio"
|
||||||
|
|
||||||
|
AUTO_LOAD = ["rp2040_pio"]
|
||||||
CODEOWNERS = ["@Papa-DMan"]
|
CODEOWNERS = ["@Papa-DMan"]
|
||||||
DEPENDENCIES = ["rp2040"]
|
DEPENDENCIES = ["rp2040"]
|
||||||
|
|
||||||
|
@ -265,9 +266,3 @@ async def to_code(config):
|
||||||
time_to_cycles(config[CONF_BIT1_LOW]),
|
time_to_cycles(config[CONF_BIT1_LOW]),
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
cg.add_platformio_option(
|
|
||||||
"platform_packages",
|
|
||||||
[
|
|
||||||
"earlephilhower/tool-pioasm-rp2040-earlephilhower",
|
|
||||||
],
|
|
||||||
)
|
|
||||||
|
|
Loading…
Reference in a new issue