summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-10-03Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-03[Keyboard] Fix key routing for Keyprez Rhino ergo keys (#14589)Christian Sandven
2021-10-02Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-02[Keyboard] Adding kbnordic nordic60 (#14555)4pplet
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-02Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-02[Keyboard] Add JP60 keyboard (#14219)ai03
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-02Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-02[Keyboard] Add Olly BB PCB (#14545)mechlovin
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-02[Keyboard] Modify mokey64 (#14612)rhmokey
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-02Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-02[Keymap] Updates to Personal Kyria Keymap (#14669)john-ezra
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-01[Keyboard] Enable Proton C defaults for SplitKB Kyria (#14490)Drashna Jaelre
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-02Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-01[Keyboard] Convert ZSA's Moonlander keyboard to matrix lite (#14667)Drashna Jaelre
2021-10-01Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-02Add FIRMWARE_FORMAT = hex for /keyboards/kinesis/kint36 and ↵negatv
/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-01Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-01[Docs] update Japanese translation of mod_tap.md (#13981)umi
* update mod_tap.md translation * add id on config_options.md and update text based on comments
2021-09-30Change `MK66F18` -> `MK66FX1M0` (#14659)Ryan
2021-09-30Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-01Fix documentation for NO_HAPTIC_MOD and NO_HAPTIC_FN features. (#14180)Purdea Andrei
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-04 16:45:00 +0000