summaryrefslogtreecommitdiff
path: root/keyboards/cannonkeys
AgeCommit message (Collapse)Author
2022-07-02Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-07-02Add Gentoo Hotswap PCB to QMK (#17528)Andrew Kannan
2022-07-02Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-07-02Add Gentoo Solderable PCB to QMK (#17527)Andrew Kannan
2022-06-19Make default layer size 16-bit (#15286)Drashna Jaelre
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
2022-06-07[Keyboard] Add BrutalV2 65 Keyboard (#17252)Andrew Kannan
* Add Brutal65 V2 to QMK * Update info.json and copyright notices * Update info.json] * Update readme and delete chconf * Update matrix and keymaps to match info json * Update keyboards/cannonkeys/brutalv2_65/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/cannonkeys/brutalv2_65/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/cannonkeys/brutalv2_65/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2022-06-07[Keyboard] Add Cloudline PCB support (#17253)Andrew Kannan
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2022-05-15RESET -> QK_BOOT default keymaps (#17037)Joel Challis
2022-05-13Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-05-12[Keyboard] Add caps and num indicators to Balance keyboard (#17075)Andrew Kannan
2022-04-22Provide better config defaults for bluepill boards (#16909)Joel Challis
2022-03-15Remove `NO_ACTION_MACRO` and `NO_ACTION_FUNCTION` from keyboard config.h ↵Ryan
(#16655)
2022-02-02Fix a couple of mismatched info.json layout names (#16164)Ryan
* Fix a couple of mismatched info.json layout names * Fix layouts * Clean up layouts
2022-01-13[Keyboard] HoodrowG PCB (#15474)Andrew Kannan
Co-authored-by: Julian <julianzabala1@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2022-01-05cannonkeys/adelie: Fix QMK Configurator Implementation (#15754)James Young
* info.json: apply friendly formatting * info.json: correct key sequence
2021-12-14[Keyboard] Adelie Firmware (#13265)Andrew Kannan
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-12-14Remove unnecessary backslash-escapes in default keymaps (#15472)Ryan
* Remove unnecessary backslash-escapes in default keymaps * Remove unnecessary backslash-escapes in via keymaps * Remove unnecessary backslash-escapes in default-ish keymaps
2021-12-12Fix up build options comments (#15463)Ryan
2021-12-09Tidy up NKRO_ENABLE rules (#15382)Ryan
2021-12-02Remove pointless `CUSTOM_MATRIX = no` (#15383)Ryan
2021-12-01Tidy up `SLEEP_LED_ENABLE` rules (#15362)Ryan
2021-11-19Move tmk_core/common/<plat> (#13918)Joel Challis
2021-11-05Remove `BOOTMAGIC_ENABLE = lite` option (#15002)James Young
* remove BOOTMAGIC_ENABLE=lite setting * change keyboard BOOTMAGIC_ENABLE rules Edits keyboard-level instances of `BOOTMAGIC_ENABLE = lite` to `BOOTMAGIC_ENABLE = yes`. * change keyboard BOOTMAGIC_ENABLE inline comments Edits keyboard-level BOOTMAGIC_ENABLE inline comments to "Enable Bootmagic Lite". * change keymap BOOTMAGIC_ENABLE rules Edits keymap-level instances of `BOOTMAGIC_ENABLE = lite` to `BOOTMAGIC_ENABLE = yes`. * change keymap BOOTMAGIC_ENABLE inline comments Edits/adds keymap-level BOOTMAGIC_ENABLE inline comments to read "Enable Bootmagic Lite". * change layout/user BOOTMAGIC_ENABLE rules/comments Edits instances of `BOOTMAGIC_ENABLE = lite` to `BOOTMAGIC_ENABLE = yes`. Edits/adds keymap-level BOOTMAGIC_ENABLE inline comments to read "Enable Bootmagic Lite". * update non-rules.mk BOOTMAGIC_ENABLE references in keyboards/ * remove docs references to Full Bootmagic * convert data-driven Bootmagic Lite instances * remove Bootmagic Lite bodge from data-driven generation * Merge remote-tracking branch 'upstream/develop' into rm/bootmagic-full_q4a * update docs/ja/config_options.md per mtei * update docs/faq_misc.md per mtei Remove remaining Full Bootmagic reference.
2021-11-02[Core] Change OLED task function to be boolean (#14864)Drashna Jaelre
* [Core] Add kb level callbacks to OLED driver * Update keyboards and keymaps * Update docs * Update userspace configs * Add fix for my keymap ... * update lefty
2021-10-10Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-11cannonkeys/satisfaction75: Add empty layers to the via keymap (#14782)Sergey Vlasov
2021-10-10Fix OLED timeout on satisfaction75 after migration from QWIIC (#14780)Sergey Vlasov
The custom OLED_OFF mode implemented on satisfaction75 is incompatible with the OLED_TIMEOUT feature (the OLED_TIMEOUT code assumes that any key or encoder action should turn the OLED display on, and does not provide any way to disable that behavior). To keep the OLED_OFF mode functioning as before while still having a working OLED idle timeout, a custom implementation of the OLED idle timeout code is added.
2021-10-09Migrate satisfaction75 away from QWIIC_DRIVERS (#14747)Joel Challis
* stash * refactor old draw * refactor old draw - tidy * refactor old draw - tidy * refactor old draw - reorder for diffs * refactor old draw - reorder for diffs
2021-09-21Merge remote-tracking branch 'upstream/master' into developfauxpark
2021-09-21Remove audio pin references in rules.mk (#14532)Ryan
2021-09-12Align ChibiOS I2C defs with other drivers (#14399)Joel Challis
* Align ChibiOS I2C defs with other drivers * Update keyboards/xelus/valor_frl_tkl/config.h Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-12Remove BLUETOOTH_ENABLE from keyboard-level rules.mk (#14379)Ryan
2021-09-12Remove width, height and key_count from info.json (#14274)Ryan
2021-09-10Remove bootloader listings from rules.mk (#14330)Ryan
2021-08-16Remove MIDI Configuration boilerplate (#11151)James Young
* remove keyboard-level instances of `MIDI_ENABLE = no` Command: ``` find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e '/^[ #]*MIDI_ENABLE[ \t]*=[ \t]*no/d' {} + ``` Co-Authored-By: Nick Brassel <nick@tzarc.org> * fix case-sensitivity issues on MIDI_ENABLE Change instances of `MIDI_ENABLE = YES` to `MIDI_ENABLE = yes`. Command: ``` find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e 's;MIDI_ENABLE[ \t]*=[ \t]*[Yy][Ee][Ss];MIDI_ENABLE = yes;g' {} + ``` * replace `# MIDI controls` with `# MIDI support` Replace `# MIDI controls` with `# MIDI support` in keyboard-level `rules.mk` files. Command: ``` find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e 's;#[ \t]*MIDI[ \t]*\(controls\|support\).*;# MIDI support;g' {} + ``` * align inline comments Aligns the inline comments to the length used by the QMK AVR rules.mk template. Command: ``` find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e 's;MIDI_ENABLE *= *yes.*;MIDI_ENABLE = yes # MIDI support;g' {} + ``` * remove commented instances of `MIDI_ENABLE` from keyboard `rules.mk` files Commands: ``` find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e 's;#\([ \t]*MIDI_ENABLE\) = yes; \1 = no ;' {} + find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e 's;^\([ \t]*\)\(MIDI_ENABLE = no\);\2\1;' {} + find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e '/^[ #]\+MIDI_ENABLE *= *no/d' {} + ``` * remove MIDI configuration boilerplate from keyboard config.h files Co-authored-by: Nick Brassel <nick@tzarc.org>
2021-08-06Remove Full Bootmagic (#13846)James Young
* disambiguate Bootmagic rules in keymaps The files edited by this commit were added at a point in time where `BOOTMAGIC_ENABLE = yes` enabled full Bootmagic. This commit edits the files to specify that full Bootmagic is intended. * remove BOOTMAGIC_ENABLE=full setting * unify commented BOOTMAGIC_ENABLE rules in keyboards Explicitly sets `BOOTMAGIC_ENABLE = no` in keyboards where the rule was commented out. Command: ``` find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e 's;#[ \t]*\(BOOTMAGIC_ENABLE\)[ \t=]\+\([a-zA-Z]\+\).*;\1 = no # Virtual DIP switch configuration;g' {} + ``` * remove commented Bootmagic rules from keymap/user level Command: ``` find keyboards/ layouts/ users/ -type f -name 'rules.mk' -exec sed -i -e '/#.*\(BOOTMAGIC_ENABLE\)[ \t=]\+\([a-z]\+\).*/d' {} + ``` * update keyboard BOOTMAGIC_ENABLE rule formatting Sets the formatting of BOOTMAGIC_ENABLE rules to `BOOTMAGIC_ENABLE = [value]`, without the inline comments (which will be replaced later). Command: ``` find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE\)[ \t=]\+\([a-z]\+\).*;\1 = \2;g' '{}' + ``` * update keyboards' BOOTMAGIC_ENABLE settings Updates keyboard `rules.mk` files to use `BOOTMAGIC_ENABLE = lite` where `BOOTMAGIC_ENABLE = full` was being used. Command: ``` find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE = \)full;\1lite;g' '{}' + ``` * update keymap/user BOOTMAGIC_ENABLE settings Updates keymap/user `rules.mk` files to use `BOOTMAGIC_ENABLE = lite` where `BOOTMAGIC_ENABLE = full` was being used. Commands: ``` find keyboards/ -type f -name 'rules.mk' -and -path '*/keymaps/*' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE[ \t=]\+\)full;\1lite;g' '{}' + find layouts/community/ users/ -type f -name 'rules.mk' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE[ \t=]\+\)full;\1lite;g' '{}' + ``` * remove and replace inline comments in keyboards and keymap/user files Removes and replaces the inline comments, which have been updated to read `Enable Bootmagic Lite`. Commands: ``` find keyboards/ -type f -name 'rules.mk' -and -path '*/keymaps/*' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE\)[ \t=]\+\([a-z]\+\).*;\1 = \2;g' '{}' + find layouts/community/ users/ -type f -name 'rules.mk' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE\)[ \t=]\+\([a-z]\+\).*;\1 = \2;g' '{}' + find keyboards/ layouts/community/ users/ -type f -name 'rules.mk' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE = lite\);\1 # Enable Bootmagic Lite;g' '{}' + find keyboards/ layouts/community/ users/ -type f -name 'rules.mk' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE = yes\);\1 # Enable Bootmagic Lite;g' '{}' + find keyboards/ layouts/community/ users/ -type f -name 'rules.mk' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE = no\);\1 # Enable Bootmagic Lite;g' '{}' + ``` * rename improperly named makefiles Some files intended to be used as makefiles had improper names causing them to not be used as intended when building. This commit corrects the filenames of the affected files. * update renamed file with new rule formatting * update QMK's template files Updates QMK's `rules.mk` templates to use the new inline comment. * update QMK Docs - remove documentation of full Bootmagic - update links to Bootmagic Lite doc - add doc for Magic Keycodes * rules.mk patch for coarse/ixora and coarse/vinta
2021-07-29Merge remote-tracking branch 'upstream/master' into developJames Young
2021-07-29Cannonkeys Balance: Configurator fixes (#13778)James Young
2021-07-27Remove some legacy files (#13715)Joel Challis
2021-07-27Merge remote-tracking branch 'upstream/master' into developNick Brassel
2021-07-25Revert "Fixed the ortho60 and ortho48 matrix layout after testing (#12106)" ↵Cyril
(#13456) This reverts commit e25f05224f1c06aeed13b2e99e8e755af65ac689.
2021-07-21Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-07-21Fix vicious40 rules (#13623)Andrew Kannan
2021-07-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-07-20[Keyboard] Add Vicious40 to QMK (#12981)Andrew Kannan
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-07-19[Keyboard] Aella Keyboard PCB (#13372)Andrew Kannan
Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-07-19[Keyboard] Add CannonKeys Balance PCB to QMK (#13489)Andrew Kannan
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-19[Bug] Develop - Change uint32_t to layer_state_t (#13596)Xelus22
* fix sat75 * update uint32_t to layer_state
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-12 11:15:58 +0000