summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-301-2/+8
|\
| * Fix documentation for NO_HAPTIC_MOD and NO_HAPTIC_FN features. (#14180)Purdea Andrei2021-10-011-2/+8
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-301-2/+2
|\|
| * Quark_LP- change MCU and RGB (#14650)npspears2021-09-301-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-3059-178/+178
|\|
| * Remove firmware size impact notes from <keyboard>/rules.mk (#14652)James Young2021-09-3059-178/+178
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-3054-57/+1
|\|
| * Remove redundant `MIDI_ENABLE = no` in keyboard-level rules.mk (#14649)Ryan2021-09-3054-57/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-304-16/+359
|\|
| * Mechlovin Hex4B: extend layout support (#14651)James Young2021-09-304-16/+359
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | Merge remote-tracking branch 'upstream/master' into developJames Young2021-09-29540-552/+0
|\|
| * Remove redundant `UNICODE_ENABLE = no` in keyboard-level rules.mk (#14633)Ryan2021-09-30541-553/+0
| |
* | massdrop alt/ctrl: support saving into nvm (#6068)Alexandre d'Alton2021-09-301-4/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | Added power tracking api (#12691)Purdea Andrei2021-09-306-2/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-295-30/+236
|\|
| * Mechlovin Hannah60RGB touch-up (#14646)James Young2021-09-295-30/+236
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-2911-30/+24
|\|
| * [Core] Fix "6kro enable" and clarify naming (#14563)Drashna Jaelre2021-09-2911-30/+24
| | | | | | | | | | | | | | | | | | | | | | * Fix USB_6KRO_ENABLE compilation errors * Add info to docs * Rename define to be more accurate * Remove unused rule * Refixe docs
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-296-51/+180
|\|
| * [Keymap] Update to Drashna Code (#14644)Drashna Jaelre2021-09-296-51/+180
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-2921-9/+673
|\|
| * [Keyboard] add support for Quark_LP (#14552)npspears2021-09-2915-0/+610
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
| * [Keyboard] Update Grandiceps to Rev2 (#14618)vattern2021-09-296-9/+63
| | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-295-34/+216
|\|
| * [Keymap] Jonavin murphpad keymap update (#14637)jonavin2021-09-295-34/+216
| | | | | | Co-authored-by: Jonavin <=>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-2912-10/+261
|\|
| * [Keyboard] Updates for Tractyl Manuform config (#14641)Drashna Jaelre2021-09-2912-10/+261
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-291-26/+26
|\|
| * [Keyboard] Fix end of file issue for Owlab suit80 (#14640)Drashna Jaelre2021-09-291-26/+26
| |
* | [Keyboard] Add support for PaladinPad, Arya pcb and move keyboards by ↵nachie2021-09-2865-120/+1504
| | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-294-0/+119
|\|
| * [Keymap] Keychron Q1 user keymap (#14636)Grayson Carr2021-09-284-0/+119
| |
* | Fix for mechlovin/adelais/standard_led/arm/rev4 (#14639)James Young2021-09-281-2/+2
| | | | | | | | | | * Fix for #14622 Fix for a bad merge conflict resolution.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-281-1/+1
|\|
| * convert checkerboards/quark_squared:via rules.mk to Unix line endings (#14638)James Young2021-09-281-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-283-4/+72
|\|
| * Mechlovin Delphine: add LAYOUT_numpad_6x4 (#14635)James Young2021-09-283-4/+72
| | | | | | | | | | | | | | | | | | | | | | | | * 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
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-282-1/+2
|\|
| * Move "firmware size check skipped" note to message.mk (#14632)Ryan2021-09-292-1/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-289-190/+213
|\|
| * [Keymap] fix NKRO - switch to get_mods() and refactor encoder action code ↵jonavin2021-09-289-190/+213
| | | | | | | | | | (#14278) Co-authored-by: Jonavin <=>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-285-12/+187
|\|
| * [Keyboard] Yampad VIA support (#14397)Greg Knapp2021-09-285-12/+187
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-2818-0/+789
|\|
| * [Keyboard] Add OwLab Suit80 (#14362)owlab-git2021-09-2818-0/+789
| | | | | | | | | | | | | | | | | | | | | | | | | | * add suit80 files * first add suit80 files * modified suit80 files * layout change * modified again * changed png url
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-282-2/+6
|\|
| * [Keymap] arkag userspace/keymap -- new macro and minor preonic keymap change ↵Alexander Kagno2021-09-282-2/+6
| | | | | | | | | | (#14623) Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-288-15/+136
|\|
| * [Keyboard] Pteron36 (#13475)Harshit Goel2021-09-288-15/+136
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Harshti Goel <harshitgoel@licious.com>
* | Merge remote-tracking branch 'upstream/master' into developJames Young2021-09-288-8/+358
|\|
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 17:55:07 +0000