Skip to content

[variant] Add Generic F7xx #8

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

Closed
wants to merge 36 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
dc1cd6d
[stm32variant] Change generic variant generation
fpistm Mar 10, 2021
5906143
Add all generated STM32F0xx generic variant files
fpistm Mar 15, 2021
fc14e72
Add all generated STM32F1xx generic variant files
fpistm Mar 15, 2021
a280c38
Add all generated STM32F2xx generic variant files
fpistm Mar 15, 2021
e1e6566
Add all generated STM32F3xx generic variant files
fpistm Mar 15, 2021
647213f
Add all generated STM32F4xx generic variant files
fpistm Mar 15, 2021
182afda
Add all generated STM32F7xx generic variant files
fpistm Mar 15, 2021
501e27c
Add all generated STM32G0xx generic variant files
fpistm Mar 15, 2021
db68aa0
Add all generated STM32G4xx generic variant files
fpistm Mar 15, 2021
21a97fa
Add all generated STM32H7xx generic variant files
fpistm Mar 15, 2021
5e7172d
Add all generated STM32L0xx generic variant files
fpistm Mar 15, 2021
0057b9d
Add all generated STM32L1xx generic variant files
fpistm Mar 15, 2021
14fde38
Add all generated STM32L4xx generic variant files
fpistm Mar 15, 2021
6519f81
Add all generated STM32L5xx generic variant files
fpistm Mar 15, 2021
8310426
Add all generated STM32MP1xx generic variant files
fpistm Mar 15, 2021
b5075b3
Add all generated STM32WBxx generic variant files
fpistm Mar 15, 2021
d1ad3e7
Add all generated STM32WLxx generic variant files
fpistm Mar 15, 2021
69beb6d
Update variant header management
fpistm Mar 11, 2021
e8d1eb1
[variant] Add Generic L4xx
fpistm Mar 12, 2021
840bf92
[variant] Add Generic G4xx
ABOSTM Mar 15, 2021
8de4a23
[variant] Add Generic G0xx
fpistm Mar 15, 2021
310059d
Add Aurora One Variant
Sep 15, 2020
9032ce6
Add Nucleo G031K8 and generic G031Kx
fpistm Mar 15, 2021
a04e2d4
[variant] Update Generic F0xx
fpistm Jan 22, 2021
8afa2bd
Add Generic F042Cx
seeers Mar 10, 2021
6fb3e45
Added NUCLEO_F070RB
gbmhunter Sep 10, 2020
55b543e
[variant] Update Generic MP1xx
fpistm Jan 27, 2021
94a4c23
[variant] Add Generic F2xx
fpistm Mar 14, 2021
084721f
[variant] Add Generic L5xx and Nucleo L552ZE-Q
fpistm Mar 14, 2021
256ac0c
[variant] Add Generic WBxx
fpistm Mar 14, 2021
8739391
[variant] Add Generic L1xx
fpistm Mar 15, 2021
ade0a1e
[variant] Update Generic H7xx
fpistm Mar 15, 2021
0b6fe6c
Enable HAL MDMA by default
fpistm Mar 16, 2021
c7388d4
[CI] Update configuration to build only one generic per variant
fpistm Mar 16, 2021
8d6e014
[PIO]Fix variant header changes
fpistm Mar 12, 2021
6a756e0
[variant] Add Generic F7xx
ABOSTM Mar 16, 2021
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
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
4 changes: 2 additions & 2 deletions .github/actions/pio-build/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ python3 -c "import json; import os; fp=open(os.path.expanduser('~/.platformio/pl
}

# Fix for variant path change while not updated in PIO
python3 -c "import json; import os; fp=open(os.path.expanduser('~/.platformio/platforms/ststm32/boards/remram_v1.json'), 'r+'); data=json.load(fp); data['build']['variant'] = 'STM32F7xx/REMRAM_V1'; fp.seek(0); fp.truncate(); json.dump(data, fp); fp.close()" || {
python3 -c "import json; import os; fp=open(os.path.expanduser('~/.platformio/platforms/ststm32/boards/remram_v1.json'), 'r+'); data=json.load(fp); data['build']['variant'] = 'STM32F7xx/REMRAM_V1'; data['build']['extra_flags'] = '-DSTM32F765xx -DVARIANT_H=\\\\\"variant_REMRAM_V1.h\\\\\"'; fp.seek(0); fp.truncate(); json.dump(data, fp); fp.close()" || {
exit 1
}
python3 -c "import json; import os; fp=open(os.path.expanduser('~/.platformio/platforms/ststm32/boards/blackpill_f103c8.json'), 'r+'); data=json.load(fp); data['build']['variant'] = 'STM32F1xx/PILL_F103XX'; fp.seek(0); fp.truncate(); json.dump(data, fp); fp.close()" || {
python3 -c "import json; import os; fp=open(os.path.expanduser('~/.platformio/platforms/ststm32/boards/blackpill_f103c8.json'), 'r+'); data=json.load(fp); data['build']['variant'] = 'STM32F1xx/PILL_F103XX'; data['build']['extra_flags'] = '-DSTM32F1 -DSTM32F103xB -DVARIANT_H=\\\\\"variant_PILL_F103XX.h\\\\\"'; fp.seek(0); fp.truncate(); json.dump(data, fp); fp.close()" || {
exit 1
}

Expand Down
83 changes: 70 additions & 13 deletions CI/build/conf/cores_config.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@
"BLACK_F407ZE", "BLACK_F407ZG",
"BLUEPILL_F103C6", "BLUEPILL_F103CB",
"DEMO_F030F4_16M", "DEMO_F030F4_HSI",
"GENERIC_F042C4TX", "GENERIC_F042C4UX", "GENERIC_F042C6TX",
"GENERIC_F051K6UX",
"GENERIC_F072C8TX", "GENERIC_F072C8UX", "GENERIC_F072CBTX", "GENERIC_F072CBUX",
"GENERIC_F072R8TX", "GENERIC_F072RBHX", "GENERIC_F072RBIX",
"GENERIC_F091RCHX", "GENERIC_F091RCTX", "GENERIC_F091RCYX",
"Generic_F103C4", "Generic_F103C6", "Generic_F103C8",
"Generic_F103R4", "Generic_F103R6", "Generic_F103R8", "Generic_F103RB",
"Generic_F103RC", "Generic_F103RD", "Generic_F103RF", "Generic_F103RG",
Expand All @@ -55,6 +60,58 @@
"Generic_F417VE",
"Generic_F423CH",
"Generic_F446RC",
"GENERIC_G030K6TX",
"GENERIC_G031J4MX", "GENERIC_G031J6MX",
"GENERIC_G031K4TX", "GENERIC_G031K4UX", "GENERIC_G031K6TX", "GENERIC_G031K6UX", "GENERIC_G031K8TX", "GENERIC_G031K8UX",
"GENERIC_G041K6TX", "GENERIC_G041K6UX", "GENERIC_G041K8UX",
"GENERIC_G071R6TX", "GENERIC_G071R8TX", "GENERIC_G071RBIX", "GENERIC_G071RBTX", "GENERIC_G081RBIX",
"GENERIC_G431K6TX", "GENERIC_G431K6UX", "GENERIC_G431K8TX", "GENERIC_G431K8UX", "GENERIC_G431KBTX", "GENERIC_G431KBUX",
"GENERIC_G441KBTX",
"GENERIC_G431R6IX", "GENERIC_G431R6TX", "GENERIC_G431R8IX", "GENERIC_G431R8TX", "GENERIC_G431RBIX", "GENERIC_G431RBTX",
"GENERIC_G441RBIX",
"GENERIC_G473RBTX", "GENERIC_G473RCTX", "GENERIC_G473RETX",
"GENERIC_G474RBTX", "GENERIC_G474RCTX", "GENERIC_G474RETX",
"GENERIC_G483RETX",
"GENERIC_H742ZGTX", "GENERIC_H742ZITX",
"GENERIC_H743ZGTX",
"GENERIC_H747AGIX", "GENERIC_H747AIIX", "GENERIC_H747IGTX", "GENERIC_H747IITX",
"GENERIC_H750ZBTX",
"GENERIC_H753ZITX",
"GENERIC_H757AIIX", "GENERIC_H757IITX",
"GENERIC_H743IGKX", "GENERIC_H743IGTX", "GENERIC_H743IIKX", "GENERIC_H743IITX", "GENERIC_H753IIKX", "GENERIC_H753IITX",
"GENERIC_L100C6UX", "GENERIC_L100C6UXA",
"GENERIC_L151C6TX", "GENERIC_L151C6TXA", "GENERIC_L151C6UX", "GENERIC_L151C6UXA", "GENERIC_L151C8TX", "GENERIC_L151C8TXA",
"GENERIC_L151C8UX", "GENERIC_L151C8UXA", "GENERIC_L151CBTX", "GENERIC_L151CBUX", "GENERIC_L151CBUXA",
"GENERIC_L152C6TX", "GENERIC_L152C6TXA", "GENERIC_L152C6UX", "GENERIC_L152C6UXA", "GENERIC_L152C8TX", "GENERIC_L152C8TXA",
"GENERIC_L152C8UX", "GENERIC_L152C8UXA", "GENERIC_L152CBTX", "GENERIC_L152CBTXA", "GENERIC_L152CBUX", "GENERIC_L152CBUXA",
"GENERIC_L151RETX", "GENERIC_L162RETX",
"GENERIC_L412K8TX", "GENERIC_L412K8UX", "GENERIC_L412KBUX",
"GENERIC_L422KBTX", "GENERIC_L422KBUX",
"GENERIC_L432KBUX",
"GENERIC_L442KCUX",
"GENERIC_L452RCIX", "GENERIC_L452RCTX", "GENERIC_L452RCYX", "GENERIC_L452REIX", "GENERIC_L452REYX",
"GENERIC_L462REIX", "GENERIC_L462RETX", "GENERIC_L462REYX",
"GENERIC_L475RCTX", "GENERIC_L475RETX", "GENERIC_L475RGTX",
"GENERIC_L476RCTX", "GENERIC_L476RETX",
"GENERIC_L486RGTX",
"GENERIC_L475VCTX", "GENERIC_L475VGTX",
"GENERIC_L476VCTX", "GENERIC_L476VETX", "GENERIC_L476VGTX",
"GENERIC_L486VGTX",
"GENERIC_L496ZETX",
"GENERIC_L4A6ZGTX",
"GENERIC_L4A6ZGTXP",
"GENERIC_L4R5VGTX", "GENERIC_L4R5VITX",
"GENERIC_L4R7VITX",
"GENERIC_L4S7VITX",
"GENERIC_L4R5ZGTX", "GENERIC_L4R5ZITX",
"GENERIC_L4R7ZITX",
"GENERIC_L4R9ZGJX",
"GENERIC_L4S7ZITX",
"GENERIC_L4S9ZIJX",
"GENERIC_L552ZCTXQ",
"GENERIC_L562ZETXQ",
"GENERIC_WB55CCUX", "GENERIC_WB55CGUX",
"GENERIC_WB55RCVX", "GENERIC_WB55REVX",
"NUCLEO_H743ZI",
"NUCLEO_L496ZG",
"NUCLEO_L4R5ZI",
Expand All @@ -71,17 +128,17 @@
{
"pattern": "DISCO_IOT_|M24SR64-Y|MX25R6435F",
"applicable": true,
"boards": [ "DISCO_L475VG_IOT" ]
"boards": [ "B_L475E_IOT01A" ]
},
{
"pattern": "SPBTLE_BeaconDemo|SPBTLE_SensorDemo|BTLE_sensors_TimeOfFlight_demo",
"applicable": true,
"boards": [ "DISCO_L475VG_IOT" ]
"boards": [ "B_L475E_IOT01A" ]
},
{
"pattern": "STM32duinoBLE",
"applicable": true,
"boards": [ "DISCO_L475VG_IOT", "STEVAL_MKSBOX1V1", "NUCLEO_L476RG" ]
"boards": [ "B_L475E_IOT01A", "STEVAL_MKSBOX1V1", "NUCLEO_L476RG" ]
},
{
"pattern": "STM32Ethernet|Ethernet_MQTT_Adafruit.io|Hello_stm32",
Expand All @@ -91,7 +148,7 @@
{
"pattern": "ISM43362-M3G-L44|WiFi_MQTT_Adafruit.io|mqtt_B-L475E-IOT01A",
"applicable": true,
"boards": [ "DISCO_L475VG_IOT" ]
"boards": [ "B_L475E_IOT01A" ]
},
{
"pattern": "ExternalWakeup|NucleoCar",
Expand Down Expand Up @@ -134,7 +191,7 @@
"RAK811_TRACKER",
"REMRAM_V1",
"Sparky_V1",
"Wraith32_V1"
"WRAITH32_V1"
]
},
{
Expand All @@ -153,7 +210,7 @@
"boards": [
"EEXTR_F030_V1", "ELEKTOR_F072C8", "ELEKTOR_F072CB", "FYSETC_S6", "Generic_F103ZG",
"MALYANM200_F103CB", "PRNTR_V2", "PX_HER0", "STEVAL_MKSBOX1V1", "VAKE_F446VE",
"VCCGND_F103ZET6", "VCCGND_F103ZET6Mini", "Wraith32_V1"
"VCCGND_F103ZET6", "VCCGND_F103ZET6Mini", "WRAITH32_V1"
]
},
{
Expand Down Expand Up @@ -196,7 +253,7 @@
"DISCO_F407VG",
"DISCO_F746NG",
"DISCO_L072CZ_LRWAN1",
"DISCO_L475VG_IOT"
"B_L475E_IOT01A"
],
"options": "usb=HID"
},
Expand All @@ -207,7 +264,7 @@
"boards": [
"DISCO_F746NG",
"DISCO_L072CZ_LRWAN1",
"DISCO_L475VG_IOT",
"B_L475E_IOT01A",
"NUCLEO_F091RC",
"NUCLEO_F103RB",
"NUCLEO_F207ZG",
Expand All @@ -234,7 +291,7 @@
"NUCLEO_L496ZG-P",
"NUCLEO_L4R5ZI",
"NUCLEO_L4R5ZI-P",
"PNUCLEO_WB55RG",
"P_NUCLEO_WB55RG",
"STM32MP157C_DK2"
]
},
Expand Down Expand Up @@ -265,8 +322,8 @@
"pattern": "X_NUCLEO_GNSS1A1",
"applicable": false,
"boards": [
"DISCO_F746NG", "DISCO_L475VG_IOT", "NUCLEO_F207ZG", "NUCLEO_F429ZI", "NUCLEO_F767ZI",
"NUCLEO_H743ZI2", "PNUCLEO_WB55RG", "STM32MP157C_DK2"
"DISCO_F746NG", "B_L475E_IOT01A", "NUCLEO_F207ZG", "NUCLEO_F429ZI", "NUCLEO_F767ZI",
"NUCLEO_H743ZI2", "P_NUCLEO_WB55RG", "STM32MP157C_DK2"
]
},
{
Expand All @@ -282,7 +339,7 @@
{
"pattern": "SerialLoop|Tests_basic_functions",
"applicable": false,
"boards": [ "NUCLEO_F031K6", "NUCLEO_L031K6", "Wraith32_V1" ]
"boards": [ "NUCLEO_F031K6", "NUCLEO_L031K6", "WRAITH32_V1" ]
},
{
"pattern": "(Alarm)?TimedWak(e)?up|SerialDeepSleep",
Expand All @@ -298,7 +355,7 @@
"pattern": "tone|p07_Keyboard",
"applicable": false,
"boards": [
"ST3DP001_EVAL", "STEVAL_MKSBOX1V1", "VAKE_F446VE", "Wraith32_V1"
"ST3DP001_EVAL", "STEVAL_MKSBOX1V1", "VAKE_F446VE", "WRAITH32_V1"
]
},
{
Expand Down
57 changes: 57 additions & 0 deletions CI/build/conf/cores_config_ci.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@
"BLACK_F407ZE", "BLACK_F407ZG",
"BLUEPILL_F103C6", "BLUEPILL_F103CB",
"DEMO_F030F4_16M", "DEMO_F030F4_HSI",
"GENERIC_F042C4TX", "GENERIC_F042C4UX", "GENERIC_F042C6TX",
"GENERIC_F051K6UX",
"GENERIC_F072C8TX", "GENERIC_F072C8UX", "GENERIC_F072CBTX", "GENERIC_F072CBUX",
"GENERIC_F072R8TX", "GENERIC_F072RBHX", "GENERIC_F072RBIX",
"GENERIC_F091RCHX", "GENERIC_F091RCTX", "GENERIC_F091RCYX",
"Generic_F103C4", "Generic_F103C6", "Generic_F103C8",
"Generic_F103R4", "Generic_F103R6", "Generic_F103R8", "Generic_F103RB",
"Generic_F103RC", "Generic_F103RD", "Generic_F103RF", "Generic_F103RG",
Expand All @@ -54,6 +59,58 @@
"Generic_F417VE",
"Generic_F423CH",
"Generic_F446RC",
"GENERIC_G030K6TX",
"GENERIC_G031J4MX", "GENERIC_G031J6MX",
"GENERIC_G031K4TX", "GENERIC_G031K4UX", "GENERIC_G031K6TX", "GENERIC_G031K6UX", "GENERIC_G031K8TX", "GENERIC_G031K8UX",
"GENERIC_G041K6TX", "GENERIC_G041K6UX", "GENERIC_G041K8UX",
"GENERIC_G071R6TX", "GENERIC_G071R8TX", "GENERIC_G071RBIX", "GENERIC_G071RBTX", "GENERIC_G081RBIX",
"GENERIC_G431K6TX", "GENERIC_G431K6UX", "GENERIC_G431K8TX", "GENERIC_G431K8UX", "GENERIC_G431KBTX", "GENERIC_G431KBUX",
"GENERIC_G441KBTX",
"GENERIC_G431R6IX", "GENERIC_G431R6TX", "GENERIC_G431R8IX", "GENERIC_G431R8TX", "GENERIC_G431RBIX", "GENERIC_G431RBTX",
"GENERIC_G441RBIX",
"GENERIC_G473RBTX", "GENERIC_G473RCTX", "GENERIC_G473RETX",
"GENERIC_G474RBTX", "GENERIC_G474RCTX", "GENERIC_G474RETX",
"GENERIC_G483RETX",
"GENERIC_H742ZGTX", "GENERIC_H742ZITX",
"GENERIC_H743ZGTX",
"GENERIC_H747AGIX", "GENERIC_H747AIIX", "GENERIC_H747IGTX", "GENERIC_H747IITX",
"GENERIC_H750ZBTX",
"GENERIC_H753ZITX",
"GENERIC_H757AIIX", "GENERIC_H757IITX",
"GENERIC_H743IGKX", "GENERIC_H743IGTX", "GENERIC_H743IIKX", "GENERIC_H743IITX", "GENERIC_H753IIKX", "GENERIC_H753IITX",
"GENERIC_L100C6UX", "GENERIC_L100C6UXA",
"GENERIC_L151C6TX", "GENERIC_L151C6TXA", "GENERIC_L151C6UX", "GENERIC_L151C6UXA", "GENERIC_L151C8TX", "GENERIC_L151C8TXA",
"GENERIC_L151C8UX", "GENERIC_L151C8UXA", "GENERIC_L151CBTX", "GENERIC_L151CBUX", "GENERIC_L151CBUXA",
"GENERIC_L152C6TX", "GENERIC_L152C6TXA", "GENERIC_L152C6UX", "GENERIC_L152C6UXA", "GENERIC_L152C8TX", "GENERIC_L152C8TXA",
"GENERIC_L152C8UX", "GENERIC_L152C8UXA", "GENERIC_L152CBTX", "GENERIC_L152CBTXA", "GENERIC_L152CBUX", "GENERIC_L152CBUXA",
"GENERIC_L151RETX", "GENERIC_L162RETX",
"GENERIC_L412K8TX", "GENERIC_L412K8UX", "GENERIC_L412KBUX",
"GENERIC_L422KBTX", "GENERIC_L422KBUX",
"GENERIC_L432KBUX",
"GENERIC_L442KCUX",
"GENERIC_L452RCIX", "GENERIC_L452RCTX", "GENERIC_L452RCYX", "GENERIC_L452REIX", "GENERIC_L452REYX",
"GENERIC_L462REIX", "GENERIC_L462RETX", "GENERIC_L462REYX",
"GENERIC_L475RCTX", "GENERIC_L475RETX", "GENERIC_L475RGTX",
"GENERIC_L476RCTX", "GENERIC_L476RETX",
"GENERIC_L486RGTX",
"GENERIC_L475VCTX", "GENERIC_L475VGTX",
"GENERIC_L476VCTX", "GENERIC_L476VETX", "GENERIC_L476VGTX",
"GENERIC_L486VGTX",
"GENERIC_L496ZETX",
"GENERIC_L4A6ZGTX",
"GENERIC_L4A6ZGTXP",
"GENERIC_L4R5VGTX", "GENERIC_L4R5VITX",
"GENERIC_L4R7VITX",
"GENERIC_L4S7VITX",
"GENERIC_L4R5ZGTX", "GENERIC_L4R5ZITX",
"GENERIC_L4R7ZITX",
"GENERIC_L4R9ZGJX",
"GENERIC_L4S7ZITX",
"GENERIC_L4S9ZIJX",
"GENERIC_L552ZCTXQ",
"GENERIC_L562ZETXQ",
"GENERIC_WB55CCUX", "GENERIC_WB55CGUX",
"GENERIC_WB55RCVX", "GENERIC_WB55REVX",
"NUCLEO_H743ZI",
"NUCLEO_L496ZG",
"NUCLEO_L4R5ZI",
Expand Down
5 changes: 2 additions & 3 deletions CI/utils/stm32variant.py
Original file line number Diff line number Diff line change
Expand Up @@ -1243,7 +1243,6 @@ def print_variant(generic_list):
variant_h_file.write(
variant_h_template.render(
year=datetime.datetime.now().year,
generic_list=generic_list,
pins_number_list=pins_number_list,
alt_pins_list=alt_pins_list,
waltpin=max(waltpin),
Expand Down Expand Up @@ -1728,8 +1727,8 @@ def manage_repo():
periph_c_filename = "PeripheralPins.c"
pinvar_h_filename = "PinNamesVar.h"
config_filename = Path("variant_config.json")
variant_h_filename = "variant.h"
variant_cpp_filename = "variant.cpp"
variant_h_filename = "variant_generic.h"
variant_cpp_filename = "variant_generic.cpp"
boards_entry_filename = "boards_entry.txt"
generic_clock_filename = "generic_clock.c"
repo_local_path = cur_dir / "repo"
Expand Down
47 changes: 0 additions & 47 deletions CI/utils/templates/variant.cpp

This file was deleted.

Loading