summaryrefslogtreecommitdiff
path: root/keyboards/handwired/woodpad
diff options
context:
space:
mode:
authordrashna <drashna@live.com>2017-11-10 19:58:53 -0800
committerJack Humbert <jack.humb@gmail.com>2017-11-10 22:58:53 -0500
commit0533362e8205957493d52d4356aa20537a151118 (patch)
tree106e6feb82d31192ce349f68b4763c5a3d71dcaa /keyboards/handwired/woodpad
parent4df4fa7c265e1e5c9b262851a704db7755971229 (diff)
Cleaned uppersonal userspace and keymaps (#1998)
* Cleanup of keymaps * Remove Tap Dance from Orthodox keymap * Cleaned up userspace and keymaps * Added sample (template)userspace files to my folder
Diffstat (limited to 'keyboards/handwired/woodpad')
-rw-r--r--keyboards/handwired/woodpad/keymaps/drashna/config.h6
-rw-r--r--keyboards/handwired/woodpad/keymaps/drashna/keymap.c22
-rw-r--r--keyboards/handwired/woodpad/keymaps/drashna/rules.mk1
3 files changed, 15 insertions, 14 deletions
diff --git a/keyboards/handwired/woodpad/keymaps/drashna/config.h b/keyboards/handwired/woodpad/keymaps/drashna/config.h
index be1e4df598..780192cf3c 100644
--- a/keyboards/handwired/woodpad/keymaps/drashna/config.h
+++ b/keyboards/handwired/woodpad/keymaps/drashna/config.h
@@ -28,13 +28,13 @@
#ifdef RGBLIGHT_ENABLE
#define RGB_DI_PIN D3
-#define RGBLED_NUM 7 // Number of LEDs
+#define RGBLED_NUM 14 // Number of LEDs
#define RGBLIGHT_ANIMATIONS
#define RGBLIGHT_HUE_STEP 12
#define RGBLIGHT_SAT_STEP 12
#define RGBLIGHT_VAL_STEP 12
-#define RGBLIGHT_EFFECT_KNIGHT_LENGTH 2
-#define RGBLIGHT_EFFECT_SNAKE_LENGTH 2
+#define RGBLIGHT_EFFECT_KNIGHT_LENGTH 4
+#define RGBLIGHT_EFFECT_SNAKE_LENGTH 3
#define RGBLIGHT_EFFECT_BREATHE_CENTER 1
#endif // RGBLIGHT_ENABLE
diff --git a/keyboards/handwired/woodpad/keymaps/drashna/keymap.c b/keyboards/handwired/woodpad/keymaps/drashna/keymap.c
index 6ec7f52fd6..e53c65f105 100644
--- a/keyboards/handwired/woodpad/keymaps/drashna/keymap.c
+++ b/keyboards/handwired/woodpad/keymaps/drashna/keymap.c
@@ -47,10 +47,10 @@ bool check_dtimer(uint8_t dtimer) {
#ifdef TAP_DANCE_ENABLE
enum {
- TD_DIABLO_1 = 0,
- TD_DIABLO_2,
- TD_DIABLO_3,
- TD_DIABLO_4
+ TD_D3_1 = 0,
+ TD_D3_2,
+ TD_D3_3,
+ TD_D3_4
};
@@ -89,10 +89,10 @@ void diablo_tapdance4(qk_tap_dance_state_t *state, void *user_data) {
//Tap Dance Definitions
qk_tap_dance_action_t tap_dance_actions[] = {
// tap once to disable, and more to enable timed micros
- [TD_DIABLO_1] = ACTION_TAP_DANCE_FN(diablo_tapdance1),
- [TD_DIABLO_2] = ACTION_TAP_DANCE_FN(diablo_tapdance2),
- [TD_DIABLO_3] = ACTION_TAP_DANCE_FN(diablo_tapdance3),
- [TD_DIABLO_4] = ACTION_TAP_DANCE_FN(diablo_tapdance4),
+ [TD_D3_1] = ACTION_TAP_DANCE_FN(diablo_tapdance1),
+ [TD_D3_2] = ACTION_TAP_DANCE_FN(diablo_tapdance2),
+ [TD_D3_3] = ACTION_TAP_DANCE_FN(diablo_tapdance3),
+ [TD_D3_4] = ACTION_TAP_DANCE_FN(diablo_tapdance4),
};
#endif
@@ -117,7 +117,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_ESC, _______, _______, _______,\
KC_S, KC_F, KC_I, KC_M, \
KC_1, KC_2, KC_3, KC_4, \
- TD(TD_DIABLO_1), TD(TD_DIABLO_2), TD(TD_DIABLO_3), TD(TD_DIABLO_4), \
+ TD(TD_D3_1), TD(TD_D3_2), TD(TD_D3_3), TD(TD_D3_4), \
_______, KC_DIABLO_CLEAR, KC_Q, SFT_T(KC_SPACE) \
),
#else
@@ -135,7 +135,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_OVERWATCH, _______, _______, XXXXXXX,\
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
XXXXXXX, XXXXXXX, XXXXXXX, KC_JUSTGAME, \
- KC_SYMM, KC_DOOMFIST, KC_TORB, KC_GOODGAME, \
+ KC_SYMM, KC_TORB, XXXXXXX, KC_GOODGAME, \
KC_SALT, KC_MORESALT, KC_SALTHARD, KC_GLHF \
),
[_MEDIA] = KEYMAP( /* Base */
@@ -226,7 +226,7 @@ void matrix_init_keymap(void) {
void matrix_scan_keymap(void) {
numlock_led_off();
- if (is_overwatch && biton32(layer_state) == _MACROS) {
+ if ((is_overwatch && biton32(layer_state) == _MACROS) || (biton32(layer_state) == _NAV)) {
numlock_led_on();
}
diff --git a/keyboards/handwired/woodpad/keymaps/drashna/rules.mk b/keyboards/handwired/woodpad/keymaps/drashna/rules.mk
index b6c5ed3bd5..bee3ecf505 100644
--- a/keyboards/handwired/woodpad/keymaps/drashna/rules.mk
+++ b/keyboards/handwired/woodpad/keymaps/drashna/rules.mk
@@ -4,6 +4,7 @@ COMMAND_ENABLE = yes # Commands for debug and configuration
RGBLIGHT_ENABLE = yes
MIDI_ENABLE = no
CONSOLE_ENABLE = no
+NKRO_ENABLE = yes
EXTRAFLAGS = -flto