Skip to content

Commit

Permalink
Merge with qmk/qmk_firmware:d143ddc06265652b2e9eb01e454ead135169712d
Browse files Browse the repository at this point in the history 
Squashed commit of the following:

commit d143ddc
Author: Yan-Fa Li <yanfali@gmail.com>
Date:   Wed Sep 25 21:35:54 2019 -0700

    [Keymap] Port personal keymap to 60_tsangan_hhkb (qmk#6820)

    * Port personal keymap to 60_tsangan_hhkb

     - add 60_tsangan_hhkb layout to plain60
     - Fix bug in split rs in plain60
     - use community and user based layout for 60_tsangan_hhkb
       - set up audio for plain60 only

    * Add LAYOUT_60_ansi_split_bs_rshift

commit b3d41d9
Author: noroadsleft <18669334+noroadsleft@users.noreply.github.com>
Date:   Wed Sep 25 21:34:37 2019 -0700

    [Keyboard] Reviung39: Configurator layout support (qmk#6819)

commit e6d8a61
Author: Mikkel Jeppesen <2756925+Duckle29@users.noreply.github.com>
Date:   Thu Sep 26 06:34:01 2019 +0200

    [Keyboard] Added QMK-DFU config to Vitamins Included rev2 (qmk#6818)

commit 297a7fe
Author: Jeong Arm <kjwonmail@gmail.com>
Date:   Thu Sep 26 13:32:14 2019 +0900

    [Keymap] Add preonic/kjwon15 layout (qmk#6812)

    * Add my custom keymap

    * Remove del key on left, Add pscr

    * Move Audio MOD key to pass ctrl

    * Change startup song

    * Enable clicky sound

    * Swap alt and gui

    * Fix semitones

    * Add mouse layer

    * Change startup song

    Additionally, fixup 5 halftones

    * Add ctrl key to ctrl+click

    * Move media keys to restore raise number keys

    * Move mouse key layer switch

    * Swap media keys as normal

    * Fix music map

    * Move mouse speed limit to correct position

    * Move prtscr

    * Align keycodes

    * Add ctrl/esc, swap smart space keys

    * Change colemak, dvorak into custom layout

    * Fix pure mode (left space)

    * Fix mouse mode interrupt

    * Add Middle mouse click

    * Add Lefthand mouse scroll

    * Temporarily disable mouse speed

    * Rename custom layout to kjwon15

    * Change readme

    * Apply suggestions from code review

    Co-Authored-By: fauxpark <fauxpark@gmail.com>

    * Apply suggestions from code review

    * Apply suggestions from code review

    Co-Authored-By: fauxpark <fauxpark@gmail.com>

    * Update from default keymap's function

commit ff85456
Author: Jonas Avellana <14019120+ninjonas@users.noreply.github.com>
Date:   Wed Sep 25 22:28:06 2019 -0600

    [Keymap] ninjonas keymap for crkbd & ninjonas userspace updates (qmk#6797)

    * [keymap(crkbd)] introducing crkbd keymap on ninjonas profile

    * [keymap(crkbd)] introducing crkbd keymap on ninjonas profile

    * [refactor(crkbd)] reducing file size by selecting RGB animations

    * [refactor(crkbd)] added shiftit key

    * [refactor(crkbd)] added shiftit key

    * [chore(crkbd)] adding SLEEP_LED_ENABLE on rules.mk

    * [refactor(crkbd)] added keylog & removed static rainbow RGB

    * [feat(crkbd)] introduced em-dash '—' keymap

    * [feat(crkbd)] added screenshot functionality

    * [refactor(lily58,pinky3)] moving media keys

    * [refactor(lily58)] Added emdash key

    * [chore] removing NUMBERS & FUNCTIONS layers as they're useless

    * [chore] removing NUMBERS & FUNCTIONS layers as they're useless

    * [chore(crkbd,lily48)] Updating README.md

    * [feat] added K_LAPP & K_RAPP to mimic command + tab

    * [feat] added K_LAPP & K_RAPP to mimic command + tab

    * [fix(qmk#6797)] resolving changes requested by @drashna

    * [fix(qmk#6797)] first cut on using QMK OLED Driver

    * [fix(qmk#6797)] cleaning up rules.mk

    * [fix(qmk#6797)] making scrolling logo work

    * [fix(qmk#6797)] Using OLED Driver for Lily58

    * [fix(qmk#6797)] Moved OLED driver implementation to ninjonas userspace

    * [fix(qmk#6797)] Bringing back crkbd & lily58 logos

    * [fix(qmk#6797)] Turning off OLED based off @drashna's workaround in qmk#5982

    * [fix(qmk#6797)] whoops! forgot to checkin crkbd/config.h

    * [fix(qmk#6797)] fixing issue with OLED randomly turning on

    * [fix(qmk#6797)] using default glcdfont.c for lily58 & crkbd

    * [fix(qmk#6797)] Using LINK_TIME_OPTIMIZATION_ENABLE rather than EXTRAFLAGS as per code review

    * [fix(qmk#6797)] updating M_MALL macro as per code review by @fauxpark

commit 2a948e7
Author: Cody Bender <50554676+cfbender@users.noreply.github.com>
Date:   Wed Sep 25 15:20:20 2019 -0600

    [Keyboard] Add Crossed Keys/Keyhive Nightmare (qmk#6796)

    * initial draft of nightmare files

    * fixed pins

    * fixed MT keycodes

    * updated READMEs

    * updated title in main readme

    * updated for split space

    * added OPT_TAB

    * fixed layer 1 keymap

    * Add DEL to keymap

    * Update Bootmagic pins

    * Update Keymap

    * Fix missing )

    * Update Up arrow on keymap

    * Add hosted image for Nightmare render

    * Update info.json for Nightmare layout

    * Resolve suggestions from drashna

    * Add split space layout in nightmare.h and info.json

commit 983c93f
Author: senseored <39708654+senseored@users.noreply.github.com>
Date:   Wed Sep 25 22:20:33 2019 +0200

    [Keymap] Added two different Swedish layouts for the Niu Mini 40% and Preonic 50%. (qmk#6793)

    * added preonic keymap senseored

    * added niu_mini/tobias

    * Changed readme's to explain that these are swedish layouts

    * Apply suggestions from code review

    Co-Authored-By: Drashna Jaelre <drashna@live.com>

    * Update keyboards/niu_mini/keymaps/tobias/keymap.c

    Co-Authored-By: Drashna Jaelre <drashna@live.com>

    * Made changes according to drashna's suggestions

    * Changed to tap_code(KC_NLCK)

    * Added #define RGBLIGHT_SLEEP

    * Added #define RGBLIGHT_SLEEP

    * Removed include config.h

commit dccafb6
Author: noroadsleft <18669334+noroadsleft@users.noreply.github.com>
Date:   Wed Sep 25 13:17:29 2019 -0700

    [Keyboard] Subatomic refactor (qmk#3194)

    * Refactor: matrix

    * New readme file

    * Configurator support

    * change info.json to debug linting

    * use an enum to manage the layers

    * readme cleanup

    file header, docs links

    * use #pragma once in keyboard header file

    * use new-style OLKB layout macro naming scheme

    * fix layout macro references in keymap.c

    * correct Keyboard Maintainer

commit 475f832
Author: Amber Holly <halcyonsilver@gmail.com>
Date:   Wed Sep 25 21:06:57 2019 +0100

    [Keyboard] Add Efreet keyboard (qmk#6811)

    * start wraith firmware

    * completed initial setup

    * added amber keymap to wraith

    * fixed LEDs, wrote readme files

    * reverted bootloader type after troubleshooting

    * decapitalised files and directory as per qmk standards

    * Update Wraith keyboard folder

    - Add timer keymap with documentation
    - Remove boilerplate in rules.mk, ready for pull request
    - Update info.json with ISO and ANSI layouts, ready for QMK Configurator

    * Add Efreet keyboard

    * Remove unnecessary keyboard folders

    * Enable community layout support for Efreet

    - Rename LAYOUT macro to LAYOUT_ortho_4x12
    - Add layout macro named LAYOUT_planck_mit
    - Remove unnecessary magic key command, as we are using the default
    - Fix readme.md formatting for GitHub

    * Fix community layout support for Efreet

    - Fix 2u spacebar keycodes in LAYOUT_planck_mit to denote absence of switch
    - Turn on Community Layouts in rules.mk

    * Update default keymap.c to use community layout

commit a76a79b
Author: noroadsleft <18669334+noroadsleft@users.noreply.github.com>
Date:   Wed Sep 25 13:00:27 2019 -0700

    [Keyboard] Rabbit68: Configurator layout support (qmk#6809)

commit f8e4f7e
Author: Manassarn "Noom" Manoonchai <manassarn@gmail.com>
Date:   Thu Sep 26 02:57:49 2019 +0700

    [Keymap] Add Z-layer to narze layouts (qmk#6806)

    * Revert raise/backspace mod tap to just backspace

    * Add Dev layer

    * Use Dev layer on holding z key

    * Add Dev layer for Ergodox

commit 0850a8c
Author: MechMerlin <30334081+mechmerlin@users.noreply.github.com>
Date:   Wed Sep 25 12:55:27 2019 -0700

    65 ansi blocker everywhere (everywhere I can find) (qmk#6805)

    * e6.5 actually already had a 65_ansi_blocker LAYOUT macro, so just had to enable in rules.

    * Add the 65_ansi_blocker LAYOUT macro and enable in rules.mk

    * rename LAYOUT macro in .h and in the keymap.c as it was only a default keymap. Also enable in rules.mk

    * rename but also had to define the existing LAYOUT macro as the new one to prevent breakage of existing keymaps

    * add 65_ansi_blocker support for vinta

    * forgot to update the info.json on these

    * add new default layout 65_ansi_blocker support to alt

    * add 65_ansi_blocker support

    * undo changes

commit c61d7d7
Author: Yaotian Feng <codetector@codetector.cn>
Date:   Wed Sep 25 14:52:17 2019 -0400

    [Keyboard] Added support for ErgoDox with STM32 Microcontroller (qmk#5398)

    * Began Work On STM32 Ergodox
     Changes to be committed:
    	new file:   keyboards/ergodox_stm32/config.h
    	new file:   keyboards/ergodox_stm32/rules.mk

    * test

    * Now it compile. Not linking thou

    * Screw this Linker. It links now!

    * Blinkly Keyboard

    * bootloader test code

    * Working on matrix / i2c stuff

    * Progress (LED Blink)

    * Progress on MCP_23017 Status Flag

    * [WIP]

    * update

    * Works! Remeber to change back the bootloader address when the new bootloadrer is ready.

    * Time to go debug the i2c

    * Finally, it now works with PCB Rev 1.0.2

    * updated for rev.2 pcb

    * minor compilation fix

    * Why when debugger is enabled then everything works.

    * Remeber to call init functions.

    * Update arm i2c driver to support STM32F103 series device.

    * fix include once header. Replaced with #pragma once.

    * complication test

commit eac4ce9
Author: ishtob <ishtob@gmail.com>
Date:   Wed Sep 25 13:05:48 2019 -0400

    [Keymap] update personal keymap (qmk#6817)

commit 00abe5d
Author: Daniel Shields <daniel.shields@bcs.org>
Date:   Wed Sep 25 17:21:07 2019 +0100

    [Keymap] Various enhancements for dshields user space and keymaps. (qmk#6816)

    - Add oneshot mod/layer unlocking
    - Fix Planck rev 3 backlight breathing
    - Fix Planck rev 6 build with arm gcc 9.2.0
    - General code clean up

commit 0f9e265
Author: MechMerlin <30334081+mechmerlin@users.noreply.github.com>
Date:   Wed Sep 25 09:18:09 2019 -0700

    [Keyboard] Add additional LAYOUT macros to Noxary 260 (qmk#6815)

    * add default LAYOUT_60_ansi

    * add LAYOUT_60_hhkb support

    * add tsangan_hhkb support

    * add ISO support and rename LAYOUT to LAYOUT_all

    * formatting

    * add community layouts support

    * remove unneeded code

    * missed a LAYOUT rename

    * add link time optimization to reduce firmware size for some people's keymaps

commit acec007
Author: Brad <broswen@users.noreply.github.com>
Date:   Wed Sep 25 04:01:58 2019 -0500

    [Keymap] add keymap broswen for kbd75 (qmk#6814)

commit 6c37798
Author: Sid Carter <sidcarter@users.noreply.github.com>
Date:   Wed Sep 25 04:54:32 2019 -0400

    [Keymap] New keymap for the DZ65RGB (qmk#6792)

    * new keymap for my chocolate tofu65 with dz65rgb

    * consistent with a tada68 layout

    * remove extra layer, add swap keycodes and mouse keycodes

    * fix the tabs and spaces

    * fix the left shift

commit df9388f
Author: noroadsleft <18669334+noroadsleft@users.noreply.github.com>
Date:   Tue Sep 24 11:36:23 2019 -0700

    Bathroom Epiphanies Pegasus Hoof: add LAYOUT_tkl_jis data to QMK Configurator (qmk#6802)

    * Bathroom Epiphanies Pegasus Hoof: add LAYOUT_tkl_jis data

    * use normal English labels

commit 460da06
Author: MechMerlin <30334081+mechmerlin@users.noreply.github.com>
Date:   Tue Sep 24 11:26:17 2019 -0700

    [Keyboard] KBD67 Mk.II RGB info.json missing a column (qmk#6807)

    * looks like configurator layout was missing a column

    * add a key count

commit 494fc51
Author: MechMerlin <30334081+mechmerlin@users.noreply.github.com>
Date:   Tue Sep 24 11:01:40 2019 -0700

    Merlin's Community Layout Updates (qmk#6798)

    * readme updates for 60_ansi and split variations

    * add new community layout for mechmerlin for the new default layout 65_ansi_blocker

    * change path now that kbd67 has been updated

    * fix up spacing

commit ad8dbd5
Author: Joel Challis <git@zvecr.com>
Date:   Tue Sep 24 15:24:12 2019 +0100

    ARM split - Add bootmagic/magic keycodes for setting handedness (qmk#6545)

    * Add docs on bootmagic/magic keycodes for setting handedness

    * Clang format fixes

    * Maintain backwards compatibility

    * Maintain backwards compatibility

commit 237147c
Author: fauxpark <fauxpark@gmail.com>
Date:   Tue Sep 24 17:59:17 2019 +1000

    Cleanup rules.mk for 32U4 keyboards, 0-9 (qmk#6789)

commit 37b6a2a
Author: MechMerlin <30334081+mechmerlin@users.noreply.github.com>
Date:   Mon Sep 23 23:34:59 2019 -0700

    Refactor the KBD67 Mk.II RGB (qmk#6799)

    * move kbd67mkiirgb into kbd67 directory as mkiirgb

    * rename files

    * rename LAYOUT to LAYOUT_65_ansi_blocker

    * add support for default layout

    * update readme for new build target

    * update parent readme with the fourth variant

commit efb7f3c
Author: QMK Bot <hello@qmk.fm>
Date:   Tue Sep 24 01:18:18 2019 +0000

    format code according to conventions [skip ci]

commit 61b5d0e
Author: mikethetiger <30720424+mikethetiger@users.noreply.github.com>
Date:   Mon Sep 23 20:14:55 2019 -0500

    [Keymap] mikethetiger's milk keymap (qmk#6611)

    * Added my Preonic keymap

    * Update keyboards/preonic/keymaps/mikethetiger/keymap.c

    Co-Authored-By: mikethetiger <30720424+mikethetiger@users.noreply.github.com>

    * Update keyboards/preonic/keymaps/mikethetiger/keymap.c

    Co-Authored-By: mikethetiger <30720424+mikethetiger@users.noreply.github.com>

    * Added my Preonic keymap

    * Added my Preonic keymap

    * mikethetigers lets slpit eh keymap

    * mikethetiger's milk keymap

    * Update rules.mk

    * Update keyboards/thevankeyboards/minivan/keymaps/mikethetiger/keymap.c

    Co-Authored-By: fauxpark <fauxpark@gmail.com>

    * Update rules.mk

    Better?

commit 8eb0aef
Author: MechMerlin <30334081+mechmerlin@users.noreply.github.com>
Date:   Mon Sep 23 15:56:24 2019 -0700

    [Keyboard] 65_ansi_blocker support for Doro67 (qmk#6791)

    * rename LAYOUT to LAYOUT_65_blocker_ansi

    * rename LAYOUT macro

    * enable LAYOUT_65_blocker_ansi community layout support and remove uneeded lines of code

    * rename LAYOUT to LAYOUT_65_blocker_ansi

    * rename LAYOUT macro

    * enable LAYOUT_65_blocker_ansi community layout support

    * enable LAYOUT_65_blocker_ansi support

    * fix rename mess up

    * add QMK Configurator support with the new rename

    * rename blocker_ansi to ansi_blocker as it rolls off the tongue easier

commit ced8c55
Author: Callum Hart <mini-ninja-64@users.noreply.github.com>
Date:   Mon Sep 23 23:49:55 2019 +0100

    [Keyboard] Fix pinout on the copenhagen clickpad (qmk#6788)

commit e41fedd
Author: MechMerlin <30334081+mechmerlin@users.noreply.github.com>
Date:   Sun Sep 22 13:50:18 2019 -0700

    New Default Layout: 65_blocker_ansi (qmk#6782)

    * initial commit

    * rename 65_ansi to 65_blocker_ansi

    * remove one key to account for blocker

commit d569f08
Author: skullydazed <skullydazed@users.noreply.github.com>
Date:   Sun Sep 22 13:25:33 2019 -0700

    Configuration system for CLI (qmk#6708)

    * Rework how bin/qmk handles subcommands

    * qmk config wip

    * Code to show all configs

    * Fully working `qmk config` command

    * Mark some CLI arguments so they don't pollute the config file

    * Fleshed out config support, nicer subcommand support

    * sync with installable cli

    * pyformat

    * Add a test for subcommand_modules

    * Documentation for the `qmk config` command

    * split config_token on space so qmk config is more predictable

    * Rework how subcommands are imported

    * Document `arg_only`

    * Document deleting from CLI

    * Document how multiple operations work

    * Add cli config to the doc index

    * Add tests for the cli commands

    * Make running the tests more reliable

    * Be more selective about building all default keymaps

    * Update new-keymap to fit the new subcommand style

    * Add documentation about writing CLI scripts

    * Document new-keyboard

    * Update docs/cli_configuration.md

    Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

    * Update docs/cli_development.md

    Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

    * Update docs/cli_development.md

    Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

    * Update docs/cli_development.md

    Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

    * Address yan's comments.

    * Apply suggestions from code review

    suggestions from @noahfrederick

    Co-Authored-By: Noah Frederick <code@noahfrederick.com>

    * Apply suggestions from code review

    Co-Authored-By: Noah Frederick <code@noahfrederick.com>

    * Remove pip3 from the test runner

commit 2f49cae
Author: XScorpion2 <rcalt2vt@gmail.com>
Date:   Sun Sep 22 09:52:33 2019 -0500

    Fixing wrapping math logic for timer_expired functions (qmk#6746)

commit 29d7f9b
Author: Burak Can <neoberg@gmail.com>
Date:   Sun Sep 22 14:32:52 2019 +0300

    Correct casing for DS_Store in .gitignore (qmk#6787)

commit e05b32d
Author: Francis St-Amour <fstamour@users.noreply.github.com>
Date:   Sat Sep 21 14:59:18 2019 -0400

    add python3 to shell.nix (qmk#6774)

commit 0e96068
Author: skullydazed <skullydazed@users.noreply.github.com>
Date:   Sat Sep 21 11:58:06 2019 -0700

    Update the breaking changes process so we always have a future branch (qmk#6785)

commit 42bf607
Author: noroadsleft <18669334+noroadsleft@users.noreply.github.com>
Date:   Sat Sep 21 11:32:08 2019 -0700

    [Keyboard] fix OLKB layout macro aliases (qmk#6761)

commit fd19795
Author: MechMerlin <30334081+mechmerlin@users.noreply.github.com>
Date:   Sat Sep 21 11:27:53 2019 -0700

    [Keyboard] Move more percent boards into the percent directory (qmk#6781)

    * move canoe into percent directory

    * update readme for new make path

    * move skog into percent directory

    * update readme for new path and new instructions

    * update readme

    * fix error in naming

commit f069e9f
Author: Drashna Jaelre <drashna@live.com>
Date:   Sat Sep 21 11:22:27 2019 -0700

    Generalize Tap Dance Layer functions (qmk#6629)

    * made tapdance dual_role general

    * updated original dual_role functionality

    * added toggling layer example

    * Fix dual role and add alias

    * Update docs about new layer tap dances

    * Fix up based on feedback

commit 63a0b12
Author: Daniel Shields <daniel.shields@bcs.org>
Date:   Sat Sep 21 19:04:27 2019 +0100

    [Keymap] Move common code and configuration to userspace for dshields keymaps. (qmk#6537)

commit 75c9747
Author: Benjamin <ben@bontakun.net>
Date:   Sat Sep 21 10:13:44 2019 -0700

    [Keymap] Bonta keymap for massdrop/ALT (qmk#6391)

    * Added new bonta keymap.

    * Added a note.

    * Made map more mac like.

commit 2df3799
Author: fauxpark <fauxpark@gmail.com>
Date:   Sat Sep 21 17:00:58 2019 +1000

    Add list-keymaps make target (qmk#5563)

commit ea96c4b
Author: jlquinn <jlquinn@optonline.net>
Date:   Sat Sep 21 02:59:16 2019 -0400

    [Keyboard] Update Stapelberg readme.md (qmk#5557)

    Previously suggested parts are hard to find or non-existent.  Update with available part numbers.

commit 7f65323
Author: Sorixelle <38685302+Sorixelle@users.noreply.github.com>
Date:   Sat Sep 21 16:55:51 2019 +1000

    Add support for Void Linux systems to the qmk_install.sh script (qmk#5526)

    * Add support for Void Linux systems to the qmk_install.sh script

    * Fix typos + grammatical edits in comments

    * Sort distributions by alphabetical order in linux_install.sh

    * Revert previous commit and sort Void packages in alphabetical order

    * Fix permissions on `util/linux_install.sh`

commit 3642a82
Author: fauxpark <fauxpark@gmail.com>
Date:   Sat Sep 21 15:11:15 2019 +1000

    Add support for 328P hardware backlight on B1/B2 (qmk#6776)

commit c7d0262
Author: coseyfannitutti <43188488+coseyfannitutti@users.noreply.github.com>
Date:   Sat Sep 21 01:07:21 2019 -0400

    [Keyboard] Add Discipad, Update Zadig doc for USBaspLoader (qmk#6771)

    * add discipad

    * Update driver_installation_zadig.md

    * Update keyboards/coseyfannitutti/discipad/info.json

    Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

    * Update keyboards/coseyfannitutti/discipad/readme.md

    Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

    * Update rules.mk

    * Update keyboards/coseyfannitutti/discipad/rules.mk

    Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

    * Update docs/driver_installation_zadig.md

    Co-Authored-By: fauxpark <fauxpark@gmail.com>

    * Update keyboards/coseyfannitutti/discipad/discipad.c

    Co-Authored-By: fauxpark <fauxpark@gmail.com>

    * Update docs/driver_installation_zadig.md

    Co-Authored-By: fauxpark <fauxpark@gmail.com>

    * Update docs/driver_installation_zadig.md

    Co-Authored-By: fauxpark <fauxpark@gmail.com>

    * Update rules.mk

    * Update discipad.c

    * Update driver_installation_zadig.md

    * Update config.h

commit de4a47f
Author: fauxpark <fauxpark@gmail.com>
Date:   Sat Sep 21 15:06:32 2019 +1000

    Cleanup rules.mk for 32A and 328P keyboards (qmk#6767)

commit beb4a12
Author: Konstantin Đorđević <vomindoraan@gmail.com>
Date:   Fri Sep 20 02:29:23 2019 +0200

    Add reset instructions for boards that use Command to the Zadig driver installation guide (qmk#6770)

    * Add reset instructions for boards that use Command to the Zadig driver installation guide

    * -> → →

    * Apply suggestions from code review

    Replace shorthand keycode names with full names

    Co-Authored-By: fauxpark <fauxpark@gmail.com>

commit 59000f4
Author: Brian Lou <ottodokto@users.noreply.github.com>
Date:   Thu Sep 19 19:38:42 2019 -0400

    [Keymap] Added my personal keymaps for dz60 and TMO50. (qmk#6772)

    * Added ottodokto keymaps for dz60 and tmo50.

    * moved placement of keymaps to proper directory

    * fixed accidental deletion of semicolon for tmo50 map

    * fix to use short form codes

    Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

commit 44c5be0
Author: fauxpark <fauxpark@gmail.com>
Date:   Fri Sep 20 02:55:14 2019 +1000

    Cleanup rules.mk for 16U2 and 32U2 keyboards (qmk#6768)

    * Cleanup rules.mk for 16U2 and 32U2 keyboards

    * Add back Tap Dance build option

commit f34299e
Author: fauxpark <fauxpark@gmail.com>
Date:   Fri Sep 20 02:55:03 2019 +1000

    Cleanup rules.mk for USB64 and USB128 keyboards (qmk#6769)

commit 911b891
Author: MechMerlin <30334081+mechmerlin@users.noreply.github.com>
Date:   Thu Sep 19 09:42:33 2019 -0700

    DRV2605L Continuous Haptic Feedback Support (qmk#6461)

    * provide means to turn on RTP mode and set the amplitude

    * new keycode HPT_CONT to turn RTP off/on

    * introduce new keycodes HPT_CONI, and HPT_COND for Haptic Continuous Increase and Decrease

    * support for continuous mode amplitude increase and decrease

    * code cleanup

    * update docs to reference new keycodes and functionality

    * don't touch the keymaps

    * add function prototypes

    * add proper guards

    * cleanup guards

    * remove extra reserved

commit 7a5a259
Author: MechMerlin <30334081+mechmerlin@users.noreply.github.com>
Date:   Wed Sep 18 18:42:53 2019 -0700

    [Keyboard] 1up60hte cleanup + bugfix (qmk#6763)

    * move caps lock led to keyboard level so even QMK Configurator users have access to it

    * set bootloader correctly to atmel-dfu

    * clean up extra carriage return

commit 7142b60
Author: Alex Mayer <amayer5125@gmail.com>
Date:   Wed Sep 18 21:38:56 2019 -0400

    [Keymap] Update Planck Layer Diagram To Match Layer (qmk#6712)

commit 095b88b
Author: XScorpion2 <rcalt2vt@gmail.com>
Date:   Wed Sep 18 20:32:38 2019 -0500

    Smoother Linear Light Table (qmk#6764)

commit 46c49ae
Author: XScorpion2 <rcalt2vt@gmail.com>
Date:   Wed Sep 18 19:56:11 2019 -0500

    Updated split encoders so indexes are based on left hand encoders first (qmk#6382)

    * Updated encoder.c so that split encoders are indexed based on left hand encoders first.
    This ensures when swapping master sides that code logic based on encoder index doesn't change.

    PR Review fixes

    * Removed extra define

commit e5aa284
Author: Andrew Kannan <andrew.kannan@klaviyo.com>
Date:   Wed Sep 18 20:41:46 2019 -0400

    [Keyboard] 201909 s75 custom encoder (qmk#6745)

    * Handle custom encoder configuration

    * Whitespace changes

    * Undo broken stuff

    * more

    * Remove printfs

    * fix the dumb bug

commit 6f5f943
Author: Adrien Tétar <1250894+adrientetar@users.noreply.github.com>
Date:   Wed Sep 18 20:14:49 2019 +0200

    [Keyboard] Introduce AT-AT 660M (qmk#6729)

    * Introduce AT-AT 660M

    * PR feedback

    Co-Authored-By: fauxpark <fauxpark@gmail.com>

    * Add dfu-util args

    * Add URL

commit 7d8dea3
Author: vuhopkep <boy9x0@gmail.com>
Date:   Wed Sep 18 13:36:05 2019 +0700

    [Keyboard] add personal fullsize pcb hnah108 (qmk#6759)

    * add personal fullsize pcb hnah108

    * Update keymap.c

commit 37c2996
Author: Drashna Jaelre <drashna@live.com>
Date:   Tue Sep 17 16:50:04 2019 -0700

    [Keyboard] Fix compile issues for OLKB Default keymaps (qmk#6751)

commit 5450316
Author: fauxpark <fauxpark@gmail.com>
Date:   Wed Sep 18 09:48:58 2019 +1000

    Update bootloader.mk (qmk#6698)

commit 23186d3
Author: fougner <fougner89@gmail.com>
Date:   Tue Sep 17 19:37:01 2019 +0200

    [Keyboard] xd87: add capslock led support (qmk#6758)

commit 12cdcd5
Author: noroadsleft <18669334+noroadsleft@users.noreply.github.com>
Date:   Tue Sep 17 10:36:18 2019 -0700

    [Keyboard] Freyr: Configurator bugfixes (qmk#6756)

    - rebuild LAYOUT_all tree (key count mismatch)
    - correct keyboard dimensions and key positioning
    - complete key object labels
    - debug linting (one key object per line; changes white space only)

commit 86d59f1
Author: noroadsleft <18669334+noroadsleft@users.noreply.github.com>
Date:   Tue Sep 17 10:34:52 2019 -0700

    [Keyboard] KBD75 refactor (qmk#6755)

    * convert codebase to #pragma once

    * fix file includes

    - quantum.h is included at keyboard level, redundant at revision level
    - keyboard-level path is accessible at revision level, remove relative pathing

    * duplicate common layout macros from rev1 to rev2

    Add the layout macros supported by both rev1 and rev2 to rev2.h directly, which exposes these layouts to QMK Configurator.

    * enable community layout support (75_ansi, 75_iso)

    * add LAYOUT_75_iso layout data

    It needs its own tree because its keys are in a different order from LAYOUT_iso_1u even though the physical layout is the same.

    * minimize rules.mk files (use QMK defaults)

    * use atmel-dfu bootloader rule

    * fix typo on rev1 info.json

commit c427023
Author: XScorpion2 <rcalt2vt@gmail.com>
Date:   Tue Sep 17 12:28:02 2019 -0500

    [Keymap][Xulkal] User code update (qmk#6752)

    * Updating rgb menu behavior

    * Fixing toggle keycode to work how I want it

    * Enabling auto scroll timeout

commit 2493eec
Author: Jason Thigpen <darwin@senet.us>
Date:   Tue Sep 17 10:27:07 2019 -0700

    [Keymap] Fix e65 7u WK layout and add crd's personal keymap (qmk#6750)

    * Add e65 keymap for crd

    * Fix e65 7u wk layout

commit bb3569d
Author: Drew Smathers <drew.smathers@gmail.com>
Date:   Tue Sep 17 10:24:15 2019 -0700

    [Keymap] idobo/drewdobo keymap v1 (qmk#6744)

commit b364a40
Author: vuhopkep <boy9x0@gmail.com>
Date:   Wed Sep 18 00:23:13 2019 +0700

    [Keyboard] Correct info.json data for vn66 (qmk#6741)

    * Correct info.json data for vn66

    * update .json file data

    * Update info.json

commit d137fde
Author: Ethan Durrant <5387347+emdarcher@users.noreply.github.com>
Date:   Tue Sep 17 11:19:16 2019 -0600

    [Keyboard] Adding YMDK "Bface" keyboard (qmk#6731)

    * making a new board setup for ymdk bface clone

    * removing extra keymaps that copied over

    * documentation and edits for new ymdk_bface board

    * cleaning up config and keymaps

    * removed extra keymap and working on READMEs

    * readme edits

    * shorter aliexpress link in ymdk_bface readme

    * added images to readmes and edited the keymaps

    * more flashing directions

    * Mac directions formatting

    * editing and creating the all layout

    * cleanign up ymdk_bface keymaps

    * fixed typos in layout

    * removed tabs

    * cleaned up the LED and Backlight configuration.

    * adding more to info.josn and cleaning up readme

    * fixing JSON typos

    * made a ymdk folder and moved the bface into it.

    * fixing file names for the new folder structure

commit ab48ffd
Author: Noan Mousy <4sstylz@protonmail.ch>
Date:   Tue Sep 17 19:17:03 2019 +0200

    [Keyboard] Adding AEK64 keyboard (qmk#6725)

    * Adding AEK64 keyboard

    * Deleting useless layout definition

    * Resolving many code review issues

    * Documenting my 4sStylZ keymap

    * Adding default keymap

    * Apply suggestions from code review

    Code review corrections

    Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>
    Co-Authored-By: fauxpark <fauxpark@gmail.com>

    * Update keyboards/handwired/aek64/readme.md

    Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

    * Correcting the NKRO implementation

commit 32b2486
Author: IanGC <ian.canino@gmail.com>
Date:   Tue Sep 17 13:15:07 2019 -0400

    [Keymap] Plaid Keymap for Programmers (qmk#6706)

    * map programmer qwerty

    * clarify and fix typo

    * finishing touches

    * use qmk
    s templates for readme

    * update copyright notice

    * remove unnecessary code

    Co-Authored-By: Drashna Jaelre <drashna@live.com>

    * remove unnecessary code

    Co-Authored-By: Drashna Jaelre <drashna@live.com>

    * Update keyboards/plaid/keymaps/thehalfdeafchef/keymap.c

    Co-Authored-By: Drashna Jaelre <drashna@live.com>

    * fix documentation

    * reformat code

    * Apply suggestions from code review

    Co-Authored-By: Drashna Jaelre <drashna@live.com>

commit 55432d0
Author: Wilba <Jason.S.Williams@gmail.com>
Date:   Wed Sep 18 02:59:34 2019 +1000

    [Keyboard] Fixed EEPROM start address for firmware using VIA (qmk#6757)

commit 59af2cb
Author: Andrew Kannan <andrew.kannan@klaviyo.com>
Date:   Mon Sep 16 22:37:51 2019 -0400

    Add Chimera65 Keyboard (qmk#6670)

    * Add chimera board

    * info json start

    * Update keyboards/cannonkeys/chimera65/config.h

    Co-Authored-By: Drashna Jaelre <drashna@live.com>

    * Apply suggestions from code review

    Co-Authored-By: Drashna Jaelre <drashna@live.com>
    Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

    * Update keyboards/cannonkeys/chimera65/config.h

    Co-Authored-By: Drashna Jaelre <drashna@live.com>

commit 7c1bb9d
Author: noroadsleft <18669334+noroadsleft@users.noreply.github.com>
Date:   Mon Sep 16 08:20:44 2019 -0700

    Percent Studio Booster: Configurator fix (qmk#6743)

commit 140c08e
Author: Xerpocalypse <31947786+Xerpocalypse@users.noreply.github.com>
Date:   Sun Sep 15 21:32:34 2019 -0700

    [Keymap] Added Xerpocalypse's layout (qmk#6732)

    * Added Xerpocalypse's layout

    + Number row and symbols are switched compared to default TMO50 layout
    + Right-hand spacebar acts as backspace and a hold-layer for layer 2.

    * Update keyboards/tmo50/keymaps/xerpocalypse/keymap.c

    Removed unnecessary #define

    Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

    * Update keyboards/tmo50/keymaps/xerpocalypse/keymap.c

    Changed keymap to use KC_UNDS instead of custom-defined keycode

    Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

commit a9c1a5a
Author: Michael Torres <torresmi@mail.gvsu.edu>
Date:   Mon Sep 16 00:13:44 2019 -0400

    remove accidental characters in default preonic keymap (qmk#6748)

commit 3b4b54f
Author: xster <xiao@xster.net>
Date:   Sun Sep 15 02:22:02 2019 -0700

    Clarify the backlight_level API doc slightly (qmk#6733)

    * Clarify the backlight_level API doc slightly

    * review

commit 9c28008
Author: vuhopkep <boy9x0@gmail.com>
Date:   Sun Sep 15 16:13:19 2019 +0700

    add VN66 keyboard (qmk#6722)

    * add VN66 keyboard

    * update

    * Update readme.md

    * Update readme.md

    * add hnah108 personal pcb

    * delete hnah108

    * Update vn66.c

commit 38a0a6a
Author: noroadsleft <18669334+noroadsleft@users.noreply.github.com>
Date:   Sat Sep 14 20:16:26 2019 -0700

    [Keyboard] TheVanKeyboards Caravan: Configurator layout support (qmk#6737)

commit 8294a0d
Author: GreenShadowMaker <39226745+GreenShadowMaker@users.noreply.github.com>
Date:   Sat Sep 14 20:15:56 2019 -0700

    [Keymap] style cleanup of GreenShadowMaker's keymap (qmk#6736)

commit 65c4b6c
Author: xster <xiao@xster.net>
Date:   Sat Sep 14 20:14:16 2019 -0700

    [Keymap] Yet another xd75 keymap (qmk#6734)

    * add a keymap for xd75

    * add colors, change some keys, add reactive modifier hold, key press

    * add readme

    * permissive hold

commit 9508b3f
Author: MechMerlin <30334081+mechmerlin@users.noreply.github.com>
Date:   Sat Sep 14 20:03:11 2019 -0700

    [Keyboard] Alps64 Refactor (qmk#6723)

    * get rid of custom matrix that is no longer being used

    * remove _kc LAYOUT

    * remove ifdefs and replace with pragma once

    * cleanup rules and use bootmagic lite

    * get rid of led.c

    * Update keyboards/alps64/alps64.c

    Co-Authored-By: Drashna Jaelre <drashna@live.com>

    * remove unneeded configurations

commit 6c87140
Author: Drashna Jaelre <drashna@live.com>
Date:   Sat Sep 14 19:59:44 2019 -0700

    [Keyboard] Fix default keymaps for OLKB boards to play Startup Sound (qmk#6721)

    * Fix Planck default keymap to play sounds on rev6

    The dip_switch_update callback was overriding the default startup sound.  This should prevent that from happening, and still allow it to play sounds, or stop them, when appropriate.

    * Fix Preonic default keymap to play sounds on Rev 3

    The dip_switch_update callback was overriding the default startup sound.  This should prevent that from happening, and still allow it to play sounds, or stop them, when appropriate.

commit 265d8ab
Author: Drashna Jaelre <drashna@live.com>
Date:   Sat Sep 14 19:57:07 2019 -0700

    Fix enables for Haptic Feedback (qmk#6707)

    * Fix enables for Haptic Feedback

    If you enabled bothe DRV2605 and SOLENOID, it would only enable one of these, not both.

    This fixes the check so that you can enable both options.

    * Fix check for haptic feature

commit d13e0b5
Author: Fedde Schaeffer <fedde.schaeffer@gmail.com>
Date:   Sun Sep 15 04:55:23 2019 +0200

    [Keymap] Fix Georgi's RZ key in NKRO fake-steno mode (qmk#6701)

    It was sending a comma keypress, while I believe that the targeted
    stenography software (at least on systems that generally use
    US-International keyboard layout) expects a single-quote/apostrophe key.

commit a4581e6
Author: m47ch4n <m47ch4n@gmail.com>
Date:   Sun Sep 15 11:53:52 2019 +0900

    [Keymap] Added m47ch4n keymap (qmk#6673)

    * Add m47ch4n's keymap

    * Modify keymap

    * Format m47ch4n keymap.c using clang-format

    * Modify layer updater

    * Fix wrong key repeating bug

    * Add readme and QMK Configurator json

    * Fix layer updateter

    * Add Raise layer

    * Add kana keys

commit 0cbe1eb
Author: J.Flanagan <jrfhoutx@comcast.net>
Date:   Sat Sep 14 16:03:14 2019 -0500

    [Keyboard] Add 2key2crawl (qmk#6727)

    * adding working 2key2crawl

    Adding working 2key2crawl files
    edited files in accordance with original PR comments

    * Changes

    Changes and updates

    * Update readme.md

    * Update config.h

    removed IS_COMMAND block that was missed in previous commit

    * Changes to vol/keymap.c

    Removed unneccesary function
  • Loading branch information
@sekigon-gonnoc
sekigon-gonnoc committed Sep 26, 2019
1 parent 7f575e4 commit 48d4fe3
Show file tree
Hide file tree
Showing 547 changed files with 20,062 additions and 5,592 deletions.
2 changes: 1 addition & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ quantum/version.h
CMakeLists.txt
cmake-build-debug
doxygen/
.DS_STORE
.DS_Store
/util/wsl_downloaded
/util/win_downloaded
/keyboards/*/Makefile
Expand Down
12 changes: 7 additions & 5 deletions .vscode/settings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,12 @@
"**/*.hex": true
},
"files.associations": {
"*.h": "c",
"*.c": "c",
"*.cpp": "cpp",
"*.hpp": "cpp",
"xstddef": "c"
"*.h": "c",
"*.c": "c",
"*.cpp": "cpp",
"*.hpp": "cpp",
"xstddef": "c",
"type_traits": "c",
"utility": "c"
}
}
13 changes: 13 additions & 0 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -371,6 +371,9 @@ define PARSE_KEYBOARD
# The same if all was specified
else ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,all),true)
$$(eval $$(call PARSE_ALL_KEYMAPS))
# List all keymaps for the given keyboard
else ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,list-keymaps),true)
$$(eval $$(call LIST_ALL_KEYMAPS))
# Try to match the specified keyamp with the list of known keymaps
else ifeq ($$(call TRY_TO_MATCH_RULE_FROM_LIST,$$(KEYMAPS)),true)
$$(eval $$(call PARSE_KEYMAP,$$(MATCHED_ITEM)))
Expand Down Expand Up @@ -407,6 +410,16 @@ endef
# endif
# endef

# Prints a list of all known keymaps for the given keyboard
define LIST_ALL_KEYMAPS
COMMAND_true_LIST_KEYMAPS := \
printf "$$(KEYMAPS)\n";
COMMAND_false_LIST_KEYMAPS := \
printf "$$(MSG_AVAILABLE_KEYMAPS)\n"; \
printf "$$(KEYMAPS)\n";
COMMANDS += LIST_KEYMAPS
endef

# $1 Keymap
# This is the meat of compiling a keyboard, when entering this, everything is known
# keyboard, subproject, and keymap
Expand Down
92 changes: 36 additions & 56 deletions bin/qmk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,17 @@
import os
import subprocess
import sys
from glob import glob
from time import strftime
from importlib import import_module
from importlib.util import find_spec
from time import strftime

# Add the QMK python libs to our path
script_dir = os.path.dirname(os.path.realpath(__file__))
qmk_dir = os.path.abspath(os.path.join(script_dir, '..'))
python_lib_dir = os.path.abspath(os.path.join(qmk_dir, 'lib', 'python'))
sys.path.append(python_lib_dir)

# Change to the root of our checkout
os.environ['ORIG_CWD'] = os.getcwd()
os.chdir(qmk_dir)

# Make sure our modules have been setup
with open('requirements.txt', 'r') as fd:
with open(os.path.join(qmk_dir, 'requirements.txt'), 'r') as fd:
for line in fd.readlines():
line = line.strip().replace('<', '=').replace('>', '=')

Expand All @@ -32,72 +26,58 @@ with open('requirements.txt', 'r') as fd:

module = line.split('=')[0] if '=' in line else line
if not find_spec(module):
print('Your QMK build environment is not fully setup!\n')
print('Please run `./util/qmk_install.sh` to setup QMK.')
print('Could not find module %s!', module)
print('Please run `pip3 install -r requirements.txt` to install the python dependencies.')
exit(255)

# Figure out our version
# TODO(skullydazed/anyone): Find a method that doesn't involve git. This is slow in docker and on windows.
command = ['git', 'describe', '--abbrev=6', '--dirty', '--always', '--tags']
result = subprocess.run(command, universal_newlines=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
result = subprocess.run(command, universal_newlines=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)

if result.returncode == 0:
os.environ['QMK_VERSION'] = 'QMK ' + result.stdout.strip()
os.environ['QMK_VERSION'] = result.stdout.strip()
else:
os.environ['QMK_VERSION'] = 'QMK ' + strftime('%Y-%m-%d-%H:%M:%S')
os.environ['QMK_VERSION'] = 'nogit-' + strftime('%Y-%m-%d-%H:%M:%S') + '-dirty'

# Setup the CLI
import milc
milc.EMOJI_LOGLEVELS['INFO'] = '{fg_blue}Ψ{style_reset_all}'

# If we were invoked as `qmk <cmd>` massage sys.argv into `qmk-<cmd>`.
# This means we can't accept arguments to the qmk script itself.
script_name = os.path.basename(sys.argv[0])
if script_name == 'qmk':
if len(sys.argv) == 1:
milc.cli.log.error('No subcommand specified!\n')

if len(sys.argv) == 1 or sys.argv[1] in ['-h', '--help']:
milc.cli.echo('usage: qmk <subcommand> [...]')
milc.cli.echo('\nsubcommands:')
subcommands = glob(os.path.join(qmk_dir, 'bin', 'qmk-*'))
for subcommand in sorted(subcommands):
subcommand = os.path.basename(subcommand).split('-', 1)[1]
milc.cli.echo('\t%s', subcommand)
milc.cli.echo('\nqmk <subcommand> --help for more information')
exit(1)
milc.EMOJI_LOGLEVELS['INFO'] = '{fg_blue}Ψ{style_reset_all}'

if sys.argv[1] in ['-V', '--version']:
milc.cli.echo(os.environ['QMK_VERSION'])
exit(0)

sys.argv[0] = script_name = '-'.join((script_name, sys.argv[1]))
del sys.argv[1]
@milc.cli.entrypoint('QMK Helper Script')
def qmk_main(cli):
"""The function that gets run when no subcommand is provided.
"""
cli.print_help()

# Look for which module to import
if script_name == 'qmk':
milc.cli.print_help()
exit(0)
elif not script_name.startswith('qmk-'):
milc.cli.log.error('Invalid symlink, must start with "qmk-": %s', script_name)
else:
subcommand = script_name.replace('-', '.').replace('_', '.').split('.')
subcommand.insert(1, 'cli')
subcommand = '.'.join(subcommand)

try:
import_module(subcommand)
except ModuleNotFoundError as e:
if e.__class__.__name__ != subcommand:
raise
def main():
"""Setup our environment and then call the CLI entrypoint.
"""
# Change to the root of our checkout
os.environ['ORIG_CWD'] = os.getcwd()
os.chdir(qmk_dir)

milc.cli.log.error('Invalid subcommand! Could not import %s.', subcommand)
exit(1)
# Import the subcommands
import qmk.cli

if __name__ == '__main__':
# Execute
return_code = milc.cli()

if return_code is False:
exit(1)
elif return_code is not True and isinstance(return_code, int) and return_code < 256:

elif return_code is not True and isinstance(return_code, int):
if return_code < 0 or return_code > 255:
milc.cli.log.error('Invalid return_code: %d', return_code)
exit(255)

exit(return_code)
else:
exit(0)

exit(0)


if __name__ == '__main__':
main()
1 change: 0 additions & 1 deletion bin/qmk-compile-json
View file

This file was deleted.

1 change: 0 additions & 1 deletion bin/qmk-doctor
View file

This file was deleted.

1 change: 0 additions & 1 deletion bin/qmk-hello
View file

This file was deleted.

1 change: 0 additions & 1 deletion bin/qmk-json-keymap
View file

This file was deleted.

36 changes: 19 additions & 17 deletions bootloader.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,53 +19,55 @@
#
# Sets the bootloader defined in the keyboard's/keymap's rules.mk
# Current options:
# atmel-dfu
# lufa-dfu
# qmk-dfu
# halfkay
# caterina
# bootloadHID
#
# halfkay PJRC Teensy
# caterina Pro Micro (Sparkfun/generic)
# atmel-dfu Atmel factory DFU
# lufa-dfu LUFA DFU
# qmk-dfu QMK DFU (LUFA + blinkenlight)
# bootloadHID HIDBootFlash compatible (ATmega32A)
# USBasp USBaspLoader (ATmega328P)
#
# BOOTLOADER_SIZE can still be defined manually, but it's recommended
# you add any possible configuration to this list

ifeq ($(strip $(BOOTLOADER)), atmel-dfu)
OPT_DEFS += -DBOOTLOADER_ATMEL_DFU
OPT_DEFS += -DBOOTLOADER_DFU
ifeq ($(strip $(MCU)), atmega32u4)
BOOTLOADER_SIZE = 4096
ifneq (,$(filter $(MCU), at90usb646 atmega16u2 atmega16u4 atmega32u2 atmega32u4))
BOOTLOADER_SIZE = 4096
endif
ifeq ($(strip $(MCU)), at90usb1286)
BOOTLOADER_SIZE = 8192
BOOTLOADER_SIZE = 8192
endif
endif
ifeq ($(strip $(BOOTLOADER)), lufa-dfu)
OPT_DEFS += -DBOOTLOADER_LUFA_DFU
OPT_DEFS += -DBOOTLOADER_DFU
ifeq ($(strip $(MCU)), atmega32u4)
BOOTLOADER_SIZE = 4096
ifneq (,$(filter $(MCU), at90usb646 atmega16u2 atmega16u4 atmega32u2 atmega32u4))
BOOTLOADER_SIZE = 4096
endif
ifeq ($(strip $(MCU)), at90usb1286)
BOOTLOADER_SIZE = 8192
BOOTLOADER_SIZE = 8192
endif
endif
ifeq ($(strip $(BOOTLOADER)), qmk-dfu)
OPT_DEFS += -DBOOTLOADER_QMK_DFU
OPT_DEFS += -DBOOTLOADER_DFU
ifeq ($(strip $(MCU)), atmega32u4)
BOOTLOADER_SIZE = 4096
ifneq (,$(filter $(MCU), at90usb646 atmega16u2 atmega16u4 atmega32u2 atmega32u4))
BOOTLOADER_SIZE = 4096
endif
ifeq ($(strip $(MCU)), at90usb1286)
BOOTLOADER_SIZE = 8192
BOOTLOADER_SIZE = 8192
endif
endif
ifeq ($(strip $(BOOTLOADER)), halfkay)
OPT_DEFS += -DBOOTLOADER_HALFKAY
ifeq ($(strip $(MCU)), atmega32u4)
BOOTLOADER_SIZE = 512
BOOTLOADER_SIZE = 512
endif
ifeq ($(strip $(MCU)), at90usb1286)
BOOTLOADER_SIZE = 1024
BOOTLOADER_SIZE = 1024
endif
endif
ifeq ($(strip $(BOOTLOADER)), caterina)
Expand Down
2 changes: 1 addition & 1 deletion build_json.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ endif

# Generate the keymap.c
ifneq ("$(KEYMAP_JSON)","")
_ = $(shell test -e $(KEYMAP_C) || bin/qmk-json-keymap $(KEYMAP_JSON) -o $(KEYMAP_C))
_ = $(shell test -e $(KEYMAP_C) || bin/qmk json-keymap $(KEYMAP_JSON) -o $(KEYMAP_C))
endif
17 changes: 9 additions & 8 deletions common_features.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -267,20 +267,21 @@ ifeq ($(strip $(ENCODER_ENABLE)), yes)
OPT_DEFS += -DENCODER_ENABLE
endif

ifeq ($(strip $(HAPTIC_ENABLE)), DRV2605L)
COMMON_VPATH += $(DRIVER_PATH)/haptic
SRC += haptic.c
HAPTIC_ENABLE ?= no
ifneq ($(strip $(HAPTIC_ENABLE)),no)
COMMON_VPATH += $(DRIVER_PATH)/haptic
SRC += haptic.c
OPT_DEFS += -DHAPTIC_ENABLE
endif

ifneq ($(filter DRV2605L, $(HAPTIC_ENABLE)), )
SRC += DRV2605L.c
QUANTUM_LIB_SRC += i2c_master.c
OPT_DEFS += -DHAPTIC_ENABLE
OPT_DEFS += -DDRV2605L
endif

ifeq ($(strip $(HAPTIC_ENABLE)), SOLENOID)
COMMON_VPATH += $(DRIVER_PATH)/haptic
SRC += haptic.c
ifneq ($(filter SOLENOID, $(HAPTIC_ENABLE)), )
SRC += solenoid.c
OPT_DEFS += -DHAPTIC_ENABLE
OPT_DEFS += -DSOLENOID_ENABLE
endif

Expand Down
3 changes: 2 additions & 1 deletion docs/_summary.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
* [QMK Basics](README.md)
* [QMK Introduction](getting_started_introduction.md)
* [QMK CLI](cli.md)
* [QMK CLI Config](cli_configuration.md)
* [Contributing to QMK](contributing.md)
* [How to Use Github](getting_started_github.md)
* [Getting Help](getting_started_getting_help.md)
Expand Down Expand Up @@ -48,7 +49,7 @@
* [Useful Functions](ref_functions.md)
* [Configurator Support](reference_configurator_support.md)
* [info.json Format](reference_info_json.md)
* [Python Development](python_development.md)
* [Python CLI Development](cli_development.md)

* [Features](features.md)
* [Basic Keycodes](keycodes_basic.md)
Expand Down
9 changes: 4 additions & 5 deletions docs/breaking_changes.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ The next Breaking Change is scheduled for Nov 29.

### Important Dates

* [ ] 2019 Oct 04 - `future` is created. It will be rebased weekly.
* [x] 2019 Sep 21 - `future` is created. It will be rebased weekly.
* [ ] 2019 Nov 01 - `future` closed to new PR's.
* [ ] 2019 Nov 01 - Call for testers.
* [ ] 2019 Nov 27 - `master` is locked, no PR's merged.
Expand Down Expand Up @@ -51,7 +51,9 @@ git rebase master
git push --force
```

## 8 Weeks Before Merge
## Creating the `future` branch

This happens immediately after the previous `future` branch is merged.

* `qmk_firmware` git commands
* [ ] `git checkout master`
Expand All @@ -65,9 +67,6 @@ git push --force
* [ ] `git tag <next_version>` # Prevent the breakpoint tag from confusing version incrementing
* [ ] `git push origin future`
* [ ] `git push --tags`
* GitHub Actions
* [ ] Switch all [breaking_change PR's](https://github.com/qmk/qmk_firmware/pulls?utf8=%E2%9C%93&q=is%3Apr+is%3Aopen+label%3Abreaking_change) to `future`
* [ ] Any that have a ChangeLog entry may be merged immediately.

## 4 Weeks Before Merge

Expand Down
Loading

0 comments on commit 48d4fe3

Please sign in to comment.