b0d293a841
[Keyboard] add Pluckey ( #14672 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-15 19:01:35 -07:00
d7f69dc620
Merge remote-tracking branch 'origin/master' into develop
2021-10-14 21:26:49 -07:00
235323269c
[Keyboard] Add MK61-RGB-ANSI keyboard ( #14795 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-14 21:22:55 -07:00
dd42387d9f
[Keymap] Add keebio iris layout beakl 15 ( #14762 )
2021-10-14 18:11:01 -07:00
44bfe04f53
[Keyboard] PLX Refactor ( #14809 )
2021-10-14 17:00:08 -07:00
63d27b7c9d
Merge remote-tracking branch 'origin/master' into develop
2021-10-14 23:56:29 +00:00
943ca36acc
[Keyboard] Add ginkgo65 ( #14802 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-14 16:55:51 -07:00
92984957f8
Merge remote-tracking branch 'origin/master' into develop
2021-10-14 23:04:30 +00:00
a827adeaae
Documentation: Updated KBDFans readmes ( #14725 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-14 16:03:53 -07:00
578cbdc495
Merge remote-tracking branch 'origin/master' into develop
2021-10-14 13:48:05 +00:00
b8de20f1e2
Add KC_BSLS key to Horizon keyboard default layout ( #14815 )
...
* Define Horizon keyboard
* Set indentation according to QMK coding convention
* Update horizon keyboard readme to satisfy current QMK template
* Use row-column order in horizon readme
* Update keyboards/horizon/rules.mk
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/horizon/rules.mk
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/horizon/rules.mk
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/horizon/rules.mk
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/horizon/rules.mk
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/horizon/rules.mk
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/horizon/info.json
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/horizon/info.json
Co-authored-by: Ryan <fauxpark@gmail.com>
* Add KC_BSLS to Horizon default keymap
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-14 14:47:29 +01:00
793f4499bf
Merge remote-tracking branch 'origin/master' into develop
2021-10-14 13:42:04 +00:00
f9f3a11c20
contra, fractal: Remove wrongly copypasted pin E6 manipulation code ( #14818 )
...
Apparently the default keymaps for `contra` and `fractal` were derived
from some `planck` keymap which contained code to control the status LED
in the implementation of the `BACKLIT` custom keycode. Unfortunately,
the code to control the LED manipulated the `E6` pin directly, and it
was copied without changes, but the `contra` and `fractal` boards use
the `E6` pin in the matrix, therefore pressing the key mapped to
`BACKLIT` resulted in phantom keypresses for all keys in the
corresponding column.
2021-10-14 14:41:30 +01:00
49e0d2ea03
Merge remote-tracking branch 'origin/master' into develop
2021-10-13 08:57:24 +00:00
04cf161aa0
maxr1998/pulse4k: use layout macros in keymaps ( #14808 )
2021-10-13 19:56:48 +11:00
0b2c506f66
Merge remote-tracking branch 'origin/master' into develop
2021-10-13 06:50:42 +00:00
ec32365944
Kopibeng MNK88 Patch ( #14807 )
...
* refactor default keymap
- correct keycode sequence (`KC_RGHT` was in the wrong place)
- change tabs to spaces (four-space indent)
- update grid alignment
* refactor via keymap
- change tabs to spaces (four-space indent)
- update grid alignment
2021-10-12 23:50:04 -07:00
918e4fb02c
Merge remote-tracking branch 'origin/master' into develop
2021-10-13 05:48:31 +00:00
bc51e330c0
Lucid Alexa layout macro rework ( #14799 )
...
* refactor keymaps for readability
- use QMK-native keycode aliases
- physically align keycodes
* rework layout macro
A discrepancy between the default and via keymaps prompted a deep dive into the keyboard's switch matrix, which led to the discovery that (1) the layout macro's arguments were not arranged physically, and (2) the keymaps didn't assign the keycodes to the same switches (the default keymap's keycodes were in the wrong sequence).
Additionally, the layout macro was built to support a split Backspace, but named as if it were for a 2u Backspace, which broke the enabled support for Community Layout keymaps.
This commit:
- arranges the layout macro arguments according to physical order
- corrects the keymaps
- renames the layout macro to specify the split Backspace
- disables Community Layout support
- updates the `info.json` data
* add LAYOUT_65_ansi_blocker
* enable Community Layout support
* update `info.json` metadata
- use full product listing URL
- use GitHub username for maintainer field
* update readme
- fix vendor link in lead paragraph
- update metadata list
- use GitHub username of keyboard maintainer
- correct Supported Hardware
- add Hardware Availability link
- add flashing and bootloader instructions
2021-10-12 22:47:54 -07:00
602d7a1867
Merge remote-tracking branch 'origin/master' into develop
2021-10-13 05:41:28 +00:00
c63c78f080
Kopibeng MNK88 Layout Extension ( #14796 )
...
* friendly-format info.json
* mnk88.h: use QMK 3-character notation
* mnk88.h: add matrix diagram
* add LAYOUT_tkl_ansi_f13
* add LAYOUT_tkl_ansi_tsangan_f13
* add LAYOUT_tkl_iso_f13
* add LAYOUT_tkl_iso_tsangan_f13
2021-10-12 22:40:48 -07:00
1e47c933cd
Merge remote-tracking branch 'origin/master' into develop
2021-10-12 02:42:19 +00:00
a0b7c1618a
[Keyboard] Add MachKeyboards Mach3 ( #14791 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-11 19:42:14 -07:00
2d8dcf08e8
[Keyboard] Add "Center x Enter" ( #14790 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-10-11 19:41:50 -07:00
3ed44b9c9a
Merge remote-tracking branch 'origin/master' into develop
2021-10-12 02:41:00 +00:00
78509658e6
KabeDon98E Refactor ( #14778 )
...
Co-authored-by: Joel Challis <git@zvecr.com>
2021-10-11 19:40:29 -07:00
4e21efd48a
Merge remote-tracking branch 'origin/master' into develop
2021-10-12 02:26:00 +00:00
25eac95348
[Keyboard] Add ISOlation and some kb-elmo keyboard updates ( #14656 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-10-11 19:25:28 -07:00
a3244a010d
Merge remote-tracking branch 'origin/master' into develop
2021-10-12 01:45:23 +00:00
bedecd3cbc
Nordic60 layout rework/extension ( #14794 )
2021-10-11 18:44:47 -07:00
5c8953387e
Merge remote-tracking branch 'origin/master' into develop
2021-10-12 01:09:53 +00:00
8385ab32d0
[Keyboard] Add Split65 to keyboards/handwired ( #13264 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Joris Wachsmuth <jwachsmuth@techfak.uni-bielefeld.de>
2021-10-11 18:09:25 -07:00
c49fd91e7a
Merge remote-tracking branch 'origin/master' into develop
2021-10-12 01:07:15 +00:00
e33ccc556f
[Keymap] Added Gherkin VIA keymap ( #14779 )
2021-10-11 18:06:48 -07:00
38228e40d1
Merge remote-tracking branch 'origin/master' into develop
2021-10-12 01:05:00 +00:00
598f3fa7a7
[Keyboard] z34 split keyboard by zigotica ( #14582 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-11 18:04:47 -07:00
762f9e320f
Merge remote-tracking branch 'origin/master' into develop
2021-10-12 01:04:30 +00:00
cecf5d52f9
[Keymap] Adding my personal Planck layout ( #14564 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-11 18:04:24 -07:00
ea2505901e
[Keymap] Jonavin new obe keymap ( #14657 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Jonavin <=>
2021-10-11 18:03:58 -07:00
5043980c36
Merge remote-tracking branch 'origin/master' into develop
2021-10-11 13:42:09 +00:00
633ef1441b
handwired/nicekey optimisation ( #14788 )
...
* handwired/nicekey optimisation
* Add some consts
* Read address from progmem, pass it into send_string_with_delay_P
2021-10-11 14:41:31 +01:00
087c9f33e9
Merge remote-tracking branch 'origin/master' into develop
2021-10-11 10:00:27 +00:00
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
e72c1e64ec
Merge remote-tracking branch 'origin/master' into develop
2021-10-11 09:57:49 +00:00
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
9351eb395b
[Keyboard] Add Rart67M and support via ( #14630 )
2021-10-11 02:57:16 -07:00
d952c384cb
Merge remote-tracking branch 'origin/master' into develop
2021-10-11 09:57:04 +00:00
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
e80c50967b
Merge remote-tracking branch 'origin/master' into develop
2021-10-11 09:55:49 +00:00
39499f9df7
[Keymap] lets split keymap for shaymdev ( #14663 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-10-11 02:55:41 -07:00
0633bc9a8b
[Keymap] Architeutis Dux keymap ( #14728 )
2021-10-11 02:55:20 -07:00
e817af80ec
Merge remote-tracking branch 'origin/master' into develop
2021-10-11 09:54:10 +00:00
b64ea02d9b
[Keyboard] Add blank01 keyboard ( #14698 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-10-11 02:54:04 -07:00
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
6e5292a8ab
Merge remote-tracking branch 'origin/master' into develop
2021-10-11 09:52:18 +00:00
f57de35dcf
[Keyboard] Modify mokey64 matrix ( #14761 )
2021-10-11 02:51:42 -07:00
9e27308c03
Merge remote-tracking branch 'origin/master' into develop
2021-10-11 09:51:26 +00:00
daece508da
[Keyboard] Add BIOI F60 ( #14763 )
2021-10-11 02:50:52 -07:00
c30805f183
Merge remote-tracking branch 'origin/master' into develop
2021-10-11 05:54:47 +00:00
064f6d96c3
[Keyboard] Fix lck75 via keymap ( #14786 )
2021-10-11 16:54:20 +11:00
0041745054
Merge remote-tracking branch 'origin/master' into develop
2021-10-11 03:48:35 +00:00
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
d0a3fc3067
Merge remote-tracking branch 'origin/master' into develop
2021-10-11 03:47:11 +00:00
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
9b975065d9
Merge remote-tracking branch 'origin/master' into develop
2021-10-11 03:31:28 +00:00
ef7fa0fe91
[Keyboard] update lck75 keyboard layouts ( #14687 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-10 20:30:55 -07:00
09ca08b237
Merge remote-tracking branch 'origin/master' into develop
2021-10-11 02:56:59 +00:00
ae73df00ec
[Keymap] orthodox keymap for shaymdev ( #14660 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-10 19:56:27 -07:00
5d4ae2a1de
Merge remote-tracking branch 'origin/master' into develop
2021-10-11 01:39:24 +00:00
5414e61f01
[Keyboard] Add keebsforall/freebirdtkl ( #14460 )
2021-10-10 18:38:58 -07:00
3d2bc8ef24
Merge remote-tracking branch 'origin/master' into develop
2021-10-11 01:38:06 +00:00
c75bf9daf4
[Keyboard] nullbitsco keyboards: common file cleanup ( #14358 )
2021-10-10 18:37:33 -07:00
6c720a6538
Merge remote-tracking branch 'origin/master' into develop
2021-10-11 01:22:19 +00:00
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
9cd0e36dbc
Merge remote-tracking branch 'origin/master' into develop
2021-10-11 00:25:18 +00:00
c8d5988ba4
[Keyboad] Add VIA support for Atreus promicro ( #13169 )
2021-10-10 17:24:45 -07:00
b487e10753
Clean up LED/RGB Matrix driver config ( #14760 )
2021-10-10 16:57:49 -07:00
a7810db7ba
Merge remote-tracking branch 'origin/master' into develop
2021-10-10 20:30:26 +00:00
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
ce15168624
Merge remote-tracking branch 'origin/master' into develop
2021-10-10 19:19:38 +00:00
06124f9885
cannonkeys/satisfaction75: Add empty layers to the via keymap ( #14782 )
2021-10-11 06:19:08 +11:00
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
0ea72af8b7
Merge remote-tracking branch 'origin/master' into develop
2021-10-10 04:51:12 +00:00
ee9da1fcf3
[Keyboard] Fix DZTECH duo_s default keymap ( #14772 )
2021-10-09 21:50:35 -07:00
1bde510463
Merge remote-tracking branch 'origin/master' into develop
2021-10-09 23:56:53 +00:00
a8a5d20464
Ein_60: add Configurator layout data ( #14777 )
2021-10-10 00:56:21 +01:00
f895e966b7
Fix OLED timeout on recent qwiic migrations ( #14775 )
2021-10-10 00:23:10 +01:00
ff85eb8ee5
Merge remote-tracking branch 'origin/master' into develop
2021-10-09 15:31:32 -07:00
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
bdb19faafa
Merge remote-tracking branch 'origin/master' into develop
2021-10-09 18:31:45 +00:00
82bf688e44
[Keyboard] Update Tractyl Manuform config for F411 ( #14770 )
2021-10-09 11:31:13 -07:00
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
948023c70a
Merge remote-tracking branch 'origin/master' into develop
2021-10-08 21:23:35 +00:00
f90d8b35f2
[Keyboard] Fix IS31FL3741 driver flushin for Xelus pachi rgb ( #14755 )
2021-10-08 22:23:03 +01:00
db41a3426c
Improve Adafruit BLE configuration defines ( #14749 )
...
* Improve Adafruit BLE configuration defines
* Formatting
2021-10-08 16:15:20 +01:00
76076a03f7
Merge remote-tracking branch 'origin/master' into develop
2021-10-08 04:13:19 +00:00
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
d00282b219
Merge remote-tracking branch 'origin/master' into develop
2021-10-08 00:27:09 +00:00
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
e0d688d4c8
Move converter specific tmk_core protocols ( #14743 )
2021-10-07 23:14:26 +01:00
c39170b7ef
Merge remote-tracking branch 'origin/master' into develop
2021-10-07 20:21:08 +00:00
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
a8866a9dca
Merge remote-tracking branch 'origin/master' into develop
2021-10-07 17:52:12 +00:00
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
426eab92b0
Merge remote-tracking branch 'origin/master' into develop
2021-10-07 17:46:29 +00:00
12b9bedee5
update product id for selka40 ( #14629 )
2021-10-07 10:45:56 -07:00
51665b1fff
Merge remote-tracking branch 'origin/master' into develop
2021-10-07 13:50:11 +00:00
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
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
b2a186cf92
Purge uGFX. ( #14720 )
...
* Purge uGFX.
* Remove remnants of visualizer.
* Remove remnants of uGFX.
2021-10-07 10:57:48 +11:00
875e44faac
Merge remote-tracking branch 'origin/master' into develop
2021-10-06 15:36:49 +00:00
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
491b369601
Merge remote-tracking branch 'origin/master' into develop
2021-10-06 08:45:35 +00:00
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
a94c6fa620
Merge remote-tracking branch 'origin/master' into develop
2021-10-06 05:54:29 +00:00
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
97197f2ca2
Merge remote-tracking branch 'origin/master' into develop
2021-10-06 00:50:11 +00:00
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
e28fc56b0a
Merge remote-tracking branch 'origin/master' into develop
2021-10-05 23:38:21 +00:00
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
517adfb763
Merge remote-tracking branch 'origin/master' into develop
2021-10-05 23:30:43 +00:00
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
39b06e3e28
Merge remote-tracking branch 'origin/master' into develop
2021-10-05 03:38:58 +00:00
46fe8ab4e2
[Keyboard] Update Iris default keymap ( #14701 )
2021-10-04 20:38:24 -07:00
d47f0c10fe
Merge remote-tracking branch 'origin/master' into develop
2021-10-05 01:36:24 +00:00
85ba507482
[Keyboard] Added DC MC 001 ( #14661 )
2021-10-04 18:35:48 -07:00
95ead1bbd1
Merge remote-tracking branch 'origin/master' into develop
2021-10-05 01:17:14 +00:00
b441efbdf6
[Keyboard] add dztech duo_s keyboard ( #14625 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-10-04 18:16:47 -07:00
8f3ea25dda
Merge remote-tracking branch 'origin/master' into develop
2021-10-04 05:35:33 +00:00
f72b2ad720
[Keyboard] Add Iris Rev. 6 ( #14683 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-03 22:35:00 -07:00
d785282df7
Merge remote-tracking branch 'origin/master' into develop
2021-10-03 21:17:56 +00:00
6279399425
[Keyboard] Fix Mechlovin's Olly/BB keyboard matrix file ( #14680 )
2021-10-03 22:17:46 +01:00
640869257f
[Keyboard] Disable RGBLIGHT on mokey64 ( #14681 )
2021-10-03 22:17:23 +01:00
db6bf9be2b
Merge remote-tracking branch 'origin/master' into develop
2021-10-03 19:03:19 +00:00
8782dc824d
[Keyboard] Add anti-ghosting support to Model M Converter ( #14049 )
2021-10-03 12:02:51 -07:00
5ce2bb83ce
Merge remote-tracking branch 'origin/master' into develop
2021-10-03 19:01:43 +00:00
5ece2846b6
[Keyboard] Fix key routing for Keyprez Rhino ergo keys ( #14589 )
2021-10-03 12:01:15 -07:00
fdc981418a
Merge remote-tracking branch 'origin/master' into develop
2021-10-02 15:18:23 +00:00
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
9b64ef8c71
Merge remote-tracking branch 'origin/master' into develop
2021-10-02 15:07:07 +00:00
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
64a118a58c
Merge remote-tracking branch 'origin/master' into develop
2021-10-02 15:00:21 +00:00
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
20a689e27c
[Keyboard] Modify mokey64 ( #14612 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-02 07:59:47 -07:00
79c6757081
Merge remote-tracking branch 'origin/master' into develop
2021-10-02 14:51:25 +00:00
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
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
481104053e
Merge remote-tracking branch 'origin/master' into develop
2021-10-02 00:13:49 +00:00
54b8d6a891
[Keyboard] Convert ZSA's Moonlander keyboard to matrix lite ( #14667 )
2021-10-01 17:13:15 -07:00
ef3176713f
Merge remote-tracking branch 'origin/master' into develop
2021-10-01 22:33:29 +00:00
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
1a9e7b95ab
Change `MK66F18` -> `MK66FX1M0` ( #14659 )
2021-09-30 23:14:37 +01:00
34d5833a28
Merge remote-tracking branch 'origin/master' into develop
2021-09-30 14:50:50 +00:00
0be3cd3e2b
Quark_LP- change MCU and RGB ( #14650 )
2021-09-30 15:50:18 +01:00
1667f1375b
Merge remote-tracking branch 'origin/master' into develop
2021-09-30 14:49:11 +00:00
292b7b3835
Remove firmware size impact notes from <keyboard>/rules.mk ( #14652 )
2021-09-30 15:48:36 +01:00
e5d48f6d16
Merge remote-tracking branch 'origin/master' into develop
2021-09-30 09:17:50 +00:00
0b37e07f90
Remove redundant `MIDI_ENABLE = no` in keyboard-level rules.mk ( #14649 )
2021-09-30 19:17:20 +10:00
ed062d811d
Merge remote-tracking branch 'origin/master' into develop
2021-09-30 08:21:20 +00:00
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
922c8071e4
Merge remote-tracking branch 'upstream/master' into develop
2021-09-29 23:23:10 -07:00
36bc3c867e
Remove redundant `UNICODE_ENABLE = no` in keyboard-level rules.mk ( #14633 )
2021-09-30 08:14:21 +10:00
552c126bea
Merge remote-tracking branch 'origin/master' into develop
2021-09-29 19:49:11 +00:00
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
be3d7063a0
Merge remote-tracking branch 'origin/master' into develop
2021-09-29 18:37:46 +00:00
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
4c4c430db8
Merge remote-tracking branch 'origin/master' into develop
2021-09-29 16:56:09 +00:00
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
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
4b77a8719a
Merge remote-tracking branch 'origin/master' into develop
2021-09-29 16:43:34 +00:00
c89f74b929
[Keymap] Jonavin murphpad keymap update ( #14637 )
...
Co-authored-by: Jonavin <=>
2021-09-29 09:42:53 -07:00
f58095fab7
Merge remote-tracking branch 'origin/master' into develop
2021-09-29 16:30:58 +00:00
0338481090
[Keyboard] Updates for Tractyl Manuform config ( #14641 )
2021-09-29 09:30:25 -07:00
f1aab47d13
Merge remote-tracking branch 'origin/master' into develop
2021-09-29 07:39:17 +00:00
363eb645fc
[Keyboard] Fix end of file issue for Owlab suit80 ( #14640 )
2021-09-29 17:38:41 +10:00
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
77e4b07fb5
Merge remote-tracking branch 'origin/master' into develop
2021-09-29 02:46:05 +00:00
046e3ce5c9
[Keymap] Keychron Q1 user keymap ( #14636 )
2021-09-28 19:45:29 -07:00
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
00555a2f02
Merge remote-tracking branch 'origin/master' into develop
2021-09-28 23:03:20 +00:00
02b760c6b0
convert checkerboards/quark_squared:via rules.mk to Unix line endings ( #14638 )
2021-09-28 16:02:48 -07:00
528623eb33
Merge remote-tracking branch 'origin/master' into develop
2021-09-28 21:50:02 +00:00
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
bc41d37baf
Merge remote-tracking branch 'origin/master' into develop
2021-09-28 19:24:40 +00:00
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
f89620d7af
Merge remote-tracking branch 'origin/master' into develop
2021-09-28 19:24:10 +00:00
724ee24075
[Keyboard] Yampad VIA support ( #14397 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-09-28 12:23:38 -07:00
3f4ea5c31f
Merge remote-tracking branch 'origin/master' into develop
2021-09-28 19:23:27 +00:00
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
52127e7bda
Merge remote-tracking branch 'origin/master' into develop
2021-09-28 19:21:40 +00:00
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
77639d8994
Merge remote-tracking branch 'origin/master' into develop
2021-09-28 19:01:12 +00:00
ac1d48cbf5
[Keyboard] Pteron36 ( #13475 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Harshti Goel <harshitgoel@licious.com>
2021-09-28 12:00:34 -07:00
5917334b42
Merge remote-tracking branch 'upstream/master' into develop
2021-09-28 10:21:11 -07:00
adc7cc5981
Mechlovin Adelais: add support for full-length Right Shift ( #14622 )
...
* add layout variants with 2.75u Right Shift
* move layout alias to info.json
* match info.json labels to matrix positions
Edits the label keys in info.json to match the matrix position identifiers in adelais.h.
* info.json: add line breaks between keyboard rows
* info.json: use GitHub username in maintainer field
2021-09-28 09:38:34 -07:00
862b348046
Merge remote-tracking branch 'origin/master' into develop
2021-09-28 05:27:07 +00:00
02451fcc75
[Keyboard] Add dz60rgb_ansi v2_1 ( #14614 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-27 22:26:30 -07:00
ded55154ef
Merge remote-tracking branch 'origin/master' into develop
2021-09-28 05:10:37 +00:00
574b3d8a5a
[Keyboard] z12 micropad by zigotica ( #14583 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-27 22:10:10 -07:00
8b74ba7e75
Merge remote-tracking branch 'origin/master' into develop
2021-09-28 05:01:22 +00:00
floookay
Drashna Jael're
Felix Jen
Tom
James Young
QMK Bot
rhmokey
MechMerlin
Steven Karrmann
Sergey Vlasov
etiennelepagel
takashicompany
kb-elmo
Joris Wachsmuth
thompson-ele
Sergi Meseguer
Jimmy Sjölund
jonavin
Ryan
bgrosse-midokura
Quinn Mikelson
Alabahuy
mechlovin
Shay Merrill
Dalius Dobravolskas
gkeyboard
Albert Y
im a can what do you think lmao?
KnoblesseOblige
Jay Greco
Wolf Van Herreweghe
leonardusdipa
Kyle McCreery
Joel Challis
Dao Tak Isaac
Bahrul Hidayat
jmcwilliams403
Nick Brassel
Grayson Carr
Danny
Daniel Cormier
moyi4681
tiltowait
Christian Sandven
4pplet
ai03
john-ezra
negatv
npspears
vattern
nachie
Greg Knapp
owlab-git
Alexander Kagno
Harshit Goel
Dasky