Commit graph

17432 commits

Author SHA1 Message Date
James Young
4279b14adf
Merge remote-tracking branch 'upstream/master' into develop
Conflicts:
	keyboards/gmmk/pro/ansi/keymaps/jonavin/rules.mk
	keyboards/space_space/rules.mk
2021-08-19 11:32:23 -07:00
GG
f4f679779e
[Keyboard] Add Mammoth20x (#14014) 2021-08-19 11:17:54 -07:00
Yaroslav Smirnov
c592128219
[Keyboard] Add Elrgo S to keyboards/handwired (#13893)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-08-19 11:15:30 -07:00
weteor
1bfbaae533
[Keyboard] add 3w6 (#13746) 2021-08-19 11:13:00 -07:00
kb-elmo
8200804e96
[Keyboard] Add Voice65 (#13744)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-08-19 11:12:34 -07:00
James Young
c039796d9d
keebzdotnet F-Me Configurator fixes and codebase touch-up (#14077)
* rename LAYOUT to LAYOUT_all

* add info.json

* override DYNAMIC_KEYMAP_LAYER_COUNT for via keymap

The via keymap only initialized two layers without overriding the default value of DYNAMIC_KEYMAP_LAYER_COUNT (4).

This commit sets DYNAMIC_KEYMAP_LAYER_COUNT for the via keymap to 2.
2021-08-19 18:47:10 +01:00
James Young
9aedf515c0
kb-elmo Noah AVR Community Layout support and Configurator fix (#14078)
* noah_avr.h: use QMK 3-character notation for matrix positions

* Community Layout support, Stage 1

- rename LAYOUT_ansi to LAYOUT_65_ansi_blocker
- rename LAYOUT_ansi_splitbs to LAYOUT_65_ansi_blocker_split_bs
- enable Community Layout support

* info.json: add line breaks between rows

* info.json: correct LAYOUT_iso data

- unsplit the Backspace
- change ANSI Enter to ISO Enter
- split the left Shift

* Community Layout support, Stage 2

- rename LAYOUT_iso to LAYOUT_65_iso_blocker
- update Community Layout support

* Community Layout support, Stage 3

- add LAYOUT_65_iso_blocker_split_bs
- update Community Layout support

* noah_avr.h: add matrix diagram
2021-08-19 18:46:22 +01:00
jonavin
98af5bc64e
[Keymap] Add jonavin user space / common functions (#13876)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Jonavin <=>
2021-08-19 10:45:49 -07:00
jfescobar18
425e1e665d
[Keyboard] Dumbpad VIA support added (#13512)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-08-19 10:39:30 -07:00
XScorpion2
9d1c98c891
Added right vs left specific pin assignments for dip switch (#13074)
* Added right vs left specific pin assignments for dip switch

* Update feature_dip_switch.md

* Ran formatting tools
2021-08-19 18:39:15 +01:00
Alan Pocklington
3b4c35da6b
[Keymap] Quark AJP10304 layout (#13290) 2021-08-19 10:36:20 -07:00
qpockets
c98e1694fb
[Keyboard] update space_space keyboard (#13305)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-08-19 10:17:01 -07:00
QMK Bot
af3673a5b6 Merge remote-tracking branch 'origin/master' into develop 2021-08-19 17:14:07 +00:00
James Young
48a8682438
Linworks Whale75 Layout Macro refactor and Configurator fixes (#14059)
* info.json: human-friendly formatting

* info.json: remove "w":1 instances

* info.json: correct positions of Left, Down and Right Arrow keys

* info.json: add LAYOUT_all data

* move Home key to end of home row

According to photographs of the keyboard, the fourth key down on the right side is physically on the home row. This commit moves the key argument and keycodes to the home row.

* whale75.h: use QMK 3-character notation for matrix

* whale75.h: add matrix diagram

* add keyboard-level encoder functionality

* info.json: correct key sequence on ISO layouts
2021-08-19 10:13:31 -07:00
QMK Bot
a85126b79e Merge remote-tracking branch 'origin/master' into develop 2021-08-19 16:41:46 +00:00
BifbofII
c148476188
[Keymap] Add personal layout for 60% ISO boards (#13232) 2021-08-19 09:41:14 -07:00
Evelien-Lillian Dekkers
81e19d61c0
[Keyboard] Refactor atom47 and add rev4 and rev5 (#13201)
Co-authored-by: Nick Brassel <nick@tzarc.org>
2021-08-19 09:40:28 -07:00
QMK Bot
374b388382 Merge remote-tracking branch 'origin/master' into develop 2021-08-19 16:31:49 +00:00
Felix Jen
a43952f35d
[Keyboard] Add Ready100 Keyboard (#13158)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-08-19 09:31:12 -07:00
QMK Bot
d112935cea Merge remote-tracking branch 'origin/master' into develop 2021-08-19 16:29:30 +00:00
Zereef
4fc01ddefe
[Keyboard] Ymdk_np21 via port (#12693) 2021-08-19 09:28:59 -07:00
QMK Bot
b7a3ddb6d1 Merge remote-tracking branch 'origin/master' into develop 2021-08-19 16:12:49 +00:00
Juno Nguyen
072459871b
[Keymap] community/ortho_4x12/junonum update (#14062)
* Update new community universal keymaps

* Revert bottom row to default for better use of WIN_MODS and MAC_MODS

* Revert to use public domain songs

* Update Dpad layer in junonum to tailor for StarCraft group control

* Remove junonum512

* Update junonum readme

* Define custom songs in the keymap

* Move DP_OFF location

* Update DPAD modifiers

* Update F-row placement in junonum dpad layer

* Update CapsLock location  and rectify KC_APP
2021-08-19 17:12:19 +01:00
QMK Bot
db316716c1 Merge remote-tracking branch 'origin/master' into develop 2021-08-19 16:12:04 +00:00
Ryan
972f8ba69a
Fix AT90USB64/128 bootloaders (#14064) 2021-08-19 17:11:20 +01:00
QMK Bot
1445fd21c8 Merge remote-tracking branch 'origin/master' into develop 2021-08-19 15:53:48 +00:00
yiancar
9ac0023a6a
Add MNK50 (#14031)
* Add MNK50

* Update keyboards/mnk50/rules.mk

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

* Update keyboards/mnk50/rules.mk

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

* Update keyboards/mnk50/readme.md

hihi thanks!

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

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

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

Co-authored-by: yiancar <yiancar@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-08-19 16:53:20 +01:00
QMK Bot
a995dd16a2 Merge remote-tracking branch 'origin/master' into develop 2021-08-19 15:51:56 +00:00
Tran Kim Tung
49be4860f7
[Keyboard] adds new keyboard version: dztech/dz60rgb_wkl/v2_1 (#14021)
* [Keyboard] adds new keyboard version: dztech/dz60rgb_wkl/v2_1

* Update keyboards/dztech/dz60rgb_wkl/readme.md

Remove external flash manual link

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

* dz60rgb_wkl/v2_1: remove NO_USB_STARTUP_CHECK

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

Co-authored-by: Ryan <fauxpark@gmail.com>
2021-08-19 16:51:23 +01:00
QMK Bot
2ff1a6a72f Merge remote-tracking branch 'origin/master' into develop 2021-08-19 15:42:23 +00:00
rate
d6eee3e0f2
Added VIA keymap for pistachio_mp (#14015)
* Added VIA keymap for pistachio_mp

* Fixed typos
2021-08-19 16:41:49 +01:00
QMK Bot
7a125872e2 Merge remote-tracking branch 'origin/master' into develop 2021-08-19 15:41:40 +00:00
AquaCylinder
468661280b
emi20 update (#14013)
* Update keymap & readme

-Keymap.c: Key combinations removed for resetting and added a new way to reset. Also removed unused timer code.

-config.h & rules.mk: Removed on kemap level (these were there for the key combo's)

-Readme.md: Changed the preview image and changed the description to reset the keyboard. Also added what connector type is used.

* Update readme.md

Better wording on how to get the keyboard in bootloader mode

* Update keymap.c

Switched + and - around, same with / and *.
2021-08-19 16:41:05 +01:00
Takeshi ISHII
f86a087127
[Keymap] fix helix:fraanrosi compile error caused by #13677. (#14061)
I'm against using RGBLIGHT_ANIMATIONS because this happens.
See also #8688.
2021-08-19 15:45:47 +09:00
QMK Bot
c8e8c21367 Merge remote-tracking branch 'origin/master' into develop 2021-08-19 00:42:53 +00:00
James Young
068ab2800c
Keebio Quefrency Configurator rework (#14060)
* add info.json for Quefrency rev1

* add info.json for Quefrency rev2

* add info.json for Quefrency rev3

* add info.json for Quefrency rev4

* remove "global" Quefrency info.json

* remove layout macro aliases from keyboard headers

These were moved into the info.json files.
2021-08-18 17:42:17 -07:00
QMK Bot
b23a4db47a Merge remote-tracking branch 'origin/master' into develop 2021-08-19 00:38:25 +00:00
James Young
ac1309cd75
Feels Feels65 Refactor (#14032)
* rename layout macros

The existing layout macro names were not accurate to QMK's standard for the names that were given.

- rename LAYOUT_65_ansi_blocker to LAYOUT_65_ansi_blocker_split_bs
- rename LAYOUT_65_iso_blocker to LAYOUT_65_iso_blocker_split_bs

* correct info.json data

* add LAYOUT_65_iso_blocker

* add LAYOUT_65_ansi_blocker

* add Community Layout support

* update grid alignment on layout macros

* add LAYOUT_all

* refactor default and via keymaps

- use LAYOUT_all macro
- use _______ for KC_TRNS
- via keymap fixes
  - swap KC_BSPC for KC_DEL on Layer 1 (matches default keymap)
  - remove KC_PGUP from Layers 2 and 3 (makes both layers fully transparent)
2021-08-18 17:37:53 -07:00
QMK Bot
c6dc1f7f8d Merge remote-tracking branch 'origin/master' into develop 2021-08-19 00:33:59 +00:00
James Young
6200907417
cest73 TKM Configurator Fixes (#14066)
* info.json: update human-friendly formatting

* correct info.json layout data

- adds missing objects for:
  - split Backspace
  - split Numpad Plus
  - split Numpad Enter
  - split Left Shift
  - ANSI Backslash
  - split Numpad 0
- deletes Mod1 object (not supported in source)
- correct key object sequence
2021-08-18 17:33:26 -07:00
Joel Challis
2e734fb6b9
Add config.h and rules.mk support for data driven keymaps (#12859)
* Add config.h and rules.mk support for data driven keymaps

* tidy up after rebase

* Rename key as it can contain more than just keyboard overrides

* tidy up after rebase

* Add validation
2021-08-18 21:52:41 +01:00
QMK Bot
10fab4ec07 Merge remote-tracking branch 'origin/master' into develop 2021-08-18 17:35:15 +00:00
Logan Butler
0daccebaf9
[Keyboard] Fixes to info.json and rules.mk for Southpad n(#14053)
Making info.json work better with the QMK Configurator and updating rules to work properly with the correct bootloader.
2021-08-18 10:34:43 -07:00
QMK Bot
342e765e9c Merge remote-tracking branch 'origin/master' into develop 2021-08-18 08:51:22 +00:00
James Young
b21e093057
Setta21 Configurator Fix (#14055)
* info.json: add line breaks for rows

* info.json: correct key sequence

* info.json: correct width dimension
2021-08-18 09:50:25 +01:00
Ryan
b16091659c
Move USB Host Shield and Arduino core to lib/ (#13973) 2021-08-18 18:20:25 +10:00
Drashna Jael're
cf5e40c251
Merge remote-tracking branch 'origin/master' into develop 2021-08-17 22:33:17 -07:00
AnthonyL
b51a187d77
[Keyboard] Use Bootmagic Lite on Montex (#14036)
Co-authored-by: Anthony Lowery <anthony.lowery@unity3d.com>
2021-08-17 22:27:02 -07:00
Nick Brassel
ceb3ebda46
Fixup atsam builds. (#14052) 2021-08-18 01:59:22 +01:00
Matthias Liffers
33587254a0
[Keyboard] Fix pins, add VIA support for Stream Cheap 2x4 (#14001)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-08-17 17:33:28 -07:00