summaryrefslogtreecommitdiff
path: root/aktersnurra/dilemma
diff options
context:
space:
mode:
Diffstat (limited to 'aktersnurra/dilemma')
-rw-r--r--aktersnurra/dilemma/config.h23
-rw-r--r--aktersnurra/dilemma/keymap.c19
-rw-r--r--aktersnurra/dilemma/rules.mk3
3 files changed, 23 insertions, 22 deletions
diff --git a/aktersnurra/dilemma/config.h b/aktersnurra/dilemma/config.h
index 813cdf7..116bd0a 100644
--- a/aktersnurra/dilemma/config.h
+++ b/aktersnurra/dilemma/config.h
@@ -16,19 +16,22 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
-#define TAPPING_TERM 150
-#define PERMISSIVE_HOLD
-#define TAPPING_FORCE_HOLD
+#define DYNAMIC_KEYMAP_LAYER_COUNT 6
-#define CHARYBDIS_MINIMUM_DEFAULT_DPI 500
-#define CHARYBDIS_DEFAULT_DPI_CONFIG_STEP 200
-#define CHARYBDIS_MINIMUM_SNIPING_DPI 100
-#define CHARYBDIS_SNIPING_DPI_CONFIG_STEP 100
+#define SPLIT_LAYER_STATE_ENABLE
+#define SPLIT_LED_STATE_ENABLE
-#define CHARYBDIS_CONFIG_SYNC
-
-#define EE_HANDS
+#define TAPPING_TERM 196
+#define PERMISSIVE_HOLD
+#define TAPPING_FORCE_HOLD
#define POINTING_DEVICE_AUTO_MOUSE_ENABLE
#define AUTO_MOUSE_TIME 800
#define AUTO_MOUSE_DEBOUNCE 50
+
+#define SPLIT_LAYER_STATE_ENABLE
+#define SPLIT_LED_STATE_ENABLE
+#define POINTING_DEVICE_GESTURES_SCROLL_ENABLE
+
+#define DILEMMA_MINIMUM_DEFAULT_DPI 256
+#define DILEMMA_DEFAULT_DPI_CONFIG_STEP 32
diff --git a/aktersnurra/dilemma/keymap.c b/aktersnurra/dilemma/keymap.c
index 14a26ac..3e60fee 100644
--- a/aktersnurra/dilemma/keymap.c
+++ b/aktersnurra/dilemma/keymap.c
@@ -18,54 +18,55 @@
#define NAV LT(_NAV, KC_SPC)
#define SYM LT(_SYM, KC_BSPC)
#define NUM LT(_NUM, KC_TAB)
-#define CHARYBDIS_AUTO_SNIPING_ON_LAYER _MOU
enum { _COLEMAK_DH, _NAV, _NUM, _SYM, _FUN, _MEDIA, } layers;
enum td_keycodes {
SFT_RP,
};
+#define DILEMMA_AUTO_SNIPING_ON_LAYER _NAV
+
tap_dance_action_t tap_dance_actions[] = {
[SFT_RP] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, sftrp_finished, sftrp_reset)};
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [_COLEMAK_DH] = LAYOUT( /* COLEMAK MOD DH */
+ [_COLEMAK_DH] = LAYOUT_split_3x5_3( /* COLEMAK MOD DH */
KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN,
KC_HA, KC_HR, KC_HS, KC_HT, KC_G, KC_M, KC_HN, KC_HE, KC_HI, KC_HO,
KC_Z, KC_X, KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH,
- KC_ENT, NAV, KC_ESC, SYM, NUM, GUI_T
+ KC_ENT, NAV, KC_ESC, SYM, NUM, KC_LGUI
),
- [_SYM] = LAYOUT( /* [> Symbol layer <] */
+ [_SYM] = LAYOUT_split_3x5_3( /* [> Symbol layer <] */
KC_TRNS, KC_EXLM, KC_PERC, KC_DLR, KC_AMPR, KC_AT, KC_ASTR, KC_CIRC, KC_TRNS, KC_TRNS,
KC_GRV, KC_HASH, KC_LPRN, TD(SFT_RP), KC_MINS, KC_EQL, KC_SLBRC, KC_RBRC, KC_QUOT, KC_PIPE,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSLS,
KC_TRNS, KC_SPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
),
- [_NAV] = LAYOUT( /* [> Mouse/Nav layer <] */
+ [_NAV] = LAYOUT_split_3x5_3( /* [> Mouse/Nav layer <] */
KC_TRNS, KC_TRNS, KC_WH_D, KC_WH_U, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_BSPC, KC_TRNS, KC_TRNS
),
- [_NUM] = LAYOUT( /* [> Number layer <] */
+ [_NUM] = LAYOUT_split_3x5_3( /* [> Number layer <] */
KC_TRNS, KC_4, KC_5, KC_6, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_1, KC_2, KC_3, KC_0, KC_TRNS, KC_7, KC_8, KC_9, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
MO(_MEDIA), MO(_FUN), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
),
- [_MEDIA] = LAYOUT( /* [> Media layer <] */
+ [_MEDIA] = LAYOUT_split_3x5_3( /* [> Media layer <] */
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
),
- [_FUN] = LAYOUT( /* [> Function layer <] */
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, EE_CLR,
+ [_FUN] = LAYOUT_split_3x5_3( /* [> Function layer <] */
+ KC_TRNS, KC_TRNS, RGB_TOG, RGB_RMOD, RGB_MOD, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, EE_CLR,
KC_TRNS, KC_TRNS, KC_TRNS, KC_ALT_CTL, KC_TRNS, KC_TRNS, KC_F1, KC_F2, KC_F3, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
diff --git a/aktersnurra/dilemma/rules.mk b/aktersnurra/dilemma/rules.mk
index 47d987b..aeb2fb5 100644
--- a/aktersnurra/dilemma/rules.mk
+++ b/aktersnurra/dilemma/rules.mk
@@ -2,6 +2,3 @@ MOUSEKEY_ENABLE = yes
SPLIT_KEYBOARD = yes
TAP_DANCE_ENABLE = yes
AUDIO_ENABLE = no
-BACKLIGHT_ENABLE = no
-RGBLIGHT_ENABLE = no
-RGB_MATRIX_ENABLE = no