locker98/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,734 Commits 1 Branch 0 Tags 293 MiB
e4afd371dc
Commit Graph

120 Commits

Author SHA1 Message Date
QMK Bot
8ad59ec127 Merge remote-tracking branch 'origin/master' into develop 2022-01-30 23:11:13 +00:00
James Young
2e13f7d9f0
Mechlovin Olly BB Touch-Up (#16137) 
* fix keymap alignment

Both the `default` and `via` keymaps had misalignments on the top 3 layers, which was misleading as to which keycode was on which switch on those layers.

* fix layout macro reference in info.json

* friendly-format info.json, phase 1

Adds line breaks between keyboard rows.

* correct info.json key sequence

* bb.h: use XXX for KC_NO

* bb.h: add matrix diagram

* add LAYOUT_ansi_split_bs

Includes reference keymap.

* add LAYOUT_iso_split_bs

Includes reference keymap.

* info.json: remove meta key
 2022-01-30 23:10:42 +00:00
QMK Bot
02637ec350 Merge remote-tracking branch 'origin/master' into develop 2022-01-15 07:51:29 +00:00
Drashna Jaelre
7edfb4deff
[Keyboard] Fix compilation issues for mechlovin hex4b (#15885) 2022-01-14 23:51:02 -08:00
Dasky
08a42dc72c
Fix broken bootloader builds in develop. (#15880) 2022-01-15 01:04:58 +00:00
QMK Bot
6e516ee89f Merge remote-tracking branch 'origin/master' into develop 2022-01-12 22:10:08 +00:00
mechlovin
2c18dcc619
[Keyboard] Add Hex4B rev.2 PCB (#15811) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2022-01-12 14:09:33 -08:00
QMK Bot
80e321f6ab Merge remote-tracking branch 'origin/master' into develop 2022-01-11 17:57:37 +00:00
Albert Y
3d63c814d3
Correct matrix effect name (#15816) 2022-01-11 09:57:25 -08:00
QMK Bot
a760168722 Merge remote-tracking branch 'origin/master' into develop 2022-01-11 01:09:14 +00:00
mechlovin
ffebc0407c
[Keyboard] Add Kay60 PCB (#15566) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2022-01-10 17:08:32 -08:00
QMK Bot
de59dd1835 Merge remote-tracking branch 'origin/master' into develop 2022-01-09 02:34:46 +00:00
mechlovin
69510bab8e
[Keyboard] add Haus PCB (#12434) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2022-01-08 18:33:46 -08:00
Ryan
6bc870d899
Refactor bootloader_jump() implementations (#15450) 
* Refactor `bootloader_jump()` implementations

* Fix tests?

* Rename `atmel-samba` to `md-boot`
 2021-12-27 21:10:07 +11:00
nazerim
ec98bc343b
Hex 4b LED Layer Indicater (#15160) 
* Hex 4b VIA Keymap to use scroll lock and num lock LED's to indicate active layer (0,1,2,3)

* Added readme.md file
 2021-12-27 14:08:06 +11:00
Ryan
f718a10889
Fix up build options comments (#15463) 2021-12-12 18:05:37 -08:00
Ryan
a8d440e4e0
Tidy up NKRO_ENABLE rules (#15382) 2021-12-09 16:05:44 +11:00
James Young
554cc86aeb
Extended Community Layout Support (#15371) 
* add tkl_f13_ansi Community Layout

* add tkl_f13_ansi_tsangan Community Layout

* add tkl_f13_iso Community Layout

* add tkl_f13_iso_tsangan Community Layout

* add missing layout diagrams to readme.md

* fix layout macro references in info.json files

* add tkl_nofrow_iso Community Layout

* enable Community Layout support: dyz/dyz_tkl

* enable Community Layout support: kopibeng/mnk88

* enable Community Layout support: mechlovin/infinity88

* enable Community Layout support: tgr/jane/v2ce

* tgr/jane/v2ce: rename/add layouts

The ANSI Tsangan and ISO Tsangan layout macros did not note that Split Right Shift was supported. This commit notes the Split Right Shift in the macro name, and adds Tsangan layouts without Split Right Shift for ANSI and ISO, which fixes the Community Layout support.
 2021-12-06 22:36:02 -08:00
Ryan
c12b997679
Tidy up SLEEP_LED_ENABLE rules (#15362) 2021-12-01 21:13:00 +11:00
James Young
b98280bf5f
Rename Layout Macros for TKLs with F13 keys (#15361) 
* dyz/dyz_tkl: rename F13 layouts

- rename LAYOUT_tkl_ansi_f13 to LAYOUT_tkl_f13_ansi
- rename LAYOUT_tkl_iso_f13 to LAYOUT_tkl_f13_iso

* kopibeng/mnk88: rename F13 layouts

- rename LAYOUT_tkl_ansi_f13 to LAYOUT_tkl_f13_ansi
- rename LAYOUT_tkl_ansi_tsangan_f13 to LAYOUT_tkl_f13_ansi_tsangan
- rename LAYOUT_tkl_iso_f13 to LAYOUT_tkl_f13_iso
- rename LAYOUT_tkl_iso_tsangan_f13 to LAYOUT_tkl_f13_iso_tsangan

* mechlovin/infinity88: rename F13 layouts

- rename LAYOUT_tkl_ansi_f13 to LAYOUT_tkl_f13_ansi
- rename LAYOUT_tkl_iso_f13 to LAYOUT_tkl_f13_iso

* mechlovin/infinity88: rename F13 layouts

- rename LAYOUT_tkl_ansi_f13 to LAYOUT_tkl_f13_ansi
- rename LAYOUT_tkl_ansi_tsangan_f13 to LAYOUT_tkl_f13_ansi_tsangan
- rename LAYOUT_tkl_iso_f13 to LAYOUT_tkl_f13_iso
- rename LAYOUT_tkl_iso_tsangan_f13 to LAYOUT_tkl_f13_iso_tsangan
 2021-11-30 12:15:15 -08:00
Joel Challis
282e916d86
Remove use of __flash due to LTO issues (#15268) 2021-11-24 18:38:49 +11:00
Drashna Jaelre
160b0558f5
Require explicit enabling of RGB Matrix modes (#15018) 2021-11-15 10:41:04 -08:00
QMK Bot
adb6012de1 Merge remote-tracking branch 'origin/master' into develop 2021-11-08 04:41:15 +00:00
James Young
93b3d9b33c
Mechlovin Pisces Refactor (#15080) 2021-11-07 20:40:30 -08:00
QMK Bot
df1d9175c4 Merge remote-tracking branch 'origin/master' into develop 2021-11-05 15:28:51 +00:00
James Young
25c93bd9a3
Mechlovin Infinity88 Layout Extension (#15058) 2021-11-05 08:28:12 -07:00
QMK Bot
833bcbac68 Merge remote-tracking branch 'origin/master' into develop 2021-11-04 22:09:19 +00:00
mechlovin
45b35e6ea1
[Keyboard] Update Infinity87 rev. 2 (#14820) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-11-04 15:08:40 -07:00
James Young
84ea77ead6
Remove BOOTMAGIC_ENABLE = lite option (#15002) 
* remove BOOTMAGIC_ENABLE=lite setting

* change keyboard BOOTMAGIC_ENABLE rules

Edits keyboard-level instances of `BOOTMAGIC_ENABLE = lite` to `BOOTMAGIC_ENABLE = yes`.

* change keyboard BOOTMAGIC_ENABLE inline comments

Edits keyboard-level BOOTMAGIC_ENABLE inline comments to "Enable Bootmagic Lite".

* change keymap BOOTMAGIC_ENABLE rules

Edits keymap-level instances of `BOOTMAGIC_ENABLE = lite` to `BOOTMAGIC_ENABLE = yes`.

* change keymap BOOTMAGIC_ENABLE inline comments

Edits/adds keymap-level BOOTMAGIC_ENABLE inline comments to read "Enable Bootmagic Lite".

* change layout/user BOOTMAGIC_ENABLE rules/comments

Edits instances of `BOOTMAGIC_ENABLE = lite` to `BOOTMAGIC_ENABLE = yes`.

Edits/adds keymap-level BOOTMAGIC_ENABLE inline comments to read "Enable Bootmagic Lite".

* update non-rules.mk BOOTMAGIC_ENABLE references in keyboards/

* remove docs references to Full Bootmagic

* convert data-driven Bootmagic Lite instances

* remove Bootmagic Lite bodge from data-driven generation

* Merge remote-tracking branch 'upstream/develop' into rm/bootmagic-full_q4a

* update docs/ja/config_options.md per mtei

* update docs/faq_misc.md per mtei

Remove remaining Full Bootmagic reference.
 2021-11-05 08:18:09 +11: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
Ryan
b487e10753
Clean up LED/RGB Matrix driver config (#14760) 2021-10-10 16:57:49 -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
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
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
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
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
James Young
5917334b42
Merge remote-tracking branch 'upstream/master' into develop 2021-09-28 10:21:11 -07:00
James Young
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
James Young
843b9a7e4d
Merge remote-tracking branch 'upstream/master' into develop 2021-09-26 03:04:11 -07:00
James Young
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
Drashna Jaelre
e1dfbfbfd3
[Keyboard] Fix typo in mechloving adelais header files (#14590) 2021-09-25 00:15:33 +01:00