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,225 Commits 64 Branches 1,613 Tags 1 GiB
5fedfa85ba
Commit Graph

28225 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
QMK Bot
63735431d3 Merge remote-tracking branch 'origin/master' into develop 2023-06-21 02:58:50 +00:00
James Young
dad41bd2f6
ProtoTypist PT-60 Refactor (#21322) 2023-06-20 20:58:44 -06:00
Albert Y
2f1cac6e9f
[Docs] Code markdown amendment (#21323) 2023-06-20 20:58:13 -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
d3d8f84b98 Merge remote-tracking branch 'origin/develop' into xap 2023-06-20 22:42:23 +00:00
Nick Brassel
ffdc70bf0a
Consolidate KEYBOARD_OUTPUT+KEYMAP_OUTPUT=>INTERMEDIATE_OUTPUT (#21272) 2023-06-21 08:41:49 +10: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