diff options
Diffstat (limited to 'keyboards/phoenix')
| -rw-r--r-- | keyboards/phoenix/config.h | 5 | ||||
| -rw-r--r-- | keyboards/phoenix/info.json | 5 | ||||
| -rw-r--r-- | keyboards/phoenix/phoenix.h | 24 |
3 files changed, 17 insertions, 17 deletions
diff --git a/keyboards/phoenix/config.h b/keyboards/phoenix/config.h index 2ada33779d..76ac0edf2c 100644 --- a/keyboards/phoenix/config.h +++ b/keyboards/phoenix/config.h @@ -23,14 +23,9 @@ #define MOUSEKEY_MAX_SPEED 7 #define MOUSEKEY_WHEEL_DELAY 0 -#define DIODE_DIRECTION ROW2COL - /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define MATRIX_ROW_PINS { B1, B0, A7, A6, A5, B7 } -#define MATRIX_COL_PINS { B10, B12, B13, B14, B15, A8, A10 } - #define HAL_USE_SERIAL TRUE #define SPLIT_HAND_PIN B9 #define SERIAL_USART_DRIVER SD1 diff --git a/keyboards/phoenix/info.json b/keyboards/phoenix/info.json index c9147ab8d8..f2f82d6d7c 100644 --- a/keyboards/phoenix/info.json +++ b/keyboards/phoenix/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B10", "B12", "B13", "B14", "B15", "A8", "A10"], + "rows": ["B1", "B0", "A7", "A6", "A5", "B7"] + }, + "diode_direction": "ROW2COL", "split": { "soft_serial_pin": "A9" }, diff --git a/keyboards/phoenix/phoenix.h b/keyboards/phoenix/phoenix.h index bd8e4a30ab..3657ef05f0 100644 --- a/keyboards/phoenix/phoenix.h +++ b/keyboards/phoenix/phoenix.h @@ -69,26 +69,26 @@ inline void led3_off(void) { led_pin_off(6); }; #define LAYOUT_ergodox_pretty( \ L00,L01,L02,L03,L04,L05,L06, R00,R01,R02,R03,R04,R05,R06, \ L10,L11,L12,L13,L14,L15,L16, R10,R11,R12,R13,R14,R15,R16, \ - L20,L21,L22,L23,L24,L25, R21,R22,R23,R24,R25,R26, \ + L20,L21,L22,L23,L24,L25, R20,R21,R22,R23,R24,R25, \ L30,L31,L32,L33,L34,L35,L36, R30,R31,R32,R33,R34,R35,R36, \ - L40,L41,L42,L43,L44, R42,R43,R44,R45,R46, \ - L55,L56, R50,R51, \ - L54, R52, \ - L53,L52,L51, R55,R54,R53 ) \ + L40,L41,L42,L43,L44, R40,R41,R42,R43,R44, \ + L53,L54, R54,R53, \ + L55, R55, \ + L50,L51,L52, R52,R51,R50 ) \ \ /* matrix positions */ \ { \ - { L00, L10, L02, L03, L04, L05, L06 },\ + { L00, L01, L02, L03, L04, L05, L06 },\ { L10, L11, L12, L13, L14, L15, L16 },\ - { L20, L21, L22, L23, L24, L25 }, \ + { L20, L21, L22, L23, L24, L25, KC_NO },\ { L30, L31, L32, L33, L34, L35, L36 },\ - { L40, L41, L42, L43, L44 }, \ - { L53, L52, L51, L55, L56, L54 }, \ + { L40, L41, L42, L43, L44, KC_NO, KC_NO },\ + { L50, L51, L52, L53, L54, L55, KC_NO },\ \ { R00, R01, R02, R03, R04, R05, R06 },\ { R10, R11, R12, R13, R14, R15, R16 },\ - { R20, R21, R22, R23, R24, R25 }, \ + { R20, R21, R22, R23, R24, R25, KC_NO },\ { R30, R31, R32, R33, R34, R35, R36 },\ - { R40, R41, R42, R43, R44 }, \ - { R53, R54, R55, R51, R50, R52 }, \ + { R40, R41, R42, R43, R44, KC_NO, KC_NO },\ + { R50, R51, R52, R53, R54, R55, KC_NO }\ } |