gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2024-11-27 13:40:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,396 Commits 62 Branches 1,612 Tags 927 MiB
fc96fab1f2
Commit Graph

10328 Commits

Author SHA1 Message Date
bgrosse-midokura
a7313992de
[Keymap] gipsy-king's layout for cornelius (#14602) 
Co-authored-by: Benjamin Große <ste3ls@gmail.com>
 2021-10-11 02:59:52 -07:00
QMK Bot
e72c1e64ec Merge remote-tracking branch 'origin/master' into develop 2021-10-11 09:57:49 +00:00
Quinn Mikelson
d9e077468a
[Keyboard] Add ZSA Moonlander VIA support (#14603) 
Co-authored-by: Quinn Mikelson <quinn.mikelson@tyvak.com>
Co-authored-by: Drashna Jael're <drashna@live.com>
 2021-10-11 02:57:44 -07:00
Alabahuy
9351eb395b
[Keyboard] Add Rart67M and support via (#14630) 2021-10-11 02:57:16 -07:00
QMK Bot
d952c384cb Merge remote-tracking branch 'origin/master' into develop 2021-10-11 09:57:04 +00:00
mechlovin
3289f74179
[Keyboard] Add Jay60 PCB (#14676) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-10-11 02:56:30 -07:00
QMK Bot
e80c50967b Merge remote-tracking branch 'origin/master' into develop 2021-10-11 09:55:49 +00:00
Shay Merrill
39499f9df7
[Keymap] lets split keymap for shaymdev (#14663) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2021-10-11 02:55:41 -07:00
Dalius Dobravolskas
0633bc9a8b
[Keymap] Architeutis Dux keymap (#14728) 2021-10-11 02:55:20 -07:00
QMK Bot
e817af80ec Merge remote-tracking branch 'origin/master' into develop 2021-10-11 09:54:10 +00:00
gkeyboard
b64ea02d9b
[Keyboard] Add blank01 keyboard (#14698) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2021-10-11 02:54:04 -07:00
Steven Karrmann
ab7d731049
[Keyboard] New Keyboard: Horizon (#14776) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-10-11 02:53:41 -07:00
QMK Bot
6e5292a8ab Merge remote-tracking branch 'origin/master' into develop 2021-10-11 09:52:18 +00:00
rhmokey
f57de35dcf
[Keyboard] Modify mokey64 matrix (#14761) 2021-10-11 02:51:42 -07:00
QMK Bot
9e27308c03 Merge remote-tracking branch 'origin/master' into develop 2021-10-11 09:51:26 +00:00
kb-elmo
daece508da
[Keyboard] Add BIOI F60 (#14763) 2021-10-11 02:50:52 -07:00
QMK Bot
c30805f183 Merge remote-tracking branch 'origin/master' into develop 2021-10-11 05:54:47 +00:00
Drashna Jaelre
064f6d96c3
[Keyboard] Fix lck75 via keymap (#14786) 2021-10-11 16:54:20 +11:00
QMK Bot
0041745054 Merge remote-tracking branch 'origin/master' into develop 2021-10-11 03:48:35 +00:00
Albert Y
8045ad711a
[Keyboard] Add bootmagic lite keys to both halve of Sweep (#14732) 
Co-authored-by: filterpaper <filterpaper@localhost>
 2021-10-10 20:48:02 -07:00
QMK Bot
d0a3fc3067 Merge remote-tracking branch 'origin/master' into develop 2021-10-11 03:47:11 +00:00
Albert Y
5d7efc7183
[Keyboard] Add bootmagic lite keys to both halve of A.dux (#14731) 
Co-authored-by: filterpaper <filterpaper@localhost>
 2021-10-10 20:46:45 -07:00
QMK Bot
9b975065d9 Merge remote-tracking branch 'origin/master' into develop 2021-10-11 03:31:28 +00:00
im a can what do you think lmao?
ef7fa0fe91
[Keyboard] update lck75 keyboard layouts (#14687) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-10-10 20:30:55 -07:00
QMK Bot
09ca08b237 Merge remote-tracking branch 'origin/master' into develop 2021-10-11 02:56:59 +00:00
Shay Merrill
ae73df00ec
[Keymap] orthodox keymap for shaymdev (#14660) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-10-10 19:56:27 -07:00
QMK Bot
5d4ae2a1de Merge remote-tracking branch 'origin/master' into develop 2021-10-11 01:39:24 +00:00
KnoblesseOblige
5414e61f01
[Keyboard] Add keebsforall/freebirdtkl (#14460) 2021-10-10 18:38:58 -07:00
QMK Bot
3d2bc8ef24 Merge remote-tracking branch 'origin/master' into develop 2021-10-11 01:38:06 +00:00
Jay Greco
c75bf9daf4
[Keyboard] nullbitsco keyboards: common file cleanup (#14358) 2021-10-10 18:37:33 -07:00
QMK Bot
6c720a6538 Merge remote-tracking branch 'origin/master' into develop 2021-10-11 01:22:19 +00:00
Wolf Van Herreweghe
5c034c43ab
[Keyboard] Add firmware for the TS60 (#14157) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Wolf Van Herreweghe <wolfvh@getupgamesofficial.com>
 2021-10-10 18:21:49 -07:00
QMK Bot
9cd0e36dbc Merge remote-tracking branch 'origin/master' into develop 2021-10-11 00:25:18 +00:00
leonardusdipa
c8d5988ba4
[Keyboad] Add VIA support for Atreus promicro (#13169) 2021-10-10 17:24:45 -07:00
Ryan
b487e10753
Clean up LED/RGB Matrix driver config (#14760) 2021-10-10 16:57:49 -07:00
QMK Bot
a7810db7ba Merge remote-tracking branch 'origin/master' into develop 2021-10-10 20:30:26 +00:00
Kyle McCreery
fa1a59e7f8
Changing RGB default to on so it plays well with VIA's QMK lighting section and adding the B9 init workaround to obe.c so the I2C EEPROM will initialize correctly since we are using B9 for caps lock indicator. (#14677) 2021-10-10 21:30:00 +01:00
QMK Bot
ce15168624 Merge remote-tracking branch 'origin/master' into develop 2021-10-10 19:19:38 +00:00
Sergey Vlasov
06124f9885
cannonkeys/satisfaction75: Add empty layers to the via keymap (#14782) 2021-10-11 06:19:08 +11:00
Sergey Vlasov
2d3bd7cfcf
Fix OLED timeout on satisfaction75 after migration from QWIIC (#14780) 
The custom OLED_OFF mode implemented on satisfaction75 is incompatible
with the OLED_TIMEOUT feature (the OLED_TIMEOUT code assumes that any
key or encoder action should turn the OLED display on, and does not
provide any way to disable that behavior).  To keep the OLED_OFF mode
functioning as before while still having a working OLED idle timeout, a
custom implementation of the OLED idle timeout code is added.
 2021-10-10 17:01:29 +01:00
QMK Bot
0ea72af8b7 Merge remote-tracking branch 'origin/master' into develop 2021-10-10 04:51:12 +00:00
Drashna Jaelre
ee9da1fcf3
[Keyboard] Fix DZTECH duo_s default keymap (#14772) 2021-10-09 21:50:35 -07:00
QMK Bot
1bde510463 Merge remote-tracking branch 'origin/master' into develop 2021-10-09 23:56:53 +00:00
James Young
a8a5d20464
Ein_60: add Configurator layout data (#14777) 2021-10-10 00:56:21 +01:00
Joel Challis
f895e966b7
Fix OLED timeout on recent qwiic migrations (#14775) 2021-10-10 00:23:10 +01:00
Drashna Jael're
ff85eb8ee5
Merge remote-tracking branch 'origin/master' into develop 2021-10-09 15:31:32 -07:00
Dao Tak Isaac
3c188d98a1
[Keyboard] Add cg108 keyboard and fix keymap Dosa40rgb (#14753) 
* Add cg108 keyboard and fix keymap Dosa40rgb

* Update keyboards/dtisaac/cg108/readme.md

* Update keyboards/dtisaac/dosa40rgb/rules.mk

* Update keyboards/dtisaac/cg108/info.json

* Update keyboards/dtisaac/cg108/keymaps/default/keymap.c

* Update keyboards/dtisaac/cg108/rules.mk

* Update keyboards/dtisaac/cg108/rules.mk
 2021-10-09 14:55:00 -07:00
QMK Bot
bdb19faafa Merge remote-tracking branch 'origin/master' into develop 2021-10-09 18:31:45 +00:00
Drashna Jaelre
82bf688e44
[Keyboard] Update Tractyl Manuform config for F411 (#14770) 2021-10-09 11:31:13 -07:00
Joel Challis
22cafb9a20
Migrate satisfaction75 away from QWIIC_DRIVERS (#14747) 
* stash

* refactor old draw

* refactor old draw - tidy

* refactor old draw - tidy

* refactor old draw - reorder for diffs

* refactor old draw - reorder for diffs
 2021-10-09 14:46:47 +01:00
QMK Bot
948023c70a Merge remote-tracking branch 'origin/master' into develop 2021-10-08 21:23:35 +00:00
Drashna Jaelre
f90d8b35f2
[Keyboard] Fix IS31FL3741 driver flushin for Xelus pachi rgb (#14755) 2021-10-08 22:23:03 +01:00
Ryan
db41a3426c
Improve Adafruit BLE configuration defines (#14749) 
* Improve Adafruit BLE configuration defines

* Formatting
 2021-10-08 16:15:20 +01:00
QMK Bot
76076a03f7 Merge remote-tracking branch 'origin/master' into develop 2021-10-08 04:13:19 +00:00
James Young
d35a98ca24
dyz selka40 touch-up (#14748) 
* friendly-format info.json

* remove info.json rounding errors

* fix info.json layout macro reference

JSON data referenced `LAYOUT` instead of `LAYOUT_all`.

* correct info.json key sequence

* remove dead space from info.json layout data

* remove vertical offsets from info.json layout data

* horizontally align info.json layout data

* add matrix diagram to selka40.h

* add LAYOUT_2u_bs

* remove duplicated settings
 2021-10-07 21:12:46 -07:00
QMK Bot
d00282b219 Merge remote-tracking branch 'origin/master' into develop 2021-10-08 00:27:09 +00:00
James Young
9d070e6a08
DYZ TKL touch-up (#14744) 
* friendly-format info.json

* add LAYOUT_all layout data

* add matrix diagram to dyz_tkl.h

* add LAYOUT_tkl_ansi

* add LAYOUT_tkl_ansi_f13

* add LAYOUT_tkl_iso

* add LAYOUT_tkl_iso_f13

* remove `ENCODER_ENABLE = no` from rules.mk

* remove redundant definitions from config.h

Data-driven compilation calculates `MATRIX_ROWS` and `MATRIX_COLS` from the info.json data, so defining them in config.h isn't necessary.

* add missing comma to info.json per fauxpark
 2021-10-07 17:26:38 -07:00
Joel Challis
e0d688d4c8
Move converter specific tmk_core protocols (#14743) 2021-10-07 23:14:26 +01:00
QMK Bot
c39170b7ef Merge remote-tracking branch 'origin/master' into develop 2021-10-07 20:21:08 +00:00
James Young
51470dfae1
Dyz60 touch-up (#14742) 
* friendly-format info.json

* refactor keymaps

- update grid alignment
- use four-space indent
- use QMK short-form keycodes

* correct info.json layout data

Adds three missing positions, and corrects some key sizes.

* add matrix diagram to dyz60.h

* add LAYOUT_60_ansi

* add LAYOUT_60_iso

* add LAYOUT_60_ansi_split_bs_rshift

* add LAYOUT_60_iso_split_bs_rshift

* add readme

* Remove duplication between config.h and info.json

Duplicating settings between config.h and info.json leads to warnings when compiling.

Removes the duplicated settings from config.h.
 2021-10-07 21:20:34 +01:00
QMK Bot
a8866a9dca Merge remote-tracking branch 'origin/master' into develop 2021-10-07 17:52:12 +00:00
James Young
cbf1e0bab5
Dyz40 Configurator fixes (#14739) 
* add matrix diagram to keyboard header file

* friendly-format info.json

* correct layout data

* add legends to info.json key labels

* add LAYOUT_split_space_split_bs

Rename the `LAYOUT` tree in info.json to `LAYOUT_split_space_split_bs`, and add a corresponding layout macro.

* add LAYOUT_all data to info.json

* add LAYOUT_7u_space

* add LAYOUT_7u_space_split_bs

* add LAYOUT_split_space

* convert tabs to spaces in dyz40.h
 2021-10-07 10:51:38 -07:00
QMK Bot
426eab92b0 Merge remote-tracking branch 'origin/master' into develop 2021-10-07 17:46:29 +00:00
Bahrul Hidayat
12b9bedee5
update product id for selka40 (#14629) 2021-10-07 10:45:56 -07:00
QMK Bot
51665b1fff Merge remote-tracking branch 'origin/master' into develop 2021-10-07 13:50:11 +00:00
jmcwilliams403
63cb273d15
Enabled Bootmagic Lite (#14573) 
* Enabled Bootmagic Lite

* Enabled Bootmagic Lite

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

Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
 2021-10-07 14:49:16 +01:00
Joel Challis
1c0347b8b8
Remove SERIAL_LINK feature (#14727) 
* Remove SERIAL_LINK

* more stale paths in doxygen-todo

* Fix

* More refs

* Update testing docs

* Update doxygen-todo

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

Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-10-07 12:32:05 +11:00
Nick Brassel
b2a186cf92
Purge uGFX. (#14720) 
* Purge uGFX.

* Remove remnants of visualizer.

* Remove remnants of uGFX.
 2021-10-07 10:57:48 +11:00
QMK Bot
875e44faac Merge remote-tracking branch 'origin/master' into develop 2021-10-06 15:36:49 +00:00
Grayson Carr
d5fae3a6f9
Updated Keychron Q1 user keymap (#14666) 
* Updated Keychron Q1 user keymap
- Added Caps Lock indicator
- Mission Control and Launchpad custom keycodes are now defined using the VIA user keycodes range so they can be labeled properly in VIA

* Only use VIA keycode range if VIA is enabled

* Reformatted led_indexes enum to match layout

* Feature: When the Fn layer is active, RGB lighting turns off for keys that are not assigned

* Fixes

* Cleanup: Updated method signature of rgb_matrix_set_color_by_keycode to more closely match rgb_matrix_set_color

* Fixed int sizing for keycodes
 2021-10-06 08:36:04 -07:00
QMK Bot
491b369601 Merge remote-tracking branch 'origin/master' into develop 2021-10-06 08:45:35 +00:00
James Young
f32db0bdd1
Mode M65S touch-up (#14722) 
* add Configurator data

* rename README.md to lowercase

API can't find this file unless the filename is lowercase (`readme.md`).

* readme touch-up

Correct typos and improve some grammar and Markdown.
 2021-10-06 01:44:57 -07:00
QMK Bot
a94c6fa620 Merge remote-tracking branch 'origin/master' into develop 2021-10-06 05:54:29 +00:00
James Young
c33491d72b
MelGeek Mach80: correct Configurator layout (#14716) 
Adds a 0.5u gap between the top two rows.
 2021-10-05 22:53:53 -07:00
QMK Bot
97197f2ca2 Merge remote-tracking branch 'origin/master' into develop 2021-10-06 00:50:11 +00:00
Drashna Jaelre
22470f0302
[Keyboard] Add basic Keyhive Sofle support (#14296) 
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
 2021-10-05 17:49:39 -07:00
QMK Bot
e28fc56b0a Merge remote-tracking branch 'origin/master' into develop 2021-10-05 23:38:21 +00:00
James Young
e762db44ba
0xc7/61key touch-up (#14712) 
* correct Configurator layout data

* rename LAYOUT to LAYOUT_60_ansi

* correct info.json maintainer field

Use the maintainer's GitHub username.

* correct the compiling/flashing instructions

Keyboard value is relative to `qmk_firmware/keyboards/`.
 2021-10-05 16:37:42 -07:00
QMK Bot
517adfb763 Merge remote-tracking branch 'origin/master' into develop 2021-10-05 23:30:43 +00:00
James Young
aabc0cc8ad
Durgod DGK6X Galaxy: correct Configurator layout (#14714) 
Top row had a y-value of 1, which placed it behind the number row when rendered.
 2021-10-05 16:30:09 -07:00
QMK Bot
39b06e3e28 Merge remote-tracking branch 'origin/master' into develop 2021-10-05 03:38:58 +00:00
Danny
46fe8ab4e2
[Keyboard] Update Iris default keymap (#14701) 2021-10-04 20:38:24 -07:00
QMK Bot
d47f0c10fe Merge remote-tracking branch 'origin/master' into develop 2021-10-05 01:36:24 +00:00
Daniel Cormier
85ba507482
[Keyboard] Added DC MC 001 (#14661) 2021-10-04 18:35:48 -07:00
QMK Bot
95ead1bbd1 Merge remote-tracking branch 'origin/master' into develop 2021-10-05 01:17:14 +00:00
moyi4681
b441efbdf6
[Keyboard] add dztech duo_s keyboard (#14625) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2021-10-04 18:16:47 -07:00
QMK Bot
8f3ea25dda Merge remote-tracking branch 'origin/master' into develop 2021-10-04 05:35:33 +00:00
Danny
f72b2ad720
[Keyboard] Add Iris Rev. 6 (#14683) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-10-03 22:35:00 -07:00
QMK Bot
d785282df7 Merge remote-tracking branch 'origin/master' into develop 2021-10-03 21:17:56 +00:00
Drashna Jaelre
6279399425
[Keyboard] Fix Mechlovin's Olly/BB keyboard matrix file (#14680) 2021-10-03 22:17:46 +01:00
Drashna Jaelre
640869257f
[Keyboard] Disable RGBLIGHT on mokey64 (#14681) 2021-10-03 22:17:23 +01:00
QMK Bot
db6bf9be2b Merge remote-tracking branch 'origin/master' into develop 2021-10-03 19:03:19 +00:00
tiltowait
8782dc824d
[Keyboard] Add anti-ghosting support to Model M Converter (#14049) 2021-10-03 12:02:51 -07:00
QMK Bot
5ce2bb83ce Merge remote-tracking branch 'origin/master' into develop 2021-10-03 19:01:43 +00:00
Christian Sandven
5ece2846b6
[Keyboard] Fix key routing for Keyprez Rhino ergo keys (#14589) 2021-10-03 12:01:15 -07:00
QMK Bot
fdc981418a Merge remote-tracking branch 'origin/master' into develop 2021-10-02 15:18:23 +00:00
4pplet
0acedbe09f
[Keyboard] Adding kbnordic nordic60 (#14555) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: 4pplet <4pplet@protonmail.com>
Co-authored-by: 4pplet <stefan.ess@gmail.com>
 2021-10-02 08:17:54 -07:00
QMK Bot
9b64ef8c71 Merge remote-tracking branch 'origin/master' into develop 2021-10-02 15:07:07 +00:00
ai03
875bbd31dc
[Keyboard] Add JP60 keyboard (#14219) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-10-02 08:06:37 -07:00
QMK Bot
64a118a58c Merge remote-tracking branch 'origin/master' into develop 2021-10-02 15:00:21 +00:00
mechlovin
0eaefb2a6c
[Keyboard] Add Olly BB PCB (#14545) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-10-02 08:00:05 -07:00
rhmokey
20a689e27c
[Keyboard] Modify mokey64 (#14612) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-10-02 07:59:47 -07:00
QMK Bot
79c6757081 Merge remote-tracking branch 'origin/master' into develop 2021-10-02 14:51:25 +00:00
john-ezra
79ad30a9d5
[Keymap] Updates to Personal Kyria Keymap (#14669) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-10-02 07:50:55 -07:00
Drashna Jaelre
5b644af415
[Keyboard] Enable Proton C defaults for SplitKB Kyria (#14490) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-10-01 19:11:34 -07:00
QMK Bot
481104053e Merge remote-tracking branch 'origin/master' into develop 2021-10-02 00:13:49 +00:00
Drashna Jaelre
54b8d6a891
[Keyboard] Convert ZSA's Moonlander keyboard to matrix lite (#14667) 2021-10-01 17:13:15 -07:00
QMK Bot
ef3176713f Merge remote-tracking branch 'origin/master' into develop 2021-10-01 22:33:29 +00:00
negatv
bed7625f93
Add FIRMWARE_FORMAT = hex for /keyboards/kinesis/kint36 and /keyboards/kinesis/kint41 (#14665) 
* Specify hex as the default FIRMWARE_FORMAT which is copied to qmk_firmware root folder

* Specify hex as the default FIRMWARE_FORMAT which is copied to qmk_firmware root folder

Co-authored-by: sadkins <sadkins@iMac-Pro.local>
 2021-10-02 08:32:53 +10:00
Ryan
1a9e7b95ab
Change MK66F18 -> MK66FX1M0 (#14659) 2021-09-30 23:14:37 +01:00
QMK Bot
34d5833a28 Merge remote-tracking branch 'origin/master' into develop 2021-09-30 14:50:50 +00:00
npspears
0be3cd3e2b
Quark_LP- change MCU and RGB (#14650) 2021-09-30 15:50:18 +01:00
QMK Bot
1667f1375b Merge remote-tracking branch 'origin/master' into develop 2021-09-30 14:49:11 +00:00
James Young
292b7b3835
Remove firmware size impact notes from <keyboard>/rules.mk (#14652) 2021-09-30 15:48:36 +01:00
QMK Bot
e5d48f6d16 Merge remote-tracking branch 'origin/master' into develop 2021-09-30 09:17:50 +00:00
Ryan
0b37e07f90
Remove redundant MIDI_ENABLE = no in keyboard-level rules.mk (#14649) 2021-09-30 19:17:20 +10:00
QMK Bot
ed062d811d Merge remote-tracking branch 'origin/master' into develop 2021-09-30 08:21:20 +00:00
James Young
a8e13f041e
Mechlovin Hex4B: extend layout support (#14651) 
* use XXX for KC_NO in hex4b.h

* add matrix diagram to hex4b.h

* rename LAYOUT to LAYOUT_all

* remove reference to KBFirmware JSON Parser

* info.json: add line breaks between rows

* rename LAYOUT_all to LAYOUT_split_bs

- LAYOUT alias for backward compatibility
- LAYOUT_all alias to signify support for every matrix position

* add LAYOUT_2u_bs

* add LAYOUT_tsangan_split_bs

* add LAYOUT_tsangan_2u_bs

* info.json: remove meta key
 2021-09-30 01:20:46 -07:00
James Young
922c8071e4
Merge remote-tracking branch 'upstream/master' into develop 2021-09-29 23:23:10 -07:00
Ryan
36bc3c867e
Remove redundant UNICODE_ENABLE = no in keyboard-level rules.mk (#14633) 2021-09-30 08:14:21 +10:00
QMK Bot
552c126bea Merge remote-tracking branch 'origin/master' into develop 2021-09-29 19:49:11 +00:00
James Young
8fccd82d4e
Mechlovin Hannah60RGB touch-up (#14646) 
* use XXX for KC_NO in rev1.h

* add matrix diagram to rev1.h

* remove reference to KBFirmware JSON Parser from rev1.h

* use XXX for KC_NO in rev2.h

* add matrix diagram to rev2.h

* add LAYOUT_60_ansi and LAYOUT_60_iso

* enable Community Layout support

* update info.json metadata

- specify keyboard revision in keyboard_name
- use GitHub username in maintainer field

* remove reference to KBFirmware JSON Parser from main rules.mk
 2021-09-29 12:48:37 -07:00
QMK Bot
be3d7063a0 Merge remote-tracking branch 'origin/master' into develop 2021-09-29 18:37:46 +00:00
Drashna Jaelre
02ab7b1888
[Core] Fix "6kro enable" and clarify naming (#14563) 
* Fix USB_6KRO_ENABLE compilation errors

* Add info to docs

* Rename define to be more accurate

* Remove unused rule

* Refixe docs
 2021-09-29 11:37:11 -07:00
QMK Bot
4c4c430db8 Merge remote-tracking branch 'origin/master' into develop 2021-09-29 16:56:09 +00:00
npspears
929d959ef9
[Keyboard] add support for Quark_LP (#14552) 
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2021-09-29 09:55:58 -07:00
vattern
03df754551
[Keyboard] Update Grandiceps to Rev2 (#14618) 
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>
Co-authored-by: Thys de Wet <thys@vectorphoto.co.uk>
 2021-09-29 09:55:34 -07:00
QMK Bot
4b77a8719a Merge remote-tracking branch 'origin/master' into develop 2021-09-29 16:43:34 +00:00
jonavin
c89f74b929
[Keymap] Jonavin murphpad keymap update (#14637) 
Co-authored-by: Jonavin <=>
 2021-09-29 09:42:53 -07:00
QMK Bot
f58095fab7 Merge remote-tracking branch 'origin/master' into develop 2021-09-29 16:30:58 +00:00
Drashna Jaelre
0338481090
[Keyboard] Updates for Tractyl Manuform config (#14641) 2021-09-29 09:30:25 -07:00
QMK Bot
f1aab47d13 Merge remote-tracking branch 'origin/master' into develop 2021-09-29 07:39:17 +00:00
Drashna Jaelre
363eb645fc
[Keyboard] Fix end of file issue for Owlab suit80 (#14640) 2021-09-29 17:38:41 +10:00
nachie
6779d5b990
[Keyboard] Add support for PaladinPad, Arya pcb and move keyboards by KapCave into their own directory (#14194) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Nachiket Kulkarni <nachiket_kulkarni@apple.com>
 2021-09-28 21:35:14 -07:00
QMK Bot
77e4b07fb5 Merge remote-tracking branch 'origin/master' into develop 2021-09-29 02:46:05 +00:00
Grayson Carr
046e3ce5c9
[Keymap] Keychron Q1 user keymap (#14636) 2021-09-28 19:45:29 -07:00
James Young
55f699c09e
Fix for mechlovin/adelais/standard_led/arm/rev4 (#14639) 
* Fix for #14622

Fix for a bad merge conflict resolution.
 2021-09-28 17:18:53 -07:00
QMK Bot
00555a2f02 Merge remote-tracking branch 'origin/master' into develop 2021-09-28 23:03:20 +00:00
James Young
02b760c6b0
convert checkerboards/quark_squared:via rules.mk to Unix line endings (#14638) 2021-09-28 16:02:48 -07:00
QMK Bot
528623eb33 Merge remote-tracking branch 'origin/master' into develop 2021-09-28 21:50:02 +00:00
James Young
732535c1bb
Mechlovin Delphine: add LAYOUT_numpad_6x4 (#14635) 
* add LAYOUT_numpad_6x4

* tidy-up info.json data

* use GitHub account name for maintainer field
* remove meta key

* add matrix diagram to delphine.h

* update Community Layout support
 2021-09-28 14:49:35 -07:00
QMK Bot
bc41d37baf Merge remote-tracking branch 'origin/master' into develop 2021-09-28 19:24:40 +00:00
jonavin
705cd433c2
[Keymap] fix NKRO - switch to get_mods() and refactor encoder action code (#14278) 
Co-authored-by: Jonavin <=>
 2021-09-28 12:24:12 -07:00
QMK Bot
f89620d7af Merge remote-tracking branch 'origin/master' into develop 2021-09-28 19:24:10 +00:00
Greg Knapp
724ee24075
[Keyboard] Yampad VIA support (#14397) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2021-09-28 12:23:38 -07:00
QMK Bot
3f4ea5c31f Merge remote-tracking branch 'origin/master' into develop 2021-09-28 19:23:27 +00:00
owlab-git
4a2062cc01
[Keyboard] Add OwLab Suit80 (#14362) 
* add suit80 files

* first add suit80 files

* modified suit80 files

* layout change

* modified again

* changed png url
 2021-09-28 12:22:56 -07:00
QMK Bot
52127e7bda Merge remote-tracking branch 'origin/master' into develop 2021-09-28 19:21:40 +00:00
Alexander Kagno
bc818352a3
[Keymap] arkag userspace/keymap -- new macro and minor preonic keymap change (#14623) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-09-28 12:21:10 -07:00
QMK Bot
77639d8994 Merge remote-tracking branch 'origin/master' into develop 2021-09-28 19:01:12 +00:00