~ruther/qmk_firmware

ce379ef4 — QMK Bot 4 years ago
Merge remote-tracking branch 'origin/master' into develop
c71d67ba — Spaceman 4 years ago
[Core] [Docs] Remove travis-ci references (#13916)

Fix LED Matrix suspend code (#14090)

e8943a8b — QMK Bot 4 years ago
Merge remote-tracking branch 'origin/master' into develop
30bb807c — Weirdo 4 years ago
[Keyboard] Add Naiping series keyboard (#14040)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
1ec6ce8c — Zach White 4 years ago
Merge remote-tracking branch 'origin/master' into develop

Resolved Conflicts:
	lib/python/qmk/info.py
c1add5d0 — Joel Challis 4 years ago
Restore layout count validation (#14068)

92fa0733 — Drashna Jaelre 4 years ago
[Bug] Fix RGB/LED Matrix Suspend code (#14084)

da11a499 — QMK Bot 4 years ago
Merge remote-tracking branch 'origin/master' into develop
90ff4fe7 — tiltowait 4 years ago
[Keyboard] Add IBM Model M SSK configuration (#14050)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
69c71d48 — Joel Challis 4 years ago
Align DIP_SWITCH_PINS_RIGHT implementation with encoders (#14079)

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