summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developZach White2021-08-201-35/+6
|\ | | | | | | | | Resolved Conflicts: lib/python/qmk/info.py
| * Restore layout count validation (#14068)Joel Challis2021-08-201-35/+6
| |
* | [Bug] Fix RGB/LED Matrix Suspend code (#14084)Drashna Jaelre2021-08-202-4/+6
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-2011-0/+938
|\|
| * [Keyboard] Add IBM Model M SSK configuration (#14050)tiltowait2021-08-2011-0/+938
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Align DIP_SWITCH_PINS_RIGHT implementation with encoders (#14079)Joel Challis2021-08-201-19/+8
| |
* | Fix issues with recent keymap.json changes (#14089)Joel Challis2021-08-202-10/+10
| | | | | | | | | | * Fix issues with recent keymap.json changes * Allow empty author string
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-201-2/+3
|\|
| * [Keyboard] Fix Feels65 Via keymap (#14086)Drashna Jaelre2021-08-191-2/+3
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-202-1/+1
|\|
| * [Keyboard] Fix space_space rev1 keyboard files (#14087)Drashna Jaelre2021-08-192-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-208-427/+5
|\|
| * Revert "[Keyboard] Dumbpad VIA support added (#13512)"Drashna Jaelre2021-08-198-427/+5
| |
* | Support using a timer for wait_us() on ChibiOS-based boards (#12211)Simon Arlott2021-08-204-79/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Support using a timer for wait_us() on ChibiOS-based boards (#12198) There are spare GPT timers that can be used to get a more accurate wait_ms() time. This is required for the matrix scan unselect delay (30µs) to be shorter than the system tick rate of 100µs. This is limited to the maximum GPT duration of 65535 so values above that will automatically use the previous implementation based on the system tick. Using a specific timer means it can't be shared by another thread at the same time so when wait_us() is called from anything other than the main thread it will use the system tick implementation too. * Update tmk_core/common/chibios/wait.c * Update tmk_core/common/chibios/wait.c Co-authored-by: Joel Challis <git@zvecr.com>
* | move volcano660 to ilumkb folder (#13550)moyi46812021-08-199-5/+5
| | | | | | | | | | | | | | | | | | * move volcano660 to ilumkb folder * Update rules.mk * Fix up readme Co-authored-by: zvecr <git@zvecr.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-199-0/+330
|\|
| * [Keyboard] Ava initial commit (#13845)SneakboxKB2021-08-199-0/+330
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: SneakboxKB <64090325+mujimanic@users.noreply.github.com>
* | [Core] Speed up pimoroni trackball driver (#13823)Dasky2021-08-192-90/+153
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-191-12/+12
|\|
| * [Keyboard] Minor fixes for mini_elixivy/info.json (#14022)minibois2021-08-191-12/+12
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'upstream/master' into developJames Young2021-08-19139-447/+6481
|\| | | | | | | | | | | Conflicts: keyboards/gmmk/pro/ansi/keymaps/jonavin/rules.mk keyboards/space_space/rules.mk
| * [Keyboard] Add Mammoth20x (#14014)GG2021-08-1911-0/+328
| |
| * [Keyboard] Add Elrgo S to keyboards/handwired (#13893)Yaroslav Smirnov2021-08-198-0/+303
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
| * [Keyboard] add 3w6 (#13746)weteor2021-08-1922-0/+1456
| |
| * [Keyboard] Add Voice65 (#13744)kb-elmo2021-08-1922-0/+2128
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
| * keebzdotnet F-Me Configurator fixes and codebase touch-up (#14077)James Young2021-08-195-5/+55
| | | | | | | | | | | | | | | | | | | | | | * rename LAYOUT to LAYOUT_all * add info.json * override DYNAMIC_KEYMAP_LAYER_COUNT for via keymap The via keymap only initialized two layers without overriding the default value of DYNAMIC_KEYMAP_LAYER_COUNT (4). This commit sets DYNAMIC_KEYMAP_LAYER_COUNT for the via keymap to 2.
| * kb-elmo Noah AVR Community Layout support and Configurator fix (#14078)James Young2021-08-194-59/+182
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * noah_avr.h: use QMK 3-character notation for matrix positions * Community Layout support, Stage 1 - rename LAYOUT_ansi to LAYOUT_65_ansi_blocker - rename LAYOUT_ansi_splitbs to LAYOUT_65_ansi_blocker_split_bs - enable Community Layout support * info.json: add line breaks between rows * info.json: correct LAYOUT_iso data - unsplit the Backspace - change ANSI Enter to ISO Enter - split the left Shift * Community Layout support, Stage 2 - rename LAYOUT_iso to LAYOUT_65_iso_blocker - update Community Layout support * Community Layout support, Stage 3 - add LAYOUT_65_iso_blocker_split_bs - update Community Layout support * noah_avr.h: add matrix diagram
| * [Keymap] Add jonavin user space / common functions (#13876)jonavin2021-08-1914-285/+500
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Jonavin <=>
| * [Keyboard] Dumbpad VIA support added (#13512)jfescobar182021-08-198-5/+427
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
| * [Keymap] Quark AJP10304 layout (#13290)Alan Pocklington2021-08-1914-6/+406
| |
| * [Keyboard] update space_space keyboard (#13305)qpockets2021-08-1931-87/+696
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Added right vs left specific pin assignments for dip switch (#13074)XScorpion22021-08-193-3/+28
| | | | | | | | | | | | | | * Added right vs left specific pin assignments for dip switch * Update feature_dip_switch.md * Ran formatting tools
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-195-428/+569
|\|
| * Linworks Whale75 Layout Macro refactor and Configurator fixes (#14059)James Young2021-08-195-428/+569
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * info.json: human-friendly formatting * info.json: remove "w":1 instances * info.json: correct positions of Left, Down and Right Arrow keys * info.json: add LAYOUT_all data * move Home key to end of home row According to photographs of the keyboard, the fourth key down on the right side is physically on the home row. This commit moves the key argument and keycodes to the home row. * whale75.h: use QMK 3-character notation for matrix * whale75.h: add matrix diagram * add keyboard-level encoder functionality * info.json: correct key sequence on ISO layouts
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-193-0/+310
|\|
| * [Keymap] Add personal layout for 60% ISO boards (#13232)BifbofII2021-08-193-0/+310
| |
* | [Keyboard] Refactor atom47 and add rev4 and rev5 (#13201)Evelien-Lillian Dekkers2021-08-1928-265/+1167
| | | | | | Co-authored-by: Nick Brassel <nick@tzarc.org>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-199-0/+382
|\|
| * [Keyboard] Add Ready100 Keyboard (#13158)Felix Jen2021-08-199-0/+382
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-192-0/+54
|\|
| * [Keyboard] Ymdk_np21 via port (#12693)Zereef2021-08-192-0/+54
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-192-4/+7
|\|
| * [Keymap] community/ortho_4x12/junonum update (#14062)Juno Nguyen2021-08-192-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update new community universal keymaps * Revert bottom row to default for better use of WIN_MODS and MAC_MODS * Revert to use public domain songs * Update Dpad layer in junonum to tailor for StarCraft group control * Remove junonum512 * Update junonum readme * Define custom songs in the keymap * Move DP_OFF location * Update DPAD modifiers * Update F-row placement in junonum dpad layer * Update CapsLock location and rectify KC_APP
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-192-2/+2
|\|
| * Fix AT90USB64/128 bootloaders (#14064)Ryan2021-08-192-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-1911-0/+278
|\|
| * Add MNK50 (#14031)yiancar2021-08-1911-0/+278
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add MNK50 * Update keyboards/mnk50/rules.mk Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/mnk50/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/mnk50/readme.md hihi thanks! Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/mnk50/keymaps/default/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: yiancar <yiancar@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-193-1/+111
|\|
| * [Keyboard] adds new keyboard version: dztech/dz60rgb_wkl/v2_1 (#14021)Tran Kim Tung2021-08-193-1/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * [Keyboard] adds new keyboard version: dztech/dz60rgb_wkl/v2_1 * Update keyboards/dztech/dz60rgb_wkl/readme.md Remove external flash manual link Co-authored-by: Ryan <fauxpark@gmail.com> * dz60rgb_wkl/v2_1: remove NO_USB_STARTUP_CHECK Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-197-5/+83
|\|
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-23 13:33:34 +0000