summaryrefslogtreecommitdiffstats
path: root/keyboards/cannonkeys
Commit message (Expand)AuthorAgeFilesLines
...
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-101-0/+16
|\
| * cannonkeys/satisfaction75: Add empty layers to the via keymap (#14782)Sergey Vlasov2021-10-111-0/+16
* | Fix OLED timeout on satisfaction75 after migration from QWIIC (#14780)Sergey Vlasov2021-10-104-8/+87
* | Migrate satisfaction75 away from QWIIC_DRIVERS (#14747)Joel Challis2021-10-096-299/+186
* | Merge remote-tracking branch 'upstream/master' into developfauxpark2021-09-211-1/+1
|\|
| * Remove audio pin references in rules.mk (#14532)Ryan2021-09-211-1/+1
* | Align ChibiOS I2C defs with other drivers (#14399)Joel Challis2021-09-121-3/+2
|/
* Remove BLUETOOTH_ENABLE from keyboard-level rules.mk (#14379)Ryan2021-09-129-9/+0
* Remove width, height and key_count from info.json (#14274)Ryan2021-09-1226-52/+0
* Remove bootloader listings from rules.mk (#14330)Ryan2021-09-101-1/+1
* Remove MIDI Configuration boilerplate (#11151)James Young2021-08-161-1/+0
* Remove Full Bootmagic (#13846)James Young2021-08-0625-25/+25
* Merge remote-tracking branch 'upstream/master' into developJames Young2021-07-291-1/+95
|\
| * Cannonkeys Balance: Configurator fixes (#13778)James Young2021-07-291-1/+95
* | Remove some legacy files (#13715)Joel Challis2021-07-277-173/+0
* | Merge remote-tracking branch 'upstream/master' into developNick Brassel2021-07-272-4/+4
|\|
| * Revert "Fixed the ortho60 and ortho48 matrix layout after testing (#12106)" (...Cyril2021-07-252-4/+4
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-211-1/+1
|\|
| * Fix vicious40 rules (#13623)Andrew Kannan2021-07-211-1/+1
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-2012-0/+371
|\|
| * [Keyboard] Add Vicious40 to QMK (#12981)Andrew Kannan2021-07-2012-0/+371
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-2010-0/+284
|\|
| * [Keyboard] Aella Keyboard PCB (#13372)Andrew Kannan2021-07-1910-0/+284
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-2012-0/+381
|\|
| * [Keyboard] Add CannonKeys Balance PCB to QMK (#13489)Andrew Kannan2021-07-1912-0/+381
* | [Bug] Develop - Change uint32_t to layer_state_t (#13596)Xelus222021-07-191-1/+1
|/
* Set `BOOTLOADER = stm32-dfu` for all applicable STM32 boards (#12956)Ryan2021-06-0817-42/+85
* Fix up WS2812 SPI driver on F072. (#13022)Nick Brassel2021-06-0311-0/+22
* 2021 May 29 Breaking Changes Update (#13034)James Young2021-05-2915-16/+20
* Some fixes for the Bakeneko variant DB60s (#12662)Andrew Kannan2021-05-1217-69/+361
* Fixup Satisfaction75 bootprocess. (#12621)Nick Brassel2021-04-193-125/+13
* Correct layout macro name in Cannonkeys Ortho75 info.json (#12581)James Young2021-04-131-1/+1
* Fixed the ortho60 and ortho48 matrix layout after testing (#12106)Nick Blyumberg2021-03-042-4/+4
* cannonkeys/atlas_alps: rename via keymaps rules.mk.txt to rules.mk (#12103)James Young2021-03-031-0/+0
* Satisfaction 75 turn off backlight on suspend, restore config on wakeup (#11774)Mario Medina2021-02-282-1/+16
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-2411-0/+394
|\
| * [Keyboard] Atlas alps/mx PCB addition (#11884)npspears2021-02-2411-0/+394
* | Remove FAUXCLICKY feature (deprecated) (#11829)Drashna Jaelre2021-02-091-2/+1
* | ChibiOS conf migrations... take 11 (#11646)Nick Brassel2021-01-2121-260/+0
* | Fix up comments showing how to execute config migration. (#11621)Nick Brassel2021-01-2063-63/+63
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-191-2/+86
|\|
| * Cannonkeys Onyx: Configurator/QMK CLI improvements (#11603)James Young2021-01-191-2/+86
* | Merge remote-tracking branch 'upstream/master' into developfauxpark2021-01-1517-17/+0
|\|
| * Remove `DESCRIPTION`, B-D (#11513)Ryan2021-01-1517-17/+0
* | ChibiOS conf migrations... take 7 (#11529)Nick Brassel2021-01-133-1375/+68
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-1112-0/+1681
|\|
| * [Keyboard] Add Onyx keyboard to QMK (#11292)Andrew Kannan2021-01-1012-0/+1681
* | ChibiOS conf migrations... take 6 (#11504)Nick Brassel2021-01-103-1377/+65
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-0612-0/+1693
|\|
| * [Keyboard] Sagittarius (#10896)Andrew Kannan2021-01-0512-0/+1693