summaryrefslogtreecommitdiffstats
path: root/keyboards/cannonkeys
Commit message (Collapse)AuthorAgeFilesLines
* Gentoo & Gentoo Hotswap: correct Configurator key sequence errors (#17668)James Young2022-07-132-3/+149
| | | | | | | | | * Gentoo info.json: apply friendly formatting * Gentoo info.json: correct key sequence error * Gentoo Hotswap info.json: apply friendly formatting * Gentoo Hotswap info.json: correct key sequence error
* Add Gentoo Hotswap PCB to QMK (#17528)Andrew Kannan2022-07-029-0/+279
|
* Add Gentoo Solderable PCB to QMK (#17527)Andrew Kannan2022-07-029-0/+282
|
* [Keyboard] Add BrutalV2 65 Keyboard (#17252)Andrew Kannan2022-06-079-0/+282
| | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* [Keyboard] Add Cloudline PCB support (#17253)Andrew Kannan2022-06-0711-0/+308
| | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* RESET -> QK_BOOT default keymaps (#17037)Joel Challis2022-05-1554-57/+57
|
* Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-131-1/+5
|\
| * [Keyboard] Add caps and num indicators to Balance keyboard (#17075)Andrew Kannan2022-05-121-1/+5
| |
* | Provide better config defaults for bluepill boards (#16909)Joel Challis2022-04-225-145/+0
|/
* Remove `NO_ACTION_MACRO` and `NO_ACTION_FUNCTION` from keyboard config.h ↵Ryan2022-03-1526-54/+0
| | | | (#16655)
* Fix a couple of mismatched info.json layout names (#16164)Ryan2022-02-021-2/+102
| | | | | | | * Fix a couple of mismatched info.json layout names * Fix layouts * Clean up layouts
* [Keyboard] HoodrowG PCB (#15474)Andrew Kannan2022-01-139-0/+278
| | | | | Co-authored-by: Julian <julianzabala1@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* cannonkeys/adelie: Fix QMK Configurator Implementation (#15754)James Young2022-01-051-1/+59
| | | | | * info.json: apply friendly formatting * info.json: correct key sequence
* [Keyboard] Adelie Firmware (#13265)Andrew Kannan2021-12-149-0/+412
| | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* Remove unnecessary backslash-escapes in default keymaps (#15472)Ryan2021-12-146-86/+86
| | | | | | | * Remove unnecessary backslash-escapes in default keymaps * Remove unnecessary backslash-escapes in via keymaps * Remove unnecessary backslash-escapes in default-ish keymaps
* Fix up build options comments (#15463)Ryan2021-12-1216-23/+29
|
* Tidy up NKRO_ENABLE rules (#15382)Ryan2021-12-0925-33/+25
|
* Remove pointless `CUSTOM_MATRIX = no` (#15383)Ryan2021-12-029-9/+0
|
* Tidy up `SLEEP_LED_ENABLE` rules (#15362)Ryan2021-12-0125-33/+5
|
* Move tmk_core/common/<plat> (#13918)Joel Challis2021-11-192-2/+2
|
* Remove `BOOTMAGIC_ENABLE = lite` option (#15002)James Young2021-11-0520-20/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
* [Core] Change OLED task function to be boolean (#14864)Drashna Jaelre2021-11-021-4/+6
| | | | | | | | | | | | | * [Core] Add kb level callbacks to OLED driver * Update keyboards and keymaps * Update docs * Update userspace configs * Add fix for my keymap ... * update lefty
* 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
| | | | | | | | | | | | | | | | 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.
* | Migrate satisfaction75 away from QWIIC_DRIVERS (#14747)Joel Challis2021-10-096-299/+186
| | | | | | | | | | | | | | | | | | | | | | | | | | * stash * refactor old draw * refactor old draw - tidy * refactor old draw - tidy * refactor old draw - reorder for diffs * refactor old draw - reorder for diffs
* | 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
|/ | | | | | | | | * 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>
* 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 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>
* Remove Full Bootmagic (#13846)James Young2021-08-0625-25/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* 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
| | | | | | | | | | (#13456) This reverts commit e25f05224f1c06aeed13b2e99e8e755af65ac689.
* | 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
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-2010-0/+284
|\|
| * [Keyboard] Aella Keyboard PCB (#13372)Andrew Kannan2021-07-1910-0/+284
| | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | 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
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | [Bug] Develop - Change uint32_t to layer_state_t (#13596)Xelus222021-07-191-1/+1
|/ | | | | * fix sat75 * update uint32_t to layer_state
* Set `BOOTLOADER = stm32-dfu` for all applicable STM32 boards (#12956)Ryan2021-06-0817-42/+85
| | | | | | | | | | | | | | | | | * Set bootloader to stm32-dfu for STM32F303 * Set bootloader to stm32-dfu for STM32F0x2 * Set bootloader to stm32-dfu for STM32F4x1 * Set bootloader to stm32duino for sowbug * Delete redundant bootloader_defs headers * Add some missing MCU name comments * Move APM32 dfu-suffix overrides underneath bootloader * Remove redundant STM32_BOOTLOADER_ADDRESS defines/rules
* Fix up WS2812 SPI driver on F072. (#13022)Nick Brassel2021-06-0311-0/+22
|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 16:44:27 +0000