diff options
| author | Joe Wasson <jwasson+github@gmail.com> | 2018-11-21 13:18:18 -0800 |
|---|---|---|
| committer | Drashna Jaelre <drashna@live.com> | 2018-11-21 13:18:18 -0800 |
| commit | 2f34252278280c34b6958066240e38a2ee6a7237 (patch) | |
| tree | 142aed28a654e22da23126cd34c3ce78845cabc3 | |
| parent | 1485098443b66462b67137715a1ba7c589db9150 (diff) | |
| download | qmk_firmware-2f34252278280c34b6958066240e38a2ee6a7237.tar.gz qmk_firmware-2f34252278280c34b6958066240e38a2ee6a7237.zip | |
Keymap: Update keymap to match latest changes to Wilba's firmware. (#4432)
* Fix firmware to work with latest Wilba changes (i.e. dynamic keymap) and M60a.
* Get back RGB Backlight codes.
* More tweaks.
* Update users/talljoe/rules.mk
Co-Authored-By: Talljoe <jwasson+github@gmail.com>
| -rw-r--r-- | keyboards/rama/m60_a/rules.mk | 6 | ||||
| -rw-r--r-- | keyboards/thevankeyboards/minivan/keymaps/talljoe-minivan/config.h (renamed from keyboards/tv44/keymaps/talljoe-minivan/config.h) | 10 | ||||
| -rw-r--r-- | keyboards/thevankeyboards/minivan/keymaps/talljoe-minivan/keymap.c (renamed from keyboards/tv44/keymaps/talljoe-minivan/keymap.c) | 0 | ||||
| -rw-r--r-- | keyboards/thevankeyboards/minivan/keymaps/talljoe-minivan/rules.mk (renamed from keyboards/tv44/keymaps/talljoe-minivan/rules.mk) | 0 | ||||
| -rw-r--r-- | layouts/community/60_ansi_split_bs_rshift/talljoe/config.h | 2 | ||||
| -rw-r--r-- | layouts/community/60_ansi_split_bs_rshift/talljoe/keymap.c | 95 | ||||
| -rw-r--r-- | layouts/community/60_hhkb/talljoe-hhkb/config.h | 3 | ||||
| -rw-r--r-- | layouts/community/tkl_ansi/talljoe-tkl/keymap.c | 90 | ||||
| -rw-r--r-- | users/talljoe/config.h | 4 | ||||
| -rw-r--r-- | users/talljoe/rules.mk | 2 | ||||
| -rw-r--r-- | users/talljoe/talljoe.c | 34 |
11 files changed, 52 insertions, 194 deletions
diff --git a/keyboards/rama/m60_a/rules.mk b/keyboards/rama/m60_a/rules.mk index 7ab1b7d3b..9c1a2d9df 100644 --- a/keyboards/rama/m60_a/rules.mk +++ b/keyboards/rama/m60_a/rules.mk | |||
| @@ -54,7 +54,7 @@ BOOTLOADER = atmel-dfu | |||
| 54 | OPT_DEFS += -DNO_SUSPEND_POWER_DOWN | 54 | OPT_DEFS += -DNO_SUSPEND_POWER_DOWN |
| 55 | 55 | ||
| 56 | # Build Options | 56 | # Build Options |
| 57 | # change to "no" to disable the options, or define them in the Makefile in | 57 | # change to "no" to disable the options, or define them in the Makefile in |
| 58 | # the appropriate keymap folder that will get included automatically | 58 | # the appropriate keymap folder that will get included automatically |
| 59 | # | 59 | # |
| 60 | BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) | 60 | BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) |
| @@ -68,7 +68,7 @@ MIDI_ENABLE = no # MIDI controls | |||
| 68 | AUDIO_ENABLE = no # Audio output on port C6 | 68 | AUDIO_ENABLE = no # Audio output on port C6 |
| 69 | UNICODE_ENABLE = no # Unicode | 69 | UNICODE_ENABLE = no # Unicode |
| 70 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID | 70 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID |
| 71 | RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. | 71 | RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. |
| 72 | 72 | ||
| 73 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE | 73 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE |
| 74 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend | 74 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend |
| @@ -76,3 +76,5 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend | |||
| 76 | RAW_ENABLE = yes | 76 | RAW_ENABLE = yes |
| 77 | DYNAMIC_KEYMAP_ENABLE = yes | 77 | DYNAMIC_KEYMAP_ENABLE = yes |
| 78 | CIE1931_CURVE = yes | 78 | CIE1931_CURVE = yes |
| 79 | |||
| 80 | LAYOUTS = 60_hhkb | ||
diff --git a/keyboards/tv44/keymaps/talljoe-minivan/config.h b/keyboards/thevankeyboards/minivan/keymaps/talljoe-minivan/config.h index fa1f43adc..26d5e207e 100644 --- a/keyboards/tv44/keymaps/talljoe-minivan/config.h +++ b/keyboards/thevankeyboards/minivan/keymaps/talljoe-minivan/config.h | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \ | 11 | K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \ |
| 12 | K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \ | 12 | K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \ |
| 13 | K40, K41, K42, K44, K45, K46, K48, K49, K4B, K4C \ | 13 | K40, K41, K42, K44, K45, K46, K48, K49, K4B, K4C \ |
| 14 | ) KEYMAP_ARROW( \ | 14 | ) LAYOUT_arrow( \ |
| 15 | K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1D, \ | 15 | K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1D, \ |
| 16 | K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \ | 16 | K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \ |
| 17 | K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K0D, \ | 17 | K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K0D, \ |
| @@ -24,7 +24,7 @@ | |||
| 24 | K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \ | 24 | K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \ |
| 25 | K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \ | 25 | K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \ |
| 26 | K40, K41, K42, K44, K45, K46, K48, K49, K4B, K4C \ | 26 | K40, K41, K42, K44, K45, K46, K48, K49, K4B, K4C \ |
| 27 | ) KEYMAP_ARROW( \ | 27 | ) LAYOUT_arrow( \ |
| 28 | K00, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1D, \ | 28 | K00, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1D, \ |
| 29 | K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2C, \ | 29 | K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2C, \ |
| 30 | K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, \ | 30 | K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, \ |
| @@ -37,14 +37,14 @@ | |||
| 37 | K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \ | 37 | K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \ |
| 38 | K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \ | 38 | K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \ |
| 39 | K40, K41, K42, K44, K45, K46, K48, K49, K4B, K4C \ | 39 | K40, K41, K42, K44, K45, K46, K48, K49, K4B, K4C \ |
| 40 | ) KEYMAP_ARROW( \ | 40 | ) LAYOUT_arrow( \ |
| 41 | K00, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K2D, \ | 41 | K00, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K2D, \ |
| 42 | K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2C, \ | 42 | K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2C, \ |
| 43 | K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, \ | 43 | K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, \ |
| 44 | K40, K49, K42, K44, K45, K48, K0B, K0C, K4C \ | 44 | K40, K41, K42, K44, K45, K48, K0B, K0C, K4C \ |
| 45 | ) | 45 | ) |
| 46 | 46 | ||
| 47 | #define TEMPLATE_RESET KEYMAP_ARROW( \ | 47 | #define TEMPLATE_RESET LAYOUT_arrow( \ |
| 48 | RESET, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RESET, \ | 48 | RESET, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RESET, \ |
| 49 | KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \ | 49 | KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \ |
| 50 | KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \ | 50 | KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \ |
diff --git a/keyboards/tv44/keymaps/talljoe-minivan/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/talljoe-minivan/keymap.c index 7812add81..7812add81 100644 --- a/keyboards/tv44/keymaps/talljoe-minivan/keymap.c +++ b/keyboards/thevankeyboards/minivan/keymaps/talljoe-minivan/keymap.c | |||
diff --git a/keyboards/tv44/keymaps/talljoe-minivan/rules.mk b/keyboards/thevankeyboards/minivan/keymaps/talljoe-minivan/rules.mk index a4e40d0ba..a4e40d0ba 100644 --- a/keyboards/tv44/keymaps/talljoe-minivan/rules.mk +++ b/keyboards/thevankeyboards/minivan/keymaps/talljoe-minivan/rules.mk | |||
diff --git a/layouts/community/60_ansi_split_bs_rshift/talljoe/config.h b/layouts/community/60_ansi_split_bs_rshift/talljoe/config.h index bf18fd9f7..65568d3ab 100644 --- a/layouts/community/60_ansi_split_bs_rshift/talljoe/config.h +++ b/layouts/community/60_ansi_split_bs_rshift/talljoe/config.h | |||
| @@ -34,7 +34,7 @@ | |||
| 34 | { K40, K41, K42, {}, {}, {}, {}, K47, {}, {}, K4A, K4B, K4C, K4D } \ | 34 | { K40, K41, K42, {}, {}, {}, {}, K47, {}, {}, K4A, K4B, K4C, K4D } \ |
| 35 | } | 35 | } |
| 36 | 36 | ||
| 37 | #ifdef KEYBOARD_zeal60 | 37 | #if defined (RGB_BACKLIGHT_ZEAL60) || defined (RGB_BACKLIGHT_M60_A) |
| 38 | 38 | ||
| 39 | #define ZEAL_RGB | 39 | #define ZEAL_RGB |
| 40 | 40 | ||
diff --git a/layouts/community/60_ansi_split_bs_rshift/talljoe/keymap.c b/layouts/community/60_ansi_split_bs_rshift/talljoe/keymap.c index cfad9da8a..7812add81 100644 --- a/layouts/community/60_ansi_split_bs_rshift/talljoe/keymap.c +++ b/layouts/community/60_ansi_split_bs_rshift/talljoe/keymap.c | |||
| @@ -1,94 +1 @@ | |||
| 1 | #ifdef KEYBOARD_zeal60 | // This space intentionally left blank | |
| 2 | #include "config.h" | ||
| 3 | #include "zeal60.h" | ||
| 4 | #include "rgb_backlight.h" | ||
| 5 | #include "action_layer.h" | ||
| 6 | #include "solarized.h" | ||
| 7 | #include "talljoe.h" | ||
| 8 | |||
| 9 | // from zeal_backlight.c | ||
| 10 | // we want to be able to set indicators for the spacebar stabs | ||
| 11 | // but they are not represented by a row/index. | ||
| 12 | extern backlight_config g_config; | ||
| 13 | void map_row_column_to_led( uint8_t row, uint8_t column, uint8_t *led ); | ||
| 14 | |||
| 15 | void set_backlight_defaults(void) { | ||
| 16 | uint8_t space; | ||
| 17 | uint8_t caps_lock; | ||
| 18 | map_row_column_to_led(3, 12, &caps_lock); | ||
| 19 | map_row_column_to_led(4, 7, &space); | ||
| 20 | backlight_config default_values = { | ||
| 21 | .use_split_backspace = USE_SPLIT_BACKSPACE, | ||
| 22 | .use_split_left_shift = USE_SPLIT_LEFT_SHIFT, | ||
| 23 | .use_split_right_shift = USE_SPLIT_RIGHT_SHIFT, | ||
| 24 | .use_7u_spacebar = USE_7U_SPACEBAR, | ||
| 25 | .use_iso_enter = USE_ISO_ENTER, | ||
| 26 | .disable_when_usb_suspended = 1, | ||
| 27 | .disable_after_timeout = 0, | ||
| 28 | .brightness = 255, | ||
| 29 | .effect = 10, | ||
| 30 | .color_1 = solarized.base2, | ||
| 31 | .color_2 = solarized.base02, | ||
| 32 | .caps_lock_indicator = { .index = caps_lock, .color = solarized.red }, | ||
| 33 | .layer_1_indicator = { .index = space, .color = solarized.blue }, | ||
| 34 | .layer_2_indicator = { .index = space, .color = solarized.yellow }, | ||
| 35 | .layer_3_indicator = { .index = 254, .color = solarized.red }, | ||
| 36 | .alphas_mods = { | ||
| 37 | RGB_BACKLIGHT_ALPHAS_MODS_ROW_0, | ||
| 38 | RGB_BACKLIGHT_ALPHAS_MODS_ROW_1, | ||
| 39 | RGB_BACKLIGHT_ALPHAS_MODS_ROW_2, | ||
| 40 | RGB_BACKLIGHT_ALPHAS_MODS_ROW_3, | ||
| 41 | RGB_BACKLIGHT_ALPHAS_MODS_ROW_4 } | ||
| 42 | }; | ||
| 43 | memcpy(&g_config, &default_values, sizeof(backlight_config)); | ||
| 44 | backlight_config_save(); | ||
| 45 | |||
| 46 | #undef CUSTOM_RGB_LAYOUTS | ||
| 47 | #ifdef CUSTOM_RGB_LAYOUTS | ||
| 48 | solarized_t* S = &solarized; | ||
| 49 | HSV alphas = S->base2; | ||
| 50 | HSV custom_color_map[MATRIX_ROWS][MATRIX_COLS] = CM( | ||
| 51 | S->red, alphas, alphas, alphas, alphas, alphas, alphas, alphas, alphas, alphas, alphas, alphas, alphas, alphas, S->red, | ||
| 52 | S->orange, alphas, alphas, alphas, alphas, alphas, alphas, alphas, alphas, alphas, alphas, alphas, alphas, S->orange, | ||
| 53 | S->green, alphas, alphas, alphas, alphas, alphas, alphas, alphas, alphas, alphas, alphas, alphas, S->green, | ||
| 54 | S->blue, alphas, alphas, alphas, alphas, alphas, alphas, alphas, alphas, alphas, alphas, S->blue, S->blue, | ||
| 55 | S->violet, S->magenta, S->yellow, alphas, S->yellow, S->magenta, S->violet, S->green | ||
| 56 | ); | ||
| 57 | for (uint8_t row = 0; row < MATRIX_ROWS; ++row) { | ||
| 58 | for (uint8_t col = 0; col < MATRIX_COLS; ++col) { | ||
| 59 | uint8_t index; | ||
| 60 | map_row_column_to_led( row, col, &index ); | ||
| 61 | set_key_color(index, custom_color_map[row][col]); | ||
| 62 | } | ||
| 63 | } | ||
| 64 | #endif // CUSTOM_RGB_LAYOUTS | ||
| 65 | } | ||
| 66 | |||
| 67 | bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { | ||
| 68 | static uint8_t last_effect; | ||
| 69 | switch (keycode) { | ||
| 70 | case DFAULTS: | ||
| 71 | if (IS_PRESSED(record->event)) set_backlight_defaults(); | ||
| 72 | return false; | ||
| 73 | case BL_TOGG: | ||
| 74 | if (IS_PRESSED(record->event)) { | ||
| 75 | if (g_config.effect) { | ||
| 76 | last_effect = g_config.effect; | ||
| 77 | g_config.effect = 0; | ||
| 78 | } else { | ||
| 79 | g_config.effect = last_effect; | ||
| 80 | } | ||
| 81 | } | ||
| 82 | return false; | ||
| 83 | case EFFECT...EFFECT_END: | ||
| 84 | if (IS_PRESSED(record->event)) { | ||
| 85 | uint8_t effect = keycode - EFFECT; | ||
| 86 | g_config.effect = effect; | ||
| 87 | backlight_config_save(); | ||
| 88 | } | ||
| 89 | return false; | ||
| 90 | } | ||
| 91 | |||
| 92 | return true; | ||
| 93 | } | ||
| 94 | #endif | ||
diff --git a/layouts/community/60_hhkb/talljoe-hhkb/config.h b/layouts/community/60_hhkb/talljoe-hhkb/config.h index 9e907feeb..54756a940 100644 --- a/layouts/community/60_hhkb/talljoe-hhkb/config.h +++ b/layouts/community/60_hhkb/talljoe-hhkb/config.h | |||
| @@ -19,4 +19,7 @@ | |||
| 19 | K41, K42, K45, K48, K4C \ | 19 | K41, K42, K45, K48, K4C \ |
| 20 | ) | 20 | ) |
| 21 | 21 | ||
| 22 | #ifdef RGB_BACKLIGHT_M60_A | ||
| 23 | #define ZEAL_RGB | ||
| 24 | #endif | ||
| 22 | #endif //CONFIG_USER_H | 25 | #endif //CONFIG_USER_H |
diff --git a/layouts/community/tkl_ansi/talljoe-tkl/keymap.c b/layouts/community/tkl_ansi/talljoe-tkl/keymap.c index b5dc54492..7812add81 100644 --- a/layouts/community/tkl_ansi/talljoe-tkl/keymap.c +++ b/layouts/community/tkl_ansi/talljoe-tkl/keymap.c | |||
| @@ -1,89 +1 @@ | |||
| 1 | #ifdef KEYBOARD_zeal60 | // This space intentionally left blank | |
| 2 | #include "config.h" | ||
| 3 | #include "zeal60.h" | ||
| 4 | #include "zeal_backlight.h" | ||
| 5 | #include "action_layer.h" | ||
| 6 | #include "solarized.h" | ||
| 7 | #include "talljoe.h" | ||
| 8 | |||
| 9 | // from zeal_backlight.c | ||
| 10 | // we want to be able to set indicators for the spacebar stabs | ||
| 11 | // but they are not represented by a row/index. | ||
| 12 | extern zeal_backlight_config g_config; | ||
| 13 | void map_row_column_to_led( uint8_t row, uint8_t column, uint8_t *led ); | ||
| 14 | |||
| 15 | void set_backlight_defaults(void) { | ||
| 16 | uint8_t space; | ||
| 17 | uint8_t caps_lock; | ||
| 18 | map_row_column_to_led(3, 12, &caps_lock); | ||
| 19 | map_row_column_to_led(4, 7, &space); | ||
| 20 | zeal_backlight_config default_values = { | ||
| 21 | .use_split_backspace = USE_SPLIT_BACKSPACE, | ||
| 22 | .use_split_left_shift = USE_SPLIT_LEFT_SHIFT, | ||
| 23 | .use_split_right_shift = USE_SPLIT_RIGHT_SHIFT, | ||
| 24 | .use_7u_spacebar = USE_7U_SPACEBAR, | ||
| 25 | .use_iso_enter = USE_ISO_ENTER, | ||
| 26 | .disable_when_usb_suspended = 1, | ||
| 27 | .disable_after_timeout = 0, | ||
| 28 | .brightness = 255, | ||
| 29 | .effect = 10, | ||
| 30 | .color_1 = solarized.base2, | ||
| 31 | .color_2 = solarized.base02, | ||
| 32 | .caps_lock_indicator = { .index = caps_lock, .color = solarized.red }, | ||
| 33 | .layer_1_indicator = { .index = space, .color = solarized.blue }, | ||
| 34 | .layer_2_indicator = { .index = space, .color = solarized.yellow }, | ||
| 35 | .layer_3_indicator = { .index = 254, .color = solarized.red }, | ||
| 36 | .alphas_mods = { | ||
| 37 | BACKLIGHT_ALPHAS_MODS_ROW_0, | ||
| 38 | BACKLIGHT_ALPHAS_MODS_ROW_1, | ||
| 39 | BACKLIGHT_ALPHAS_MODS_ROW_2, | ||
| 40 | BACKLIGHT_ALPHAS_MODS_ROW_3, | ||
| 41 | BACKLIGHT_ALPHAS_MODS_ROW_4 } | ||
| 42 | }; | ||
| 43 | memcpy(&g_config, &default_values, sizeof(zeal_backlight_config)); | ||
| 44 | backlight_config_save(); | ||
| 45 | |||
| 46 | solarized_t* S = &solarized; | ||
| 47 | HSV alphas = S->base2; | ||
| 48 | HSV custom_color_map[MATRIX_ROWS][MATRIX_COLS] = CM( | ||
| 49 | S->red, alphas, alphas, alphas, alphas, alphas, alphas, alphas, alphas, alphas, alphas, alphas, alphas, alphas, S->red, | ||
| 50 | S->orange, alphas, alphas, alphas, alphas, alphas, alphas, alphas, alphas, alphas, alphas, alphas, alphas, S->orange, | ||
| 51 | S->green, alphas, alphas, alphas, alphas, alphas, alphas, alphas, alphas, alphas, alphas, alphas, S->green, | ||
| 52 | S->blue, alphas, alphas, alphas, alphas, alphas, alphas, alphas, alphas, alphas, alphas, S->blue, S->blue, | ||
| 53 | S->violet, S->magenta, S->yellow, alphas, S->yellow, S->magenta, S->violet, S->green | ||
| 54 | ); | ||
| 55 | for (uint8_t row = 0; row < MATRIX_ROWS; ++row) { | ||
| 56 | for (uint8_t col = 0; col < MATRIX_COLS; ++col) { | ||
| 57 | backlight_set_key_color(row, col, custom_color_map[row][col]); | ||
| 58 | } | ||
| 59 | } | ||
| 60 | } | ||
| 61 | |||
| 62 | bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { | ||
| 63 | static uint8_t last_effect; | ||
| 64 | switch (keycode) { | ||
| 65 | case DFAULTS: | ||
| 66 | if (IS_PRESSED(record->event)) set_backlight_defaults(); | ||
| 67 | return false; | ||
| 68 | case BL_TOGG: | ||
| 69 | if (IS_PRESSED(record->event)) { | ||
| 70 | if (g_config.effect) { | ||
| 71 | last_effect = g_config.effect; | ||
| 72 | g_config.effect = 0; | ||
| 73 | } else { | ||
| 74 | g_config.effect = last_effect; | ||
| 75 | } | ||
| 76 | } | ||
| 77 | return false; | ||
| 78 | case EFFECT...EFFECT_END: | ||
| 79 | if (IS_PRESSED(record->event)) { | ||
| 80 | uint8_t effect = keycode - EFFECT; | ||
| 81 | g_config.effect = effect; | ||
| 82 | backlight_config_save(); | ||
| 83 | } | ||
| 84 | return false; | ||
| 85 | } | ||
| 86 | |||
| 87 | return true; | ||
| 88 | } | ||
| 89 | #endif | ||
diff --git a/users/talljoe/config.h b/users/talljoe/config.h index 0d06a0b12..33374014d 100644 --- a/users/talljoe/config.h +++ b/users/talljoe/config.h | |||
| @@ -5,4 +5,8 @@ | |||
| 5 | 5 | ||
| 6 | #define RESET_LAYER 15 | 6 | #define RESET_LAYER 15 |
| 7 | 7 | ||
| 8 | #define BOOTMAGIC_KEY_SALT KC_ESC | ||
| 9 | #define BOOTMAGIC_KEY_SKIP KC_I | ||
| 10 | #define BOOTMAGIC_KEY_EEPROM_CLEAR KC_E | ||
| 11 | |||
| 8 | #endif // !USERSPACE_CONFIG_H | 12 | #endif // !USERSPACE_CONFIG_H |
diff --git a/users/talljoe/rules.mk b/users/talljoe/rules.mk index 0f1f6f26a..e0a71561f 100644 --- a/users/talljoe/rules.mk +++ b/users/talljoe/rules.mk | |||
| @@ -5,3 +5,5 @@ EXTRAFLAGS+=-flto | |||
| 5 | TAP_DANCE_ENABLE=yes | 5 | TAP_DANCE_ENABLE=yes |
| 6 | CONSOLE_ENABLE=no | 6 | CONSOLE_ENABLE=no |
| 7 | COMMAND_ENABLE=no | 7 | COMMAND_ENABLE=no |
| 8 | DYNAMIC_KEYMAP_ENABLE=no | ||
| 9 | BOOTMAGIC_ENABLE=full | ||
diff --git a/users/talljoe/talljoe.c b/users/talljoe/talljoe.c index 7a343e776..e72dc6c3e 100644 --- a/users/talljoe/talljoe.c +++ b/users/talljoe/talljoe.c | |||
| @@ -1,13 +1,16 @@ | |||
| 1 | #include QMK_KEYBOARD_H | 1 | #include QMK_KEYBOARD_H |
| 2 | 2 | ||
| 3 | #include "talljoe.h" | 3 | #include "talljoe.h" |
| 4 | #ifdef ZEAL_RGB | ||
| 5 | #include "../../../keyboards/zeal60/rgb_backlight.h" | ||
| 6 | #endif | ||
| 4 | 7 | ||
| 5 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 8 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 6 | [_BASE] = TEMPLATE_TKL( | 9 | [_BASE] = TEMPLATE_TKL( |
| 7 | KC_ESC, KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10 , KC_F11 , KC_F12 , KC_PSCR, KC_SLCK, MO_ADJ , | 10 | KC_ESC, KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10 , KC_F11 , KC_F12 , KC_PSCR, KC_SLCK, MO_ADJ , |
| 8 | US_GRV , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_MINS, KC_EQL , US_BSLS, KC_INS , KC_HOME, KC_PGUP, | 11 | US_GRV , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_MINS, KC_EQL , US_BSLS, KC_INS , KC_HOME, KC_PGUP, |
| 9 | US_TAB , KC_Q, KC_W, KC_E, KC_R, KC_T , KC_Y, KC_U, KC_I, KC_O, KC_P , KC_LBRC, KC_RBRC, KC_BSPC, KC_DEL , KC_END , KC_PGDN, | 12 | US_TAB , KC_Q, KC_W, KC_E, KC_R, KC_T , KC_Y, KC_U, KC_I, KC_O, KC_P , KC_LBRC, KC_RBRC, KC_BSPC, KC_DEL , KC_END , KC_PGDN, |
| 10 | CTL_ESC, KC_A, KC_S, KC_D, KC_F, KC_G , KC_H, KC_J, KC_K, KC_L, US_SCLN, US_QUOT, US_ENT , | 13 | CTL_ESC, KC_A, KC_S, KC_D, KC_F, KC_G , KC_H, KC_J, KC_K, KC_L, US_SCLN, KC_QUOT, US_ENT , |
| 11 | SH_LBRC, KC_Z, KC_X, KC_C, KC_V, KC_B , KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SH_RBRC, KC_UP , | 14 | SH_LBRC, KC_Z, KC_X, KC_C, KC_V, KC_B , KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SH_RBRC, KC_UP , |
| 12 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC2, KC_SPC1, KC_SPC3, KC_RALT, KC_RGUI, KC_RCTL, KC_PTT , KC_LEFT, KC_DOWN, KC_RGHT), | 15 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC2, KC_SPC1, KC_SPC3, KC_RALT, KC_RGUI, KC_RCTL, KC_PTT , KC_LEFT, KC_DOWN, KC_RGHT), |
| 13 | [_WORKMAN] = TEMPLATE( | 16 | [_WORKMAN] = TEMPLATE( |
| @@ -52,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 52 | KC_LCTL, KC_PTT , KC_PGDN, KC_SPC , KC_SPC , KC_SPC , KC_RALT, KC_APP , KC_RCTL, KC_PTT ), | 55 | KC_LCTL, KC_PTT , KC_PGDN, KC_SPC , KC_SPC , KC_SPC , KC_RALT, KC_APP , KC_RCTL, KC_PTT ), |
| 53 | #endif | 56 | #endif |
| 54 | [_NAV] = TEMPLATE_NAV( | 57 | [_NAV] = TEMPLATE_NAV( |
| 55 | KC_GRV , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, | 58 | KC_GRV , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10 , KC_F11 , KC_F12 , XXXXXXX, XXXXXXX, |
| 56 | US_TAB , KC_EXLM, KC_AT , KC_HASH, KC_DLR , KC_PERC, KC_INS , KC_PGUP, KC_UP , KC_PGDN, KC_BTN1, KC_BTN3, KC_BTN2, KC_DEL , | 59 | US_TAB , KC_EXLM, KC_AT , KC_HASH, KC_DLR , KC_PERC, KC_INS , KC_PGUP, KC_UP , KC_PGDN, KC_BTN1, KC_BTN3, KC_BTN2, KC_DEL , |
| 57 | CTL_ESC, KC_LCBR, KC_RCBR, KC_LPRN, KC_RPRN, KC_AMPR, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END , US_QUOT, TG_ADJ , | 60 | CTL_ESC, KC_LCBR, KC_RCBR, KC_LPRN, KC_RPRN, KC_AMPR, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END , US_QUOT, TG_ADJ , |
| 58 | KC_LSFT, KC_EQL, KC_PLUS, KC_MINS, KC_UNDS, KC_ASTR, KC_CALC, US_GRV , KC_WBAK, KC_WFWD, KC_WREF, KC_RSFT, KC_APP , | 61 | KC_LSFT, KC_EQL, KC_PLUS, KC_MINS, KC_UNDS, KC_ASTR, KC_CALC, US_GRV , KC_WBAK, KC_WFWD, KC_WREF, KC_RSFT, KC_APP , |
| @@ -65,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 65 | KC_LCTL, KC_LGUI, KC_LALT, NM_SPC2, NM_SPC1, NM_SPC3, KC_PDOT, KC_PCMM, KC_RCTL, KC_PTT ), | 68 | KC_LCTL, KC_LGUI, KC_LALT, NM_SPC2, NM_SPC1, NM_SPC3, KC_PDOT, KC_PCMM, KC_RCTL, KC_PTT ), |
| 66 | // Adjust layer is on the split-shift key; or NAV+Enter (for non-split keyboards) | 69 | // Adjust layer is on the split-shift key; or NAV+Enter (for non-split keyboards) |
| 67 | [_ADJUST] = TEMPLATE_ADJUST( | 70 | [_ADJUST] = TEMPLATE_ADJUST( |
| 68 | MO_RST , FX(1) , FX(2) , FX(3) , FX(4) , FX(5) , FX(8) , FX(9) , FX(10) , FX(20) , FX(0) , BR_DEC , BR_INC , XXXXXXX, MO_RST , | 71 | MO_RST , FX(1) , FX(2) , FX(3) , FX(4) , FX(5) , FX(6) , FX(7) , FX(8) , FX(9) , FX(10) , BR_DEC , BR_INC , XXXXXXX, MO_RST , |
| 69 | MO_RST , H1_INC , S1_INC , H2_INC , S2_INC , EF_INC , RGB_HUI, RGB_SAI, RGB_MOD, RGB_M_P, DFAULTS, RGB_VAD, RGB_VAI, MO_RST , | 72 | MO_RST , H1_INC , S1_INC , H2_INC , S2_INC , EF_INC , RGB_HUI, RGB_SAI, RGB_MOD, RGB_M_P, DFAULTS, RGB_VAD, RGB_VAI, MO_RST , |
| 70 | XXXXXXX, H1_DEC , S1_DEC , H2_DEC , S2_DEC , EF_DEC , RGB_HUD, RGB_SAD, RGB_RMOD,RGB_M_K, RGB_M_B, RGB_M_G, TG_ADJ , | 73 | XXXXXXX, H1_DEC , S1_DEC , H2_DEC , S2_DEC , EF_DEC , RGB_HUD, RGB_SAD, RGB_RMOD,RGB_M_K, RGB_M_B, RGB_M_G, TG_ADJ , |
| 71 | TG_NKRO, LY_QWER, LY_WORK, LY_NRMN, LY_DVRK, LY_CLMK, XXXXXXX, LY_MALT, XXXXXXX, XXXXXXX, KC_MAKE, KC_CAPS, XXXXXXX, | 74 | TG_NKRO, LY_QWER, LY_WORK, LY_NRMN, LY_DVRK, LY_CLMK, XXXXXXX, LY_MALT, XXXXXXX, XXXXXXX, KC_MAKE, KC_CAPS, XXXXXXX, |
| @@ -101,7 +104,11 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { | |||
| 101 | return true; | 104 | return true; |
| 102 | } | 105 | } |
| 103 | 106 | ||
| 107 | #ifdef ZEAL_RGB | ||
| 108 | extern backlight_config g_config; | ||
| 109 | #endif | ||
| 104 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { | 110 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { |
| 111 | static uint8_t last_effect; | ||
| 105 | 112 | ||
| 106 | #ifdef RGBLIGHT_ENABLE | 113 | #ifdef RGBLIGHT_ENABLE |
| 107 | static uint32_t savedRgbMode; | 114 | static uint32_t savedRgbMode; |
| @@ -144,6 +151,27 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 144 | } | 151 | } |
| 145 | return false; | 152 | return false; |
| 146 | break; | 153 | break; |
| 154 | #ifdef ZEAL_RGB | ||
| 155 | case BL_TOGG: | ||
| 156 | if (IS_PRESSED(record->event)) { | ||
| 157 | if (g_config.effect) { | ||
| 158 | last_effect = g_config.effect; | ||
| 159 | g_config.effect = 0; | ||
| 160 | } else { | ||
| 161 | g_config.effect = last_effect; | ||
| 162 | } | ||
| 163 | } | ||
| 164 | return false; | ||
| 165 | case EFFECT...EFFECT_END: | ||
| 166 | if (IS_PRESSED(record->event)) { | ||
| 167 | uint8_t effect = keycode - EFFECT; | ||
| 168 | if(effect == g_config.effect) | ||
| 169 | effect = 0; // Toggle effect on second press | ||
| 170 | g_config.effect = effect; | ||
| 171 | backlight_config_save(); | ||
| 172 | } | ||
| 173 | return false; | ||
| 174 | #endif | ||
| 147 | } | 175 | } |
| 148 | return process_record_keymap(keycode, record); | 176 | return process_record_keymap(keycode, record); |
| 149 | } | 177 | } |
