darkkirb/qmk_firmware
1
0
Fork 0
forked from mirrors/qmk_firmware
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

Browse source
This commit is contained in:
QMK Bot 2021-09-11 04:59:55 +00:00
commit fcda0a7ff0
3 changed files with 12 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
keyboards/owl8/config.h
View file

@ -27,8 +27,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define PRODUCT owl8 #define PRODUCT owl8
/* key matrix size */ /* key matrix size */
#define MATRIX_ROWS 4 #define MATRIX_ROWS 1
#define MATRIX_COLS 4 #define MATRIX_COLS 16
/* /*
* Keyboard Matrix Assignments * Keyboard Matrix Assignments
@ -41,10 +41,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
*/ */
#define DIRECT_PINS { \ #define DIRECT_PINS { \
{ F4, F7, B3, B6 }, \ { F4, F7, B3, B6, F5, F6, B1, B2, D4, C6, D7, E6, NO_PIN, NO_PIN, NO_PIN, NO_PIN } \
{ F5, F6, B1, B2 }, \
{ D4, C6, D7, E6 }, \
{ NO_PIN, NO_PIN, NO_PIN, NO_PIN } \
} }
#define UNUSED_PINS #define UNUSED_PINS

8
keyboards/owl8/keymaps/via/keymap.c
View file

@ -51,22 +51,22 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
}; };
keyevent_t encoder1_ccw = { keyevent_t encoder1_ccw = {
.key = (keypos_t){.row = 3, .col = 1}, .key = (keypos_t){.row = 0, .col = 12},
.pressed = false .pressed = false
}; };
keyevent_t encoder1_cw = { keyevent_t encoder1_cw = {
.key = (keypos_t){.row = 3, .col = 0}, .key = (keypos_t){.row = 0, .col = 13},
.pressed = false .pressed = false
}; };
keyevent_t encoder2_ccw = { keyevent_t encoder2_ccw = {
.key = (keypos_t){.row = 3, .col = 3}, .key = (keypos_t){.row = 0, .col = 14},
.pressed = false .pressed = false
}; };
keyevent_t encoder2_cw = { keyevent_t encoder2_cw = {
.key = (keypos_t){.row = 3, .col = 2}, .key = (keypos_t){.row = 0, .col = 15},
.pressed = false .pressed = false
}; };

13
keyboards/owl8/owl8.h
View file

@ -28,14 +28,11 @@
*/ */
#define LAYOUT( \ #define LAYOUT( \
k30, k31, k32, k33, \ k012, k013, k014, k015, \
k20, k21, k22, k23, \ k008, k009, k010, k011, \
k00, k01, k02, k03, \ k000, k001, k002, k003, \
k10, k11, k12, k13 \ k004, k005, k006, k007 \
) \ ) \
{ \ { \
{k00, k01, k02, k03 }, \ {k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015 } \
{k10, k11, k12, k13 }, \
{k20, k21, k22, k23 }, \
{k30, k31, k32, k33 } \
} }