~ruther/qmk_firmware

b229b0fb — Joel Challis 4 years ago
Fix issues with recent keymap.json changes (#14089)

* Fix issues with recent keymap.json changes

* Allow empty author string
0741aae1 — QMK Bot 4 years ago
Merge remote-tracking branch 'origin/master' into develop
fd54992e — Drashna Jaelre 4 years ago
[Keyboard] Fix Feels65 Via keymap (#14086)

8dfd33e3 — QMK Bot 4 years ago
Merge remote-tracking branch 'origin/master' into develop
37b5ead1 — Drashna Jaelre 4 years ago
[Keyboard] Fix space_space rev1 keyboard files (#14087)

c6f24f66 — QMK Bot 4 years ago
Merge remote-tracking branch 'origin/master' into develop
cc0ae9cc — Drashna Jaelre 4 years ago
Revert "[Keyboard] Dumbpad VIA support added (#13512)"

0a1bf7f6 — Simon Arlott 4 years ago
Support using a timer for wait_us() on ChibiOS-based boards (#12211)

* 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>
462e7f07 — moyi4681 4 years ago
move volcano660 to ilumkb folder (#13550)

* move volcano660 to ilumkb folder

* Update rules.mk

* Fix up readme

Co-authored-by: zvecr <git@zvecr.com>
34137666 — QMK Bot 4 years ago
Merge remote-tracking branch 'origin/master' into develop
b724a0df — SneakboxKB 4 years ago
[Keyboard] Ava initial commit (#13845)

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>
7f1c90b7 — Dasky 4 years ago
[Core] Speed up pimoroni trackball driver (#13823)

e988f583 — QMK Bot 4 years ago
Merge remote-tracking branch 'origin/master' into develop
a12f3a3f — minibois 4 years ago
[Keyboard] Minor fixes for mini_elixivy/info.json (#14022)

Co-authored-by: Drashna Jaelre <drashna@live.com>
4279b14a — James Young 4 years ago
Merge remote-tracking branch 'upstream/master' into develop

Conflicts:
	keyboards/gmmk/pro/ansi/keymaps/jonavin/rules.mk
	keyboards/space_space/rules.mk
[Keyboard] Add Mammoth20x (#14014)

c5921282 — Yaroslav Smirnov 4 years ago
[Keyboard] Add Elrgo S to keyboards/handwired (#13893)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
1bfbaae5 — weteor 4 years ago
[Keyboard] add 3w6 (#13746)

8200804e — kb-elmo 4 years ago
[Keyboard] Add Voice65 (#13744)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
c039796d — James Young 4 years ago
keebzdotnet F-Me Configurator fixes and codebase touch-up (#14077)

* 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.
Next