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
2742d0c4c1
[Keyboard] Add BM80 Keyboard ( #12948 )
...
* Initial compatibility with bm80
* move files to kprepublic directory, see #12159
* fix pin assignment
* Revert "fix pin assignment"
This reverts commit 5a53a74953a23bb5064c11d5d9e6daf007a54872.
* add testing setup (peepeetee keymap, will use for personal purposes later), fix LED assignment, add indicator LED, LED location, count, and flags are broken
* fixed flags( not sure, please check)
* fixed number of LEDs
* add comment about f11
* remove comment about f11, change capslock flag to be 1 rather than 1+8 as there is a standalone indicator LED
* readme.md
* add via keymap
* add info.json with help from noroadsleft's converter
* add suspended state implementation, I don't think it's working
* update to my testing setup
* restore erroneously included bm68rgb config
* Update keyboards/kprepublic/bm80/config.h
Co-authored-by: Drashna Jaelre <drashna@live.com>
* add reset instructions
* change reset instruction grammar
* remove not working sleep function, add comment for RGB flags
* add LED mapping comments
* change readme grammar
* replace rgb light paremeters with rgb matrix paremeters, enable framebuffer effects
* re-enable peepeetee/config.h, updating my disabled effect list
* updating my disabled effect list
* update LED struct documentation
* update readme with RGB matrix effect information
* Update keyboards/kprepublic/bm80/rules.mk
Co-authored-by: Drashna Jaelre <drashna@live.com>
* move files back to keyboard from keyboard/kprepublic, see 85b33d6 and qmk#12159
* Apply suggestions from code review
Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>
* cleanup peepeetee keymap
* update peepeetee keymap; rebase on current master
* moved to /kprepublic, see #12159
* 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>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-27 22:00:47 -07:00
16c4550608
Merge remote-tracking branch 'origin/master' into develop
2021-09-27 17:50:46 +00:00
ae993dc068
Zinc: Clean up LTO rules ( #14597 )
2021-09-28 03:50:06 +10:00
273c426d15
Merge remote-tracking branch 'origin/master' into develop
2021-09-27 17:46:46 +00:00
e8b7cee9d3
SquishyTKL: Layouts cleanup ( #14594 )
2021-09-28 03:46:10 +10:00
bca7a99e7a
Merge remote-tracking branch 'origin/master' into develop
2021-09-27 17:03:42 +00:00
fce9cb9338
Cleanup issues identified by lgtm ( #14459 )
...
* cleanup issues identified by lgtm
* fix the git_status check
2021-09-27 10:02:54 -07:00
a311514f43
Merge remote-tracking branch 'origin/master' into develop
2021-09-27 04:42:26 +00:00
5f38a98fa0
Adding SP Mini keymap. ( #14593 )
2021-09-27 14:41:48 +10:00
7d501c9648
Merge remote-tracking branch 'origin/master' into develop
2021-09-26 16:50:52 +00:00
3823fdc9e0
[Keyboard] Fix Compile issues for Signum 3.0 ( #14588 )
...
* [Keyboard] Fix Compile issues for Signum 3.0
* quantuuum
2021-09-26 17:50:22 +01:00
3c9b98387c
Merge remote-tracking branch 'origin/master' into develop
2021-09-26 14:54:48 +00:00
f07de1b309
[Keyboard] Fix double comment in config files ( #14615 )
2021-09-27 00:54:17 +10:00
1d10a78068
Merge remote-tracking branch 'upstream/master' into develop
2021-09-26 03:16:04 -07:00
03f4c53564
Unicomp Mini M handwired Configurator fix ( #14609 )
...
* apply human-friendly formatting
* correct info.json data
2021-09-26 03:10:40 -07:00
843b9a7e4d
Merge remote-tracking branch 'upstream/master' into develop
2021-09-26 03:04:11 -07:00
6f36eb469d
Remove unused `IS_COMMAND()` instances and Magic Key definitions ( #14610 )
...
* Remove unused IS_COMMAND() instances from keyboard-level config.h, 0-9
* Remove unused IS_COMMAND() instances from keyboard-level config.h, A-B
* Remove unused IS_COMMAND() instances from keyboard-level config.h, C-D
* Remove unused IS_COMMAND() instances from keyboard-level config.h, E-G
* Remove unused IS_COMMAND() instances from keyboard-level config.h, handwired
* Remove unused IS_COMMAND() instances from keyboard-level config.h, H-M
* Remove unused IS_COMMAND() instances from keyboard-level config.h, N-R
* Remove unused IS_COMMAND() instances from keyboard-level config.h, S-Z
* Remove unused Magic Key definitions from keyboard-level config.h, 0-9
* Remove unused Magic Key definitions from keyboard-level config.h, A
* Remove unused Magic Key definitions from keyboard-level config.h, B
* Remove unused Magic Key definitions from keyboard-level config.h, C
* Remove unused Magic Key definitions from keyboard-level config.h, D-E
* Remove unused Magic Key definitions from keyboard-level config.h, F-H
* Remove unused Magic Key definitions from keyboard-level config.h, handwired
* Remove unused Magic Key definitions from keyboard-level config.h, I-K
* Remove unused Magic Key definitions from keyboard-level config.h, L-M
* Remove unused Magic Key definitions from keyboard-level config.h, N-R
* Remove unused Magic Key definitions from keyboard-level config.h, S-V
* Remove unused Magic Key definitions from keyboard-level config.h, W-Z
* Merge remote-tracking branch 'upstream/master' into clean/command_and_magic
* Remove remaining unused IS_COMMAND() instances from keyboard-level config.h
2021-09-26 02:57:20 -07:00
327b1c0298
Merge remote-tracking branch 'origin/master' into develop
2021-09-26 07:01:41 +00:00
95733d1c16
Remove references to KBFirmware JSON Parser ( #14608 )
...
* remove refs: exclusive/e85/soldered
* remove refs: handwired/bigmac
* remove refs: handwired/boss566y/redragon_vara
* remove refs: handwired/marauder
* remove refs: id67
* remove refs: kprepublic/bm60rgb
* remove refs: playkbtw/helen80
* remove refs: sam/sg81m
* remove refs: sawnsprojects/satxri6key
* remove refs: yncognito/batpad
2021-09-26 00:01:11 -07:00
93c3e10f75
Merge remote-tracking branch 'origin/master' into develop
2021-09-26 05:48:44 +00:00
14f0a417c7
GG Keyboards Genesis: Layout Macro update and clean-up ( #14606 )
...
* Genesis Hotswap: rename LAYOUT to LAYOUT_tkl_ansi
* Genesis Hotswap: delete blank layers from default keymap
Results in a smaller compiled firmware size.
* Genesis Hotswap: tidy-up via keymap
Fixes the visual alignment of keycodes.
* Genesis Hotswap: specify Hotswap in info.json
* Genesis Hotswap: enable Community Layout support
* Genesis Hotswap: remove KBFirmware Parser references
* Genesis Hotswap: specify Hotswap in config.h
* Genesis Solder: correct keyboard layout
* Genesis Solder: rename LAYOUT to LAYOUT_all
I don't actually know with certainty that this *is* LAYOUT_all, but in the absence of more concrete information, I'm going with this.
* Genesis Solder: delete blank layers from default keymap
Results in a smaller compiled firmware size.
* Genesis Solder: tidy-up via keymap
Fixes the visual alignment of keycodes.
* Genesis Solder: specify Hotswap in info.json
* Genesis Solder: add LAYOUT_tkl_ansi
* Genesis Solder: enable Community Layout support
* Genesis Solder: remove KBFirmware Parser references
* Genesis Solder: specify Solder in config.h
2021-09-25 22:48:14 -07:00
2e76b24db6
Merge remote-tracking branch 'origin/master' into develop
2021-09-26 05:22:33 +00:00
532cfd56ca
Exclusive E6 RGB Refactor ( #14604 )
2021-09-26 15:22:04 +10:00
c576b11008
Merge remote-tracking branch 'origin/master' into develop
2021-09-26 04:54:31 +00:00
8c76e1ec08
FLX Virgo: metadata clean-up ( #14605 )
...
* correct maintainer field in info.json
* remove KBFirmware Parser references
2021-09-25 21:53:57 -07:00
3b9a401036
Merge remote-tracking branch 'origin/master' into develop
2021-09-25 19:26:16 +00:00
3296c26c98
Saka68 Solder Refactor ( #14596 )
...
* rename LAYOUT to LAYOUT_68_ansi
* tidy-up keymaps
Adjusts indenting for readability/aesthetics.
* add LAYOUT_68_iso macro
* enable Community Layout support
* add Split Backspace layout variants
* remove KBFirmware Parser references
* correct keyboard metadata
2021-09-25 12:25:43 -07:00
32dca0e19d
Merge remote-tracking branch 'origin/master' into develop
2021-09-25 18:03:37 +00:00
5c2d15573d
Saka68 Hotswap Refactor ( #14595 )
...
* rename LAYOUT to LAYOUT_68_ansi
* tidy-up keymaps
Adjusts indenting for readability/aesthetics.
* remove default keymap readme
* add LAYOUT_68_iso macro
* enable Community Layout support
* remove KBFirmware Parser references
* correct keyboard metadata
* specify keyboard variant in info.json and config.h
* correct maintainer field in info.json
2021-09-25 11:03:00 -07:00
ab82ca1789
Merge remote-tracking branch 'origin/master' into develop
2021-09-25 16:50:23 +00:00
aee0b0097b
[Keyboard] add keyboard dyz_TKL ( #14535 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-09-25 09:49:58 -07:00
ea451cbe8e
Merge remote-tracking branch 'origin/master' into develop
2021-09-25 16:49:53 +00:00
29079e54f1
[Keyboard] add keyboard dyz40 ( #14533 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-09-25 09:49:26 -07:00
2c415a8b61
Merge remote-tracking branch 'origin/master' into develop
2021-09-25 16:49:17 +00:00
8b0b858db9
[Keyboard] add keyboard selka40 ( #14560 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-09-25 09:48:47 -07:00
ebd81b3217
Merge remote-tracking branch 'origin/master' into develop
2021-09-25 16:48:23 +00:00
c74bd72d4f
[Keyboard] Fix pin spacing alignmnent ( #14592 )
...
Co-authored-by: filterpaper <filterpaper@localhost>
2021-09-25 09:47:56 -07:00
a857956a3c
Merge remote-tracking branch 'origin/master' into develop
2021-09-25 08:31:52 +00:00
68c327f672
Remove keyboard-level `COMBO_ENABLE` rules ( #14550 )
2021-09-25 18:31:24 +10:00
8fa9312b0f
Merge remote-tracking branch 'origin/master' into develop
2021-09-24 23:30:19 +00:00
3be47b3eaa
[Keyboard] Fix default keymap for Potato65s ( #14587 )
2021-09-25 00:29:47 +01:00
7deac7ada3
Merge remote-tracking branch 'origin/master' into develop
2021-09-24 23:29:40 +00:00
216620ee76
tidy up Clawsome Boards info.json files ( #14586 )
...
* removes `meta` field
* changes `maintainer` field to use GitHub username
2021-09-25 00:29:08 +01:00
cf7b59389e
Merge remote-tracking branch 'origin/master' into develop
2021-09-24 23:28:56 +00:00
9e87b47a9c
Aozora Hotswap info.json clean-up ( #14585 )
...
* clean up info.json
* correct maintainer field to use GitHub username
* remove `meta` key
* clean up readme.md
* correct key count in intro paragraph
2021-09-25 00:28:25 +01:00
3a2a39e5ec
Initial pass of F405 support ( #14584 )
...
* Initial pass of F405 support
* remove some conf files
* docs
* clang
2021-09-25 00:19:41 +01:00
e1dfbfbfd3
[Keyboard] Fix typo in mechloving adelais header files ( #14590 )
2021-09-25 00:15:33 +01:00
20d3dc0c83
Patch for develop branch merge conflicts
...
Fixes bugs introduced by 675c5a5e12
2021-09-24 12:42:57 -07:00
675c5a5e12
Merge remote-tracking branch 'origin/master' into develop
2021-09-24 12:21:32 -07:00
4493a05b74
[Keyboard] refactor signum30 ( #14527 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Stan Gurenkov <stan.gurenkov@docusign.com>
2021-09-24 10:05:29 -07:00
60b13d04cd
Alf X2 Refactor ( #14572 )
2021-09-24 09:29:58 -07:00
076a332613
Swift65 Solder Refactor ( #14579 )
2021-09-24 09:29:46 -07:00
3778dd5727
[Keyboard] add 2 keys in jkb65 keymap ( #14576 )
2021-09-24 09:29:18 -07:00
863d9c35fe
[Keyboard] Create the battleship gamepad keyboard. ( #14551 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-24 09:27:29 -07:00
257bc473e5
[Keyboard] Add Potato65 Solderable PCB ( #14047 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-24 09:13:53 -07:00
768803ef72
[Keyboard] PLX info.json update ( #14536 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-24 08:57:08 -07:00
2d079c984f
[Keyboard] Add Rotor Keyboard ( #14407 )
...
* rotor keyboard
* readme image
* info.json update
* Update readme.md
* Update keyboards/rotor/rules.mk
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/rotor/info.json
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-24 08:56:37 -07:00
77bb907fee
[Keyboard] Added A. Dux keyboard configurations ( #14320 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-24 00:30:52 -07:00
c6f92e37aa
[Keyboard] Add phrygian design ph100 ( #13738 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-24 00:25:33 -07:00
fcb7c7b04f
[Keyboard] Add Adelais PCB. Adelais RGB rev.3, Adelais rev. 4 APM32F103, Adelais AVR rev. 1 ( #14252 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-24 00:13:23 -07:00
c242693ec7
[Keyboard] Add sam/sg81m layout ( #13432 )
...
Co-authored-by: Joel Challis <git@zvecr.com>
2021-09-23 23:41:05 -07:00
e36c2cbf90
[Keyboard] Disable console on Sofle for size concerns ( #14577 )
...
Co-authored-by: filterpaper <filterpaper@localhost>
2021-09-23 23:32:40 -07:00
f4e42bde4a
kk980 - Fix Configurator rendering ( #14556 )
...
* add kk980
* fix
* fix config.h
* Modified readme.md
* fix
* Modified format.
* Modified image.
* Modified rules.mk
* Modified rules.mk + #
* fix info.json: keys dislocation
2021-09-23 20:16:20 +01:00
a68c4d8b81
[Keyboard] Update default keymaps for OLKB boards ( #14565 )
2021-09-23 20:08:23 +01:00
29f199f456
AMJ96 Refactor ( #14571 )
...
* clean up amj96.h
- use #pragma once include guard
- remove extra comments
- update matrix position alignment (easier readability)
* info.json: apply human-friendly formatting
* rename LAYOUT to LAYOUT_all
* clean up rules.mk
Align to QMK's AVR template.
* clean up default keymap
- use four-space indent
- add RESET keycode (Fn+R)
- remove unnecessary functions
* clean up config.h
- use #pragma once include guard
- move lighting settings to the middle of the file (QMK template conformance)
- remove Magic and MIDI configuration blocks
* update readme.md file
- update keyboard info list
- add flashing instructions
- update Docs links
- remove trailing spaces
* remove "empty" config.h and readme.md from default keymap
2021-09-23 11:01:49 -07:00
d7e61e56bb
Merge remote-tracking branch 'origin/master' into develop
2021-09-23 08:32:00 +00:00
66857b919b
Wuque Mammoth20x Layout Macro Refactor ( #14568 )
...
* mammoth20x: edit size of RightEncode key in Configurator
* physically arrange layout macro
Arranges the keycodes to resemble the assembled board.
* rename LAYOUT_default to LAYOUT
Includes "layout_aliases" tree in info.json for backwards compatibility.
* rules.mk touch-up
* convert tabs to spaces
* add line break before ENCODER_ENABLE (not included in QMK's template)
* readme.md touch-up
* remove zero-width space characters
* markdown fix for info paragraph
* update link text
2021-09-23 01:31:11 -07:00
c679911f3d
Merge remote-tracking branch 'upstream/master' into develop
2021-09-23 00:59:31 -07:00
62ef4a9c8a
Meira Refactor ( #14566 )
...
* clean up keyboard header files
* use #pragma once include guard
* convert tabs to spaces
* remove redundant #include statements
* update revision references to main header (`../meira.h` -> `meira.h`)
* refactor default keymap
* use LAYOUT as layout macro reference
* use enum statement for layer indexes; make layers contiguous
* use four-space indent
* update keycode grid alignment
* update layout macro aliases
* move layout macro aliases to info.json
* alias KEYMAP to LAYOUT_ortho_4x12 so the user keymaps don't have to be edited
* touch up meira.h
There's no Planck MIT layout reference here.
* add copyright headers
* workaround patch for grahampheath keymap
The `matrix_init_kb()` function in `meira.c` calls `backlight_set()`, but the grahampheath keymap disables Backlight to make space for Audio, causing the firmware to fail to compile.
This commit wraps the `backlight_set()` call in an ifdef statement, so the call is excluded if Backlight is disabled.
* clean up rules.mk inline comments
* re-order rules.mk settings
* clean up readme.md
* correct link to keyboard image
* change metadata section to unordered list
* spelling corrections
* update make instructions and Docs links
2021-09-23 00:49:02 -07:00
d5df1b81a3
Merge remote-tracking branch 'origin/master' into develop
2021-09-23 01:03:23 +00:00
QMK Bot
Jay Greco
Wolf Van Herreweghe
leonardusdipa
Ryan
Kyle McCreery
Sergey Vlasov
Drashna Jaelre
James Young
Joel Challis
Dao Tak Isaac
Bahrul Hidayat
jmcwilliams403
Nick Brassel
Grayson Carr
Danny
Daniel Cormier
moyi4681
tiltowait
Christian Sandven
4pplet
ai03
mechlovin
rhmokey
john-ezra
negatv
npspears
vattern
jonavin
nachie
Greg Knapp
owlab-git
Alexander Kagno
Harshit Goel
Dasky
Sergi Meseguer
peepeetee
Zach White
peott-fr
Albert Y
Stan Gurenkov
WiZ.GG
Andrew Braini
Aeonstrife
Nick Abe
Albert Engelbrecht
phrygiandesign
ryanbughuang
Sets3n