summaryrefslogtreecommitdiff
path: root/keyboards/cannonkeys
AgeCommit message (Collapse)Author
2020-06-28Fix ordering for new info.jsons (#9567)Ryan
2020-06-28Add missing info.jsons for a few boards (#9549)Ryan
2020-06-11Fixing Iron165 VIA Keymap (#9298)George Mao
* Fixing via issues * Fixing whitespace issues on the keymap * Fixed the default via layer 1 keymap, was a little weird before * Removing redundant declarations in via/rules.mk
2020-04-24Merge pull request #8806 from awkannan/202004_obliterated75Joel Challis
Add Obliterated75 Keyboard
2020-04-21Update keyboards/cannonkeys/obliterated75/keymaps/default/keymap.cAndrew Kannan
Co-Authored-By: Ryan <fauxpark@gmail.com>
2020-04-17Apply suggestions from code reviewAndrew Kannan
Co-Authored-By: Ryan <fauxpark@gmail.com> Co-Authored-By: Joel Challis <git@zvecr.com>
2020-04-16Apply suggestions from code reviewAndrew Kannan
Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> Co-Authored-By: Ryan <fauxpark@gmail.com>
2020-04-15Whitespace changesAndrew Kannan
Co-Authored-By: Ryan <fauxpark@gmail.com>
2020-04-15Miscellaneous stuff: remove clang-complete and autocomplete.sh, fix some ↵Ryan
rules.mk comments (#8784)
2020-04-15Add new obliterated75 filesAndrew Kannan
2020-04-12[Keyboard] Add CannonKeys Atlas keyboard (#8207)Andrew Kannan
* Atlas keyboard * Update info and readme * Update firmware * Apply suggestions from code review * Updates * Add 2x2U layout * Minor cleanup * Fix trailing comma * Remove line * Apply suggestions from code review
2020-04-12[Keyboard] Add CannonKeys Rekt1800 keyboard (#7760)Andrew Kannan
* Add Rekt1800 keyboards * Update keyboards/cannonkeys/rekt1800/config.h * Update keyboards/cannonkeys/rekt1800/info.json * Apply suggestions from code review * Apply suggestions from code review * Remove line * Apply suggestions from code review
2020-04-12Fix compile issues with devastatingtkl (#8765)Joel Challis
2020-04-11CannonKeys DB60 (Daughterboard60) PCB (#8208)Andrew Kannan
* Cannonkeys DB60 Keyboard * WhitespacE * Add ISO and make layer names more idiomatic * backlight enable * Remove big backslash from ISO * Apply suggestions from code review Co-Authored-By: Ryan <fauxpark@gmail.com> * Update for correct matrix * Apply suggestions from code review Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> Co-Authored-By: Ryan <fauxpark@gmail.com> * Update chibios config files * Complete VIA keymap * Remove ugly hack comments * Update keyboards/cannonkeys/db60/rules.mk Co-Authored-By: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> Co-authored-by: Joel Challis <git@zvecr.com>
2020-04-11DevastatingTKL Keyboard (#8209)Andrew Kannan
* Save progress * Finished matrix and everything * Apply suggestions from code review Co-Authored-By: Ryan <fauxpark@gmail.com> * Update DevastatingTKL * Renames * Add renamed files * Update chibios files and VIA keymap for completion * Some cleanup * Apply suggestions from code review Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/cannonkeys/devastatingtkl/rules.mk Co-Authored-By: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> Co-authored-by: Joel Challis <git@zvecr.com>
2020-04-07Update 072 based CannonKeys boards to rely on core QMK support (#8716)Andrew Kannan
* Swap CannonKeys 072 boards over to rely on core QMK backlight support * Rename keymap * Rename via_tsangan back to via
2020-04-06Remove keyboard level ws2812 spi drivers (#7694)Joel Challis
2020-04-06Refactor cannonkeys f103 boards to use core backlight (#8089)Joel Challis
* Refactor to use core backlight * Remove custom implementation
2020-04-05Enable memcore to fix malloc/rand crashes (#8695)Joel Challis
2020-03-02Remove "ugly hack in usb_main.c" comments (#8296)Ryan
2020-03-01Get the direction right on the S75 encoder (#8287)Andrew Kannan
2020-03-02Make a fix to savage65 and tmov2 for via (#8286)Andrew Kannan
2020-02-292020 February 29 Breaking Changes Update (#8064)James Young
2020-02-21Update TMOv2 for new key (#7759)Andrew Kannan
* Update TMOv2 for new keymap * Update based on PR changes
2020-02-21S75 Encoder Fixes (#7758)Andrew Kannan
* S75 Encoder Fixes * Flip encoder pins vs using setting
2020-02-13Fix RESET keycode on some STM32F072 keyboards (#8134)Joel Challis
* Add f072 board files with 'enter_bootloader_mode_if_requested' support * rename default f072 board file to GENERIC_STM32_F072XB * Remove board files * Add bootloader def * Update generic f072 board paths * Revert wrong deletion
2020-02-05Add RESET key for default keymap in Satisfaction 75 (#8088)MechMerlin
2020-01-28Move CORTEX_ENABLE_WFI_IDLE=TRUE to rules.mk files.Nick Brassel
2020-01-27Refactor stm32duino f103 keyboards to use new central board config files (#7706)Joel Challis
* Create central board for bluepill * Remove duplicate board files * Refactor to use new central board config files * Fix cannonkeys f103 boards
2020-01-27Migrate common ld scripts to common location (#7887)Joel Challis
* Migrate common ld scripts to common location * Remove duplicate ld scripts * Update build to look at common ld location
2020-01-27Fix boards which were overriding backlight without setting custom (#7970)Joel Challis
2020-01-26Fix cannonkeys f103 boardszvecr
2020-01-26Refactor to use new central board config fileszvecr
2020-01-26Remove duplicate board fileszvecr
2020-01-20Add VIA support for QMK backlight, QMK RGBLight (#7911)Wilba
* Add VIA support for QMK backlight, QMK RGBLight * clang-format changes
2020-01-10Refactor f103,f072,f042 based keyboards to use new MCU selection defaults ↵Joel Challis
(#7705) * refactor keyboards using ST_STM32F072B_DISCOVERY to use 'MCU = STM32F072' * refactor keyboards using GENERIC_STM32_F042X6 to use 'MCU = STM32F042' * refactor keyboards using GENERIC_STM32_F103 to use 'MCU = STM32F103'
2020-01-09Fix matrix_scan_user is not called at stm32 env(projectkb/alice etc..) which ↵bottilabo
using cannonkeys/stm32f072 (#7821)
2020-01-09Ensure `PROGMEM` is present on default keymaps (#7836)fauxpark
2020-01-03VIA Configurator Refactor (#7268)Wilba
* VIA Refactor * Remove old code * review changes * review changes * Fix cannonkeys/satisfaction75/prototype:via build * Add via.h to quantum.h * Move backlight init to after backlight config load * Merge branch 'master' into via_refactor_pr * Update user's rules.mk to new way of enabling VIA * Added id_switch_matrix_state * Review changes
2019-12-15[Keymap] boy_314's satisfaction75 layout (#7638)Boy_314
* added boy_314's satisfaction75 layout * added readme * updated NKRO toggle, removed unecessary code * Update keyboards/cannonkeys/satisfaction75/keymaps/boy_314/config.h Co-Authored-By: Drashna Jaelre <drashna@live.com>
2019-12-08[Keyboard] instant60: Enable bootmagic lite to make eeprom reset easier (#7566)Yan-Fa Li
2019-11-20Remove keymap_config extern from default keymaps (#7399)Drashna Jaelre
* Remove keymap_config extern from default keymaps * Revert unicode Apparently VSCode does not like unicode, I didn't actually edit these lines, so it must have been automatic... :( Co-Authored-By: fauxpark <fauxpark@gmail.com>
2019-10-29[Keyboard] New CannonKeys boards and EEPROM fixes (#6968)Andrew Kannan
* Add Iron165 * CannonKeys new boards and cleanup * Tmo50 info json * Update readme for TMOv2 * update via keymap tmo * info json again * Apply suggestions from code review Co-Authored-By: Drashna Jaelre <drashna@live.com> * Address PR comments * More changes for rules files cleanup * info.json fixed? * Fix Savage65 matrix * Apply suggestions from code review Thanks noroadsleft for the improvements! Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com> * Bump eeprom version * Apply suggestions from code review Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>
2019-10-28[Keyboard] Fix matrix for Tsangan (#7159)Yan-Fa Li
- 1st mod after space bar was wrong position
2019-10-09[Keyboard] Satisfaction75 Configurator support (info.json) (#6833)MechMerlin
* add configurator support for rev1 s75 * add configurator support for prototype * Update keyboards/cannonkeys/satisfaction75/prototype/info.json Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/cannonkeys/satisfaction75/rev1/info.json Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/cannonkeys/satisfaction75/rev1/info.json Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/cannonkeys/satisfaction75/rev1/info.json Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/cannonkeys/satisfaction75/rev1/info.json Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/cannonkeys/satisfaction75/rev1/info.json Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com> * fixup layouts * Update keyboards/cannonkeys/satisfaction75/rev1/info.json Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/cannonkeys/satisfaction75/rev1/info.json Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>
2019-10-07[Keyboard] Cannon Keys Satisfaction75: Fix buffer sizes for sprintfs. (#6954)NoshBar
sprintf always adds a NULL terminator at the end of the buffer it works on. A few places made just enough space for the resulting string, but not the terminator. So this just adds one to the buffer size to make room for it.
2019-09-18[Keyboard] 201909 s75 custom encoder (#6745)Andrew Kannan
* Handle custom encoder configuration * Whitespace changes * Undo broken stuff * more * Remove printfs * fix the dumb bug
2019-09-16Add Chimera65 Keyboard (#6670)Andrew Kannan
* Add chimera board * info json start * Update keyboards/cannonkeys/chimera65/config.h Co-Authored-By: Drashna Jaelre <drashna@live.com> * Apply suggestions from code review Co-Authored-By: Drashna Jaelre <drashna@live.com> Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/cannonkeys/chimera65/config.h Co-Authored-By: Drashna Jaelre <drashna@live.com>
2019-08-30[Keyboard] Support flashing Instant60 from command line (#6625)Jonathan Rascher
2019-07-29[Keyboard] Correct name of community layout for ortho75 (#6434)Joel Challis