summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-2210-9/+1120
|\|
| * [Keyboard] Version 2 of Draytronics Elise Keyboard + ISO Keymap Change (#14253)Blake2021-09-2110-9/+1120
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-229-0/+505
|\|
| * [Keyboard] add kk980 keyboard (#14436)Sets3n2021-09-219-0/+505
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-225-137/+79
|\|
| * [Keyboard] Fix jkb65 compile issues (#14554)Drashna Jaelre2021-09-215-137/+79
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-221-1/+1
|\|
| * [Keyboard] Fix font file for Ein 60 Keyboard (#14553)Drashna Jaelre2021-09-211-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-229-0/+502
|\|
| * [Keyboard] Add Dango40 (#14437)Brandon Claveria2021-09-219-0/+502
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Swiftrax <swiftrax@gmail.com> Co-authored-by: Swiftrax <swiftrax@github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-2212-0/+368
|\|
| * [Keyboard] Add Free Willy Keyboard (#14394)Caleb Lightfoot2021-09-2112-0/+368
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-2214-0/+551
|\|
| * [Keyboard] 0-Sixty: Splits kb config into base and underglow (#14384)Vinam Arora2021-09-214-0/+84
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
| * [Keyboard] Add support for XT8x (#14440)kopibeng2021-09-2110-0/+467
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-221-2/+2
|\|
| * [Keyboard] fixed one of the unicode drawings of the layout in dz60.h (#14482)milostatsea2021-09-211-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-2211-2/+379
|\|
| * [Keyboard] Add JadooKB JKB65 RGB (#14525)WiZ.GG2021-09-2110-0/+377
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
| * Changed VENDOR_ID and PRODUCT_ID of Boston keyboard (#14528)Pylon2021-09-211-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-221-0/+97
|\|
| * [Keyboard] Add commented out OLED/encoder code in default Kyria (#14539)precondition2021-09-211-0/+97
| | | | | | | | Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-2216-0/+1182
|\|
| * [Keyboard] add ein_60 (#14398)James Smith2021-09-2116-0/+1182
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-221-28/+28
|\|
| * [Keyboard] smallkeyboard fix of rgb matrix config (#14548)Drashna Jaelre2021-09-211-28/+28
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-2215-22/+298
|\|
| * [Keyboard] Addition of VIA keymap and a few fixes for naked48 (#14177)Salicylic-acid32021-09-2115-22/+298
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | [Keyboard] Set USB max power consumption of kint* controllers to 100mA (#14546)Michael Stapelberg2021-09-213-0/+12
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-213-6/+6
|\|
| * [Docs] update suspend_*_user examples (#14542)Dasky2021-09-213-6/+6
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-219-0/+297
|\|
| * [Keyboard] smallkeyboard support (#12817)zhouqiong198401192021-09-219-0/+297
| | | | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Add ability to use numpad digits for unicode mode UC_WIN (#14496)Marcus van Houdt2021-09-211-10/+37
| | | | | | Co-authored-by: Konstantin Đorđević <vomindoraan@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-2111-0/+621
|\|
| * [Keyboard] Macro-1 keyboard by Laneware Peripherals (#14472)Laneware2021-09-2111-0/+621
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-213-3/+64
|\|
| * [Keyboard] add via keymap support for bt66tech/bt66tech60 (#13818)bt66tech2021-09-213-3/+64
| | | | | | Co-authored-by: root <crkndevops@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-2116-0/+841
|\|
| * [Keyboard] add wanten keyboard to QMK (#14410)qpockets2021-09-2116-0/+841
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-2110-0/+457
|\|
| * [Keyboard] Add support for MNK88 (#14435)kopibeng2021-09-2110-0/+457
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-2128-0/+1745
|\|
| * [Keyboard] add bandominedoni keyboard (#13116)3araht2021-09-2116-0/+1249
| |
| * [Keyboard] add synapse pcb (#14428)qpockets2021-09-2112-0/+496
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-2140-0/+1505
|\|
| * [Keyboard] Add 5 boards by the OverNumpad Controller (#14382)Purdea Andrei2021-09-2140-0/+1505
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add initial implementation of 5 keyboards supported by the OverNumpad Controller. * Apply suggestions from code review Co-authored-by: Drashna Jaelre <drashna@live.com> * Apply changes similar to other code review suggestions. * Apply suggestions from code review Co-authored-by: Drashna Jaelre <drashna@live.com> * Apply changes similar to other code review suggestions. * overnumpad controller info.jsons: update maintainer and url. * classic_ultracl_pre_2013: added support for the default 'fullsize_ansi' layout * classic_ultracl_pre_2013: moved the order of the iso enter key in the layout macro to be considered to be on the bottom row, like in the default fullsize_iso layout. Rename the iso layout to fullsize_iso, and enable it in rules.mk * Removed QMKBEST and QMKURL * Apply suggestions from code review Co-authored-by: Ryan <fauxpark@gmail.com> * Deleting empty files Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-2115-0/+775
|\|
| * [Keyboard] gBoards GergoPlex (#13027)Phil Pirozhkov2021-09-2115-0/+775
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Moved gergoplex to seperate PR * vendor + cformat * Update keyboards/gboards/k/gergoplex/matrix.c Co-Authored-By: Drashna Jaelre <drashna@live.com> * lifiting keyboards up * Update readme.md * Update keyboards/gboards/gergoplex/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * remove English dicts * cformatted * Prettify keymap * Remove via keymaps Via doesn't support chords/combos, and this makes the keymap on such a small keyboard quite uncomfortable and incomplete. * Address QMK pull code review notes * Cleanup (tabs, excessive comments) * Fix keymap typos * Use enum to define layers * Multiple changes - got rid of LAYOUT_kc in favour of LAYOUT_split_3x5_3 - fixed matrix custom C code to build with updated external dependencies (gcc) - fixed used combo docs keyboards/gboards/gergoplex/matrix.c:189:9: error: implicit declaration of function 'phex' [-Werror=implicit-function-declaration] phex(row); ^~~~ keyboards/gboards/gergoplex/matrix.c:191:9: error: implicit declaration of function 'pbin_reverse16'; did you mean 'print_bin_reverse16'? [-Werror=implicit-function-declaration] pbin_reverse16(matrix_get_row(row)); * Remove apparently redundant macros * Replace direct pin control with IO functions * config mouse enable and combo delay fix The default delay is 200: #define COMBO_TERM 200 how long for the Combo keys to be detected. Defaults to TAPPING_TERM if not defined. tmk_core/common/action_tapping.h|22| 13:# define TAPPING_TERM 200 * Remove redundant defines * Unambiguously refer to the Special layer * Fix formatting * gboards/gergoplex set IGNORE_MOD_TAP_INTERRUPT This solves my issue was with KC_CTL_A working correctly and it was set in @germ's repo https://github.com/germ/qmk_firmware/blob/39c86e080dc04b68ee08387dcb5144c88cb44855/keyboards/gboards/k/gergoplex/config.h#L49 https://beta.docs.qmk.fm/using-qmk/software-features/tap_hold#ignore-mod-tap-interrupt * Name change See commit 581368596ed * Wording change * Update keyboards/gboards/gergoplex/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Add copyright headers * Fix debounce type | avr-gcc: error: .build/obj_gboards_gergoplex_default/quantum/debounce/eager_pr.o: No such file or directory * Implement colemak-dhm keymap Co-authored-by: Germ <jeremythegeek@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Brian Tannous <Brian@BrianTannous.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-2133-34/+5
|\|