summaryrefslogtreecommitdiffstats
path: root/keyboards/cannonkeys
Commit message (Collapse)AuthorAgeFilesLines
* [Keyboard] Add community layouts to Savage65 (#9854)Brandon Schlack2020-07-313-0/+70
|
* Add Instant65 to QMK (#9804)Andrew Kannan2020-07-2712-0/+1669
| | | | | | | | | | | * Add Instant65 to QMK * Fix via map * Apply suggestions from code review Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* Atlas Updates (#9343)Andrew Kannan2020-07-273-8/+9
| | | | | | | | | | | * Update atlas keyboard files and default keyboard layout * Remove wierd LT things * Update keyboards/cannonkeys/atlas/keymaps/via/keymap.c Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Joel Challis <git@zvecr.com>
* Adding VIA support for CannonKeys/Practice60 (#8169)morbetter2020-06-294-3/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Adding VIA support for 40percentclub/luddite * Update config.h * Update rules.mk * Delete config.h config.h was created to override the "default" of RGBLED_NUM 8 deleting the file to keep with defaults * Removing block and comment as suggested * Update PRODUCT_ID Changing from: #define PRODUCT_ID 0x0A0C To: #define PRODUCT_ID 0x4C55 // "LU" * Changing Vendor ID Changing Vendor ID from: #define VENDOR_ID 0xFEED To: #define VENDOR_ID 0x3430 // "40" * Adding VIA support to cannonkeys/practice60 Adding VIA support to cannonkeys/practice60 * updated VENDOR_ID to match other CannonKeys boards * changed PRODUCT_ID to be unique * added additional notes to readme.md * keymap.c and config.h for VIA support * Update readme.md * Update keyboards/cannonkeys/practice60/readme.md * Update keyboards/cannonkeys/practice60/readme.md * Update keyboards/cannonkeys/practice60/config.h * Update rules.mk * Update keyboards/cannonkeys/practice60/config.h * Update config.h * Rebased from Master Rebased from Master
* Fix ordering for new info.jsons (#9567)Ryan2020-06-281-2/+2
|
* Add missing info.jsons for a few boards (#9549)Ryan2020-06-281-2/+87
|
* Fixing Iron165 VIA Keymap (#9298)George Mao2020-06-112-15/+30
| | | | | | | | | * 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
* Merge pull request #8806 from awkannan/202004_obliterated75Joel Challis2020-04-2412-0/+1679
|\ | | | | Add Obliterated75 Keyboard
| * Update keyboards/cannonkeys/obliterated75/keymaps/default/keymap.cAndrew Kannan2020-04-211-1/+1
| | | | | | Co-Authored-By: Ryan <fauxpark@gmail.com>
| * Apply suggestions from code reviewAndrew Kannan2020-04-174-7/+7
| | | | | | | | Co-Authored-By: Ryan <fauxpark@gmail.com> Co-Authored-By: Joel Challis <git@zvecr.com>
| * Apply suggestions from code reviewAndrew Kannan2020-04-165-20/+23
| | | | | | | | Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> Co-Authored-By: Ryan <fauxpark@gmail.com>
| * Whitespace changesAndrew Kannan2020-04-153-7/+2
| | | | | | Co-Authored-By: Ryan <fauxpark@gmail.com>
| * Add new obliterated75 filesAndrew Kannan2020-04-1512-0/+1681
| |
* | Miscellaneous stuff: remove clang-complete and autocomplete.sh, fix some ↵Ryan2020-04-152-2/+2
|/ | | | rules.mk comments (#8784)
* [Keyboard] Add CannonKeys Atlas keyboard (#8207)Andrew Kannan2020-04-1212-0/+1955
| | | | | | | | | | | | | | | | | | | | | | * 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
* [Keyboard] Add CannonKeys Rekt1800 keyboard (#7760)Andrew Kannan2020-04-1212-0/+1658
| | | | | | | | | | | | | | | | * 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
* Fix compile issues with devastatingtkl (#8765)Joel Challis2020-04-121-1/+0
|
* CannonKeys DB60 (Daughterboard60) PCB (#8208)Andrew Kannan2020-04-1114-0/+1807
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* DevastatingTKL Keyboard (#8209)Andrew Kannan2020-04-1112-0/+1659
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* Update 072 based CannonKeys boards to rely on core QMK support (#8716)Andrew Kannan2020-04-0742-12255/+34
| | | | | | | * Swap CannonKeys 072 boards over to rely on core QMK backlight support * Rename keymap * Rename via_tsangan back to via
* Remove keyboard level ws2812 spi drivers (#7694)Joel Challis2020-04-0622-121/+28
|
* Refactor cannonkeys f103 boards to use core backlight (#8089)Joel Challis2020-04-0613-285/+24
| | | | | * Refactor to use core backlight * Remove custom implementation
* Enable memcore to fix malloc/rand crashes (#8695)Joel Challis2020-04-057-7/+7
|
* Remove "ugly hack in usb_main.c" comments (#8296)Ryan2020-03-0212-24/+0
|
* Get the direction right on the S75 encoder (#8287)Andrew Kannan2020-03-011-2/+2
|
* Make a fix to savage65 and tmov2 for via (#8286)Andrew Kannan2020-03-022-4/+2
|
* 2020 February 29 Breaking Changes Update (#8064)James Young2020-02-2942-807/+6432
|
* Update TMOv2 for new key (#7759)Andrew Kannan2020-02-217-21/+21
| | | | | | * Update TMOv2 for new keymap * Update based on PR changes
* S75 Encoder Fixes (#7758)Andrew Kannan2020-02-211-2/+4
| | | | | | * S75 Encoder Fixes * Flip encoder pins vs using setting
* Fix RESET keycode on some STM32F072 keyboards (#8134)Joel Challis2020-02-137-0/+7
| | | | | | | | | | | | | | * 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
* Add RESET key for default keymap in Satisfaction 75 (#8088)MechMerlin2020-02-051-1/+1
|
* Move CORTEX_ENABLE_WFI_IDLE=TRUE to rules.mk files.Nick Brassel2020-01-2824-48/+46
|
* Refactor stm32duino f103 keyboards to use new central board config files (#7706)Joel Challis2020-01-2721-1141/+10
|\ | | | | | | | | | | | | | | | | | | * Create central board for bluepill * Remove duplicate board files * Refactor to use new central board config files * Fix cannonkeys f103 boards
| * Fix cannonkeys f103 boardszvecr2020-01-261-1/+5
| |
| * Refactor to use new central board config fileszvecr2020-01-265-5/+5
| |
| * Remove duplicate board fileszvecr2020-01-2615-1135/+0
| |
* | Migrate common ld scripts to common location (#7887)Joel Challis2020-01-279-860/+0
| | | | | | | | | | | | | | | | * Migrate common ld scripts to common location * Remove duplicate ld scripts * Update build to look at common ld location
* | Fix boards which were overriding backlight without setting custom (#7970)Joel Challis2020-01-275-0/+5
|/
* Add VIA support for QMK backlight, QMK RGBLight (#7911)Wilba2020-01-2010-0/+175
| | | | | | * Add VIA support for QMK backlight, QMK RGBLight * clang-format changes
* Refactor f103,f072,f042 based keyboards to use new MCU selection defaults ↵Joel Challis2020-01-1012-430/+54
| | | | | | | | | | (#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'
* Fix matrix_scan_user is not called at stm32 env(projectkb/alice etc..) which ↵bottilabo2020-01-091-1/+2
| | | | using cannonkeys/stm32f072 (#7821)
* Ensure `PROGMEM` is present on default keymaps (#7836)fauxpark2020-01-093-17/+3
|
* VIA Configurator Refactor (#7268)Wilba2020-01-0323-581/+230
| | | | | | | | | | | | | | | | | | | | | | | | * 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
* [Keymap] boy_314's satisfaction75 layout (#7638)Boy_3142019-12-154-0/+47
| | | | | | | | | | | | * 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>
* [Keyboard] instant60: Enable bootmagic lite to make eeprom reset easier (#7566)Yan-Fa Li2019-12-081-1/+1
|
* Remove keymap_config extern from default keymaps (#7399)Drashna Jaelre2019-11-205-5/+0
| | | | | | | | | | * 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>
* [Keyboard] New CannonKeys boards and EEPROM fixes (#6968)Andrew Kannan2019-10-2953-14/+9319
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* [Keyboard] Fix matrix for Tsangan (#7159)Yan-Fa Li2019-10-281-2/+2
| | | - 1st mod after space bar was wrong position
* [Keyboard] Satisfaction75 Configurator support (info.json) (#6833)MechMerlin2019-10-093-1/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* [Keyboard] Cannon Keys Satisfaction75: Fix buffer sizes for sprintfs. (#6954)NoshBar2019-10-071-7/+7
| | | | | 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.