Skip to content

variant: update generated files to STM32_open_pin_data v6.0.60 #1757

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 2 commits into from
Jul 6, 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
  •  
  •  
  •  
19 changes: 16 additions & 3 deletions CI/update/stm32variant.py
Original file line number Diff line number Diff line change
Expand Up @@ -2033,13 +2033,16 @@ def aggregate_dir():
variant_exp = []
# Compare the first directory to all other directories
while mcu_dirs and index < len(mcu_dirs):
# Compare all the variant file except the generic_boards.txt
# Compare all the variant files except the generic_boards.txt
mcu_dir2_files_list = [
mcu_dirs[index] / periph_c_filename,
mcu_dirs[index] / pinvar_h_filename,
mcu_dirs[index] / variant_cpp_filename,
mcu_dirs[index] / variant_h_filename,
]
# Iterate over each variant files
periph_xml_tmp = []
variant_exp_tmp = []
for index2, fname in enumerate(mcu_dir1_files_list):
with open(fname, "r") as f1:
with open(mcu_dir2_files_list[index2], "r") as f2:
Expand All @@ -2048,20 +2051,30 @@ def aggregate_dir():
if not diff or len(diff) == 2:
if index2 == 0:
for line in diff:
periph_xml += periperalpins_regex.findall(line)
periph_xml_tmp += periperalpins_regex.findall(
line
)
elif index2 == 2:
for line in diff:
variant_exp += variant_regex.findall(line)
variant_exp_tmp += variant_regex.findall(line)
continue
else:
# Not the same directory compare with the next one
index += 1
break
# All files compared and matched
else:
# Concatenate lists without duplicate
uniq_periph_xml = set(periph_xml_tmp) - set(periph_xml)
periph_xml = periph_xml + list(uniq_periph_xml)
uniq_variant_exp = set(variant_exp_tmp) - set(variant_exp)
variant_exp = variant_exp + list(uniq_variant_exp)
# Matched files append to the group list
group_mcu_dir.append(mcu_dirs.pop(index))
del periph_xml_tmp[:]
del variant_exp_tmp[:]
del mcu_dir2_files_list[:]

# Merge directories name and contents if needed
mcu_dir = merge_dir(
out_temp_path, group_mcu_dir, mcu_family, periph_xml, variant_exp
Expand Down
2 changes: 1 addition & 1 deletion variants/STM32F0xx/F030C6T/PeripheralPins.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
/*
* Automatically generated from STM32F030C6Tx.xml
* CubeMX DB release 6.0.50
* CubeMX DB release 6.0.60
*/
#if !defined(CUSTOM_PERIPHERAL_PINS)
#include "Arduino.h"
Expand Down
2 changes: 1 addition & 1 deletion variants/STM32F0xx/F030C8T/PeripheralPins.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
/*
* Automatically generated from STM32F030C8Tx.xml
* CubeMX DB release 6.0.50
* CubeMX DB release 6.0.60
*/
#if !defined(CUSTOM_PERIPHERAL_PINS)
#include "Arduino.h"
Expand Down
2 changes: 1 addition & 1 deletion variants/STM32F0xx/F030CCT/PeripheralPins.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
/*
* Automatically generated from STM32F030CCTx.xml
* CubeMX DB release 6.0.50
* CubeMX DB release 6.0.60
*/
#if !defined(CUSTOM_PERIPHERAL_PINS)
#include "Arduino.h"
Expand Down
2 changes: 1 addition & 1 deletion variants/STM32F0xx/F030F4P/PeripheralPins.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
/*
* Automatically generated from STM32F030F4Px.xml
* CubeMX DB release 6.0.50
* CubeMX DB release 6.0.60
*/
#if !defined(CUSTOM_PERIPHERAL_PINS)
#include "Arduino.h"
Expand Down
2 changes: 1 addition & 1 deletion variants/STM32F0xx/F030K6T/PeripheralPins.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
/*
* Automatically generated from STM32F030K6Tx.xml
* CubeMX DB release 6.0.50
* CubeMX DB release 6.0.60
*/
#if !defined(CUSTOM_PERIPHERAL_PINS)
#include "Arduino.h"
Expand Down
2 changes: 1 addition & 1 deletion variants/STM32F0xx/F030R8T/PeripheralPins.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
/*
* Automatically generated from STM32F030R8Tx.xml
* CubeMX DB release 6.0.50
* CubeMX DB release 6.0.60
*/
#if !defined(CUSTOM_PERIPHERAL_PINS)
#include "Arduino.h"
Expand Down
2 changes: 1 addition & 1 deletion variants/STM32F0xx/F030RCT/PeripheralPins.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
/*
* Automatically generated from STM32F030RCTx.xml
* CubeMX DB release 6.0.50
* CubeMX DB release 6.0.60
*/
#if !defined(CUSTOM_PERIPHERAL_PINS)
#include "Arduino.h"
Expand Down
2 changes: 1 addition & 1 deletion variants/STM32F0xx/F031C(4-6)T/PeripheralPins.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
/*
* Automatically generated from STM32F031C(4-6)Tx.xml
* CubeMX DB release 6.0.50
* CubeMX DB release 6.0.60
*/
#if !defined(CUSTOM_PERIPHERAL_PINS)
#include "Arduino.h"
Expand Down
2 changes: 1 addition & 1 deletion variants/STM32F0xx/F031E6Y_F038E6Y/PeripheralPins.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
/*
* Automatically generated from STM32F031E6Yx.xml, STM32F038E6Yx.xml
* CubeMX DB release 6.0.50
* CubeMX DB release 6.0.60
*/
#if !defined(CUSTOM_PERIPHERAL_PINS)
#include "Arduino.h"
Expand Down
2 changes: 1 addition & 1 deletion variants/STM32F0xx/F031F(4-6)P/PeripheralPins.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
/*
* Automatically generated from STM32F031F(4-6)Px.xml
* CubeMX DB release 6.0.50
* CubeMX DB release 6.0.60
*/
#if !defined(CUSTOM_PERIPHERAL_PINS)
#include "Arduino.h"
Expand Down
2 changes: 1 addition & 1 deletion variants/STM32F0xx/F031G(4-6)U/PeripheralPins.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
/*
* Automatically generated from STM32F031G(4-6)Ux.xml
* CubeMX DB release 6.0.50
* CubeMX DB release 6.0.60
*/
#if !defined(CUSTOM_PERIPHERAL_PINS)
#include "Arduino.h"
Expand Down
2 changes: 1 addition & 1 deletion variants/STM32F0xx/F031K(4-6)U/PeripheralPins.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
/*
* Automatically generated from STM32F031K(4-6)Ux.xml
* CubeMX DB release 6.0.50
* CubeMX DB release 6.0.60
*/
#if !defined(CUSTOM_PERIPHERAL_PINS)
#include "Arduino.h"
Expand Down
2 changes: 1 addition & 1 deletion variants/STM32F0xx/F031K6T/PeripheralPins.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
/*
* Automatically generated from STM32F031K6Tx.xml
* CubeMX DB release 6.0.50
* CubeMX DB release 6.0.60
*/
#if !defined(CUSTOM_PERIPHERAL_PINS)
#include "Arduino.h"
Expand Down
2 changes: 1 addition & 1 deletion variants/STM32F0xx/F038C6T/PeripheralPins.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
/*
* Automatically generated from STM32F038C6Tx.xml
* CubeMX DB release 6.0.50
* CubeMX DB release 6.0.60
*/
#if !defined(CUSTOM_PERIPHERAL_PINS)
#include "Arduino.h"
Expand Down
2 changes: 1 addition & 1 deletion variants/STM32F0xx/F038F6P/PeripheralPins.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
/*
* Automatically generated from STM32F038F6Px.xml
* CubeMX DB release 6.0.50
* CubeMX DB release 6.0.60
*/
#if !defined(CUSTOM_PERIPHERAL_PINS)
#include "Arduino.h"
Expand Down
2 changes: 1 addition & 1 deletion variants/STM32F0xx/F038G6U/PeripheralPins.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
/*
* Automatically generated from STM32F038G6Ux.xml
* CubeMX DB release 6.0.50
* CubeMX DB release 6.0.60
*/
#if !defined(CUSTOM_PERIPHERAL_PINS)
#include "Arduino.h"
Expand Down
2 changes: 1 addition & 1 deletion variants/STM32F0xx/F038K6U/PeripheralPins.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
/*
* Automatically generated from STM32F038K6Ux.xml
* CubeMX DB release 6.0.50
* CubeMX DB release 6.0.60
*/
#if !defined(CUSTOM_PERIPHERAL_PINS)
#include "Arduino.h"
Expand Down
2 changes: 1 addition & 1 deletion variants/STM32F0xx/F042C(4-6)(T-U)/PeripheralPins.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
/*
* Automatically generated from STM32F042C(4-6)Tx.xml, STM32F042C(4-6)Ux.xml
* CubeMX DB release 6.0.50
* CubeMX DB release 6.0.60
*/
#if !defined(CUSTOM_PERIPHERAL_PINS)
#include "Arduino.h"
Expand Down
2 changes: 1 addition & 1 deletion variants/STM32F0xx/F042F(4-6)P/PeripheralPins.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
/*
* Automatically generated from STM32F042F4Px.xml, STM32F042F6Px.xml
* CubeMX DB release 6.0.50
* CubeMX DB release 6.0.60
*/
#if !defined(CUSTOM_PERIPHERAL_PINS)
#include "Arduino.h"
Expand Down
2 changes: 1 addition & 1 deletion variants/STM32F0xx/F042G(4-6)U/PeripheralPins.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
/*
* Automatically generated from STM32F042G(4-6)Ux.xml
* CubeMX DB release 6.0.50
* CubeMX DB release 6.0.60
*/
#if !defined(CUSTOM_PERIPHERAL_PINS)
#include "Arduino.h"
Expand Down
2 changes: 1 addition & 1 deletion variants/STM32F0xx/F042K(4-6)T/PeripheralPins.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
/*
* Automatically generated from STM32F042K(4-6)Tx.xml
* CubeMX DB release 6.0.50
* CubeMX DB release 6.0.60
*/
#if !defined(CUSTOM_PERIPHERAL_PINS)
#include "Arduino.h"
Expand Down
2 changes: 1 addition & 1 deletion variants/STM32F0xx/F042K(4-6)U/PeripheralPins.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
/*
* Automatically generated from STM32F042K(4-6)Ux.xml
* CubeMX DB release 6.0.50
* CubeMX DB release 6.0.60
*/
#if !defined(CUSTOM_PERIPHERAL_PINS)
#include "Arduino.h"
Expand Down
2 changes: 1 addition & 1 deletion variants/STM32F0xx/F042T6Y/PeripheralPins.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
/*
* Automatically generated from STM32F042T6Yx.xml
* CubeMX DB release 6.0.50
* CubeMX DB release 6.0.60
*/
#if !defined(CUSTOM_PERIPHERAL_PINS)
#include "Arduino.h"
Expand Down
2 changes: 1 addition & 1 deletion variants/STM32F0xx/F048C6U/PeripheralPins.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
/*
* Automatically generated from STM32F048C6Ux.xml
* CubeMX DB release 6.0.50
* CubeMX DB release 6.0.60
*/
#if !defined(CUSTOM_PERIPHERAL_PINS)
#include "Arduino.h"
Expand Down
2 changes: 1 addition & 1 deletion variants/STM32F0xx/F048G6U/PeripheralPins.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
/*
* Automatically generated from STM32F048G6Ux.xml
* CubeMX DB release 6.0.50
* CubeMX DB release 6.0.60
*/
#if !defined(CUSTOM_PERIPHERAL_PINS)
#include "Arduino.h"
Expand Down
2 changes: 1 addition & 1 deletion variants/STM32F0xx/F048T6Y/PeripheralPins.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
/*
* Automatically generated from STM32F048T6Yx.xml
* CubeMX DB release 6.0.50
* CubeMX DB release 6.0.60
*/
#if !defined(CUSTOM_PERIPHERAL_PINS)
#include "Arduino.h"
Expand Down
2 changes: 1 addition & 1 deletion variants/STM32F0xx/F051C4(T-U)/PeripheralPins.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
/*
* Automatically generated from STM32F051C4Tx.xml, STM32F051C4Ux.xml
* CubeMX DB release 6.0.50
* CubeMX DB release 6.0.60
*/
#if !defined(CUSTOM_PERIPHERAL_PINS)
#include "Arduino.h"
Expand Down
2 changes: 1 addition & 1 deletion variants/STM32F0xx/F051C6(T-U)/PeripheralPins.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
/*
* Automatically generated from STM32F051C6Tx.xml, STM32F051C6Ux.xml
* CubeMX DB release 6.0.50
* CubeMX DB release 6.0.60
*/
#if !defined(CUSTOM_PERIPHERAL_PINS)
#include "Arduino.h"
Expand Down
3 changes: 1 addition & 2 deletions variants/STM32F0xx/F051C8(T-U)/PeripheralPins.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
*/
/*
* Automatically generated from STM32F051C8Tx.xml, STM32F051C8Ux.xml
* STM32F058C8Ux.xml
* CubeMX DB release 6.0.50
* CubeMX DB release 6.0.60
*/
#if !defined(CUSTOM_PERIPHERAL_PINS)
#include "Arduino.h"
Expand Down
3 changes: 1 addition & 2 deletions variants/STM32F0xx/F051K(6-8)T/PeripheralPins.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
*/
/*
* Automatically generated from STM32F051K6Tx.xml, STM32F051K8Tx.xml
* STM32F051T8Yx.xml, STM32F058T8Yx.xml
* CubeMX DB release 6.0.50
* CubeMX DB release 6.0.60
*/
#if !defined(CUSTOM_PERIPHERAL_PINS)
#include "Arduino.h"
Expand Down
2 changes: 1 addition & 1 deletion variants/STM32F0xx/F051K(6-8)U/PeripheralPins.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
/*
* Automatically generated from STM32F051K6Ux.xml, STM32F051K8Ux.xml
* CubeMX DB release 6.0.50
* CubeMX DB release 6.0.60
*/
#if !defined(CUSTOM_PERIPHERAL_PINS)
#include "Arduino.h"
Expand Down
2 changes: 1 addition & 1 deletion variants/STM32F0xx/F051K4T/PeripheralPins.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
/*
* Automatically generated from STM32F051K4Tx.xml
* CubeMX DB release 6.0.50
* CubeMX DB release 6.0.60
*/
#if !defined(CUSTOM_PERIPHERAL_PINS)
#include "Arduino.h"
Expand Down
2 changes: 1 addition & 1 deletion variants/STM32F0xx/F051K4U/PeripheralPins.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
/*
* Automatically generated from STM32F051K4Ux.xml
* CubeMX DB release 6.0.50
* CubeMX DB release 6.0.60
*/
#if !defined(CUSTOM_PERIPHERAL_PINS)
#include "Arduino.h"
Expand Down
2 changes: 1 addition & 1 deletion variants/STM32F0xx/F051R4T/PeripheralPins.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
/*
* Automatically generated from STM32F051R4Tx.xml
* CubeMX DB release 6.0.50
* CubeMX DB release 6.0.60
*/
#if !defined(CUSTOM_PERIPHERAL_PINS)
#include "Arduino.h"
Expand Down
2 changes: 1 addition & 1 deletion variants/STM32F0xx/F051R6T/PeripheralPins.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
/*
* Automatically generated from STM32F051R6Tx.xml
* CubeMX DB release 6.0.50
* CubeMX DB release 6.0.60
*/
#if !defined(CUSTOM_PERIPHERAL_PINS)
#include "Arduino.h"
Expand Down
3 changes: 1 addition & 2 deletions variants/STM32F0xx/F051R8(H-T)/PeripheralPins.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
*/
/*
* Automatically generated from STM32F051R8Hx.xml, STM32F051R8Tx.xml
* STM32F058R8Hx.xml, STM32F058R8Tx.xml
* CubeMX DB release 6.0.50
* CubeMX DB release 6.0.60
*/
#if !defined(CUSTOM_PERIPHERAL_PINS)
#include "Arduino.h"
Expand Down
2 changes: 1 addition & 1 deletion variants/STM32F0xx/F051T8Y/PeripheralPins.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
/*
* Automatically generated from STM32F051T8Yx.xml
* CubeMX DB release 6.0.50
* CubeMX DB release 6.0.60
*/
#if !defined(CUSTOM_PERIPHERAL_PINS)
#include "Arduino.h"
Expand Down
2 changes: 1 addition & 1 deletion variants/STM32F0xx/F058C8U/PeripheralPins.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
/*
* Automatically generated from STM32F058C8Ux.xml
* CubeMX DB release 6.0.50
* CubeMX DB release 6.0.60
*/
#if !defined(CUSTOM_PERIPHERAL_PINS)
#include "Arduino.h"
Expand Down
Loading