Skip to content

Trinkeys #296

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.

Sign up for GitHub

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 7 commits into from
May 8, 2021
Merged

Trinkeys #296

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
badc0f9
add rotary trinkey rev B
ladyada Apr 11, 2021
c8a9ac6
add slide trinkey
ladyada Apr 11, 2021
c69a4fe
proximity sensing trinkey
ladyada Apr 11, 2021
6faed3e
update variant to shipping
ladyada May 5, 2021
a9fe013
forgot one!
ladyada May 5, 2021
f2dbc90
fix two typos
ladyada May 8, 2021
7f1317a
fix up slide trinkey for rev B
ladyada May 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
196 changes: 195 additions & 1 deletion boards.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ adafruit_neotrinkey_m0.pid.0=0x80EF
adafruit_neotrinkey_m0.vid.1=0x239A
adafruit_neotrinkey_m0.pid.1=0x00EF
adafruit_neotrinkey_m0.vid.1=0x239A
adafruit_neotrinkey_m0.pid.1=0x00F0
adafruit_neotrinkey_m0.pid.1=0x80F0
adafruit_neotrinkey_m0.upload.tool=bossac
adafruit_neotrinkey_m0.upload.protocol=sam-ba
adafruit_neotrinkey_m0.upload.maximum_size=262144
Expand Down Expand Up @@ -426,6 +426,200 @@ adafruit_neotrinkey_m0.menu.debug.off=Off
adafruit_neotrinkey_m0.menu.debug.on=On
adafruit_neotrinkey_m0.menu.debug.on.build.flags.debug=-g

# Adafruit Rotary Trinkey (SAMD21)
# ------------------------------
adafruit_rotarytrinkey_m0.name=Adafruit Rotary Trinkey (SAMD21)
adafruit_rotarytrinkey_m0.vid.0=0x239A
adafruit_rotarytrinkey_m0.pid.0=0x80FB
adafruit_rotarytrinkey_m0.vid.1=0x239A
adafruit_rotarytrinkey_m0.pid.1=0x00FB
adafruit_rotarytrinkey_m0.vid.1=0x239A
adafruit_rotarytrinkey_m0.pid.1=0x80FC
adafruit_rotarytrinkey_m0.upload.tool=bossac
adafruit_rotarytrinkey_m0.upload.protocol=sam-ba
adafruit_rotarytrinkey_m0.upload.maximum_size=262144
adafruit_rotarytrinkey_m0.upload.offset=0x2000
adafruit_rotarytrinkey_m0.upload.use_1200bps_touch=true
adafruit_rotarytrinkey_m0.upload.wait_for_upload_port=true
adafruit_rotarytrinkey_m0.upload.native_usb=true
adafruit_rotarytrinkey_m0.build.mcu=cortex-m0plus
adafruit_rotarytrinkey_m0.build.f_cpu=48000000L
adafruit_rotarytrinkey_m0.build.usb_product="Rotary Trinkey M0"
adafruit_rotarytrinkey_m0.build.usb_manufacturer="Adafruit"
adafruit_rotarytrinkey_m0.build.board=ROTARYTRINKEY_M0
adafruit_rotarytrinkey_m0.build.core=arduino
adafruit_rotarytrinkey_m0.build.extra_flags=-DCRYSTALLESS -DADAFRUIT_ROTARYTRINKEY_M0 -D__SAMD21E18A__ -DARM_MATH_CM0PLUS {build.usb_flags}
adafruit_rotarytrinkey_m0.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
adafruit_rotarytrinkey_m0.build.openocdscript=openocd_scripts/rotarytrinkey_m0.cfg
adafruit_rotarytrinkey_m0.build.variant=rotarytrinkey_m0
adafruit_rotarytrinkey_m0.build.variant_system_lib=
adafruit_rotarytrinkey_m0.build.vid=0x239A
adafruit_rotarytrinkey_m0.build.pid=0x80FB
adafruit_rotarytrinkey_m0.bootloader.tool=openocd
adafruit_rotarytrinkey_m0.bootloader.file=rotarytrinkey_m0/bootloader-rotarytrinkey_m0.bin
adafruit_rotarytrinkey_m0.menu.opt.small=Small (-Os) (standard)
adafruit_rotarytrinkey_m0.menu.opt.small.build.flags.optimize=-Os
adafruit_rotarytrinkey_m0.menu.opt.fast=Fast (-O2)
adafruit_rotarytrinkey_m0.menu.opt.fast.build.flags.optimize=-O2
adafruit_rotarytrinkey_m0.menu.opt.faster=Faster (-O3)
adafruit_rotarytrinkey_m0.menu.opt.faster.build.flags.optimize=-O3
adafruit_rotarytrinkey_m0.menu.opt.fastest=Fastest (-Ofast)
adafruit_rotarytrinkey_m0.menu.opt.fastest.build.flags.optimize=-Ofast
adafruit_rotarytrinkey_m0.menu.opt.dragons=Here be dragons (-Ofast -funroll-loops)
adafruit_rotarytrinkey_m0.menu.opt.dragons.build.flags.optimize=-Ofast -funroll-loops
adafruit_rotarytrinkey_m0.menu.usbstack.arduino=Arduino
adafruit_rotarytrinkey_m0.menu.usbstack.tinyusb=TinyUSB
adafruit_rotarytrinkey_m0.menu.usbstack.tinyusb.build.flags.usbstack=-DUSE_TINYUSB
adafruit_rotarytrinkey_m0.menu.debug.off=Off
adafruit_rotarytrinkey_m0.menu.debug.on=On
adafruit_rotarytrinkey_m0.menu.debug.on.build.flags.debug=-g

# Adafruit NeoKey Trinkey (SAMD21)
# ------------------------------
adafruit_neokeytrinkey_m0.name=Adafruit Rotary Trinkey (SAMD21)
adafruit_neokeytrinkey_m0.vid.0=0x239A
adafruit_neokeytrinkey_m0.pid.0=0x80FF
adafruit_neokeytrinkey_m0.vid.1=0x239A
adafruit_neokeytrinkey_m0.pid.1=0x00FF
adafruit_neokeytrinkey_m0.vid.1=0x239A
adafruit_neokeytrinkey_m0.pid.1=0x8100
adafruit_neokeytrinkey_m0.upload.tool=bossac
adafruit_neokeytrinkey_m0.upload.protocol=sam-ba
adafruit_neokeytrinkey_m0.upload.maximum_size=262144
adafruit_neokeytrinkey_m0.upload.offset=0x2000
adafruit_neokeytrinkey_m0.upload.use_1200bps_touch=true
adafruit_neokeytrinkey_m0.upload.wait_for_upload_port=true
adafruit_neokeytrinkey_m0.upload.native_usb=true
adafruit_neokeytrinkey_m0.build.mcu=cortex-m0plus
adafruit_neokeytrinkey_m0.build.f_cpu=48000000L
adafruit_neokeytrinkey_m0.build.usb_product="NeoKey Trinkey M0"
adafruit_neokeytrinkey_m0.build.usb_manufacturer="Adafruit"
adafruit_neokeytrinkey_m0.build.board=NEOKEYTRINKEY_M0
adafruit_neokeytrinkey_m0.build.core=arduino
adafruit_neokeytrinkey_m0.build.extra_flags=-DCRYSTALLESS -DADAFRUIT_NEOKEYTRINKEY_M0 -D__SAMD21E18A__ -DARM_MATH_CM0PLUS {build.usb_flags}
adafruit_neokeytrinkey_m0.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
adafruit_neokeytrinkey_m0.build.openocdscript=openocd_scripts/neokeytrinkey_m0.cfg
adafruit_neokeytrinkey_m0.build.variant=neokeytrinkey_m0
adafruit_neokeytrinkey_m0.build.variant_system_lib=
adafruit_neokeytrinkey_m0.build.vid=0x239A
adafruit_neokeytrinkey_m0.build.pid=0x80FF
adafruit_neokeytrinkey_m0.bootloader.tool=openocd
adafruit_neokeytrinkey_m0.bootloader.file=neokeytrinkey_m0/bootloader-neokeytrinkey_m0.bin
adafruit_neokeytrinkey_m0.menu.opt.small=Small (-Os) (standard)
adafruit_neokeytrinkey_m0.menu.opt.small.build.flags.optimize=-Os
adafruit_neokeytrinkey_m0.menu.opt.fast=Fast (-O2)
adafruit_neokeytrinkey_m0.menu.opt.fast.build.flags.optimize=-O2
adafruit_neokeytrinkey_m0.menu.opt.faster=Faster (-O3)
adafruit_neokeytrinkey_m0.menu.opt.faster.build.flags.optimize=-O3
adafruit_neokeytrinkey_m0.menu.opt.fastest=Fastest (-Ofast)
adafruit_neokeytrinkey_m0.menu.opt.fastest.build.flags.optimize=-Ofast
adafruit_neokeytrinkey_m0.menu.opt.dragons=Here be dragons (-Ofast -funroll-loops)

adafruit_neokeytrinkey_m0.menu.opt.dragons.build.flags.optimize=-Ofast -funroll-loops
adafruit_neokeytrinkey_m0.menu.usbstack.arduino=Arduino
adafruit_neokeytrinkey_m0.menu.usbstack.tinyusb=TinyUSB
adafruit_neokeytrinkey_m0.menu.usbstack.tinyusb.build.flags.usbstack=-DUSE_TINYUSB
adafruit_neokeytrinkey_m0.menu.debug.off=Off
adafruit_neokeytrinkey_m0.menu.debug.on=On
adafruit_neokeytrinkey_m0.menu.debug.on.build.flags.debug=-g


# Adafruit Slide Trinkey (SAMD21)
# ------------------------------
adafruit_slidetrinkey_m0.name=Adafruit Slide Trinkey (SAMD21)
adafruit_slidetrinkey_m0.vid.0=0x239A
adafruit_slidetrinkey_m0.pid.0=0x8101
adafruit_slidetrinkey_m0.vid.1=0x239A
adafruit_slidetrinkey_m0.pid.1=0x0101
adafruit_slidetrinkey_m0.vid.1=0x239A
adafruit_slidetrinkey_m0.pid.1=0x8102
adafruit_slidetrinkey_m0.upload.tool=bossac
adafruit_slidetrinkey_m0.upload.protocol=sam-ba
adafruit_slidetrinkey_m0.upload.maximum_size=262144
adafruit_slidetrinkey_m0.upload.offset=0x2000
adafruit_slidetrinkey_m0.upload.use_1200bps_touch=true
adafruit_slidetrinkey_m0.upload.wait_for_upload_port=true
adafruit_slidetrinkey_m0.upload.native_usb=true
adafruit_slidetrinkey_m0.build.mcu=cortex-m0plus
adafruit_slidetrinkey_m0.build.f_cpu=48000000L
adafruit_slidetrinkey_m0.build.usb_product="Rotary Trinkey M0"
adafruit_slidetrinkey_m0.build.usb_manufacturer="Adafruit"
adafruit_slidetrinkey_m0.build.board=SLIDETRINKEY_M0
adafruit_slidetrinkey_m0.build.core=arduino
adafruit_slidetrinkey_m0.build.extra_flags=-DCRYSTALLESS -DADAFRUIT_SLIDETRINKEY_M0 -D__SAMD21E18A__ -DARM_MATH_CM0PLUS {build.usb_flags}
adafruit_slidetrinkey_m0.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
adafruit_slidetrinkey_m0.build.openocdscript=openocd_scripts/slidetrinkey_m0.cfg
adafruit_slidetrinkey_m0.build.variant=slidetrinkey_m0
adafruit_slidetrinkey_m0.build.variant_system_lib=
adafruit_slidetrinkey_m0.build.vid=0x239A
adafruit_slidetrinkey_m0.build.pid=0x8101
adafruit_slidetrinkey_m0.bootloader.tool=openocd
adafruit_slidetrinkey_m0.bootloader.file=slidetrinkey_m0/bootloader-slidetrinkey_m0.bin
adafruit_slidetrinkey_m0.menu.opt.small=Small (-Os) (standard)
adafruit_slidetrinkey_m0.menu.opt.small.build.flags.optimize=-Os
adafruit_slidetrinkey_m0.menu.opt.fast=Fast (-O2)
adafruit_slidetrinkey_m0.menu.opt.fast.build.flags.optimize=-O2
adafruit_slidetrinkey_m0.menu.opt.faster=Faster (-O3)
adafruit_slidetrinkey_m0.menu.opt.faster.build.flags.optimize=-O3
adafruit_slidetrinkey_m0.menu.opt.fastest=Fastest (-Ofast)
adafruit_slidetrinkey_m0.menu.opt.fastest.build.flags.optimize=-Ofast
adafruit_slidetrinkey_m0.menu.opt.dragons=Here be dragons (-Ofast -funroll-loops)
adafruit_slidetrinkey_m0.menu.opt.dragons.build.flags.optimize=-Ofast -funroll-loops
adafruit_slidetrinkey_m0.menu.usbstack.arduino=Arduino
adafruit_slidetrinkey_m0.menu.usbstack.tinyusb=TinyUSB
adafruit_slidetrinkey_m0.menu.usbstack.tinyusb.build.flags.usbstack=-DUSE_TINYUSB
adafruit_slidetrinkey_m0.menu.debug.off=Off
adafruit_slidetrinkey_m0.menu.debug.on=On
adafruit_slidetrinkey_m0.menu.debug.on.build.flags.debug=-g

# Adafruit ProxLight Trinkey (SAMD21)
# ------------------------------
adafruit_proxlighttrinkey_m0.name=Adafruit ProxLight Trinkey (SAMD21)
adafruit_proxlighttrinkey_m0.vid.0=0x239A
adafruit_proxlighttrinkey_m0.pid.0=0x8103
adafruit_proxlighttrinkey_m0.vid.1=0x239A
adafruit_proxlighttrinkey_m0.pid.1=0x0103
adafruit_proxlighttrinkey_m0.vid.1=0x239A
adafruit_proxlighttrinkey_m0.pid.1=0x8104
adafruit_proxlighttrinkey_m0.upload.tool=bossac
adafruit_proxlighttrinkey_m0.upload.protocol=sam-ba
adafruit_proxlighttrinkey_m0.upload.maximum_size=262144
adafruit_proxlighttrinkey_m0.upload.offset=0x2000
adafruit_proxlighttrinkey_m0.upload.use_1200bps_touch=true
adafruit_proxlighttrinkey_m0.upload.wait_for_upload_port=true
adafruit_proxlighttrinkey_m0.upload.native_usb=true
adafruit_proxlighttrinkey_m0.build.mcu=cortex-m0plus
adafruit_proxlighttrinkey_m0.build.f_cpu=48000000L
adafruit_proxlighttrinkey_m0.build.usb_product="ProxLight Trinkey M0"
adafruit_proxlighttrinkey_m0.build.usb_manufacturer="Adafruit"
adafruit_proxlighttrinkey_m0.build.board=PROXLIGHTTRINKEY_M0
adafruit_proxlighttrinkey_m0.build.core=arduino
adafruit_proxlighttrinkey_m0.build.extra_flags=-DCRYSTALLESS -DADAFRUIT_PROXLIGHTTRINKEY_M0 -D__SAMD21E18A__ -DARM_MATH_CM0PLUS {build.usb_flags}
adafruit_proxlighttrinkey_m0.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
adafruit_proxlighttrinkey_m0.build.openocdscript=openocd_scripts/proxlighttrinkey_m0.cfg
adafruit_proxlighttrinkey_m0.build.variant=proxlighttrinkey_m0
adafruit_proxlighttrinkey_m0.build.variant_system_lib=
adafruit_proxlighttrinkey_m0.build.vid=0x239A
adafruit_proxlighttrinkey_m0.build.pid=0x8103
adafruit_proxlighttrinkey_m0.bootloader.tool=openocd
adafruit_proxlighttrinkey_m0.bootloader.file=proxlighttrinkey_m0/bootloader-proxlighttrinkey_m0.bin
adafruit_proxlighttrinkey_m0.menu.opt.small=Small (-Os) (standard)
adafruit_proxlighttrinkey_m0.menu.opt.small.build.flags.optimize=-Os
adafruit_proxlighttrinkey_m0.menu.opt.fast=Fast (-O2)
adafruit_proxlighttrinkey_m0.menu.opt.fast.build.flags.optimize=-O2
adafruit_proxlighttrinkey_m0.menu.opt.faster=Faster (-O3)
adafruit_proxlighttrinkey_m0.menu.opt.faster.build.flags.optimize=-O3
adafruit_proxlighttrinkey_m0.menu.opt.fastest=Fastest (-Ofast)
adafruit_proxlighttrinkey_m0.menu.opt.fastest.build.flags.optimize=-Ofast
adafruit_proxlighttrinkey_m0.menu.opt.dragons=Here be dragons (-Ofast -funroll-loops)
adafruit_proxlighttrinkey_m0.menu.opt.dragons.build.flags.optimize=-Ofast -funroll-loops
adafruit_proxlighttrinkey_m0.menu.usbstack.arduino=Arduino
adafruit_proxlighttrinkey_m0.menu.usbstack.tinyusb=TinyUSB
adafruit_proxlighttrinkey_m0.menu.usbstack.tinyusb.build.flags.usbstack=-DUSE_TINYUSB
adafruit_proxlighttrinkey_m0.menu.debug.off=Off
adafruit_proxlighttrinkey_m0.menu.debug.on=On
adafruit_proxlighttrinkey_m0.menu.debug.on.build.flags.debug=-g


# Adafruit ItsyBitsy M0 (SAMD21)
# ------------------------------
Expand Down
Binary file added bootloaders/neokeytrinkey_m0/bootloader-neokeytrinkey_m0.bin
View file
Open in desktop
Binary file not shown.
Binary file added bootloaders/proxlighttrinkey_m0/bootloader-proxlighttrinkey_m0.bin
View file
Open in desktop
Binary file not shown.
Binary file added bootloaders/rotarytrinkey_m0/bootloader-rotarytrinkey_m0.bin
View file
Open in desktop
Binary file not shown.
Binary file added bootloaders/slidetrinkey_m0/bootloader-slidetrinkey_m0.bin
View file
Open in desktop
Binary file not shown.
31 changes: 31 additions & 0 deletions variants/neokeytrinkey_m0/debug_scripts/variant.gdb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
#
# Arduino Zero OpenOCD script.
#
# Copyright (c) 2014-2015 Arduino LLC. All right reserved.
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation; either
# version 2.1 of the License, or (at your option) any later version.
#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# See the GNU Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#

# Define 'reset' command
define reset

info reg

break main

# End of 'reset' command
end

target remote | openocd -c "interface cmsis-dap" -c "set CHIPNAME at91samd21e18" -f target/at91samdXX.cfg -c "gdb_port pipe; log_output openocd.log"
Loading