1
0
Fork 0
forked from forks/qmk_firmware
Commit graph

18331 commits

Author SHA1 Message Date
QMK Bot 4af4ef3428 Merge remote-tracking branch 'origin/master' into develop 2021-10-04 16:26:57 +00:00
Zach White 20f81af98a
Allow community layouts to be specified in info.json (#14682)
* move the community layout detection to python

* fixup tests
2021-10-04 09:26:19 -07:00
QMK Bot 8f3ea25dda Merge remote-tracking branch 'origin/master' into develop 2021-10-04 05:35:33 +00:00
Danny f72b2ad720
[Keyboard] Add Iris Rev. 6 (#14683)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-03 22:35:00 -07:00
QMK Bot d785282df7 Merge remote-tracking branch 'origin/master' into develop 2021-10-03 21:17:56 +00:00
Drashna Jaelre 6279399425
[Keyboard] Fix Mechlovin's Olly/BB keyboard matrix file (#14680) 2021-10-03 22:17:46 +01:00
Drashna Jaelre 640869257f
[Keyboard] Disable RGBLIGHT on mokey64 (#14681) 2021-10-03 22:17:23 +01:00
QMK Bot db6bf9be2b Merge remote-tracking branch 'origin/master' into develop 2021-10-03 19:03:19 +00:00
tiltowait 8782dc824d
[Keyboard] Add anti-ghosting support to Model M Converter (#14049) 2021-10-03 12:02:51 -07:00
Purdea Andrei eb5b24f97c
Add LM() keys to the list of keys disabled by NO_HAPTIC_MOD (#14181) 2021-10-03 12:02:05 -07:00
QMK Bot 5ce2bb83ce Merge remote-tracking branch 'origin/master' into develop 2021-10-03 19:01:43 +00:00
Christian Sandven 5ece2846b6
[Keyboard] Fix key routing for Keyprez Rhino ergo keys (#14589) 2021-10-03 12:01:15 -07:00
QMK Bot fdc981418a Merge remote-tracking branch 'origin/master' into develop 2021-10-02 15:18:23 +00:00
4pplet 0acedbe09f
[Keyboard] Adding kbnordic nordic60 (#14555)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: 4pplet <4pplet@protonmail.com>
Co-authored-by: 4pplet <stefan.ess@gmail.com>
2021-10-02 08:17:54 -07:00
QMK Bot 9b64ef8c71 Merge remote-tracking branch 'origin/master' into develop 2021-10-02 15:07:07 +00:00
ai03 875bbd31dc
[Keyboard] Add JP60 keyboard (#14219)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-02 08:06:37 -07:00
QMK Bot 64a118a58c Merge remote-tracking branch 'origin/master' into develop 2021-10-02 15:00:21 +00:00
mechlovin 0eaefb2a6c
[Keyboard] Add Olly BB PCB (#14545)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-02 08:00:05 -07:00
rhmokey 20a689e27c
[Keyboard] Modify mokey64 (#14612)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-02 07:59:47 -07:00
QMK Bot 79c6757081 Merge remote-tracking branch 'origin/master' into develop 2021-10-02 14:51:25 +00:00
john-ezra 79ad30a9d5
[Keymap] Updates to Personal Kyria Keymap (#14669)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-02 07:50:55 -07:00
Drashna Jaelre 5b644af415
[Keyboard] Enable Proton C defaults for SplitKB Kyria (#14490)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-01 19:11:34 -07:00
QMK Bot 481104053e Merge remote-tracking branch 'origin/master' into develop 2021-10-02 00:13:49 +00:00
Drashna Jaelre 54b8d6a891
[Keyboard] Convert ZSA's Moonlander keyboard to matrix lite (#14667) 2021-10-01 17:13:15 -07:00
QMK Bot ef3176713f Merge remote-tracking branch 'origin/master' into develop 2021-10-01 22:33:29 +00:00
negatv bed7625f93
Add FIRMWARE_FORMAT = hex for /keyboards/kinesis/kint36 and /keyboards/kinesis/kint41 (#14665)
* Specify hex as the default FIRMWARE_FORMAT which is copied to qmk_firmware root folder

* Specify hex as the default FIRMWARE_FORMAT which is copied to qmk_firmware root folder

Co-authored-by: sadkins <sadkins@iMac-Pro.local>
2021-10-02 08:32:53 +10:00
QMK Bot de4a7131df Merge remote-tracking branch 'origin/master' into develop 2021-10-01 08:25:24 +00:00
umi e54a57d32a
[Docs] update Japanese translation of mod_tap.md (#13981)
* update mod_tap.md translation

* add id on config_options.md and update text based on comments
2021-10-01 17:24:53 +09:00
Ryan 1a9e7b95ab
Change MK66F18 -> MK66FX1M0 (#14659) 2021-09-30 23:14:37 +01:00
QMK Bot 85b3f5a406 Merge remote-tracking branch 'origin/master' into develop 2021-09-30 21:24:52 +00:00
Purdea Andrei 52cb19713b
Fix documentation for NO_HAPTIC_MOD and NO_HAPTIC_FN features. (#14180) 2021-10-01 07:24:19 +10:00
QMK Bot 34d5833a28 Merge remote-tracking branch 'origin/master' into develop 2021-09-30 14:50:50 +00:00
npspears 0be3cd3e2b
Quark_LP- change MCU and RGB (#14650) 2021-09-30 15:50:18 +01:00
QMK Bot 1667f1375b Merge remote-tracking branch 'origin/master' into develop 2021-09-30 14:49:11 +00:00
James Young 292b7b3835
Remove firmware size impact notes from <keyboard>/rules.mk (#14652) 2021-09-30 15:48:36 +01:00
QMK Bot e5d48f6d16 Merge remote-tracking branch 'origin/master' into develop 2021-09-30 09:17:50 +00:00
Ryan 0b37e07f90
Remove redundant MIDI_ENABLE = no in keyboard-level rules.mk (#14649) 2021-09-30 19:17:20 +10:00
QMK Bot ed062d811d Merge remote-tracking branch 'origin/master' into develop 2021-09-30 08:21:20 +00:00
James Young a8e13f041e
Mechlovin Hex4B: extend layout support (#14651)
* use XXX for KC_NO in hex4b.h

* add matrix diagram to hex4b.h

* rename LAYOUT to LAYOUT_all

* remove reference to KBFirmware JSON Parser

* info.json: add line breaks between rows

* rename LAYOUT_all to LAYOUT_split_bs

- LAYOUT alias for backward compatibility
- LAYOUT_all alias to signify support for every matrix position

* add LAYOUT_2u_bs

* add LAYOUT_tsangan_split_bs

* add LAYOUT_tsangan_2u_bs

* info.json: remove meta key
2021-09-30 01:20:46 -07:00
James Young 922c8071e4
Merge remote-tracking branch 'upstream/master' into develop 2021-09-29 23:23:10 -07:00
Ryan 36bc3c867e
Remove redundant UNICODE_ENABLE = no in keyboard-level rules.mk (#14633) 2021-09-30 08:14:21 +10:00
Alexandre d'Alton 90797d903c
massdrop alt/ctrl: support saving into nvm (#6068)
* support saving into SmartEEPROM

Signed-off-by: Alexandre d Alton <alex@alexdalton.org>

* atsam: update smarteeprom implementation

- Use define for SmartEEPROM buffer address
- Check buffer overflow
- Do not perform operation when timeout occurs

Signed-off-by: Alexandre d'Alton <alex@alexdalton.org>

* return 0 instead of ff for invalid address or timeout

Signed-off-by: Alexandre d'Alton <alex@alexdalton.org>

* clang-format

* Add extra bounds checks

Co-authored-by: zvecr <git@zvecr.com>
2021-09-30 06:56:13 +10:00
Purdea Andrei b02a539625
Added power tracking api (#12691)
* Add power tracking API to lufa and chibios targets

* power.c: Pass through power state to the notify function

* power: added notify_power_state_change_user too.

* making it pass the PR linter

* Add a POWER_STATE_NO_INIT state, that we start in before calling power_init();

* Rename *power* to *usb_power*

* removing stray newline

* Rename usb_power* to usb_device_state*

* Update quantum/usb_device_state.h

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Fix comment

* usb_device_state.h: Don't include quantum.h, only the necessary headers.

Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-09-30 06:31:39 +10:00
QMK Bot 552c126bea Merge remote-tracking branch 'origin/master' into develop 2021-09-29 19:49:11 +00:00
James Young 8fccd82d4e
Mechlovin Hannah60RGB touch-up (#14646)
* use XXX for KC_NO in rev1.h

* add matrix diagram to rev1.h

* remove reference to KBFirmware JSON Parser from rev1.h

* use XXX for KC_NO in rev2.h

* add matrix diagram to rev2.h

* add LAYOUT_60_ansi and LAYOUT_60_iso

* enable Community Layout support

* update info.json metadata

- specify keyboard revision in keyboard_name
- use GitHub username in maintainer field

* remove reference to KBFirmware JSON Parser from main rules.mk
2021-09-29 12:48:37 -07:00
QMK Bot be3d7063a0 Merge remote-tracking branch 'origin/master' into develop 2021-09-29 18:37:46 +00:00
Drashna Jaelre 02ab7b1888
[Core] Fix "6kro enable" and clarify naming (#14563)
* Fix USB_6KRO_ENABLE compilation errors

* Add info to docs

* Rename define to be more accurate

* Remove unused rule

* Refixe docs
2021-09-29 11:37:11 -07:00
QMK Bot 81f2d0f4cb Merge remote-tracking branch 'origin/master' into develop 2021-09-29 18:16:49 +00:00
Drashna Jaelre 1e54796f0c
[Keymap] Update to Drashna Code (#14644) 2021-09-29 11:16:11 -07:00
QMK Bot 4c4c430db8 Merge remote-tracking branch 'origin/master' into develop 2021-09-29 16:56:09 +00:00