From 5e1c39eb0fcbd1982e640fd33ae689a0f7d21e60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= Date: Tue, 31 Jan 2023 15:51:21 +0100 Subject: [PATCH] RP2040 toolchain updated --- .trunk/trunk.yaml | 15 +++++++++++++-- .vscode/extensions.json | 7 ++++--- .vscode/settings.json | 6 +++++- arch/rp2040/rp2040.ini | 4 +--- src/platform/rp2040/rp2040CryptoEngine.cpp | 2 +- 5 files changed, 24 insertions(+), 10 deletions(-) diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml index 70acfd11..d168fec5 100644 --- a/.trunk/trunk.yaml +++ b/.trunk/trunk.yaml @@ -1,6 +1,6 @@ version: 0.1 cli: - version: 1.3.1 + version: 1.3.2 plugins: sources: - id: trunk @@ -8,8 +8,18 @@ plugins: uri: https://github.com/trunk-io/plugins lint: enabled: + - svgo@3.0.2 + - shfmt@3.5.0 + - isort@5.11.4 + - black@22.12.0 + - hadolint@2.12.0 + - actionlint@1.6.23 + - flake8@6.0.0 + - markdownlint@0.33.0 + - shellcheck@0.9.0 + - oxipng@8.0.0 - git-diff-check - - gitleaks@8.15.2 + - gitleaks@8.15.3 - clang-format@14.0.0 - prettier@2.8.3 disabled: @@ -22,6 +32,7 @@ lint: - svgo@3.0.2 runtimes: enabled: + - python@3.10.8 - go@1.18.3 - node@18.12.1 actions: diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 4fc84fa7..080e70d0 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -2,8 +2,9 @@ // See http://go.microsoft.com/fwlink/?LinkId=827846 // for the documentation about the extensions.json format "recommendations": [ - "ms-vscode.cpptools", - "platformio.platformio-ide", - "trunk.io" + "platformio.platformio-ide" ], + "unwantedRecommendations": [ + "ms-vscode.cpptools-extension-pack" + ] } diff --git a/.vscode/settings.json b/.vscode/settings.json index 3b489975..0e9ee3ce 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,4 +1,8 @@ { "editor.formatOnSave": true, - "editor.defaultFormatter": "trunk.io" + "editor.defaultFormatter": "trunk.io", + "githubPullRequests.ignoredPullRequestBranches": ["master"], + "files.associations": { + "*.tcc": "cpp" + } } diff --git a/arch/rp2040/rp2040.ini b/arch/rp2040/rp2040.ini index f30a94d3..c41f9289 100644 --- a/arch/rp2040/rp2040.ini +++ b/arch/rp2040/rp2040.ini @@ -1,8 +1,6 @@ ; Common settings for rp2040 Processor based targets [rp2040_base] -platform = https://github.com/maxgerhardt/platform-raspberrypi.git#20c7dbfcfe6677c5305fa28ecf5e3870321cb157 -platform_packages = - earlephilhower/toolchain-rp2040-earlephilhower@^5.100300.221223 +platform = https://github.com/maxgerhardt/platform-raspberrypi.git#9f8c10e50b5acd18e7bfd32638199c655be73a5b extends = arduino_base board_build.core = earlephilhower board_build.filesystem_size = 0.5m diff --git a/src/platform/rp2040/rp2040CryptoEngine.cpp b/src/platform/rp2040/rp2040CryptoEngine.cpp index c90126cc..bb1c0077 100644 --- a/src/platform/rp2040/rp2040CryptoEngine.cpp +++ b/src/platform/rp2040/rp2040CryptoEngine.cpp @@ -1,6 +1,6 @@ +#include "configuration.h" #include "CryptoEngine.h" #include "aes.hpp" -#include "configuration.h" class RP2040CryptoEngine : public CryptoEngine {