diff --git a/keyboards/pabile/p18/config.h b/keyboards/pabile/p18/config.h index 73c5c906b97..2a7f117ef2b 100644 --- a/keyboards/pabile/p18/config.h +++ b/keyboards/pabile/p18/config.h @@ -16,12 +16,12 @@ /* pin-out for PROMICRO */ #define MATRIX_ROW_PINS { D1, D0, D4, C6 } -#define MATRIX_COL_PINS { D7, E6, B4, B5, D2 } +#define MATRIX_COL_PINS { D2, D7, E6, B4, B5 } #define UNUSED_PINS /* Encoder position for PROMICRO */ -#define ENCODERS_PAD_A { F5, F6 } -#define ENCODERS_PAD_B { F4, B6 } +#define ENCODERS_PAD_A { B6, F6 } +#define ENCODERS_PAD_B { F4, F5 } /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/pabile/p18/keymaps/default/keymap.c b/keyboards/pabile/p18/keymaps/default/keymap.c index e1b71c7b5df..831ad4c7c5c 100644 --- a/keyboards/pabile/p18/keymaps/default/keymap.c +++ b/keyboards/pabile/p18/keymaps/default/keymap.c @@ -11,10 +11,10 @@ enable rgb here const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( - KC_P7, KC_P8, KC_P9, KC_PMNS, - KC_P4, KC_P5, KC_P6, KC_PPLS, - KC_A, KC_P1, KC_P2, KC_P3, KC_TAB, - KC_B, KC_DEL, KC_P0, KC_PDOT, KC_PENT) + KC_NO,KC_PMNS, KC_P9, KC_P8, KC_P7, + KC_NO,KC_PPLS,KC_P6, KC_P5, KC_P4, + KC_A, KC_TAB, KC_P3, KC_P2, KC_P1, + KC_B, KC_PENT, KC_PDOT, KC_P0, KC_DEL) }; void encoder_update_user(uint8_t index, bool clockwise) { diff --git a/keyboards/pabile/p18/p18.h b/keyboards/pabile/p18/p18.h index 533130a4e95..0c64b15e65b 100644 --- a/keyboards/pabile/p18/p18.h +++ b/keyboards/pabile/p18/p18.h @@ -4,16 +4,16 @@ #include "quantum.h" #define LAYOUT( \ - k104, k103, k102, k101, \ - k204, k203, k202, k201, \ - k304, k303, k302, k301, k300\ - k404, k403, k402, k401, k400\ + k100, k101, k102, k103, k104, \ + k200, k201, k202, k203, k204, \ + k300, k301, k302, k303, k304, \ + k400, k401, k402, k403, k404 \ ) \ { \ - {k104, k103, k102, k101}, \ - {k204, k203, k202, k201}, \ - {k304, k303, k302, k301, k300}, \ - {k404, k403, k402, k401, k400} \ + {k100, k101, k102, k103, k104}, \ + {k200, k201, k202, k203, k204}, \ + {k300, k301, k302, k303, k304}, \ + {k400, k401, k402, k403, k404} \ } #endif diff --git a/keyboards/pabile/p18/rules.mk b/keyboards/pabile/p18/rules.mk index e0cfa26e39d..76eb8409c59 100644 --- a/keyboards/pabile/p18/rules.mk +++ b/keyboards/pabile/p18/rules.mk @@ -18,15 +18,15 @@ MOUSEKEY_ENABLE = yes # Mouse keys(+4700) EXTRAKEY_ENABLE = yes # Audio control and System control(+450) CONSOLE_ENABLE = no # Console for debug(+400) COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE = no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality MIDI_ENABLE = no # MIDI controls AUDIO_ENABLE = no # Audio output on port C6 UNICODE_ENABLE = yes # Unicode BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. +RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. IOS_DEVICE_ENABLE = no # connect to IOS Device ENCODER_ENABLE = yes -LAYOUTS = ortho \ No newline at end of file +LAYOUTS = ortho diff --git a/keyboards/pabile/p40/config.h b/keyboards/pabile/p40/config.h index af05e8e605e..f2d886e8d03 100644 --- a/keyboards/pabile/p40/config.h +++ b/keyboards/pabile/p40/config.h @@ -7,7 +7,7 @@ #define PRODUCT_ID 0x0000 #define DEVICE_VER 0x0001 #define MANUFACTURER Pabile -#define PRODUCT Pabile40 +#define PRODUCT Pabile40 Keyboard #define DESCRIPTION 4x10key keyboard /* key matrix size */ diff --git a/keyboards/pabile/p40/keymaps/default/keymap.c b/keyboards/pabile/p40/keymaps/default/keymap.c index 0403ec6e81c..c55699e0598 100644 --- a/keyboards/pabile/p40/keymaps/default/keymap.c +++ b/keyboards/pabile/p40/keymaps/default/keymap.c @@ -1,8 +1,16 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_ortho_4x10(KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, LT(3,KC_MINS), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, LT(4,KC_SLSH), KC_LCTL, KC_LGUI, KC_LALT, KC_LSFT, LT(2,KC_BSPC), LT(1,KC_SPC), KC_ENT, KC_APP, KC_DEL, KC_ESC), - [1] = LAYOUT_ortho_4x10(KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TAB, KC_NO, KC_NO, KC_GRV, KC_LBRC, KC_RBRC, KC_SLSH, KC_SCLN, KC_QUOT, KC_MINS, KC_NO, KC_NO, KC_NO, KC_NO, KC_EQL, KC_MINS, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), + [0] = LAYOUT_ortho_4x10( + KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, + KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, LT(3,KC_MINS), + KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, LT(4,KC_SLSH), + KC_LCTL, KC_LGUI, KC_LALT, KC_LSFT, LT(2,KC_BSPC), LT(1,KC_SPC), KC_ENT, KC_APP, KC_DEL, KC_ESC), + [1] = LAYOUT_ortho_4x10( + KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, + KC_TAB, KC_NO, KC_NO, KC_GRV, KC_LBRC, KC_RBRC, KC_BSLS, KC_SCLN, KC_QUOT, KC_MINS, + KC_NO, KC_NO, KC_NO, KC_NO, KC_EQL, KC_MINS, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), [2] = LAYOUT_ortho_4x10(KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_TAB, KC_F11, KC_F12, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_CAPS, KC_PSCR, KC_SLCK, KC_PAUS, KC_NO, KC_NLCK, KC_NO, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO), [3] = LAYOUT_ortho_4x10(KC_ESC, KC_NO, KC_NO, KC_NO, KC_NO, KC_INS, KC_PGUP, KC_UP, KC_PGDN, KC_DEL, KC_TAB, KC_NO, KC_NO, KC_NO, KC_NO, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_END, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSPC, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO), [4] = LAYOUT_ortho_4x10(KC_ESC, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_BTN1, KC_MS_U, KC_BTN2, KC_DEL, KC_TAB, KC_NO, KC_NO, KC_NO, KC_NO, KC_WH_U, KC_MS_L, KC_MS_D, KC_MS_R, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_WH_D, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSPC, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO)