alterNERDtive/qmk_firmware
1
0
Fork 0
Code Pull requests Activity
15432 commits 2 branches 1591 tags 844 MiB
Commit graph

8480 commits

Author SHA1 Message Date
QMK Bot
d2b405066d Merge remote-tracking branch 'origin/master' into develop 2021-03-25 11:55:36 +00:00
Matt W
2cd684f8e0
add massdrop/alt/hlmtre keymap, add .exe to gitignore (#12191) 
* add massdrop/alt/hlmtre keymap, add .exe to gitignore

* changes request in PR (license header and fix gitignore)

Co-authored-by: Matt Weller <matthew.weller@nvih.org>
 2021-03-25 22:55:01 +11:00
QMK Bot
ea1ed13bc8 Merge remote-tracking branch 'origin/master' into develop 2021-03-25 11:53:33 +00:00
Blake
c4d05010cb
Add Daisy, a macropad with dual rotary encoders + update Scarlet readme.md (#12221) 
* Daisy first commit buggy

* buggy still underglow crash

* Daisy V1

* ReadMe Updates
 2021-03-25 22:53:30 +11:00
Albert Y
6276f54752
Add suspend wake functions for The Mark:65's RGB Matrix (#12245) 
* Add suspend wake functions for RGB Matrix

* Add USB suspend definition to config.h

Co-authored-by: filterpaper <filterpaper@localhost>
 2021-03-25 22:52:53 +11:00
QMK Bot
c3483458fe Merge remote-tracking branch 'origin/master' into develop 2021-03-25 11:51:33 +00:00
TerryMathews
572395ac20
TKC GodSpeed75: add RGB LED support (#12278) 
* GodSpeed75: add RGB support

* GodSpeed75: minor updates

* GodSpeed75: minor updates

* GodSpeed75: restore chconf.h

* GodSpeed75: restore chconf.h

* GodSpeed75: restore chconf.h
 2021-03-25 22:51:02 +11:00
QMK Bot
ba5aacbb95 Merge remote-tracking branch 'origin/master' into develop 2021-03-25 11:50:49 +00:00
peepeetee
95c74ae4ae
add via support for bm68rgb (#12275) 
* add via support for bm68rgb

* add newline to keymap.c
 2021-03-25 22:50:17 +11:00
QMK Bot
a2165b38a0 Merge remote-tracking branch 'origin/master' into develop 2021-03-25 11:49:40 +00:00
kopibeng
3fc710e0b1
Add XT65 keyboard (#11998) 
* Add XT65 keyboard

* Create readme.md

* Updated readme.md and rules.mk

* Updated config.h and readme.md

* Update imgur link

* Update keyboards/kopibeng/xt65/rules.mk

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/kopibeng/xt65/rules.mk

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/kopibeng/xt65/config.h

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

* Update keyboards/kopibeng/xt65/readme.md

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

* Update keyboards/kopibeng/xt65/readme.md

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

* Update keyboards/kopibeng/xt65/rules.mk

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

* Update keyboards/kopibeng/xt65/rules.mk

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

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-03-25 22:49:37 +11:00
kb-elmo
dd0a35273c
added twelvekey (#12281) 
* added twelvekey

* rename layout
 2021-03-25 22:48:59 +11:00
QMK Bot
e86b7d0c13 Merge remote-tracking branch 'origin/master' into develop 2021-03-25 11:47:36 +00:00
Matteo Montemarani
cf7404630e
ISO Layouts fix (#12319) 2021-03-25 22:47:03 +11:00
QMK Bot
a3760c0891 Merge remote-tracking branch 'origin/master' into develop 2021-03-25 11:39:24 +00:00
James Young
1d706bd77c
handwired/bolek: correct key object order (#12356) 2021-03-25 22:38:52 +11:00
QMK Bot
87f6df0655 Merge remote-tracking branch 'origin/master' into develop 2021-03-25 11:36:57 +00:00
Wilba
a74846a0db
Added wilba.tech WT60-H2 (#12348) 
* Added wilba.tech WT60-H2

* fix typo

* Fix error in keymap
 2021-03-25 22:36:52 +11:00
QMK Bot
25b7a5d531 Merge remote-tracking branch 'origin/master' into develop 2021-03-25 11:36:29 +00:00
Wilba
038d9118b6
Added wilba.tech WT65-G2 (#12360) 2021-03-25 22:36:24 +11:00
Wilba
be771e5fd2
Added wilba.tech WT60-H3 (#12354) 
* Added wilba.tech WT60-H2

* fix typo
 2021-03-25 22:35:54 +11:00
QMK Bot
c7436e667d Merge remote-tracking branch 'origin/master' into develop 2021-03-25 11:35:49 +00:00
Andrew-Fahmy
1fbee7c316
(Re)Fixing K-type RGB lighting (#12084) 
* initial rgb driver fix

* added underglow LEDs and fixed typo in RGB locations

* removed test code

* added my key maps

* updated rgb keymap to work with changes

* refactored my code to make it more maintainable and updated keymaps.

* added GPL licence

* Turned off matrix scan rate debug info

* added checks if RGB matrix is enabled to fix errors when building keymaps without RGB matrix enabled

* Apply suggestions from code review by fauxpark

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

* Renamed led driver file to be less ambiguous

* Renamed is31fl3733 driver files to is31fl3733-dual

Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-03-25 22:35:18 +11:00
QMK Bot
183dde75de Merge remote-tracking branch 'origin/master' into develop 2021-03-25 11:35:06 +00:00
Brandon Claveria
8b39ae13c7
add equator (#12369) 
Co-authored-by: Swiftrax <swiftrax@gmail.com>
 2021-03-25 22:34:29 +11:00
QMK Bot
921f1ba4cf Merge remote-tracking branch 'origin/master' into develop 2021-03-25 07:06:41 +00:00
Armando Magalhães
c59fb1b477
feat(keymaps): Changes to crkbd/keymaps/armand1m layout and README.md update (#12252) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-03-25 18:06:30 +11:00
James Young
e7cb7bc737
Roses Lite layout macro touch-up (#12357) 2021-03-25 18:05:59 +11:00
QMK Bot
1bb04ea598 Merge remote-tracking branch 'origin/master' into develop 2021-03-25 05:29:33 +00:00
Xelus22
1ed48c774e
add valor_frl_tkl info.json (#12359) 
* add info.json

* remove macro keys to correct layout
 2021-03-24 22:28:54 -07:00
QMK Bot
c823160d94 Merge remote-tracking branch 'origin/master' into develop 2021-03-25 01:33:46 +00:00
sbuller
97a73637e0
[Keyboard] Preserve signedness from opt_encoder_handler for scroll data on ploopy devices (#12223) 2021-03-24 18:33:06 -07:00
QMK Bot
743d6c430b Merge remote-tracking branch 'origin/master' into develop 2021-03-24 10:13:37 +00:00
Ryan
723d9af04d
Add info.json for handwired/datahand (#12320) 2021-03-24 21:12:55 +11:00
QMK Bot
87aa3282f0 Merge remote-tracking branch 'origin/master' into develop 2021-03-24 09:07:46 +00:00
James Young
6edcbdca19
[Keyboard] YMDK YM68 (#12352) 
* [Keyboard] YMDK YM68

Converted from a KBFirmware JSON file provided via the vendor's product listing.

PCB supports Backlight on B6 and RGB Underglow on E2, but the LEDs are not pre-soldered according to the PCB photos.

* update VENDOR_ID and PRODUCT_ID
 2021-03-24 02:07:12 -07:00
QMK Bot
bbc48b0ef5 Merge remote-tracking branch 'origin/master' into develop 2021-03-24 04:25:05 +00:00
James Young
2882ee9f55
Configurator bugfix for GMMK Pro (#12353) 2021-03-24 15:24:20 +11:00
QMK Bot
dd5a732eac Merge remote-tracking branch 'origin/master' into develop 2021-03-24 02:04:16 +00:00
Ryan
78149505f9
Fix Uni660 linker errors (#12341) 2021-03-24 13:03:43 +11:00
QMK Bot
862b01d4c0 Merge remote-tracking branch 'origin/master' into develop 2021-03-24 02:00:40 +00:00
duoshock
7b07ce3fef
Add UC-1 keypad (#11926) 
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: online <33636898+online@users.noreply.github.com>
 2021-03-24 13:00:07 +11:00
QMK Bot
9afbbf21fd Merge remote-tracking branch 'origin/master' into develop 2021-03-23 18:19:00 +00:00
Viktor Eikman
d395c81606
Configurator fixes for handwired/concertina/64key (#12316) 
* Fixed bug that was hiding a key in info.json.

* Improvements to presentation.
 2021-03-23 11:18:19 -07:00
QMK Bot
b2cfb629e4 Merge remote-tracking branch 'origin/master' into develop 2021-03-23 15:11:57 +00:00
Danny
be257b6f9f
Add Sinc Rev. 2 (#12138) 2021-03-23 11:11:07 -04:00
QMK Bot
34423580e0 Merge remote-tracking branch 'origin/master' into develop 2021-03-23 07:01:25 +00:00
Luca Di Bartolomeo
d4a8123267
Update readme.md on quefrency (#12276) 
* Update readme.md on quefrency

Fix incorrect flashing instructions

* Update keyboards/keebio/quefrency/readme.md
 2021-03-23 00:00:34 -07:00
QMK Bot
fe58770df8 Merge remote-tracking branch 'origin/master' into develop 2021-03-21 02:43:41 +00:00
kb-elmo
c5b0366a25
Fix Kira80 license headers (#12303) 
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
 2021-03-21 13:43:04 +11:00