Skip to content

Commit 3ec33c9

Browse files
PaintYourDragonladyada
PaintYourDragon
authored and
ladyada
committed
Add QSPI menu, fix SPI compiler settings for some boards (arduino#103)
1 parent 1b780ba commit 3ec33c9

File tree

10 files changed

+82
-26
lines changed

10 files changed

+82
-26
lines changed

‎boards.txt‎

Lines changed: 46 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ menu.cache=Cache
1818
menu.speed=CPU Speed
1919
menu.opt=Optimize
2020
menu.maxspi=Max SPI
21+
menu.maxqspi=Max QSPI
2122

2223
# Adafruit Feather M0 (SAMD21)
2324
# ------------------------------
@@ -308,7 +309,7 @@ adafruit_metro_m4.build.usb_product="Adafruit Metro M4"
308309
adafruit_metro_m4.build.usb_manufacturer="Adafruit LLC"
309310
adafruit_metro_m4.build.board=METRO_M4
310311
adafruit_metro_m4.build.core=arduino
311-
adafruit_metro_m4.build.extra_flags=-D__SAMD51J19A__ -DADAFRUIT_METRO_M4_EXPRESS -D__SAMD51__ {build.usb_flags} -D__FPU_PRESENT -DARM_MATH_CM4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 {build.flags.optimize}
312+
adafruit_metro_m4.build.extra_flags=-D__SAMD51J19A__ -DADAFRUIT_METRO_M4_EXPRESS -D__SAMD51__ {build.usb_flags} -D__FPU_PRESENT -DARM_MATH_CM4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 {build.flags.optimize} {build.flags.maxspi} {build.flags.maxqspi}
312313
adafruit_metro_m4.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
313314
adafruit_metro_m4.build.openocdscript=openocd_scripts/arduino_zero.cfg
314315
adafruit_metro_m4.build.variant=metro_m4
@@ -342,6 +343,10 @@ adafruit_metro_m4.menu.maxspi.50=50 MHz
342343
adafruit_metro_m4.menu.maxspi.50.build.flags.maxspi=-DMAX_SPI=50000000
343344
adafruit_metro_m4.menu.maxspi.fcpu2=CPU Speed / 2
344345
adafruit_metro_m4.menu.maxspi.fcpu2.build.flags.maxspi=-DMAX_SPI=({build.f_cpu}/2)
346+
adafruit_metro_m4.menu.maxqspi.50=50 MHz (standard)
347+
adafruit_metro_m4.menu.maxqspi.50.build.flags.maxqspi=-DVARIANT_QSPI_BAUD_DEFAULT=50000000
348+
adafruit_metro_m4.menu.maxqspi.fcpu=CPU Speed
349+
adafruit_metro_m4.menu.maxqspi.fcpu.build.flags.maxqspi=-DVARIANT_QSPI_BAUD_DEFAULT=({build.f_cpu})
345350

346351
# Adafruit Grand Central M4 (SAMD51)
347352
# ------------------------------
@@ -363,7 +368,7 @@ adafruit_grandcentral_m4.build.usb_product="Adafruit Grand Central M4"
363368
adafruit_grandcentral_m4.build.usb_manufacturer="Adafruit LLC"
364369
adafruit_grandcentral_m4.build.board=GRAND_CENTRAL_M4
365370
adafruit_grandcentral_m4.build.core=arduino
366-
adafruit_grandcentral_m4.build.extra_flags=-D__SAMD51P20A__ -DADAFRUIT_GRAND_CENTRAL_M4 -D__SAMD51__ {build.usb_flags} -D__FPU_PRESENT -DARM_MATH_CM4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 {build.flags.optimize} {build.flags.maxspi}
371+
adafruit_grandcentral_m4.build.extra_flags=-D__SAMD51P20A__ -DADAFRUIT_GRAND_CENTRAL_M4 -D__SAMD51__ {build.usb_flags} -D__FPU_PRESENT -DARM_MATH_CM4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 {build.flags.optimize} {build.flags.maxspi} {build.flags.maxqspi}
367372
adafruit_grandcentral_m4.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
368373
adafruit_grandcentral_m4.build.openocdscript=openocd_scripts/arduino_zero.cfg
369374
adafruit_grandcentral_m4.build.variant=grand_central_m4
@@ -397,6 +402,10 @@ adafruit_grandcentral_m4.menu.maxspi.50=50 MHz
397402
adafruit_grandcentral_m4.menu.maxspi.50.build.flags.maxspi=-DMAX_SPI=50000000
398403
adafruit_grandcentral_m4.menu.maxspi.fcpu2=CPU Speed / 2
399404
adafruit_grandcentral_m4.menu.maxspi.fcpu2.build.flags.maxspi=-DMAX_SPI=({build.f_cpu}/2)
405+
adafruit_grandcentral_m4.menu.maxqspi.50=50 MHz (standard)
406+
adafruit_grandcentral_m4.menu.maxqspi.50.build.flags.maxqspi=-DVARIANT_QSPI_BAUD_DEFAULT=50000000
407+
adafruit_grandcentral_m4.menu.maxqspi.fcpu=CPU Speed
408+
adafruit_grandcentral_m4.menu.maxqspi.fcpu.build.flags.maxqspi=-DVARIANT_QSPI_BAUD_DEFAULT=({build.f_cpu})
400409

401410
# Adafruit ItsyBitsy M4 (SAMD51)
402411
# ------------------------------
@@ -418,7 +427,7 @@ adafruit_itsybitsy_m4.build.usb_product="Adafruit ItsyBitsy M4"
418427
adafruit_itsybitsy_m4.build.usb_manufacturer="Adafruit LLC"
419428
adafruit_itsybitsy_m4.build.board=ITSYBITSY_M4
420429
adafruit_itsybitsy_m4.build.core=arduino
421-
adafruit_itsybitsy_m4.build.extra_flags=-D__SAMD51G19A__ -DADAFRUIT_ITSYBITSY_M4_EXPRESS -D__SAMD51__ {build.usb_flags} -D__FPU_PRESENT -DARM_MATH_CM4 -DCRYSTALLESS -mfloat-abi=hard -mfpu=fpv4-sp-d16 {build.flags.optimize}
430+
adafruit_itsybitsy_m4.build.extra_flags=-D__SAMD51G19A__ -DADAFRUIT_ITSYBITSY_M4_EXPRESS -D__SAMD51__ {build.usb_flags} -D__FPU_PRESENT -DARM_MATH_CM4 -DCRYSTALLESS -mfloat-abi=hard -mfpu=fpv4-sp-d16 {build.flags.optimize} {build.flags.maxspi} {build.flags.maxqspi}
422431
adafruit_itsybitsy_m4.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
423432
adafruit_itsybitsy_m4.build.openocdscript=openocd_scripts/arduino_zero.cfg
424433
adafruit_itsybitsy_m4.build.variant=itsybitsy_m4
@@ -452,6 +461,10 @@ adafruit_itsybitsy_m4.menu.maxspi.50=50 MHz
452461
adafruit_itsybitsy_m4.menu.maxspi.50.build.flags.maxspi=-DMAX_SPI=50000000
453462
adafruit_itsybitsy_m4.menu.maxspi.fcpu2=CPU Speed / 2
454463
adafruit_itsybitsy_m4.menu.maxspi.fcpu2.build.flags.maxspi=-DMAX_SPI=({build.f_cpu}/2)
464+
adafruit_itsybitsy_m4.menu.maxqspi.50=50 MHz (standard)
465+
adafruit_itsybitsy_m4.menu.maxqspi.50.build.flags.maxqspi=-DVARIANT_QSPI_BAUD_DEFAULT=50000000
466+
adafruit_itsybitsy_m4.menu.maxqspi.fcpu=CPU Speed
467+
adafruit_itsybitsy_m4.menu.maxqspi.fcpu.build.flags.maxqspi=-DVARIANT_QSPI_BAUD_DEFAULT=({build.f_cpu})
455468

456469

457470
# Adafruit Feather M4 Express (SAMD51)
@@ -474,7 +487,7 @@ adafruit_feather_m4.build.usb_product="Adafruit Feather M4"
474487
adafruit_feather_m4.build.usb_manufacturer="Adafruit LLC"
475488
adafruit_feather_m4.build.board=FEATHER_M4
476489
adafruit_feather_m4.build.core=arduino
477-
adafruit_feather_m4.build.extra_flags=-D__SAMD51J19A__ -DADAFRUIT_FEATHER_M4_EXPRESS -D__SAMD51__ {build.usb_flags} -D__FPU_PRESENT -DARM_MATH_CM4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 {build.flags.optimize}
490+
adafruit_feather_m4.build.extra_flags=-D__SAMD51J19A__ -DADAFRUIT_FEATHER_M4_EXPRESS -D__SAMD51__ {build.usb_flags} -D__FPU_PRESENT -DARM_MATH_CM4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 {build.flags.optimize} {build.flags.maxspi} {build.flags.maxqspi}
478491
adafruit_feather_m4.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
479492
adafruit_feather_m4.build.openocdscript=openocd_scripts/arduino_zero.cfg
480493
adafruit_feather_m4.build.variant=feather_m4
@@ -508,6 +521,10 @@ adafruit_feather_m4.menu.maxspi.50=50 MHz
508521
adafruit_feather_m4.menu.maxspi.50.build.flags.maxspi=-DMAX_SPI=50000000
509522
adafruit_feather_m4.menu.maxspi.fcpu2=CPU Speed / 2
510523
adafruit_feather_m4.menu.maxspi.fcpu2.build.flags.maxspi=-DMAX_SPI=({build.f_cpu}/2)
524+
adafruit_feather_m4.menu.maxqspi.50=50 MHz (standard)
525+
adafruit_feather_m4.menu.maxqspi.50.build.flags.maxqspi=-DVARIANT_QSPI_BAUD_DEFAULT=50000000
526+
adafruit_feather_m4.menu.maxqspi.fcpu=CPU Speed
527+
adafruit_feather_m4.menu.maxqspi.fcpu.build.flags.maxqspi=-DVARIANT_QSPI_BAUD_DEFAULT=({build.f_cpu})
511528

512529

513530
# Adafruit HalloWing M0 (SAMD21)
@@ -564,7 +581,7 @@ adafruit_trellis_m4.build.usb_product="Adafruit Trellis M4"
564581
adafruit_trellis_m4.build.usb_manufacturer="Adafruit LLC"
565582
adafruit_trellis_m4.build.board=TRELLIS_M4
566583
adafruit_trellis_m4.build.core=arduino
567-
adafruit_trellis_m4.build.extra_flags=-D__SAMD51G19A__ -DADAFRUIT_TRELLIS_M4_EXPRESS -D__SAMD51__ {build.usb_flags} -D__FPU_PRESENT -DARM_MATH_CM4 -DCRYSTALLESS -mfloat-abi=hard -mfpu=fpv4-sp-d16 {build.flags.optimize}
584+
adafruit_trellis_m4.build.extra_flags=-D__SAMD51G19A__ -DADAFRUIT_TRELLIS_M4_EXPRESS -D__SAMD51__ {build.usb_flags} -D__FPU_PRESENT -DARM_MATH_CM4 -DCRYSTALLESS -mfloat-abi=hard -mfpu=fpv4-sp-d16 {build.flags.optimize} {build.flags.maxspi} {build.flags.maxqspi}
568585
adafruit_trellis_m4.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
569586
adafruit_trellis_m4.build.openocdscript=openocd_scripts/arduino_zero.cfg
570587
adafruit_trellis_m4.build.variant=trellis_m4
@@ -598,6 +615,10 @@ adafruit_trellis_m4.menu.maxspi.50=50 MHz
598615
adafruit_trellis_m4.menu.maxspi.50.build.flags.maxspi=-DMAX_SPI=50000000
599616
adafruit_trellis_m4.menu.maxspi.fcpu2=CPU Speed / 2
600617
adafruit_trellis_m4.menu.maxspi.fcpu2.build.flags.maxspi=-DMAX_SPI=({build.f_cpu}/2)
618+
adafruit_trellis_m4.menu.maxqspi.50=50 MHz (standard)
619+
adafruit_trellis_m4.menu.maxqspi.50.build.flags.maxqspi=-DVARIANT_QSPI_BAUD_DEFAULT=50000000
620+
adafruit_trellis_m4.menu.maxqspi.fcpu=CPU Speed
621+
adafruit_trellis_m4.menu.maxqspi.fcpu.build.flags.maxqspi=-DVARIANT_QSPI_BAUD_DEFAULT=({build.f_cpu})
601622

602623
# Adafruit Crickit M0 (SAMD21)
603624
# ------------------------------
@@ -651,7 +672,7 @@ adafruit_pyportal_m4.build.usb_product="Adafruit PyPortal M4"
651672
adafruit_pyportal_m4.build.usb_manufacturer="Adafruit LLC"
652673
adafruit_pyportal_m4.build.board=PYPORTAL_M4
653674
adafruit_pyportal_m4.build.core=arduino
654-
adafruit_pyportal_m4.build.extra_flags=-D__SAMD51J20A__ -DADAFRUIT_PYPORTAL -DCRYSTALLESS -D__SAMD51__ {build.usb_flags} -D__FPU_PRESENT -DARM_MATH_CM4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 {build.flags.optimize}
675+
adafruit_pyportal_m4.build.extra_flags=-D__SAMD51J20A__ -DADAFRUIT_PYPORTAL -DCRYSTALLESS -D__SAMD51__ {build.usb_flags} -D__FPU_PRESENT -DARM_MATH_CM4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 {build.flags.optimize} {build.flags.maxspi} {build.flags.maxqspi}
655676
adafruit_pyportal_m4.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
656677
adafruit_pyportal_m4.build.openocdscript=openocd_scripts/arduino_zero.cfg
657678
adafruit_pyportal_m4.build.variant=pyportal_m4
@@ -685,6 +706,10 @@ adafruit_pyportal_m4.menu.maxspi.50=50 MHz
685706
adafruit_pyportal_m4.menu.maxspi.50.build.flags.maxspi=-DMAX_SPI=50000000
686707
adafruit_pyportal_m4.menu.maxspi.fcpu2=CPU Speed / 2
687708
adafruit_pyportal_m4.menu.maxspi.fcpu2.build.flags.maxspi=-DMAX_SPI=({build.f_cpu}/2)
709+
adafruit_pyportal_m4.menu.maxqspi.50=50 MHz (standard)
710+
adafruit_pyportal_m4.menu.maxqspi.50.build.flags.maxqspi=-DVARIANT_QSPI_BAUD_DEFAULT=50000000
711+
adafruit_pyportal_m4.menu.maxqspi.fcpu=CPU Speed
712+
adafruit_pyportal_m4.menu.maxqspi.fcpu.build.flags.maxqspi=-DVARIANT_QSPI_BAUD_DEFAULT=({build.f_cpu})
688713

689714
# Adafruit pyBadge M4 (SAMD51)
690715
# ------------------------------
@@ -708,7 +733,7 @@ adafruit_pybadge_m4.build.usb_product="Adafruit pyBadge M4"
708733
adafruit_pybadge_m4.build.usb_manufacturer="Adafruit LLC"
709734
adafruit_pybadge_m4.build.board=PYBADGE_M4
710735
adafruit_pybadge_m4.build.core=arduino
711-
adafruit_pybadge_m4.build.extra_flags=-D__SAMD51J19A__ -DADAFRUIT_PYBADGE_M4_EXPRESS -DADAFRUIT_PYBADGE_M4_EXPRESS -DCRYSTALLESS -D__SAMD51__ {build.usb_flags} -D__FPU_PRESENT -DARM_MATH_CM4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 {build.flags.optimize}
736+
adafruit_pybadge_m4.build.extra_flags=-D__SAMD51J19A__ -DADAFRUIT_PYBADGE_M4_EXPRESS -DADAFRUIT_PYBADGE_M4_EXPRESS -DCRYSTALLESS -D__SAMD51__ {build.usb_flags} -D__FPU_PRESENT -DARM_MATH_CM4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 {build.flags.optimize} {build.flags.maxspi} {build.flags.maxqspi}
712737
adafruit_pybadge_m4.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
713738
adafruit_pybadge_m4.build.openocdscript=openocd_scripts/arduino_zero.cfg
714739
adafruit_pybadge_m4.build.variant=pybadge_m4
@@ -742,6 +767,10 @@ adafruit_pybadge_m4.menu.maxspi.50=50 MHz
742767
adafruit_pybadge_m4.menu.maxspi.50.build.flags.maxspi=-DMAX_SPI=50000000
743768
adafruit_pybadge_m4.menu.maxspi.fcpu2=CPU Speed / 2
744769
adafruit_pybadge_m4.menu.maxspi.fcpu2.build.flags.maxspi=-DMAX_SPI=({build.f_cpu}/2)
770+
adafruit_pybadge_m4.menu.maxqspi.50=50 MHz (standard)
771+
adafruit_pybadge_m4.menu.maxqspi.50.build.flags.maxqspi=-DVARIANT_QSPI_BAUD_DEFAULT=50000000
772+
adafruit_pybadge_m4.menu.maxqspi.fcpu=CPU Speed
773+
adafruit_pybadge_m4.menu.maxqspi.fcpu.build.flags.maxqspi=-DVARIANT_QSPI_BAUD_DEFAULT=({build.f_cpu})
745774

746775
# Adafruit Metro M4 AirLift lite (SAMD51)
747776
# ------------------------------
@@ -763,7 +792,7 @@ adafruit_metro_m4_airliftlite.build.usb_product="Adafruit Metro M4 Airlift Lite"
763792
adafruit_metro_m4_airliftlite.build.usb_manufacturer="Adafruit LLC"
764793
adafruit_metro_m4_airliftlite.build.board=METRO_M4_AIRLIFT_LITE
765794
adafruit_metro_m4_airliftlite.build.core=arduino
766-
adafruit_metro_m4_airliftlite.build.extra_flags=-D__SAMD51J19A__ -DADAFRUIT_METRO_M4_AIRLIFT_LITE -D__SAMD51__ {build.usb_flags} -D__FPU_PRESENT -DARM_MATH_CM4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 {build.flags.optimize}
795+
adafruit_metro_m4_airliftlite.build.extra_flags=-D__SAMD51J19A__ -DADAFRUIT_METRO_M4_AIRLIFT_LITE -D__SAMD51__ {build.usb_flags} -D__FPU_PRESENT -DARM_MATH_CM4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 {build.flags.optimize} {build.flags.maxspi} {build.flags.maxqspi}
767796
adafruit_metro_m4_airliftlite.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
768797
adafruit_metro_m4_airliftlite.build.openocdscript=openocd_scripts/arduino_zero.cfg
769798
adafruit_metro_m4_airliftlite.build.variant=metro_m4_airlift
@@ -797,6 +826,10 @@ adafruit_metro_m4_airliftlite.menu.maxspi.50=50 MHz
797826
adafruit_metro_m4_airliftlite.menu.maxspi.50.build.flags.maxspi=-DMAX_SPI=50000000
798827
adafruit_metro_m4_airliftlite.menu.maxspi.fcpu2=CPU Speed / 2
799828
adafruit_metro_m4_airliftlite.menu.maxspi.fcpu2.build.flags.maxspi=-DMAX_SPI=({build.f_cpu}/2)
829+
adafruit_metro_m4_airliftlite.menu.maxqspi.50=50 MHz (standard)
830+
adafruit_metro_m4_airliftlite.menu.maxqspi.50.build.flags.maxqspi=-DVARIANT_QSPI_BAUD_DEFAULT=50000000
831+
adafruit_metro_m4_airliftlite.menu.maxqspi.fcpu=CPU Speed
832+
adafruit_metro_m4_airliftlite.menu.maxqspi.fcpu.build.flags.maxqspi=-DVARIANT_QSPI_BAUD_DEFAULT=({build.f_cpu})
800833

801834
# Adafruit pyGamer M4 Express (SAMD51)
802835
# ------------------------------
@@ -820,7 +853,7 @@ adafruit_pygamer_m4.build.usb_product="Adafruit PyGamer M4"
820853
adafruit_pygamer_m4.build.usb_manufacturer="Adafruit LLC"
821854
adafruit_pygamer_m4.build.board=PYGAMER_M4
822855
adafruit_pygamer_m4.build.core=arduino
823-
adafruit_pygamer_m4.build.extra_flags=-D__SAMD51J19A__ -DADAFRUIT_PYGAMER_M4_EXPRESS -DADAFRUIT_PYGAMER_M4_EXPRESS -DCRYSTALLESS -D__SAMD51__ {build.usb_flags} -D__FPU_PRESENT -DARM_MATH_CM4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 {build.flags.optimize} {build.flags.maxspi}
856+
adafruit_pygamer_m4.build.extra_flags=-D__SAMD51J19A__ -DADAFRUIT_PYGAMER_M4_EXPRESS -DADAFRUIT_PYGAMER_M4_EXPRESS -DCRYSTALLESS -D__SAMD51__ {build.usb_flags} -D__FPU_PRESENT -DARM_MATH_CM4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 {build.flags.optimize} {build.flags.maxspi} {build.flags.maxqspi}
824857
adafruit_pygamer_m4.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
825858
adafruit_pygamer_m4.build.openocdscript=openocd_scripts/arduino_zero.cfg
826859
adafruit_pygamer_m4.build.variant=pygamer_m4
@@ -854,3 +887,7 @@ adafruit_pygamer_m4.menu.maxspi.50=50 MHz
854887
adafruit_pygamer_m4.menu.maxspi.50.build.flags.maxspi=-DMAX_SPI=50000000
855888
adafruit_pygamer_m4.menu.maxspi.fcpu2=CPU Speed / 2
856889
adafruit_pygamer_m4.menu.maxspi.fcpu2.build.flags.maxspi=-DMAX_SPI=({build.f_cpu}/2)
890+
adafruit_pygamer_m4.menu.maxqspi.50=50 MHz (standard)
891+
adafruit_pygamer_m4.menu.maxqspi.50.build.flags.maxqspi=-DVARIANT_QSPI_BAUD_DEFAULT=50000000
892+
adafruit_pygamer_m4.menu.maxqspi.fcpu=CPU Speed
893+
adafruit_pygamer_m4.menu.maxqspi.fcpu.build.flags.maxqspi=-DVARIANT_QSPI_BAUD_DEFAULT=({build.f_cpu})

‎variants/feather_m4/variant.h‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,8 +189,10 @@ static const uint8_t SCL = PIN_WIRE_SCL;
189189
#define PIN_QSPI_IO2 (38u)
190190
#define PIN_QSPI_IO3 (39u)
191191

192-
//TODO: meaningful value for this
193-
#define VARIANT_QSPI_BAUD_DEFAULT 5000000
192+
#if !defined(VARIANT_QSPI_BAUD_DEFAULT)
193+
// TODO: meaningful value for this
194+
#define VARIANT_QSPI_BAUD_DEFAULT 5000000
195+
#endif
194196

195197
#ifdef __cplusplus
196198
}

‎variants/grand_central_m4/variant.h‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -278,8 +278,10 @@ static const uint8_t SCL1 = PIN_WIRE1_SCL;
278278
#define PIN_PCC_D12 (43u)
279279
#define PIN_PCC_D13 (42u)
280280

281-
//TODO: meaningful value for this
282-
#define VARIANT_QSPI_BAUD_DEFAULT 5000000
281+
#if !defined(VARIANT_QSPI_BAUD_DEFAULT)
282+
// TODO: meaningful value for this
283+
#define VARIANT_QSPI_BAUD_DEFAULT 5000000
284+
#endif
283285

284286
#ifdef __cplusplus
285287
}

‎variants/itsybitsy_m4/variant.h‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,8 +193,10 @@ static const uint8_t SCL = PIN_WIRE_SCL;
193193
#define PIN_PCC_D8 (5u)
194194
#define PIN_PCC_D9 (6u)
195195

196-
//TODO: meaningful value for this
197-
#define VARIANT_QSPI_BAUD_DEFAULT 5000000
196+
#if !defined(VARIANT_QSPI_BAUD_DEFAULT)
197+
// TODO: meaningful value for this
198+
#define VARIANT_QSPI_BAUD_DEFAULT 5000000
199+
#endif
198200

199201
#ifdef __cplusplus
200202
}

‎variants/metro_m4/variant.h‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,8 +206,10 @@ static const uint8_t SCL = PIN_WIRE_SCL;
206206
#define PIN_PCC_D8 (5u)
207207
#define PIN_PCC_D9 (6u)
208208

209-
//TODO: meaningful value for this
210-
#define VARIANT_QSPI_BAUD_DEFAULT 5000000
209+
#if !defined(VARIANT_QSPI_BAUD_DEFAULT)
210+
// TODO: meaningful value for this
211+
#define VARIANT_QSPI_BAUD_DEFAULT 5000000
212+
#endif
211213

212214
#ifdef __cplusplus
213215
}

‎variants/metro_m4_airlift/variant.h‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,8 +223,10 @@ static const uint8_t SCL = PIN_WIRE_SCL;
223223
#define PIN_PCC_D8 (5u)
224224
#define PIN_PCC_D9 (6u)
225225

226-
//TODO: meaningful value for this
227-
#define VARIANT_QSPI_BAUD_DEFAULT 5000000
226+
#if !defined(VARIANT_QSPI_BAUD_DEFAULT)
227+
// TODO: meaningful value for this
228+
#define VARIANT_QSPI_BAUD_DEFAULT 5000000
229+
#endif
228230

229231
#ifdef __cplusplus
230232
}

‎variants/pybadge_m4/variant.h‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,10 @@ static const uint8_t SCL = PIN_WIRE_SCL;
196196
#define PIN_QSPI_IO2 (39u)
197197
#define PIN_QSPI_IO3 (40u)
198198

199-
//TODO: meaningful value for this
200-
#define VARIANT_QSPI_BAUD_DEFAULT 5000000
199+
#if !defined(VARIANT_QSPI_BAUD_DEFAULT)
200+
// TODO: meaningful value for this
201+
#define VARIANT_QSPI_BAUD_DEFAULT 5000000
202+
#endif
201203

202204
#ifdef __cplusplus
203205
}

‎variants/pygamer_m4/variant.h‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,8 +201,11 @@ static const uint8_t SCL = PIN_WIRE_SCL;
201201
#define PIN_QSPI_IO2 (41u)
202202
#define PIN_QSPI_IO3 (42u)
203203

204-
//TODO: meaningful value for this
205204
#define VARIANT_QSPI_BAUD_DEFAULT 5000000
205+
#if !defined(VARIANT_QSPI_BAUD_DEFAULT)
206+
// TODO: meaningful value for this
207+
#define VARIANT_QSPI_BAUD_DEFAULT 5000000
208+
#endif
206209

207210
#ifdef __cplusplus
208211
}

‎variants/pyportal_m4/variant.h‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,8 +190,10 @@ static const uint8_t SCL = PIN_WIRE_SCL;
190190
#define PIN_QSPI_IO2 (46u)
191191
#define PIN_QSPI_IO3 (47u)
192192

193-
//TODO: meaningful value for this
194-
#define VARIANT_QSPI_BAUD_DEFAULT 5000000
193+
#if !defined(VARIANT_QSPI_BAUD_DEFAULT)
194+
// TODO: meaningful value for this
195+
#define VARIANT_QSPI_BAUD_DEFAULT 5000000
196+
#endif
195197

196198
#ifdef __cplusplus
197199
}

‎variants/trellis_m4/variant.h‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,8 +190,10 @@ static const uint8_t SCL1 = PIN_WIRE_SCL;
190190
#define PIN_QSPI_IO2 (27u)
191191
#define PIN_QSPI_IO3 (28u)
192192

193-
//TODO: meaningful value for this
194-
#define VARIANT_QSPI_BAUD_DEFAULT 5000000
193+
#if !defined(VARIANT_QSPI_BAUD_DEFAULT)
194+
// TODO: meaningful value for this
195+
#define VARIANT_QSPI_BAUD_DEFAULT 5000000
196+
#endif
195197

196198
#ifdef __cplusplus
197199
}

0 commit comments

Comments
 (0)