b7d4a9dc25
Merge remote-tracking branch 'origin/master' into develop
2021-01-03 20:31:41 +00:00
acec174fde
Homebrew install: ignore pinned formulae in `brew upgrade` ( #11423 )
2021-01-03 20:30:59 +00:00
1f8acb7619
Merge remote-tracking branch 'origin/master' into develop
2021-01-03 20:30:50 +00:00
070240f212
arm_atsam: Use PROGRAM_CMD for :flash target if set ( #11424 )
2021-01-04 07:30:22 +11:00
271c0cf136
Merge remote-tracking branch 'upstream/master' into develop
2021-01-03 15:26:43 +11:00
f3ac792c09
Align ChibiOS spi_master behaviour with AVR ( #11404 )
...
* Align ChibiOS spi_master behaviour with AVR
* Rollback `spi_transmit()` and `spi_receive()` to preserve DMA
2021-01-03 14:53:53 +11:00
e8e090aced
Remove handwired/bluepill. ( #11415 )
2021-01-03 13:29:19 +11:00
7456e6c776
ChibiOS conf migrations... take 4 ( #11413 )
...
* ChibiOS conf upgrade for cannonkeys/tsukuyomi
cannonkeys/tsukuyomi - 7beddc74b03d652481198843a178177de5da3ddb
* ChibiOS conf upgrade for misterknife/knife66_iso
misterknife/knife66_iso - f2dd6e6c54258ae9d09a88215b36fba34947fc23
* ChibiOS conf upgrade for mode/eighty
mode/eighty/m80h - 4bbbee01a89a5b4ab5f4de36e0dd2044cf54a698
mode/eighty/m80s - 6de4a1affab4ed8f08423eb511393ed797e3ea77
2021-01-03 13:17:34 +11:00
11bd98f684
Fix broken keyboards ( #11412 )
...
* Fix a couple errors
* add a dependency for the generated headers
2021-01-03 13:08:17 +11:00
b3de903a3d
Fix broken Lighting Layers when RGBLIGHT_MAX_LAYERS > 16 ( #11406 )
...
* fix incorrect bit math when RGBLIGHT_MAX_LAYERS > 16
* with 1UL cast is not needed
* ...but just casting works and is even more efficient
* cformat
2021-01-02 13:42:48 -08:00
f27d8d9448
Fix compiling on develop ( #11409 )
2021-01-02 21:05:56 +01:00
f12000a1b6
Merge remote-tracking branch 'origin/master' into develop
2021-01-02 17:28:05 +00:00
c07543133a
Return the make exit code for qmk compile and flash ( #11402 )
2021-01-02 17:27:35 +00:00
266343666f
Merge remote-tracking branch 'origin/master' into develop
2021-01-02 08:46:59 +00:00
2e9d091960
[Keyboard] Added LDK65 based off BKS65 ( #11335 )
2021-01-02 00:46:25 -08:00
e190872b82
Improved Language Specific Keycodes for US International and Extended Layouts ( #11307 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-02 15:54:48 +11:00
8e68003b28
Merge remote-tracking branch 'origin/master' into develop
2021-01-02 01:39:21 +00:00
13efa8290e
Update quark pin config ( #11398 )
2021-01-02 12:38:50 +11:00
d8a9974a41
Merge remote-tracking branch 'origin/master' into develop
2021-01-02 01:36:46 +00:00
988715910c
[Docs] Fix typo in hand_wire.md ( #11297 )
2021-01-01 17:36:17 -08:00
7ecbc83e71
Merge remote-tracking branch 'origin/master' into develop
2021-01-02 00:45:16 +00:00
8da9219c16
[Keyboard] Added Phantom Solder PCB and KBD8X HS PCB Variants ( #11282 )
...
* Added config for phantom solder all layout via only
* fixed matrix def
* Added KBD8X
* changed info name
* lowercase instances of LAYOUT_ALL and edited rules.mk
* edited kbd8x results
* fixed kbd8x rules
* removed trailing comma in kbd8x info
* Update keyboards/lucid/kbd8x_hs/config.h
Co-authored-by: Joel Challis <git@zvecr.com>
* Update keyboards/lucid/kbd8x_hs/kbd8x_hs.h
Co-authored-by: Joel Challis <git@zvecr.com>
* Update keyboards/lucid/kbd8x_hs/readme.md
Co-authored-by: Joel Challis <git@zvecr.com>
* Update keyboards/lucid/kbd8x_hs/rules.mk
Co-authored-by: Joel Challis <git@zvecr.com>
* Update keyboards/lucid/phantom_solder/info.json
Co-authored-by: Joel Challis <git@zvecr.com>
* Update keyboards/lucid/phantom_solder/readme.md
Co-authored-by: Joel Challis <git@zvecr.com>
* Update keyboards/lucid/phantom_solder/rules.mk
Co-authored-by: Joel Challis <git@zvecr.com>
* Fixed info.json key mismatch
Co-authored-by: Joel Challis <git@zvecr.com>
2021-01-01 16:44:45 -08:00
ddfb558591
Merge remote-tracking branch 'origin/master' into develop
2021-01-01 23:27:44 +00:00
d321cb3f8b
[Keyboard] Pos78 update ( #11274 )
...
* Added LED hardware pin numbers
CAPS and NUM lock LEDs
* Added "LED_PIN_ON_STATE 1"
* Make MATRIX_ROW/COL pins match reality
2021-01-01 15:27:13 -08:00
5209576828
Merge remote-tracking branch 'origin/master' into develop
2021-01-01 23:26:27 +00:00
8ed9eb9c7f
[Keyboard] Add GKB-M16 Macro Pad ( #11262 )
...
* Add GKB-M16 Macro Pad
Add GKB-M16 (gkb_m16) Macro Pad under gkeyboard
* Update keyboards/gkeyboard/gkb_m16/config.h
Co-authored-by: Joel Challis <git@zvecr.com>
* Update keyboards/gkeyboard/gkb_m16/keymaps/via/keymap.c
Co-authored-by: Joel Challis <git@zvecr.com>
* Update keyboards/gkeyboard/gkb_m16/info.json
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/gkeyboard/gkb_m16/keymaps/default/keymap.c
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-01 15:26:00 -08:00
f410dfa091
Merge remote-tracking branch 'origin/master' into develop
2021-01-01 23:16:33 +00:00
1d2a9a1cdb
[Keyboard] New Keyboard - Mercutio ( #11214 )
...
* Initial commit on new clean branch. Testing out functionality of oled and encoder for default features.
* Cleaned up the initial push and removed the fancy keymap until the extra features and functionality can be tested and made more user friendly.
* Cleaned up the readme some more, compiled and tested both default and via keymaps, and did another round of checks to prepare for starting the PR.
* Cleaning up the keymap to meet expected formatting in a couple places and also adding in the TAP_CODE_DELAY after newly encoutnered encoder issues and inconsistencies.
* Apply suggestions from code review
Co-authored-by: Joel Challis <git@zvecr.com>
* Update keyboards/mechwild/mercutio/readme.md
Co-authored-by: Ryan <fauxpark@gmail.com>
* Fixing json syntax.
* Update keyboards/mechwild/mercutio/rules.mk
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-01 15:16:00 -08:00
428eb5faad
Merge remote-tracking branch 'origin/master' into develop
2021-01-01 23:05:35 +00:00
fcd921f3aa
[Keyboard] Rebound, adding files for VIA compat ( #11193 )
...
* changes for via
* add manu to product name
* remove manu from product value
* remove description
* i m licensed
2021-01-01 15:05:02 -08:00
e45a2af683
Merge remote-tracking branch 'origin/master' into develop
2021-01-01 18:09:02 +00:00
e11d3d524d
speed up list_keyboards.sh
2021-01-01 10:08:32 -08:00
d288f2f5da
Merge remote-tracking branch 'origin/master' into develop
2021-01-01 16:32:49 +00:00
c01a8b030e
O4L 5x12 refactor ( #11392 )
...
* O4L 5x12 refactor
* Remove config.h
2021-01-01 16:32:21 +00:00
5fe3de3153
Merge remote-tracking branch 'origin/master' into develop
2021-01-01 14:59:27 +00:00
b5fc6f0682
Fix rart4x4 info.json ( #11390 )
2021-01-01 14:58:55 +00:00
39bd151472
Merge remote-tracking branch 'origin/master' into develop
2021-01-01 14:57:27 +00:00
08fdf086b7
Fix typo in hand wiring guide ( #11388 )
...
ridid -> rigid
2021-01-01 14:57:02 +00:00
8a2a39ed06
Merge remote-tracking branch 'origin/master' into develop
2021-01-01 13:53:22 +00:00
aab056a4a6
Manta60 refactor ( #11378 )
2021-01-02 00:52:49 +11:00
7b83bb188a
Merge remote-tracking branch 'origin/master' into develop
2021-01-01 13:43:06 +00:00
565a038a3d
Fix layout ortho_4x12 macro for montsinger/rebound/rev4 ( #11382 )
2021-01-01 13:42:36 +00:00
e3da93e658
Merge remote-tracking branch 'upstream/master' into develop
2021-01-01 05:09:50 +11:00
53e9213a22
Quark refactor ( #11377 )
2021-01-01 05:04:00 +11:00
a68d289fa5
Manually run formatting CI process ( #11375 )
2021-01-01 03:50:32 +11:00
da8423ca97
Merge remote-tracking branch 'origin/master' into develop
2020-12-31 15:00:40 +00:00
4ef4347543
Quark PCB for Planck/Preonic ( #11206 )
...
* Quark PCB for Planck/Preonic
Quark provides alternate bottom row layouts for both the OLKB Planck and Preonic
* Rename rules.mk.txt to rules.mk
* added Tapping Toggle
removed tapping toggle from keymap level
* Update info.json
took out } as requested
* update config.h
added GPL2+ license and #pragma once
* update info.json again
cleaned up syntax
* Apply suggestions from code review
Co-authored-by: Drashna Jaelre <drashna@live.com>
* update config.h
added GPL2+ License
* Update info.json - and again
fixed it - oops
Co-authored-by: Drashna Jaelre <drashna@live.com>
2020-12-31 10:00:08 -05:00
42cdba8680
Merge remote-tracking branch 'origin/master' into develop
2020-12-31 14:53:38 +00:00
028d2c91dc
Fixed typo in readme.md ( #11333 )
...
* Fixed typo in readme.md
censor -> sensor
* Censor -> Sensor in the Ploopy Trackball Readme
2020-12-31 14:53:06 +00:00
e319d501f7
Merge remote-tracking branch 'origin/master' into develop
2020-12-31 12:59:26 +00:00
QMK Bot
Ryan
Joel Elkins
Nick Brassel
Zach White
Joshua Diamond
Felix Jen
npspears
Michael Overman
smssmssms
gkeyboard
Kyle McCreery
Ross Montsinger
MURAOKA Taro
s-maurice
Joel Challis
Chas