diff options
| author | Drashna Jaelre <drashna@live.com> | 2019-04-22 11:55:55 -0700 |
|---|---|---|
| committer | MechMerlin <30334081+mechmerlin@users.noreply.github.com> | 2019-04-22 11:55:55 -0700 |
| commit | a2cec0594b15dc667adf7f1b0e35cb698dc1758d (patch) | |
| tree | fdfd6646aa6bdd9003125406e2dc5e2069f8ea17 /keyboards/orthodox | |
| parent | 6d73fe12779d6e8527d404572810ea95e714dce7 (diff) | |
| download | qmk_firmware-a2cec0594b15dc667adf7f1b0e35cb698dc1758d.tar.gz qmk_firmware-a2cec0594b15dc667adf7f1b0e35cb698dc1758d.zip | |
[Keymap] Update to Drashna Keymaps (#5594)
* Start to standardize macro timer
* Update Fractal layout
Specifically, limit the RGB Lighting, since it's too many for the power, and only have the KITT annimation on the front
* Update Iris keymap to use I2C for transport
* Remove TAP_CODE_DELAY from keyboard in favor of global setting
* Remove Woodpad
Since it\'s no longer in my possession
* Only enable LTO on AVR boards
* Run matrix_scans while doing startup light
* Run matrix_scan to get split keyboard code synced properly
* Fix rgb mode
* Remove custom debouncing settings
* Make RGB Light Startup Animation optional
* Fix opt def
* Remove extra tap code delay value
* Fix references to keebio boards
* Add support for LP Iris keyboard
* Add backlight code
* Make startup animation optional
* Update gitlab ci script
* Remove port declaration
* Revert avrgcc changes to gitlab ci file
* Don't re-set mods
* Remove MACRO_TIMER define
* Add custom name for crkbd
* Add name for Prime M pad
* Add names for ortho 4x12 boards
* Add some additional handling for rgb init
* Change thumb clusters on ergodox
* Switch Orthodox to I2C
* Fix Space in ergodox keymap
* Use OSL for ergodox layout
* Ugh, can't find a good layout
* Fix typo
* Fix up animation startup
* Cries in AVR
* Fix makefiles for ergodox ez boards
* Add support for "secret songs" in my userspace
* Reset debounce to 5ms for Ergodox EZ
* Fix gitlab CI yaml file
* More crying in AVR
* Cannot use rgb light and rgb matrix at the same time due to the WS2812 rgb matrix PR until the "Coexistance" PR is merged
* Update ODox for split common and i2c
* Add split config
* Impement Split code
* Add support for xscorpion OLED code
* Add OLED display config
* Fix OLED screen font
* Get OLED set up in vertical mode
* Remove old OLED code
* add per key support for crkbd
* Fix split changes
* RGB Tweeaks
* More OLED tweaks
* Fix rotation stuff
* Fix more OLED stuff
* Remove custom Debounce from Ergodox layout since it's no longer needed
Diffstat (limited to 'keyboards/orthodox')
| -rw-r--r-- | keyboards/orthodox/keymaps/drashna/config.h | 5 | ||||
| -rw-r--r-- | keyboards/orthodox/keymaps/drashna/keymap.c | 2 | ||||
| -rw-r--r-- | keyboards/orthodox/keymaps/drashna/rules.mk | 4 |
3 files changed, 7 insertions, 4 deletions
diff --git a/keyboards/orthodox/keymaps/drashna/config.h b/keyboards/orthodox/keymaps/drashna/config.h index a2eaf63c3..1f04d5298 100644 --- a/keyboards/orthodox/keymaps/drashna/config.h +++ b/keyboards/orthodox/keymaps/drashna/config.h | |||
| @@ -23,8 +23,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 23 | 23 | ||
| 24 | /* Use I2C or Serial, not both */ | 24 | /* Use I2C or Serial, not both */ |
| 25 | 25 | ||
| 26 | #define USE_SERIAL | 26 | // #define USE_SERIAL |
| 27 | #undef USE_I2C | 27 | #define USE_I2C |
| 28 | 28 | ||
| 29 | /* Select hand configuration */ | 29 | /* Select hand configuration */ |
| 30 | 30 | ||
| @@ -41,6 +41,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 41 | #ifdef RGBLIGHT_ENABLE | 41 | #ifdef RGBLIGHT_ENABLE |
| 42 | #define RGB_DI_PIN D3 | 42 | #define RGB_DI_PIN D3 |
| 43 | #define RGBLED_NUM 16 // Number of LEDs | 43 | #define RGBLED_NUM 16 // Number of LEDs |
| 44 | #define RGBLED_SPLIT { 8, 8 } | ||
| 44 | 45 | ||
| 45 | #define RGBLIGHT_HUE_STEP 12 | 46 | #define RGBLIGHT_HUE_STEP 12 |
| 46 | #define RGBLIGHT_SAT_STEP 12 | 47 | #define RGBLIGHT_SAT_STEP 12 |
diff --git a/keyboards/orthodox/keymaps/drashna/keymap.c b/keyboards/orthodox/keymaps/drashna/keymap.c index 0f23bd9aa..b1d406905 100644 --- a/keyboards/orthodox/keymaps/drashna/keymap.c +++ b/keyboards/orthodox/keymaps/drashna/keymap.c | |||
| @@ -38,7 +38,7 @@ uint8_t last_osm; | |||
| 38 | ) \ | 38 | ) \ |
| 39 | LAYOUT_wrapper( \ | 39 | LAYOUT_wrapper( \ |
| 40 | KC_ESC, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, KC_BSPC, \ | 40 | KC_ESC, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, KC_BSPC, \ |
| 41 | KC_TAB, K11, K12, K13, K14, K15, OS_LALT, OS_LGUI, OS_RALT, OS_RGUI, K16, K17, K18, K19, K1A, KC_QUOT, \ | 41 | KC_TAB, K11, K12, K13, K14, K15, OS_LALT, OS_LGUI, OS_RALT, RAISE, K16, K17, K18, K19, K1A, KC_QUOT, \ |
| 42 | KC_MLSF, CTL_T(K21), K22, K23, K24, K25, LOWER, KC_SPACE,KC_BSPC, KC_DEL, KC_ENT, RAISE, K26, K27, K28, K29, CTL_T(K2A), KC_MRSF \ | 42 | KC_MLSF, CTL_T(K21), K22, K23, K24, K25, LOWER, KC_SPACE,KC_BSPC, KC_DEL, KC_ENT, RAISE, K26, K27, K28, K29, CTL_T(K2A), KC_MRSF \ |
| 43 | ) | 43 | ) |
| 44 | #define LAYOUT_orthodox_base_wrapper(...) LAYOUT_orthodox_base(__VA_ARGS__) | 44 | #define LAYOUT_orthodox_base_wrapper(...) LAYOUT_orthodox_base(__VA_ARGS__) |
diff --git a/keyboards/orthodox/keymaps/drashna/rules.mk b/keyboards/orthodox/keymaps/drashna/rules.mk index a826c664a..fdbfc94c9 100644 --- a/keyboards/orthodox/keymaps/drashna/rules.mk +++ b/keyboards/orthodox/keymaps/drashna/rules.mk | |||
| @@ -5,11 +5,13 @@ CONSOLE_ENABLE = no # Console for debug(+400) | |||
| 5 | COMMAND_ENABLE = no # Commands for debug and configuration | 5 | COMMAND_ENABLE = no # Commands for debug and configuration |
| 6 | TAP_DANCE_ENABLE = no | 6 | TAP_DANCE_ENABLE = no |
| 7 | RGBLIGHT_ENABLE = yes | 7 | RGBLIGHT_ENABLE = yes |
| 8 | AUDIO_ENABLE = yes | 8 | AUDIO_ENABLE = no |
| 9 | NKRO_ENABLE = yes | 9 | NKRO_ENABLE = yes |
| 10 | 10 | ||
| 11 | INDICATOR_LIGHTS = yes | 11 | INDICATOR_LIGHTS = yes |
| 12 | MACROS_ENABLED = no | 12 | MACROS_ENABLED = no |
| 13 | RGBLIGHT_TWINKLE = no | 13 | RGBLIGHT_TWINKLE = no |
| 14 | RGBLIGHT_STARTUP_ANIMATION = yes | ||
| 15 | |||
| 14 | 16 | ||
| 15 | BOOTLOADER = qmk-dfu | 17 | BOOTLOADER = qmk-dfu |
