summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-051-0/+2
|\
| * Fix missing define to map rgb_matrix function set to rgblight. (#11084)Sergey Omelchenko2020-12-051-0/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-059-0/+685
|\|
| * add nt750 (#11091)Evy Dekkers2020-12-059-0/+685
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-040-0/+0
|\|
| * Add default early-init bootloader to F042/F072. (#11120)Nick Brassel2020-12-042-0/+40
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-049-0/+685
|\|
| * [Keyboard] Added taleguers75 rev1 keyboard (#11052)Borja López Jiménez2020-12-039-0/+685
| | | | | | | | | | | | | | | | | | | | | | * Added taleguers75 rev1 keyboard * Apply suggestions from code review Co-authored-by: Joel Challis <git@zvecr.com> * Fixed VIA keymap Co-authored-by: Joel Challis <git@zvecr.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-0410-0/+27
|\|
| * Allow APM32 MCUs on certain CannonKeys PCBs (#10899)Andrew Kannan2020-12-0310-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Allow APM32 MCUs on certain CannonKeys PCBs * another one * Update DFU suffix args * missed one * Apply suggestions from code review Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Joel Challis <git@zvecr.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-043-1/+29
|\|
| * Hotfix for #11106 (#11118)James Young2020-12-033-1/+29
| | | | | | | | | | | | | | * Hotfix for #11106: Rework LAYOUT_alice support; add LAYOUT_alice_split_bs Accidentally missed backwards compatibility on the sneakbox/aliceclone in #11106, which broke stanrc85's Community Layout keymap. * sneakbox/aliceclone: move 2u Backspace to column 6
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-0482-123/+1438
|\|
| * [Keyboard] add scatter42 by bbrfkr (#10893)bbrfkr2020-12-038-0/+505
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add new keyboard scatter42 by bbrfkr * mod info.json to work * mod info.json * mod readme * Update keyboards/scatter42/keymaps/default/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/scatter42/keymaps/default/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/scatter42/scatter42.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/scatter42/config.h Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
| * Rework LAYOUT_alice support; add LAYOUT_alice_split_bs (#11106)James Young2020-12-0374-123/+933
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add LAYOUT_alice support: fallacy * Add LAYOUT_alice support: kb_elmo/sesame * Add LAYOUT_alice support: cheshire/curiosity * Add LAYOUT_alice support: evyd13/wonderland * Add LAYOUT_alice support: mechlovin/adelais * Update LAYOUT_alice support: projectkb/alice The PR that added Alice community layout support for the projectkb/alice/rev2 simultaneously broke support for every other keyboard that supported LAYOUT_alice. This commit partially reverts the offending PR. `LAYOUT_alice` for the projectkb/alice has been renamed to `LAYOUT_alice_split_bs`, and a correct 65-key `LAYOUT_alice` has been added. Additionally, the `LAYOUTS` rule has been moved to keyboard level as the layout macros are shared between rev1 and rev2 boards, which means the layout options are the same for both revisions. * Update ramonimbao/aelith info.json Keyboard source was already correct to support LAYOUT_alice, but the layout tree was missing from info.json. * Fork `alice` Community Layout... ... into Standard and Split Backspace versions Also updates stanrc85's layout keymap to use 65 keys instead of the Split Backspace 66-key version. * Update LAYOUT_alice support: sneakbox/aliceclone Rework the sneakbox/aliceclone to use the Split Backspace Alice layout. * Update LAYOUT_alice support: zoo/wampus The layout macro that was `LAYOUT_alice` was 66 keys. This layout macro has been renamed to `LAYOUT_alice_split_bs`, and a 65-key `LAYOUT_alice` has been added. Additionally, the 66-key macro has been rearranged to accept its keycodes in the intended order for Community Layout support. * Update keyboards for `LAYOUT_alice_split_bs` support * LAYOUT_alice_split_bs support: ergosaurus * LAYOUT_alice_split_bs support: handwired/colorlice * LAYOUT_alice(_split_bs) support: handwired/owlet60 * LAYOUT_alice_split_bs support: nightly_boards/alter/rev1 * LAYOUT_alice(_split_bs) support: sck/osa * LAYOUT_alice_split_bs support: tgr/alice * LAYOUT_alice(_split_bs) support: tkc/osav2 * LAYOUT_alice_split_bs support: xelus/valor/rev1
* | Disable almost all ChibiOS subsystems in default configs (#11111)Nick Brassel2020-12-0416-546/+3179
| | | | | | | | | | | | | | | | | | * Disable almost all ChibiOS subsystems. * Modify ChibiOS config updater script to fixup mcuconf include, use develop as base instead of master. * Add default early-init bootloader to F042/F072. * Back to 100k freq.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-032-0/+102
|\|
| * Add Via support to Plexus75 PCB (#11027)npspears2020-12-032-0/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add Via keymap * Via Enable in Rules.mk * Update config.h added nasp before Plexus75 in PRODUCT to better follow Via naming convention * Update keymap.c changed KC_CTRL to KC_LCTL * Update config.h took out the manu repeat * Update rules.mk * Create rules.mk changed location of rules.mk for supporting Via * Apply suggestions from code review Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/plexus75/keymaps/via/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Apply suggestions from code review Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-031-1/+1
|\|
| * [Keyboard] Fixed inconsistent MATRIX_COLS and MATRIX_COL_PINS: facew (#8115)a_p_u_r_o2020-12-041-1/+1
| |
* | Add board specific to Proton-C, with usual defaults turned on. (#10976)Nick Brassel2020-12-0365-17/+1659
| | | | | | | | | | - Set all other ChibiOS defaults to 'off', when not targeting Proton-C - Modified all existing F303 boards to point at the QMK_PROTON_C to ensure repeatable binary output - Modified version.h generation so that SKIP_VERSION=yes generates the same output
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-029-0/+434
|\|
| * TKC TKL_A/B87: Initial support (#10943)TerryMathews2020-12-029-0/+434
| | | | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-021-0/+1
|\|
| * [Keyboard] Fix issue with Kyria and RGB Light (#11070)Dustin Bosveld2020-12-011-0/+1
| | | | | | Add recommendation to default firmware https://docs.splitkb.com/hc/en-us/articles/360017633199-The-keyboard-behaves-erratically-after-changing-the-RGB-settings
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-011-1/+1
|\|
| * Fix Valor default underglow (#11093)Xelus222020-12-021-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-019-18/+506
|\|
| * [Keyboard] Fix compiler issues for handwired/6macro (#11098)Drashna Jaelre2020-12-012-18/+10
| |
| * Add support for Drop + Ryloo Studio "Hello" M0110. (#11050)David Dai2020-12-017-0/+496
| |
* | [Split] Sync Timer feature (#10997)XScorpion22020-12-018-15/+154
| | | | | | A timer that is kept in sync between the halves of a split keyboard
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-014-8/+8
|\|
| * fix handwired/swiftrax/beegboy keymaps (#11071)Brandon Claveria2020-12-012-2/+2
| | | | | | Co-authored-by: Swiftrax <swiftrax@gmail.com>
| * fix handwired/swiftrax/bebol keymaps (#11072)Brandon Claveria2020-12-012-6/+6
| | | | | | Co-authored-by: Swiftrax <swiftrax@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-012-2/+2
|\|
| * Moved default LALT and LWIN for BKS65 (#11087)Felix Jen2020-12-012-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-0120-3/+592
|\|
| * Adding bootleg and waffling60 rev b (#10846)4pplet2020-12-0120-3/+592
| | | | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-11-301-0/+20
|\|
| * nix-shell: add milc dependency (#11086)André Silva2020-11-301-0/+20
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-11-303-2/+57
|\|
| * Added VIA keymap to YMDK bface keyboard (#11002)Desp-Key2020-11-303-2/+57
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-11-304-5/+2
|\|
| * Reduce travis load by replacing an exclusive grep with an inclusive grep ↵Zach White2020-11-304-5/+2
| | | | | | | | | | | | | | (#10964) * add -n to avoid compiling * switch to an include rather than exclude strategy
* | Branch point for 2021 Feb 27 Breaking ChangeJames Young2020-11-301-0/+6
| |
* | Configurable serial usart timeout (#11057)XScorpion22020-11-302-5/+9
|/
* Fix int wrapping for timer_expired macros and use MAX defines for ↵XScorpion22020-11-301-2/+2
| | | | consistency and clarity (#10996)
* [Keyboard] Add edc40 keyboard (#11021)ojthetiny2020-11-3010-0/+326
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Re-adding edc40 keyboard branch/files * Update keymap.c * add default keymap for edc40 * removed redundant keymap * added custom keymap for edc40 * fixed false update to settings.json * fixed false update to settings.json * added newline to info.json * Update keyboards/edc40/config.h * Update keyboards/edc40/readme.md * Update keyboards/edc40/rules.mk * Update rules.mk * Update keyboards/edc40/info.json * Update info.json * Update info.json * Update keyboards/edc40/config.h * Update keyboards/edc40/info.json * Update keyboards/edc40/readme.md * Update keyboards/edc40/keymaps/default/keymap.c
* KBD67 Rev2 VIA: Increase layer count from 2 to 4 (#11039)MechMerlin2020-11-302-2/+33
|
* map reset key to the correct location (#11037)Anand Babu (AB) Periasamy2020-11-301-2/+2
| | | Co-authored-by: Anand Babu (AB) Periasamy <twitter.com/abperiasamy>
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-05 06:15:27 +0000