~ruther/qmk_firmware

Fix syntax error when compiling for ARM (#12866)

LED Matrix: Effects! (#12651)

f41fc6b7 — Nick Brassel 4 years ago
Fixup build errors on `develop` branch. (#12723)

0432bde9 — QMK Bot 4 years ago
Merge remote-tracking branch 'origin/master' into develop
77875e89 — peepeetee 4 years ago
peepeetee's custom keymap for bm68rgb (#12232)

* add custom keymaps for BM68rgb

* add user keymap for bm68rgb

* fix grammar

* add custom hub16 keymap

* Apply suggestions from code review

* fix errorenously included hub16 file

* add GPL headers

* revert defining dfa_state in keymap.h

* Update keyboards/bm68rgb/keymaps/peepeetee/keymap.h

* enable tap dance, add tap dance to left alt
17586ea7 — QMK Bot 4 years ago
Merge remote-tracking branch 'origin/master' into develop
1ab2167f — George Wietor 4 years ago
[Keyboard] VIA support for Preonic Rev3 (#11344)

Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Jack Humbert <jack.humb@gmail.com>
069cfb61 — Lukas Reineke 4 years ago
[Keymap] Turn OLED off on suspend in soundmonster keymap (#10419)

6bb9113e — QMK Bot 4 years ago
Merge remote-tracking branch 'origin/master' into develop
a116b3f1 — Drashna Jaelre 4 years ago
Improve EEPROM defaults for Dynamic Keymaps (#12853)

0e7c66e8 — Zach White 4 years ago
Merge remote-tracking branch 'origin/master' into develop

Conflicts:
	bin/qmk
	lib/python/qmk/cli/__init__.py

Merge conflicts fixed by skullydazed.
bc38c38f — Zach White 4 years ago
Move the module checking and updating to lib/python (#12416)

* move the module checking and updating to lib/python

* make flake8 happy

* Update lib/python/qmk/cli/__init__.py

Co-authored-by: Erovia <Erovia@users.noreply.github.com>

* prompt the user to disable developer mode

* pyformat

* flake8

Co-authored-by: Erovia <Erovia@users.noreply.github.com>
911b45ce — QMK Bot 4 years ago
Merge remote-tracking branch 'origin/master' into develop
a3e7f3e7 — Zach White 4 years ago
Improve our CI tests (#11476)

* add a test and dry-run to qmk generate-api

* add a dry-run to qmk pyformat

* Add a --dry-run to qmk cformat

* reverse the order of nose2 and flake8 tests

* run CI test against cformat and pyformat

* fix programming errors

* tweak job name

* fix argument

* refine the files we select

* fix stack trace in --ci

* make cformat exit clean

* fix c file extensions

* decouple CI from pyformat

* remove --ci arg

* make ci happy

* use the environment var instead

* change output to text

* fix log message

* replace tabs
cfc6e4bf — QMK Bot 4 years ago
Merge remote-tracking branch 'origin/master' into develop
66ed80ad — James Young 4 years ago
Lagrange handwired Configurator bugfix (#12854)

* use human-friendly formatting

* correct key object order
ffe81cbe — Sergey Vlasov 4 years ago
Fix another bin/qmk reference (#12856)

f0b30e00 — Drashna Jaelre 4 years ago
Make Swap Hands use PROGMEM (#12284)

This converts the array that the Swap Hands feature uses to use PROGMEM,
and to read from that array, as such. Since this array never changes at
runtime, there is no reason to keep it in memory. Especially for AVR
boards, as memory is a precious resource.
40d15065 — QMK Bot 4 years ago
Merge remote-tracking branch 'origin/master' into develop
3f854e16 — Joel Challis 4 years ago
Catch 'LAYOUTS = all' in lint (#12848)

Co-authored-by: Zach White <skullydazed@drpepper.org>
Next