summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortmk <nobody@nowhere>2012-06-15 16:14:56 +0900
committertmk <nobody@nowhere>2012-06-15 16:14:56 +0900
commitdd10d11a449b1c050d6e42c61e2ecb910b5b678e (patch)
treed2a2d6429bc00ec2f6edd5a49a909c1ddbe4a8a0
parent784c6e39795edd86e368e601f3c2e367a758c69f (diff)
Change pin configurationa and keymap.
-rw-r--r--keyboard/macway/config.h5
-rw-r--r--keyboard/macway/keymap.c14
-rw-r--r--keyboard/macway/matrix.c10
3 files changed, 17 insertions, 12 deletions
diff --git a/keyboard/macway/config.h b/keyboard/macway/config.h
index 2e68bf252f..b68ea20dcf 100644
--- a/keyboard/macway/config.h
+++ b/keyboard/macway/config.h
@@ -44,6 +44,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
)
+/* layer switching */
+#define LAYER_SWITCH_DELAY 100
+#define LAYER_SEND_FN_TERM 300
+
+
/* mouse keys */
#ifdef MOUSEKEY_ENABLE
# define MOUSEKEY_DELAY_TIME 192
diff --git a/keyboard/macway/keymap.c b/keyboard/macway/keymap.c
index ae9f595fce..89634e2f41 100644
--- a/keyboard/macway/keymap.c
+++ b/keyboard/macway/keymap.c
@@ -32,12 +32,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// This is a macro to define keymap easily in keyboard layout form.
#define KEYMAP( \
K11, K10, K20, K30, K40, K41, K51, K50, K60, K70, K80, K81, K61, K02, \
- K12, K13, K23, K33, K43, K42, K52, K53, K63, K73, K83, K82, K62, \
+ K12, K13, K23, K33, K43, K42, K52, K53, K63, K73, K83, K82, K62, K01, \
K15, K14, K24, K34, K44, K45, K55, K54, K64, K74, K84, K85, K06, \
K67, K16, K26, K36, K46, K47, K57, K56, K66, K76, K87, K32, K35, \
K75, K22, K00, K07, K21, K04, K37, K27, K17 \
) { \
- { KB_##K00, KB_NO, KB_##K02, KB_NO, KB_##K04, KB_NO, KB_##K06, KB_##K07 }, \
+ { KB_##K00, KB_##K01, KB_##K02, KB_NO, KB_##K04, KB_NO, KB_##K06, KB_##K07 }, \
{ KB_##K10, KB_##K11, KB_##K12, KB_##K13, KB_##K14, KB_##K15, KB_##K16, KB_##K17 }, \
{ KB_##K20, KB_##K21, KB_##K22, KB_##K23, KB_##K24, KB_NO, KB_##K26, KB_##K27 }, \
{ KB_##K30, KB_NO, KB_##K32, KB_##K33, KB_##K34, KB_##K35, KB_##K36, KB_##K37 }, \
@@ -91,7 +91,7 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `-----------------------------------------------------------'
*/
KEYMAP(ESC, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC, \
- TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC, \
+ TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC,BSLS, \
LCTL,A, S, D, F, G, H, J, K, L, FN3, QUOT,ENT, \
LSFT,Z, X, C, V, B, N, M, COMM,DOT, FN2, RSFT,FN1, \
FN7, LGUI,LALT,FN4, RALT,BSLS,GRV, FN6, RCTL),
@@ -111,7 +111,7 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `-----------------------------------------------------------'
*/
KEYMAP(ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, DEL, \
- CAPS,NO, NO, NO, NO, NO, NO, NO, PSCR,SLCK,BRK, UP, NO, \
+ CAPS,NO, NO, NO, NO, NO, NO, NO, PSCR,SLCK,BRK, UP, NO, NO, \
LCTL,VOLD,VOLU,MUTE,NO, NO, PAST,PSLS,HOME,PGUP,LEFT,RGHT,ENT, \
LSFT,NO, NO, NO, NO, NO, PPLS,PMNS,END, PGDN,DOWN,RSFT,FN1, \
NO, LGUI,LALT,SPC, RALT,NO, NO, NO, RCTL),
@@ -131,7 +131,7 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `-----------------------------------------------------------'
*/
KEYMAP(GRV, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, GRV, \
- BSLS,HOME,PGDN,UP, PGUP,END, HOME,PGDN,PGUP,END, NO, NO, NO, \
+ BSLS,HOME,PGDN,UP, PGUP,END, HOME,PGDN,PGUP,END, NO, NO, NO, NO, \
LCTL,NO, LEFT,DOWN,RGHT,NO, LEFT,DOWN,UP, RGHT,NO, NO, BSLS, \
LSFT,NO, NO, NO, NO, NO, HOME,PGDN,PGUP,END, FN2, RSFT,NO, \
NO, LGUI,LALT,SPC, RALT,RGUI,FN6, FN6, RCTL),
@@ -152,7 +152,7 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* Mc: Mouse Cursor / Mb: Mouse Button / Mw: Mouse Wheel
*/
KEYMAP(GRV, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, GRV, \
- BSLS,WH_L,WH_D,MS_U,WH_U,WH_R,WH_L,WH_D,WH_U,WH_R,NO, NO, NO, \
+ BSLS,WH_L,WH_D,MS_U,WH_U,WH_R,WH_L,WH_D,WH_U,WH_R,NO, NO, NO, NO, \
LCTL,NO, MS_L,MS_D,MS_R,NO, MS_L,MS_D,MS_U,MS_R,FN3, NO, BSLS, \
LSFT,NO, NO, BTN1,BTN2,BTN3,BTN2,BTN1,NO, NO, NO, RSFT,NO, \
FN7, LGUI,LALT,BTN1,RALT,NO, NO, NO, NO),
@@ -172,7 +172,7 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `-----------------------------------------------------------'
*/
KEYMAP(MINS,0, 9, 8, 7, 6, 5, 4, 3, 2, 1, NO, NO, ESC, \
- BSPC,P, O, I, U, Y, T, R, E, W, Q, TAB, TAB, \
+ BSPC,P, O, I, U, Y, T, R, E, W, Q, TAB, TAB, TAB, \
LCTL,SCLN,L, K, J, H, G, F, D, S, A, RCTL,RCTL, \
LSFT,SLSH,DOT, COMM,M, N, B, V, C, X, Z, RSFT,NO, \
NO, LGUI,LALT,FN4, RALT,RGUI,NO, NO, RCTL),
diff --git a/keyboard/macway/matrix.c b/keyboard/macway/matrix.c
index 56fb858960..394c3d9709 100644
--- a/keyboard/macway/matrix.c
+++ b/keyboard/macway/matrix.c
@@ -216,9 +216,9 @@ inline
static void unselect_rows(void)
{
// Hi-Z(DDR:0, PORT:0) to unselect
- DDRC &= ~0b11000000; // PC: 7,6
+ DDRC &= ~0b01000000; // PC: 6
PORTC &= ~0b11000000;
- DDRD &= ~0b11000111; // PD: 7,6,2,1,0
+ DDRD &= ~0b11100111; // PD: 7,6,5,2,1,0
PORTD &= ~0b11000111;
DDRF &= ~0b11000000; // PF: 7,6
PORTF &= ~0b11000000;
@@ -229,15 +229,15 @@ static void select_row(uint8_t row)
{
// Output low(DDR:1, PORT:0) to select
// row: 0 1 2 3 4 5 6 7 8
- // pin: PD0, PC7, PD7, PF6, PD6, PD1, PD2, PC6, PF7
+ // pin: PD0, PD5, PD7, PF6, PD6, PD1, PD2, PC6, PF7
switch (row) {
case 0:
DDRD |= (1<<0);
PORTD &= ~(1<<0);
break;
case 1:
- DDRC |= (1<<7);
- PORTC &= ~(1<<7);
+ DDRD |= (1<<5);
+ PORTD &= ~(1<<5);
break;
case 2:
DDRD |= (1<<7);