diff options
| author | Drashna Jaelre <drashna@live.com> | 2018-08-29 10:42:15 -0700 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2018-08-29 13:42:15 -0400 |
| commit | e4bbe057f2620ee24c3a78cb758cdfa7c4bd7abf (patch) | |
| tree | 7bba9941bd9e1058d3105d2df312cb0006e56eba /keyboards/orthodox | |
| parent | 661ca4440cc42f3b60697e98985c44b0571ccfc1 (diff) | |
| download | qmk_firmware-e4bbe057f2620ee24c3a78cb758cdfa7c4bd7abf.tar.gz qmk_firmware-e4bbe057f2620ee24c3a78cb758cdfa7c4bd7abf.zip | |
Yet another update to drashna keymaps and userspace (#3787)
* Make tap function inline
* Use better makefile keyboard detection
* Remove Copy-Paste macro
* Add F11/F12 to Iris
* Minor tweaks to userspace config
* Set audio clicky randomness to 1.5
* Set NO_DEBUG to only be set if console is not enabled
* Move NO_MUSIC_MODE to userspace config.h
* Reduce Ergodox Debounce
* Add Planck Light config
* Use OSM for ortho 4x12
* Music Mode changes for planck light
* Cleanup do to shutdown user and other fixes in Master
* Add and use 'shutdown_user' fzunction
* Remove global NO_MUSIC_MODE define
* Add NO_MUSIC_MODE to individual keymaps
* Change layer colors
* Remove NO_PRINT and NO_DEBUG from userspace config.h
Since these are automatically disabled if the console isn't enabled.
* Remove backlight code if backlight isn't enabled
* Remove Twinkle from Ergodox
* Disable RGB twinkling and enable PSM
* Clean up RGB matrix code
* Clean up planck light indicators
* Clean up tap code
* Rules cleanup for ortho 4x12
* Fix up userspace template
* Revert "Clean up tap code"
This reverts commit 09f64d6d67aa021c3b5ac86a9a739a5ca2b9c1ec.
* Organize includes
* userspace cleanup
* Fix modifier spelling error
* Fix userspace rules
* Disable Permissive Hold again
* Minor clean up
* Fix Tap stuff
* Viterbi Updates for file size
Diffstat (limited to 'keyboards/orthodox')
| -rw-r--r-- | keyboards/orthodox/keymaps/drashna/config.h | 2 | ||||
| -rw-r--r-- | keyboards/orthodox/keymaps/drashna/rules.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/keyboards/orthodox/keymaps/drashna/config.h b/keyboards/orthodox/keymaps/drashna/config.h index d8ff95fcb..2257b62fd 100644 --- a/keyboards/orthodox/keymaps/drashna/config.h +++ b/keyboards/orthodox/keymaps/drashna/config.h | |||
| @@ -58,7 +58,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 58 | #define C6_AUDIO | 58 | #define C6_AUDIO |
| 59 | #ifdef RGBLIGHT_ENABLE | 59 | #ifdef RGBLIGHT_ENABLE |
| 60 | #define NO_MUSIC_MODE | 60 | #define NO_MUSIC_MODE |
| 61 | #endif //RGBLIGHT_ENABLE | 61 | #endif |
| 62 | #endif //AUDIO_ENABLE | 62 | #endif //AUDIO_ENABLE |
| 63 | 63 | ||
| 64 | #undef PRODUCT | 64 | #undef PRODUCT |
diff --git a/keyboards/orthodox/keymaps/drashna/rules.mk b/keyboards/orthodox/keymaps/drashna/rules.mk index f870c3a7d..a826c664a 100644 --- a/keyboards/orthodox/keymaps/drashna/rules.mk +++ b/keyboards/orthodox/keymaps/drashna/rules.mk | |||
| @@ -10,6 +10,6 @@ NKRO_ENABLE = yes | |||
| 10 | 10 | ||
| 11 | INDICATOR_LIGHTS = yes | 11 | INDICATOR_LIGHTS = yes |
| 12 | MACROS_ENABLED = no | 12 | MACROS_ENABLED = no |
| 13 | RGBLIGHT_TWINKLE = yes | 13 | RGBLIGHT_TWINKLE = no |
| 14 | 14 | ||
| 15 | BOOTLOADER = qmk-dfu | 15 | BOOTLOADER = qmk-dfu |