summaryrefslogtreecommitdiffstats
path: root/keyboards/contra
Commit message (Collapse)AuthorAgeFilesLines
* Merge upstream master to 2022 Q4 breaking changelokher2022-12-0712-1536/+0
|
* Merge upstream masterlokher2022-12-0612-0/+1536
|\
| * Update use of legacy keycodes (#19120)Joel Challis2022-11-222-4/+4
| |
| * Normalise MIDI keycodes (#18972)Ryan2022-11-071-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * `MI_ON`, `MI_OFF`, `MI_TOG` -> `MI_TOGG` * `MI_CH*`, `MI_CHU` -> `MI_CHNU`, `MI_CHD` -> `MI_CHND` * `MI_VEL_*` -> `MI_VL*`, `MI_VELU`, `MI_VELD` * `MI_TRNS_*` -> `MI_TR*`, `MI_TRNSU` -> `MI_TRSU`, `MI_TRNSD` -> `MI_TRSD` * `MI_OCT_*` -> `MI_OC*`, `MI_OCTU`, `MI_OCTD` * Misc controls * Note keycodes * Add legacy keycodes * Regenerate keycodes * Typo
| * Normalise Unicode keycodes (#18898)Ryan2022-10-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * `UC_MOD`/`UC_RMOD` -> `UC_NEXT`/`UC_PREV` * `UNICODE_MODE_*` -> `QK_UNICODE_MODE_*` * `UC_MAC` -> `UNICODE_MODE_MACOS` * `UC_LNX` -> `UNICODE_MODE_LINUX` * `UC_WIN` -> `UNICODE_MODE_WINDOWS` * `UC_BSD` -> `UNICODE_MODE_BSD` * `UC_WINC` -> `UNICODE_MODE_WINCOMPOSE` * `UC_EMACS` -> `UNICODE_MODE_EMACS` * `UC__COUNT` -> `UNICODE_MODE_COUNT` * `UC_M_MA` -> `UC_MAC` * `UC_M_LN` -> `UC_LINX` * `UC_M_WI` -> `UC_WIN` * `UC_M_BS` -> `UC_BSD` * `UC_M_WC` -> `UC_WINC` * `UC_M_EM` -> `UC_EMAC` * Docs * Update quantum/unicode/unicode.h
| * Normalise Auto Shift keycodes (#18892)Ryan2022-10-281-1/+1
| | | | | | | | | | | | | | | | * Normalise Auto Shift keycodes * Add keycode table to main list * Add old keycodes to legacy header
| * Deprecate `KC_LOCK` for `QK_LOCK` (#18796)Ryan2022-10-211-1/+1
| |
| * Remove legacy Grave Escape keycodes (#18787)Ryan2022-10-203-3/+3
| |
| * Remove legacy Debug keycode (#18769)Ryan2022-10-193-3/+3
| | | | | | | | | | | | | | | | | | | | | | * `DEBUG` -> `DB_TOGG`, default-ish keymaps * `DEBUG` -> `DB_TOGG`, user keymaps * `DEBUG` -> `DB_TOGG`, community layouts * `DEBUG` -> `DB_TOGG`, userspace * `DEBUG` -> `DB_TOGG`, docs & core
| * Remove legacy keycodes, part 6 (#18740)Ryan2022-10-161-8/+8
| | | | | | | | | | | | | | | | | | * `KC_RSHIFT` -> `KC_RSFT` * `KC_RCTRL` -> `KC_RCTL` * `KC_LSHIFT` -> `KC_LSFT` * `KC_LCTRL` -> `KC_LCTL`
| * Remove legacy keycodes, part 5 (#18710)Ryan2022-10-151-1/+1
| | | | | | | | | | * `KC_SLCK` -> `KC_SCRL` * `KC_NLCK` -> `KC_NUM`
| * Remove RGBLIGHT_ANIMTION and clean up effect defines for 0-F (#18725)Drashna Jaelre2022-10-151-1/+10
| |
| * Remove legacy keycodes, part 2 (#18660)Ryan2022-10-104-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * `KC_SYSREQ` -> `KC_SYRQ` And one `KC_ALT_ERASE` -> `KC_ERAS` * `KC_NONUS_BSLASH` -> `KC_NUBS` * `KC_NUMLOCK` -> `KC_NUM` * `KC_CLCK` -> `KC_CAPS` * `KC_SCROLLLOCK` -> `KC_SCRL` * `KC_LBRACKET` -> `KC_LBRC` * `KC_RBRACKET` -> `KC_RBRC` * `KC_CAPSLOCK` -> `KC_CAPS`
| * Merge remote-tracking branch 'origin/master' into developQMK Bot2022-10-071-6/+0
| |\
| | * Remove all `BACKLIGHT_LEVELS 0` (#18630)jack2022-10-071-6/+0
| | |
| * | Remove remaining use of terminal keys and related comment labels (#18402)Johannes Löthberg2022-09-291-1/+1
| |/
* / Remove non-Keychron keyboardslokher2022-09-1355-3560/+0
|/
* RESET -> QK_BOOT user keymaps (#17940)Joel Challis2022-08-213-4/+4
|
* Remove `UNUSED_PINS` (#17931)Nick Brassel2022-08-061-1/+0
|
* Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-305-8/+689
|\
| * [Keymap] Add enigma keymap for contra keyboard (#17829)Chris Swenson2022-07-295-8/+689
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-252-7/+6
|\|
| * Move keyboard USB IDs and strings to data driven: C (#17789)Ryan2022-07-262-7/+6
| |
* | Removes terminal from QMK. (#17258)Nick Brassel2022-05-301-1/+1
|/
* RESET -> QK_BOOT default keymaps (#17037)Joel Challis2022-05-152-2/+2
|
* [Keymap] Contra - QWERTY US basic layout; MechWild Marcuio - EN update ↵Stephon Parker2022-05-124-1/+240
| | | | | | | | layout (#16787) Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Stephon Parker <stephonparker@Stephons-MacBook-Pro.local>
* Remove manual enable of LTO within user keymaps (#15378)Joel Challis2022-02-101-1/+1
|
* Tidy up NKRO_ENABLE rules (#15382)Ryan2021-12-091-1/+1
|
* Tidy up `SLEEP_LED_ENABLE` rules (#15362)Ryan2021-12-011-1/+0
|
* Remove `BOOTMAGIC_ENABLE = lite` option (#15002)James Young2021-11-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-141-2/+0
|\
| * contra, fractal: Remove wrongly copypasted pin E6 manipulation code (#14818)Sergey Vlasov2021-10-141-2/+0
| | | | | | | | | | | | | | | | | | | | Apparently the default keymaps for `contra` and `fractal` were derived from some `planck` keymap which contained code to control the status LED in the implementation of the `BACKLIT` custom keycode. Unfortunately, the code to control the LED manipulated the `E6` pin directly, and it was copied without changes, but the `contra` and `fractal` boards use the `E6` pin in the matrix, therefore pressing the key mapped to `BACKLIT` resulted in phantom keypresses for all keys in the corresponding column.
* | Merge remote-tracking branch 'upstream/master' into developJames Young2021-09-291-1/+0
|\|
| * Remove redundant `UNICODE_ENABLE = no` in keyboard-level rules.mk (#14633)Ryan2021-09-301-1/+0
| |
* | 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
| |
* | Merge remote-tracking branch 'upstream/master' into developfauxpark2021-09-201-1/+1
|\|
| * Remove backlight pin references in rules.mk (#14513)Ryan2021-09-201-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-121-1/+0
|\|
| * Remove BLUETOOTH_ENABLE from keyboard-level rules.mk (#14379)Ryan2021-09-121-1/+0
| |
* | Merge remote-tracking branch 'upstream/master' into developfauxpark2021-09-121-4/+0
|\|
| * Remove width, height and key_count from info.json (#14274)Ryan2021-09-121-4/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-101-7/+0
|\|
| * Remove bootloader listings from rules.mk (#14330)Ryan2021-09-101-7/+0
| |
* | Change keyboard level include guards to `pragma once` (#14248)Ryan2021-09-012-24/+18
|/ | | | | | | | | * Change keyboard level include guards to `pragma once` And clean up a lot of layout macros * Oops * Remove dangling endif
* 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-063-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* `keymap_extras`: Remove deprecated defines (#12949)Ryan2021-07-062-7/+7
|
* Remove KEYMAP and LAYOUT_kc (#12160)Zach White2021-05-111-13/+0
| | | | | * alias KEYMAP to LAYOUT * remove KEYMAP and LAYOUT_kc
* Change `BOOTMAGIC_ENABLE=yes` to use Bootmagic Lite (#12172)James Young2021-04-121-1/+1
|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 08:16:48 +0000