summaryrefslogtreecommitdiffstats
path: root/keyboards/cannonkeys
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* [Keyboard] 201909 s75 custom encoder (#6745)Andrew Kannan2019-09-184-67/+129
| | | | | | | | | | | | | | * Handle custom encoder configuration * Whitespace changes * Undo broken stuff * more * Remove printfs * fix the dumb bug
* Add Chimera65 Keyboard (#6670)Andrew Kannan2019-09-1618-2/+3077
| | | | | | | | | | | | | | | | | | | * 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>
* [Keyboard] Support flashing Instant60 from command line (#6625)Jonathan Rascher2019-08-301-0/+4
|
* [Keyboard] Correct name of community layout for ortho75 (#6434)Joel Challis2019-07-291-1/+1
|
* Refactoring wilba.tech PCBs, updating Rama Works U80-A (#6272)Wilba2019-07-212-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added WT65-B, WT75-B, minor fixes * Update keyboards/wilba_tech/wt65_b/config.h Co-Authored-By: Drashna Jaelre <drashna@live.com> * Update keyboards/wilba_tech/wt65_b/readme.md Co-Authored-By: fauxpark <fauxpark@gmail.com> * Update keyboards/wilba_tech/wt75_b/config.h Co-Authored-By: Drashna Jaelre <drashna@live.com> * Change DEBOUNCING_DELAY to DEBOUNCE * Change DEBOUNCING_DELAY to DEBOUNCE * Move Zeal60/Zeal65 files to keyboards/wilba_tech * Change DEBOUNCING_DELAY to DEBOUNCE * Refactoring zeal60 code to wilba_tech * Moved Rama Works PCBs to wilba_tech * Rename Rama Works files * Cleanup info.json * Cleanup readme.md * Cleanup USB device strings * U80-A RGB matrix, IS31FL3731 driver changes * Fixed #include from keyboards/zeal60
* Allow userspace the opportunity to handle keycodesjshuf2019-07-171-1/+1
|
* Remove the need to specify NUM_OF_ENCODERS for the Encoder feature (#6328)Drashna Jaelre2019-07-162-2/+0
| | | | | | | | | | | | * Remove the need to set NUM_OF_ENCODERS Instead, calculate the size of the array, and use that instead * Add hack for split common support * Remove NUM_OF_ENCODERS from keyboard config Can be reverted, if needed
* Align ARM i2c_readReg with AVR (#6314)Joel Challis2019-07-161-2/+2
| | | | | | * Align arm i2c_readReg with avr * Align arm i2c_readReg with avr - fix cannonkeys
* [Keyboard] Cannonkeys Instant60 Configurator updates (#6186)noroadsleft2019-06-244-6/+7
| | | | | | | | | | | | | | | | | * Rename layout macros The Instant60's info.json was updated in #6157. The intention seems to have been supporting Community Layouts, but that feature was not implemented. After checking that the layouts conform, rename the appropriate layout macros. - rename LAYOUT_ansi as LAYOUT_60_ansi - rename LAYOUT_tsangan as LAYOUT_60_tsangan_hhkb - update `default` and `tsangan` keymaps * Enable Community Layout support Supported Community Layouts: - 60_ansi (Instant60 ANSI version) - 60_tsangan_hhkb (Instant60 Tsangan version)
* [Keyboard] Add Ortho75 (#6177)Andrew Kannan2019-06-2415-0/+1789
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add Ortho75 * fix typo * Add dfu args to rules.mk * Update keyboards/cannonkeys/ortho75/info.json Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/cannonkeys/ortho75/info.json Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/cannonkeys/ortho75/info.json Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/cannonkeys/ortho75/info.json Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/cannonkeys/ortho75/info.json Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/cannonkeys/ortho75/info.json Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/cannonkeys/ortho75/keymaps/default/keymap.c Co-Authored-By: fauxpark <fauxpark@gmail.com>
* [Keyboard] Add AN-C PCB (#6157)Andrew Kannan2019-06-2420-3/+3172
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add cannonkeys AN-C keyboard * Update Instant60 readme to point to CannonKeys docs * Ortho75 * Update keyboards/cannonkeys/an_c/an_c.h Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/cannonkeys/an_c/an_c.h Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/cannonkeys/an_c/keymaps/default/keymap.c Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/cannonkeys/an_c/keymaps/default/keymap.c Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/cannonkeys/an_c/keymaps/tsangan/keymap.c Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/cannonkeys/an_c/keymaps/tsangan/keymap.c Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/cannonkeys/an_c/rules.mk Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/cannonkeys/instant60/readme.md Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/cannonkeys/an_c/readme.md Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com> * Update readme * Update info.json * Remove Ortho75 and put in a separate branch * Update info.json * remove redundant things * Update keyboards/cannonkeys/an_c/keymaps/default/keymap.c Co-Authored-By: fauxpark <fauxpark@gmail.com> * Update keyboards/cannonkeys/an_c/keymaps/tsangan/keymap.c Co-Authored-By: fauxpark <fauxpark@gmail.com> * Update rules and info.json
* Moving rgb typedefs into a single location (#5978)XScorpion22019-06-042-3/+2
| | | | | Because someone named the define poorly Using full relative path as handwired/promethium has a color.h file
* [Keyboard] Instant60 VIA Support (#5909)Andrew Kannan2019-05-1910-11/+317
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * VIA Support for Instant60 * Backlighting updates * Update default keymap * Add Standard layout default VIA supported layout * Clean up some backslashes * Add info.json * Update info json metadata * add info.json for practice65 * Update keyboards/cannonkeys/instant60/info.json Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/cannonkeys/practice65/info.json Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/cannonkeys/instant60/keymaps/via/keymap.c Co-Authored-By: fauxpark <fauxpark@gmail.com> * Update keyboards/cannonkeys/instant60/keymaps/via_standard/keymap.c Co-Authored-By: fauxpark <fauxpark@gmail.com> * Remove unused enum
* [Keyboard] Practice65 Keyboard (#5795)Andrew Kannan2019-05-0515-0/+1728
| | | | | | | | | | * Save p65 changes * Save p65 changes * Add reset * update num leds
* [Keyboard] Satisfaction75 i2c fix and VIA layout (#5726)Andrew Kannan2019-04-274-17/+56
|
* OLED Driver FeatureRyan Caltabiano2019-04-201-19/+27
|
* [Keyboard] Instant60 Tsangan (#5580)Andrew Kannan2019-04-074-11/+94
| | | | | | | | * Update instant60 for tsangan version * Add extra init hook * Remove hacky first init thing
* [Keyboard] CannonKeys Instant60 Keyboard (#5433)Andrew Kannan2019-03-1820-0/+3597
| | | | | | | | | | | | | | | | | | | | | | | | | | * Instant 60 * Instant60 changes again * turn off LSE and features * Working RGB underglow :tada: * Add missing files * Update keymap to have reset * Backlighting on * Backlight code for instant60 * Move 072 files to common folder and use it in Instant60 * Updates * Update keyboards/cannonkeys/instant60/rules.mk Co-Authored-By: awkannan <andrew.kannan@klaviyo.com>
* Next set of split_common changes (#4974)James Churchill2019-03-121-1/+1
| | | | | | | | | | | | | | | | * Update split_common to use standard i2c drivers * Eliminate RGB_DIRTY/BACKLIT_DIRTY * Fix avr i2c_master error handling * Fix i2c_slave addressing * Remove unneeded timeout on i2c_stop() * Fix RGB I2C transfers * Remove incorrect comment
* [Keyboard] Satisfaction75 Protoype/Rev1 split, and new VIA features (#5303)Andrew Kannan2019-03-1112-45/+324
| | | | | | | | | | | | | | | | | | | | | | | | | | * Add satisfaction75 revision 1 * Update manufacturer * Add tester layout and update rev1 comments * Add ifdef guards for OLED for tester * Add oled disabling rules * Update to save backlight settings and setup for VIA custom config * Add new VIA values to satisfaction75 * Safety guard in clock set mode * Fix mistaken doc edit * Address PR comments * bring the default back to pass travis CI * Address further PR comments
* Add Satisfaction75 to QMK, Enable EEPROM on stm32f072 (#5094)Andrew Kannan2019-02-1321-0/+4373
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add stm32f072 base ck4x4 to handwired * add prints * Save these tries * Save changes again * Working hadron oled * OLEd working but ws2812b still iffy: * save another try * Encoder feature + OLED * RTC code * Implement clock setting mode * Whitespace * Encoder hooked up to working LED PWM code * Add missing files * eeprom changes * Save changes * Move i2c master * Move satisfaction75 under cannonkeys * Set proper default folder * Revert some core changes * Undo paved iris changes * Reorganize code for maintainability and prep for new features * Add starting code for clock OLED mode * Clock set mode finished * Add custom encoder modes * Actually add VIA keymap * Gate to only 072 * fix gate for only 072 * Update header guards and includes * Update i2c selection strategy * Update board.c to handle software reset to DFU
* Moving cannonkeys boards to one place, eeprom fix (#4999)Andrew Kannan2019-01-2953-0/+6076
* Move boards to cannonkeys and share resources * Share common files between cannonkey boards * Fix ortho60 keymap * update LED numbers * Add RGB keys to Ortho60 and Ortho48 * Add Backlight control to default layout Ortho60 and 48 * Remove unnecessary ws2812.c SRC from rules.mk