summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-09-11 04:59:55 +0000
committerQMK Bot <hello@qmk.fm>2021-09-11 04:59:55 +0000
commitfcda0a7ff02afc7c943abdaf1823eb3cdca3d402 (patch)
tree7cde791430895f93dac457b9d1a54bf405d0b58b
parentf72a358931a8989d007b191e0d254caec07d480f (diff)
parent46f15cd1a533cce8c9f7a406b1e6ee6765e48a20 (diff)
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--keyboards/owl8/config.h9
-rw-r--r--keyboards/owl8/keymaps/via/keymap.c8
-rw-r--r--keyboards/owl8/owl8.h13
3 files changed, 12 insertions, 18 deletions
diff --git a/keyboards/owl8/config.h b/keyboards/owl8/config.h
index 7bbaff3985..d28fd9c927 100644
--- a/keyboards/owl8/config.h
+++ b/keyboards/owl8/config.h
@@ -27,8 +27,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define PRODUCT owl8
/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 4
+#define MATRIX_ROWS 1
+#define MATRIX_COLS 16
/*
* Keyboard Matrix Assignments
@@ -41,10 +41,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
#define DIRECT_PINS { \
- { F4, F7, B3, B6 }, \
- { F5, F6, B1, B2 }, \
- { D4, C6, D7, E6 }, \
- { NO_PIN, NO_PIN, NO_PIN, NO_PIN } \
+ { F4, F7, B3, B6, F5, F6, B1, B2, D4, C6, D7, E6, NO_PIN, NO_PIN, NO_PIN, NO_PIN } \
}
#define UNUSED_PINS
diff --git a/keyboards/owl8/keymaps/via/keymap.c b/keyboards/owl8/keymaps/via/keymap.c
index dc981f4754..6e3f6ea90b 100644
--- a/keyboards/owl8/keymaps/via/keymap.c
+++ b/keyboards/owl8/keymaps/via/keymap.c
@@ -51,22 +51,22 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};
keyevent_t encoder1_ccw = {
- .key = (keypos_t){.row = 3, .col = 1},
+ .key = (keypos_t){.row = 0, .col = 12},
.pressed = false
};
keyevent_t encoder1_cw = {
- .key = (keypos_t){.row = 3, .col = 0},
+ .key = (keypos_t){.row = 0, .col = 13},
.pressed = false
};
keyevent_t encoder2_ccw = {
- .key = (keypos_t){.row = 3, .col = 3},
+ .key = (keypos_t){.row = 0, .col = 14},
.pressed = false
};
keyevent_t encoder2_cw = {
- .key = (keypos_t){.row = 3, .col = 2},
+ .key = (keypos_t){.row = 0, .col = 15},
.pressed = false
};
diff --git a/keyboards/owl8/owl8.h b/keyboards/owl8/owl8.h
index 656b3f17cd..5e561f580c 100644
--- a/keyboards/owl8/owl8.h
+++ b/keyboards/owl8/owl8.h
@@ -28,14 +28,11 @@
*/
#define LAYOUT( \
- k30, k31, k32, k33, \
- k20, k21, k22, k23, \
- k00, k01, k02, k03, \
- k10, k11, k12, k13 \
+ k012, k013, k014, k015, \
+ k008, k009, k010, k011, \
+ k000, k001, k002, k003, \
+ k004, k005, k006, k007 \
) \
{ \
- {k00, k01, k02, k03 }, \
- {k10, k11, k12, k13 }, \
- {k20, k21, k22, k23 }, \
- {k30, k31, k32, k33 } \
+ {k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015 } \
}