Commit Graph

9616 Commits

Author SHA1 Message Date
fauxpark
4b3691e72d Merge remote-tracking branch 'upstream/master' into develop 2021-08-15 15:27:25 +10:00
Ryan
4c93c350a6
AL1 refactor (#13679) 2021-08-15 15:19:01 +10:00
Ryan
b1d8efeb59
LFKeyboards: Replace KC_FNx with F(x) (#13999) 2021-08-15 15:18:41 +10:00
Zach White
8a54127782
Fix errors that have cropped up in develop (#14005)
* frooastboard: remove duplicate values from config.h

* pistachio_pro: remove unused pin D5
2021-08-15 11:02:46 +10:00
Zach White
60a36863bc
[Keyboard] ez_maker/directpins for easy one-offs in qmk_configurator (#13321)
* new keyboard: handwired/directpins

* fix promicro keyboard_name

* add teensy2 and teensy2++ support

* align with handwired/onekey

* tweak pids

* add teensy 3.2 and teensy lc to directpins

* move directpins from handwired to ez_maker

* add docs for easy maker
2021-08-14 08:42:59 -07:00
QMK Bot
110a320321 Merge remote-tracking branch 'origin/master' into develop 2021-08-14 15:08:27 +00:00
Ramon Imbao
209fd753cb
[Keyboard] Add TKL-FF PCB (#14003) 2021-08-14 08:07:55 -07:00
QMK Bot
a6d77fdf27 Merge remote-tracking branch 'origin/master' into develop 2021-08-14 14:59:20 +00:00
Rifaa Subekti
1e4f0d9dcf
[Keyboard] add Stealth macropad (#13986)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-08-14 07:58:44 -07:00
QMK Bot
3c013ca7b0 Merge remote-tracking branch 'origin/master' into develop 2021-08-14 13:20:22 +00:00
James Young
de29364827
Ducky One2mini Layout Macro fixes (#14002) 2021-08-14 23:19:50 +10:00
QMK Bot
d1be25e9ab Merge remote-tracking branch 'origin/master' into develop 2021-08-14 09:10:32 +00:00
James Young
47b76f556b
Function96 V2 Configurator fixes (#13996)
* info.json: apply human-friendly formatting

* correct key sequence for LAYOUT_iso

* correct key sequence for LAYOUT_iso_splitspace

* add layout data for LAYOUT_all
2021-08-14 02:10:03 -07:00
QMK Bot
4039c5dda9 Merge remote-tracking branch 'origin/master' into develop 2021-08-14 09:03:03 +00:00
James Young
90583a1668
Orthocode Layout Macro rework (#13995)
* move rotary encoder to top row of layout macro

Makes the layout macro and keycodes resemble the assembled keyboard.

* update info.json data

- convert tabs to spaces
- use human-friendly formatting
- fill in key object labels
- adjust object sequence for layout macro changes
2021-08-14 02:02:24 -07:00
QMK Bot
e021357299 Merge remote-tracking branch 'origin/master' into develop 2021-08-14 08:48:55 +00:00
James Young
e2c6dadfbf
Noxary 378 Layout Macro rework (#13998)
* physically arrange layout macro

* add info.json
2021-08-14 01:48:25 -07:00
QMK Bot
3036189584 Merge remote-tracking branch 'origin/master' into develop 2021-08-14 06:36:00 +00:00
yulei
ed350a1aa6
add falcon keyboard (#13674)
* added falcon keyboard

* Update keyboards/matrix/falcon/rules.mk

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

* Update keyboards/matrix/falcon/rules.mk

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

* Apply suggestions from code review

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

* Apply suggestions from code review

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

* added description for the bootloader

* Apply suggestions from code review

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

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-08-14 16:35:32 +10:00
QMK Bot
1715fa0e8b Merge remote-tracking branch 'origin/master' into develop 2021-08-14 04:55:04 +00:00
Ramon Imbao
088d6abf54
[Keyboard] Add Irene Keyboard (#13991)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-08-13 21:54:38 -07:00
Drashna Jaelre
2881517097
Fix Line endings in Absinthe VIA keymap (#13997) 2021-08-14 13:57:41 +10:00
QMK Bot
e80772da40 Merge remote-tracking branch 'origin/master' into develop 2021-08-14 01:15:07 +00:00
Joshua T
ade989962a
[Keymap] clean up userspace, add XD75 / Keyboardio Atreus (#13121)
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-08-13 18:14:21 -07:00
QMK Bot
1412a785ed Merge remote-tracking branch 'origin/master' into develop 2021-08-14 00:01:38 +00:00
James Young
424b9ff709
Crin Refactor (#13982)
* rename LAYOUT_default to LAYOUT_all

* apply human-friendly formatting to info.json

* correct keyboard dimensions

* correct data for LAYOUT_tsangan

* add labels to LAYOUT_ansi data

* add labels to LAYOUT_all data

* add labels to LAYOUT_iso data

* crin.h: update grid alignment of matrix identifiers

* crin.h: add matrix diagram

* physically position matrix identifiers for LAYOUT_all

- move k2d to top row (right half of split Backspace)
- move k41 to fourth row (right half of split Left Shift [KC_NUBS])

* physically position matrix identifiers for LAYOUT_iso

- move k1d to top row ([KC_NUHS])
- add k41 to fourth row ([KC_NUBS], previously missing)

* refactor keymaps

- grid-align keycodes
- use four-space indent

* correct data for LAYOUT_iso

- move Enter key to home row

* rename LAYOUT_tsangan to LAYOUT_ansi_tsangan

* add LAYOUT_iso_tsangan

* update readme.md

- add `make` command for building
- add "Flashing example..."
- touch-up bootloader jump instructions (previous Markdown didn't render ideally on GitHub)

* extend keymap functionality

- add Grave Accent, Function keys, Print Screen, Scroll Lock and Pause keycodes to keymaps
- add RESET keycode (Fn+R)
- use KC_RGHT for Right arrow

* touch-up bootloader instructions on readme

- note that Bootmagic Lite jump erases persistent settings
- note that Fn+R is RESET keycode by default
2021-08-13 17:01:05 -07:00
Drashna Jael're
7ed235d15d
Merge remote-tracking branch 'origin/master' into develop 2021-08-13 14:15:58 -07:00
Evelien-Lillian Dekkers
af98005b02
[Keyboard] Add Gud70 (#12575)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-08-13 12:53:02 -07:00
alittlepeace
9b922d55dd
[Keyboard] Adding VIA to Absinthe (#13031)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-08-13 12:35:56 -07:00
Sergey Omelchenko
74c9c3e9c2
[Keyboard] Macropad v2 polling rate fix (#13129) 2021-08-13 12:34:47 -07:00
eniigmakeyboards
4db9aa65b2
[Keyboard] Add eniigmakeyboards/ek60 (#13140)
* add eniigmakeyboards/ek60

* Update keyboards/eniigmakeyboards/ek60/rules.mk

Updated layouts

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

* Update keymap.c

Added GPL2+ header

* Update keymap.c

Added GPL2+

* Update rules.mk

Added ISO layout here

* Update readme.md

Added instructions for resetting bootloader

* Update keyboards/eniigmakeyboards/ek60/rules.mk

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

Co-authored-by: adamws <adamws@users.noreply.github.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-08-13 12:34:27 -07:00
NightlyBoards
504d443ee3
[Keyboard] Add n9 macropad (#13168) 2021-08-13 12:32:33 -07:00
DonutCables
0f0ebde0aa
[Keyboard] Updates to ScrabblePad (#13177)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-08-13 12:30:38 -07:00
QMK Bot
854b292873 Merge remote-tracking branch 'origin/master' into develop 2021-08-13 19:30:22 +00:00
steve ulrich
0972789e76
[Keymap] adds sulrich crkbd (corne) personal keymap (#13186) 2021-08-13 12:29:51 -07:00
QMK Bot
fcddaadc56 Merge remote-tracking branch 'origin/master' into develop 2021-08-13 19:29:21 +00:00
Joel Elkins
2aeacf9db7
[Keymap] Updates to jdelkins userspace and keymaps (#13216)
- Remove disused dz60/jdelkins_ss keymap
- Manage configured features for firmware size
- Improve build configuration for the secrets feature
- Various keymap tweaks
- Clean up formatting in various places
2021-08-13 12:28:37 -07:00
QMK Bot
bd811f6546 Merge remote-tracking branch 'origin/master' into develop 2021-08-13 19:28:35 +00:00
Christian Sandven
ac3b9333d8
[Keyboard] Add optional colemak layout to keymap (#13217) 2021-08-13 12:28:05 -07:00
QMK Bot
5c0daf5442 Merge remote-tracking branch 'origin/master' into develop 2021-08-13 19:27:20 +00:00
QMK Bot
21387a7f59 Merge remote-tracking branch 'origin/master' into develop 2021-08-13 19:26:50 +00:00
npspears
3366c5628c
[Keyboard] add support for alternate ortho UD40 PCB (#13491)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-08-13 12:26:49 -07:00
Manna Harbour
1b5d7616d3
[Keyboard] Add split_3x5_3 layout support to boardsource/microdox (#13323) 2021-08-13 12:26:22 -07:00
QMK Bot
a75204743a Merge remote-tracking branch 'origin/master' into develop 2021-08-13 18:53:04 +00:00
Hugues Morisset
d5eb673426
[Keyboard] Interlace matrix scan for performance on Moonlander (#13625) 2021-08-13 11:52:27 -07:00
QMK Bot
d358492fb4 Merge remote-tracking branch 'origin/master' into develop 2021-08-13 18:48:39 +00:00
Weirdo
20589fb050
[Keybord] Add LS_60 keyboard (#13851)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-08-13 11:47:57 -07:00
QMK Bot
72bd653895 Merge remote-tracking branch 'origin/master' into develop 2021-08-13 18:47:00 +00:00
fire-h0und
d52e9321e9
[Keyboard] Add cest73/tkm keyboard (#13939)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: cest <cest@localhost>
2021-08-13 11:46:29 -07:00
QMK Bot
924a0b30c3 Merge remote-tracking branch 'origin/master' into develop 2021-08-13 18:41:31 +00:00
8bits4ever
325009587a
[converter/a1200] Added support for ATmega32u4 (#13974) 2021-08-13 11:40:50 -07:00
Andre Brait
5711a3bac2
[Keymap] Improve andrebrait keymap (#13985) 2021-08-13 11:33:04 -07:00
QMK Bot
fa1ec32e39 Merge remote-tracking branch 'origin/master' into develop 2021-08-13 18:31:14 +00:00
Path Nirvana
670603590e
[Keymap] adding new keymap for the idobo keyboard with backlight (#13969) 2021-08-13 11:31:12 -07:00
Dao Tak Isaac
2c9957eb7e
[Keyboard] Add dtisaac01 keyboard (#13967)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-08-13 11:30:43 -07:00
QMK Bot
349d36ff89 Merge remote-tracking branch 'origin/master' into develop 2021-08-13 18:30:33 +00:00
Logan Butler
f00e56eb0b
[Keyboard] Add Southpad Keyboard (#13964)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-08-13 11:29:59 -07:00
Drashna Jaelre
041ff26ff1
[Keyboard] Fixup Ungodly Launch Pad config (#13992) 2021-08-13 11:28:43 -07:00
QMK Bot
ad2f3a0cf5 Merge remote-tracking branch 'origin/master' into develop 2021-08-13 18:23:05 +00:00
minibois
8392729d74
[Keyboard] Add the mini_elixivy keyboard (#13960)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-08-13 11:22:28 -07:00
QMK Bot
8fea9722dd Merge remote-tracking branch 'origin/master' into develop 2021-08-13 18:21:40 +00:00
Simon
0014c32375
[Keyboard] Added Frooastboard (#13970)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-08-13 11:21:32 -07:00
Vincent Vorholter
0967d4c8a9
[Keyboard] Add Basketweave VIA keymap (#13972)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Vince Vorholter <vince@28east.co.za>
2021-08-13 11:21:09 -07:00
QMK Bot
ceb428c9aa Merge remote-tracking branch 'origin/master' into develop 2021-08-13 18:18:30 +00:00
Alabahuy
0b90877b4b
[Keyboard] add rart75m with via support (#13975) 2021-08-13 11:18:02 -07:00
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 4ad3834925508b79f2ff9fd5526dfc39f07fa3bc.

* 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
Daniil Yastremskiy
26ea090190
Limit RGB max brightness on KPrepublic BM-series keyboards (#13132) 2021-08-09 11:32:35 -07:00
Drashna Jaelre
2617ac6041
Fixup rgb matrix config for KBD67 mkII boards (#13931) 2021-08-09 19:26:02 +01:00
Pierre Chevalier
23becac3a6
Support all the 0.2 Ferris variants (#12653)
* Support all the 0.2 Ferris variants

For the Compact, the High and the Mini, create a new directory so each
keyboard may have the correct USB descriptor and a readme with more
specific information about it.

For the Bling, also add support for the underglow functionality.

Change the "MANUFACTURER" string to "Cuddly Keyboards Ltd.", the
name of the company I incorporated to sell keyboards, and change the
default descriptor from "Ferris the keeb" to "Ferris 0.2" which is more
descriptive.
I didn't update the 0.1 variants as I don't intend to sell these kits
with "Cuddly Keyboards". The firmware is mostly there to support
existing users.

Update the "hardware availability" to point to my new website:
cuddlykeyboards.com.

* Add RGB mode toggle to my keymap and to the default keymap

* Improve wording in the readme
2021-08-09 11:23:15 -07:00
Stick
5a59363e28
[User] changes to nstickney's keymaps (#11456)
0) Built a Bastyl, gave away the ErgoDoxEZ
1) UNICODEMAP
2) Iris left is now Elite-C
3) New QMK flashing instructions
2021-08-09 10:34:36 -07:00
QMK Bot
8d19f4f187 Merge remote-tracking branch 'origin/master' into develop 2021-08-09 17:06:58 +00:00
Edvard Sire
8936d0ae4b
[Keymap] new keymap for nui_mini (#13924) 2021-08-09 10:06:25 -07:00
QMK Bot
ed7f06bd7b Merge remote-tracking branch 'origin/master' into develop 2021-08-09 17:05:08 +00:00
Andre Brait
dbee96098d
Make default keymap for GMMK Pro reflect stock (#13850) 2021-08-09 10:04:58 -07:00
Pascal Pfeil
9a1a35f681
[Keymap] Add kbd67 mkiirgb keymap (#13884)
Co-authored-by: Spaceman <rionlion100@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-08-09 10:04:40 -07:00
QMK Bot
f3cede7299 Merge remote-tracking branch 'origin/master' into develop 2021-08-09 17:04:30 +00:00
Michele Ferri
be72a64cf6
[Keyboard] Add TouhouPad (#13915)
* Touhoupad rev 2

* cleanup for PR

* fixes after review
2021-08-09 10:04:00 -07:00
Zach White
12681bacc4 Merge remote-tracking branch 'origin/master' into develop
Conflicts:
	keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.c
2021-08-09 08:34:14 -07:00
Zach White
e6c171bdd6
Fix generate api (#13930)
* Add missing returncode to exit()

* fix the aozora/hotswap vendor id
2021-08-09 08:28:51 -07:00
Chris
79d5b27993
[Keymap] rootiest for planck/rev6/ (#13294)
* squashed commits to master

* Fix in case of missing user_song_list
Substitutes missing songs with safe versions
Also updated and added detail to keymap readme

* Adjust Readme to match qmk contrib conventions

* Update keyboards/planck/keymaps/rootiest/config.h

* Update keyboards/planck/keymaps/rootiest/keymap.c

* Update keyboards/planck/keymaps/rootiest/keymap.c

* Update keyboards/planck/keymaps/rootiest/keymap.c

* Update keyboards/planck/keymaps/rootiest/keymap.c

* Fixed license header to GPLv2+

* Fix Volume key delay
Use a static number instead of removed MEDIA_KEY_DELAY

* Use TAP_CODE_DELAY

* added license to config.h

* Clean up formatting
- Fixed markdown in readme
- Removed extra commented line from config.h

* Update keyboards/planck/keymaps/rootiest/config.h
2021-08-09 02:25:43 -07:00
jfescobar18
59b5c884ff
[Keyboard] Undead 60M (#13735)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-08-08 23:17:46 -07:00
Phooood
7c2f48e55d
[Keyboard] Add Aozora (hotswap) keyboard (#13919)
* Initial Commit

* added header to hotswap.c

* added keymap-specific reamdme.md

* minor adjustments

* Requested corrections to readme's
2021-08-08 20:31:33 -07:00
datafx
ac2090bf4e
[Keyboard] Add kbdfans kbd67 mkii rgb v3 (#13714)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-08-07 21:45:43 -07:00
QMK Bot
ac92ded0cc Merge remote-tracking branch 'origin/master' into develop 2021-08-08 04:42:36 +00:00
Spaceman
bfa7449041
[Keyboard] Add Pancake v2 (#13839)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-08-07 21:42:04 -07:00
QMK Bot
8e5213ca6c Merge remote-tracking branch 'origin/master' into develop 2021-08-08 04:41:43 +00:00
Ananya Kirti
b046bffcb8
[Keyboard] Added CapsLED and ScrollLock LEDs (#13837)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-08-07 21:41:15 -07:00
Drashna Jaelre
b9dcd5ac38
[Keymap] Drashna split transport improvement (#13905)
* Fix up split stuff

* Fix Split perf issues

* Allow LTO to be disabled

* Fixup WPM and encoders

* Fixup qmk keys per scan

* Add bootloader info

* Change encoder pins

* Fixup corne oled code

* Expand transport sync

* Improve user transport

* Cleanup mouse processing at keymap level

* Improve layer checking for mouse layering
2021-08-07 21:40:48 -07:00
QMK Bot
100333818f Merge remote-tracking branch 'origin/master' into develop 2021-08-08 04:15:54 +00:00
8bits4ever
bc2b73f997
[Keyboard] a1200 converter minor changes (#13848)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-08-07 21:15:23 -07:00
QMK Bot
21b71932f7 Merge remote-tracking branch 'origin/master' into develop 2021-08-08 04:13:48 +00:00
jpuerto96
41d854048c
[Keyboard] Gorthage Truck - New PCB (#13909)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-08-07 21:12:55 -07:00
QMK Bot
6c5ef3ce30 Merge remote-tracking branch 'origin/master' into develop 2021-08-08 03:38:09 +00:00
Pascal Pfeil
27d0844efb
[Keyboard] Clean up lfkpad and add keymap (#13881)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-08-07 20:37:13 -07:00
QMK Bot
d0f1a4c48a Merge remote-tracking branch 'origin/master' into develop 2021-08-08 03:24:59 +00:00
peott-fr
34689e348f
[Keyboard] Adding my Nyquist keymap (#13858) 2021-08-07 20:24:24 -07:00
Drashna Jaelre
d06f50a31a
[Keyboard] Fix matrix_output_unselect_delay for handwired/xealousbrown (#13913) 2021-08-08 01:36:38 +10:00
QMK Bot
243e75659c Merge remote-tracking branch 'origin/master' into develop 2021-08-07 14:57:43 +00:00
kb-elmo
07e2c11e55
[Keyboard] fixes for KBD67 rev2 (#13906) 2021-08-07 07:57:14 -07:00
Drashna Jaelre
6fb9842936
Clean up remaining RGB_DISABLE_WHEN_USB_SUSPENDED defines Part 2 (#13912) 2021-08-07 15:18:06 +01:00
James Young
a03aa301de
Remove Full Bootmagic (#13846)
* disambiguate Bootmagic rules in keymaps

The files edited by this commit were added at a point in time where `BOOTMAGIC_ENABLE = yes` enabled full Bootmagic.

This commit edits the files to specify that full Bootmagic is intended.

* remove BOOTMAGIC_ENABLE=full setting

* unify commented BOOTMAGIC_ENABLE rules in keyboards

Explicitly sets `BOOTMAGIC_ENABLE = no` in keyboards where the rule was commented out.

Command:

```
find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e 's;#[ \t]*\(BOOTMAGIC_ENABLE\)[ \t=]\+\([a-zA-Z]\+\).*;\1 = no       # Virtual DIP switch configuration;g' {} +
```

* remove commented Bootmagic rules from keymap/user level

Command:

```
find keyboards/ layouts/ users/ -type f -name 'rules.mk' -exec sed -i -e '/#.*\(BOOTMAGIC_ENABLE\)[ \t=]\+\([a-z]\+\).*/d' {} +
```

* update keyboard BOOTMAGIC_ENABLE rule formatting

Sets the formatting of BOOTMAGIC_ENABLE rules to `BOOTMAGIC_ENABLE = [value]`, without the inline comments (which will be replaced later).

Command:

```
find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE\)[ \t=]\+\([a-z]\+\).*;\1 = \2;g' '{}' +
```

* update keyboards' BOOTMAGIC_ENABLE settings

Updates keyboard `rules.mk` files to use `BOOTMAGIC_ENABLE = lite` where `BOOTMAGIC_ENABLE = full` was being used.

Command:

```
find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE = \)full;\1lite;g' '{}' +
```

* update keymap/user BOOTMAGIC_ENABLE settings

Updates keymap/user `rules.mk` files to use `BOOTMAGIC_ENABLE = lite` where `BOOTMAGIC_ENABLE = full` was being used.

Commands:

```
find keyboards/ -type f -name 'rules.mk' -and -path '*/keymaps/*' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE[ \t=]\+\)full;\1lite;g' '{}' +
find layouts/community/ users/ -type f -name 'rules.mk' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE[ \t=]\+\)full;\1lite;g' '{}' +
```

* remove and replace inline comments in keyboards and keymap/user files

Removes and replaces the inline comments, which have been updated to read `Enable Bootmagic Lite`.

Commands:

```
find keyboards/ -type f -name 'rules.mk' -and -path '*/keymaps/*' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE\)[ \t=]\+\([a-z]\+\).*;\1 = \2;g' '{}' +
find layouts/community/ users/ -type f -name 'rules.mk' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE\)[ \t=]\+\([a-z]\+\).*;\1 = \2;g' '{}' +
find keyboards/ layouts/community/ users/ -type f -name 'rules.mk' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE = lite\);\1     # Enable Bootmagic Lite;g' '{}' +
find keyboards/ layouts/community/ users/ -type f -name 'rules.mk' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE = yes\);\1      # Enable Bootmagic Lite;g' '{}' +
find keyboards/ layouts/community/ users/ -type f -name 'rules.mk' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE = no\);\1       # Enable Bootmagic Lite;g' '{}' +
```

* rename improperly named makefiles

Some files intended to be used as makefiles had improper names causing them to not be used as intended when building.

This commit corrects the filenames of the affected files.

* update renamed file with new rule formatting

* update QMK's template files

Updates QMK's `rules.mk` templates to use the new inline comment.

* update QMK Docs

- remove documentation of full Bootmagic
- update links to Bootmagic Lite doc
- add doc for Magic Keycodes

* rules.mk patch for coarse/ixora and coarse/vinta
2021-08-06 23:59:56 -07:00