sravan/system76-embedded-controller
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move KEYMAP definition to common

Browse Source
This commit is contained in:
Jeremy Soller 2020-09-30 20:11:24 -06:00 committed by Jeremy Soller
parent c2125aa99c
commit fc2c3511d2
9 changed files with 73 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/board/system76/addw2/include/board/keymap.h
View File

@ -3,9 +3,15 @@
#ifndef _BOARD_KEYMAP_H #ifndef _BOARD_KEYMAP_H
#define _BOARD_KEYMAP_H #define _BOARD_KEYMAP_H
#include <common/keymap.h> // Keymap layers (normal, Fn)
#define KM_LAY 2
// Keymap output pins
#define KM_OUT 18
// Keymap input pins
#define KM_IN 8
#define ___ 0 // common/keymap.h requires KM_LAY, KM_OUT, and KM_IN definitions
#include <common/keymap.h>
// Conversion of physical layout to keyboard matrix // Conversion of physical layout to keyboard matrix
#define LAYOUT( \ #define LAYOUT( \
@ -36,16 +42,6 @@
{ K35, K1C, K4F, K51, K4D, K58, K5A, ___ } \ { K35, K1C, K4F, K51, K4D, K58, K5A, ___ } \
} }
// Keymap output pins
#define KM_OUT 18
// Keymap input pins
#define KM_IN 8
// Keymap layers (normal, Fn)
#define KM_LAY 2
// Keymap
extern uint16_t __xdata KEYMAP[KM_LAY][KM_OUT][KM_IN];
// Position of physical Esc key in the matrix // Position of physical Esc key in the matrix
#define MATRIX_ESC_INPUT 7 #define MATRIX_ESC_INPUT 7
#define MATRIX_ESC_OUTPUT 7 #define MATRIX_ESC_OUTPUT 7

24
src/board/system76/bonw14/include/board/keymap.h
View File

@ -3,9 +3,17 @@
#ifndef _BOARD_KEYMAP_H #ifndef _BOARD_KEYMAP_H
#define _BOARD_KEYMAP_H #define _BOARD_KEYMAP_H
#include <common/keymap.h> // Keymap layers (normal, Fn)
#define KM_LAY 2
// Keymap output pins
#define KM_OUT 18
// Keymap input pins
#define KM_IN 8
// Keyboard has n-key rollover
#define KM_NKEY 1
#define ___ 0 // common/keymap.h requires KM_LAY, KM_OUT, and KM_IN definitions
#include <common/keymap.h>
// Conversion of physical layout to keyboard matrix // Conversion of physical layout to keyboard matrix
#define LAYOUT( \ #define LAYOUT( \
@ -36,18 +44,6 @@
{ ___, ___, ___, ___, ___, ___, ___, ___ } /* 17 */ \ { ___, ___, ___, ___, ___, ___, ___, ___ } /* 17 */ \
} }
// Keymap output pins
#define KM_OUT 18
// Keymap input pins
#define KM_IN 8
// Keymap layers (normal, Fn)
#define KM_LAY 2
// Keyboard has n-key rollover
#define KM_NKEY 1
// Keymap
extern uint16_t __xdata KEYMAP[KM_LAY][KM_OUT][KM_IN];
// Position of physical Esc key in the matrix // Position of physical Esc key in the matrix
#define MATRIX_ESC_INPUT 0 #define MATRIX_ESC_INPUT 0
#define MATRIX_ESC_OUTPUT 6 #define MATRIX_ESC_OUTPUT 6

20
src/board/system76/darp5/include/board/keymap.h
View File

@ -3,9 +3,15 @@
#ifndef _BOARD_KEYMAP_H #ifndef _BOARD_KEYMAP_H
#define _BOARD_KEYMAP_H #define _BOARD_KEYMAP_H
#include <common/keymap.h> // Keymap layers (normal, Fn)
#define KM_LAY 2
// Keymap output pins
#define KM_OUT 18
// Keymap input pins
#define KM_IN 8
#define ___ 0 // common/keymap.h requires KM_LAY, KM_OUT, and KM_IN definitions
#include <common/keymap.h>
// Conversion of physical layout to keyboard matrix // Conversion of physical layout to keyboard matrix
#define LAYOUT( \ #define LAYOUT( \
@ -36,16 +42,6 @@
{ K35, K1C, K4F, K51, K4D, K58, K5A, ___ } \ { K35, K1C, K4F, K51, K4D, K58, K5A, ___ } \
} }
// Keymap output pins
#define KM_OUT 18
// Keymap input pins
#define KM_IN 8
// Keymap layers (normal, Fn)
#define KM_LAY 2
// Keymap
extern uint16_t __xdata KEYMAP[KM_LAY][KM_OUT][KM_IN];
// Position of physical Esc key in the matrix // Position of physical Esc key in the matrix
#define MATRIX_ESC_INPUT 7 #define MATRIX_ESC_INPUT 7
#define MATRIX_ESC_OUTPUT 7 #define MATRIX_ESC_OUTPUT 7

20
src/board/system76/galp3-c/include/board/keymap.h
View File

@ -3,9 +3,15 @@
#ifndef _BOARD_KEYMAP_H #ifndef _BOARD_KEYMAP_H
#define _BOARD_KEYMAP_H #define _BOARD_KEYMAP_H
#include <common/keymap.h> // Keymap layers (normal, Fn)
#define KM_LAY 2
// Keymap output pins
#define KM_OUT 16
// Keymap input pins
#define KM_IN 8
#define ___ 0 // common/keymap.h requires KM_LAY, KM_OUT, and KM_IN definitions
#include <common/keymap.h>
// Conversion of physical layout to keyboard matrix // Conversion of physical layout to keyboard matrix
#define LAYOUT( \ #define LAYOUT( \
@ -34,16 +40,6 @@
{ K56, ___, K3C, ___, K59, K0C, K4D, K3D } \ { K56, ___, K3C, ___, K59, K0C, K4D, K3D } \
} }
// Keymap output pins
#define KM_OUT 16
// Keymap input pins
#define KM_IN 8
// Keymap layers (normal, Fn)
#define KM_LAY 2
// Keymap
extern uint16_t __xdata KEYMAP[KM_LAY][KM_OUT][KM_IN];
// Position of physical Esc key in the matrix // Position of physical Esc key in the matrix
#define MATRIX_ESC_INPUT 7 #define MATRIX_ESC_INPUT 7
#define MATRIX_ESC_OUTPUT 7 #define MATRIX_ESC_OUTPUT 7

20
src/board/system76/gaze15/include/board/keymap.h
View File

@ -3,9 +3,15 @@
#ifndef _BOARD_KEYMAP_H #ifndef _BOARD_KEYMAP_H
#define _BOARD_KEYMAP_H #define _BOARD_KEYMAP_H
#include <common/keymap.h> // Keymap layers (normal, Fn)
#define KM_LAY 2
// Keymap output pins
#define KM_OUT 18
// Keymap input pins
#define KM_IN 8
#define ___ 0 // common/keymap.h requires KM_LAY, KM_OUT, and KM_IN definitions
#include <common/keymap.h>
// Conversion of physical layout to keyboard matrix // Conversion of physical layout to keyboard matrix
#define LAYOUT( \ #define LAYOUT( \
@ -36,16 +42,6 @@
{ K35, K1C, K4F, K51, K4D, K58, K5A, ___ } \ { K35, K1C, K4F, K51, K4D, K58, K5A, ___ } \
} }
// Keymap output pins
#define KM_OUT 18
// Keymap input pins
#define KM_IN 8
// Keymap layers (normal, Fn)
#define KM_LAY 2
// Keymap
extern uint16_t __xdata KEYMAP[KM_LAY][KM_OUT][KM_IN];
// Position of physical Esc key in the matrix // Position of physical Esc key in the matrix
#define MATRIX_ESC_INPUT 7 #define MATRIX_ESC_INPUT 7
#define MATRIX_ESC_OUTPUT 7 #define MATRIX_ESC_OUTPUT 7

20
src/board/system76/lemp9/include/board/keymap.h
View File

@ -3,9 +3,15 @@
#ifndef _BOARD_KEYMAP_H #ifndef _BOARD_KEYMAP_H
#define _BOARD_KEYMAP_H #define _BOARD_KEYMAP_H
#include <common/keymap.h> // Keymap layers (normal, Fn)
#define KM_LAY 2
// Keymap output pins
#define KM_OUT 16
// Keymap input pins
#define KM_IN 8
#define ___ 0 // common/keymap.h requires KM_LAY, KM_OUT, and KM_IN definitions
#include <common/keymap.h>
// Conversion of physical layout to keyboard matrix // Conversion of physical layout to keyboard matrix
#define LAYOUT( \ #define LAYOUT( \
@ -35,16 +41,6 @@
{ ___, ___, K3C, ___, K61, K0C, ___, K59 } \ { ___, ___, K3C, ___, K61, K0C, ___, K59 } \
} }
// Keymap output pins
#define KM_OUT 16
// Keymap input pins
#define KM_IN 8
// Keymap layers (normal, Fn)
#define KM_LAY 2
// Keymap
extern uint16_t __xdata KEYMAP[KM_LAY][KM_OUT][KM_IN];
// Position of physical Esc key in the matrix // Position of physical Esc key in the matrix
#define MATRIX_ESC_INPUT 7 #define MATRIX_ESC_INPUT 7
#define MATRIX_ESC_OUTPUT 7 #define MATRIX_ESC_OUTPUT 7

20
src/board/system76/oryp5/include/board/keymap.h
View File

@ -3,9 +3,15 @@
#ifndef _BOARD_KEYMAP_H #ifndef _BOARD_KEYMAP_H
#define _BOARD_KEYMAP_H #define _BOARD_KEYMAP_H
#include <common/keymap.h> // Keymap layers (normal, Fn)
#define KM_LAY 2
// Keymap output pins
#define KM_OUT 18
// Keymap input pins
#define KM_IN 8
#define ___ 0 // common/keymap.h requires KM_LAY, KM_OUT, and KM_IN definitions
#include <common/keymap.h>
// Conversion of physical layout to keyboard matrix // Conversion of physical layout to keyboard matrix
#define LAYOUT( \ #define LAYOUT( \
@ -36,16 +42,6 @@
{ K35, K1C, K4F, K51, K4D, K58, K5A, ___ } \ { K35, K1C, K4F, K51, K4D, K58, K5A, ___ } \
} }
// Keymap output pins
#define KM_OUT 18
// Keymap input pins
#define KM_IN 8
// Keymap layers (normal, Fn)
#define KM_LAY 2
// Keymap
extern uint16_t __xdata KEYMAP[KM_LAY][KM_OUT][KM_IN];
// Position of physical Esc key in the matrix // Position of physical Esc key in the matrix
#define MATRIX_ESC_INPUT 7 #define MATRIX_ESC_INPUT 7
#define MATRIX_ESC_OUTPUT 7 #define MATRIX_ESC_OUTPUT 7

20
src/board/system76/oryp6/include/board/keymap.h
View File

@ -3,9 +3,15 @@
#ifndef _BOARD_KEYMAP_H #ifndef _BOARD_KEYMAP_H
#define _BOARD_KEYMAP_H #define _BOARD_KEYMAP_H
#include <common/keymap.h> // Keymap layers (normal, Fn)
#define KM_LAY 2
// Keymap output pins
#define KM_OUT 18
// Keymap input pins
#define KM_IN 8
#define ___ 0 // common/keymap.h requires KM_LAY, KM_OUT, and KM_IN definitions
#include <common/keymap.h>
// Conversion of physical layout to keyboard matrix // Conversion of physical layout to keyboard matrix
#define LAYOUT( \ #define LAYOUT( \
@ -36,16 +42,6 @@
{ K35, K1C, K4F, K51, K4D, K58, K5A, ___ } \ { K35, K1C, K4F, K51, K4D, K58, K5A, ___ } \
} }
// Keymap output pins
#define KM_OUT 18
// Keymap input pins
#define KM_IN 8
// Keymap layers (normal, Fn)
#define KM_LAY 2
// Keymap
extern uint16_t __xdata KEYMAP[KM_LAY][KM_OUT][KM_IN];
// Position of physical Esc key in the matrix // Position of physical Esc key in the matrix
#define MATRIX_ESC_INPUT 7 #define MATRIX_ESC_INPUT 7
#define MATRIX_ESC_OUTPUT 7 #define MATRIX_ESC_OUTPUT 7

7
src/common/include/common/keymap.h
View File

@ -5,9 +5,16 @@
#include <stdint.h> #include <stdint.h>
#if defined(KM_LAY) && defined(KM_OUT) && defined(KM_IN)
extern uint16_t __xdata KEYMAP[KM_LAY][KM_OUT][KM_IN];
#endif
// Translate a keycode from PS/2 set 2 to PS/2 set 1 // Translate a keycode from PS/2 set 2 to PS/2 set 1
uint16_t keymap_translate(uint16_t key); uint16_t keymap_translate(uint16_t key);
// Helper definition for empty key
#define ___ 0
// Key types // Key types
#define KT_MASK (0xF000) #define KT_MASK (0xF000)