Skip to content

Commit 018450b

Browse files
hathachhathach
committed
fix variant folder name case for trrstrinkey_m0
1 parent bb55281 commit 018450b

File tree

3 files changed

+11
-98
lines changed

3 files changed

+11
-98
lines changed

‎.github/workflows/githubci.yml‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,29 +9,26 @@ jobs:
99
matrix:
1010
board:
1111
# Alphabetical order
12-
- 'metro_m0'
13-
- 'hallowing'
1412
- 'circuitplayground_m0'
13+
- 'feather_m4_can'
14+
- 'hallowing'
15+
- 'hallowing_m4'
16+
- 'metro_m0'
1517
- 'metro_m4'
1618
- 'pybadge_m4'
1719
- 'pygamer_m4'
18-
- 'hallowing_m4'
1920
- 'pyportal_m4'
2021
- 'pyportal_m4_titano'
21-
- 'feather_m4_can'
22+
- 'trrstrinkey_m0'
23+
# with TinyUSB
2224
- 'metro_m0:usbstack=tinyusb'
2325
- 'metro_m4:speed=120,usbstack=tinyusb'
2426

2527
runs-on: ubuntu-latest
2628

2729
steps:
28-
- name: Setup Python
29-
uses: actions/setup-python@v4
30-
with:
31-
python-version: '3.x'
32-
3330
- name: Checkout code
34-
uses: actions/checkout@v3
31+
uses: actions/checkout@v4
3532
with:
3633
submodules: 'true'
3734

‎boards.txt‎

Lines changed: 2 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -911,12 +911,12 @@ adafruit_TRRStrinkey_m0.build.core=arduino
911911
adafruit_TRRStrinkey_m0.build.extra_flags=-D__SAMD21E18A__ -DCRYSTALLESS -DADAFRUIT_TRRSTRINKEY_M0 -DARDUINO_SAMD_ZERO -DARM_MATH_CM0PLUS {build.usb_flags}
912912
adafruit_TRRStrinkey_m0.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
913913
adafruit_TRRStrinkey_m0.build.openocdscript=scripts/openocd/daplink_samd21.cfg
914-
adafruit_TRRStrinkey_m0.build.variant=TRRStrinkey_m0
914+
adafruit_TRRStrinkey_m0.build.variant=trrstrinkey_m0
915915
adafruit_TRRStrinkey_m0.build.variant_system_lib=
916916
adafruit_TRRStrinkey_m0.build.vid=0x239A
917917
adafruit_TRRStrinkey_m0.build.pid=0x8157
918918
adafruit_TRRStrinkey_m0.bootloader.tool=openocd
919-
adafruit_TRRStrinkey_m0.bootloader.file=TRRStrinkey_m0/bootloader-TRRStrinkey_m0.bin
919+
adafruit_TRRStrinkey_m0.bootloader.file=trrstrinkey_m0/bootloader-TRRStrinkey_m0.bin
920920

921921
# Menu: Optimization
922922
adafruit_TRRStrinkey_m0.menu.opt.small=Small (-Os) (standard)
@@ -1736,90 +1736,6 @@ adafruit_feather_m4_can.menu.debug.on=On
17361736
adafruit_feather_m4_can.menu.debug.on.build.flags.debug=-g
17371737

17381738

1739-
# -----------------------------------
1740-
# Adafruit Feather M4 Adalogger (SAMD51)
1741-
# -----------------------------------
1742-
#adafruit_feather_m4_log.name=Adafruit Feather M4 Adalogger (SAMD51)
1743-
1744-
# VID/PID for Bootloader, Arduino & CircuitPython
1745-
#adafruit_feather_m4_log.vid.0=0x239A
1746-
#adafruit_feather_m4_log.pid.0=0x8115
1747-
#adafruit_feather_m4_log.vid.1=0x239A
1748-
#adafruit_feather_m4_log.pid.1=0x0115
1749-
#adafruit_feather_m4_log.vid.2=0x239A
1750-
#adafruit_feather_m4_log.pid.2=0x8116
1751-
1752-
# Upload
1753-
#adafruit_feather_m4_log.upload.tool=bossac18
1754-
#adafruit_feather_m4_log.upload.protocol=sam-ba
1755-
#adafruit_feather_m4_log.upload.maximum_size=1032192
1756-
#adafruit_feather_m4_log.upload.offset=0x4000
1757-
#adafruit_feather_m4_log.upload.use_1200bps_touch=true
1758-
#adafruit_feather_m4_log.upload.wait_for_upload_port=true
1759-
#adafruit_feather_m4_log.upload.native_usb=true
1760-
1761-
# Build
1762-
#adafruit_feather_m4_log.build.mcu=cortex-m4
1763-
#adafruit_feather_m4_log.build.f_cpu=120000000L
1764-
#adafruit_feather_m4_log.build.usb_product="Feather M4 Adalogger"
1765-
#adafruit_feather_m4_log.build.usb_manufacturer="Adafruit"
1766-
#adafruit_feather_m4_log.build.board=FEATHER_M4_ADALOGGER
1767-
#adafruit_feather_m4_log.build.core=arduino
1768-
#adafruit_feather_m4_log.build.extra_flags=-D__SAMD51J20A__ -DADAFRUIT_FEATHER_M4_ADALOGGER -D__SAMD51__ -D__FPU_PRESENT -DARM_MATH_CM4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 {build.usb_flags}
1769-
#adafruit_feather_m4_log.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
1770-
#adafruit_feather_m4_log.build.openocdscript=scripts/openocd/daplink_samd51.cfg
1771-
#adafruit_feather_m4_log.build.variant=feather_m4
1772-
#adafruit_feather_m4_log.build.variant_system_lib=
1773-
#adafruit_feather_m4_log.build.vid=0x239A
1774-
#adafruit_feather_m4_log.build.pid=0x8115
1775-
#adafruit_feather_m4_log.bootloader.tool=openocd
1776-
#adafruit_feather_m4_log.bootloader.file=featherM4/bootloader-feather_m4-v2.0.0-adafruit.5.bin
1777-
#adafruit_feather_m4_log.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-5.4.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16
1778-
1779-
# Menu: Cache
1780-
#adafruit_feather_m4_log.menu.cache.on=Enabled
1781-
#adafruit_feather_m4_log.menu.cache.on.build.cache_flags=-DENABLE_CACHE
1782-
#adafruit_feather_m4_log.menu.cache.off=Disabled
1783-
#adafruit_feather_m4_log.menu.cache.off.build.cache_flags=
1784-
1785-
# Menu: Speed
1786-
#adafruit_feather_m4_log.menu.speed.120=120 MHz (standard)
1787-
#adafruit_feather_m4_log.menu.speed.120.build.f_cpu=120000000L
1788-
#adafruit_feather_m4_log.menu.speed.150=150 MHz (overclock)
1789-
#adafruit_feather_m4_log.menu.speed.150.build.f_cpu=150000000L
1790-
#adafruit_feather_m4_log.menu.speed.180=180 MHz (overclock)
1791-
#adafruit_feather_m4_log.menu.speed.180.build.f_cpu=180000000L
1792-
#adafruit_feather_m4_log.menu.speed.200=200 MHz (overclock)
1793-
#adafruit_feather_m4_log.menu.speed.200.build.f_cpu=200000000L
1794-
1795-
# Menu: Optimization
1796-
#adafruit_feather_m4_log.menu.opt.small=Small (-Os) (standard)
1797-
#adafruit_feather_m4_log.menu.opt.small.build.flags.optimize=-Os
1798-
#adafruit_feather_m4_log.menu.opt.fast=Fast (-O2)
1799-
#adafruit_feather_m4_log.menu.opt.fast.build.flags.optimize=-O2
1800-
#adafruit_feather_m4_log.menu.opt.faster=Faster (-O3)
1801-
#adafruit_feather_m4_log.menu.opt.faster.build.flags.optimize=-O3
1802-
#adafruit_feather_m4_log.menu.opt.fastest=Fastest (-Ofast)
1803-
#adafruit_feather_m4_log.menu.opt.fastest.build.flags.optimize=-Ofast
1804-
#adafruit_feather_m4_log.menu.opt.dragons=Here be dragons (-Ofast -funroll-loops)
1805-
#adafruit_feather_m4_log.menu.opt.dragons.build.flags.optimize=-Ofast -funroll-loops
1806-
1807-
# Menu: QSPI Speed
1808-
#adafruit_feather_m4_log.menu.maxqspi.50=50 MHz (standard)
1809-
#adafruit_feather_m4_log.menu.maxqspi.50.build.flags.maxqspi=-DVARIANT_QSPI_BAUD_DEFAULT=50000000
1810-
#adafruit_feather_m4_log.menu.maxqspi.fcpu=CPU Speed / 2
1811-
#adafruit_feather_m4_log.menu.maxqspi.fcpu.build.flags.maxqspi=-DVARIANT_QSPI_BAUD_DEFAULT=({build.f_cpu})
1812-
1813-
# Menu: USB Stack
1814-
#adafruit_feather_m4_log.menu.usbstack.arduino=Arduino
1815-
#adafruit_feather_m4_log.menu.usbstack.tinyusb=TinyUSB
1816-
#adafruit_feather_m4_log.menu.usbstack.tinyusb.build.flags.usbstack=-DUSE_TINYUSB
1817-
1818-
# Menu: Debug
1819-
#adafruit_feather_m4_log.menu.debug.off=Off
1820-
#adafruit_feather_m4_log.menu.debug.on=On
1821-
#adafruit_feather_m4_log.menu.debug.on.build.flags.debug=-g
1822-
18231739
# -----------------------------------
18241740
# Adafruit Trellis M4 (SAMD51)
18251741
# -----------------------------------

‎tools/makeboards.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -280,10 +280,10 @@ def make_board(mcu, name, variant, vendor, product, vid, pid_list, boarddefine,
280280
"PIXELTRINKEY_M0", "-D__SAMD21E18A__ -DCRYSTALLESS -DADAFRUIT_PIXELTRINKEY_M0",
281281
"pixeltrinkey_m0/bootloader-pixeltrinkey_m0.bin"],
282282

283-
["adafruit_TRRStrinkey_m0", "TRRStrinkey_m0", "Adafruit", "TRRS Trinkey M0",
283+
["adafruit_TRRStrinkey_m0", "trrstrinkey_m0", "Adafruit", "TRRS Trinkey M0",
284284
"0x239A", ["0x8157", "0x0157", "0x8158"],
285285
"TRRSTRINKEY_M0", "-D__SAMD21E18A__ -DCRYSTALLESS -DADAFRUIT_TRRSTRINKEY_M0",
286-
"TRRStrinkey_m0/bootloader-TRRStrinkey_m0.bin"],
286+
"trrstrinkey_m0/bootloader-TRRStrinkey_m0.bin"],
287287

288288
["adafruit_thumbsticktrinkey_m0", "thumbsticktrinkey_m0", "Adafruit", "Thumbstick Trinkey M0",
289289
"0x239A", ["0x8159", "0x0159", "0x8160"],

0 commit comments

Comments
 (0)