qmk/qmk_firmware
1
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2026-09-28 04:49:15 +02:00
Code Issues Packages Projects Releases Wiki Activity
28,100 Commits 58 Branches 1,722 Tags
c221b4f04659997ba7eb41746fa5bf1f41dc9c2b
Commit Graph
28100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
mechlovinandjack 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) 0.21.3 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