summaryrefslogtreecommitdiff
path: root/keyboards/dailycraft/owl8/keymaps
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/dailycraft/owl8/keymaps')
-rw-r--r--keyboards/dailycraft/owl8/keymaps/default/keymap.c6
-rw-r--r--keyboards/dailycraft/owl8/keymaps/via/keymap.c85
-rw-r--r--keyboards/dailycraft/owl8/keymaps/via/rules.mk1
3 files changed, 9 insertions, 83 deletions
diff --git a/keyboards/dailycraft/owl8/keymaps/default/keymap.c b/keyboards/dailycraft/owl8/keymaps/default/keymap.c
index e840263639..7ff5519e5a 100644
--- a/keyboards/dailycraft/owl8/keymaps/default/keymap.c
+++ b/keyboards/dailycraft/owl8/keymaps/default/keymap.c
@@ -25,26 +25,22 @@ enum layer_names {
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_BASE] = LAYOUT(
- KC_NO, KC_NO, KC_NO, KC_NO, // for encoders
KC_NO, KC_NO, KC_NO, KC_NO, // for ext keys
MO(1), KC_BSPC, KC_SPC, KC_ENT,
KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
),
[_FN1] = LAYOUT(
KC_NO, KC_NO, KC_NO, KC_NO,
- KC_NO, KC_NO, KC_NO, KC_NO,
KC_1, KC_2, KC_3, KC_4,
KC_5, KC_6, KC_7, KC_8
),
[_FN2] = LAYOUT(
KC_NO, KC_NO, KC_NO, KC_NO,
- KC_NO, KC_NO, KC_NO, KC_NO,
KC_1, KC_2, KC_3, KC_4,
KC_5, KC_6, KC_7, KC_8
),
[_FN3] = LAYOUT(
KC_NO, KC_NO, KC_NO, KC_NO,
- KC_NO, KC_NO, KC_NO, KC_NO,
KC_1, KC_2, KC_3, KC_4,
KC_5, KC_6, KC_7, KC_8
)
@@ -64,5 +60,5 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
tap_code(KC_UP);
}
}
- return true;
+ return false;
}
diff --git a/keyboards/dailycraft/owl8/keymaps/via/keymap.c b/keyboards/dailycraft/owl8/keymaps/via/keymap.c
index 1a3bb0f0ae..fcce35bf2b 100644
--- a/keyboards/dailycraft/owl8/keymaps/via/keymap.c
+++ b/keyboards/dailycraft/owl8/keymaps/via/keymap.c
@@ -25,103 +25,32 @@ enum layer_names {
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_BASE] = LAYOUT(
- KC_NO, KC_NO, KC_NO, KC_NO, // for encoders
KC_NO, KC_NO, KC_NO, KC_NO, // for ext keys
MO(1), KC_BSPC, KC_SPC, KC_ENT,
KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
),
[_FN1] = LAYOUT(
KC_NO, KC_NO, KC_NO, KC_NO,
- KC_NO, KC_NO, KC_NO, KC_NO,
KC_1, KC_2, KC_3, KC_4,
KC_5, KC_6, KC_7, KC_8
),
[_FN2] = LAYOUT(
KC_NO, KC_NO, KC_NO, KC_NO,
- KC_NO, KC_NO, KC_NO, KC_NO,
KC_1, KC_2, KC_3, KC_4,
KC_5, KC_6, KC_7, KC_8
),
[_FN3] = LAYOUT(
KC_NO, KC_NO, KC_NO, KC_NO,
- KC_NO, KC_NO, KC_NO, KC_NO,
KC_1, KC_2, KC_3, KC_4,
KC_5, KC_6, KC_7, KC_8
)
};
-keyevent_t encoder1_ccw = {
- .key = (keypos_t){.row = 0, .col = 12},
- .pressed = false,
- .type = KEY_EVENT
-};
-
-keyevent_t encoder1_cw = {
- .key = (keypos_t){.row = 0, .col = 13},
- .pressed = false,
- .type = KEY_EVENT
-};
-
-keyevent_t encoder2_ccw = {
- .key = (keypos_t){.row = 0, .col = 14},
- .pressed = false,
- .type = KEY_EVENT
+#ifdef ENCODER_MAP_ENABLE
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+ [0] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) },
+ [1] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) },
+ [2] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) },
+ [3] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) }
};
-
-keyevent_t encoder2_cw = {
- .key = (keypos_t){.row = 0, .col = 15},
- .pressed = false,
- .type = KEY_EVENT
-};
-
-void matrix_scan_user(void) {
- if (encoder1_ccw.pressed) {
- encoder1_ccw.pressed = false;
- encoder1_ccw.time = timer_read();
- action_exec(encoder1_ccw);
- }
-
- if (encoder1_cw.pressed) {
- encoder1_cw.pressed = false;
- encoder1_cw.time = timer_read();
- action_exec(encoder1_cw);
- }
-
- if (encoder2_ccw.pressed) {
- encoder2_ccw.pressed = false;
- encoder2_ccw.time = timer_read();
- action_exec(encoder2_ccw);
- }
-
- if (encoder2_cw.pressed) {
- encoder2_cw.pressed = false;
- encoder2_cw.time = timer_read();
- action_exec(encoder2_cw);
- }
-}
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
- if (index == 0) { /* First encoder */
- if (clockwise) {
- encoder1_cw.pressed = true;
- encoder1_cw.time = timer_read();
- action_exec(encoder1_cw);
- } else {
- encoder1_ccw.pressed = true;
- encoder1_ccw.time = timer_read();
- action_exec(encoder1_ccw);
- }
- } else if (index == 1) {
- if (clockwise) {
- encoder2_cw.pressed = true;
- encoder2_cw.time = timer_read();
- action_exec(encoder2_cw);
- } else {
- encoder2_ccw.pressed = true;
- encoder2_ccw.time = timer_read();
- action_exec(encoder2_ccw);
- }
- }
-
- return true;
-}
+#endif
diff --git a/keyboards/dailycraft/owl8/keymaps/via/rules.mk b/keyboards/dailycraft/owl8/keymaps/via/rules.mk
index 1e5b99807c..f1adcab005 100644
--- a/keyboards/dailycraft/owl8/keymaps/via/rules.mk
+++ b/keyboards/dailycraft/owl8/keymaps/via/rules.mk
@@ -1 +1,2 @@
VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes