summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-09-30Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-30Quark_LP- change MCU and RGB (#14650)npspears
2021-09-30Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-30Remove firmware size impact notes from <keyboard>/rules.mk (#14652)James Young
2021-09-30Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-30Remove redundant `MIDI_ENABLE = no` in keyboard-level rules.mk (#14649)Ryan
2021-09-30Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-30Mechlovin Hex4B: extend layout support (#14651)James Young
* 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-29Merge remote-tracking branch 'upstream/master' into developJames Young
2021-09-30Remove redundant `UNICODE_ENABLE = no` in keyboard-level rules.mk (#14633)Ryan
2021-09-30massdrop alt/ctrl: support saving into nvm (#6068)Alexandre d'Alton
* 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-30Added power tracking api (#12691)Purdea Andrei
* 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-29Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-29Mechlovin Hannah60RGB touch-up (#14646)James Young
* 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-29Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-29[Core] Fix "6kro enable" and clarify naming (#14563)Drashna Jaelre
* Fix USB_6KRO_ENABLE compilation errors * Add info to docs * Rename define to be more accurate * Remove unused rule * Refixe docs
2021-09-29Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-29[Keymap] Update to Drashna Code (#14644)Drashna Jaelre
2021-09-29Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-29[Keyboard] add support for Quark_LP (#14552)npspears
Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-09-29[Keyboard] Update Grandiceps to Rev2 (#14618)vattern
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-29Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-29[Keymap] Jonavin murphpad keymap update (#14637)jonavin
Co-authored-by: Jonavin <=>
2021-09-29Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-29[Keyboard] Updates for Tractyl Manuform config (#14641)Drashna Jaelre
2021-09-29Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-29[Keyboard] Fix end of file issue for Owlab suit80 (#14640)Drashna Jaelre
2021-09-28[Keyboard] Add support for PaladinPad, Arya pcb and move keyboards by ↵nachie
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-29Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-28[Keymap] Keychron Q1 user keymap (#14636)Grayson Carr
2021-09-28Fix for mechlovin/adelais/standard_led/arm/rev4 (#14639)James Young
* Fix for #14622 Fix for a bad merge conflict resolution.
2021-09-28Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-28convert checkerboards/quark_squared:via rules.mk to Unix line endings (#14638)James Young
2021-09-28Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-28Mechlovin Delphine: add LAYOUT_numpad_6x4 (#14635)James Young
* 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-28Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-29Move "firmware size check skipped" note to message.mk (#14632)Ryan
2021-09-28Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-28[Keymap] fix NKRO - switch to get_mods() and refactor encoder action code ↵jonavin
(#14278) Co-authored-by: Jonavin <=>
2021-09-28Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-28[Keyboard] Yampad VIA support (#14397)Greg Knapp
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-09-28Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-28[Keyboard] Add OwLab Suit80 (#14362)owlab-git
* add suit80 files * first add suit80 files * modified suit80 files * layout change * modified again * changed png url
2021-09-28Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-28[Keymap] arkag userspace/keymap -- new macro and minor preonic keymap change ↵Alexander Kagno
(#14623) Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-28Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-28[Keyboard] Pteron36 (#13475)Harshit Goel
Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Harshti Goel <harshitgoel@licious.com>
2021-09-28Merge remote-tracking branch 'upstream/master' into developJames Young
2021-09-28Mechlovin Adelais: add support for full-length Right Shift (#14622)James Young
* add layout variants with 2.75u Right Shift * move layout alias to info.json * match info.json labels to matrix positions Edits the label keys in info.json to match the matrix position identifiers in adelais.h. * info.json: add line breaks between keyboard rows * info.json: use GitHub username in maintainer field
2021-09-28Merge remote-tracking branch 'origin/master' into developQMK Bot
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 11:49:13 +0000