Henry-Hiles/qmk_userspace
Watch
1
0
Fork
You've already forked qmk_userspace
 0
forked from mirrors/qmk_userspace
Code Pull requests Activity
26,545 commits 2 branches 1 tag 294 MiB
Commit graph

26,545 commits

This branch
This branch
All branches
Author SHA1 Message Date
QMK Bot
536df7c240 Merge remote-tracking branch 'origin/master' into develop 2021-05-13 00:02:42 +00:00
thompson-ele
7d21ce367d
 		[Keyboard] Titan60 LED and keymap updates (#12558) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-05-13 10:02:09 +10:00
QMK Bot
9c80db1fdc Merge remote-tracking branch 'origin/master' into develop 2021-05-12 23:25:56 +00:00
Albert Y
9ada2f30ea
 		USB suspend option and LED position change for The Mark 65 (#12725) 
Co-authored-by: filterpaper <filterpaper@localhost>
 2021-05-13 09:25:21 +10:00
QMK Bot
53075ccc5d Merge remote-tracking branch 'origin/master' into develop 2021-05-12 23:25:03 +00:00
coarse
d471a691f7
 		Fix Cordillera LED states config (#12646) 2021-05-13 09:24:20 +10:00
Ryan
92fbadeb1b
 		Rename point_t -> led_point_t (#12864) 2021-05-13 09:17:18 +10:00
QMK Bot
07800e82c9 Merge remote-tracking branch 'origin/master' into develop 2021-05-12 16:50:09 +00:00
Brandon Claveria
c305edc680
 		add handwired/swiftrax/walter (#12428) 
* init commit of walter

* finalize keyboard

* fix walter.h

* fix config.h

* fix rgblight animations

* fix config.h

Co-authored-by: Swiftrax <swiftrax@gmail.com>
 2021-05-12 12:49:30 -04:00
Zach White
6da60d4a5d
 		Add setup, clone, and env to the list of commands we allow even with broken modules (#12868) 2021-05-12 09:40:58 -07:00
QMK Bot
3a1ce81d29 Merge remote-tracking branch 'origin/master' into develop 2021-05-12 00:52:47 +00:00
Andrew Kannan
9a3f4f8f8a
 		Some fixes for the Bakeneko variant DB60s (#12662) 
* Some fixes for the Bakeneko variant DB60s

* Add copyright to header

* Add .python-version to gitignore for people who use pyenv or similar

* update readme

* Add more readmes

* Add more readmes

* Update the versions to have different product IDs

* Update readme

* Add missing rules.mk

* Fix matrix on hotswap

* remove iso from hotswap

* Fix hotswap spacebar

* Revert gitignore changes

* Fix layouts

* Apply suggestions from code review

Co-authored-by: Ryan <fauxpark@gmail.com>

* Add split configs

* Apply suggestions from code review

Co-authored-by: Ryan <fauxpark@gmail.com>

* Add license to config

* or equivalent

Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-05-12 10:52:15 +10:00
QMK Bot
4bb00c6a0a Merge remote-tracking branch 'origin/master' into develop 2021-05-11 18:43:25 +00:00
coarse
e9aee3bfd0
 		[Keyboard] Add Charue Design's Sunsetter (#12547) 2021-05-11 20:42:56 +02:00
Zach White
38d8d5445e
 		Remove KEYMAP and LAYOUT_kc (#12160) 
* alias KEYMAP to LAYOUT

* remove KEYMAP and LAYOUT_kc
 2021-05-11 10:10:31 -07:00
Ryan
d84cbc3cec
 		Fix syntax error when compiling for ARM (#12866) 2021-05-11 08:17:28 -07:00
Ryan
3edc43964d
 		LED Matrix: Effects! (#12651) 2021-05-11 13:41:06 +10:00
Nick Brassel
f41fc6b70c
 		Fixup build errors on develop branch. (#12723) 2021-05-11 11:01:58 +10:00
QMK Bot
0432bde962 Merge remote-tracking branch 'origin/master' into develop 2021-05-11 00:33:02 +00:00
peepeetee
77875e89ec
 		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
 2021-05-10 17:32:26 -07:00
QMK Bot
17586ea7c4 Merge remote-tracking branch 'origin/master' into develop 2021-05-10 22:43:41 +00:00
George Wietor
1ab2167ff9
 		[Keyboard] VIA support for Preonic Rev3 (#11344) 
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Jack Humbert <jack.humb@gmail.com>
 2021-05-10 15:43:05 -07:00
Lukas Reineke
069cfb61b8
 		[Keymap] Turn OLED off on suspend in soundmonster keymap (#10419) 2021-05-10 15:40:18 -07:00
QMK Bot
6bb9113e27 Merge remote-tracking branch 'origin/master' into develop 2021-05-10 22:38:06 +00:00
Drashna Jaelre
a116b3f1ae
 		Improve EEPROM defaults for Dynamic Keymaps (#12853) 2021-05-10 15:37:36 -07:00
Zach White
0e7c66e891 Merge remote-tracking branch 'origin/master' into develop 
Conflicts:
	bin/qmk
	lib/python/qmk/cli/__init__.py

Merge conflicts fixed by skullydazed.
 2021-05-10 12:16:04 -07:00
Zach White
bc38c38f8c
 		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>
 2021-05-10 12:00:52 -07:00
QMK Bot
911b45ce3b Merge remote-tracking branch 'origin/master' into develop 2021-05-10 18:19:15 +00:00
Zach White
a3e7f3e7c5
 		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
 2021-05-10 11:18:44 -07:00
QMK Bot
cfc6e4bfac Merge remote-tracking branch 'origin/master' into develop 2021-05-10 17:37:36 +00:00
James Young
66ed80ad3a
 		Lagrange handwired Configurator bugfix (#12854) 
* use human-friendly formatting

* correct key object order
 2021-05-10 10:37:05 -07:00
Sergey Vlasov
ffe81cbec1
 		Fix another bin/qmk reference (#12856) 2021-05-10 09:21:13 -07:00
Drashna Jaelre
f0b30e0027
 		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.
 2021-05-09 23:21:09 -07:00
QMK Bot
40d1506527 Merge remote-tracking branch 'origin/master' into develop 2021-05-09 20:40:22 +00:00
Joel Challis
3f854e16ac
 		Catch 'LAYOUTS = all' in lint (#12848) 
Co-authored-by: Zach White <skullydazed@drpepper.org>
 2021-05-09 22:39:48 +02:00
QMK Bot
2549b4b082 Merge remote-tracking branch 'origin/master' into develop 2021-05-09 19:16:57 +00:00
Ryan
4fa32f0f04
 		KBDMini refactor (#12850) 2021-05-10 05:16:29 +10:00
QMK Bot
201dc6d024 Merge remote-tracking branch 'origin/master' into develop 2021-05-09 18:30:52 +00:00
Zach White
5c924efa04
 		fix the makefile snippet so flake8 and yapf don't fight (#12849) 2021-05-09 11:30:17 -07:00
QMK Bot
2f367bab98 Merge remote-tracking branch 'origin/master' into develop 2021-05-09 17:20:16 +00:00
Erovia
30aae6298b
 		CLI: Use BASH if SHELL variable is not set (Windows) (#12847) 2021-05-09 19:19:42 +02:00
QMK Bot
ad1244e2cf Merge remote-tracking branch 'origin/master' into develop 2021-05-09 17:15:32 +00:00
github-actions[bot]
6c5e94061c
 		[CI] Format code according to conventions (#12838) 
Co-authored-by: QMK Bot <hello@qmk.fm>
 2021-05-10 03:15:00 +10:00
Ryan
62c3e3d11f
 		Remove pointless SERIAL_LINK_ENABLE rules (#12846) 2021-05-10 02:53:21 +10:00
QMK Bot
12292ba264 Merge remote-tracking branch 'origin/master' into develop 2021-05-09 15:07:13 +00:00
Nick Brassel
1426ffc0ee
 		Add script to perform parallel builds. (#12497) 
Co-authored-by: Erovia <Erovia@users.noreply.github.com>
 2021-05-09 17:06:44 +02:00
QMK Bot
bfb052db1d Merge remote-tracking branch 'origin/master' into develop 2021-05-09 13:53:46 +00:00
Joel Challis
f544b60aaa
 		Align qmk info ascii logic with milc logging (#11627) 2021-05-09 15:53:18 +02:00
QMK Bot
a0c95cb07e Merge remote-tracking branch 'origin/master' into develop 2021-05-09 10:58:43 +00:00
Joel Challis
7725d813c9
 		Allow MAKE environment override for 'qmk clean' (#12473) 2021-05-09 12:57:49 +02:00