Skip to content

Commit 58786f9

Browse files
massonalmassonal
committed
Merge tag '2.3.0' into cmake_dev
2 parents 2116e6e + 92ebaf5 commit 58786f9

File tree

325 files changed

+4748
-1041
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

325 files changed

+4748
-1041
lines changed

‎.github/workflows/arduino-lint.yml

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: Check Arduino
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
pull_request:
8+
workflow_dispatch:
9+
10+
jobs:
11+
lint:
12+
runs-on: ubuntu-latest
13+
14+
steps:
15+
- name: Checkout repository
16+
uses: actions/checkout@v3
17+
18+
- name: Arduino Lint
19+
uses: arduino/arduino-lint-action@v1

‎CI/build/conf/cores_config.json

+10
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,9 @@
8787
"GENERIC_F439ZGTX", "GENERIC_F439ZGYX", "GENERIC_F439ZITX", "GENERIC_F439ZIYX",
8888
"GENERIC_F446RCTX",
8989
"GENERIC_F446VETX",
90+
"GENERIC_F722RCTX",
91+
"GENERIC_F730R8TX",
92+
"GENERIC_F732RETX",
9093
"GENERIC_F745ZETX", "GENERIC_F745ZGTX",
9194
"GENERIC_F746BETX", "GENERIC_F746BGTX", "GENERIC_F746NEHX",
9295
"GENERIC_F746ZETX", "GENERIC_F746ZEYX", "GENERIC_F746ZGYX",
@@ -103,8 +106,15 @@
103106
"GENERIC_G030K6TX",
104107
"GENERIC_G031J4MX", "GENERIC_G031J6MX",
105108
"GENERIC_G031K4TX", "GENERIC_G031K4UX", "GENERIC_G031K6TX", "GENERIC_G031K6UX", "GENERIC_G031K8TX", "GENERIC_G031K8UX",
109+
"GENERIC_G031F4PX", "GENERIC_G031F6PX", "GENERIC_G031F8PX", "GENERIC_G031Y8YX",
110+
"GENERIC_G041F6PX", "GENERIC_G041F8PX",
106111
"GENERIC_G041K6TX", "GENERIC_G041K6UX", "GENERIC_G041K8UX",
112+
"GENERIC_G070CBTX", "GENERIC_G070KBTX",
113+
"GENERIC_G071C6TX", "GENERIC_G071C8TX", "GENERIC_G071CBTX",
114+
"GENERIC_G071C6UX", "GENERIC_G071C8UX", "GENERIC_G071CBUX",
115+
"GENERIC_G071G8UXN", "GENERIC_G071GBUXN",
107116
"GENERIC_G071R6TX", "GENERIC_G071R8TX", "GENERIC_G071RBIX", "GENERIC_G071RBTX", "GENERIC_G081RBIX",
117+
"GENERIC_G081CBTX",
108118
"GENERIC_G0B1RBTX", "GENERIC_G0B1RCTX", "GENERIC_G0C1RCTX", "GENERIC_G0C1RETX",
109119
"GENERIC_G431K6TX", "GENERIC_G431K6UX", "GENERIC_G431K8TX", "GENERIC_G431K8UX", "GENERIC_G431KBTX", "GENERIC_G431KBUX",
110120
"GENERIC_G441KBTX",

‎CI/build/conf/cores_config_ci.json

+10
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,9 @@
8686
"GENERIC_F439ZGTX", "GENERIC_F439ZGYX", "GENERIC_F439ZITX", "GENERIC_F439ZIYX",
8787
"GENERIC_F446RCTX",
8888
"GENERIC_F446VETX",
89+
"GENERIC_F722RCTX",
90+
"GENERIC_F730R8TX",
91+
"GENERIC_F732RETX",
8992
"GENERIC_F745ZETX", "GENERIC_F745ZGTX",
9093
"GENERIC_F746BETX", "GENERIC_F746BGTX", "GENERIC_F746NEHX",
9194
"GENERIC_F746ZETX", "GENERIC_F746ZEYX", "GENERIC_F746ZGYX",
@@ -102,8 +105,15 @@
102105
"GENERIC_G030K6TX",
103106
"GENERIC_G031J4MX", "GENERIC_G031J6MX",
104107
"GENERIC_G031K4TX", "GENERIC_G031K4UX", "GENERIC_G031K6TX", "GENERIC_G031K6UX", "GENERIC_G031K8TX", "GENERIC_G031K8UX",
108+
"GENERIC_G031F4PX", "GENERIC_G031F6PX", "GENERIC_G031F8PX", "GENERIC_G031Y8YX",
109+
"GENERIC_G041F6PX", "GENERIC_G041F8PX",
105110
"GENERIC_G041K6TX", "GENERIC_G041K6UX", "GENERIC_G041K8UX",
111+
"GENERIC_G070CBTX", "GENERIC_G070KBTX",
112+
"GENERIC_G071C6TX", "GENERIC_G071C8TX", "GENERIC_G071CBTX",
113+
"GENERIC_G071C6UX", "GENERIC_G071C8UX", "GENERIC_G071CBUX",
114+
"GENERIC_G071G8UXN", "GENERIC_G071GBUXN",
106115
"GENERIC_G071R6TX", "GENERIC_G071R8TX", "GENERIC_G071RBIX", "GENERIC_G071RBTX", "GENERIC_G081RBIX",
116+
"GENERIC_G081CBTX",
107117
"GENERIC_G0B1RBTX", "GENERIC_G0B1RCTX", "GENERIC_G0C1RCTX", "GENERIC_G0C1RETX",
108118
"GENERIC_G431K6TX", "GENERIC_G431K6UX", "GENERIC_G431K8TX", "GENERIC_G431K8UX", "GENERIC_G431KBTX", "GENERIC_G431KBUX",
109119
"GENERIC_G441KBTX",

‎CI/build/platformio-builder.py

+19-2
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,26 @@
33
import subprocess
44
import sys
55

6+
# Libraries that are not meant to be checked in CI by default
7+
DEFAULT_IGNORED_LIBRARIES = (
8+
"keyboard",
9+
"mouse"
10+
)
11+
612

713
def run_platformio(example_path, boards):
814
return subprocess.call(
915
["platformio", "ci", example_path] + ["--board=" + b for b in boards]
1016
)
1117

1218

13-
def collect_examples(libs_dir):
19+
def collect_examples(libs_dir, ignored_libraries=None):
20+
ignored_libraries = ignored_libraries or []
1421
examples = []
1522
for lib in os.listdir(libs_dir):
23+
if lib.lower() in ignored_libraries:
24+
print(f"Skipping examples from the `{lib}` library...")
25+
continue
1626
lib_dir = os.path.join(libs_dir, lib)
1727
examples_dir = os.path.join(lib_dir, "examples")
1828
if os.path.isdir(examples_dir):
@@ -27,6 +37,9 @@ def collect_examples(libs_dir):
2737
parser.add_argument(
2838
"-b", "--board", action="append", help="board ID used for PlatformIO project"
2939
)
40+
parser.add_argument(
41+
"-i", "--ignore-library", action="append", help="Library name to ignore when collecting project examples"
42+
)
3043

3144

3245
def main():
@@ -35,8 +48,12 @@ def main():
3548
if boards is None:
3649
boards = ["nucleo_f401re"]
3750

51+
ignored_libraries = args.ignore_library
52+
if ignored_libraries is None:
53+
ignored_libraries = DEFAULT_IGNORED_LIBRARIES
54+
3855
libs_dir = os.path.join(os.environ["GITHUB_WORKSPACE"], "libraries")
39-
if any(run_platformio(example, boards) for example in collect_examples(libs_dir)):
56+
if any(run_platformio(example, boards) for example in collect_examples(libs_dir, ignored_libraries)):
4057
sys.exit(1)
4158

4259

‎CI/update/patch/CMSIS/G4/0001-Fix-CMSIS-stm32g491-and-stm32g4a1-add-missing-aliase.patch

+51
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
From 43d68baed68625b2e99d15d841c31cb1bfb2475a Mon Sep 17 00:00:00 2001
2+
From: Alexandre Bourdiol <[email protected]>
3+
Date: Mon, 20 Jun 2022 13:58:28 +0200
4+
Subject: [PATCH] Fix: CMSIS stm32g491 and stm32g4a1 add missing aliases for
5+
TIM7 and COMP4/5/6
6+
7+
Internal ticket 130525
8+
9+
Signed-off-by: Alexandre Bourdiol <[email protected]>
10+
---
11+
.../Drivers/CMSIS/Device/ST/STM32G4xx/Include/stm32g491xx.h | 4 ++++
12+
.../Drivers/CMSIS/Device/ST/STM32G4xx/Include/stm32g4a1xx.h | 4 ++++
13+
2 files changed, 8 insertions(+)
14+
15+
diff --git a/system/Drivers/CMSIS/Device/ST/STM32G4xx/Include/stm32g491xx.h b/system/Drivers/CMSIS/Device/ST/STM32G4xx/Include/stm32g491xx.h
16+
index ca9874b3..84f12c6e 100644
17+
--- a/system/Drivers/CMSIS/Device/ST/STM32G4xx/Include/stm32g491xx.h
18+
+++ b/system/Drivers/CMSIS/Device/ST/STM32G4xx/Include/stm32g491xx.h
19+
@@ -13694,8 +13694,12 @@ typedef struct
20+
/******************************************************************************/
21+
22+
/* Aliases for __IRQn */
23+
+#define TIM7_DAC_IRQn TIM7_IRQn
24+
+#define COMP4_5_6_IRQn COMP4_IRQn
25+
26+
/* Aliases for __IRQHandler */
27+
+#define TIM7_DAC_IRQHandler TIM7_IRQHandler
28+
+#define COMP4_5_6_IRQHandler COMP4_IRQHandler
29+
30+
#ifdef __cplusplus
31+
}
32+
diff --git a/system/Drivers/CMSIS/Device/ST/STM32G4xx/Include/stm32g4a1xx.h b/system/Drivers/CMSIS/Device/ST/STM32G4xx/Include/stm32g4a1xx.h
33+
index 2fb6e6f5..2431b284 100644
34+
--- a/system/Drivers/CMSIS/Device/ST/STM32G4xx/Include/stm32g4a1xx.h
35+
+++ b/system/Drivers/CMSIS/Device/ST/STM32G4xx/Include/stm32g4a1xx.h
36+
@@ -13926,8 +13926,12 @@ typedef struct
37+
/******************************************************************************/
38+
39+
/* Aliases for __IRQn */
40+
+#define TIM7_DAC_IRQn TIM7_IRQn
41+
+#define COMP4_5_6_IRQn COMP4_IRQn
42+
43+
/* Aliases for __IRQHandler */
44+
+#define TIM7_DAC_IRQHandler TIM7_IRQHandler
45+
+#define COMP4_5_6_IRQHandler COMP4_IRQHandler
46+
47+
#ifdef __cplusplus
48+
}
49+
--
50+
2.31.1.windows.1
51+

‎CI/update/stm32cube.py

+1-26
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
script_path = Path(__file__).parent.resolve()
1616
sys.path.append(str(script_path.parent))
1717
from utils import copyFile, copyFolder, createFolder, deleteFolder, genSTM32List
18+
from utils import execute_cmd, getRepoBranchName
1819

1920
if sys.platform.startswith("win32"):
2021
from colorama import init
@@ -74,16 +75,6 @@
7475
out_separator = "-" * 70
7576

7677

77-
def execute_cmd(cmd, stderror):
78-
try:
79-
output = subprocess.check_output(cmd, stderr=stderror).decode("utf-8").strip()
80-
except subprocess.CalledProcessError as e:
81-
print("Failed command: ")
82-
print(e.cmd)
83-
exit(e.returncode)
84-
return output
85-
86-
8778
def create_config(config_file_path):
8879
global repo_local_path
8980

@@ -238,22 +229,6 @@ def createSystemFiles(serie):
238229
copyFile(hal_conf_file, hal_conf_default)
239230

240231

241-
def getRepoBranchName(repo_path):
242-
bname = ""
243-
rname = ""
244-
cmd = ["git", "-C", repo_path, "branch", "-r"]
245-
bnames = execute_cmd(cmd, None).split("\n")
246-
for b in bnames:
247-
name_match = re.match(r"\S+/\S+ -> (\S+)/(\S+)", b.strip())
248-
if name_match:
249-
rname = name_match.group(1)
250-
bname = name_match.group(2)
251-
if not bname:
252-
print(f"Could not find branch name for {repo_path}!")
253-
exit(1)
254-
return (rname, bname)
255-
256-
257232
def updateCoreRepo():
258233
# Handle core repo
259234
repo_path = repo_local_path / repo_core_name

0 commit comments

Comments
 (0)