64a118a58c
Merge remote-tracking branch 'origin/master' into develop
2021-10-02 15:00:21 +00:00
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
20a689e27c
[Keyboard] Modify mokey64 ( #14612 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-02 07:59:47 -07:00
79c6757081
Merge remote-tracking branch 'origin/master' into develop
2021-10-02 14:51:25 +00:00
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
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
481104053e
Merge remote-tracking branch 'origin/master' into develop
2021-10-02 00:13:49 +00:00
54b8d6a891
[Keyboard] Convert ZSA's Moonlander keyboard to matrix lite ( #14667 )
2021-10-01 17:13:15 -07:00
ef3176713f
Merge remote-tracking branch 'origin/master' into develop
2021-10-01 22:33:29 +00:00
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
de4a7131df
Merge remote-tracking branch 'origin/master' into develop
2021-10-01 08:25:24 +00:00
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
1a9e7b95ab
Change `MK66F18` -> `MK66FX1M0` ( #14659 )
2021-09-30 23:14:37 +01:00
85b3f5a406
Merge remote-tracking branch 'origin/master' into develop
2021-09-30 21:24:52 +00:00
52cb19713b
Fix documentation for NO_HAPTIC_MOD and NO_HAPTIC_FN features. ( #14180 )
2021-10-01 07:24:19 +10:00
34d5833a28
Merge remote-tracking branch 'origin/master' into develop
2021-09-30 14:50:50 +00:00
0be3cd3e2b
Quark_LP- change MCU and RGB ( #14650 )
2021-09-30 15:50:18 +01:00
1667f1375b
Merge remote-tracking branch 'origin/master' into develop
2021-09-30 14:49:11 +00:00
292b7b3835
Remove firmware size impact notes from <keyboard>/rules.mk ( #14652 )
2021-09-30 15:48:36 +01:00
e5d48f6d16
Merge remote-tracking branch 'origin/master' into develop
2021-09-30 09:17:50 +00:00
0b37e07f90
Remove redundant `MIDI_ENABLE = no` in keyboard-level rules.mk ( #14649 )
2021-09-30 19:17:20 +10:00
ed062d811d
Merge remote-tracking branch 'origin/master' into develop
2021-09-30 08:21:20 +00:00
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
922c8071e4
Merge remote-tracking branch 'upstream/master' into develop
2021-09-29 23:23:10 -07:00
36bc3c867e
Remove redundant `UNICODE_ENABLE = no` in keyboard-level rules.mk ( #14633 )
2021-09-30 08:14:21 +10:00
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
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
552c126bea
Merge remote-tracking branch 'origin/master' into develop
2021-09-29 19:49:11 +00:00
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
be3d7063a0
Merge remote-tracking branch 'origin/master' into develop
2021-09-29 18:37:46 +00:00
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
81f2d0f4cb
Merge remote-tracking branch 'origin/master' into develop
2021-09-29 18:16:49 +00:00
1e54796f0c
[Keymap] Update to Drashna Code ( #14644 )
2021-09-29 11:16:11 -07:00
4c4c430db8
Merge remote-tracking branch 'origin/master' into develop
2021-09-29 16:56:09 +00:00
929d959ef9
[Keyboard] add support for Quark_LP ( #14552 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-09-29 09:55:58 -07:00
03df754551
[Keyboard] Update Grandiceps to Rev2 ( #14618 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>
Co-authored-by: Thys de Wet <thys@vectorphoto.co.uk>
2021-09-29 09:55:34 -07:00
4b77a8719a
Merge remote-tracking branch 'origin/master' into develop
2021-09-29 16:43:34 +00:00
c89f74b929
[Keymap] Jonavin murphpad keymap update ( #14637 )
...
Co-authored-by: Jonavin <=>
2021-09-29 09:42:53 -07:00
f58095fab7
Merge remote-tracking branch 'origin/master' into develop
2021-09-29 16:30:58 +00:00
0338481090
[Keyboard] Updates for Tractyl Manuform config ( #14641 )
2021-09-29 09:30:25 -07:00
f1aab47d13
Merge remote-tracking branch 'origin/master' into develop
2021-09-29 07:39:17 +00:00
363eb645fc
[Keyboard] Fix end of file issue for Owlab suit80 ( #14640 )
2021-09-29 17:38:41 +10:00
6779d5b990
[Keyboard] Add support for PaladinPad, Arya pcb and move keyboards by KapCave into their own directory ( #14194 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Nachiket Kulkarni <nachiket_kulkarni@apple.com>
2021-09-28 21:35:14 -07:00
77e4b07fb5
Merge remote-tracking branch 'origin/master' into develop
2021-09-29 02:46:05 +00:00
046e3ce5c9
[Keymap] Keychron Q1 user keymap ( #14636 )
2021-09-28 19:45:29 -07:00
55f699c09e
Fix for mechlovin/adelais/standard_led/arm/rev4 ( #14639 )
...
* Fix for #14622
Fix for a bad merge conflict resolution.
2021-09-28 17:18:53 -07:00
00555a2f02
Merge remote-tracking branch 'origin/master' into develop
2021-09-28 23:03:20 +00:00
02b760c6b0
convert checkerboards/quark_squared:via rules.mk to Unix line endings ( #14638 )
2021-09-28 16:02:48 -07:00
528623eb33
Merge remote-tracking branch 'origin/master' into develop
2021-09-28 21:50:02 +00:00
732535c1bb
Mechlovin Delphine: add LAYOUT_numpad_6x4 ( #14635 )
...
* add LAYOUT_numpad_6x4
* tidy-up info.json data
* use GitHub account name for maintainer field
* remove meta key
* add matrix diagram to delphine.h
* update Community Layout support
2021-09-28 14:49:35 -07:00
QMK Bot
mechlovin
rhmokey
john-ezra
Drashna Jaelre
negatv
umi
Ryan
Purdea Andrei
npspears
James Young
Alexandre d'Alton
vattern
jonavin
nachie
Grayson Carr