summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-162-2/+3
|\
| * [Keymap] Userspace updates (#14832)stanrc852021-10-152-2/+3
| |
* | Further tidy up of STM32 eeprom emulation (#14591)Joel Challis2021-10-163-38/+10
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-161-1/+1
|\|
| * Update documentation because GPIO functions are no longer in quantum.h (#14826)Aaron Paterson2021-10-161-1/+1
| | | | | | | | | | | | | | | | | | * GPIO functions are no longer in quantum.h * Update docs/internals_gpio_control.md Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Enable CLI flashing via mdloader (#14729)Joel Challis2021-10-153-6/+21
| | | | | | | | | | | | | | * Enable CLI flashing via mdloader * remove flag * Update qmk flash help
* | Merge remote-tracking branch 'origin/master' into developDrashna Jael're2021-10-1421-141/+934
|\|
| * [Keyboard] Add MK61-RGB-ANSI keyboard (#14795)Felix Jen2021-10-149-0/+381
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
| * [Docs] Clean up reference_info_json.md (#14806)Ryan2021-10-151-43/+51
| |
| * [Keymap] Add keebio iris layout beakl 15 (#14762)Tom2021-10-144-0/+231
| |
| * remove Bracket Pair Colorizer recommendation (#14816)Alex Meyer2021-10-151-2/+1
| | | | | | | | As of v1.60, vscode has a much faster built-in method of colorizing bracket pairs, making the extension unnecessary. https://code.visualstudio.com/blogs/2021/09/29/bracket-pair-colorization
| * [Keyboard] PLX Refactor (#14809)James Young2021-10-146-75/+315
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-149-0/+851
|\|
| * [Keyboard] Add ginkgo65 (#14802)rhmokey2021-10-149-0/+851
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-1415-49/+61
|\|
| * Documentation: Updated KBDFans readmes (#14725)MechMerlin2021-10-1415-49/+61
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-141-1/+13
|\|
| * [Keymap] Display default layer name (#14819)Reibl János Dániel2021-10-141-1/+13
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-141-3/+3
|\|
| * Add KC_BSLS key to Horizon keyboard default layout (#14815)Steven Karrmann2021-10-141-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Define Horizon keyboard * Set indentation according to QMK coding convention * Update horizon keyboard readme to satisfy current QMK template * Use row-column order in horizon readme * Update keyboards/horizon/rules.mk Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/horizon/rules.mk Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/horizon/rules.mk Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/horizon/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/horizon/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/horizon/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/horizon/info.json Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/horizon/info.json Co-authored-by: Ryan <fauxpark@gmail.com> * Add KC_BSLS to Horizon default keymap Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-142-4/+0
|\|
| * contra, fractal: Remove wrongly copypasted pin E6 manipulation code (#14818)Sergey Vlasov2021-10-142-4/+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 'origin/master' into developQMK Bot2021-10-132-8/+8
|\|
| * maxr1998/pulse4k: use layout macros in keymaps (#14808)James Young2021-10-132-8/+8
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-132-76/+76
|\|
| * Kopibeng MNK88 Patch (#14807)James Young2021-10-122-76/+76
| | | | | | | | | | | | | | | | | | | | | | | | * refactor default keymap - correct keycode sequence (`KC_RGHT` was in the wrong place) - change tabs to spaces (four-space indent) - update grid alignment * refactor via keymap - change tabs to spaces (four-space indent) - update grid alignment
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-136-126/+236
|\|
| * Lucid Alexa layout macro rework (#14799)James Young2021-10-126-126/+236
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * refactor keymaps for readability - use QMK-native keycode aliases - physically align keycodes * rework layout macro A discrepancy between the default and via keymaps prompted a deep dive into the keyboard's switch matrix, which led to the discovery that (1) the layout macro's arguments were not arranged physically, and (2) the keymaps didn't assign the keycodes to the same switches (the default keymap's keycodes were in the wrong sequence). Additionally, the layout macro was built to support a split Backspace, but named as if it were for a 2u Backspace, which broke the enabled support for Community Layout keymaps. This commit: - arranges the layout macro arguments according to physical order - corrects the keymaps - renames the layout macro to specify the split Backspace - disables Community Layout support - updates the `info.json` data * add LAYOUT_65_ansi_blocker * enable Community Layout support * update `info.json` metadata - use full product listing URL - use GitHub username for maintainer field * update readme - fix vendor link in lead paragraph - update metadata list - use GitHub username of keyboard maintainer - correct Supported Hardware - add Hardware Availability link - add flashing and bootloader instructions
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-132-106/+581
|\|
| * Kopibeng MNK88 Layout Extension (#14796)James Young2021-10-122-106/+581
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * friendly-format info.json * mnk88.h: use QMK 3-character notation * mnk88.h: add matrix diagram * add LAYOUT_tkl_ansi_f13 * add LAYOUT_tkl_ansi_tsangan_f13 * add LAYOUT_tkl_iso_f13 * add LAYOUT_tkl_iso_tsangan_f13
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-1221-0/+909
|\|
| * [Keyboard] Add MachKeyboards Mach3 (#14791)etiennelepagel2021-10-1111-0/+269
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
| * [Keyboard] Add "Center x Enter" (#14790)takashicompany2021-10-1110-0/+640
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-125-234/+225
|\|
| * KabeDon98E Refactor (#14778)James Young2021-10-115-234/+225
| | | | | | Co-authored-by: Joel Challis <git@zvecr.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-123-10/+39
|\|
| * [Keymap] Add workman layout (#14792)Reibl János Dániel2021-10-113-10/+39
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-1210-5/+205
|\|
| * [Keyboard] Add ISOlation and some kb-elmo keyboard updates (#14656)kb-elmo2021-10-1110-5/+205
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-124-236/+437
|\|
| * Nordic60 layout rework/extension (#14794)James Young2021-10-114-236/+437
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-1216-0/+693
|\|
| * [Keyboard] Add Split65 to keyboards/handwired (#13264)Joris Wachsmuth2021-10-1116-0/+693
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Joris Wachsmuth <jwachsmuth@techfak.uni-bielefeld.de>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-122-0/+47
|\|
| * [Keymap] Added Gherkin VIA keymap (#14779)thompson-ele2021-10-112-0/+47
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-1210-0/+309
|\|
| * [Keyboard] z34 split keyboard by zigotica (#14582)Sergi Meseguer2021-10-1110-0/+309
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-1212-43/+741
|\|
| * [Keymap] Adding my personal Planck layout (#14564)Jimmy Sjölund2021-10-114-0/+419
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
| * [Keymap] Jonavin new obe keymap (#14657)jonavin2021-10-118-43/+322
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Jonavin <=>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-12 15:18:27 +0000