diff options
| author | tmk <nobody@nowhere> | 2014-01-03 07:10:53 +0900 |
|---|---|---|
| committer | tmk <nobody@nowhere> | 2014-01-03 07:10:53 +0900 |
| commit | cb33e78126c6a9154c747ebfb1a635716b9183e5 (patch) | |
| tree | 006b4d9229d6953ea22bd9cab6cc6f2dae33e0b6 | |
| parent | 92cda14f7a30f14bb3836c2369d110b2c8b4cf75 (diff) | |
| parent | dcfae0beb5d601b1a9dc9e12974814558f854cef (diff) | |
Merge branch 'master' of github.com:tmk/tmk_keyboard
| -rw-r--r-- | converter/sun_usb/keymap.c | 8 | ||||
| -rw-r--r-- | converter/sun_usb/matrix.c | 1 |
2 files changed, 4 insertions, 5 deletions
diff --git a/converter/sun_usb/keymap.c b/converter/sun_usb/keymap.c index 048a863caf..3d724a5201 100644 --- a/converter/sun_usb/keymap.c +++ b/converter/sun_usb/keymap.c @@ -77,12 +77,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. K63, K64,K65,K66,K67,K68,K69,K6A,K6B,K6C,K6D, K0D,K14,K6E, \ K77,K13, K78, K79, K7A,K43,K62,K18,K1B,K1C \ ) KEYMAP( \ - HELP, K05,K06,K08,K0A, K0C,K0E,K10,K11, K12,K07,K09,K0B, PSCR,SLCK,PAUS, MUTE,VOLD,VOLU,PWR, \ + HELP, K05,K06,K08,K0A, K0C,K0E,K10,K11, K12,K07,K09,K0B, PSCR,SLCK,PAUS, MUTE,VOLD,VOLU,K30, \ K01, AGAIN, K1D,K1E,K1F,K20,K21,K22,K23,K24,K25,K26,K27,K28,K29,K58,K2A, K2C, K34, K60, K62, PSLS,PAST,PMNS, \ MENU, UNDO, K35, K36,K37,K38,K39,K3A,K3B,K3C,K3D,K3E,K3F,K40,K41, K2B, K42, K4A, K7B, P7, P8, P9, PPLS, \ - SELECT, COPY, K4C, K4D,K4E,K4F,K50,K51,K52,K53,K54,K55,K56,K57, K59, P4, P5, P6, \ - EXECUTE,PASTE, K63, K64,K65,K66,K67,K68,K69,K6A,K6B,K6C,K6D, K6E, K14, P1, P2, P3, PENT, \ - FIND, CUT, K77,K13, K78, HENK, K79, MHEN, KANA, K7A,K43,K0D, K18, K1B, K1C, P0, PDOT \ + SELECT, K33, K4C, K4D,K4E,K4F,K50,K51,K52,K53,K54,K55,K56,K57, K59, P4, P5, P6, \ + EXECUTE,K49, K63, K64,K65,K66,K67,K68,K69,K6A,K6B,K6C,K6D, K6E, K14, P1, P2, P3, PENT, \ + FIND, K61, K77,K13, K78, HENK, K79, MHEN, KANA, K7A,K43,K0D, K18, K1B, K1C, P0, PDOT \ ) diff --git a/converter/sun_usb/matrix.c b/converter/sun_usb/matrix.c index 717c131e62..a61e3a2d34 100644 --- a/converter/sun_usb/matrix.c +++ b/converter/sun_usb/matrix.c @@ -63,7 +63,6 @@ uint8_t matrix_cols(void) void matrix_init(void) { - print_enable = true; debug_enable = true; serial_init(); |