Skip to content
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

Variant g4 addon #10

Closed
wants to merge 21 commits into from
Closed
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
  •  
  •  
  •  
7 changes: 4 additions & 3 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/F765V\\\\\(G-I\\\\\)_F767VG_F767VI_F777VI'; data['build']['extra_flags'] = '-DSTM32F765xx -DCUSTOM_PERIPHERAL_PINS -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 All @@ -33,6 +33,7 @@ tar --extract --bzip2 --file="$CMSIS_ARCHIVE" || {
cd "$GITHUB_WORKSPACE/CI/build/" || {
exit 1
}
python3 platformio-builder.py --board=blackpill_f103c8 --board=remram_v1
# python3 platformio-builder.py --board=blackpill_f103c8 --board=remram_v1
python3 platformio-builder.py --board=blackpill_f103c8

exit $?
75 changes: 66 additions & 9 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 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 @@ -195,7 +252,7 @@
"DISCO_F072RB",
"DISCO_F407VG",
"DISCO_F746NG",
"DISCO_L072CZ_LRWAN1",
"B_L072Z_LRWAN1",
"B_L475E_IOT01A"
],
"options": "usb=HID"
Expand All @@ -206,7 +263,7 @@
"applicable": true,
"boards": [
"DISCO_F746NG",
"DISCO_L072CZ_LRWAN1",
"B_L072Z_LRWAN1",
"B_L475E_IOT01A",
"NUCLEO_F091RC",
"NUCLEO_F103RB",
Expand Down Expand Up @@ -234,7 +291,7 @@
"NUCLEO_L496ZG-P",
"NUCLEO_L4R5ZI",
"NUCLEO_L4R5ZI-P",
"PNUCLEO_WB55RG",
"P_NUCLEO_WB55RG",
"STM32MP157C_DK2"
]
},
Expand Down Expand Up @@ -266,13 +323,13 @@
"applicable": false,
"boards": [
"DISCO_F746NG", "B_L475E_IOT01A", "NUCLEO_F207ZG", "NUCLEO_F429ZI", "NUCLEO_F767ZI",
"NUCLEO_H743ZI2", "PNUCLEO_WB55RG", "STM32MP157C_DK2"
"NUCLEO_H743ZI2", "P_NUCLEO_WB55RG", "STM32MP157C_DK2"
]
},
{
"pattern": "IKS01A3_S2LP_P2P_Demo|X_NUCLEO_(S2868A1|S2868A2|S2915A1)_HelloWorld",
"applicable": false,
"boards": [ "DISCO_L072CZ_LRWAN1", "STM32MP157C_DK2" ]
"boards": [ "B_L072Z_LRWAN1", "STM32MP157C_DK2" ]
},
{
"pattern": "MicroNMEA[\\\\/]",
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
Loading