gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2024-11-26 21:26:46 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,262 Commits 63 Branches 1,610 Tags 925 MiB
477365912d
Commit Graph

9451 Commits

Author SHA1 Message Date
Drashna Jaelre
477365912d
Fix some additional bootmagic settings (#13979) 2021-08-12 13:03:40 -07:00
Drashna Jaelre
799c2bdfa3
[Keyboard] Fix default keymap for GMMK Pro Iso (#13980) 2021-08-13 04:47:20 +10:00
QMK Bot
968a3b324b Merge remote-tracking branch 'origin/master' into develop 2021-08-12 18:04:20 +00:00
Drashna Jaelre
fd4759dcfa
[Keyboard] Fix keymaps for Ocean Gin v2 (#13976) 2021-08-13 04:03:50 +10:00
Drashna Jael're
8e8ec6338c
Merge remote-tracking branch 'origin/master' into develop 2021-08-12 09:18:18 -07:00
Vino Rodrigues
80015f7fb0
Update config.h for kbdfans/kbd67/mkiirgb/v3 (#13978) 
QMK Configurator does not compile - needs a value on RGB_DISABLE_WHEN_USB_SUSPENDED
 2021-08-12 09:04:06 -07:00
Jarrett Drouillard
2218879d68
[Keymap] add kuatsure planck keymap (#10625) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-08-12 08:56:25 -07:00
Luis Godinez
a2d5468df3
[Keyboard] Add Launch Pad keymaps (#12490) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-08-12 08:51:56 -07:00
David Hoelscher
541e749aa8
[Keyboard] Update to customMK Genesis (#12511) 
Co-authored-by: Ray <ray@custommk.com>
 2021-08-12 08:51:34 -07:00
Vanilla
74aff52bff
[Keyboard] Add Spacey keyboard firmware (#12599) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: tfjones24 <tannerfj24@gmail.com>
 2021-08-12 08:50:12 -07:00
Paul James
7ee2b0f1ee
[Keyboard] Add Tripel keyboard (#12635) 2021-08-12 08:49:51 -07:00
Christian Sandven
022e2748af
[Keyboard] Keyprez rhino (#13035) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-08-12 08:38:37 -07:00
Quentin
356561c438
[Keyboard] Add Skeletyl keyboard (#13495) 
Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-08-12 07:45:42 -07:00
Jacob Jerrell
30843f8329
[Keymap] JJerrell - Add Userspace and ZSA Keyboard Keymaps (#13548) 2021-08-12 07:44:15 -07:00
QMK Bot
176bce50e9 Merge remote-tracking branch 'origin/master' into develop 2021-08-12 14:43:35 +00:00
sato-takashi
1e9d91d4ef
[Keyboard] Add EndZone34 (#13847) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2021-08-12 07:43:01 -07:00
QMK Bot
cb8be2d468 Merge remote-tracking branch 'origin/master' into develop 2021-08-12 14:25:30 +00:00
James Young
b61613ccb4
Cospad Configurator touch-up (#13971) 2021-08-12 07:24:58 -07:00
QMK Bot
fd1b0f91e5 Merge remote-tracking branch 'origin/master' into develop 2021-08-12 13:59:41 +00:00
arnstadm
ac92f4b721
[Keyboard] Add Edda Keyboard (#13953) 
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-08-12 06:59:07 -07:00
Andre Brait
33f64903b4
[Keymap] Add andrebrait layout for GMMK Pro (#13932) 2021-08-12 06:55:19 -07:00
QMK Bot
7fe375aef5 Merge remote-tracking branch 'origin/master' into develop 2021-08-12 03:40:49 +00:00
David Dansby
6a5c07680c
[Keymap] Add lily58 datadavd layout (#13560) 2021-08-11 20:40:17 -07:00
QMK Bot
353c615c29 Merge remote-tracking branch 'origin/master' into develop 2021-08-12 02:45:25 +00:00
Rifaa Subekti
2bc2a51618
[Keyboard] add Gin V2 keyboard (#13943) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-08-11 19:44:59 -07:00
QMK Bot
d9f2f9d22f Merge remote-tracking branch 'origin/master' into develop 2021-08-12 02:44:46 +00:00
Rifaa Subekti
af81e3e63d
[Keyboard] add Wang V2 keyboard (#13948) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-08-11 19:44:15 -07:00
James Young
345f6dc4e6
Merge remote-tracking branch 'upstream/master' into develop 
Fixes merge conflicts in:

- keyboards/poker87c/rules.mk and keyboards/poker87d/rules.mk
  - Conflicts from PR 13961
- keyboards/tronguylabs/m122_3270/keymaps/default/keymap.c
  - Conflict from PR 13947
 2021-08-11 09:48:25 -07:00
Vicktor Hutama
02ac0f89c4
[Keyboard] Add Rune Vaengr Keyboard (#13945) 
* initial commit

* fixed layout

* enabled NKRO

* removed qmkbest

* changed the pins and bootloader to the mcu version

* updated readme

* Apply suggestions from code review

thank you @drashna

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

Co-authored-by: Drashna Jaelre <drashna@live.com>
 2021-08-11 00:24:34 -07:00
jmaynard
710d37b3eb
[Keyboard] Improvements to m122_3270 (#13947) 
Co-authored-by: Jay Maynard <jmaynard@conmicro.com>
 2021-08-11 00:21:40 -07:00
James Young
71ce2b0d79
Poker87C and Poker87D Refactor (#13961) 2021-08-11 00:20:10 -07:00
James Young
3161f10b1f
Update USB Device strings for VIA identification (#13962) 2021-08-11 00:19:55 -07:00
QMK Bot
5ed7210d53 Merge remote-tracking branch 'origin/master' into develop 2021-08-11 02:11:51 +00:00
Fernando Rodrigues
83a1c4763a
[Keyboard] Added split plus layout to Cospad (#13938) 2021-08-10 19:11:19 -07:00
QMK Bot
d58dc522a5 Merge remote-tracking branch 'origin/master' into develop 2021-08-11 02:10:38 +00:00
jpuerto96
04b9286605
[Keyboard] Gorthage Truck - Rotary Encoder Switch Position (#13942) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-08-10 19:09:59 -07:00
QMK Bot
1537e3975d Merge remote-tracking branch 'origin/master' into develop 2021-08-11 00:31:28 +00:00
Ananya Kirti
8d4fcd678a
Hp69 - Update led logic (#13940) 
Co-authored-by: zvecr <git@zvecr.com>
 2021-08-11 10:30:56 +10:00
Luigi311
8d1255ccab
Handwired/Stream_Cheap/2x4: Add via support (#13297) 
* Handwired/Stream_Cheap/2x4: Add via support

Signed-off-by: Luigi311 <luigi311.lg@gmail.com>

* Handwired/Stream_Cheap: Update readme for via

Signed-off-by: Luigi311 <luigi311.lg@gmail.com>

* Handwired/Stream_Cheap/2x4: Add 2x4 to via json

Signed-off-by: Luigi311 <luigi311.lg@gmail.com>

* Handwired/Stream_Cheap/2x4: Add GPL2+ License to keymap

Signed-off-by: Luigi311 <luigi311.lg@gmail.com>
 2021-08-11 07:40:30 +10:00
Alin Marin Elena
184c2e35af
add support for m65 and simple 5x13 ortholinear (#12315) 
* add support for m65 and simple 5x13 ortholinear

* Update keyboards/m65/keymaps/default/keymap.c

Co-authored-by: Sergey Vlasov <sigprof@gmail.com>

* Update keyboards/m65/keymaps/default/keymap.c

Co-authored-by: Sergey Vlasov <sigprof@gmail.com>

* Update keyboards/m65/keymaps/default/keymap.c

Co-authored-by: Sergey Vlasov <sigprof@gmail.com>

* Update keyboards/m65/keymaps/default/keymap.c

Co-authored-by: Sergey Vlasov <sigprof@gmail.com>

* Update keyboards/m65/keymaps/default/keymap.c

Co-authored-by: Sergey Vlasov <sigprof@gmail.com>

* Update keyboards/m65/keymaps/default/keymap.c

Co-authored-by: Sergey Vlasov <sigprof@gmail.com>

* updates as per @sigprof review plus reformat

* pins all now are defined at microcontroller level

* profuct id defined at microcontroller level

* put leds on when _ADJ is on

* add danish keymap

* make default uk centric iso as per readme

* default is now iso generic, uk is its own business

* add license

* update imgur links to reflect the layout

* leds for _ADJ layer now do not prevent the other layers leds to get on

* Update keyboards/m65/keymaps/uk/keymap.c

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

* Update keyboards/m65/keymaps/dk/keymap.c

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

* Update keyboards/m65/keymaps/uk/readme.md

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

* Update keyboards/m65/readme.md

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

* add support for gd32f303cct6 by we act in rev2

* Revert "add support for gd32f303cct6 by we act in rev2"

This reverts commit 4ad3834925.

* Update keyboards/m65/rev1/rules.mk

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

* Update keyboards/m65/keymaps/dk/readme.md

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

* Update keyboards/m65/keymaps/uk/readme.md

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

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

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

* remove empty hal

* add capslock

* Update keyboards/m65/readme.md

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

* Update keyboards/m65/config.h

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

Co-authored-by: Alin M Elena <alin-marin.elena@stfc.ac.uk>
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
 2021-08-11 06:59:01 +10:00
QMK Bot
85090b77af Merge remote-tracking branch 'origin/master' into develop 2021-08-10 05:24:08 +00:00
rate
076c8cc45f
[Keyboard] Added pistachio_pro (#13466) 
* Added pistachio_pro

* Apply suggestions from code review

* Apply suggestions from code review
 2021-08-09 22:23:25 -07:00
QMK Bot
3e0517f1ef Merge remote-tracking branch 'origin/master' into develop 2021-08-10 04:07:54 +00:00
Ryuki
8ef58e3291
adding my keymap "vayashiko" (#13049) 
* adding my keymap

* changed some bugs

* removed include keymap.h
 2021-08-09 21:07:14 -07:00
QMK Bot
f0a2641cf1 Merge remote-tracking branch 'origin/master' into develop 2021-08-09 21:15:07 +00:00
Brandon Lewis
760caaa9af
Ristretto - Update bootloader (#13933) 
* updated bootloader for 32u4 mcu

Should be atmel-dfu instead of caterina as the mcu is integrated instead of on a pro-micro/elite-c
 2021-08-09 14:14:33 -07:00
Dasky
bb2986c115
Fix compliation for ferris 0.2 bling (#13937) 
* Fix include
 2021-08-09 14:04:40 -07:00
James Young
7bec943043
Merge remote-tracking branch 'upstream/master' into develop 
Fixes merge conflicts in:

- keyboards/bm40hsrgb/config.h
  - Conflict from PR 13132:
    - RGB_DISABLE_WHEN_USB_SUSPENDED signature updated in develop branch, unmodified in master branch
    - updated file with changes from master branch

- keyboards/keebio/iris/keymaps/nstickney/keymap.c
  - Conflict from PR 11456:
    - layer_state_set_user() updated in develop branch, removed in master branch
    - updated file with changes from master branch
 2021-08-09 12:14:22 -07:00
Joel Challis
c0628c2820
Remove backwards compatibility of debounce names (#13877) 
* Remove backwards compatibility of debounce names

* Update docs

* Update keyboards/keymaps
 2021-08-09 19:46:18 +01:00
Joel Challis
7c691d82bf
Remove ONEHAND_ENABLE (#13920) 2021-08-09 19:46:03 +01:00