summaryrefslogtreecommitdiffstats
path: root/layouts/community/ergodox
diff options
context:
space:
mode:
authorDrashna Jaelre <drashna@live.com>2019-05-06 22:34:09 -0700
committerMechMerlin <30334081+mechmerlin@users.noreply.github.com>2019-05-06 22:34:09 -0700
commitf3d5b1091d364468cd9f5510aef9e723d8542279 (patch)
tree762b8f562b1e96e42657f872fd4b04c8efaaa829 /layouts/community/ergodox
parent7a751f114114bf3b78d5d8fc8bedf2b42b665dba (diff)
[Keymap] RGB Changes for Drashna Keyboards (#5803)
* Disable a bunch of reactive modes * Enable rgb matrix for Corne Keyboard * Convert CRKBD to rgb matrix * Add Gergo keyboard layout * Make Diablo 3 tap dance better * Add basic support for Planck EZ * Fix RGB Matrix stuff * Fix keycodes for Planck EZ * Update CRKBD OLED stuff * Fix typo for sleep on ergodox glow * Improve my gergo layout * Scrolling OLED key logger! * Change gergo layout * Hnadle unicode keycodes if unicode is disabled * Disable COMMAND/CONSOLE for gergo * Fix right side control * Re-enable LTO for all platforms Since I got updated arm gcc binaries that no longer error out on lto * Update formatting to match newer community standards Poor 2 space * Re-alight startup animation to use new HUE range * Streamline gitlab ci scripts * Disabled Space Cadet * Add support for breathing table * Enable new LTO Option And clean up defines that will now be repeatitive * Remove vscode settings * Additional formatting cleanup of config.h files
Diffstat (limited to 'layouts/community/ergodox')
-rw-r--r--layouts/community/ergodox/drashna/config.h9
-rw-r--r--layouts/community/ergodox/drashna/keymap.c300
-rw-r--r--layouts/community/ergodox/drashna/rules.mk23
-rw-r--r--layouts/community/ergodox/drashna_glow/config.h15
4 files changed, 171 insertions, 176 deletions
diff --git a/layouts/community/ergodox/drashna/config.h b/layouts/community/ergodox/drashna/config.h
index 7b2ad4fa1c..7feaf6f252 100644
--- a/layouts/community/ergodox/drashna/config.h
+++ b/layouts/community/ergodox/drashna/config.h
@@ -1,12 +1,11 @@
#pragma once
#ifdef RGBLIGHT_ENABLE
-#undef RGBLIGHT_SAT_STEP
-#define RGBLIGHT_SAT_STEP 12
+# undef RGBLIGHT_SAT_STEP
+# define RGBLIGHT_SAT_STEP 12
-#define RGBLIGHT_EFFECT_KNIGHT_LENGTH 3
-#define RGBLIGHT_EFFECT_SNAKE_LENGTH 3
-#define RGBLIGHT_EFFECT_BREATHE_CENTER 1
+# define RGBLIGHT_EFFECT_KNIGHT_LENGTH 3
+# define RGBLIGHT_EFFECT_SNAKE_LENGTH 3
#endif // RGBLIGHT_ENABLE
diff --git a/layouts/community/ergodox/drashna/keymap.c b/layouts/community/ergodox/drashna/keymap.c
index 26c2e33040..eeb21501ba 100644
--- a/layouts/community/ergodox/drashna/keymap.c
+++ b/layouts/community/ergodox/drashna/keymap.c
@@ -20,6 +20,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifdef UNICODEMAP_ENABLE
#include "drashna_unicode.h"
#endif // UNICODEMAP_ENABLE
+#ifndef UNICODE_ENABLE
+# define UC(x) KC_NO
+#endif
#ifdef RGB_MATRIX_ENABLE
extern bool g_suspend_state;
@@ -28,7 +31,7 @@ extern rgb_config_t rgb_matrix_config;
extern userspace_config_t userspace_config;
enum more_custom_keycodes {
- KC_SWAP_NUM = NEW_SAFE_RANGE
+ KC_SWAP_NUM = NEW_SAFE_RANGE
};
//define layer change stuff for underglow indicator
@@ -43,7 +46,7 @@ bool skip_leds = false;
KC_ESC, ________________NUMBER_LEFT________________, UC_FLIP, UC_TABL, ________________NUMBER_RIGHT_______________, KC_MINS, \
KC_TAB, K01, K02, K03, K04, K05, TG(_DIABLO), TG(_DIABLO), K06, K07, K08, K09, K0A, KC_BSLS, \
KC_C1R3, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, KC_QUOT, \
- KC_MLSF, CTL_T(K21), K22, K23, K24, K25, TG(_GAMEPAD), TG(_GAMEPAD), K26, K27, K28, K29, CTL_T(K2A), KC_MRSF, \
+ KC_MLSF, CTL_T(K21), K22, K23, K24, K25, TG(_GAMEPAD), TG(_GAMEPAD), K26, K27, K28, K29, RCTL_T(K2A), KC_MRSF, \
KC_GRV, OS_MEH, OS_HYPR, KC_LBRC, KC_RBRC, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, UC(0x2E2E), \
OS_LALT, OS_LGUI, OS_RGUI, CTL_T(KC_ESCAPE), \
KC_APP, KC_MENU, \
@@ -305,87 +308,88 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
- switch (keycode) {
- case KC_1:
- if (IS_LAYER_ON(_GAMEPAD) && userspace_config.swapped_numbers) {
- if (record->event.pressed) {
- register_code(KC_2);
- } else {
- unregister_code(KC_2);
- }
- return false;
- }
- break;
- case KC_2:
- if (IS_LAYER_ON(_GAMEPAD) && userspace_config.swapped_numbers) {
- if (record->event.pressed) {
- register_code(KC_1);
- } else {
- unregister_code(KC_1);
- }
- return false;
- }
- break;
- case KC_SWAP_NUM:
- if (record->event.pressed) {
- userspace_config.swapped_numbers ^= 1;
- eeconfig_update_user(userspace_config.raw);
- }
- }
- //switch (keycode) {
- // case KC_P00:
- // if (!record->event.pressed) {
- // register_code(KC_KP_0);
- // unregister_code(KC_KP_0);
- // register_code(KC_KP_0);
- // unregister_code(KC_KP_0);
- // }
- // return false;
- // break;
- //}
- return true;
+ switch (keycode) {
+ case KC_1:
+ if (IS_LAYER_ON(_GAMEPAD) && userspace_config.swapped_numbers) {
+ if (record->event.pressed) {
+ register_code(KC_2);
+ } else {
+ unregister_code(KC_2);
+ }
+ return false;
+ }
+ break;
+ case KC_2:
+ if (IS_LAYER_ON(_GAMEPAD) && userspace_config.swapped_numbers) {
+ if (record->event.pressed) {
+ register_code(KC_1);
+ } else {
+ unregister_code(KC_1);
+ }
+ return false;
+ }
+ break;
+ case KC_SWAP_NUM:
+ if (record->event.pressed) {
+ userspace_config.swapped_numbers ^= 1;
+ eeconfig_update_user(userspace_config.raw);
+ }
+ break;
+ }
+ //switch (keycode) {
+ // case KC_P00:
+ // if (!record->event.pressed) {
+ // register_code(KC_KP_0);
+ // unregister_code(KC_KP_0);
+ // register_code(KC_KP_0);
+ // unregister_code(KC_KP_0);
+ // }
+ // return false;
+ // break;
+ //}
+ return true;
}
void matrix_scan_keymap(void) { // runs frequently to update info
- uint8_t modifiers = get_mods();
- uint8_t led_usb_state = host_keyboard_leds();
- uint8_t one_shot = get_oneshot_mods();
-
- if (!skip_leds) {
- ergodox_board_led_off();
- ergodox_right_led_1_off();
- ergodox_right_led_2_off();
- ergodox_right_led_3_off();
-
- // Since we're not using the LEDs here for layer indication anymore,
- // then lets use them for modifier indicators. Shame we don't have 4...
- // Also, no "else", since we want to know each, independently.
- if ( ( modifiers | one_shot ) & MOD_MASK_SHIFT || led_usb_state & (1<<USB_LED_CAPS_LOCK) ) {
- ergodox_right_led_2_on();
- ergodox_right_led_2_set( 50 );
- }
- if ( ( modifiers | one_shot ) & MOD_MASK_CTRL) {
- ergodox_right_led_1_on();
- ergodox_right_led_1_set( 10 );
- }
- if ( ( modifiers | one_shot ) & MOD_MASK_ALT) {
- ergodox_right_led_3_on();
- ergodox_right_led_3_set( 10 );
- }
+ uint8_t modifiers = get_mods();
+ uint8_t led_usb_state = host_keyboard_leds();
+ uint8_t one_shot = get_oneshot_mods();
+
+ if (!skip_leds) {
+ ergodox_board_led_off();
+ ergodox_right_led_1_off();
+ ergodox_right_led_2_off();
+ ergodox_right_led_3_off();
+
+ // Since we're not using the LEDs here for layer indication anymore,
+ // then lets use them for modifier indicators. Shame we don't have 4...
+ // Also, no "else", since we want to know each, independently.
+ if ( ( modifiers | one_shot ) & MOD_MASK_SHIFT || led_usb_state & (1<<USB_LED_CAPS_LOCK) ) {
+ ergodox_right_led_2_on();
+ ergodox_right_led_2_set( 50 );
+ }
+ if ( ( modifiers | one_shot ) & MOD_MASK_CTRL) {
+ ergodox_right_led_1_on();
+ ergodox_right_led_1_set( 10 );
+ }
+ if ( ( modifiers | one_shot ) & MOD_MASK_ALT) {
+ ergodox_right_led_3_on();
+ ergodox_right_led_3_set( 10 );
+ }
- }
+ }
-};
+}
bool indicator_is_this_led_used_keyboard(uint8_t index) {
- switch (index) {
- case 13 ... 14:
- return true;
- break;
- default:
- return false;
- }
+ switch (index) {
+ case 13 ... 14:
+ return true;
+ break;
+ default:
+ return false;
+ }
}
@@ -393,101 +397,81 @@ bool indicator_is_this_led_used_keyboard(uint8_t index) {
void suspend_power_down_keymap(void) {
rgb_matrix_set_suspend_state(true);
- rgb_matrix_config.enable = false;
}
void suspend_wakeup_init_keymap(void) {
- rgb_matrix_config.enable = true;
rgb_matrix_set_suspend_state(false);
}
void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue) {
- rgb_led led;
- for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
- led = g_rgb_leds[i];
- if (HAS_FLAGS(led.flags, LED_FLAG_MODIFIER)) {
- rgb_matrix_set_color( i, red, green, blue );
+ rgb_led led;
+ for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
+ led = g_rgb_leds[i];
+ if (HAS_FLAGS(led.flags, LED_FLAG_MODIFIER)) {
+ rgb_matrix_set_color( i, red, green, blue );
+ }
}
- }
}
void rgb_matrix_indicators_user(void) {
- if (g_suspend_state || !rgb_matrix_config.enable || !userspace_config.rgb_layer_change) { return; }
-
- switch (biton32(layer_state)) {
- case _MODS:
- rgb_matrix_layer_helper(0xFF, 0xFF, 0x00); break;
- case _GAMEPAD:
- rgb_matrix_layer_helper(0xFF, 0x80, 0x00);
- rgb_matrix_set_color(32, 0x00, 0xFF, 0x00); // Q
- rgb_matrix_set_color(31, 0x00, 0xFF, 0xFF); // W
- rgb_matrix_set_color(30, 0xFF, 0x00, 0x00); // E
- rgb_matrix_set_color(29, 0xFF, 0x80, 0x00); // R
- rgb_matrix_set_color(37, 0x00, 0xFF, 0xFF); // A
- rgb_matrix_set_color(36, 0x00, 0xFF, 0xFF); // S
- rgb_matrix_set_color(35, 0x00, 0xFF, 0xFF); // D
- rgb_matrix_set_color(34, 0x7A, 0x00, 0xFF); // F
-
- rgb_matrix_set_color(27, 0xFF, 0xFF, 0xFF); // 1
- rgb_matrix_set_color(26, 0x00, 0xFF, 0x00); // 2
- rgb_matrix_set_color(25, 0x7A, 0x00, 0xFF); // 3
-
- break;
- case _DIABLO:
- rgb_matrix_layer_helper(0xFF, 0x00, 0x00); break;
- case _RAISE:
- rgb_matrix_layer_helper(0xFF, 0xFF, 0x00); break;
- case _LOWER:
- rgb_matrix_layer_helper(0x00, 0xFF, 0x00); break;
- case _ADJUST:
- rgb_matrix_layer_helper(0xFF, 0x00, 0x00); break;
- default:
- switch (biton32(default_layer_state)) {
- case _QWERTY:
- rgb_matrix_layer_helper(0x00, 0xFF, 0xFF); break;
- case _COLEMAK:
- rgb_matrix_layer_helper(0xFF, 0x00, 0xFF); break;
- case _DVORAK:
- rgb_matrix_layer_helper(0x00, 0xFF, 0x00); break;
- case _WORKMAN:
- rgb_matrix_layer_helper(0xD9, 0xA5, 0x21); break;
- case _NORMAN:
- rgb_matrix_layer_helper(0xFF, 0x7C, 0x4D); break;
- case _MALTRON:
- rgb_matrix_layer_helper(0xFF, 0xFF, 0x00); break;
- case _EUCALYN:
- rgb_matrix_layer_helper(0xFF, 0x80, 0xBF); break;
- case _CARPLAX:
- rgb_matrix_layer_helper(0x00, 0x00, 0xFF); break;
- }
- }
-#if 0
- if (this_mod & MOD_MASK_SHIFT || this_led & (1<<USB_LED_CAPS_LOCK) || this_osm & MOD_MASK_SHIFT) {
- rgb_matrix_set_color(24, 0x00, 0xFF, 0x00);
- rgb_matrix_set_color(36, 0x00, 0xFF, 0x00);
- }
- if (this_mod & MOD_MASK_CTRL || this_osm & MOD_MASK_CTRL) {
- rgb_matrix_set_color(25, 0xFF, 0x00, 0x00);
- rgb_matrix_set_color(34, 0xFF, 0x00, 0x00);
- rgb_matrix_set_color(37, 0xFF, 0x00, 0x00);
-
- }
- if (this_mod & MOD_MASK_GUI || this_osm & MOD_MASK_GUI) {
- rgb_matrix_set_color(39, 0xFF, 0xD9, 0x00);
- }
- if (this_mod & MOD_MASK_ALT || this_osm & MOD_MASK_ALT) {
- rgb_matrix_set_color(38, 0x00, 0x00, 0xFF);
- }
+ if ( userspace_config.rgb_layer_change &&
+#ifdef RGB_DISABLE_WHEN_USB_SUSPENDED
+ !g_suspend_state &&
#endif
-}
-
-void matrix_init_keymap(void) {
-#if 0
- #ifdef RGB_MATRIX_KEYPRESSES
- rgblight_mode(RGB_MATRIX_MULTISPLASH);
- #else
- rgblight_mode(RGB_MATRIX_RAINBOW_MOVING_CHEVRON);
- #endif
+#if defined(RGBLIGHT_ENABLE)
+ (!rgblight_config.enable && rgb_matrix_config.enable)
+#else
+ rgb_matrix_config.enable
#endif
+ ) {
+ switch (biton32(layer_state)) {
+ case _MODS:
+ rgb_matrix_layer_helper(0xFF, 0xFF, 0x00); break;
+ case _GAMEPAD:
+ rgb_matrix_layer_helper(0xFF, 0x80, 0x00);
+ rgb_matrix_set_color(32, 0x00, 0xFF, 0x00); // Q
+ rgb_matrix_set_color(31, 0x00, 0xFF, 0xFF); // W
+ rgb_matrix_set_color(30, 0xFF, 0x00, 0x00); // E
+ rgb_matrix_set_color(29, 0xFF, 0x80, 0x00); // R
+ rgb_matrix_set_color(37, 0x00, 0xFF, 0xFF); // A
+ rgb_matrix_set_color(36, 0x00, 0xFF, 0xFF); // S
+ rgb_matrix_set_color(35, 0x00, 0xFF, 0xFF); // D
+ rgb_matrix_set_color(34, 0x7A, 0x00, 0xFF); // F
+
+ rgb_matrix_set_color(27, 0xFF, 0xFF, 0xFF); // 1
+ rgb_matrix_set_color(26, 0x00, 0xFF, 0x00); // 2
+ rgb_matrix_set_color(25, 0x7A, 0x00, 0xFF); // 3
+
+ break;
+ case _DIABLO:
+ rgb_matrix_layer_helper(0xFF, 0x00, 0x00); break;
+ case _RAISE:
+ rgb_matrix_layer_helper(0xFF, 0xFF, 0x00); break;
+ case _LOWER:
+ rgb_matrix_layer_helper(0x00, 0xFF, 0x00); break;
+ case _ADJUST:
+ rgb_matrix_layer_helper(0xFF, 0x00, 0x00); break;
+ default:
+ switch (biton32(default_layer_state)) {
+ case _QWERTY:
+ rgb_matrix_layer_helper(0x00, 0xFF, 0xFF); break;
+ case _COLEMAK:
+ rgb_matrix_layer_helper(0xFF, 0x00, 0xFF); break;
+ case _DVORAK:
+ rgb_matrix_layer_helper(0x00, 0xFF, 0x00); break;
+ case _WORKMAN:
+ rgb_matrix_layer_helper(0xD9, 0xA5, 0x21); break;
+ case _NORMAN:
+ rgb_matrix_layer_helper(0xFF, 0x7C, 0x4D); break;
+ case _MALTRON:
+ rgb_matrix_layer_helper(0xFF, 0xFF, 0x00); break;
+ case _EUCALYN:
+ rgb_matrix_layer_helper(0xFF, 0x80, 0xBF); break;
+ case _CARPLAX:
+ rgb_matrix_layer_helper(0x00, 0x00, 0xFF); break;
+ }
+ }
+ }
}
+
#endif //RGB_MATRIX_INIT
diff --git a/layouts/community/ergodox/drashna/rules.mk b/layouts/community/ergodox/drashna/rules.mk
index ee231321e3..f0628d9daf 100644
--- a/layouts/community/ergodox/drashna/rules.mk
+++ b/layouts/community/ergodox/drashna/rules.mk
@@ -1,19 +1,20 @@
-TAP_DANCE_ENABLE = yes
-SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
-COMMAND_ENABLE = no # Commands for debug and configuration
+TAP_DANCE_ENABLE = yes
+SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
+COMMAND_ENABLE = no # Commands for debug and configuration
+SPACE_CADET_ENABLE = no
ifneq (,$(findstring ergodox_ez,$(KEYBOARD)))
- RGBLIGHT_ENABLE = yes
+ RGBLIGHT_ENABLE = yes
RGB_MATRIX_ENABLE = no
endif
-CONSOLE_ENABLE = no
-BOOTMAGIC_ENABLE = yes
+CONSOLE_ENABLE = no
+BOOTMAGIC_ENABLE = yes
-UNICODE_ENABLE = yes
-UNICDOEMAP_ENABLE = no
+UNICODE_ENABLE = yes
+UNICDOEMAP_ENABLE = no
-MACROS_ENABLED = no
-RGBLIGHT_TWINKLE = no
-INDICATOR_LIGHTS = no
+MACROS_ENABLED = no
+RGBLIGHT_TWINKLE = no
+INDICATOR_LIGHTS = no
RGBLIGHT_STARTUP_ANIMATION = yes
DEBOUNCE_TYPE = eager_pk
diff --git a/layouts/community/ergodox/drashna_glow/config.h b/layouts/community/ergodox/drashna_glow/config.h
index e2d9594267..5eb1c6d0f3 100644
--- a/layouts/community/ergodox/drashna_glow/config.h
+++ b/layouts/community/ergodox/drashna_glow/config.h
@@ -6,10 +6,21 @@
#define PRODUCT DrashnaDox - Hacked ErgoDox EZ Glow
#ifdef RGB_MATRIX_ENABLE
-#define RGB_MATRIX_KEYPRESSES // reacts to keypresses (will slow down matrix scan by a lot)
+# define RGB_MATRIX_KEYPRESSES // reacts to keypresses (will slow down matrix scan by a lot)
// #define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (not recommened)
// #define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
-#define RGB_DISABLE_WHEN_USB_SUSPENDED true// turn off effects when suspended
+# define RGB_DISABLE_WHEN_USB_SUSPENDED true// turn off effects when suspended
// #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
// #define EECONFIG_RGB_MATRIX (uint32_t *)16
+
+# define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+# define DISABLE_RGB_MATRIX_CYCLE_ALL
+# define DISABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+# define DISABLE_RGB_MATRIX_DUAL_BEACON
+# define DISABLE_RGB_MATRIX_RAINBOW_BEACON
+# define DISABLE_RGB_MATRIX_DIGITAL_RAIN
+# define DISABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+# define DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+# define DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+
#endif