qmk/qmk_firmware
1
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2026-09-27 04:19:11 +02:00
Code Issues Packages Projects Releases Wiki Activity
28,315 Commits 58 Branches 1,722 Tags
37824313ffba811300791108ee4bdee5bc728dce
Commit Graph
28315 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
lalalademaxiya1Drashna Jaelreadophoxiajack
 		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@hfdadophoxiajack
 		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 HumbertRyanPeter.Falken
 		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
lalalademaxiya1adophoxiaDrashna Jaelrejack
 		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
DerekJoel Challisjack
 		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 60643b3171 Merge remote-tracking branch 'origin/develop' into xap 2023-06-20 01:56:44 +00:00
QMK Bot 808228c1a8 Merge remote-tracking branch 'origin/master' into develop 2023-06-20 01:56:07 +00:00
Drashna JaelreandRyan 7bd1d18427 [Docs] Add note about ENABLE_COMPILE_KEYCODE to docs (#21290) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2023-06-19 19:55:27 -06: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