From bda035aad8b305b4da579e836d518920dd9d166b Mon Sep 17 00:00:00 2001 From: leviport Date: Mon, 30 Dec 2019 13:37:43 -0700 Subject: [PATCH] WIP: Correct rules & config --- keyboards/system76/ortho_split_2u/.#config.h | 1 - keyboards/system76/ortho_split_2u/config.h | 4 +-- .../system76/ortho_split_2u/ortho_split_2u.c | 2 +- .../system76/ortho_split_2u/ortho_split_2u.h | 29 ++++++++++--------- 4 files changed, 18 insertions(+), 18 deletions(-) delete mode 120000 keyboards/system76/ortho_split_2u/.#config.h diff --git a/keyboards/system76/ortho_split_2u/.#config.h b/keyboards/system76/ortho_split_2u/.#config.h deleted file mode 120000 index 658c1e6a134..00000000000 --- a/keyboards/system76/ortho_split_2u/.#config.h +++ /dev/null @@ -1 +0,0 @@ -levi@pop-os.17218:1577715666 \ No newline at end of file diff --git a/keyboards/system76/ortho_split_2u/config.h b/keyboards/system76/ortho_split_2u/config.h index 6a8d720c33d..d05393ded44 100644 --- a/keyboards/system76/ortho_split_2u/config.h +++ b/keyboards/system76/ortho_split_2u/config.h @@ -17,9 +17,9 @@ /* key matrix pins */ #define MATRIX_ROW_PINS_LEFT { F4, F5, F6, F7, B1, B3 } -#define MATRIX_COL_PINS_LEFT { D1, D0, D4, C6, D7, E6, B4 } +#define MATRIX_COL_PINS_LEFT { D1, B5, D4, C6, D7, E6, B4 } #define MATRIX_ROW_PINS_RIGHT { F4, F5, F6, F7, B1, B3 } -#define MATRIX_COL_PINS_RIGHT { D3, D2, D1, D0, D4, C6, D7, E6, B4 } +#define MATRIX_COL_PINS_RIGHT { D3, D2, D1, B5, D4, C6, D7, E6, B4 } #define UNUSED_PINS /* COL2ROW or ROW2COL */ diff --git a/keyboards/system76/ortho_split_2u/ortho_split_2u.c b/keyboards/system76/ortho_split_2u/ortho_split_2u.c index 662fe36720b..56fb53b5f8a 100644 --- a/keyboards/system76/ortho_split_2u/ortho_split_2u.c +++ b/keyboards/system76/ortho_split_2u/ortho_split_2u.c @@ -1,4 +1,4 @@ -#include "virgortholeft.h" +#include "ortho_split_2u.h" void keyboard_post_init_user(void) { // Customise these values to desired behaviour diff --git a/keyboards/system76/ortho_split_2u/ortho_split_2u.h b/keyboards/system76/ortho_split_2u/ortho_split_2u.h index 6289b124143..a5f07276bea 100644 --- a/keyboards/system76/ortho_split_2u/ortho_split_2u.h +++ b/keyboards/system76/ortho_split_2u/ortho_split_2u.h @@ -1,24 +1,25 @@ -#ifndef VIRGORTHOLEFT_H -#define VIRGORTHOLEFT_H +#ifndef ORTHO_SPLIT_2U_H +#define ORTHO_SPLIT_2U_H #include "quantum.h" #define ___ KC_NO #define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, \ - K10, K11, K12, K13, K14, K15, K16, \ - K21, K22, K23, K24, K25, K26, \ - K31, K32, K33, K34, K35, K36, \ - K41, K42, K43, K44, K45, K46, \ - K51, K52, K53, K54, K56 \ + K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \ + K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1F, \ + K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \ + K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3F, \ + K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4E, K4F, \ + K51, K52, K53, K54, K56, K57, K59, K5A, K5B, K56, K5E, K5F \ + ) { \ - { K00, K01, K02, K03, K04, K05, K06 }, \ - { K10, K11, K12, K13, K14, K15, K16 }, \ - { ___, K21, K22, K23, K24, K25, K26 }, \ - { ___, K31, K32, K33, K34, K35, K36 }, \ - { ___, K41, K42, K43, K44, K45, K46 }, \ - { ___, K51, K52, K53, K54, ___, K56 }, \ + { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \ + { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, ___, K1F }, \ + { ___, K21, K22, K23, K24, K25, K26, K17, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \ + { ___, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, ___, K3F }, \ + { ___, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, ___, K4E, K4F }, \ + { ___, K51, K52, K53, K54, ___, K56, K57, ___, K59, K5A, K5B, ___, K5D, K5E, K5F }, \ } #endif // VIRGORTHOLEFT_H