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

7826 commits

Author SHA1 Message Date
QMK Bot
2f18993905 Merge remote-tracking branch 'origin/master' into develop 2021-01-19 01:22:57 +00:00
James Young
dfb8a29718
Caps Unlocked CU65 layout macro fixes (#11606) 2021-01-19 12:22:26 +11:00
Nick Brassel
94746b6557
Fixup builds on develop branch. (#11600) 2021-01-19 12:18:57 +11:00
QMK Bot
814c4cb56d Merge remote-tracking branch 'origin/master' into develop 2021-01-18 18:59:13 +00:00
datafx
3bb1897bdc
[Keyboard] Monstargear XO87 RGB Hot-Swap PCB (#11555) 
* Support for Monstargear XO87 Hot-Swap PCB

* Remove manufacturer from product line

* Removed alternate bootloaders

* Updated info.json

* Missed RGB_DISABLE_WHEN_USB_SUSPENDED in config.h

* Delete kb.h

* Update rgb.h

* Update rules.mk

* Add files via upload

* Delete kb.h

* Update keymap.c

* Update config.h

* Update rgb.c

* Add via RGB support

* Update info.json

* Update readme.md

* Update readme.md

* Update config.h

* Update rgb.h

* Update config.h

* Mirror factory layout

* Mirror factory layout

* Update rgb.h

* Update keyboards/xo87/rgb/rgb.c

* Update rgb.c

* Update keyboards/xo87/rgb/config.h

* Update keyboards/xo87/rgb/rules.mk

* Update keyboards/xo87/rgb/rules.mk

* Update keyboards/xo87/rgb/keymaps/via/keymap.c

* Update keyboards/xo87/rgb/rules.mk

* Update keyboards/xo87/rgb/rules.mk

* Update keyboards/xo87/rgb/keymaps/via/keymap.c

* Update config.h

* Update keyboards/xo87/rgb/readme.md

* Update keyboards/xo87/rgb/readme.md

* Update keyboards/xo87/rgb/readme.md

* Update keyboards/xo87/rgb/rules.mk

* Update keyboards/xo87/rgb/rules.mk

* Update keyboards/xo87/rgb/rules.mk

* Update keyboards/xo87/rgb/rules.mk

* Update keyboards/xo87/rgb/rules.mk

* remove deprecated action_get_macro()

* rearrange layout per request

* rearrange layout per request

* Update keyboards/xo87/rgb/rgb.h

* Update keyboards/xo87/rgb/keymaps/default/readme.md

* Update keyboards/xo87/rgb/readme.md

* Bugfix for RGB Matrix

* Bugfix for RGB Matrix

* Moved to new subdirectory and updated build commands to reflect changes

* Remove old files
 2021-01-18 10:58:09 -08:00
QMK Bot
ffaaadc270 Merge remote-tracking branch 'origin/master' into develop 2021-01-18 12:47:01 +00:00
James Young
03bacec87d
Naked64 Configurator update and rework (#11568) 2021-01-18 23:45:56 +11:00
Nick Brassel
e0e67df933
ChibiOS conf migrations... take 9 (#11598) 
* ChibiOS conf upgrade for akegata_denki/device_one

 akegata_denki/device_one - 0d9f891416decbbb533c6c1147632ef7c55a2d9f

* ChibiOS conf upgrade for ergodox_stm32

 ergodox_stm32 - 72aeab1612ef73555a73dd60d005e671a90d7e2f

* ChibiOS conf upgrade for jm60

 jm60 - cc75e97727fadd939be4bdf7fa3714320465d3ef

* ChibiOS conf upgrade for matrix/m20add

 matrix/m20add - b0dee0b4e8c0a94d55fea51c8699972f15483209

* ChibiOS conf upgrade for matrix/noah

 matrix/noah - 57a1c09cd24716863ce862e0b9cbca2a9c6fcebf

* ChibiOS conf upgrade for nibiria/stream15

 nibiria/stream15 - 610b151b02f5cac681c65fbd3f94a12312f99b82

* ChibiOS conf upgrade for xiaomi/mk02

 xiaomi/mk02 - f92fcee777acc159c0af268e88b751fd1e33f74f
 2021-01-18 13:16:59 +11:00
QMK Bot
82a875056c Merge remote-tracking branch 'origin/master' into develop 2021-01-18 01:50:00 +00:00
Ryan
cc3f2e2865
Remove DESCRIPTION, E-G (#11574) 2021-01-18 12:49:25 +11:00
QMK Bot
98b1cccd12 Merge remote-tracking branch 'origin/master' into develop 2021-01-17 17:04:28 +00:00
nibiria
f0f6174136
[Keyboard] add Stream15 keyboard (#11515) 
* add keyboard Stream15

* committted changes as suggested by drashna

* committed further changes as suggested

* Update info.json

removed excessive comma

* Update keyboards/nibiria/stream15/rules.mk

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

* Update keyboards/nibiria/stream15/keymaps/via/rules.mk

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

* Update keyboards/nibiria/stream15/readme.md

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

* resolved 2 more issues

Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-01-17 09:03:53 -08:00
Nick Brassel
f08a11fad3
ChibiOS conf upgrade for hub20 (#11588) 
hub20 - 089b49b233c4e9b8ab643c6b338c91f5c3136e32
 2021-01-17 13:53:03 +00:00
QMK Bot
f35b1127fa Merge remote-tracking branch 'origin/master' into develop 2021-01-15 21:50:23 +00:00
ridingqwerty
c628408688
New Keyboard: walletburner/cajal (#10458) 
* adding alpha variants

* adding cajal layouts

* adding V2 PCB support

adding additional layouts for new PCB version, and correecting incorrect image in info file

* Cleanup master -- remove alpha9

* Cleanup master -- remove g4m3ralpha

* Cleanup master -- remove cajal & sl40

* Master cleanup -- re-add sl40

* Master cleanup -- correct SL40 image

* New Keyboard: walletburner/cajal

* Added license attribution to *.{c,h} files

* Update keyboards/walletburner/cajal/config.h

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/walletburner/cajal/keymaps/ortho/keymap.c

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

* Rename 'ortho' keymap to 'default_ortho'

* Update keyboards/walletburner/cajal/cajal.c

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

* Update readme.md

Adding bootloader instructions.

Co-authored-by: worldspawn00 <mcmancuso@gmail.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2021-01-15 16:49:49 -05:00
QMK Bot
6525551357 Merge remote-tracking branch 'origin/master' into develop 2021-01-15 20:41:00 +00:00
Peter Peterson
fe14907039
Adds VIA support for the KPRepublic's BM60 Poker (#11267) 
* WIP working on new keymap

* tweaking keymap

* updated keymap

* cleaned up a little bit

* New preonic keymap

* my preonic keymap

* added mac layout

* preonic map update

* cleaning up old repo

* cleaning up to match upstream

* more cleanup

* removing old keymaps

* cleaned up commit history for bm60poker via support

* cleaned up via keymap

* fixed copywrite

Co-authored-by: Peter Peterson <ppeterson@noao.edu>
 2021-01-15 15:40:26 -05:00
QMK Bot
fef4ed568e Merge remote-tracking branch 'origin/master' into develop 2021-01-15 08:26:36 +00:00
James Young
d72f5435fb
Afternoon Labs Breeze Rev0: Configurator key sequence fix (#11550) 
* human-friendly formatting

* correct key order
 2021-01-15 00:25:50 -08:00
fauxpark
ca7da3866d Merge remote-tracking branch 'upstream/master' into develop 2021-01-15 18:34:12 +11:00
James Young
8cf5f72aad
Cutie Club Borsdorf: Configurator key sequence fix (#11549) 
* human-friendly formatting

* correct key order (ISO Enter)
 2021-01-14 23:26:30 -08:00
Ohashi
6009a91514
[Keyboard] Add cool836A 1_2 (#11467) 
* 1st trial on 1_2

* remove keymaps/default/km_default.c

* fix cool836A.h

* fix keymap.c into 3x12

* rename to cool836a (not 'A')

* remove cool836A (not a)

* remove backslashes at keymap.c

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

* update keymap.c (add licence)

* Update keyboards/cool836a/keymaps/default/readme.md

removed "<br>" in line 2

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

* Update keyboards/cool836a/keymaps/default/readme.md

remove "<br>" in line 4

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

* Update keyboards/cool836a/keymaps/default/readme.md

remove "<br>" in line 8

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

* Update keyboards/cool836a/cool836a.h

remove cool836a.h line 30:36

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

Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-01-14 22:27:21 -08:00
Andy
f1b06d0ae7
[Keymap] Adds ymdk/ymd09 andys8 layout (#11320) 
Custom layout for macropad. It shows the usage of macros with unicode,
and other layouts (ISO-DE) with unicode, emojis, and git commands.
 2021-01-14 11:29:22 -08:00
Domantas
e9f73e5454
[Keymap] Add domnantas lily58 keymap (#10910) 
* Initialize domnantas layout

* Update oled status display

* Layout and oled changes

* Updates to keymap

* Add F keys and page moves

* Add media keys, rearrange home and end

* Add instructions

* Swap backspace and enter

* Remove unnecesary Enter keymap

* - Change display timeout
- Update minus sign to work on both English and Lithuanian layouts

* Add copyright header

* Replace static strings with PSTR

* Update keyboards/lily58/keymaps/domnantas/keymap.c

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

* Update keyboards/lily58/keymaps/domnantas/keymap.c

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

* Update keyboards/lily58/keymaps/domnantas/keymap.c

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

* Update keyboards/lily58/keymaps/domnantas/keymap.c

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

* Update keyboards/lily58/keymaps/domnantas/rules.mk

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

Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-01-14 11:04:30 -08:00
Ryan
f325bd6eb2
Remove DESCRIPTION, B-D (#11513) 2021-01-15 05:00:04 +11:00
QMK Bot
4b44452900 Merge remote-tracking branch 'origin/master' into develop 2021-01-14 16:58:07 +00:00
Nick Blyumberg
3525a61baf
Updated documentation for new BDN9 board revisions (#11380) 
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Danny <nooges@users.noreply.github.com>
 2021-01-14 11:57:30 -05:00
QMK Bot
749d9f2227 Merge remote-tracking branch 'origin/master' into develop 2021-01-14 07:08:25 +00:00
Joshua Diamond
c46619d8fb
[Keyboard] eliminate nested layout warnings in kbd75 (#11540) 2021-01-13 23:07:47 -08:00
QMK Bot
a668640a3f Merge remote-tracking branch 'origin/master' into develop 2021-01-14 07:03:47 +00:00
melonbred
b323ab89e0
[Keyboard] Added Ortho support to Program Yoink kb (#11534) 
* Added Ortho support

* Updated JSON
 2021-01-13 23:03:12 -08:00
QMK Bot
18ae86faf5 Merge remote-tracking branch 'origin/master' into develop 2021-01-14 07:01:48 +00:00
J.Flanagan
1f633c027b
[Keyboard] Add VIA support for CA66 (#11522) 
* Add VIA support

made changes to add VIA support for the CA66

- added VIA keymap.c, readme.md, rules.mk
- changes made to main rules.mk to keep firmware size down (mousekey_enable = no; backlight_enable = no)
- changed VENDOR_ID in config.h from 0xFEED to 0x504B (PK)

* Minor changes to CA66 for VIA support

edited keymap info
enabled backlight

* Update vendorID

Change to vendorID to remove conflict with previously chosen vendorID already in use

* Update keyboards/playkbtw/ca66/rules.mk

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/playkbtw/ca66/keymaps/via/readme.md

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/playkbtw/ca66/keymaps/via/keymap.c

Co-authored-by: Joel Challis <git@zvecr.com>

Co-authored-by: Joel Challis <git@zvecr.com>
 2021-01-13 23:01:14 -08:00
QMK Bot
15f0fa85c9 Merge remote-tracking branch 'origin/master' into develop 2021-01-14 06:58:28 +00:00
duoshock
1f38221ec5
[Keyboard] Add ISO Macro keyboard (#11517) 
* -

* -

* -

* -

* -

Co-authored-by: online <33636898+online@users.noreply.github.com>
 2021-01-13 22:57:55 -08:00
QMK Bot
3dfaf12030 Merge remote-tracking branch 'origin/master' into develop 2021-01-14 06:51:52 +00:00
Eithan Shavit
68c3773c8e
[Keyboard] Add new afternoonlabs/breeze/rev0 split keyboard (#11510) 
* Adding new breeze keyboard under afternoonlabs

* Compiling only Rev0, moving readme there

* Apply suggestions from code review

Addressing review comments, removing legacy description config. Removing copy paste leftovers

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

* Addressing review, remove empty rules.mk

* typos

* Apply suggestions from code review

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

Co-authored-by: Eithan Shavit <eithan@fb.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-01-13 22:51:24 -08:00
QMK Bot
770e0f08d5 Merge remote-tracking branch 'origin/master' into develop 2021-01-14 06:46:51 +00:00
Josh Johnson
5dfb6459df
[Keyboard] Add Hub20 keyboard (#11497) 
* add Hub20 support

* Keymap formatting cleanup

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

* Delete bootloader_defs.h as no longer required

* Correct make / flashing example

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

* Update rules.mk

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

Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-01-13 22:46:07 -08:00
QMK Bot
ea7b82b33c Merge remote-tracking branch 'origin/master' into develop 2021-01-14 06:40:40 +00:00
koshinoya
d97d4794e0
[Keyboard] Add Rect44 keyboard (#11484) 
* Add Rect44 keyboard

* Update keyboards/rect44/readme.md

Co-authored-by: Joel Challis <git@zvecr.com>

* Delete config.h files in keymaps

* Update keyboards/rect44/rules.mk

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

* Update keyboards/rect44/readme.md

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

* Update keyboards/rect44/config.h

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

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2021-01-13 22:40:10 -08:00
QMK Bot
c7cfdd82bb Merge remote-tracking branch 'origin/master' into develop 2021-01-14 06:39:46 +00:00
Adam Gwilliam
b48a5b573f
[Keymp] add gwillad's keymap for prime_e (#11477) 
* new keymap

* Update keyboards/primekb/prime_e/keymaps/gwillad/keymap.c

use a more concise pin setting method

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

Co-authored-by: Adam Gwilliam <agwilliam@yaharasoftware.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2021-01-13 22:39:15 -08:00
QMK Bot
3810bda5a5 Merge remote-tracking branch 'origin/master' into develop 2021-01-14 06:02:33 +00:00
qpockets
eb0ce0abc7
[Keyboard] Add space space keyboard (#11425) 
* add space_space keyboard

* update space_space readme

* fix space_space formatting issue

* add layout readme, vid & pid

* experiment

* readme fix

* readme fix

* readme fix

* readme formatting

* readme formatting

* readme formatting

* Update keymap.c

change I+O combo to O+P because of accidental activation

* Update keymap.c

change I+O combo to O+P because of accidental activation

* Update readme.md

change keymap readme to reflect keymap changes

* Apply suggestions from code review

remove deprecated  "key count" from .json

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

* Apply suggestions from code review

-move combo and modtap defines to the keymap level
-formatting issues

Co-authored-by: Joel Challis <git@zvecr.com>

* move combo defines to keymap level and update config.h

* Apply suggestions from code review

add lower resolution readme picture and sleep LED note

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

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-01-13 22:01:58 -08:00
QMK Bot
84e71ecf10 Merge remote-tracking branch 'origin/master' into develop 2021-01-14 05:58:55 +00:00
David Dejaeghere
501f3ed419
[Keyboard] Adding new keyboard UD_40 ortho version (#11401) 
* Adding keyboard UD_40 Ortho

* Update keyboards/mechstudio/ud_40_ortho/info.json

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

* Update keyboards/mechstudio/ud_40_ortho/keymaps/default/keymap.c

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

* Update keyboards/mechstudio/ud_40_ortho/keymaps/default/keymap.c

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

* Update keyboards/mechstudio/ud_40_ortho/keymaps/default/keymap.c

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

* Update keyboards/mechstudio/ud_40_ortho/keymaps/via/keymap.c

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

* Update keyboards/mechstudio/ud_40_ortho/keymaps/via/keymap.c

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

* Update keyboards/mechstudio/ud_40_ortho/ud_40_ortho.h

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

* Update keyboards/mechstudio/ud_40_ortho/keymaps/via/keymap.c

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

* Update keyboards/mechstudio/ud_40_ortho/ud_40_ortho.h

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

* Update keyboards/mechstudio/ud_40_ortho/rules.mk

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

* fixing syntax after merging suggestions

* Update keyboards/mechstudio/ud_40_ortho/config.h

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/mechstudio/ud_40_ortho/keymaps/default/keymap.c

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/mechstudio/ud_40_ortho/keymaps/via/keymap.c

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

* Update keyboards/mechstudio/ud_40_ortho/rules.mk

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/mechstudio/ud_40_ortho/ud_40_ortho.h

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/mechstudio/ud_40_ortho/rules.mk

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/mechstudio/ud_40_ortho/config.h

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

Co-authored-by: David <david@tarpit.be>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-01-13 21:58:16 -08:00
QMK Bot
1504b328d1 Merge remote-tracking branch 'origin/master' into develop 2021-01-14 05:57:02 +00:00
Christian Eiden
8ea28429e9
[Keymap] own Lily58 keymap (#11395) 
* [Keymap] own Lily58 keymap

Signed-off-by: Christian Eiden <christian@eiden.ch>

* adjustments of personal keymap

Signed-off-by: Christian Eiden <christian@eiden.ch>
 2021-01-13 21:56:22 -08:00
QMK Bot
8233ab83c2 Merge remote-tracking branch 'origin/master' into develop 2021-01-14 05:52:48 +00:00