zvecr
4d4b013e5b
Fixup after merge
2022-03-18 17:03:54 +00:00
zvecr
5bb6173cc7
Fixup after merge
2022-03-18 17:01:02 +00:00
zvecr
e5e1e54f39
Merge remote-tracking branch 'origin/develop' into xap
2022-03-18 16:57:34 +00:00
QMK Bot
3a08deb7fe
Merge remote-tracking branch 'origin/master' into develop
2022-03-18 16:02:57 +00:00
Joel Challis
ed773ab73c
Relocate CLI git interactions ( #16682 )
2022-03-18 16:02:24 +00:00
zvecr
72602a3443
Fixup after merge
2022-03-18 01:53:39 +00:00
zvecr
2e8db66201
Merge remote-tracking branch 'origin/develop' into xap
2022-03-18 01:20:16 +00:00
zvecr
bffb209eee
Merge remote-tracking branch 'origin/master' into develop
2022-03-18 01:15:23 +00:00
Joel Challis
e5823b5650
[CLI] Add common util for dumping generated content ( #16674 )
2022-03-18 01:09:29 +00:00
QMK Bot
46256e08eb
Merge remote-tracking branch 'origin/develop' into xap
2022-03-17 21:20:11 +00:00
Drashna Jaelre
02655690f4
[Core] Add compile/make macro to core ( #15959 )
...
* [Core] Add KC_MAKE keycode to core
fix linting
fix testing error
work around test idiocyncracies
fix more lint
something something stupid tests
add doc
* updates based on feedback
* Add bad names
* Fixup docs
* semantics but cleaner
Co-authored-by: precondition <57645186+precondition@users.noreply.github.com>
* Hide oneshot checks behind preprocessors
* Move no-compile option around
* Fix formatting
* make shift optional
* Make opt in
* fix formatting
* update send string function name
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: precondition <57645186+precondition@users.noreply.github.com>
Co-authored-by: Joel Challis <git@zvecr.com>
2022-03-17 21:19:34 +00:00
QMK Bot
770c7ab20e
Merge remote-tracking branch 'origin/develop' into xap
2022-03-16 23:46:07 +00:00
QMK Bot
2749346a53
Merge remote-tracking branch 'origin/master' into develop
2022-03-16 23:45:35 +00:00
Joel Challis
417f089115
Print out generated files during build ( #16672 )
2022-03-17 10:45:06 +11:00
zvecr
31c4864705
Crude CLI device discovery
2022-03-16 19:45:42 +00:00
QMK Bot
68efb1635c
Merge remote-tracking branch 'origin/develop' into xap
2022-03-16 15:35:27 +00:00
QMK Bot
4e863dbdef
Merge remote-tracking branch 'origin/master' into develop
2022-03-16 15:34:51 +00:00
Jay Greco
193dd01f4e
[Keyboard] Add nullbits TIDBIT ( #15182 )
2022-03-16 08:34:16 -07:00
zvecr
9fd4db1fc7
fix up for pytest - remove fstring escaping
2022-03-16 10:58:21 +00:00
QMK Bot
5b2db70d65
Merge remote-tracking branch 'origin/develop' into xap
2022-03-16 04:10:00 +00:00
QMK Bot
024bda1dd3
Merge remote-tracking branch 'origin/master' into develop
2022-03-16 04:09:30 +00:00
Ryan
d5d2a01db2
gboards/butterstick: move steno rules config to keymap level ( #16666 )
2022-03-16 04:08:52 +00:00
QMK Bot
7301950bcf
Merge remote-tracking branch 'origin/develop' into xap
2022-03-16 03:58:52 +00:00
QMK Bot
78f7c7bb0d
Merge remote-tracking branch 'origin/master' into develop
2022-03-16 03:58:24 +00:00
Ryan
8c5779f768
Fix m3n3van and minim keyboard names in keymap JSON ( #16665 )
2022-03-16 03:57:47 +00:00
QMK Bot
d5b6b82361
Merge remote-tracking branch 'origin/develop' into xap
2022-03-16 03:15:37 +00:00
QMK Bot
d802e1c805
Merge remote-tracking branch 'origin/master' into develop
2022-03-16 03:15:02 +00:00
QMK Bot
1bb00c1609
Merge remote-tracking branch 'origin/develop' into xap
2022-03-16 03:14:32 +00:00
Yakbats
a867cfc26d
Update the AL1 Vender ID ( #16660 )
...
* Add via to AL1
* Updated number of rows and columns, and applied suggestions from code review
* Update Vender ID
Change the Vender ID for Triangle Lab to comply with the via PR checklist.
2022-03-16 03:14:31 +00:00
QMK Bot
db6d432d6a
Merge remote-tracking branch 'origin/master' into develop
2022-03-16 03:13:51 +00:00
AnthonyNguyen168
fded67f1a9
[MB-65S] Change layout to follow change request from OEM ( #16663 )
2022-03-16 03:13:14 +00:00
zvecr
52d3b9dcc5
fix up for pytest
2022-03-16 00:10:40 +00:00
QMK Bot
cddcd8d735
Merge remote-tracking branch 'origin/develop' into xap
2022-03-16 00:07:59 +00:00
QMK Bot
b2e870e4a2
Merge remote-tracking branch 'origin/master' into develop
2022-03-16 00:07:19 +00:00
an_achronism
f6f4d85aa5
yugo_m enhancement: include all available key positions ( #16216 )
...
* yugo_m enhancement to include all available key positions in matrix
2022-03-15 17:06:27 -07:00
zvecr
7e8f0d49ea
Temp bodge for unit tests?
2022-03-15 23:57:59 +00:00
QMK Bot
7183516a2b
Merge remote-tracking branch 'origin/develop' into xap
2022-03-15 23:28:59 +00:00
QMK Bot
919df5934b
Merge remote-tracking branch 'origin/master' into develop
2022-03-15 23:28:31 +00:00
Joel Challis
8bffc61959
Ensure dependent CI workflows run ( #16662 )
2022-03-15 23:27:55 +00:00
QMK Bot
d37ed07c47
Merge remote-tracking branch 'origin/master' into develop
2022-03-15 22:58:50 +00:00
Moritz
77aafd8056
[Keyboard] Add Dolice keyboard ( #16186 )
2022-03-15 15:58:16 -07:00
QMK Bot
8e1f505ab2
Merge remote-tracking branch 'origin/master' into develop
2022-03-15 22:49:10 +00:00
Tom Konidas
a808c29726
[Keymap] Planck Keymap: tomkonidas ( #15869 )
2022-03-15 15:48:13 -07:00
zvecr
2b4724bd83
Convert info_json_gz.h generation to CLI
2022-03-15 17:59:12 +00:00
QMK Bot
5f817a1d7f
Merge remote-tracking branch 'origin/master' into develop
2022-03-15 13:57:46 +00:00
Ryan
764dc18a81
Remove NO_ACTION_MACRO and NO_ACTION_FUNCTION from keyboard config.h ( #16655 )
2022-03-15 13:56:58 +00:00
zvecr
b96b862ef9
Merge remote-tracking branch 'origin/develop' into xap
2022-03-15 13:27:35 +00:00
QMK Bot
872b521e4f
Merge remote-tracking branch 'origin/master' into develop
2022-03-15 12:50:04 +00:00
Joel Challis
46e85ded47
Add merge workflow for XAP branch ( #16652 )
...
* Add merge workflow for XAP branch
* uncomment
2022-03-15 12:49:23 +00:00
QMK Bot
3315894269
Merge remote-tracking branch 'origin/master' into develop
2022-03-15 09:35:53 +00:00
