Skip to content

Variant update 6.0.50 #1683

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Apr 4, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
20 changes: 12 additions & 8 deletions CI/build/arduino-cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@

# error or fatal error
fork_pattern = re.compile(r"^Error during build: fork/exec")
error_pattern = re.compile(r":\d+:\d*:?\s.*error:\s|^Error:")
error_pattern = re.compile(r":\d+:\d*:?\s.*error:\s|^Error:|fatal error:")
ld_pattern = re.compile("arm-none-eabi/bin/ld:")
overflow_pattern = re.compile(
r"(will not fit in |section .+ is not within )?region( .+ overflowed by [\d]+ bytes)?"
Expand Down Expand Up @@ -584,6 +584,7 @@ def check_status(status, build_conf, boardKo, nb_build_conf):
# Check if failed due to a region overflowed
logFile = build_conf[idx_log] / f"{sketch_name}.log"
error_found = False
overflow_found = False
for i, line in enumerate(open(logFile)):
if error_pattern.search(line):
error_found = True
Expand All @@ -593,17 +594,20 @@ def check_status(status, build_conf, boardKo, nb_build_conf):
# If one ld line is not for region overflowed --> failed
if overflow_pattern.search(line) is None:
error_found = True
else:
overflow_found = True
if error_found:
result = ffail
boardKo.append(build_conf[idx_b_name])
if args.ci:
cat(logFile)
nb_build_failed += 1
break
else:
# else consider it succeeded
# Succeeded if overflow is found and no other error found
if overflow_found and not error_found:
result = "\033[32msucceeded*\033[0m"
nb_build_passed += 1
else:
result = ffail
boardKo.append(build_conf[idx_b_name])
if args.ci:
cat(logFile)
nb_build_failed += 1
else:
result = "\033[31merror\033[0m"
boardKo.append(build_conf[idx_b_name])
Expand Down
8 changes: 2 additions & 6 deletions CI/update/stm32variant.py
Original file line number Diff line number Diff line change
Expand Up @@ -1037,7 +1037,6 @@ def print_peripheral():

periph_c_file.write(
periph_c_template.render(
year=datetime.datetime.now().year,
mcu_file=mcu_file.name,
db_release=db_release,
peripherals_list=(
Expand Down Expand Up @@ -1360,7 +1359,6 @@ def print_variant(generic_list, alt_syswkup_list):

variant_h_file.write(
variant_h_template.render(
year=datetime.datetime.now().year,
pins_number_list=pins_number_list,
alt_pins_list=alt_pins_list,
alt_syswkup_list=alt_syswkup_list,
Expand All @@ -1379,7 +1377,6 @@ def print_variant(generic_list, alt_syswkup_list):

variant_cpp_file.write(
variant_cpp_template.render(
year=datetime.datetime.now().year,
generic_list=generic_list,
pinnames_list=pinnames_list,
analog_pins_list=analog_pins_list,
Expand Down Expand Up @@ -1515,7 +1512,6 @@ def print_general_clock(generic_list):
generic_clock_template = j2_env.get_template(generic_clock_filename)
generic_clock_file.write(
generic_clock_template.render(
year=datetime.datetime.now().year,
generic_list=generic_list,
)
)
Expand Down Expand Up @@ -1845,7 +1841,7 @@ def group_by_flash(group_base_list, glist, index_mcu_base):
# Assert
if sub.group(2) != "x":
print(
"Package of {base_name} info contains {sub.group(2)} instead of 'x'"
f"Package of {base_name}, ppe {ppe} info contains {sub.group(2)} instead of 'x'"
)
exit(1)
if sub.group(3):
Expand Down Expand Up @@ -2427,7 +2423,7 @@ def manage_repo():
update_regex = re.compile(r"defined\(ARDUINO_GENERIC_.+\)")
board_entry_regex = re.compile(r"(Gen.+\..+variant=STM32.+xx/)\S+")
# P T E
mcu_PE_regex = re.compile(r"([\w])([\w])([ANPQX])?$")
mcu_PE_regex = re.compile(r"([\w])([\w])([ANPQSX])?$")
aggregate_dir()

# Clean temporary dir
Expand Down
2 changes: 1 addition & 1 deletion CI/update/templates/PeripheralPins.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
*******************************************************************************
* Copyright (c) 2020-{{year}}, STMicroelectronics
* Copyright (c) 2020, STMicroelectronics
* All rights reserved.
*
* This software component is licensed by ST under BSD 3-Clause license,
Expand Down
2 changes: 1 addition & 1 deletion CI/update/templates/generic_clock.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
*******************************************************************************
* Copyright (c) 2020-{{year}}, STMicroelectronics
* Copyright (c) 2020, STMicroelectronics
* All rights reserved.
*
* This software component is licensed by ST under BSD 3-Clause license,
Expand Down
2 changes: 1 addition & 1 deletion CI/update/templates/variant_generic.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
*******************************************************************************
* Copyright (c) 2020-{{year}}, STMicroelectronics
* Copyright (c) 2020, STMicroelectronics
* All rights reserved.
*
* This software component is licensed by ST under BSD 3-Clause license,
Expand Down
2 changes: 1 addition & 1 deletion CI/update/templates/variant_generic.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
*******************************************************************************
* Copyright (c) 2020-{{year}}, STMicroelectronics
* Copyright (c) 2020, STMicroelectronics
* All rights reserved.
*
* This software component is licensed by ST under BSD 3-Clause license,
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,7 @@ User can add a STM32 based board following this [wiki](https://github.com/stm32d
| Status | Device(s) | Name | Release | Notes |
| :----: | :-------: | ---- | :-----: | :---- |
| :green_heart: | STM32U575AGIxQ<br>STM32U575AIIxQ<br>STM32U585AIIxQ | Generic Board | *2.1.0* | |
| :green_heart: | STM32U575ZGTxQ<br>STM32U575ZITxQ<br>STM32U585ZETxQ | Generic Board | *2.1.0* | |
| :green_heart: | STM32U575ZGTxQ<br>STM32U575ZITxQ<br>STM32U585ZITxQ | Generic Board | *2.1.0* | |

### Generic STM32WB boards

Expand Down
Loading