diff --git a/src/board/system76/addw1/board.mk b/src/board/system76/addw1/board.mk index 496b58b..edfa67e 100644 --- a/src/board/system76/addw1/board.mk +++ b/src/board/system76/addw1/board.mk @@ -2,9 +2,8 @@ EC=it8587e -# Add keymap to src -KEYMAP?=default -SRC+=$(BOARD_DIR)/keymap/$(KEYMAP).c +# Include keyboard +KEYBOARD=15in_102 # Set keyboard LED mechanism KBLED=rgb_pwm diff --git a/src/board/system76/addw2/board.mk b/src/board/system76/addw2/board.mk index 3fadc24..630ab4b 100644 --- a/src/board/system76/addw2/board.mk +++ b/src/board/system76/addw2/board.mk @@ -2,9 +2,8 @@ EC=it5570e -# Add keymap to src -KEYMAP?=default -SRC+=$(BOARD_DIR)/keymap/$(KEYMAP).c +# Include keyboard +KEYBOARD=15in_102 # Set keyboard LED mechanism KBLED=rgb_pwm diff --git a/src/board/system76/addw2/include/board/keymap.h b/src/board/system76/addw2/include/board/keymap.h deleted file mode 100644 index 9c5b943..0000000 --- a/src/board/system76/addw2/include/board/keymap.h +++ /dev/null @@ -1,61 +0,0 @@ -// SPDX-License-Identifier: GPL-3.0-only - -#ifndef _BOARD_KEYMAP_H -#define _BOARD_KEYMAP_H - -// Keymap layers (normal, Fn) -#define KM_LAY 2 -// Keymap output pins -#define KM_OUT 18 -// Keymap input pins -#define KM_IN 8 - -// common/keymap.h requires KM_LAY, KM_OUT, and KM_IN definitions -#include - -// International keys -#ifndef KI1 - #define KI1 K_INT_1 -#endif -#ifndef KI2 - #define KI2 K_INT_2 -#endif - -// Conversion of physical layout to keyboard matrix -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, K0I, K0J, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, \ - K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F, K4G, \ - K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C \ -) { \ - { ___, ___, ___, ___, ___, ___, K50, K57 }, \ - { ___, ___, ___, ___, ___, ___, K53, K55 }, \ - { ___, ___, ___, ___, ___, ___, K40, K4B }, \ - { K52, ___, ___, ___, ___, ___, ___, K54 }, \ - { K41, K1H, ___, K2F, K4E, ___, ___, ___ }, \ - { K0I, K22, ___, ___, K1E, K3D, K3F, K30 }, \ - { K0J, K1B, K23, K39, ___, ___, K47, ___ }, \ - { K38, K26, K1A, K24, ___, K3A, K20, K00 }, \ - { K5B, K37, K2C, K19, K25, K07, K18, K01 }, \ - { K5C, K34, K36, K02, ___, K4G, K3B, K45 }, \ - { K1F, K48, ___, K2B, K32, K08, K06, K12 }, \ - { K1G, K49, K17, K33, ___, ___, K11, K2A }, \ - { K2D, KI1, K31, K4A, KI2, K03, K28, K16 }, \ - { ___, K44, K0D, K09, K46, K29, K15, K05 }, \ - { K21, K0A, K2E, K04, K3E, K0E, K0F, K14 }, \ - { K56, K42, K3C, K2H, K27, K2G, K13, K1D }, \ - { K0H, K0G, K43, K4C, K59, K10, K0B, K0C }, \ - { K35, K1C, K4F, K51, K4D, K58, K5A, ___ } \ -} - -// Position of physical Esc key in the matrix -#define MATRIX_ESC_INPUT 7 -#define MATRIX_ESC_OUTPUT 7 - -// Position of physical Fn key in the matrix -#define MATRIX_FN_INPUT 3 -#define MATRIX_FN_OUTPUT 17 - -#endif // _BOARD_KEYMAP_H diff --git a/src/board/system76/bonw14/board.mk b/src/board/system76/bonw14/board.mk index f625f40..e896ccb 100644 --- a/src/board/system76/bonw14/board.mk +++ b/src/board/system76/bonw14/board.mk @@ -2,9 +2,8 @@ EC=it5570e -# Add keymap to src -KEYMAP?=default -SRC+=$(BOARD_DIR)/keymap/$(KEYMAP).c +# Include keyboard +KEYBOARD=15in_102_nkey # Set keyboard LED mechanism KBLED=bonw14 diff --git a/src/board/system76/bonw14/keymap/default.c b/src/board/system76/bonw14/keymap/default.c deleted file mode 100644 index a8b9fa8..0000000 --- a/src/board/system76/bonw14/keymap/default.c +++ /dev/null @@ -1,24 +0,0 @@ -// SPDX-License-Identifier: GPL-3.0-only - -// Default layout - -#include - -uint16_t __code KEYMAP[KM_LAY][KM_OUT][KM_IN] = { -LAYOUT( - K_ESC, K_F1, K_F2, K_F3, K_F4, K_F5, K_F6, K_F7, K_F8, K_F9, K_F10, K_F11, K_F12, K_PRINT_SCREEN, K_INSERT, K_DEL, K_HOME, K_END, K_PGUP, K_PGDN, - K_TICK, K_1, K_2, K_3, K_4, K_5, K_6, K_7, K_8, K_9, K_0, K_MINUS, K_EQUALS, K_BKSP, K_NUM_LOCK, K_NUM_SLASH, K_NUM_ASTERISK, K_NUM_MINUS, - K_TAB, K_Q, K_W, K_E, K_R, K_T, K_Y, K_U, K_I, K_O, K_P, K_BRACE_OPEN, K_BRACE_CLOSE, K_BACKSLASH, K_NUM_7, K_NUM_8, K_NUM_9, K_NUM_PLUS, - K_CAPS, K_A, K_S, K_D, K_F, K_G, K_H, K_J, K_K, K_L, K_SEMICOLON, K_QUOTE, K_ENTER, K_NUM_4, K_NUM_5, K_NUM_6, - K_LEFT_SHIFT, K_Z, K_X, K_C, K_V, K_B, K_N, K_M, K_COMMA, K_PERIOD, K_SLASH, K_RIGHT_SHIFT, K_UP, K_NUM_1, K_NUM_2, K_NUM_3, K_NUM_ENTER, - K_LEFT_CTRL, KT_FN, K_LEFT_SUPER, K_LEFT_ALT, K_SPACE, K_RIGHT_ALT, K_APP, K_RIGHT_CTRL, K_LEFT, K_DOWN, K_RIGHT, K_NUM_0, K_NUM_PERIOD -), -LAYOUT( - K_ESC, K_TOUCHPAD, K_DISPLAY_TOGGLE, K_MUTE, K_F4, K_VOLUME_DOWN, K_VOLUME_UP, K_DISPLAY_MODE, K_BRIGHTNESS_DOWN, K_BRIGHTNESS_UP, K_CAMERA_TOGGLE, K_AIRPLANE_MODE, K_SUSPEND, K_PRINT_SCREEN, K_INSERT, K_DEL, K_HOME, K_END, K_PGUP, K_PGDN, - K_PLAY_PAUSE, K_FAN_TOGGLE, K_2, K_3, K_4, K_5, K_6, K_7, K_8, K_9, K_0, K_MINUS, K_EQUALS, K_BKSP, K_NUM_LOCK, K_KBD_COLOR, K_KBD_TOGGLE, K_KBD_DOWN, - K_TAB, K_Q, K_W, K_E, K_R, K_T, K_Y, K_U, K_I, K_O, K_P, K_BRACE_OPEN, K_BRACE_CLOSE, K_BACKSLASH, K_NUM_7, K_NUM_8, K_NUM_9, K_KBD_UP, - K_CAPS, K_A, K_S, K_D, K_F, K_G, K_H, K_J, K_K, K_L, K_SEMICOLON, K_QUOTE, K_ENTER, K_NUM_4, K_NUM_5, K_NUM_6, - K_LEFT_SHIFT, K_Z, K_X, K_C, K_V, K_B, K_N, K_M, K_COMMA, K_PERIOD, K_SLASH, K_RIGHT_SHIFT, K_UP, K_NUM_1, K_NUM_2, K_NUM_3, K_NUM_ENTER, - K_LEFT_CTRL, KT_FN, K_LEFT_SUPER, K_LEFT_ALT, K_SPACE, K_RIGHT_ALT, K_APP, K_RIGHT_CTRL, K_LEFT, K_DOWN, K_RIGHT, K_NUM_0, K_NUM_PERIOD -) -}; diff --git a/src/board/system76/bonw14/keymap/jeremy.c b/src/board/system76/bonw14/keymap/jeremy.c deleted file mode 100644 index 257fe36..0000000 --- a/src/board/system76/bonw14/keymap/jeremy.c +++ /dev/null @@ -1,24 +0,0 @@ -// SPDX-License-Identifier: GPL-3.0-only - -// Default layout - -#include - -uint16_t __code KEYMAP[KM_LAY][KM_OUT][KM_IN] = { -LAYOUT( - K_ESC, K_F1, K_F2, K_F3, K_F4, K_F5, K_F6, K_F7, K_F8, K_F9, K_F10, K_F11, K_F12, K_PRINT_SCREEN, K_INSERT, K_DEL, K_HOME, K_END, K_PGUP, K_PGDN, - K_TICK, K_1, K_2, K_3, K_4, K_5, K_6, K_7, K_8, K_9, K_0, K_MINUS, K_EQUALS, K_BKSP, K_NUM_LOCK, K_NUM_SLASH, K_NUM_ASTERISK, K_NUM_MINUS, - K_TAB, K_Q, K_W, K_E, K_R, K_T, K_Y, K_U, K_I, K_O, K_P, K_BRACE_OPEN, K_BRACE_CLOSE, K_BACKSLASH, K_NUM_7, K_NUM_8, K_NUM_9, K_NUM_PLUS, - KT_FN, K_A, K_S, K_D, K_F, K_G, K_H, K_J, K_K, K_L, K_SEMICOLON, K_QUOTE, K_ENTER, K_NUM_4, K_NUM_5, K_NUM_6, - K_LEFT_SHIFT, K_Z, K_X, K_C, K_V, K_B, K_N, K_M, K_COMMA, K_PERIOD, K_SLASH, K_RIGHT_SHIFT, K_UP, K_NUM_1, K_NUM_2, K_NUM_3, K_NUM_ENTER, - K_LEFT_CTRL, KT_FN, K_LEFT_ALT, K_LEFT_SUPER, K_SPACE, KT_FN, K_RIGHT_ALT, K_RIGHT_CTRL, K_LEFT, K_DOWN, K_RIGHT, K_NUM_0, K_NUM_PERIOD -), -LAYOUT( - K_ESC, K_TOUCHPAD, K_DISPLAY_TOGGLE, K_MUTE, K_F4, K_VOLUME_DOWN, K_VOLUME_UP, K_DISPLAY_MODE, K_BRIGHTNESS_DOWN, K_BRIGHTNESS_UP, K_CAMERA_TOGGLE, K_AIRPLANE_MODE, K_SUSPEND, K_PRINT_SCREEN, K_INSERT, K_DEL, K_HOME, K_END, K_PGUP, K_PGDN, - K_PLAY_PAUSE, K_FAN_TOGGLE, K_2, K_3, K_4, K_5, K_6, K_7, K_8, K_9, K_0, K_MINUS, K_EQUALS, K_DEL, K_NUM_LOCK, K_KBD_COLOR, K_KBD_TOGGLE, K_KBD_DOWN, - K_TAB, K_Q, K_W, K_E, K_R, K_T, K_Y, K_PGUP, K_HOME, K_PGDN, K_P, K_BRACE_OPEN, K_BRACE_CLOSE, K_BACKSLASH, K_NUM_7, K_NUM_8, K_NUM_9, K_KBD_UP, - KT_FN, K_A, K_S, K_D, K_F, K_G, K_LEFT, K_DOWN, K_UP, K_RIGHT, K_BKSP, K_DEL, K_ENTER, K_NUM_4, K_NUM_5, K_NUM_6, - K_LEFT_SHIFT, K_Z, K_X, K_C, K_V, K_B, K_END, K_M, K_COMMA, K_PERIOD, K_SLASH, K_RIGHT_SHIFT, K_UP, K_NUM_1, K_NUM_2, K_NUM_3, K_NUM_ENTER, - K_LEFT_CTRL, KT_FN, K_LEFT_ALT, K_LEFT_SUPER, K_ESC, KT_FN, K_RIGHT_ALT, K_RIGHT_CTRL, K_LEFT, K_DOWN, K_RIGHT, K_NUM_0, K_NUM_PERIOD -) -}; diff --git a/src/board/system76/common/common.mk b/src/board/system76/common/common.mk index 84c5230..6a12de8 100644 --- a/src/board/system76/common/common.mk +++ b/src/board/system76/common/common.mk @@ -36,6 +36,13 @@ CFLAGS+=\ CHARGER?=bq24780s SRC+=$(SYSTEM76_COMMON_DIR)/charger/$(CHARGER).c +# Add keyboard +ifndef KEYBOARD +$(error KEYBOARD is not set by the board) +endif +KEYBOARD_DIR=src/keyboard/system76/$(KEYBOARD) +include $(KEYBOARD_DIR)/keyboard.mk + # Add kbled KBLED?=none SRC+=$(SYSTEM76_COMMON_DIR)/kbled/$(KBLED).c diff --git a/src/board/system76/darp5/board.mk b/src/board/system76/darp5/board.mk index af68d3a..2b3e555 100644 --- a/src/board/system76/darp5/board.mk +++ b/src/board/system76/darp5/board.mk @@ -2,9 +2,8 @@ EC=it8587e -# Add keymap to src -KEYMAP?=default -SRC+=$(BOARD_DIR)/keymap/$(KEYMAP).c +# Include keyboard +KEYBOARD=15in_102 # Set keyboard LED mechanism KBLED=darp5 diff --git a/src/board/system76/darp5/include/board/keymap.h b/src/board/system76/darp5/include/board/keymap.h deleted file mode 100644 index 9c5b943..0000000 --- a/src/board/system76/darp5/include/board/keymap.h +++ /dev/null @@ -1,61 +0,0 @@ -// SPDX-License-Identifier: GPL-3.0-only - -#ifndef _BOARD_KEYMAP_H -#define _BOARD_KEYMAP_H - -// Keymap layers (normal, Fn) -#define KM_LAY 2 -// Keymap output pins -#define KM_OUT 18 -// Keymap input pins -#define KM_IN 8 - -// common/keymap.h requires KM_LAY, KM_OUT, and KM_IN definitions -#include - -// International keys -#ifndef KI1 - #define KI1 K_INT_1 -#endif -#ifndef KI2 - #define KI2 K_INT_2 -#endif - -// Conversion of physical layout to keyboard matrix -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, K0I, K0J, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, \ - K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F, K4G, \ - K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C \ -) { \ - { ___, ___, ___, ___, ___, ___, K50, K57 }, \ - { ___, ___, ___, ___, ___, ___, K53, K55 }, \ - { ___, ___, ___, ___, ___, ___, K40, K4B }, \ - { K52, ___, ___, ___, ___, ___, ___, K54 }, \ - { K41, K1H, ___, K2F, K4E, ___, ___, ___ }, \ - { K0I, K22, ___, ___, K1E, K3D, K3F, K30 }, \ - { K0J, K1B, K23, K39, ___, ___, K47, ___ }, \ - { K38, K26, K1A, K24, ___, K3A, K20, K00 }, \ - { K5B, K37, K2C, K19, K25, K07, K18, K01 }, \ - { K5C, K34, K36, K02, ___, K4G, K3B, K45 }, \ - { K1F, K48, ___, K2B, K32, K08, K06, K12 }, \ - { K1G, K49, K17, K33, ___, ___, K11, K2A }, \ - { K2D, KI1, K31, K4A, KI2, K03, K28, K16 }, \ - { ___, K44, K0D, K09, K46, K29, K15, K05 }, \ - { K21, K0A, K2E, K04, K3E, K0E, K0F, K14 }, \ - { K56, K42, K3C, K2H, K27, K2G, K13, K1D }, \ - { K0H, K0G, K43, K4C, K59, K10, K0B, K0C }, \ - { K35, K1C, K4F, K51, K4D, K58, K5A, ___ } \ -} - -// Position of physical Esc key in the matrix -#define MATRIX_ESC_INPUT 7 -#define MATRIX_ESC_OUTPUT 7 - -// Position of physical Fn key in the matrix -#define MATRIX_FN_INPUT 3 -#define MATRIX_FN_OUTPUT 17 - -#endif // _BOARD_KEYMAP_H diff --git a/src/board/system76/darp5/keymap/default.c b/src/board/system76/darp5/keymap/default.c deleted file mode 100644 index a8b9fa8..0000000 --- a/src/board/system76/darp5/keymap/default.c +++ /dev/null @@ -1,24 +0,0 @@ -// SPDX-License-Identifier: GPL-3.0-only - -// Default layout - -#include - -uint16_t __code KEYMAP[KM_LAY][KM_OUT][KM_IN] = { -LAYOUT( - K_ESC, K_F1, K_F2, K_F3, K_F4, K_F5, K_F6, K_F7, K_F8, K_F9, K_F10, K_F11, K_F12, K_PRINT_SCREEN, K_INSERT, K_DEL, K_HOME, K_END, K_PGUP, K_PGDN, - K_TICK, K_1, K_2, K_3, K_4, K_5, K_6, K_7, K_8, K_9, K_0, K_MINUS, K_EQUALS, K_BKSP, K_NUM_LOCK, K_NUM_SLASH, K_NUM_ASTERISK, K_NUM_MINUS, - K_TAB, K_Q, K_W, K_E, K_R, K_T, K_Y, K_U, K_I, K_O, K_P, K_BRACE_OPEN, K_BRACE_CLOSE, K_BACKSLASH, K_NUM_7, K_NUM_8, K_NUM_9, K_NUM_PLUS, - K_CAPS, K_A, K_S, K_D, K_F, K_G, K_H, K_J, K_K, K_L, K_SEMICOLON, K_QUOTE, K_ENTER, K_NUM_4, K_NUM_5, K_NUM_6, - K_LEFT_SHIFT, K_Z, K_X, K_C, K_V, K_B, K_N, K_M, K_COMMA, K_PERIOD, K_SLASH, K_RIGHT_SHIFT, K_UP, K_NUM_1, K_NUM_2, K_NUM_3, K_NUM_ENTER, - K_LEFT_CTRL, KT_FN, K_LEFT_SUPER, K_LEFT_ALT, K_SPACE, K_RIGHT_ALT, K_APP, K_RIGHT_CTRL, K_LEFT, K_DOWN, K_RIGHT, K_NUM_0, K_NUM_PERIOD -), -LAYOUT( - K_ESC, K_TOUCHPAD, K_DISPLAY_TOGGLE, K_MUTE, K_F4, K_VOLUME_DOWN, K_VOLUME_UP, K_DISPLAY_MODE, K_BRIGHTNESS_DOWN, K_BRIGHTNESS_UP, K_CAMERA_TOGGLE, K_AIRPLANE_MODE, K_SUSPEND, K_PRINT_SCREEN, K_INSERT, K_DEL, K_HOME, K_END, K_PGUP, K_PGDN, - K_PLAY_PAUSE, K_FAN_TOGGLE, K_2, K_3, K_4, K_5, K_6, K_7, K_8, K_9, K_0, K_MINUS, K_EQUALS, K_BKSP, K_NUM_LOCK, K_KBD_COLOR, K_KBD_TOGGLE, K_KBD_DOWN, - K_TAB, K_Q, K_W, K_E, K_R, K_T, K_Y, K_U, K_I, K_O, K_P, K_BRACE_OPEN, K_BRACE_CLOSE, K_BACKSLASH, K_NUM_7, K_NUM_8, K_NUM_9, K_KBD_UP, - K_CAPS, K_A, K_S, K_D, K_F, K_G, K_H, K_J, K_K, K_L, K_SEMICOLON, K_QUOTE, K_ENTER, K_NUM_4, K_NUM_5, K_NUM_6, - K_LEFT_SHIFT, K_Z, K_X, K_C, K_V, K_B, K_N, K_M, K_COMMA, K_PERIOD, K_SLASH, K_RIGHT_SHIFT, K_UP, K_NUM_1, K_NUM_2, K_NUM_3, K_NUM_ENTER, - K_LEFT_CTRL, KT_FN, K_LEFT_SUPER, K_LEFT_ALT, K_SPACE, K_RIGHT_ALT, K_APP, K_RIGHT_CTRL, K_LEFT, K_DOWN, K_RIGHT, K_NUM_0, K_NUM_PERIOD -) -}; diff --git a/src/board/system76/darp5/keymap/jeremy.c b/src/board/system76/darp5/keymap/jeremy.c deleted file mode 100644 index 257fe36..0000000 --- a/src/board/system76/darp5/keymap/jeremy.c +++ /dev/null @@ -1,24 +0,0 @@ -// SPDX-License-Identifier: GPL-3.0-only - -// Default layout - -#include - -uint16_t __code KEYMAP[KM_LAY][KM_OUT][KM_IN] = { -LAYOUT( - K_ESC, K_F1, K_F2, K_F3, K_F4, K_F5, K_F6, K_F7, K_F8, K_F9, K_F10, K_F11, K_F12, K_PRINT_SCREEN, K_INSERT, K_DEL, K_HOME, K_END, K_PGUP, K_PGDN, - K_TICK, K_1, K_2, K_3, K_4, K_5, K_6, K_7, K_8, K_9, K_0, K_MINUS, K_EQUALS, K_BKSP, K_NUM_LOCK, K_NUM_SLASH, K_NUM_ASTERISK, K_NUM_MINUS, - K_TAB, K_Q, K_W, K_E, K_R, K_T, K_Y, K_U, K_I, K_O, K_P, K_BRACE_OPEN, K_BRACE_CLOSE, K_BACKSLASH, K_NUM_7, K_NUM_8, K_NUM_9, K_NUM_PLUS, - KT_FN, K_A, K_S, K_D, K_F, K_G, K_H, K_J, K_K, K_L, K_SEMICOLON, K_QUOTE, K_ENTER, K_NUM_4, K_NUM_5, K_NUM_6, - K_LEFT_SHIFT, K_Z, K_X, K_C, K_V, K_B, K_N, K_M, K_COMMA, K_PERIOD, K_SLASH, K_RIGHT_SHIFT, K_UP, K_NUM_1, K_NUM_2, K_NUM_3, K_NUM_ENTER, - K_LEFT_CTRL, KT_FN, K_LEFT_ALT, K_LEFT_SUPER, K_SPACE, KT_FN, K_RIGHT_ALT, K_RIGHT_CTRL, K_LEFT, K_DOWN, K_RIGHT, K_NUM_0, K_NUM_PERIOD -), -LAYOUT( - K_ESC, K_TOUCHPAD, K_DISPLAY_TOGGLE, K_MUTE, K_F4, K_VOLUME_DOWN, K_VOLUME_UP, K_DISPLAY_MODE, K_BRIGHTNESS_DOWN, K_BRIGHTNESS_UP, K_CAMERA_TOGGLE, K_AIRPLANE_MODE, K_SUSPEND, K_PRINT_SCREEN, K_INSERT, K_DEL, K_HOME, K_END, K_PGUP, K_PGDN, - K_PLAY_PAUSE, K_FAN_TOGGLE, K_2, K_3, K_4, K_5, K_6, K_7, K_8, K_9, K_0, K_MINUS, K_EQUALS, K_DEL, K_NUM_LOCK, K_KBD_COLOR, K_KBD_TOGGLE, K_KBD_DOWN, - K_TAB, K_Q, K_W, K_E, K_R, K_T, K_Y, K_PGUP, K_HOME, K_PGDN, K_P, K_BRACE_OPEN, K_BRACE_CLOSE, K_BACKSLASH, K_NUM_7, K_NUM_8, K_NUM_9, K_KBD_UP, - KT_FN, K_A, K_S, K_D, K_F, K_G, K_LEFT, K_DOWN, K_UP, K_RIGHT, K_BKSP, K_DEL, K_ENTER, K_NUM_4, K_NUM_5, K_NUM_6, - K_LEFT_SHIFT, K_Z, K_X, K_C, K_V, K_B, K_END, K_M, K_COMMA, K_PERIOD, K_SLASH, K_RIGHT_SHIFT, K_UP, K_NUM_1, K_NUM_2, K_NUM_3, K_NUM_ENTER, - K_LEFT_CTRL, KT_FN, K_LEFT_ALT, K_LEFT_SUPER, K_ESC, KT_FN, K_RIGHT_ALT, K_RIGHT_CTRL, K_LEFT, K_DOWN, K_RIGHT, K_NUM_0, K_NUM_PERIOD -) -}; diff --git a/src/board/system76/darp7/board.mk b/src/board/system76/darp7/board.mk index 48e2097..d95e4db 100644 --- a/src/board/system76/darp7/board.mk +++ b/src/board/system76/darp7/board.mk @@ -5,9 +5,8 @@ EC=it5570e # Enable eSPI CFLAGS+=-DEC_ESPI=1 -# Add keymap to src -KEYMAP?=default -SRC+=$(BOARD_DIR)/keymap/$(KEYMAP).c +# Include keyboard +KEYBOARD=15in_102 # Set keyboard LED mechanism KBLED=rgb_pwm diff --git a/src/board/system76/darp7/include/board/keymap.h b/src/board/system76/darp7/include/board/keymap.h deleted file mode 100644 index 9c5b943..0000000 --- a/src/board/system76/darp7/include/board/keymap.h +++ /dev/null @@ -1,61 +0,0 @@ -// SPDX-License-Identifier: GPL-3.0-only - -#ifndef _BOARD_KEYMAP_H -#define _BOARD_KEYMAP_H - -// Keymap layers (normal, Fn) -#define KM_LAY 2 -// Keymap output pins -#define KM_OUT 18 -// Keymap input pins -#define KM_IN 8 - -// common/keymap.h requires KM_LAY, KM_OUT, and KM_IN definitions -#include - -// International keys -#ifndef KI1 - #define KI1 K_INT_1 -#endif -#ifndef KI2 - #define KI2 K_INT_2 -#endif - -// Conversion of physical layout to keyboard matrix -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, K0I, K0J, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, \ - K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F, K4G, \ - K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C \ -) { \ - { ___, ___, ___, ___, ___, ___, K50, K57 }, \ - { ___, ___, ___, ___, ___, ___, K53, K55 }, \ - { ___, ___, ___, ___, ___, ___, K40, K4B }, \ - { K52, ___, ___, ___, ___, ___, ___, K54 }, \ - { K41, K1H, ___, K2F, K4E, ___, ___, ___ }, \ - { K0I, K22, ___, ___, K1E, K3D, K3F, K30 }, \ - { K0J, K1B, K23, K39, ___, ___, K47, ___ }, \ - { K38, K26, K1A, K24, ___, K3A, K20, K00 }, \ - { K5B, K37, K2C, K19, K25, K07, K18, K01 }, \ - { K5C, K34, K36, K02, ___, K4G, K3B, K45 }, \ - { K1F, K48, ___, K2B, K32, K08, K06, K12 }, \ - { K1G, K49, K17, K33, ___, ___, K11, K2A }, \ - { K2D, KI1, K31, K4A, KI2, K03, K28, K16 }, \ - { ___, K44, K0D, K09, K46, K29, K15, K05 }, \ - { K21, K0A, K2E, K04, K3E, K0E, K0F, K14 }, \ - { K56, K42, K3C, K2H, K27, K2G, K13, K1D }, \ - { K0H, K0G, K43, K4C, K59, K10, K0B, K0C }, \ - { K35, K1C, K4F, K51, K4D, K58, K5A, ___ } \ -} - -// Position of physical Esc key in the matrix -#define MATRIX_ESC_INPUT 7 -#define MATRIX_ESC_OUTPUT 7 - -// Position of physical Fn key in the matrix -#define MATRIX_FN_INPUT 3 -#define MATRIX_FN_OUTPUT 17 - -#endif // _BOARD_KEYMAP_H diff --git a/src/board/system76/darp7/keymap/default.c b/src/board/system76/darp7/keymap/default.c deleted file mode 100644 index a8b9fa8..0000000 --- a/src/board/system76/darp7/keymap/default.c +++ /dev/null @@ -1,24 +0,0 @@ -// SPDX-License-Identifier: GPL-3.0-only - -// Default layout - -#include - -uint16_t __code KEYMAP[KM_LAY][KM_OUT][KM_IN] = { -LAYOUT( - K_ESC, K_F1, K_F2, K_F3, K_F4, K_F5, K_F6, K_F7, K_F8, K_F9, K_F10, K_F11, K_F12, K_PRINT_SCREEN, K_INSERT, K_DEL, K_HOME, K_END, K_PGUP, K_PGDN, - K_TICK, K_1, K_2, K_3, K_4, K_5, K_6, K_7, K_8, K_9, K_0, K_MINUS, K_EQUALS, K_BKSP, K_NUM_LOCK, K_NUM_SLASH, K_NUM_ASTERISK, K_NUM_MINUS, - K_TAB, K_Q, K_W, K_E, K_R, K_T, K_Y, K_U, K_I, K_O, K_P, K_BRACE_OPEN, K_BRACE_CLOSE, K_BACKSLASH, K_NUM_7, K_NUM_8, K_NUM_9, K_NUM_PLUS, - K_CAPS, K_A, K_S, K_D, K_F, K_G, K_H, K_J, K_K, K_L, K_SEMICOLON, K_QUOTE, K_ENTER, K_NUM_4, K_NUM_5, K_NUM_6, - K_LEFT_SHIFT, K_Z, K_X, K_C, K_V, K_B, K_N, K_M, K_COMMA, K_PERIOD, K_SLASH, K_RIGHT_SHIFT, K_UP, K_NUM_1, K_NUM_2, K_NUM_3, K_NUM_ENTER, - K_LEFT_CTRL, KT_FN, K_LEFT_SUPER, K_LEFT_ALT, K_SPACE, K_RIGHT_ALT, K_APP, K_RIGHT_CTRL, K_LEFT, K_DOWN, K_RIGHT, K_NUM_0, K_NUM_PERIOD -), -LAYOUT( - K_ESC, K_TOUCHPAD, K_DISPLAY_TOGGLE, K_MUTE, K_F4, K_VOLUME_DOWN, K_VOLUME_UP, K_DISPLAY_MODE, K_BRIGHTNESS_DOWN, K_BRIGHTNESS_UP, K_CAMERA_TOGGLE, K_AIRPLANE_MODE, K_SUSPEND, K_PRINT_SCREEN, K_INSERT, K_DEL, K_HOME, K_END, K_PGUP, K_PGDN, - K_PLAY_PAUSE, K_FAN_TOGGLE, K_2, K_3, K_4, K_5, K_6, K_7, K_8, K_9, K_0, K_MINUS, K_EQUALS, K_BKSP, K_NUM_LOCK, K_KBD_COLOR, K_KBD_TOGGLE, K_KBD_DOWN, - K_TAB, K_Q, K_W, K_E, K_R, K_T, K_Y, K_U, K_I, K_O, K_P, K_BRACE_OPEN, K_BRACE_CLOSE, K_BACKSLASH, K_NUM_7, K_NUM_8, K_NUM_9, K_KBD_UP, - K_CAPS, K_A, K_S, K_D, K_F, K_G, K_H, K_J, K_K, K_L, K_SEMICOLON, K_QUOTE, K_ENTER, K_NUM_4, K_NUM_5, K_NUM_6, - K_LEFT_SHIFT, K_Z, K_X, K_C, K_V, K_B, K_N, K_M, K_COMMA, K_PERIOD, K_SLASH, K_RIGHT_SHIFT, K_UP, K_NUM_1, K_NUM_2, K_NUM_3, K_NUM_ENTER, - K_LEFT_CTRL, KT_FN, K_LEFT_SUPER, K_LEFT_ALT, K_SPACE, K_RIGHT_ALT, K_APP, K_RIGHT_CTRL, K_LEFT, K_DOWN, K_RIGHT, K_NUM_0, K_NUM_PERIOD -) -}; diff --git a/src/board/system76/darp7/keymap/jeremy.c b/src/board/system76/darp7/keymap/jeremy.c deleted file mode 100644 index 257fe36..0000000 --- a/src/board/system76/darp7/keymap/jeremy.c +++ /dev/null @@ -1,24 +0,0 @@ -// SPDX-License-Identifier: GPL-3.0-only - -// Default layout - -#include - -uint16_t __code KEYMAP[KM_LAY][KM_OUT][KM_IN] = { -LAYOUT( - K_ESC, K_F1, K_F2, K_F3, K_F4, K_F5, K_F6, K_F7, K_F8, K_F9, K_F10, K_F11, K_F12, K_PRINT_SCREEN, K_INSERT, K_DEL, K_HOME, K_END, K_PGUP, K_PGDN, - K_TICK, K_1, K_2, K_3, K_4, K_5, K_6, K_7, K_8, K_9, K_0, K_MINUS, K_EQUALS, K_BKSP, K_NUM_LOCK, K_NUM_SLASH, K_NUM_ASTERISK, K_NUM_MINUS, - K_TAB, K_Q, K_W, K_E, K_R, K_T, K_Y, K_U, K_I, K_O, K_P, K_BRACE_OPEN, K_BRACE_CLOSE, K_BACKSLASH, K_NUM_7, K_NUM_8, K_NUM_9, K_NUM_PLUS, - KT_FN, K_A, K_S, K_D, K_F, K_G, K_H, K_J, K_K, K_L, K_SEMICOLON, K_QUOTE, K_ENTER, K_NUM_4, K_NUM_5, K_NUM_6, - K_LEFT_SHIFT, K_Z, K_X, K_C, K_V, K_B, K_N, K_M, K_COMMA, K_PERIOD, K_SLASH, K_RIGHT_SHIFT, K_UP, K_NUM_1, K_NUM_2, K_NUM_3, K_NUM_ENTER, - K_LEFT_CTRL, KT_FN, K_LEFT_ALT, K_LEFT_SUPER, K_SPACE, KT_FN, K_RIGHT_ALT, K_RIGHT_CTRL, K_LEFT, K_DOWN, K_RIGHT, K_NUM_0, K_NUM_PERIOD -), -LAYOUT( - K_ESC, K_TOUCHPAD, K_DISPLAY_TOGGLE, K_MUTE, K_F4, K_VOLUME_DOWN, K_VOLUME_UP, K_DISPLAY_MODE, K_BRIGHTNESS_DOWN, K_BRIGHTNESS_UP, K_CAMERA_TOGGLE, K_AIRPLANE_MODE, K_SUSPEND, K_PRINT_SCREEN, K_INSERT, K_DEL, K_HOME, K_END, K_PGUP, K_PGDN, - K_PLAY_PAUSE, K_FAN_TOGGLE, K_2, K_3, K_4, K_5, K_6, K_7, K_8, K_9, K_0, K_MINUS, K_EQUALS, K_DEL, K_NUM_LOCK, K_KBD_COLOR, K_KBD_TOGGLE, K_KBD_DOWN, - K_TAB, K_Q, K_W, K_E, K_R, K_T, K_Y, K_PGUP, K_HOME, K_PGDN, K_P, K_BRACE_OPEN, K_BRACE_CLOSE, K_BACKSLASH, K_NUM_7, K_NUM_8, K_NUM_9, K_KBD_UP, - KT_FN, K_A, K_S, K_D, K_F, K_G, K_LEFT, K_DOWN, K_UP, K_RIGHT, K_BKSP, K_DEL, K_ENTER, K_NUM_4, K_NUM_5, K_NUM_6, - K_LEFT_SHIFT, K_Z, K_X, K_C, K_V, K_B, K_END, K_M, K_COMMA, K_PERIOD, K_SLASH, K_RIGHT_SHIFT, K_UP, K_NUM_1, K_NUM_2, K_NUM_3, K_NUM_ENTER, - K_LEFT_CTRL, KT_FN, K_LEFT_ALT, K_LEFT_SUPER, K_ESC, KT_FN, K_RIGHT_ALT, K_RIGHT_CTRL, K_LEFT, K_DOWN, K_RIGHT, K_NUM_0, K_NUM_PERIOD -) -}; diff --git a/src/board/system76/galp3-c/board.mk b/src/board/system76/galp3-c/board.mk index 7fe9a7d..9daccfb 100644 --- a/src/board/system76/galp3-c/board.mk +++ b/src/board/system76/galp3-c/board.mk @@ -2,9 +2,8 @@ EC=it8587e -# Add keymap to src -KEYMAP?=default -SRC+=$(BOARD_DIR)/keymap/$(KEYMAP).c +# Include keyboard +KEYBOARD=14in_86 # Set keyboard LED mechanism KBLED=white_dac diff --git a/src/board/system76/galp5/board.mk b/src/board/system76/galp5/board.mk index 5fd9f6a..f910a90 100644 --- a/src/board/system76/galp5/board.mk +++ b/src/board/system76/galp5/board.mk @@ -5,9 +5,8 @@ EC=it5570e # Enable eSPI CFLAGS+=-DEC_ESPI=1 -# Add keymap to src -KEYMAP?=default -SRC+=$(BOARD_DIR)/keymap/$(KEYMAP).c +# Include keyboard +KEYBOARD=14in_83 # Set keyboard LED mechanism KBLED=white_dac diff --git a/src/board/system76/galp5/include/board/keymap.h b/src/board/system76/galp5/include/board/keymap.h deleted file mode 100644 index 843d1f0..0000000 --- a/src/board/system76/galp5/include/board/keymap.h +++ /dev/null @@ -1,52 +0,0 @@ -// SPDX-License-Identifier: GPL-3.0-only - -#ifndef _BOARD_KEYMAP_H -#define _BOARD_KEYMAP_H - -// Keymap layers (normal, Fn) -#define KM_LAY 2 -// Keymap output pins -#define KM_OUT 16 -// Keymap input pins -#define KM_IN 8 - -// common/keymap.h requires KM_LAY, KM_OUT, and KM_IN definitions -#include - -// Conversion of physical layout to keyboard matrix -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, \ - K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, \ - K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, \ - K60, K61, K62 \ -) { \ - { ___, ___, ___, ___, ___, ___, K52, ___ }, \ - { ___, ___, ___, ___, ___, ___, K50, K56 }, \ - { ___, ___, ___, ___, ___, ___, K53, K55 }, \ - { ___, ___, ___, ___, ___, ___, K40, K4B }, \ - { K42, K41, K30, K31, K20, ___, K54, K21 }, \ - { K44, K43, ___, K33, ___, ___, ___, K23 }, \ - { K51, K45, K34, K35, K24, K25, ___, ___ }, \ - { ___, K46, K36, K26, K12, K11, K10, K00 }, \ - { K28, K47, K27, K15, K14, K13, K02, K01 }, \ - { K22, K37, K38, ___, K17, K16, K04, K03 }, \ - { K32, K48, K39, K29, K19, K18, K06, K05 }, \ - { ___, K58, K49, K3A, K2A, K1A, K08, K07 }, \ - { ___, ___, K4A, K3B, K2B, K1B, K0A, K09 }, \ - { ___, ___, K0D, K2C, K1C, K62, K0E, K0B }, \ - { ___, K2D, K60, K1D, K57, K0F, ___, K0G }, \ - { ___, ___, K3C, ___, K61, K0C, ___, K59 } \ -} - -// Position of physical Esc key in the matrix -#define MATRIX_ESC_INPUT 7 -#define MATRIX_ESC_OUTPUT 7 - -// Position of physical Fn key in the matrix -#define MATRIX_FN_INPUT 0 -#define MATRIX_FN_OUTPUT 6 - -#endif // _BOARD_KEYMAP_H diff --git a/src/board/system76/gaze15/board.mk b/src/board/system76/gaze15/board.mk index 3388ad2..fd67efb 100644 --- a/src/board/system76/gaze15/board.mk +++ b/src/board/system76/gaze15/board.mk @@ -2,9 +2,8 @@ EC=it5570e -# Add keymap to src -KEYMAP?=default -SRC+=$(BOARD_DIR)/keymap/$(KEYMAP).c +# Include keyboard +KEYBOARD=15in_102 # Set keyboard LED mechanism KBLED=rgb_pwm diff --git a/src/board/system76/gaze15/include/board/keymap.h b/src/board/system76/gaze15/include/board/keymap.h deleted file mode 100644 index 9c5b943..0000000 --- a/src/board/system76/gaze15/include/board/keymap.h +++ /dev/null @@ -1,61 +0,0 @@ -// SPDX-License-Identifier: GPL-3.0-only - -#ifndef _BOARD_KEYMAP_H -#define _BOARD_KEYMAP_H - -// Keymap layers (normal, Fn) -#define KM_LAY 2 -// Keymap output pins -#define KM_OUT 18 -// Keymap input pins -#define KM_IN 8 - -// common/keymap.h requires KM_LAY, KM_OUT, and KM_IN definitions -#include - -// International keys -#ifndef KI1 - #define KI1 K_INT_1 -#endif -#ifndef KI2 - #define KI2 K_INT_2 -#endif - -// Conversion of physical layout to keyboard matrix -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, K0I, K0J, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, \ - K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F, K4G, \ - K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C \ -) { \ - { ___, ___, ___, ___, ___, ___, K50, K57 }, \ - { ___, ___, ___, ___, ___, ___, K53, K55 }, \ - { ___, ___, ___, ___, ___, ___, K40, K4B }, \ - { K52, ___, ___, ___, ___, ___, ___, K54 }, \ - { K41, K1H, ___, K2F, K4E, ___, ___, ___ }, \ - { K0I, K22, ___, ___, K1E, K3D, K3F, K30 }, \ - { K0J, K1B, K23, K39, ___, ___, K47, ___ }, \ - { K38, K26, K1A, K24, ___, K3A, K20, K00 }, \ - { K5B, K37, K2C, K19, K25, K07, K18, K01 }, \ - { K5C, K34, K36, K02, ___, K4G, K3B, K45 }, \ - { K1F, K48, ___, K2B, K32, K08, K06, K12 }, \ - { K1G, K49, K17, K33, ___, ___, K11, K2A }, \ - { K2D, KI1, K31, K4A, KI2, K03, K28, K16 }, \ - { ___, K44, K0D, K09, K46, K29, K15, K05 }, \ - { K21, K0A, K2E, K04, K3E, K0E, K0F, K14 }, \ - { K56, K42, K3C, K2H, K27, K2G, K13, K1D }, \ - { K0H, K0G, K43, K4C, K59, K10, K0B, K0C }, \ - { K35, K1C, K4F, K51, K4D, K58, K5A, ___ } \ -} - -// Position of physical Esc key in the matrix -#define MATRIX_ESC_INPUT 7 -#define MATRIX_ESC_OUTPUT 7 - -// Position of physical Fn key in the matrix -#define MATRIX_FN_INPUT 3 -#define MATRIX_FN_OUTPUT 17 - -#endif // _BOARD_KEYMAP_H diff --git a/src/board/system76/gaze15/keymap/default.c b/src/board/system76/gaze15/keymap/default.c deleted file mode 100644 index a8b9fa8..0000000 --- a/src/board/system76/gaze15/keymap/default.c +++ /dev/null @@ -1,24 +0,0 @@ -// SPDX-License-Identifier: GPL-3.0-only - -// Default layout - -#include - -uint16_t __code KEYMAP[KM_LAY][KM_OUT][KM_IN] = { -LAYOUT( - K_ESC, K_F1, K_F2, K_F3, K_F4, K_F5, K_F6, K_F7, K_F8, K_F9, K_F10, K_F11, K_F12, K_PRINT_SCREEN, K_INSERT, K_DEL, K_HOME, K_END, K_PGUP, K_PGDN, - K_TICK, K_1, K_2, K_3, K_4, K_5, K_6, K_7, K_8, K_9, K_0, K_MINUS, K_EQUALS, K_BKSP, K_NUM_LOCK, K_NUM_SLASH, K_NUM_ASTERISK, K_NUM_MINUS, - K_TAB, K_Q, K_W, K_E, K_R, K_T, K_Y, K_U, K_I, K_O, K_P, K_BRACE_OPEN, K_BRACE_CLOSE, K_BACKSLASH, K_NUM_7, K_NUM_8, K_NUM_9, K_NUM_PLUS, - K_CAPS, K_A, K_S, K_D, K_F, K_G, K_H, K_J, K_K, K_L, K_SEMICOLON, K_QUOTE, K_ENTER, K_NUM_4, K_NUM_5, K_NUM_6, - K_LEFT_SHIFT, K_Z, K_X, K_C, K_V, K_B, K_N, K_M, K_COMMA, K_PERIOD, K_SLASH, K_RIGHT_SHIFT, K_UP, K_NUM_1, K_NUM_2, K_NUM_3, K_NUM_ENTER, - K_LEFT_CTRL, KT_FN, K_LEFT_SUPER, K_LEFT_ALT, K_SPACE, K_RIGHT_ALT, K_APP, K_RIGHT_CTRL, K_LEFT, K_DOWN, K_RIGHT, K_NUM_0, K_NUM_PERIOD -), -LAYOUT( - K_ESC, K_TOUCHPAD, K_DISPLAY_TOGGLE, K_MUTE, K_F4, K_VOLUME_DOWN, K_VOLUME_UP, K_DISPLAY_MODE, K_BRIGHTNESS_DOWN, K_BRIGHTNESS_UP, K_CAMERA_TOGGLE, K_AIRPLANE_MODE, K_SUSPEND, K_PRINT_SCREEN, K_INSERT, K_DEL, K_HOME, K_END, K_PGUP, K_PGDN, - K_PLAY_PAUSE, K_FAN_TOGGLE, K_2, K_3, K_4, K_5, K_6, K_7, K_8, K_9, K_0, K_MINUS, K_EQUALS, K_BKSP, K_NUM_LOCK, K_KBD_COLOR, K_KBD_TOGGLE, K_KBD_DOWN, - K_TAB, K_Q, K_W, K_E, K_R, K_T, K_Y, K_U, K_I, K_O, K_P, K_BRACE_OPEN, K_BRACE_CLOSE, K_BACKSLASH, K_NUM_7, K_NUM_8, K_NUM_9, K_KBD_UP, - K_CAPS, K_A, K_S, K_D, K_F, K_G, K_H, K_J, K_K, K_L, K_SEMICOLON, K_QUOTE, K_ENTER, K_NUM_4, K_NUM_5, K_NUM_6, - K_LEFT_SHIFT, K_Z, K_X, K_C, K_V, K_B, K_N, K_M, K_COMMA, K_PERIOD, K_SLASH, K_RIGHT_SHIFT, K_UP, K_NUM_1, K_NUM_2, K_NUM_3, K_NUM_ENTER, - K_LEFT_CTRL, KT_FN, K_LEFT_SUPER, K_LEFT_ALT, K_SPACE, K_RIGHT_ALT, K_APP, K_RIGHT_CTRL, K_LEFT, K_DOWN, K_RIGHT, K_NUM_0, K_NUM_PERIOD -) -}; diff --git a/src/board/system76/gaze15/keymap/jeremy.c b/src/board/system76/gaze15/keymap/jeremy.c deleted file mode 100644 index 257fe36..0000000 --- a/src/board/system76/gaze15/keymap/jeremy.c +++ /dev/null @@ -1,24 +0,0 @@ -// SPDX-License-Identifier: GPL-3.0-only - -// Default layout - -#include - -uint16_t __code KEYMAP[KM_LAY][KM_OUT][KM_IN] = { -LAYOUT( - K_ESC, K_F1, K_F2, K_F3, K_F4, K_F5, K_F6, K_F7, K_F8, K_F9, K_F10, K_F11, K_F12, K_PRINT_SCREEN, K_INSERT, K_DEL, K_HOME, K_END, K_PGUP, K_PGDN, - K_TICK, K_1, K_2, K_3, K_4, K_5, K_6, K_7, K_8, K_9, K_0, K_MINUS, K_EQUALS, K_BKSP, K_NUM_LOCK, K_NUM_SLASH, K_NUM_ASTERISK, K_NUM_MINUS, - K_TAB, K_Q, K_W, K_E, K_R, K_T, K_Y, K_U, K_I, K_O, K_P, K_BRACE_OPEN, K_BRACE_CLOSE, K_BACKSLASH, K_NUM_7, K_NUM_8, K_NUM_9, K_NUM_PLUS, - KT_FN, K_A, K_S, K_D, K_F, K_G, K_H, K_J, K_K, K_L, K_SEMICOLON, K_QUOTE, K_ENTER, K_NUM_4, K_NUM_5, K_NUM_6, - K_LEFT_SHIFT, K_Z, K_X, K_C, K_V, K_B, K_N, K_M, K_COMMA, K_PERIOD, K_SLASH, K_RIGHT_SHIFT, K_UP, K_NUM_1, K_NUM_2, K_NUM_3, K_NUM_ENTER, - K_LEFT_CTRL, KT_FN, K_LEFT_ALT, K_LEFT_SUPER, K_SPACE, KT_FN, K_RIGHT_ALT, K_RIGHT_CTRL, K_LEFT, K_DOWN, K_RIGHT, K_NUM_0, K_NUM_PERIOD -), -LAYOUT( - K_ESC, K_TOUCHPAD, K_DISPLAY_TOGGLE, K_MUTE, K_F4, K_VOLUME_DOWN, K_VOLUME_UP, K_DISPLAY_MODE, K_BRIGHTNESS_DOWN, K_BRIGHTNESS_UP, K_CAMERA_TOGGLE, K_AIRPLANE_MODE, K_SUSPEND, K_PRINT_SCREEN, K_INSERT, K_DEL, K_HOME, K_END, K_PGUP, K_PGDN, - K_PLAY_PAUSE, K_FAN_TOGGLE, K_2, K_3, K_4, K_5, K_6, K_7, K_8, K_9, K_0, K_MINUS, K_EQUALS, K_DEL, K_NUM_LOCK, K_KBD_COLOR, K_KBD_TOGGLE, K_KBD_DOWN, - K_TAB, K_Q, K_W, K_E, K_R, K_T, K_Y, K_PGUP, K_HOME, K_PGDN, K_P, K_BRACE_OPEN, K_BRACE_CLOSE, K_BACKSLASH, K_NUM_7, K_NUM_8, K_NUM_9, K_KBD_UP, - KT_FN, K_A, K_S, K_D, K_F, K_G, K_LEFT, K_DOWN, K_UP, K_RIGHT, K_BKSP, K_DEL, K_ENTER, K_NUM_4, K_NUM_5, K_NUM_6, - K_LEFT_SHIFT, K_Z, K_X, K_C, K_V, K_B, K_END, K_M, K_COMMA, K_PERIOD, K_SLASH, K_RIGHT_SHIFT, K_UP, K_NUM_1, K_NUM_2, K_NUM_3, K_NUM_ENTER, - K_LEFT_CTRL, KT_FN, K_LEFT_ALT, K_LEFT_SUPER, K_ESC, KT_FN, K_RIGHT_ALT, K_RIGHT_CTRL, K_LEFT, K_DOWN, K_RIGHT, K_NUM_0, K_NUM_PERIOD -) -}; diff --git a/src/board/system76/lemp10/board.mk b/src/board/system76/lemp10/board.mk index f3f2d17..9d09b54 100644 --- a/src/board/system76/lemp10/board.mk +++ b/src/board/system76/lemp10/board.mk @@ -5,9 +5,8 @@ EC=it5570e # Enable eSPI CFLAGS+=-DEC_ESPI=1 -# Add keymap to src -KEYMAP?=default -SRC+=$(BOARD_DIR)/keymap/$(KEYMAP).c +# Include keyboard +KEYBOARD=14in_83 # Set keyboard LED mechanism KBLED=white_dac diff --git a/src/board/system76/lemp10/include/board/keymap.h b/src/board/system76/lemp10/include/board/keymap.h deleted file mode 100644 index 843d1f0..0000000 --- a/src/board/system76/lemp10/include/board/keymap.h +++ /dev/null @@ -1,52 +0,0 @@ -// SPDX-License-Identifier: GPL-3.0-only - -#ifndef _BOARD_KEYMAP_H -#define _BOARD_KEYMAP_H - -// Keymap layers (normal, Fn) -#define KM_LAY 2 -// Keymap output pins -#define KM_OUT 16 -// Keymap input pins -#define KM_IN 8 - -// common/keymap.h requires KM_LAY, KM_OUT, and KM_IN definitions -#include - -// Conversion of physical layout to keyboard matrix -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, \ - K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, \ - K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, \ - K60, K61, K62 \ -) { \ - { ___, ___, ___, ___, ___, ___, K52, ___ }, \ - { ___, ___, ___, ___, ___, ___, K50, K56 }, \ - { ___, ___, ___, ___, ___, ___, K53, K55 }, \ - { ___, ___, ___, ___, ___, ___, K40, K4B }, \ - { K42, K41, K30, K31, K20, ___, K54, K21 }, \ - { K44, K43, ___, K33, ___, ___, ___, K23 }, \ - { K51, K45, K34, K35, K24, K25, ___, ___ }, \ - { ___, K46, K36, K26, K12, K11, K10, K00 }, \ - { K28, K47, K27, K15, K14, K13, K02, K01 }, \ - { K22, K37, K38, ___, K17, K16, K04, K03 }, \ - { K32, K48, K39, K29, K19, K18, K06, K05 }, \ - { ___, K58, K49, K3A, K2A, K1A, K08, K07 }, \ - { ___, ___, K4A, K3B, K2B, K1B, K0A, K09 }, \ - { ___, ___, K0D, K2C, K1C, K62, K0E, K0B }, \ - { ___, K2D, K60, K1D, K57, K0F, ___, K0G }, \ - { ___, ___, K3C, ___, K61, K0C, ___, K59 } \ -} - -// Position of physical Esc key in the matrix -#define MATRIX_ESC_INPUT 7 -#define MATRIX_ESC_OUTPUT 7 - -// Position of physical Fn key in the matrix -#define MATRIX_FN_INPUT 0 -#define MATRIX_FN_OUTPUT 6 - -#endif // _BOARD_KEYMAP_H diff --git a/src/board/system76/lemp10/keymap/default.c b/src/board/system76/lemp10/keymap/default.c deleted file mode 100644 index 9381d95..0000000 --- a/src/board/system76/lemp10/keymap/default.c +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-License-Identifier: GPL-3.0-only - -// Default layout - -#include - -uint16_t __code KEYMAP[KM_LAY][KM_OUT][KM_IN] = { -LAYOUT( - K_ESC, K_F1, K_F2, K_F3, K_F4, K_F5, K_F6, K_F7, K_F8, K_F9, K_F10, K_F11, K_F12, K_HOME, K_END, K_PRINT_SCREEN, K_DEL, - K_TICK, K_1, K_2, K_3, K_4, K_5, K_6, K_7, K_8, K_9, K_0, K_MINUS, K_EQUALS, K_BKSP, - K_TAB, K_Q, K_W, K_E, K_R, K_T, K_Y, K_U, K_I, K_O, K_P, K_BRACE_OPEN, K_BRACE_CLOSE, K_BACKSLASH, - K_CAPS, K_A, K_S, K_D, K_F, K_G, K_H, K_J, K_K, K_L, K_SEMICOLON, K_QUOTE, K_ENTER, - K_LEFT_SHIFT, K_Z, K_X, K_C, K_V, K_B, K_N, K_M, K_COMMA, K_PERIOD, K_SLASH, K_RIGHT_SHIFT, - K_LEFT_CTRL, KT_FN, K_LEFT_SUPER, K_LEFT_ALT, K_SPACE, K_RIGHT_ALT, K_RIGHT_CTRL, K_PGUP, K_UP, K_PGDN, - K_LEFT, K_DOWN, K_RIGHT -), -LAYOUT( - K_ESC, K_TOUCHPAD, K_DISPLAY_TOGGLE, K_MUTE, K_KBD_BKL, K_VOLUME_DOWN, K_VOLUME_UP, K_DISPLAY_MODE, K_BRIGHTNESS_DOWN, K_BRIGHTNESS_UP, K_CAMERA_TOGGLE, K_AIRPLANE_MODE, K_SUSPEND, K_HOME, K_END, K_PRINT_SCREEN, K_DEL, - K_PLAY_PAUSE, K_FAN_TOGGLE, K_2, K_3, K_4, K_5, K_6, K_7, K_8, K_9, K_0, K_MINUS, K_EQUALS, K_BKSP, - K_TAB, K_Q, K_W, K_E, K_R, K_T, K_Y, K_U, K_I, K_O, K_P, K_BRACE_OPEN, K_BRACE_CLOSE, K_BACKSLASH, - K_CAPS, K_A, K_S, K_D, K_F, K_G, K_H, K_J, K_K, K_L, K_SEMICOLON, K_QUOTE, K_ENTER, - K_LEFT_SHIFT, K_Z, K_X, K_C, K_V, K_B, K_N, K_M, K_COMMA, K_PERIOD, K_SLASH, K_RIGHT_SHIFT, - K_LEFT_CTRL, KT_FN, K_LEFT_SUPER, K_LEFT_ALT, K_SPACE, K_RIGHT_ALT, K_APP, K_PGUP, K_UP, K_PGDN, - K_LEFT, K_DOWN, K_RIGHT -) -}; diff --git a/src/board/system76/lemp10/keymap/jeremy.c b/src/board/system76/lemp10/keymap/jeremy.c deleted file mode 100644 index f1a390f..0000000 --- a/src/board/system76/lemp10/keymap/jeremy.c +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-License-Identifier: GPL-3.0-only - -// Jeremy's layout - -#include - -uint16_t __code KEYMAP[KM_LAY][KM_OUT][KM_IN] = { -LAYOUT( - K_ESC, K_F1, K_F2, K_F3, K_F4, K_F5, K_F6, K_F7, K_F8, K_F9, K_F10, K_F11, K_F12, K_HOME, K_END, K_PRINT_SCREEN, K_DEL, - K_TICK, K_1, K_2, K_3, K_4, K_5, K_6, K_7, K_8, K_9, K_0, K_MINUS, K_EQUALS, K_BKSP, - K_TAB, K_Q, K_W, K_E, K_R, K_T, K_Y, K_U, K_I, K_O, K_P, K_BRACE_OPEN, K_BRACE_CLOSE, K_BACKSLASH, - KT_FN, K_A, K_S, K_D, K_F, K_G, K_H, K_J, K_K, K_L, K_SEMICOLON, K_QUOTE, K_ENTER, - K_LEFT_SHIFT, K_Z, K_X, K_C, K_V, K_B, K_N, K_M, K_COMMA, K_PERIOD, K_SLASH, K_RIGHT_SHIFT, - K_LEFT_CTRL, KT_FN, K_LEFT_ALT, K_LEFT_SUPER, K_SPACE, K_RIGHT_ALT, K_RIGHT_CTRL, K_PGUP, K_UP, K_PGDN, - K_LEFT, K_DOWN, K_RIGHT -), -LAYOUT( - K_ESC, K_TOUCHPAD, K_DISPLAY_TOGGLE, K_MUTE, K_KBD_BKL, K_VOLUME_DOWN, K_VOLUME_UP, K_DISPLAY_MODE, K_BRIGHTNESS_DOWN, K_BRIGHTNESS_UP, K_CAMERA_TOGGLE, K_AIRPLANE_MODE, K_SUSPEND, K_HOME, K_END, K_PRINT_SCREEN, K_DEL, - K_PLAY_PAUSE, K_FAN_TOGGLE, K_2, K_3, K_4, K_5, K_6, K_7, K_8, K_9, K_0, K_MINUS, K_EQUALS, K_DEL, - K_TAB, K_Q, K_W, K_E, K_R, K_T, K_Y, K_PGUP, K_HOME, K_PGDN, K_P, K_BRACE_OPEN, K_BRACE_CLOSE, K_BACKSLASH, - KT_FN, K_A, K_S, K_D, K_F, K_G, K_LEFT, K_DOWN, K_UP, K_RIGHT, K_BKSP, K_DEL, K_ENTER, - K_LEFT_SHIFT, K_Z, K_X, K_C, K_V, K_B, K_END, K_M, K_COMMA, K_PERIOD, K_SLASH, K_RIGHT_SHIFT, - K_LEFT_CTRL, KT_FN, K_LEFT_ALT, K_LEFT_SUPER, K_ESC, K_RIGHT_ALT, K_APP, K_PGUP, K_UP, K_PGDN, - K_LEFT, K_DOWN, K_RIGHT -) -}; diff --git a/src/board/system76/lemp9/board.mk b/src/board/system76/lemp9/board.mk index 26b603c..ccadf01 100644 --- a/src/board/system76/lemp9/board.mk +++ b/src/board/system76/lemp9/board.mk @@ -2,9 +2,8 @@ EC=it5570e -# Add keymap to src -KEYMAP?=default -SRC+=$(BOARD_DIR)/keymap/$(KEYMAP).c +# Include keyboard +KEYBOARD=14in_83 # Set keyboard LED mechanism KBLED=white_dac diff --git a/src/board/system76/lemp9/keymap/default.c b/src/board/system76/lemp9/keymap/default.c deleted file mode 100644 index 9381d95..0000000 --- a/src/board/system76/lemp9/keymap/default.c +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-License-Identifier: GPL-3.0-only - -// Default layout - -#include - -uint16_t __code KEYMAP[KM_LAY][KM_OUT][KM_IN] = { -LAYOUT( - K_ESC, K_F1, K_F2, K_F3, K_F4, K_F5, K_F6, K_F7, K_F8, K_F9, K_F10, K_F11, K_F12, K_HOME, K_END, K_PRINT_SCREEN, K_DEL, - K_TICK, K_1, K_2, K_3, K_4, K_5, K_6, K_7, K_8, K_9, K_0, K_MINUS, K_EQUALS, K_BKSP, - K_TAB, K_Q, K_W, K_E, K_R, K_T, K_Y, K_U, K_I, K_O, K_P, K_BRACE_OPEN, K_BRACE_CLOSE, K_BACKSLASH, - K_CAPS, K_A, K_S, K_D, K_F, K_G, K_H, K_J, K_K, K_L, K_SEMICOLON, K_QUOTE, K_ENTER, - K_LEFT_SHIFT, K_Z, K_X, K_C, K_V, K_B, K_N, K_M, K_COMMA, K_PERIOD, K_SLASH, K_RIGHT_SHIFT, - K_LEFT_CTRL, KT_FN, K_LEFT_SUPER, K_LEFT_ALT, K_SPACE, K_RIGHT_ALT, K_RIGHT_CTRL, K_PGUP, K_UP, K_PGDN, - K_LEFT, K_DOWN, K_RIGHT -), -LAYOUT( - K_ESC, K_TOUCHPAD, K_DISPLAY_TOGGLE, K_MUTE, K_KBD_BKL, K_VOLUME_DOWN, K_VOLUME_UP, K_DISPLAY_MODE, K_BRIGHTNESS_DOWN, K_BRIGHTNESS_UP, K_CAMERA_TOGGLE, K_AIRPLANE_MODE, K_SUSPEND, K_HOME, K_END, K_PRINT_SCREEN, K_DEL, - K_PLAY_PAUSE, K_FAN_TOGGLE, K_2, K_3, K_4, K_5, K_6, K_7, K_8, K_9, K_0, K_MINUS, K_EQUALS, K_BKSP, - K_TAB, K_Q, K_W, K_E, K_R, K_T, K_Y, K_U, K_I, K_O, K_P, K_BRACE_OPEN, K_BRACE_CLOSE, K_BACKSLASH, - K_CAPS, K_A, K_S, K_D, K_F, K_G, K_H, K_J, K_K, K_L, K_SEMICOLON, K_QUOTE, K_ENTER, - K_LEFT_SHIFT, K_Z, K_X, K_C, K_V, K_B, K_N, K_M, K_COMMA, K_PERIOD, K_SLASH, K_RIGHT_SHIFT, - K_LEFT_CTRL, KT_FN, K_LEFT_SUPER, K_LEFT_ALT, K_SPACE, K_RIGHT_ALT, K_APP, K_PGUP, K_UP, K_PGDN, - K_LEFT, K_DOWN, K_RIGHT -) -}; diff --git a/src/board/system76/lemp9/keymap/jeremy.c b/src/board/system76/lemp9/keymap/jeremy.c deleted file mode 100644 index f1a390f..0000000 --- a/src/board/system76/lemp9/keymap/jeremy.c +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-License-Identifier: GPL-3.0-only - -// Jeremy's layout - -#include - -uint16_t __code KEYMAP[KM_LAY][KM_OUT][KM_IN] = { -LAYOUT( - K_ESC, K_F1, K_F2, K_F3, K_F4, K_F5, K_F6, K_F7, K_F8, K_F9, K_F10, K_F11, K_F12, K_HOME, K_END, K_PRINT_SCREEN, K_DEL, - K_TICK, K_1, K_2, K_3, K_4, K_5, K_6, K_7, K_8, K_9, K_0, K_MINUS, K_EQUALS, K_BKSP, - K_TAB, K_Q, K_W, K_E, K_R, K_T, K_Y, K_U, K_I, K_O, K_P, K_BRACE_OPEN, K_BRACE_CLOSE, K_BACKSLASH, - KT_FN, K_A, K_S, K_D, K_F, K_G, K_H, K_J, K_K, K_L, K_SEMICOLON, K_QUOTE, K_ENTER, - K_LEFT_SHIFT, K_Z, K_X, K_C, K_V, K_B, K_N, K_M, K_COMMA, K_PERIOD, K_SLASH, K_RIGHT_SHIFT, - K_LEFT_CTRL, KT_FN, K_LEFT_ALT, K_LEFT_SUPER, K_SPACE, K_RIGHT_ALT, K_RIGHT_CTRL, K_PGUP, K_UP, K_PGDN, - K_LEFT, K_DOWN, K_RIGHT -), -LAYOUT( - K_ESC, K_TOUCHPAD, K_DISPLAY_TOGGLE, K_MUTE, K_KBD_BKL, K_VOLUME_DOWN, K_VOLUME_UP, K_DISPLAY_MODE, K_BRIGHTNESS_DOWN, K_BRIGHTNESS_UP, K_CAMERA_TOGGLE, K_AIRPLANE_MODE, K_SUSPEND, K_HOME, K_END, K_PRINT_SCREEN, K_DEL, - K_PLAY_PAUSE, K_FAN_TOGGLE, K_2, K_3, K_4, K_5, K_6, K_7, K_8, K_9, K_0, K_MINUS, K_EQUALS, K_DEL, - K_TAB, K_Q, K_W, K_E, K_R, K_T, K_Y, K_PGUP, K_HOME, K_PGDN, K_P, K_BRACE_OPEN, K_BRACE_CLOSE, K_BACKSLASH, - KT_FN, K_A, K_S, K_D, K_F, K_G, K_LEFT, K_DOWN, K_UP, K_RIGHT, K_BKSP, K_DEL, K_ENTER, - K_LEFT_SHIFT, K_Z, K_X, K_C, K_V, K_B, K_END, K_M, K_COMMA, K_PERIOD, K_SLASH, K_RIGHT_SHIFT, - K_LEFT_CTRL, KT_FN, K_LEFT_ALT, K_LEFT_SUPER, K_ESC, K_RIGHT_ALT, K_APP, K_PGUP, K_UP, K_PGDN, - K_LEFT, K_DOWN, K_RIGHT -) -}; diff --git a/src/board/system76/oryp5/board.mk b/src/board/system76/oryp5/board.mk index 9fea540..7f9a8f5 100644 --- a/src/board/system76/oryp5/board.mk +++ b/src/board/system76/oryp5/board.mk @@ -2,9 +2,8 @@ EC=it8587e -# Add keymap to src -KEYMAP?=default -SRC+=$(BOARD_DIR)/keymap/$(KEYMAP).c +# Include keyboard +KEYBOARD=15in_102 # Set keyboard LED mechanism KBLED=oryp5 diff --git a/src/board/system76/oryp5/include/board/keymap.h b/src/board/system76/oryp5/include/board/keymap.h deleted file mode 100644 index 9c5b943..0000000 --- a/src/board/system76/oryp5/include/board/keymap.h +++ /dev/null @@ -1,61 +0,0 @@ -// SPDX-License-Identifier: GPL-3.0-only - -#ifndef _BOARD_KEYMAP_H -#define _BOARD_KEYMAP_H - -// Keymap layers (normal, Fn) -#define KM_LAY 2 -// Keymap output pins -#define KM_OUT 18 -// Keymap input pins -#define KM_IN 8 - -// common/keymap.h requires KM_LAY, KM_OUT, and KM_IN definitions -#include - -// International keys -#ifndef KI1 - #define KI1 K_INT_1 -#endif -#ifndef KI2 - #define KI2 K_INT_2 -#endif - -// Conversion of physical layout to keyboard matrix -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, K0I, K0J, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, \ - K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F, K4G, \ - K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C \ -) { \ - { ___, ___, ___, ___, ___, ___, K50, K57 }, \ - { ___, ___, ___, ___, ___, ___, K53, K55 }, \ - { ___, ___, ___, ___, ___, ___, K40, K4B }, \ - { K52, ___, ___, ___, ___, ___, ___, K54 }, \ - { K41, K1H, ___, K2F, K4E, ___, ___, ___ }, \ - { K0I, K22, ___, ___, K1E, K3D, K3F, K30 }, \ - { K0J, K1B, K23, K39, ___, ___, K47, ___ }, \ - { K38, K26, K1A, K24, ___, K3A, K20, K00 }, \ - { K5B, K37, K2C, K19, K25, K07, K18, K01 }, \ - { K5C, K34, K36, K02, ___, K4G, K3B, K45 }, \ - { K1F, K48, ___, K2B, K32, K08, K06, K12 }, \ - { K1G, K49, K17, K33, ___, ___, K11, K2A }, \ - { K2D, KI1, K31, K4A, KI2, K03, K28, K16 }, \ - { ___, K44, K0D, K09, K46, K29, K15, K05 }, \ - { K21, K0A, K2E, K04, K3E, K0E, K0F, K14 }, \ - { K56, K42, K3C, K2H, K27, K2G, K13, K1D }, \ - { K0H, K0G, K43, K4C, K59, K10, K0B, K0C }, \ - { K35, K1C, K4F, K51, K4D, K58, K5A, ___ } \ -} - -// Position of physical Esc key in the matrix -#define MATRIX_ESC_INPUT 7 -#define MATRIX_ESC_OUTPUT 7 - -// Position of physical Fn key in the matrix -#define MATRIX_FN_INPUT 3 -#define MATRIX_FN_OUTPUT 17 - -#endif // _BOARD_KEYMAP_H diff --git a/src/board/system76/oryp5/keymap/default.c b/src/board/system76/oryp5/keymap/default.c deleted file mode 100644 index a8b9fa8..0000000 --- a/src/board/system76/oryp5/keymap/default.c +++ /dev/null @@ -1,24 +0,0 @@ -// SPDX-License-Identifier: GPL-3.0-only - -// Default layout - -#include - -uint16_t __code KEYMAP[KM_LAY][KM_OUT][KM_IN] = { -LAYOUT( - K_ESC, K_F1, K_F2, K_F3, K_F4, K_F5, K_F6, K_F7, K_F8, K_F9, K_F10, K_F11, K_F12, K_PRINT_SCREEN, K_INSERT, K_DEL, K_HOME, K_END, K_PGUP, K_PGDN, - K_TICK, K_1, K_2, K_3, K_4, K_5, K_6, K_7, K_8, K_9, K_0, K_MINUS, K_EQUALS, K_BKSP, K_NUM_LOCK, K_NUM_SLASH, K_NUM_ASTERISK, K_NUM_MINUS, - K_TAB, K_Q, K_W, K_E, K_R, K_T, K_Y, K_U, K_I, K_O, K_P, K_BRACE_OPEN, K_BRACE_CLOSE, K_BACKSLASH, K_NUM_7, K_NUM_8, K_NUM_9, K_NUM_PLUS, - K_CAPS, K_A, K_S, K_D, K_F, K_G, K_H, K_J, K_K, K_L, K_SEMICOLON, K_QUOTE, K_ENTER, K_NUM_4, K_NUM_5, K_NUM_6, - K_LEFT_SHIFT, K_Z, K_X, K_C, K_V, K_B, K_N, K_M, K_COMMA, K_PERIOD, K_SLASH, K_RIGHT_SHIFT, K_UP, K_NUM_1, K_NUM_2, K_NUM_3, K_NUM_ENTER, - K_LEFT_CTRL, KT_FN, K_LEFT_SUPER, K_LEFT_ALT, K_SPACE, K_RIGHT_ALT, K_APP, K_RIGHT_CTRL, K_LEFT, K_DOWN, K_RIGHT, K_NUM_0, K_NUM_PERIOD -), -LAYOUT( - K_ESC, K_TOUCHPAD, K_DISPLAY_TOGGLE, K_MUTE, K_F4, K_VOLUME_DOWN, K_VOLUME_UP, K_DISPLAY_MODE, K_BRIGHTNESS_DOWN, K_BRIGHTNESS_UP, K_CAMERA_TOGGLE, K_AIRPLANE_MODE, K_SUSPEND, K_PRINT_SCREEN, K_INSERT, K_DEL, K_HOME, K_END, K_PGUP, K_PGDN, - K_PLAY_PAUSE, K_FAN_TOGGLE, K_2, K_3, K_4, K_5, K_6, K_7, K_8, K_9, K_0, K_MINUS, K_EQUALS, K_BKSP, K_NUM_LOCK, K_KBD_COLOR, K_KBD_TOGGLE, K_KBD_DOWN, - K_TAB, K_Q, K_W, K_E, K_R, K_T, K_Y, K_U, K_I, K_O, K_P, K_BRACE_OPEN, K_BRACE_CLOSE, K_BACKSLASH, K_NUM_7, K_NUM_8, K_NUM_9, K_KBD_UP, - K_CAPS, K_A, K_S, K_D, K_F, K_G, K_H, K_J, K_K, K_L, K_SEMICOLON, K_QUOTE, K_ENTER, K_NUM_4, K_NUM_5, K_NUM_6, - K_LEFT_SHIFT, K_Z, K_X, K_C, K_V, K_B, K_N, K_M, K_COMMA, K_PERIOD, K_SLASH, K_RIGHT_SHIFT, K_UP, K_NUM_1, K_NUM_2, K_NUM_3, K_NUM_ENTER, - K_LEFT_CTRL, KT_FN, K_LEFT_SUPER, K_LEFT_ALT, K_SPACE, K_RIGHT_ALT, K_APP, K_RIGHT_CTRL, K_LEFT, K_DOWN, K_RIGHT, K_NUM_0, K_NUM_PERIOD -) -}; diff --git a/src/board/system76/oryp6/board.mk b/src/board/system76/oryp6/board.mk index 93b6f55..540c1ec 100644 --- a/src/board/system76/oryp6/board.mk +++ b/src/board/system76/oryp6/board.mk @@ -2,9 +2,8 @@ EC=it5570e -# Add keymap to src -KEYMAP?=default -SRC+=$(BOARD_DIR)/keymap/$(KEYMAP).c +# Include keyboard +KEYBOARD=15in_102 # Set keyboard LED mechanism KBLED=rgb_pwm diff --git a/src/board/system76/oryp6/include/board/keymap.h b/src/board/system76/oryp6/include/board/keymap.h deleted file mode 100644 index 9c5b943..0000000 --- a/src/board/system76/oryp6/include/board/keymap.h +++ /dev/null @@ -1,61 +0,0 @@ -// SPDX-License-Identifier: GPL-3.0-only - -#ifndef _BOARD_KEYMAP_H -#define _BOARD_KEYMAP_H - -// Keymap layers (normal, Fn) -#define KM_LAY 2 -// Keymap output pins -#define KM_OUT 18 -// Keymap input pins -#define KM_IN 8 - -// common/keymap.h requires KM_LAY, KM_OUT, and KM_IN definitions -#include - -// International keys -#ifndef KI1 - #define KI1 K_INT_1 -#endif -#ifndef KI2 - #define KI2 K_INT_2 -#endif - -// Conversion of physical layout to keyboard matrix -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, K0I, K0J, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, \ - K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F, K4G, \ - K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C \ -) { \ - { ___, ___, ___, ___, ___, ___, K50, K57 }, \ - { ___, ___, ___, ___, ___, ___, K53, K55 }, \ - { ___, ___, ___, ___, ___, ___, K40, K4B }, \ - { K52, ___, ___, ___, ___, ___, ___, K54 }, \ - { K41, K1H, ___, K2F, K4E, ___, ___, ___ }, \ - { K0I, K22, ___, ___, K1E, K3D, K3F, K30 }, \ - { K0J, K1B, K23, K39, ___, ___, K47, ___ }, \ - { K38, K26, K1A, K24, ___, K3A, K20, K00 }, \ - { K5B, K37, K2C, K19, K25, K07, K18, K01 }, \ - { K5C, K34, K36, K02, ___, K4G, K3B, K45 }, \ - { K1F, K48, ___, K2B, K32, K08, K06, K12 }, \ - { K1G, K49, K17, K33, ___, ___, K11, K2A }, \ - { K2D, KI1, K31, K4A, KI2, K03, K28, K16 }, \ - { ___, K44, K0D, K09, K46, K29, K15, K05 }, \ - { K21, K0A, K2E, K04, K3E, K0E, K0F, K14 }, \ - { K56, K42, K3C, K2H, K27, K2G, K13, K1D }, \ - { K0H, K0G, K43, K4C, K59, K10, K0B, K0C }, \ - { K35, K1C, K4F, K51, K4D, K58, K5A, ___ } \ -} - -// Position of physical Esc key in the matrix -#define MATRIX_ESC_INPUT 7 -#define MATRIX_ESC_OUTPUT 7 - -// Position of physical Fn key in the matrix -#define MATRIX_FN_INPUT 3 -#define MATRIX_FN_OUTPUT 17 - -#endif // _BOARD_KEYMAP_H diff --git a/src/board/system76/oryp6/keymap/default.c b/src/board/system76/oryp6/keymap/default.c deleted file mode 100644 index a8b9fa8..0000000 --- a/src/board/system76/oryp6/keymap/default.c +++ /dev/null @@ -1,24 +0,0 @@ -// SPDX-License-Identifier: GPL-3.0-only - -// Default layout - -#include - -uint16_t __code KEYMAP[KM_LAY][KM_OUT][KM_IN] = { -LAYOUT( - K_ESC, K_F1, K_F2, K_F3, K_F4, K_F5, K_F6, K_F7, K_F8, K_F9, K_F10, K_F11, K_F12, K_PRINT_SCREEN, K_INSERT, K_DEL, K_HOME, K_END, K_PGUP, K_PGDN, - K_TICK, K_1, K_2, K_3, K_4, K_5, K_6, K_7, K_8, K_9, K_0, K_MINUS, K_EQUALS, K_BKSP, K_NUM_LOCK, K_NUM_SLASH, K_NUM_ASTERISK, K_NUM_MINUS, - K_TAB, K_Q, K_W, K_E, K_R, K_T, K_Y, K_U, K_I, K_O, K_P, K_BRACE_OPEN, K_BRACE_CLOSE, K_BACKSLASH, K_NUM_7, K_NUM_8, K_NUM_9, K_NUM_PLUS, - K_CAPS, K_A, K_S, K_D, K_F, K_G, K_H, K_J, K_K, K_L, K_SEMICOLON, K_QUOTE, K_ENTER, K_NUM_4, K_NUM_5, K_NUM_6, - K_LEFT_SHIFT, K_Z, K_X, K_C, K_V, K_B, K_N, K_M, K_COMMA, K_PERIOD, K_SLASH, K_RIGHT_SHIFT, K_UP, K_NUM_1, K_NUM_2, K_NUM_3, K_NUM_ENTER, - K_LEFT_CTRL, KT_FN, K_LEFT_SUPER, K_LEFT_ALT, K_SPACE, K_RIGHT_ALT, K_APP, K_RIGHT_CTRL, K_LEFT, K_DOWN, K_RIGHT, K_NUM_0, K_NUM_PERIOD -), -LAYOUT( - K_ESC, K_TOUCHPAD, K_DISPLAY_TOGGLE, K_MUTE, K_F4, K_VOLUME_DOWN, K_VOLUME_UP, K_DISPLAY_MODE, K_BRIGHTNESS_DOWN, K_BRIGHTNESS_UP, K_CAMERA_TOGGLE, K_AIRPLANE_MODE, K_SUSPEND, K_PRINT_SCREEN, K_INSERT, K_DEL, K_HOME, K_END, K_PGUP, K_PGDN, - K_PLAY_PAUSE, K_FAN_TOGGLE, K_2, K_3, K_4, K_5, K_6, K_7, K_8, K_9, K_0, K_MINUS, K_EQUALS, K_BKSP, K_NUM_LOCK, K_KBD_COLOR, K_KBD_TOGGLE, K_KBD_DOWN, - K_TAB, K_Q, K_W, K_E, K_R, K_T, K_Y, K_U, K_I, K_O, K_P, K_BRACE_OPEN, K_BRACE_CLOSE, K_BACKSLASH, K_NUM_7, K_NUM_8, K_NUM_9, K_KBD_UP, - K_CAPS, K_A, K_S, K_D, K_F, K_G, K_H, K_J, K_K, K_L, K_SEMICOLON, K_QUOTE, K_ENTER, K_NUM_4, K_NUM_5, K_NUM_6, - K_LEFT_SHIFT, K_Z, K_X, K_C, K_V, K_B, K_N, K_M, K_COMMA, K_PERIOD, K_SLASH, K_RIGHT_SHIFT, K_UP, K_NUM_1, K_NUM_2, K_NUM_3, K_NUM_ENTER, - K_LEFT_CTRL, KT_FN, K_LEFT_SUPER, K_LEFT_ALT, K_SPACE, K_RIGHT_ALT, K_APP, K_RIGHT_CTRL, K_LEFT, K_DOWN, K_RIGHT, K_NUM_0, K_NUM_PERIOD -) -}; diff --git a/src/board/system76/oryp6/keymap/jeremy.c b/src/board/system76/oryp6/keymap/jeremy.c deleted file mode 100644 index 257fe36..0000000 --- a/src/board/system76/oryp6/keymap/jeremy.c +++ /dev/null @@ -1,24 +0,0 @@ -// SPDX-License-Identifier: GPL-3.0-only - -// Default layout - -#include - -uint16_t __code KEYMAP[KM_LAY][KM_OUT][KM_IN] = { -LAYOUT( - K_ESC, K_F1, K_F2, K_F3, K_F4, K_F5, K_F6, K_F7, K_F8, K_F9, K_F10, K_F11, K_F12, K_PRINT_SCREEN, K_INSERT, K_DEL, K_HOME, K_END, K_PGUP, K_PGDN, - K_TICK, K_1, K_2, K_3, K_4, K_5, K_6, K_7, K_8, K_9, K_0, K_MINUS, K_EQUALS, K_BKSP, K_NUM_LOCK, K_NUM_SLASH, K_NUM_ASTERISK, K_NUM_MINUS, - K_TAB, K_Q, K_W, K_E, K_R, K_T, K_Y, K_U, K_I, K_O, K_P, K_BRACE_OPEN, K_BRACE_CLOSE, K_BACKSLASH, K_NUM_7, K_NUM_8, K_NUM_9, K_NUM_PLUS, - KT_FN, K_A, K_S, K_D, K_F, K_G, K_H, K_J, K_K, K_L, K_SEMICOLON, K_QUOTE, K_ENTER, K_NUM_4, K_NUM_5, K_NUM_6, - K_LEFT_SHIFT, K_Z, K_X, K_C, K_V, K_B, K_N, K_M, K_COMMA, K_PERIOD, K_SLASH, K_RIGHT_SHIFT, K_UP, K_NUM_1, K_NUM_2, K_NUM_3, K_NUM_ENTER, - K_LEFT_CTRL, KT_FN, K_LEFT_ALT, K_LEFT_SUPER, K_SPACE, KT_FN, K_RIGHT_ALT, K_RIGHT_CTRL, K_LEFT, K_DOWN, K_RIGHT, K_NUM_0, K_NUM_PERIOD -), -LAYOUT( - K_ESC, K_TOUCHPAD, K_DISPLAY_TOGGLE, K_MUTE, K_F4, K_VOLUME_DOWN, K_VOLUME_UP, K_DISPLAY_MODE, K_BRIGHTNESS_DOWN, K_BRIGHTNESS_UP, K_CAMERA_TOGGLE, K_AIRPLANE_MODE, K_SUSPEND, K_PRINT_SCREEN, K_INSERT, K_DEL, K_HOME, K_END, K_PGUP, K_PGDN, - K_PLAY_PAUSE, K_FAN_TOGGLE, K_2, K_3, K_4, K_5, K_6, K_7, K_8, K_9, K_0, K_MINUS, K_EQUALS, K_DEL, K_NUM_LOCK, K_KBD_COLOR, K_KBD_TOGGLE, K_KBD_DOWN, - K_TAB, K_Q, K_W, K_E, K_R, K_T, K_Y, K_PGUP, K_HOME, K_PGDN, K_P, K_BRACE_OPEN, K_BRACE_CLOSE, K_BACKSLASH, K_NUM_7, K_NUM_8, K_NUM_9, K_KBD_UP, - KT_FN, K_A, K_S, K_D, K_F, K_G, K_LEFT, K_DOWN, K_UP, K_RIGHT, K_BKSP, K_DEL, K_ENTER, K_NUM_4, K_NUM_5, K_NUM_6, - K_LEFT_SHIFT, K_Z, K_X, K_C, K_V, K_B, K_END, K_M, K_COMMA, K_PERIOD, K_SLASH, K_RIGHT_SHIFT, K_UP, K_NUM_1, K_NUM_2, K_NUM_3, K_NUM_ENTER, - K_LEFT_CTRL, KT_FN, K_LEFT_ALT, K_LEFT_SUPER, K_ESC, KT_FN, K_RIGHT_ALT, K_RIGHT_CTRL, K_LEFT, K_DOWN, K_RIGHT, K_NUM_0, K_NUM_PERIOD -) -}; diff --git a/src/board/system76/oryp7/board.mk b/src/board/system76/oryp7/board.mk index 93b6f55..540c1ec 100644 --- a/src/board/system76/oryp7/board.mk +++ b/src/board/system76/oryp7/board.mk @@ -2,9 +2,8 @@ EC=it5570e -# Add keymap to src -KEYMAP?=default -SRC+=$(BOARD_DIR)/keymap/$(KEYMAP).c +# Include keyboard +KEYBOARD=15in_102 # Set keyboard LED mechanism KBLED=rgb_pwm diff --git a/src/board/system76/oryp7/include/board/keymap.h b/src/board/system76/oryp7/include/board/keymap.h deleted file mode 100644 index 9c5b943..0000000 --- a/src/board/system76/oryp7/include/board/keymap.h +++ /dev/null @@ -1,61 +0,0 @@ -// SPDX-License-Identifier: GPL-3.0-only - -#ifndef _BOARD_KEYMAP_H -#define _BOARD_KEYMAP_H - -// Keymap layers (normal, Fn) -#define KM_LAY 2 -// Keymap output pins -#define KM_OUT 18 -// Keymap input pins -#define KM_IN 8 - -// common/keymap.h requires KM_LAY, KM_OUT, and KM_IN definitions -#include - -// International keys -#ifndef KI1 - #define KI1 K_INT_1 -#endif -#ifndef KI2 - #define KI2 K_INT_2 -#endif - -// Conversion of physical layout to keyboard matrix -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, K0I, K0J, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, \ - K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F, K4G, \ - K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C \ -) { \ - { ___, ___, ___, ___, ___, ___, K50, K57 }, \ - { ___, ___, ___, ___, ___, ___, K53, K55 }, \ - { ___, ___, ___, ___, ___, ___, K40, K4B }, \ - { K52, ___, ___, ___, ___, ___, ___, K54 }, \ - { K41, K1H, ___, K2F, K4E, ___, ___, ___ }, \ - { K0I, K22, ___, ___, K1E, K3D, K3F, K30 }, \ - { K0J, K1B, K23, K39, ___, ___, K47, ___ }, \ - { K38, K26, K1A, K24, ___, K3A, K20, K00 }, \ - { K5B, K37, K2C, K19, K25, K07, K18, K01 }, \ - { K5C, K34, K36, K02, ___, K4G, K3B, K45 }, \ - { K1F, K48, ___, K2B, K32, K08, K06, K12 }, \ - { K1G, K49, K17, K33, ___, ___, K11, K2A }, \ - { K2D, KI1, K31, K4A, KI2, K03, K28, K16 }, \ - { ___, K44, K0D, K09, K46, K29, K15, K05 }, \ - { K21, K0A, K2E, K04, K3E, K0E, K0F, K14 }, \ - { K56, K42, K3C, K2H, K27, K2G, K13, K1D }, \ - { K0H, K0G, K43, K4C, K59, K10, K0B, K0C }, \ - { K35, K1C, K4F, K51, K4D, K58, K5A, ___ } \ -} - -// Position of physical Esc key in the matrix -#define MATRIX_ESC_INPUT 7 -#define MATRIX_ESC_OUTPUT 7 - -// Position of physical Fn key in the matrix -#define MATRIX_FN_INPUT 3 -#define MATRIX_FN_OUTPUT 17 - -#endif // _BOARD_KEYMAP_H diff --git a/src/board/system76/oryp7/keymap/default.c b/src/board/system76/oryp7/keymap/default.c deleted file mode 100644 index a8b9fa8..0000000 --- a/src/board/system76/oryp7/keymap/default.c +++ /dev/null @@ -1,24 +0,0 @@ -// SPDX-License-Identifier: GPL-3.0-only - -// Default layout - -#include - -uint16_t __code KEYMAP[KM_LAY][KM_OUT][KM_IN] = { -LAYOUT( - K_ESC, K_F1, K_F2, K_F3, K_F4, K_F5, K_F6, K_F7, K_F8, K_F9, K_F10, K_F11, K_F12, K_PRINT_SCREEN, K_INSERT, K_DEL, K_HOME, K_END, K_PGUP, K_PGDN, - K_TICK, K_1, K_2, K_3, K_4, K_5, K_6, K_7, K_8, K_9, K_0, K_MINUS, K_EQUALS, K_BKSP, K_NUM_LOCK, K_NUM_SLASH, K_NUM_ASTERISK, K_NUM_MINUS, - K_TAB, K_Q, K_W, K_E, K_R, K_T, K_Y, K_U, K_I, K_O, K_P, K_BRACE_OPEN, K_BRACE_CLOSE, K_BACKSLASH, K_NUM_7, K_NUM_8, K_NUM_9, K_NUM_PLUS, - K_CAPS, K_A, K_S, K_D, K_F, K_G, K_H, K_J, K_K, K_L, K_SEMICOLON, K_QUOTE, K_ENTER, K_NUM_4, K_NUM_5, K_NUM_6, - K_LEFT_SHIFT, K_Z, K_X, K_C, K_V, K_B, K_N, K_M, K_COMMA, K_PERIOD, K_SLASH, K_RIGHT_SHIFT, K_UP, K_NUM_1, K_NUM_2, K_NUM_3, K_NUM_ENTER, - K_LEFT_CTRL, KT_FN, K_LEFT_SUPER, K_LEFT_ALT, K_SPACE, K_RIGHT_ALT, K_APP, K_RIGHT_CTRL, K_LEFT, K_DOWN, K_RIGHT, K_NUM_0, K_NUM_PERIOD -), -LAYOUT( - K_ESC, K_TOUCHPAD, K_DISPLAY_TOGGLE, K_MUTE, K_F4, K_VOLUME_DOWN, K_VOLUME_UP, K_DISPLAY_MODE, K_BRIGHTNESS_DOWN, K_BRIGHTNESS_UP, K_CAMERA_TOGGLE, K_AIRPLANE_MODE, K_SUSPEND, K_PRINT_SCREEN, K_INSERT, K_DEL, K_HOME, K_END, K_PGUP, K_PGDN, - K_PLAY_PAUSE, K_FAN_TOGGLE, K_2, K_3, K_4, K_5, K_6, K_7, K_8, K_9, K_0, K_MINUS, K_EQUALS, K_BKSP, K_NUM_LOCK, K_KBD_COLOR, K_KBD_TOGGLE, K_KBD_DOWN, - K_TAB, K_Q, K_W, K_E, K_R, K_T, K_Y, K_U, K_I, K_O, K_P, K_BRACE_OPEN, K_BRACE_CLOSE, K_BACKSLASH, K_NUM_7, K_NUM_8, K_NUM_9, K_KBD_UP, - K_CAPS, K_A, K_S, K_D, K_F, K_G, K_H, K_J, K_K, K_L, K_SEMICOLON, K_QUOTE, K_ENTER, K_NUM_4, K_NUM_5, K_NUM_6, - K_LEFT_SHIFT, K_Z, K_X, K_C, K_V, K_B, K_N, K_M, K_COMMA, K_PERIOD, K_SLASH, K_RIGHT_SHIFT, K_UP, K_NUM_1, K_NUM_2, K_NUM_3, K_NUM_ENTER, - K_LEFT_CTRL, KT_FN, K_LEFT_SUPER, K_LEFT_ALT, K_SPACE, K_RIGHT_ALT, K_APP, K_RIGHT_CTRL, K_LEFT, K_DOWN, K_RIGHT, K_NUM_0, K_NUM_PERIOD -) -}; diff --git a/src/board/system76/oryp7/keymap/jeremy.c b/src/board/system76/oryp7/keymap/jeremy.c deleted file mode 100644 index 257fe36..0000000 --- a/src/board/system76/oryp7/keymap/jeremy.c +++ /dev/null @@ -1,24 +0,0 @@ -// SPDX-License-Identifier: GPL-3.0-only - -// Default layout - -#include - -uint16_t __code KEYMAP[KM_LAY][KM_OUT][KM_IN] = { -LAYOUT( - K_ESC, K_F1, K_F2, K_F3, K_F4, K_F5, K_F6, K_F7, K_F8, K_F9, K_F10, K_F11, K_F12, K_PRINT_SCREEN, K_INSERT, K_DEL, K_HOME, K_END, K_PGUP, K_PGDN, - K_TICK, K_1, K_2, K_3, K_4, K_5, K_6, K_7, K_8, K_9, K_0, K_MINUS, K_EQUALS, K_BKSP, K_NUM_LOCK, K_NUM_SLASH, K_NUM_ASTERISK, K_NUM_MINUS, - K_TAB, K_Q, K_W, K_E, K_R, K_T, K_Y, K_U, K_I, K_O, K_P, K_BRACE_OPEN, K_BRACE_CLOSE, K_BACKSLASH, K_NUM_7, K_NUM_8, K_NUM_9, K_NUM_PLUS, - KT_FN, K_A, K_S, K_D, K_F, K_G, K_H, K_J, K_K, K_L, K_SEMICOLON, K_QUOTE, K_ENTER, K_NUM_4, K_NUM_5, K_NUM_6, - K_LEFT_SHIFT, K_Z, K_X, K_C, K_V, K_B, K_N, K_M, K_COMMA, K_PERIOD, K_SLASH, K_RIGHT_SHIFT, K_UP, K_NUM_1, K_NUM_2, K_NUM_3, K_NUM_ENTER, - K_LEFT_CTRL, KT_FN, K_LEFT_ALT, K_LEFT_SUPER, K_SPACE, KT_FN, K_RIGHT_ALT, K_RIGHT_CTRL, K_LEFT, K_DOWN, K_RIGHT, K_NUM_0, K_NUM_PERIOD -), -LAYOUT( - K_ESC, K_TOUCHPAD, K_DISPLAY_TOGGLE, K_MUTE, K_F4, K_VOLUME_DOWN, K_VOLUME_UP, K_DISPLAY_MODE, K_BRIGHTNESS_DOWN, K_BRIGHTNESS_UP, K_CAMERA_TOGGLE, K_AIRPLANE_MODE, K_SUSPEND, K_PRINT_SCREEN, K_INSERT, K_DEL, K_HOME, K_END, K_PGUP, K_PGDN, - K_PLAY_PAUSE, K_FAN_TOGGLE, K_2, K_3, K_4, K_5, K_6, K_7, K_8, K_9, K_0, K_MINUS, K_EQUALS, K_DEL, K_NUM_LOCK, K_KBD_COLOR, K_KBD_TOGGLE, K_KBD_DOWN, - K_TAB, K_Q, K_W, K_E, K_R, K_T, K_Y, K_PGUP, K_HOME, K_PGDN, K_P, K_BRACE_OPEN, K_BRACE_CLOSE, K_BACKSLASH, K_NUM_7, K_NUM_8, K_NUM_9, K_KBD_UP, - KT_FN, K_A, K_S, K_D, K_F, K_G, K_LEFT, K_DOWN, K_UP, K_RIGHT, K_BKSP, K_DEL, K_ENTER, K_NUM_4, K_NUM_5, K_NUM_6, - K_LEFT_SHIFT, K_Z, K_X, K_C, K_V, K_B, K_END, K_M, K_COMMA, K_PERIOD, K_SLASH, K_RIGHT_SHIFT, K_UP, K_NUM_1, K_NUM_2, K_NUM_3, K_NUM_ENTER, - K_LEFT_CTRL, KT_FN, K_LEFT_ALT, K_LEFT_SUPER, K_ESC, KT_FN, K_RIGHT_ALT, K_RIGHT_CTRL, K_LEFT, K_DOWN, K_RIGHT, K_NUM_0, K_NUM_PERIOD -) -}; diff --git a/src/board/system76/lemp9/include/board/keymap.h b/src/keyboard/system76/14in_83/include/board/keymap.h similarity index 100% rename from src/board/system76/lemp9/include/board/keymap.h rename to src/keyboard/system76/14in_83/include/board/keymap.h diff --git a/src/keyboard/system76/14in_83/keyboard.mk b/src/keyboard/system76/14in_83/keyboard.mk new file mode 100644 index 0000000..2706f41 --- /dev/null +++ b/src/keyboard/system76/14in_83/keyboard.mk @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: GPL-3.0-only + +# Include keyboard source +KEYMAP?=default +SRC+=$(KEYBOARD_DIR)/keymap/$(KEYMAP).c +INCLUDE+=$(wildcard $(KEYBOARD_DIR)/include/board/*.h) $(KEYBOARD_DIR)/keyboard.mk +CFLAGS+=-I$(KEYBOARD_DIR)/include diff --git a/src/board/system76/lemp9/keymap/clevo_l141cu_us_iso.c b/src/keyboard/system76/14in_83/keymap/clevo_l141cu_us_iso.c similarity index 100% rename from src/board/system76/lemp9/keymap/clevo_l141cu_us_iso.c rename to src/keyboard/system76/14in_83/keymap/clevo_l141cu_us_iso.c diff --git a/src/board/system76/galp5/keymap/default.c b/src/keyboard/system76/14in_83/keymap/default.c similarity index 100% rename from src/board/system76/galp5/keymap/default.c rename to src/keyboard/system76/14in_83/keymap/default.c diff --git a/src/board/system76/lemp9/keymap/fabian.c b/src/keyboard/system76/14in_83/keymap/fabian.c similarity index 100% rename from src/board/system76/lemp9/keymap/fabian.c rename to src/keyboard/system76/14in_83/keymap/fabian.c diff --git a/src/board/system76/lemp9/keymap/ins-prtsc.c b/src/keyboard/system76/14in_83/keymap/ins-prtsc.c similarity index 100% rename from src/board/system76/lemp9/keymap/ins-prtsc.c rename to src/keyboard/system76/14in_83/keymap/ins-prtsc.c diff --git a/src/board/system76/galp5/keymap/jeremy.c b/src/keyboard/system76/14in_83/keymap/jeremy.c similarity index 100% rename from src/board/system76/galp5/keymap/jeremy.c rename to src/keyboard/system76/14in_83/keymap/jeremy.c diff --git a/src/board/system76/lemp9/keymap/levi.c b/src/keyboard/system76/14in_83/keymap/levi.c similarity index 100% rename from src/board/system76/lemp9/keymap/levi.c rename to src/keyboard/system76/14in_83/keymap/levi.c diff --git a/src/board/system76/lemp9/keymap/valentin_french_iso.c b/src/keyboard/system76/14in_83/keymap/valentin_french_iso.c similarity index 100% rename from src/board/system76/lemp9/keymap/valentin_french_iso.c rename to src/keyboard/system76/14in_83/keymap/valentin_french_iso.c diff --git a/src/board/system76/galp3-c/include/board/keymap.h b/src/keyboard/system76/14in_86/include/board/keymap.h similarity index 100% rename from src/board/system76/galp3-c/include/board/keymap.h rename to src/keyboard/system76/14in_86/include/board/keymap.h diff --git a/src/keyboard/system76/14in_86/keyboard.mk b/src/keyboard/system76/14in_86/keyboard.mk new file mode 100644 index 0000000..2706f41 --- /dev/null +++ b/src/keyboard/system76/14in_86/keyboard.mk @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: GPL-3.0-only + +# Include keyboard source +KEYMAP?=default +SRC+=$(KEYBOARD_DIR)/keymap/$(KEYMAP).c +INCLUDE+=$(wildcard $(KEYBOARD_DIR)/include/board/*.h) $(KEYBOARD_DIR)/keyboard.mk +CFLAGS+=-I$(KEYBOARD_DIR)/include diff --git a/src/board/system76/galp3-c/keymap/carl.c b/src/keyboard/system76/14in_86/keymap/carl.c similarity index 100% rename from src/board/system76/galp3-c/keymap/carl.c rename to src/keyboard/system76/14in_86/keymap/carl.c diff --git a/src/board/system76/galp3-c/keymap/default.c b/src/keyboard/system76/14in_86/keymap/default.c similarity index 100% rename from src/board/system76/galp3-c/keymap/default.c rename to src/keyboard/system76/14in_86/keymap/default.c diff --git a/src/board/system76/galp3-c/keymap/jeremy.c b/src/keyboard/system76/14in_86/keymap/jeremy.c similarity index 100% rename from src/board/system76/galp3-c/keymap/jeremy.c rename to src/keyboard/system76/14in_86/keymap/jeremy.c diff --git a/src/board/system76/addw1/include/board/keymap.h b/src/keyboard/system76/15in_102/include/board/keymap.h similarity index 100% rename from src/board/system76/addw1/include/board/keymap.h rename to src/keyboard/system76/15in_102/include/board/keymap.h diff --git a/src/keyboard/system76/15in_102/keyboard.mk b/src/keyboard/system76/15in_102/keyboard.mk new file mode 100644 index 0000000..2706f41 --- /dev/null +++ b/src/keyboard/system76/15in_102/keyboard.mk @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: GPL-3.0-only + +# Include keyboard source +KEYMAP?=default +SRC+=$(KEYBOARD_DIR)/keymap/$(KEYMAP).c +INCLUDE+=$(wildcard $(KEYBOARD_DIR)/include/board/*.h) $(KEYBOARD_DIR)/keyboard.mk +CFLAGS+=-I$(KEYBOARD_DIR)/include diff --git a/src/board/system76/addw1/keymap/default.c b/src/keyboard/system76/15in_102/keymap/default.c similarity index 100% rename from src/board/system76/addw1/keymap/default.c rename to src/keyboard/system76/15in_102/keymap/default.c diff --git a/src/board/system76/addw1/keymap/jeremy.c b/src/keyboard/system76/15in_102/keymap/jeremy.c similarity index 100% rename from src/board/system76/addw1/keymap/jeremy.c rename to src/keyboard/system76/15in_102/keymap/jeremy.c diff --git a/src/board/system76/bonw14/include/board/keymap.h b/src/keyboard/system76/15in_102_nkey/include/board/keymap.h similarity index 100% rename from src/board/system76/bonw14/include/board/keymap.h rename to src/keyboard/system76/15in_102_nkey/include/board/keymap.h diff --git a/src/keyboard/system76/15in_102_nkey/keyboard.mk b/src/keyboard/system76/15in_102_nkey/keyboard.mk new file mode 100644 index 0000000..2706f41 --- /dev/null +++ b/src/keyboard/system76/15in_102_nkey/keyboard.mk @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: GPL-3.0-only + +# Include keyboard source +KEYMAP?=default +SRC+=$(KEYBOARD_DIR)/keymap/$(KEYMAP).c +INCLUDE+=$(wildcard $(KEYBOARD_DIR)/include/board/*.h) $(KEYBOARD_DIR)/keyboard.mk +CFLAGS+=-I$(KEYBOARD_DIR)/include diff --git a/src/board/system76/addw2/keymap/default.c b/src/keyboard/system76/15in_102_nkey/keymap/default.c similarity index 100% rename from src/board/system76/addw2/keymap/default.c rename to src/keyboard/system76/15in_102_nkey/keymap/default.c diff --git a/src/board/system76/addw2/keymap/jeremy.c b/src/keyboard/system76/15in_102_nkey/keymap/jeremy.c similarity index 100% rename from src/board/system76/addw2/keymap/jeremy.c rename to src/keyboard/system76/15in_102_nkey/keymap/jeremy.c