Revision 8f8c694c

View differences:

Matrix.h
86 86
#define QWERTY_ESCAPE {{0,key(ESCAPE)},{0,key(ESCAPE)},{0,key(ESCAPE)},{0,key(ESCAPE)}}
87 87
#define QWERTY_ENTER {{0,key(ENTER)},{0,key(ENTER)},{0,key(ENTER)},{0,key(ENTER)}}
88 88

  
89
#define QWERTY_LEFT_ALT {{key(LEFT_ALT),0},{key(LEFT_ALT),0},{key(LEFT_ALT),0},{key(LEFT_ALT),0}}
89
// from left to right
90
#define QWERTY_LEFT_SHIFT {{key(LEFT_SHIFT),0},{key(LEFT_SHIFT),0},{key(LEFT_SHIFT),0},{key(LEFT_SHIFT),0}}
90 91
#define QWERTY_LEFT_CONTROL {{key(LEFT_CONTROL),0},{key(LEFT_CONTROL),0},{key(LEFT_CONTROL),0},{key(LEFT_CONTROL),0}}
91 92
#define QWERTY_LEFT_GUI {{key(LEFT_GUI),0},{key(LEFT_GUI),0},{key(LEFT_GUI),0},{key(LEFT_GUI),0}}
92
#define QWERTY_LEFT_SHIFT {{key(LEFT_SHIFT),0},{key(LEFT_SHIFT),0},{key(LEFT_SHIFT),0},{key(LEFT_SHIFT),0}}
93

  
94
#define QWERTY_RIGHT_CONTROL {{key(RIGHT_CONTROL),0},{key(RIGHT_CONTROL),0},{key(RIGHT_CONTROL),0},{key(RIGHT_CONTROL),0}}
93
#define QWERTY_LEFT_ALT {{key(LEFT_ALT),0},{key(LEFT_ALT),0},{key(LEFT_ALT),0},{key(LEFT_ALT),0}}
94
// Right_ALT is modifier 
95 95
#define QWERTY_RIGHT_GUI {{key(RIGHT_GUI),0},{key(RIGHT_GUI),0},{key(RIGHT_GUI),0},{key(RIGHT_GUI),0}}
96
//#define QWERTY_MANU {{key(MANU),0},{key(MANU),0},{key(MANU),0},{key(MANU),0}}
97
#define QWERTY_RIGHT_CONTROL {{key(RIGHT_CONTROL),0},{key(RIGHT_CONTROL),0},{key(RIGHT_CONTROL),0},{key(RIGHT_CONTROL),0}}
96 98
#define QWERTY_RIGHT_SHIFT {{key(RIGHT_SHIFT),0},{key(RIGHT_SHIFT),0},{key(RIGHT_SHIFT),0},{key(RIGHT_SHIFT),0}}
97 99

  
98 100
#define QWERTY_F1 {{0,key(F1)},{0,key(F1)},{0,key(F1)},{0,key(F1)}}
......
108 110
#define QWERTY_F11 {{0,key(F11)},{0,key(F11)},{0,key(F11)},{0,key(F11)}}
109 111
#define QWERTY_F12 {{0,key(F12)},{0,key(F12)},{0,key(F12)},{0,key(F12)}}
110 112

  
113
#define QWERTY_UP	{{0,key(UP_ARROW)},{0,key(UP_ARROW)},{0,key(UP_ARROW)},{0,key(UP_ARROW)}}
114
#define QWERTY_DOWN	{{0,key(DOWN_ARROW)},{0,key(DOWN_ARROW)},{0,key(DOWN_ARROW)},{0,key(DOWN_ARROW)}}
115
#define QWERTY_LEFT	{{0,key(LEFT_ARROW)},{0,key(LEFT_ARROW)},{0,key(LEFT_ARROW)},{0,key(LEFT_ARROW)}}
116
#define QWERTY_RIGHT	{{0,key(RIGHT_ARROW)},{0,key(RIGHT_ARROW)},{0,key(RIGHT_ARROW)},{0,key(RIGHT_ARROW)}}
117

  
118
#define QWERTY_INSERT	{{0,key(INSERT)},{0,key(INSERT)},{0,key(INSERT)},{0,key(INSERT)}}
119
#define QWERTY_DELETE	{{0,key(DELETE)},{0,key(DELETE)},{0,key(DELETE)},{0,key(DELETE)}}
120
#define QWERTY_HOME	{{0,key(HOME)},{0,key(HOME)},{0,key(HOME)},{0,key(HOME)}}
121
#define QWERTY_END	{{0,key(END)},{0,key(END)},{0,key(END)},{0,key(END)}}
122
#define QWERTY_PAGE_UP	{{0,key(PAGE_UP)},{0,key(PAGE_UP)},{0,key(PAGE_UP)},{0,key(PAGE_UP)}}
123
#define QWERTY_PAGE_DOWN {{0,key(PAGE_DOWN)},{0,key(PAGE_DOWN)},{0,key(PAGE_DOWN)},{0,key(PAGE_DOWN)}}
124

  
111 125
#define BLANK {{0,0},{0,0},{0,0},{0,0}}
112 126

  
113
#define MAX_KEYPRESS_COUNT 50
114
#define KEYPRESS_TRIGGER_COUNT 40
127
#define MAX_KEYPRESS_COUNT 15
128
#define KEYPRESS_TRIGGER_COUNT 7
115 129

  
116 130
volatile uint8_t matrixState[19];
117 131
volatile uint8_t detectedKeypress[30][3];
......
119 133
{
120 134
 {BLANK, BLANK, BLANK, BLANK,  BLANK, BLANK, BLANK, BLANK}, //a
121 135
 {QWERTY_LEFT_ALT, BLANK, BLANK, BLANK,  BLANK, BLANK, BLANK, QWERTY_RIGHT_ALT}, //b
122
 {BLANK, BLANK, BLANK, BLANK,  BLANK, QWERTY_MANU, BLANK, BLANK}, //c
136
 {QWERTY_UP, BLANK, BLANK, BLANK,  BLANK, QWERTY_RIGHT_GUI, BLANK, QWERTY_LEFT}, //c
123 137
 {BLANK, BLANK, BLANK, BLANK,  BLANK, BLANK, BLANK, BLANK}, //d
124
 {BLANK, BLANK, QWERTY_F12, BLANK,  BLANK, BLANK, BLANK, BLANK}, //e
125
 {BLANK, BLANK, QWERTY_F11, BLANK,  BLANK, BLANK, BLANK, BLANK}, //f
138
 {BLANK, BLANK, QWERTY_F12, QWERTY_INSERT,  BLANK, BLANK, BLANK, QWERTY_RIGHT}, //e
139
 {BLANK, QWERTY_HOME, QWERTY_F11, QWERTY_DELETE, QWERTY_END, QWERTY_PAGE_UP, QWERTY_PAGE_DOWN, QWERTY_DOWN}, //f
126 140
 {QWERTY_F5, QWERTY_ENTER, QWERTY_F10, QWERTY_F9,  BLANK, QWERTY_BACKSPACE, BLANK, QWERTY_SPACE}, //g
127 141
 {QWERTY_APOSTROPHE_AND_QUOTE, QWERTY_BACKSLASH_AND_PIPE, QWERTY_0_AND_CLOSING_PARENTHESIS, QWERTY_MINUS_AND_UNDERSCORE,  QWERTY_P, QWERTY_OPENING_BRACKET_AND_OPENING_BRACE, QWERTY_SEMICOLON_AND_COLON, QWERTY_SLASH_AND_QUESTION_MARK}, //h
128 142
 {BLANK, QWERTY_DOT_AND_GREATER_THAN_SIGN, QWERTY_9_AND_OPENING_PARENTHESIS, QWERTY_F8,  QWERTY_O, QWERTY_F7, QWERTY_L, BLANK}, //i
......
135 149
 {BLANK, QWERTY_RIGHT_SHIFT, BLANK, BLANK,  BLANK, QWERTY_LEFT_SHIFT, BLANK, BLANK}, //p
136 150
 {BLANK, QWERTY_RIGHT_CONTROL, BLANK, QWERTY_LEFT_CONTROL,  BLANK, BLANK, BLANK, BLANK}, //q
137 151
 {QWERTY_LEFT_GUI, BLANK, BLANK, BLANK,  BLANK, BLANK, BLANK, BLANK}, //r
138
 {BLANK, BLANK, BLANK, BLANK,  BLANK, BLANK, BLANK, QWERTY_RIGHT_GUI} //s
152
 {BLANK, BLANK, BLANK, BLANK,  BLANK, BLANK, BLANK, QWERTY_LEFT_ALT} //s
139 153
};
140 154
#undef key
141 155

  

Also available in: Unified diff