PS/2 to USB: fix comments.

author: tmk <nobody@nowhere> 2011-12-09 14:51:30 +0900
committer: tmk <nobody@nowhere> 2011-12-09 14:51:30 +0900
commit: e2afc305edc7133e42cab8c2a30b1e214f4926f8 (patch)
tree: 020f2e9062c213e6a2d8a91246f151c1b1f88826
parent: 3f9de37310f670e6289738c628747e6787d42b22 (diff)
download: qmk_firmware-e2afc305edc7133e42cab8c2a30b1e214f4926f8.tar.gz
qmk_firmware-e2afc305edc7133e42cab8c2a30b1e214f4926f8.zip
3 files changed, 85 insertions, 10 deletions
diff --git a/ps2_usb/Makefile b/ps2_usb/Makefile
index 7352f6b13..f003aea01 100644
--- a/ps2_usb/Makefile
+++ b/ps2_usb/Makefile
@@ -39,7 +39,7 @@ F_CPU = 16000000
 # Build Options
-#   comment out to disable the options.
+#   *Comment out* to disable the options.
 #
 MOUSEKEY_ENABLE = yes   # Mouse keys
 EXTRAKEY_ENABLE = yes   # Audio control and System control
diff --git a/ps2_usb/keymap.c b/ps2_usb/keymap.c
index fc429212d..f1e34a929 100644
--- a/ps2_usb/keymap.c
+++ b/ps2_usb/keymap.c
@@ -200,7 +200,7 @@ static const uint8_t PROGMEM fn_keycode[] = {
 // See usb_keycodes.h for USB keycodes. You should omit a 'KB_' prefix of USB keycodes in keymap macro.
 // Use KEYMAP_ISO() or KEYMAP_JIS() instead of KEYMAP() if your keyboard is ISO or JIS.
 static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* keymap
+    /* 0: default
     * ,---.   ,---------------. ,---------------. ,---------------. ,-----------.     ,-----------.
     * |Esc|   |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau|     |Pwr|Slp|Wak|
     * `---'   `---------------' `---------------' `---------------' `-----------'     `-----------'
@@ -215,8 +215,9 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     * |-----------------------------------------------------------| ,-----------. |-----------|Ent|
     * |Ctrl |Gui |Alt |         Space         |Alt |Gui |Menu|Ctrl| |Lef|Dow|Rig| |      0|  .|   |
     * `-----------------------------------------------------------' `-----------' `---------------'
+     * ; = Fn0(to Layer 5)
+     * / = Fn1(to Layer 6)
     */
-    /* 0: default */
    KEYMAP(
    ESC, F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12,           PSCR,SLCK,BRK,
    GRV, 1,   2,   3,   4,   5,   6,   7,   8,   9,   0,   MINS,EQL, BSPC,     INS, HOME,PGUP,    NLCK,PSLS,PAST,PMNS,
@@ -226,7 +227,19 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    LCTL,LGUI,LALT,          SPC,                     RALT,RGUI,APP, RCTL,     LEFT,DOWN,RGHT,    P0,       PDOT,PENT
    ),
-    /* 1: plain Qwerty without layer switching */
+    /* 1: plain Qwerty without layer switching
+     * ,-----------------------------------------------------------.
+     * |  `|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backspa|
+     * |-----------------------------------------------------------|
+     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|    \|
+     * |-----------------------------------------------------------|
+     * |CapsLo|  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return  |
+     * |-----------------------------------------------------------|
+     * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  ,|  /|Shift     |
+     * |-----------------------------------------------------------|
+     * |Ctrl |Gui |Alt |         Space         |Alt |Gui |Menu|Ctrl|
+     * `-----------------------------------------------------------'
+     */
    KEYMAP(
    ESC, F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12,           PSCR,SLCK,BRK,
    GRV, 1,   2,   3,   4,   5,   6,   7,   8,   9,   0,   MINS,EQL, BSPC,     INS, HOME,PGUP,    NLCK,PSLS,PAST,PMNS,
@@ -236,7 +249,19 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    LCTL,LGUI,LALT,          SPC,                     RALT,RGUI,APP, RCTL,     LEFT,DOWN,RGHT,    P0,       PDOT,PENT
    ),
-    /* 2: Colemak http://colemak.com */
+    /* 2: Colemak http://colemak.com
+     * ,-----------------------------------------------------------.
+     * |  `|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backspa|
+     * |-----------------------------------------------------------|
+     * |Tab  |  Q|  W|  F|  P|  G|  J|  L|  U|  Y|  ;|  [|  ]|    \|
+     * |-----------------------------------------------------------|
+     * |BackSp|  A|  R|  S|  T|  D|  H|  N|  E|  I|  O|  '|Return  |
+     * |-----------------------------------------------------------|
+     * |Shift   |  Z|  X|  C|  V|  B|  K|  M|  ,|  ,|  /|Shift     |
+     * |-----------------------------------------------------------|
+     * |Ctrl |Gui |Alt |         Space         |Alt |Gui |Menu|Ctrl|
+     * `----------------------------------------------------------'
+     */
    KEYMAP(
    ESC, F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12,           PSCR,SLCK,BRK,
    GRV, 1,   2,   3,   4,   5,   6,   7,   8,   9,   0,   MINS,EQL, BSPC,     INS, HOME,PGUP,    NLCK,PSLS,PAST,PMNS,
@@ -246,7 +271,19 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    LCTL,LGUI,LALT,          SPC,                     RALT,RGUI,APP, RCTL,     LEFT,DOWN,RGHT,    P0,       PDOT,PENT
    ),
-    /* 3: Dvorak http://en.wikipedia.org/wiki/Dvorak_Simplified_Keyboard */
+    /* 3: Dvorak http://en.wikipedia.org/wiki/Dvorak_Simplified_Keyboard
+     * ,-----------------------------------------------------------.
+     * |  `|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  [|  ]|Backspa|
+     * |-----------------------------------------------------------|
+     * |Tab  |  '|  ,|  .|  P|  Y|  F|  G|  C|  R|  L|  /|  =|    \|
+     * |-----------------------------------------------------------|
+     * |BackSp|  A|  O|  E|  U|  I|  D|  H|  T|  N|  S|  -|Return  |
+     * |-----------------------------------------------------------|
+     * |Shift   |  ;|  Q|  J|  K|  X|  B|  M|  Wl  V|  Z|Shift     |
+     * |-----------------------------------------------------------|
+     * |Ctrl |Gui |Alt |         Space         |Alt |Gui |Menu|Ctrl|
+     * `-----------------------------------------------------------'
+     */
    KEYMAP(
    ESC, F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12,           PSCR,SLCK,BRK,
    GRV, 1,   2,   3,   4,   5,   6,   7,   8,   9,   0,   LBRC,RBRC,BSPC,     INS, HOME,PGUP,    NLCK,PSLS,PAST,PMNS,
@@ -256,7 +293,19 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    LCTL,LGUI,LALT,          SPC,                     RALT,RGUI,APP, RCTL,     LEFT,DOWN,RGHT,    P0,       PDOT,PENT
    ),
-    /* 4: Workman http://viralintrospection.wordpress.com/2010/09/06/a-different-philosophy-in-designing-keyboard-layouts/ */
+    /* 4: Workman http://viralintrospection.wordpress.com/2010/09/06/a-different-philosophy-in-designing-keyboard-layouts/
+     * ,-----------------------------------------------------------.
+     * |  `|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backspa|
+     * |-----------------------------------------------------------|
+     * |Tab  |  Q|  D|  R|  W|  B|  J|  F|  U|  P|  ;|  [|  ]|    \|
+     * |-----------------------------------------------------------|
+     * |CapsLo|  A|  S|  H|  T|  G|  Y|  N|  E|  O|  I|  '|Return  |
+     * |-----------------------------------------------------------|
+     * |Shift   |  Z|  X|  M|  C|  V|  K|  L|  ,|  ,|  /|Shift     |
+     * |-----------------------------------------------------------|
+     * |Ctrl |Gui |Alt |         Space         |Alt |Gui |Menu|Ctrl|
+     * `-----------------------------------------------------------'
+     */
    KEYMAP(
    ESC, F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12,           PSCR,SLCK,BRK,
    GRV, 1,   2,   3,   4,   5,   6,   7,   8,   9,   0,   MINS,EQL, BSPC,     INS, HOME,PGUP,    NLCK,PSLS,PAST,PMNS,
@@ -266,7 +315,21 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    LCTL,LGUI,LALT,          SPC,                     RALT,RGUI,APP, RCTL,     LEFT,DOWN,RGHT,    P0,       PDOT,PENT
    ),
-    /* 5: Mouse keys */
+    /* 5: Mouse keys
+     * ,-----------------------------------------------------------.
+     * |Esc| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Backspa|
+     * |-----------------------------------------------------------|
+     * |Tab  |MwL|MwU|McU|WwU|WwR|MwL|MwD|MwU|MwR|   |   |   |    \|
+     * |-----------------------------------------------------------|
+     * |CapsLo|   |McL|McD|McR|   |McL|McD|McU|McR|Fn0|   |Return  |
+     * |-----------------------------------------------------------|
+     * |Shift   |VoD|VoU|Mut|Mb2|Mb3|Mb2|Mb1|VoD|VoU|Mut|Shift     |
+     * |-----------------------------------------------------------|
+     * |Ctrl |Gui |Alt |         Mb1           |Alt |Gui |Menu|Ctrl|
+     * `-----------------------------------------------------------'
+     * Mc = mouse cursor, Mw = mouse wheel, Mb = mouse button
+     * Vo = Volume, Mut = Mute
+     */
    KEYMAP(
    ESC, F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12,           PSCR,SLCK,BRK,
    ESC, F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F8,  F10, F11, F12, BSPC,     INS, HOME,PGUP,    NLCK,PSLS,PAST,PMNS,
@@ -276,7 +339,19 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    LCTL,LGUI,LALT,          BTN1,                    RALT,RGUI,APP, RCTL,     LEFT,DOWN,RGHT,    P0,       PDOT,PENT
    ),
-    /* 6: Cursor keys */
+    /* 6: Cursor keys
+     * ,-----------------------------------------------------------.
+     * |Esc| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Backspa|
+     * |-----------------------------------------------------------|
+     * |Tab  |Hom|PgU| Up|PgU|End|Hom|PgD|PgU|End|   |   |   |    \|
+     * |-----------------------------------------------------------|
+     * |CapsLo|   |Lef|Dow|Rig|   |Lef|Dow| Up|Rig|   |   |Return  |
+     * |-----------------------------------------------------------|
+     * |Shift   |   |   |   |   |   |Hom|PgD|PgU|End|Fn1|Shift     |
+     * |-----------------------------------------------------------|
+     * |Ctrl |Gui |Alt |         Space         |Alt |Gui |Menu|Ctrl|
+     * `-----------------------------------------------------------'
+     */
    KEYMAP(
    ESC, F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12,           PSCR,SLCK,BRK,
    ESC, F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F8,  F10, F11, F12, BSPC,     INS, HOME,PGUP,    NLCK,PSLS,PAST,PMNS,
diff --git a/rules.mk b/rules.mk
index f1d0a301c..3d32adc5f 100644
--- a/rules.mk
+++ b/rules.mk
@@ -224,7 +224,7 @@ EXTMEMOPTS =
 #       (.vectors+0x30): relocation truncated to fit: R_AVR_13_PCREL against symbol `__vector_12'
 #
 LDFLAGS = -Wl,-Map=$(TARGET).map,--cref
-LDFLAGS += -Wl,--relax
+#LDFLAGS += -Wl,--relax
 LDFLAGS += -Wl,--gc-sections
 LDFLAGS += $(EXTMEMOPTS)
 LDFLAGS += $(patsubst %,-L%,$(EXTRALIBDIRS))
author	tmk <nobody@nowhere>	2011-12-09 14:51:30 +0900
committer	tmk <nobody@nowhere>	2011-12-09 14:51:30 +0900
commit	e2afc305edc7133e42cab8c2a30b1e214f4926f8 (patch)
tree	020f2e9062c213e6a2d8a91246f151c1b1f88826
parent	3f9de37310f670e6289738c628747e6787d42b22 (diff)
download	qmk_firmware-e2afc305edc7133e42cab8c2a30b1e214f4926f8.tar.gz qmk_firmware-e2afc305edc7133e42cab8c2a30b1e214f4926f8.zip

diff --git a/ps2_usb/Makefile b/ps2_usb/Makefile index 7352f6b13..f003aea01 100644 --- a/ps2_usb/Makefile +++ b/ps2_usb/Makefile
@@ -39,7 +39,7 @@ F_CPU = 16000000
39		39
40		40
41	# Build Options	41	# Build Options
42	# comment out to disable the options.	42	# Comment out to disable the options.
43	#	43	#
44	MOUSEKEY_ENABLE = yes # Mouse keys	44	MOUSEKEY_ENABLE = yes # Mouse keys
45	EXTRAKEY_ENABLE = yes # Audio control and System control	45	EXTRAKEY_ENABLE = yes # Audio control and System control


diff --git a/ps2_usb/keymap.c b/ps2_usb/keymap.c index fc429212d..f1e34a929 100644 --- a/ps2_usb/keymap.c +++ b/ps2_usb/keymap.c
@@ -200,7 +200,7 @@ static const uint8_t PROGMEM fn_keycode[] = {
200	// See usb_keycodes.h for USB keycodes. You should omit a 'KB_' prefix of USB keycodes in keymap macro.	200	// See usb_keycodes.h for USB keycodes. You should omit a 'KB_' prefix of USB keycodes in keymap macro.
201	// Use KEYMAP_ISO() or KEYMAP_JIS() instead of KEYMAP() if your keyboard is ISO or JIS.	201	// Use KEYMAP_ISO() or KEYMAP_JIS() instead of KEYMAP() if your keyboard is ISO or JIS.
202	static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {	202	static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
203	/* keymap	203	/* 0: default
204	* ,---. ,---------------. ,---------------. ,---------------. ,-----------. ,-----------.	204	* ,---. ,---------------. ,---------------. ,---------------. ,-----------. ,-----------.
205	* \|Esc\| \|F1 \|F2 \|F3 \|F4 \| \|F5 \|F6 \|F7 \|F8 \| \|F9 \|F10\|F11\|F12\| \|PrS\|ScL\|Pau\| \|Pwr\|Slp\|Wak\|	205	* \|Esc\| \|F1 \|F2 \|F3 \|F4 \| \|F5 \|F6 \|F7 \|F8 \| \|F9 \|F10\|F11\|F12\| \|PrS\|ScL\|Pau\| \|Pwr\|Slp\|Wak\|
206	* `---' `---------------' `---------------' `---------------' `-----------' `-----------'	206	* `---' `---------------' `---------------' `---------------' `-----------' `-----------'
@@ -215,8 +215,9 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
215	* \|-----------------------------------------------------------\| ,-----------. \|-----------\|Ent\|	215	* \|-----------------------------------------------------------\| ,-----------. \|-----------\|Ent\|
216	* \|Ctrl \|Gui \|Alt \| Space \|Alt \|Gui \|Menu\|Ctrl\| \|Lef\|Dow\|Rig\| \| 0\| .\| \|	216	* \|Ctrl \|Gui \|Alt \| Space \|Alt \|Gui \|Menu\|Ctrl\| \|Lef\|Dow\|Rig\| \| 0\| .\| \|
217	* `-----------------------------------------------------------' `-----------' `---------------'	217	* `-----------------------------------------------------------' `-----------' `---------------'
		218	* ; = Fn0(to Layer 5)
		219	* / = Fn1(to Layer 6)
218	*/	220	*/
219	/* 0: default */
220	KEYMAP(	221	KEYMAP(
221	ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PSCR,SLCK,BRK,	222	ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PSCR,SLCK,BRK,
222	GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC, INS, HOME,PGUP, NLCK,PSLS,PAST,PMNS,	223	GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC, INS, HOME,PGUP, NLCK,PSLS,PAST,PMNS,
@@ -226,7 +227,19 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
226	LCTL,LGUI,LALT, SPC, RALT,RGUI,APP, RCTL, LEFT,DOWN,RGHT, P0, PDOT,PENT	227	LCTL,LGUI,LALT, SPC, RALT,RGUI,APP, RCTL, LEFT,DOWN,RGHT, P0, PDOT,PENT
227	),	228	),
228		229
229	/* 1: plain Qwerty without layer switching */	230	/* 1: plain Qwerty without layer switching
		231	* ,-----------------------------------------------------------.
		232	* \| `\| 1\| 2\| 3\| 4\| 5\| 6\| 7\| 8\| 9\| 0\| -\| =\|Backspa\|
		233	* \|-----------------------------------------------------------\|
		234	* \|Tab \| Q\| W\| E\| R\| T\| Y\| U\| I\| O\| P\| [\| ]\| \\|
		235	* \|-----------------------------------------------------------\|
		236	* \|CapsLo\| A\| S\| D\| F\| G\| H\| J\| K\| L\| ;\| '\|Return \|
		237	* \|-----------------------------------------------------------\|
		238	* \|Shift \| Z\| X\| C\| V\| B\| N\| M\| ,\| ,\| /\|Shift \|
		239	* \|-----------------------------------------------------------\|
		240	* \|Ctrl \|Gui \|Alt \| Space \|Alt \|Gui \|Menu\|Ctrl\|
		241	* `-----------------------------------------------------------'
		242	*/
230	KEYMAP(	243	KEYMAP(
231	ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PSCR,SLCK,BRK,	244	ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PSCR,SLCK,BRK,
232	GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC, INS, HOME,PGUP, NLCK,PSLS,PAST,PMNS,	245	GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC, INS, HOME,PGUP, NLCK,PSLS,PAST,PMNS,
@@ -236,7 +249,19 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
236	LCTL,LGUI,LALT, SPC, RALT,RGUI,APP, RCTL, LEFT,DOWN,RGHT, P0, PDOT,PENT	249	LCTL,LGUI,LALT, SPC, RALT,RGUI,APP, RCTL, LEFT,DOWN,RGHT, P0, PDOT,PENT
237	),	250	),
238		251
239	/* 2: Colemak http://colemak.com */	252	/* 2: Colemak http://colemak.com
		253	* ,-----------------------------------------------------------.
		254	* \| `\| 1\| 2\| 3\| 4\| 5\| 6\| 7\| 8\| 9\| 0\| -\| =\|Backspa\|
		255	* \|-----------------------------------------------------------\|
		256	* \|Tab \| Q\| W\| F\| P\| G\| J\| L\| U\| Y\| ;\| [\| ]\| \\|
		257	* \|-----------------------------------------------------------\|
		258	* \|BackSp\| A\| R\| S\| T\| D\| H\| N\| E\| I\| O\| '\|Return \|
		259	* \|-----------------------------------------------------------\|
		260	* \|Shift \| Z\| X\| C\| V\| B\| K\| M\| ,\| ,\| /\|Shift \|
		261	* \|-----------------------------------------------------------\|
		262	* \|Ctrl \|Gui \|Alt \| Space \|Alt \|Gui \|Menu\|Ctrl\|
		263	* `----------------------------------------------------------'
		264	*/
240	KEYMAP(	265	KEYMAP(
241	ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PSCR,SLCK,BRK,	266	ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PSCR,SLCK,BRK,
242	GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC, INS, HOME,PGUP, NLCK,PSLS,PAST,PMNS,	267	GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC, INS, HOME,PGUP, NLCK,PSLS,PAST,PMNS,
@@ -246,7 +271,19 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
246	LCTL,LGUI,LALT, SPC, RALT,RGUI,APP, RCTL, LEFT,DOWN,RGHT, P0, PDOT,PENT	271	LCTL,LGUI,LALT, SPC, RALT,RGUI,APP, RCTL, LEFT,DOWN,RGHT, P0, PDOT,PENT
247	),	272	),
248		273
249	/* 3: Dvorak http://en.wikipedia.org/wiki/Dvorak_Simplified_Keyboard */	274	/* 3: Dvorak http://en.wikipedia.org/wiki/Dvorak_Simplified_Keyboard
		275	* ,-----------------------------------------------------------.
		276	* \| `\| 1\| 2\| 3\| 4\| 5\| 6\| 7\| 8\| 9\| 0\| [\| ]\|Backspa\|
		277	* \|-----------------------------------------------------------\|
		278	* \|Tab \| '\| ,\| .\| P\| Y\| F\| G\| C\| R\| L\| /\| =\| \\|
		279	* \|-----------------------------------------------------------\|
		280	* \|BackSp\| A\| O\| E\| U\| I\| D\| H\| T\| N\| S\| -\|Return \|
		281	* \|-----------------------------------------------------------\|
		282	* \|Shift \| ;\| Q\| J\| K\| X\| B\| M\| Wl V\| Z\|Shift \|
		283	* \|-----------------------------------------------------------\|
		284	* \|Ctrl \|Gui \|Alt \| Space \|Alt \|Gui \|Menu\|Ctrl\|
		285	* `-----------------------------------------------------------'
		286	*/
250	KEYMAP(	287	KEYMAP(
251	ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PSCR,SLCK,BRK,	288	ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PSCR,SLCK,BRK,
252	GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, LBRC,RBRC,BSPC, INS, HOME,PGUP, NLCK,PSLS,PAST,PMNS,	289	GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, LBRC,RBRC,BSPC, INS, HOME,PGUP, NLCK,PSLS,PAST,PMNS,
@@ -256,7 +293,19 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
256	LCTL,LGUI,LALT, SPC, RALT,RGUI,APP, RCTL, LEFT,DOWN,RGHT, P0, PDOT,PENT	293	LCTL,LGUI,LALT, SPC, RALT,RGUI,APP, RCTL, LEFT,DOWN,RGHT, P0, PDOT,PENT
257	),	294	),
258		295
259	/* 4: Workman http://viralintrospection.wordpress.com/2010/09/06/a-different-philosophy-in-designing-keyboard-layouts/ */	296	/* 4: Workman http://viralintrospection.wordpress.com/2010/09/06/a-different-philosophy-in-designing-keyboard-layouts/
		297	* ,-----------------------------------------------------------.
		298	* \| `\| 1\| 2\| 3\| 4\| 5\| 6\| 7\| 8\| 9\| 0\| -\| =\|Backspa\|
		299	* \|-----------------------------------------------------------\|
		300	* \|Tab \| Q\| D\| R\| W\| B\| J\| F\| U\| P\| ;\| [\| ]\| \\|
		301	* \|-----------------------------------------------------------\|
		302	* \|CapsLo\| A\| S\| H\| T\| G\| Y\| N\| E\| O\| I\| '\|Return \|
		303	* \|-----------------------------------------------------------\|
		304	* \|Shift \| Z\| X\| M\| C\| V\| K\| L\| ,\| ,\| /\|Shift \|
		305	* \|-----------------------------------------------------------\|
		306	* \|Ctrl \|Gui \|Alt \| Space \|Alt \|Gui \|Menu\|Ctrl\|
		307	* `-----------------------------------------------------------'
		308	*/
260	KEYMAP(	309	KEYMAP(
261	ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PSCR,SLCK,BRK,	310	ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PSCR,SLCK,BRK,
262	GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC, INS, HOME,PGUP, NLCK,PSLS,PAST,PMNS,	311	GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC, INS, HOME,PGUP, NLCK,PSLS,PAST,PMNS,
@@ -266,7 +315,21 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
266	LCTL,LGUI,LALT, SPC, RALT,RGUI,APP, RCTL, LEFT,DOWN,RGHT, P0, PDOT,PENT	315	LCTL,LGUI,LALT, SPC, RALT,RGUI,APP, RCTL, LEFT,DOWN,RGHT, P0, PDOT,PENT
267	),	316	),
268		317
269	/* 5: Mouse keys */	318	/* 5: Mouse keys
		319	* ,-----------------------------------------------------------.
		320	* \|Esc\| F1\| F2\| F3\| F4\| F5\| F6\| F7\| F8\| F9\|F10\|F11\|F12\|Backspa\|
		321	* \|-----------------------------------------------------------\|
		322	* \|Tab \|MwL\|MwU\|McU\|WwU\|WwR\|MwL\|MwD\|MwU\|MwR\| \| \| \| \\|
		323	* \|-----------------------------------------------------------\|
		324	* \|CapsLo\| \|McL\|McD\|McR\| \|McL\|McD\|McU\|McR\|Fn0\| \|Return \|
		325	* \|-----------------------------------------------------------\|
		326	* \|Shift \|VoD\|VoU\|Mut\|Mb2\|Mb3\|Mb2\|Mb1\|VoD\|VoU\|Mut\|Shift \|
		327	* \|-----------------------------------------------------------\|
		328	* \|Ctrl \|Gui \|Alt \| Mb1 \|Alt \|Gui \|Menu\|Ctrl\|
		329	* `-----------------------------------------------------------'
		330	* Mc = mouse cursor, Mw = mouse wheel, Mb = mouse button
		331	* Vo = Volume, Mut = Mute
		332	*/
270	KEYMAP(	333	KEYMAP(
271	ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PSCR,SLCK,BRK,	334	ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PSCR,SLCK,BRK,
272	ESC, F1, F2, F3, F4, F5, F6, F7, F8, F8, F10, F11, F12, BSPC, INS, HOME,PGUP, NLCK,PSLS,PAST,PMNS,	335	ESC, F1, F2, F3, F4, F5, F6, F7, F8, F8, F10, F11, F12, BSPC, INS, HOME,PGUP, NLCK,PSLS,PAST,PMNS,
@@ -276,7 +339,19 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
276	LCTL,LGUI,LALT, BTN1, RALT,RGUI,APP, RCTL, LEFT,DOWN,RGHT, P0, PDOT,PENT	339	LCTL,LGUI,LALT, BTN1, RALT,RGUI,APP, RCTL, LEFT,DOWN,RGHT, P0, PDOT,PENT
277	),	340	),
278		341
279	/* 6: Cursor keys */	342	/* 6: Cursor keys
		343	* ,-----------------------------------------------------------.
		344	* \|Esc\| F1\| F2\| F3\| F4\| F5\| F6\| F7\| F8\| F9\|F10\|F11\|F12\|Backspa\|
		345	* \|-----------------------------------------------------------\|
		346	* \|Tab \|Hom\|PgU\| Up\|PgU\|End\|Hom\|PgD\|PgU\|End\| \| \| \| \\|
		347	* \|-----------------------------------------------------------\|
		348	* \|CapsLo\| \|Lef\|Dow\|Rig\| \|Lef\|Dow\| Up\|Rig\| \| \|Return \|
		349	* \|-----------------------------------------------------------\|
		350	* \|Shift \| \| \| \| \| \|Hom\|PgD\|PgU\|End\|Fn1\|Shift \|
		351	* \|-----------------------------------------------------------\|
		352	* \|Ctrl \|Gui \|Alt \| Space \|Alt \|Gui \|Menu\|Ctrl\|
		353	* `-----------------------------------------------------------'
		354	*/
280	KEYMAP(	355	KEYMAP(
281	ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PSCR,SLCK,BRK,	356	ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PSCR,SLCK,BRK,
282	ESC, F1, F2, F3, F4, F5, F6, F7, F8, F8, F10, F11, F12, BSPC, INS, HOME,PGUP, NLCK,PSLS,PAST,PMNS,	357	ESC, F1, F2, F3, F4, F5, F6, F7, F8, F8, F10, F11, F12, BSPC, INS, HOME,PGUP, NLCK,PSLS,PAST,PMNS,


diff --git a/rules.mk b/rules.mk index f1d0a301c..3d32adc5f 100644 --- a/rules.mk +++ b/rules.mk
@@ -224,7 +224,7 @@ EXTMEMOPTS =
224	# (.vectors+0x30): relocation truncated to fit: R_AVR_13_PCREL against symbol `__vector_12'	224	# (.vectors+0x30): relocation truncated to fit: R_AVR_13_PCREL against symbol `__vector_12'
225	#	225	#
226	LDFLAGS = -Wl,-Map=$(TARGET).map,--cref	226	LDFLAGS = -Wl,-Map=$(TARGET).map,--cref
227	LDFLAGS += -Wl,--relax	227	#LDFLAGS += -Wl,--relax
228	LDFLAGS += -Wl,--gc-sections	228	LDFLAGS += -Wl,--gc-sections
229	LDFLAGS += $(EXTMEMOPTS)	229	LDFLAGS += $(EXTMEMOPTS)
230	LDFLAGS += $(patsubst %,-L%,$(EXTRALIBDIRS))	230	LDFLAGS += $(patsubst %,-L%,$(EXTRALIBDIRS))