Cutieguwu/qmk_firmware-mirror
1
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2026-08-04 08:21:08 -04:00
Code Issues Packages Projects Releases Wiki Activity
23,484 Commits 57 Branches 1,715 Tags
478689a87dc7fc6f8cb4c5e4c53caba86c76a6b2
Commit Graph

23484 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
QMK Bot 478689a87d Merge remote-tracking branch 'origin/develop' into xap 2022-09-06 21:43:23 +00:00
Joshua Diamond a4d1d8b745 Resolve conflict merging master to develop (#18297) 
* Discourage use of ENCODER_MAP at keyboard level (#18286)

* Discourage use of ENCODER_MAP at keyboard level

* Update docs/feature_encoders.md

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

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

* Fungo rev1: fix QMK Configurator key sequence (#18293)

* info.json: correct JSON syntax; friendly formatting

* info.json: fix key sequence

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
 2022-09-06 17:42:43 -04:00
QMK Bot 8d2009391a Merge remote-tracking branch 'origin/develop' into xap 2022-09-06 17:47:09 +00:00
Dasky dc4af81e0b Remove legacy USE_SERIAL define (#18292) 
* Remove legacy USE_SERIAL define

* tidy up missed comments
 2022-09-06 18:46:34 +01:00
QMK Bot d05ba544ca Merge remote-tracking branch 'origin/develop' into xap 2022-09-06 17:07:42 +00:00
Ryan 8833b28361 Remove UNICODE_KEY_OSX and UC_OSX (#18290) 2022-09-06 18:07:08 +01:00
zvecr 8e18f4d0fd hid hid_get_input_report workarounds 2022-09-06 17:33:19 +01:00
QMK Bot a43d225fae Merge remote-tracking branch 'origin/develop' into xap 2022-09-06 04:27:39 +00:00
QMK Bot c6ab11bc45 Merge remote-tracking branch 'origin/master' into develop 2022-09-06 04:26:42 +00:00
QMK Bot 076877475d Merge remote-tracking branch 'origin/develop' into xap 2022-09-06 04:26:35 +00:00
James Young 712aa7b1cd Mars 6.5 Layout Additions (#18282) 
* info.json: apply friendly formatting

* add LAYOUT_65_ansi_blocker

* add LAYOUT_65_ansi_blocker_split_bs

* add LAYOUT_65_iso_blocker

* add LAYOUT_65_iso_blocker_split_bs

* enable Community Layouts support

* info.json: correct maintainer value
 2022-09-06 05:26:11 +01:00
QMK Bot 165c15e250 Merge remote-tracking branch 'origin/master' into develop 2022-09-06 04:26:03 +00:00
Joel Challis 0306bdf7fd Remove use of legacy keycode (#18281) 0.18.5 2022-09-06 05:25:32 +01:00
QMK Bot 552c15c969 Merge remote-tracking branch 'origin/develop' into xap 2022-09-05 13:15:38 +00:00
QMK Bot f010af0c8e Merge remote-tracking branch 'origin/master' into develop 2022-09-05 13:15:04 +00:00
James Young 5f1273fca6 EU ISOlation: fix QMK Configurator key sequence (#18272) 
* eu_isolation.h: physically arrange layout macros

Whitespace only; no logic changes.

* info.json: apply friendly formatting

Add line breaks between physical rows.

* info.json: correct key sequence
 2022-09-05 14:14:25 +01:00
QMK Bot 7ce93618e6 Merge remote-tracking branch 'origin/develop' into xap 2022-09-05 01:02:02 +00:00
QMK Bot 0ac18bfc84 Merge remote-tracking branch 'origin/master' into develop 2022-09-05 01:01:23 +00:00
AMing Lau a36c95db60 Fix compilation error for GH60 satan HHKB 7u layout (#18250) 
* Fix compilation error for GH60 satan HHKB 7u layout

* Update keyboards/gh60/satan/info.json

Co-authored-by: Joel Challis <git@zvecr.com>

Co-authored-by: Joel Challis <git@zvecr.com>
 2022-09-05 02:00:44 +01:00
QMK Bot b2002d63b1 Merge remote-tracking branch 'origin/develop' into xap 2022-09-04 20:37:14 +00:00
Ryan 3e02b70d28 Rename keyboards with uppercase letters (#18268) 2022-09-04 21:36:33 +01:00
QMK Bot a7661cac6c Merge remote-tracking branch 'origin/develop' into xap 2022-09-03 21:45:04 +00:00
QMK Bot a9f8111eac Merge remote-tracking branch 'origin/master' into develop 2022-09-03 21:44:27 +00:00
James Young 288808526b dyz60_hs Layout Additions (#18261) 
* dyz60_hs: add matrix diagram

* add LAYOUT_60_ansi

* add LAYOUT_60_ansi_split_bs_rshift

* add LAYOUT_60_tsangan_hhkb

* add LAYOUT_60_iso

* add LAYOUT_60_iso_split_bs_rshift

* enable Community Layouts support

* readme.md: correct keyboard references

Replace `dyz60` with `dyz60_hs` as needed.
 2022-09-03 22:43:52 +01:00
QMK Bot 87593b76bf Merge remote-tracking branch 'origin/develop' into xap 2022-09-03 18:48:24 +00:00
QMK Bot 3a56e973ff Merge remote-tracking branch 'origin/master' into develop 2022-09-03 18:47:52 +00:00
Ryan 3c09db41fe Fix a couple of boards still using usb.device_ver (#18258) 2022-09-03 14:47:22 -04:00
QMK Bot c9eed5e143 Merge remote-tracking branch 'origin/develop' into xap 2022-09-03 18:45:57 +00:00
QMK Bot d1c4008f1c Merge remote-tracking branch 'origin/master' into develop 2022-09-03 18:45:16 +00:00
Ryan bfec30a9fe Clean up data driven mappings syntax (#18257) 2022-09-03 19:44:42 +01:00
QMK Bot 2e3fb35ffd Merge remote-tracking branch 'origin/develop' into xap 2022-09-03 17:47:56 +00:00
QMK Bot aa2e5fc6da Merge remote-tracking branch 'origin/master' into develop 2022-09-03 17:47:15 +00:00
coliss86 39e611794d [Docs] Update 'Process Record' according to the code (#18209) 
* [doc] Update 'Process Record' according to the code

* [doc] fix link
 2022-09-03 13:46:42 -04:00
QMK Bot d4deb2fbc2 Merge remote-tracking branch 'origin/develop' into xap 2022-09-03 15:28:16 +00:00
QMK Bot 272b6f6ddb Merge remote-tracking branch 'origin/master' into develop 2022-09-03 15:27:31 +00:00
Xelus22 489b287e1f [Keyboard] RS60 Rev2 change to eeprom emulation (#18201) 
by xelus
 2022-09-03 16:27:00 +01:00
QMK Bot 622c08cde9 Merge remote-tracking branch 'origin/develop' into xap 2022-09-03 15:22:28 +00:00
QMK Bot 556fd909eb Merge remote-tracking branch 'origin/master' into develop 2022-09-03 15:21:53 +00:00
Vino Rodrigues 0c76a3c7d0 [Keyboard] Add IDOBAO Abacus ID42 Keyboard (#16923) 
by vinorodrigues
 2022-09-03 16:21:00 +01:00
QMK Bot 3dc5e787f2 Merge remote-tracking branch 'origin/develop' into xap 2022-09-03 14:48:23 +00:00
QMK Bot 2c9c62b365 Merge remote-tracking branch 'origin/master' into develop 2022-09-03 14:47:51 +00:00
Tim Traversy f27c70fffc Add absolute key positions to microdox info.json (#18238) 2022-09-03 15:47:20 +01:00
QMK Bot b5767c6632 Merge remote-tracking branch 'origin/develop' into xap 2022-09-03 05:52:07 +00:00
QMK Bot fea65c9856 Merge remote-tracking branch 'origin/master' into develop 2022-09-03 05:51:26 +00:00
Joel Challis 5c0e87608f Remove more RESET keycode references (#18252) 2022-09-03 06:50:44 +01:00
QMK Bot a1da56d6bf Merge remote-tracking branch 'origin/develop' into xap 2022-09-02 20:51:11 +00:00
Ryan f76b55d5ad Adjust EXTRAKEY_ENABLE ifdefs for send_extra() (#18249) 2022-09-02 21:50:36 +01:00
QMK Bot ac46d4a756 Merge remote-tracking branch 'origin/develop' into xap 2022-09-02 19:38:58 +00:00
Ryan 09d668eb0e Simplify extrakeys sending at the host driver level (#18230) 
* Simplify extrakeys sending at the host driver level

* There are two arguments here

* Wrong syntax

* Adjust keyboards which use a custom host driver
 2022-09-02 20:38:27 +01:00
QMK Bot ba760447f7 Merge remote-tracking branch 'origin/develop' into xap 2022-09-02 16:11:17 +00:00