gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2024-12-15 14:13:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,217 Commits 64 Branches 1,613 Tags 1 GiB
17e41a90c8
Commit Graph

17212 Commits

Author SHA1 Message Date
QMK Bot
94b74b537a Merge remote-tracking branch 'origin/master' into develop 2023-06-22 16:32:06 +00:00
James Young
c01a3cfaca
Viktus OSAv2 Numpad Community Layout Support and Configurator Touch-Up (#21342) 
* [style] sort JSON keys in layout objects

* [chore] correct layout data

* [refactor] rename LAYOUT_all_split to LAYOUT_ortho_5x4

* [refactor] rename LAYOUT_2u_plus_2u_enter_2u_zero to LAYOUT_numpad_5x4

* [enhancement] enable Community Layout support
 2023-06-22 17:31:34 +01:00
QMK Bot
ff8d9fa382 Merge remote-tracking branch 'origin/develop' into xap 2023-06-22 14:07:41 +00:00
Joel Challis
fb76c941ee
Fix rate/pistachio_pro:via (#21339) 2023-06-22 15:06:57 +01:00
QMK Bot
2e811f8f30 Merge remote-tracking branch 'origin/develop' into xap 2023-06-22 13:48:00 +00:00
QMK Bot
bfd6bb8d23 Merge remote-tracking branch 'origin/master' into develop 2023-06-22 13:46:17 +00:00
QMK Bot
1987c13246 Merge remote-tracking branch 'origin/develop' into xap 2023-06-22 13:45:59 +00:00
James Young
87ab13094e
Soda Pocket: correct layout data (#21333) 
[chore]

Correct the layout data for the keyboard.

This commit fixes a misleading Configurator implementation.
 2023-06-22 14:45:39 +01:00
QMK Bot
8ca7570cd2 Merge remote-tracking branch 'origin/master' into develop 2023-06-22 13:45:27 +00:00
James Young
2176c760df
Spleeb: correct layout data (#21334) 
* [style] friendly-format info.json

* [chore] correct layout data

Fix a poor Configurator/CLI rendering.
 2023-06-22 14:44:48 +01:00
QMK Bot
f9210f35c7 Merge remote-tracking branch 'origin/develop' into xap 2023-06-22 04:36:49 +00:00
QMK Bot
5a4fab0b9e Merge remote-tracking branch 'origin/master' into develop 2023-06-22 04:36:15 +00:00
James Young
cc4ac72f85
Igloo Configurator Touch-Up (#21303) 
* [refactor] friendly-format info.json

* [enhancement] add matrix diagram

* [enhancement] remove key overlaps in layout data
 2023-06-21 21:35:35 -07:00
QMK Bot
b0782a1e2f Merge remote-tracking branch 'origin/develop' into xap 2023-06-22 02:13:04 +00:00
QMK Bot
c601b1f623 Merge remote-tracking branch 'origin/master' into develop 2023-06-22 02:12:05 +00:00
James Young
33f76d79d4
Quarkeys Z40 Community Layout Support and Touch-Up (#21329) 
* [refactor] rename LAYOUT to LAYOUT_planck_mit

* [style] friendly-format info.json

* [style] refactor keymaps

- grid-align keycodes
- use four-space indent
- remove trailing whitespace

* [chore] tidy-up keyboard data in info.json

- spell-check `manufacturer` value
- use valid `url`
- reference GitHub username for `maintainer`

* [chore] tidy-up readme

- link to maintainer's GitHub account
- add Hardware Availability link
- break-out Hardware Specs into its own section

* [enhancement] enable Community Layout support

* [chore] replace product image in readme

Source repository for previous URL seems to have been deleted.
 2023-06-21 19:11:32 -07:00
QMK Bot
cd02697381 Merge remote-tracking branch 'origin/develop' into xap 2023-06-22 00:43:50 +00:00
QMK Bot
adc954fafd Merge remote-tracking branch 'origin/master' into develop 2023-06-22 00:43:08 +00:00
James Young
b8a12db1a1
Pteropus: correct layout data (#21326) 
* [style] friendly-format info.json

* [chore] correct layout data

Fix keys overlapping when rendered in QMK Configurator or CLI.
 2023-06-21 17:42:30 -07:00
QMK Bot
c0b64f1ed7 Merge remote-tracking branch 'origin/develop' into xap 2023-06-21 21:20:37 +00:00
James Young
87b371cea6
ProtoTypist PT-80 Refactor (#21325) 
* [style] friendly-format info.json

* [docs] add layout/matrix diagram

* [style] refactor via keymap

- grid-align keycodes
- remove trailing whitespace

* [refactor] LAYOUT_all macro

Move the JSON object for the Enter key to the end of the home row.

* [style] refactor default keymap

- update keycode grid alignment
- remove trailing whitespace

* [refactor] LAYOUT_tkl_iso macro

Move the JSON object for the Enter key to the end of the home row.

This commit fixes a key sequence error with the `tkl_iso` Community
Layout support.

* [style] refactor default_ansi keymap

- update keycode grid alignment
- remove trailing whitespace

* [bugfix] fix function row matrix assignments for LAYOUT_tkl_iso

Fix incorrect matrix position assignments on the function row keys for
the `LAYOUT_tkl_iso` macro.

* [bugfix] fix function row matrix assignments for LAYOUT_tkl_ansi

Fix incorrect matrix position assignments on the function row keys for
the `LAYOUT_tkl_ansi` macro.
 2023-06-21 14:20:02 -07:00
QMK Bot
de22d5639a Merge remote-tracking branch 'origin/develop' into xap 2023-06-21 19:31:13 +00:00
QMK Bot
810cd9bc53 Merge remote-tracking branch 'origin/master' into develop 2023-06-21 19:30:39 +00:00
James Young
6f39205f73
Laneware LW75: correct layout data (#21314) 
[refactor]

Fixes misleading Configurator implementations of the available layouts.
 2023-06-21 12:30:04 -07:00
QMK Bot
f934275e16 Merge remote-tracking branch 'origin/develop' into xap 2023-06-21 18:43:28 +00:00
QMK Bot
e3faa76e4c Merge remote-tracking branch 'origin/master' into develop 2023-06-21 18:42:56 +00:00
lindgrenj6
20c0043538
[Keymap] Add lindgrenj6 planck layout (#21155) 2023-06-21 12:42:23 -06:00
QMK Bot
da90e320d0 Merge remote-tracking branch 'origin/develop' into xap 2023-06-21 18:31:28 +00:00
QMK Bot
fa1b53360b Merge remote-tracking branch 'origin/master' into develop 2023-06-21 18:30:50 +00:00
James Young
4cc427c13e
Lucid Velvet Solder Layout Additions and Touch-Up (#21313) 
* [refactor] refactor via keymap

- grid-align keycodes
- remove trailing whitespace

* [refactor] refactor default keymap

- grid-align keycodes
- remove trailing whitespace

* [bugfix] fix key sequence error in default keymap

* [enhancement] fix key overlaps in Configurator

* [enhancement] add matrix diagram

* [refactor] rename LAYOUT to LAYOUT_all

* [enhancement] add LAYOUT_tkl_f13_ansi_split_space_split_bs_rshift

* [enhancement] add LAYOUT_tkl_f13_ansi_split_bs_rshift

* [enhancement] add LAYOUT_tkl_f13_ansi

* [enhancement] add LAYOUT_tkl_f13_iso_split_space_split_bs_rshift

* [enhancement] add LAYOUT_tkl_f13_iso_split_bs_rshift

* [enhancement] add LAYOUT_tkl_f13_iso
 2023-06-21 11:30:15 -07:00
QMK Bot
5ad99a5012 Merge remote-tracking branch 'origin/develop' into xap 2023-06-21 17:39:43 +00:00
QMK Bot
b6c76cd143 Merge remote-tracking branch 'origin/master' into develop 2023-06-21 17:39:03 +00:00
James Young
b814ff5bca
Lucid Velvet Hotswap Layout Additions and Touch-Up (#21312) 
* [refactor] refactor via keymap

- grid-align keycodes
- remove trailing whitespace

* [refactor] refactor default keymap

- grid-align keycodes
- remove trailing whitespace

* [bugfix] fix key sequence error in default keymap

* [enhancement] fix key overlap in Configurator

* [enhancement] add matrix diagram

* [refactor] rename LAYOUT to LAYOUT_tkl_f13_ansi_split_bs_rshift

* [enhancement] add LAYOUT_tkl_f13_ansi

* [enhancement] add LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift

* [enhancement] add LAYOUT_tkl_f13_ansi_tsangan

* [enhancenment] enable Community Layout support
 2023-06-21 10:38:18 -07:00
QMK Bot
f8839cf738 Merge remote-tracking branch 'origin/develop' into xap 2023-06-21 16:01:07 +00:00
QMK Bot
673b536d70 Merge remote-tracking branch 'origin/master' into develop 2023-06-21 16:00:31 +00:00
James Young
71b77df06f
Keebio Cepstrum Configurator Touch-Up (#21310) 
* [enhancement] remove redundant layout data

Remove the redundant layout data from the keyboard-level `info.json`.

* [enhancement] correct JSON syntax in rev1/info.json

* [enhancement] friendly-format rev1/info.json

* [enhancement] correct layout data
 2023-06-21 08:59:54 -07:00
QMK Bot
e97f01436f Merge remote-tracking branch 'origin/develop' into xap 2023-06-21 03:06:34 +00:00
QMK Bot
3274e0a4d5 Merge remote-tracking branch 'origin/master' into develop 2023-06-21 03:05:47 +00:00
lalalademaxiya1
ecca9c5459
Add Keychron C2 Pro (#20701) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: adophoxia <100170946+adophoxia@users.noreply.github.com>
Co-authored-by: jack <0x6a73@protonmail.com>
 2023-06-20 21:05:07 -06:00
QMK Bot
6164c6e0a9 Merge remote-tracking branch 'origin/develop' into xap 2023-06-21 03:03:08 +00:00
QMK Bot
08ba8a0160 Merge remote-tracking branch 'origin/master' into develop 2023-06-21 03:02:34 +00:00
jonylee@hfd
595d393fd8
[Keyboard] Add Monsgeek M5 (#21182) 
Co-authored-by: adophoxia <100170946+adophoxia@users.noreply.github.com>
Co-authored-by: jack <0x6a73@protonmail.com>
 2023-06-20 21:01:43 -06:00
QMK Bot
a52b4c324c Merge remote-tracking branch 'origin/develop' into xap 2023-06-21 02:59:19 +00:00
James Young
dad41bd2f6
ProtoTypist PT-60 Refactor (#21322) 2023-06-20 20:58:44 -06:00
QMK Bot
c221b4f046 Merge remote-tracking branch 'origin/develop' into xap 2023-06-21 02:30:51 +00:00
QMK Bot
c69f82f282 Merge remote-tracking branch 'origin/master' into develop 2023-06-21 02:30:16 +00:00
James Young
7753249d3d
NovelKeys NK+: correct layout data (#21317) 
* NovelKeys NK+: correct layout data

Add key sizes to the layout data.

* [refactor] rename LAYOUT to LAYOUT_65_xt_ansi_blocker_tsangan
 2023-06-21 03:29:44 +01:00
QMK Bot
c004587f5e Merge remote-tracking branch 'origin/develop' into xap 2023-06-21 00:33:51 +00:00
QMK Bot
6ec91a75d5 Merge remote-tracking branch 'origin/master' into develop 2023-06-21 00:33:07 +00:00
Jack Humbert
42cd55e08d
Planck Matrix Fixes (#21196) 
* fix non-default keymap compiling, initial matrix state, watchdog options

* fix: allow planck/rev7 to be used with ENCODER_ENABLE = no

* chore: update function name on all cases.

* remove old midi tone option

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

* fixes abhixec's planck keymap

* add audio enable condition to abhixec's planck keymap

* add audio enable condition to all muse includes

* Revert "add audio enable condition to all muse includes"

This reverts commit 9779e90897.

* Revert "add audio enable condition to abhixec's planck keymap"

This reverts commit 24c742a5e8.

* Revert "fixes abhixec's planck keymap"

This reverts commit 4bb085d1ff.

---------

Co-authored-by: Peter.Falken <luis@bitjester.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2023-06-20 20:32:32 -04:00
QMK Bot
1ac997140d Merge remote-tracking branch 'origin/develop' into xap 2023-06-20 22:41:13 +00:00
James Young
45dc1ccffe
EC Pro X JIS Layout Touch-Up (#21260) 
* [refactor] update `info.json` for readability

- sort the JSON objects representing the keyboard's keys in the order:
  - label, matrix, x, y, w, h
- convert numeric JSON values to integers where appropriate

* [refactor] remove key labels from `info.json`

* [refactor] keymap refactor

- grid-align keycodes

* [bugfix] move Enter key to home row

Moves the JSON object representing the Enter key to the home row.

Fixes an issue that resulted in correct key assignment only if the
keymap being compiled/flashed was based upon the `via` keymap.
 2023-06-20 15:40:31 -07:00
James Young
ac14fce06d
Kalakos Bahrnob65 Configurator Layout Touch-Up (#21309) 
* [enhancement] add matrix diagram

* [refactor] friendly-format info.json

* [enhancement] remove key overlaps
 2023-06-20 18:18:16 +01:00
QMK Bot
42d0adc7cd Merge remote-tracking branch 'origin/develop' into xap 2023-06-20 17:17:48 +00:00
QMK Bot
a9f49a0ce8 Merge remote-tracking branch 'origin/master' into develop 2023-06-20 17:17:10 +00:00
James Young
85b804496c
KJ-Modify RS40 Configurator Touch-Up (#21311) 
* [refactor] friendly-format info.json

* [enhancement] remove key overlap

Fix a key overlap in the Configurator rendering between LCtrl and Fn2.

* [enhancement] replace store links with product links

Replace URLs that point to the vendor's shop with URLs to the vendor's
product listing.
 2023-06-20 18:16:35 +01:00
QMK Bot
3e7bf8b6d9 Merge remote-tracking branch 'origin/develop' into xap 2023-06-20 15:43:54 +00:00
QMK Bot
01cfc72b57 Merge remote-tracking branch 'origin/master' into develop 2023-06-20 15:42:27 +00:00
lalalademaxiya1
45c52c742e
[Keyboard] Add Keychron C1 Pro (#20700) 
Co-authored-by: adophoxia <100170946+adophoxia@users.noreply.github.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: jack <0x6a73@protonmail.com>
 2023-06-20 09:41:45 -06:00
QMK Bot
7830982781 Merge remote-tracking branch 'origin/develop' into xap 2023-06-20 15:39:43 +00:00
QMK Bot
965cfec3f9 Merge remote-tracking branch 'origin/master' into develop 2023-06-20 15:39:02 +00:00
Roberts Kursitis
958cae3e0a
[Keyboard] Add Alisaie (#21266) 2023-06-20 09:38:26 -06:00
QMK Bot
d2e0fc22d8 Merge remote-tracking branch 'origin/develop' into xap 2023-06-20 15:36:39 +00:00
QMK Bot
a2e2d92652 Merge remote-tracking branch 'origin/master' into develop 2023-06-20 15:36:05 +00:00
Derek
0abe3129f1
[Keyboard] Add bigsmoothknob (#21265) 
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: jack <0x6a73@protonmail.com>
 2023-06-20 09:35:23 -06:00
QMK Bot
c820bd4240 Merge remote-tracking branch 'origin/develop' into xap 2023-06-20 02:32:22 +00:00
jonylee@hfd
d98b60c8f6
Move kb83 keyboard (#20761) 
* move hfdkb/keyboard_sw/k83 --> inland/kb83

* move hfdkb/keyboard_sw/k83 --> inland/kb83

* Update data/mappings/keyboard_aliases.hjson

* Update keyboard_aliases.hjson

* fixed  the Configurator layout data

* fixed the Configurator layout data

* Revert "Update keyboard_aliases.hjson"

This reverts commit c085c54765.

* Revert "fixed  the Configurator layout data"

* Update keyboard_aliases.hjson

* Update info.json
 2023-06-19 19:31:46 -07:00
QMK Bot
6aa81dd1cf Merge remote-tracking branch 'origin/develop' into xap 2023-06-20 01:47:02 +00:00
QMK Bot
be6f92c612 Merge remote-tracking branch 'origin/master' into develop 2023-06-20 01:46:21 +00:00
James Young
31e39a9ff4
dnworks SBL Community Layout Support and Touch-Up (#21267) 2023-06-19 18:45:47 -07:00
QMK Bot
6050499eb2 Merge remote-tracking branch 'origin/develop' into xap 2023-06-19 20:00:07 +00:00
jack
b749a5f720
Fixup nightly_boards/n40_o (#21307) 2023-06-19 13:59:35 -06:00
QMK Bot
f3a956b9f4 Merge remote-tracking branch 'origin/develop' into xap 2023-06-19 15:47:01 +00:00
jack
c4a67d3f33
Remove encoder in-matrix workaround code (#20389) 2023-06-19 09:46:27 -06:00
QMK Bot
85f81c4be1 Merge remote-tracking branch 'origin/develop' into xap 2023-06-19 12:11:09 +00:00
jack
74fbd5a031
Fixup dekunukem/duckypad (#21298) 2023-06-19 13:10:25 +01:00
QMK Bot
f63e7b5fce Merge remote-tracking branch 'origin/develop' into xap 2023-06-19 06:06:00 +00:00
QMK Bot
a68e9f0116 Merge remote-tracking branch 'origin/master' into develop 2023-06-19 06:05:27 +00:00
James Young
abd0632b9e
Tsubasa Handwired: correct layout data (#21295) 2023-06-19 00:04:50 -06:00
QMK Bot
495e2f5e8d Merge remote-tracking branch 'origin/develop' into xap 2023-06-19 05:54:17 +00:00
QMK Bot
55ed2bcc7e Merge remote-tracking branch 'origin/master' into develop 2023-06-19 05:53:34 +00:00
James Young
a756ef6c88
HFDKB K83 Configurator Layout Fix (#21297) 2023-06-18 23:53:01 -06:00
QMK Bot
4b1afd2350 Merge remote-tracking branch 'origin/develop' into xap 2023-06-19 05:24:24 +00:00
QMK Bot
3c84f2b96d Merge remote-tracking branch 'origin/master' into develop 2023-06-19 05:23:45 +00:00
mechlovin
e646ec2024
[Keyboard] Add support for Alveus MX PCB (#21238) 
Co-authored-by: jack <0x6a73@protonmail.com>
 2023-06-18 23:23:11 -06:00
QMK Bot
785c3fec83 Merge remote-tracking branch 'origin/develop' into xap 2023-06-19 05:03:59 +00:00
QMK Bot
2ea02c3995 Merge remote-tracking branch 'origin/master' into develop 2023-06-19 05:03:28 +00:00
Nick Brassel
0774381f81
Swap G431 to transient EEPROM. Add G431 and G474 onekeys. (#21282) 2023-06-19 15:02:57 +10:00
QMK Bot
9d83d690e2 Merge remote-tracking branch 'origin/develop' into xap 2023-06-19 03:58:03 +00:00
QMK Bot
1f6aa12184 Merge remote-tracking branch 'origin/master' into develop 2023-06-19 03:57:28 +00:00
James Young
de49bcd8e8
Geistmaschine Geist Layout Refactor and Touch-Up (#21288) 2023-06-18 20:56:55 -07:00
QMK Bot
ef7965831a Merge remote-tracking branch 'origin/develop' into xap 2023-06-18 22:34:19 +00:00
Ryan
1c9d0f0eec
Remove default TAPPING_TERM from keyboard config.h (#21284) 2023-06-18 23:33:45 +01:00
QMK Bot
c9beff4be3 Merge remote-tracking branch 'origin/develop' into xap 2023-06-18 22:09:41 +00:00
QMK Bot
7c7cec906a Merge remote-tracking branch 'origin/master' into develop 2023-06-18 22:09:05 +00:00
James Young
88640e47ef
[refactor] correct layout data (#21289) 2023-06-18 23:08:34 +01:00
QMK Bot
fbf4ec086f Merge remote-tracking branch 'origin/develop' into xap 2023-06-18 11:39:16 +00:00
QMK Bot
54d883befa Merge remote-tracking branch 'origin/master' into develop 2023-06-18 11:38:43 +00:00
Sergey Vlasov
b520b352f9
preonic/rev3{,_drop}: Fix layouts with 2u keys (#21114) 
Apparently layouts with 2u keys were not correctly converted into the
`info.json` format (the old C layout macros used the arguments for such
keys multiple times to cover all possible 1u locations; this is not
supported in `info.json`, and the single matrix location for 2u keys was
chosen incorrectly in some cases).  Fix the layout definitions to match
the real PCB wiring.
 2023-06-18 14:38:09 +03:00
QMK Bot
3bce99af37 Merge remote-tracking branch 'origin/develop' into xap 2023-06-18 04:39:41 +00:00