Commit Graph

351 Commits

Author SHA1 Message Date
Marcel Maltry
10f0e7db31
Add Vial support for cannonkeys/moment_hs (#634) 2024-01-21 12:52:26 -06:00
Ilya Zhuravlev
66574eb854 Merge remote-tracking branch 'qmk/master' into merge-2023-12-16 2023-12-16 10:48:34 -06:00
Joel Challis
1ed03f498f
Remove userspace keymaps (#22544) 2023-11-27 05:36:45 +11:00
QMK Bot
f24d51f5be Merge remote-tracking branch 'origin/master' into develop 2023-10-31 01:32:32 +00:00
Cipulot
538b79657e
Fix for swapped PID and VID (#22372) 2023-10-31 01:31:58 +00:00
QMK Bot
07ec38f345 Merge remote-tracking branch 'origin/master' into develop 2023-09-30 02:44:14 +00:00
Andrew Kannan
b404d5e9e4
Add Brutalv2 60 Keyboard (#22094)
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-09-29 19:43:40 -07:00
Ryan
21ed9b4575
Simplify more feature driver defines (#22090) 2023-09-25 13:06:42 +10:00
QMK Bot
27ad5b4f4e Merge remote-tracking branch 'origin/master' into develop 2023-09-25 02:59:53 +00:00
Andrew Kannan
c10a46aa43
Add is0gr to QMK (#22024)
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
2023-09-25 12:59:38 +10:00
Joel Challis
6adf461aa0
Remove duplication of RP2040 EEPROM defaults (#21979) 2023-09-12 07:07:40 +01:00
Ilya Zhuravlev
e390a34128 Merge remote-tracking branch 'qmk/master' into merge-2023-09-08 2023-09-08 20:53:27 -06:00
James Young
6aa3814f6e
CannonKeys BastionTKL Layout Additions (#21901)
* [docs] add layout/matrix diagram

* [enhancement] add LAYOUT_tkl_ansi_split_bs_rshift

* [enhancement] add LAYOUT_tkl_ansi_tsangan_split_bs_rshift

* [enhancement] add LAYOUT_tkl_ansi_tsangan

* [enhancement] add LAYOUT_tkl_f13_ansi_tsangan

* [enhancement] add LAYOUT_tkl_f13_ansi_split_bs_rshift

* [enhancement] add LAYOUT_tkl_f13_ansi

* [enhancement] correct LAYOUT_tkl_iso key order

* [enhancement] add LAYOUT_tkl_iso_split_bs_rshift

* [enhancement] add LAYOUT_tkl_iso_tsangan_split_bs_rshift

* [enhancement] add LAYOUT_tkl_iso_tsangan

* [enhancement] add LAYOUT_tkl_f13_iso_split_bs_rshift

* [enhancement] add LAYOUT_tkl_f13_iso

* [enhancement] add LAYOUT_tkl_f13_iso_tsangan_split_bs_rshift

* [enhancement] add LAYOUT_tkl_f13_iso_tsangan

* [enhancement] extend Community Layout support
2023-09-05 00:48:35 -07:00
James Young
809865e9ee
CannonKeys Bastion65 Layout Additions (#21888)
* [docs] add layout/matrix diagram

* [refactor] rename LAYOUT to LAYOUT_all

* [enhancement] add LAYOUT_65_ansi_blocker_split_bs

* [enhancement] add LAYOUT_65_ansi_blocker

* [enhancement] add LAYOUT_65_ansi_blocker_tsangan_split_bs

* [enhancement] add LAYOUT_65_ansi_blocker_tsangan

* [enhancement] add LAYOUT_65_iso_blocker_split_bs

* [enhancement] add LAYOUT_65_iso_blocker

* [enhancement] add LAYOUT_65_iso_blocker_tsangan_split_bs

* [enhancement] add LAYOUT_65_iso_blocker_tsangan

* [enhancement] enable Community Layout support
2023-09-05 00:21:15 -07:00
James Young
2f243e2817
CannonKeys Bastion60 Layout Additions (#21887)
* [bugfix] correct LAYOUT_60_iso_tsangan key order

* [docs] add layout/matrix diagram

* [enhancement] add LAYOUT_60_tsangan_hhkb

* [enhancement] add LAYOUT_60_ansi_tsangan

* [enhancement] add LAYOUT_60_iso

* [enhancement] add LAYOUT_60_iso_split_bs_rshift

* [enhancement] add LAYOUT_60_iso_tsangan_split_bs_rshift

* [enhancement] add LAYOUT_60_hhkb

* [enhancement] extend Community Layout support
2023-09-04 23:55:24 -07:00
James Young
2f517041c7
CannonKeys Bastion75 Layout Additions (#21899)
* [docs] add layout/matrix diagram

* [refactor] rename LAYOUT to LAYOUT_all

* [enhancement] add LAYOUT_ansi_blocker_split_bs

* [enhancement] add LAYOUT_ansi_blocker

* [enhancement] add LAYOUT_ansi_blocker_tsangan_split_bs

* [enhancement] add LAYOUT_ansi_blocker_tsangan

* [enhancement] add LAYOUT_iso_blocker_split_bs

* [enhancement] add LAYOUT_iso_blocker

* [enhancement] add LAYOUT_iso_blocker_tsangan_split_bs

* [enhancement] add LAYOUT_iso_blocker_tsangan
2023-09-04 23:34:23 -07:00
Andrew Kannan
adef366e0c
CannonKeys Meetup Pad 2023 (#21806)
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-08-29 18:08:51 -07:00
Ryan
023d644bb6
Move RGBLight animations to data driven (#21635)
* Move RGBLight animations to data driven, 0-9

* Move RGBLight animations to data driven, A

* Move RGBLight animations to data driven, B

* Move RGBLight animations to data driven, C

* Move RGBLight animations to data driven, D

* Move RGBLight animations to data driven, E

* Move RGBLight animations to data driven, F

* Move RGBLight animations to data driven, G

* Move RGBLight animations to data driven, H

* Move RGBLight animations to data driven, handwired

* Move RGBLight animations to data driven, I

* Move RGBLight animations to data driven, J

* Move RGBLight animations to data driven, K

* Move RGBLight animations to data driven, L

* Move RGBLight animations to data driven, M

* Move RGBLight animations to data driven, N

* Move RGBLight animations to data driven, O

* Move RGBLight animations to data driven, P

* Move RGBLight animations to data driven, Q

* Move RGBLight animations to data driven, R

* Move RGBLight animations to data driven, S

* Move RGBLight animations to data driven, T

* Move RGBLight animations to data driven, U

* Move RGBLight animations to data driven, V

* Move RGBLight animations to data driven, W

* Move RGBLight animations to data driven, X

* Move RGBLight animations to data driven, Y

* Move RGBLight animations to data driven, Z

* Fix incorrect placement

* Fix build failures and mismatches
2023-08-23 22:11:39 +01:00
Ryan
5d2f2af198
OLED: driver naming cleanups (#21710) 2023-08-15 10:30:34 +01:00
QMK Bot
2775e57d8a Merge remote-tracking branch 'origin/master' into develop 2023-07-26 07:21:00 +00:00
Andrew Kannan
48f096013b
Add Bastion65 PCB to QMK (#21528)
Co-authored-by: jack <0x6a73@protonmail.com>
2023-07-26 01:20:23 -06:00
QMK Bot
76b608bb7d Merge remote-tracking branch 'origin/master' into develop 2023-07-25 17:29:31 +00:00
Andrew Kannan
93549c06b9
Add BastionTKL PCB to QMK (#21530)
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Danny <nooges@users.noreply.github.com>
2023-07-25 11:28:51 -06:00
QMK Bot
28e6c11f36 Merge remote-tracking branch 'origin/master' into develop 2023-07-25 17:08:21 +00:00
Andrew Kannan
87c7118b88
Add Bastion60 PCB to QMK (#21527)
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Danny <nooges@users.noreply.github.com>
2023-07-25 11:07:43 -06:00
fauxpark
9a4abea7c9 Merge remote-tracking branch 'upstream/master' into develop 2023-07-21 00:51:15 +10:00
Andrew Kannan
c5a1e485a6
Add Bastion75 PCB to QMK (#21529)
* Add Bastion75 to QMK

* Remove blank layers

* Apply suggestions from code review

Co-authored-by: jack <0x6a73@protonmail.com>

* Update keymaps

---------

Co-authored-by: jack <0x6a73@protonmail.com>
2023-07-20 10:45:09 -04:00
Ryan
7ff80a57cb
Get rid of USB_LED_SCROLL_LOCK (#21405) 2023-07-02 19:24:22 +01:00
Ryan
2f9f555add
Move TAP_CODE_DELAY to data driven (#21363) 2023-06-25 22:06:31 +10:00
Ryan
4ae9bfd17a
Move RGBLIGHT_HUE/SAT/VAL_STEP to data driven (#21292)
Co-authored-by: Nick Brassel <nick@tzarc.org>
2023-06-24 17:37:54 +10:00
Nick Brassel
416af0171c
Remove CORTEX_ENABLE_WFI_IDLE from keyboards. (#21353)
* Remove CORTEX_ENABLE_WFI_IDLE from the codebase.

* Turn on CORTEX_ENABLE_WFI_IDLE by default.
2023-06-23 20:31:25 +01:00
Ryan
b1783db4ea
Move RGBLED_NUM to data driven (#21278) 2023-06-18 14:39:07 +10:00
Ryan
2367d8129c
Move RGBLIGHT_SLEEP to data driven (#21072) 2023-06-16 14:04:45 +10:00
Andrew Kannan
a2c17d5518
[Keyboard] Add CannonKeys Leviatan PCB (#21231) 2023-06-14 22:08:16 -06:00
Ilya Zhuravlev
d6e95213e3 Merge remote-tracking branch 'qmk/master' into merge-2023-06-03 2023-06-03 12:35:25 -06:00
Ryan
363bfdbfda
Move RGBLIGHT_LIMIT_VAL to data driven (#20974)
Co-authored-by: Nick Brassel <nick@tzarc.org>
2023-05-27 12:27:44 +10:00
Ryan
17de141c92
Add missing layout data for a handful of boards (#20931)
* Add missing layout data for a handful of boards

* typo

* Add missing layouts for stoutgat

* Add missing layout for j80

* Replace missing layout with alias for wraith

* Add missing layout for matrix/me

* Add missing layout for satisfaction75/prototype

* Apply suggestions from code review

* Rename wt80-a layouts

* Rename rosa layouts

* Add missing layouts for naked48

* Add missing layouts for naked60

* Add missing layouts for uma

* Remove unused and pointless `LAYOUT_stack` for buzzard

* Add missing layout for keyboardio/model01

* Add missing layout for smk65 revf

* Fix via keymap for h60

* Add missing layout for jabberwocky/v1

* Apply suggestions from code review

* Add missing layout for m3n3van

* Add missing layout for giabalanai

* Add missing layouts for treadstone48/rev1

* Add missing layouts for squiggle

* Update keyboards/marksard/treadstone48/rev1/info.json
2023-05-16 00:00:08 -07:00
Ryan
ef6a712899
Even more info.json whitespace cleanups (#20703) 2023-05-04 19:09:59 +10:00
Ryan
a5e46d8082
More info.json whitespace cleanups (#20665) 2023-05-03 12:19:34 +10:00
Ryan
79aa319946
info.json whitespace cleanups (#20651) 2023-05-02 08:25:15 +10:00
Ryan
12d42cedd2
Move FORCE_NKRO to data driven (#20604) 2023-05-01 13:33:10 +10:00
James Young
6d89034d12
CannonKeys Vector Layout Macro Additions (#20571)
* add matrix_diagram.md

* info.json: apply friendly formatting

* add LAYOUT_60_iso_tsangan_split_bs_rshift

* add LAYOUT_60_iso_tsangan

* add LAYOUT_60_tsangan_hhkb

* add LAYOUT_60_ansi_tsangan

* enable Community Layout support
2023-04-26 20:25:53 -07:00
James Young
68da1e7ed4
CannonKeys Serenity Layout Macro Additions (#20570)
* add matrix_diagram.md

* info.json: apply friendly formatting

* info.json: correct layout data

* add LAYOUT_tkl_f13_iso_split_bs_rshift

* add LAYOUT_tkl_f13_iso

* add LAYOUT_tkl_f13_ansi_split_bs_rshift

* add LAYOUT_tkl_f13_ansi

* enable Community Layout support
2023-04-26 19:58:35 -07:00
James Young
78b893e7fd
CannonKeys Rekt1800 Layout Macro Additions (#20569)
* add matrix_diagram.md

* info.json: apply friendly formatting

* add LAYOUT_ansi

* add LAYOUT_ansi_split_bs

* add LAYOUT_iso

* add LAYOUT_iso_split_bs
2023-04-26 19:37:59 -07:00
Ryan
4871f651c5
Move remaining LAYOUT_alls to data driven (#20463) 2023-04-27 07:45:43 +10:00
James Young
67e18c0d6b
CannonKeys Onyx Layout Macro Additions (#20568)
* add matrix_diagram.md

* info.json: apply friendly formatting

* add LAYOUT_ansi_split_bs_rshift

* add LAYOUT_ansi

* add LAYOUT_ansi_tsangan_split_bs_rshift

* add LAYOUT_ansi_tsangan

* add LAYOUT_iso_split_bs_rshift

* add LAYOUT_iso

* add LAYOUT_iso_tsangan_split_bs_rshift

* add LAYOUT_iso_tsangan
2023-04-26 14:10:46 -07:00
James Young
292db9c0c2
cannonkeys/ellipse_hs: correct layout macro references (#20577) 2023-04-26 13:07:38 -07:00
James Young
553d62672a
CannonKeys Obliterated75 Layout Macro Additions (#20567)
* add matrix_diagram.md

* info.json: apply friendly formatting

* add LAYOUT_ansi_blocker

* add LAYOUT_ansi_blocker_split_bs

* add LAYOUT_iso_blocker

* add LAYOUT_iso_blocker_split_bs
2023-04-26 12:36:50 -07:00
James Young
ea25d17da6
CannonKeys Nearfield Layout Macro Addition (#20566)
* add matrix_diagram.md

* info.json: apply friendly formatting

* add LAYOUT_3u_space
2023-04-26 12:15:09 -07:00
James Young
63ce1e282b
CannonKeys Moment Hotswap Touch-Up (#20565)
* rename LAYOUT_all to LAYOUT_60_tsangan_hhkb

* refactor keymaps

- use four-space indent
- grid-align keycodes

* copy via keymap to default

The default keymap had some keycodes that aren't appropriate for this board, and the function layer was wonky.

* enable Community Layout support
2023-04-26 11:55:43 -07:00