aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBalz Guenat <balz.guenat@gmail.com>2017-08-16 01:34:46 +0200
committerJack Humbert <jack.humb@gmail.com>2017-08-15 23:14:41 -0400
commit5bff9d61818c5dd692c505896aee287168af80cc (patch)
treea3ba9cc695d6b106bab9c43c292076a7f8b58cd0
parent7e5ccd50dc4d1142fe27a34006257a1fd4cbf4b9 (diff)
downloadqmk_firmware-5bff9d61818c5dd692c505896aee287168af80cc.tar.gz
qmk_firmware-5bff9d61818c5dd692c505896aee287168af80cc.zip
cleanup usb-usb converter code
Diffstat
-rw-r--r--keyboards/converter/usb_usb/Makefile2
-rw-r--r--keyboards/converter/usb_usb/Makefile.8mhz5
-rw-r--r--keyboards/converter/usb_usb/Makefile.debug6
-rw-r--r--keyboards/converter/usb_usb/Makefile.unimap5
-rw-r--r--keyboards/converter/usb_usb/README.md (renamed from keyboards/converter/usb_usb/README)28
-rw-r--r--keyboards/converter/usb_usb/config.h28
-rw-r--r--keyboards/converter/usb_usb/keymaps/coloneljesus/Makefile3
-rw-r--r--keyboards/converter/usb_usb/keymaps/coloneljesus/config.h6
-rw-r--r--keyboards/converter/usb_usb/keymaps/coloneljesus/keymap.c307
-rw-r--r--keyboards/converter/usb_usb/keymaps/default/Makefile2
-rw-r--r--keyboards/converter/usb_usb/keymaps/default/keymap.c262
-rw-r--r--keyboards/converter/usb_usb/rules.mk120
-rw-r--r--keyboards/converter/usb_usb/unimap.c45
-rw-r--r--keyboards/converter/usb_usb/usb_usb.h1
-rw-r--r--tmk_core/protocol/usb_hid.mk1
15 files changed, 393 insertions, 428 deletions
diff --git a/keyboards/converter/usb_usb/Makefile b/keyboards/converter/usb_usb/Makefile
index 191c6bb66..bd09e5885 100644
--- a/keyboards/converter/usb_usb/Makefile
+++ b/keyboards/converter/usb_usb/Makefile
@@ -1,3 +1,3 @@
1ifndef MAKEFILE_INCLUDED 1ifndef MAKEFILE_INCLUDED
2 include ../../../Makefile 2 include ../../../Makefile
3endif \ No newline at end of file 3endif
diff --git a/keyboards/converter/usb_usb/Makefile.8mhz b/keyboards/converter/usb_usb/Makefile.8mhz
deleted file mode 100644
index 845a02be2..000000000
--- a/keyboards/converter/usb_usb/Makefile.8mhz
+++ /dev/null
@@ -1,5 +0,0 @@
1F_CPU = 8000000
2F_USB = 16000000
3UNIMAP_ENABLE = yes
4KEYMAP_SECTION_ENABLE = yes
5include Makefile
diff --git a/keyboards/converter/usb_usb/Makefile.debug b/keyboards/converter/usb_usb/Makefile.debug
deleted file mode 100644
index e229cd780..000000000
--- a/keyboards/converter/usb_usb/Makefile.debug
+++ /dev/null
@@ -1,6 +0,0 @@
1TARGET = usb_usb_debug
2UNIMAP_ENABLE = yes
3#KEYMAP_SECTION_ENABLE = yes
4#LUFA_DEBUG = yes
5OPT_DEFS += -DDEBUG_USB_HOST
6include Makefile
diff --git a/keyboards/converter/usb_usb/Makefile.unimap b/keyboards/converter/usb_usb/Makefile.unimap
deleted file mode 100644
index cc383edaf..000000000
--- a/keyboards/converter/usb_usb/Makefile.unimap
+++ /dev/null
@@ -1,5 +0,0 @@
1TARGET = usb_usb_unimap
2UNIMAP_ENABLE = yes
3KEYMAP_SECTION_ENABLE = yes
4#LUFA_DEBUG = yes
5include Makefile
diff --git a/keyboards/converter/usb_usb/README b/keyboards/converter/usb_usb/README.md
index 742ec3292..274e11956 100644
--- a/keyboards/converter/usb_usb/README
+++ b/keyboards/converter/usb_usb/README.md
@@ -1,5 +1,9 @@
1USB to USB keyboard protocol converter 1USB to USB keyboard protocol converter
2====================================== 2======================================
3Original code from Hasu's TMK firmware. Ported to QMK by Coloneljesus.
4
5This port has been tested only on the Pro Micro variant described in the next section.
6
3See for detail and discussion. 7See for detail and discussion.
4https://geekhack.org/index.php?topic=69169.0 8https://geekhack.org/index.php?topic=69169.0
5 9
@@ -34,27 +38,7 @@ Also Pro Micro 3.3V(not Mini) or Teensy with mini host shield will work with som
34 38
35Build firmware 39Build firmware
36-------------- 40--------------
37Build. 41Follow normal QMK build instructions to get a binary file. Flashing depends on you hardware.
38
39 $ git clone git://github.com/tmk/tmk_keyboard.git
40 $ cd tmk_keyboard
41 $ git submodule init
42 $ git submodule update
43 $ cd converter/usb_usb
44 $ make
45
46And Program converter. Push button on TMK converter and just run this.
47
48 $ make dfu
49
50
51In case of Leonardo push reset button then run command. Serial port name(COM17) depends your system. On Linux I got /dev/ttyACM0.
52
53 $ DEV=COM17 make program
54 or
55 $ avrdude -patmega32u4 -cavr109 -b57600 -Uflash:w:usb_usb.hex -PCOM17
56
57
58 42
59Limitation 43Limitation
60---------- 44----------
@@ -77,7 +61,7 @@ Update
772014/12/11 Added Hub support(confirmed with HHKB pro2) 612014/12/11 Added Hub support(confirmed with HHKB pro2)
782016/09/10 Unimap editor support 622016/09/10 Unimap editor support
792016/10/18 Fix LED state at startup 632016/10/18 Fix LED state at startup
80 642017/08/16 Port to QMK
81 65
82 66
83Resource 67Resource
diff --git a/keyboards/converter/usb_usb/config.h b/keyboards/converter/usb_usb/config.h
index fa059feea..591d80f32 100644
--- a/keyboards/converter/usb_usb/config.h
+++ b/keyboards/converter/usb_usb/config.h
@@ -1,5 +1,5 @@
1/* 1/*
2Copyright 2012 Jun Wako <wakojun@gmail.com> 2Copyright 2017 Balz Guenat <balz.guenat@gmail.com>
3 3
4This program is free software: you can redistribute it and/or modify 4This program is free software: you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by 5it under the terms of the GNU General Public License as published by
@@ -18,7 +18,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
18#ifndef CONFIG_H 18#ifndef CONFIG_H
19#define CONFIG_H 19#define CONFIG_H
20 20
21// do not #include "config_common.h" because the pin names conflict with the USB HID code.
22// CUSTOM_MATRIX is defined it that file, though, and we need it, so we define it ourselves.
23// It's a hack, yeah...
24#define CUSTOM_MATRIX 2
21 25
26/* USB Device descriptor parameter */
22#define VENDOR_ID 0xFEED 27#define VENDOR_ID 0xFEED
23#define PRODUCT_ID 0x005B 28#define PRODUCT_ID 0x005B
24#define DEVICE_VER 0x0001 29#define DEVICE_VER 0x0001
@@ -27,13 +32,32 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
27#define DESCRIPTION USB to USB Keyboard Converter with QMK 32#define DESCRIPTION USB to USB Keyboard Converter with QMK
28 33
29 34
30/* matrix size */ 35/* size of virtual matrix */
31#define MATRIX_ROWS 16 36#define MATRIX_ROWS 16
32#define MATRIX_COLS 16 37#define MATRIX_COLS 16
33 38
39/* matrix scanning is done in custom_matrix.cpp */
34#define DIODE_DIRECTION CUSTOM_MATRIX 40#define DIODE_DIRECTION CUSTOM_MATRIX
35 41
36/* key combination for command */ 42/* key combination for command */
37#define IS_COMMAND() (keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) 43#define IS_COMMAND() (keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)))
38 44
45/*
46 * Feature disable options
47 * These options are also useful to firmware size reduction.
48 */
49
50/* disable debug print */
51//#define NO_DEBUG
52
53/* disable print */
54//#define NO_PRINT
55
56/* disable action features */
57//#define NO_ACTION_LAYER
58//#define NO_ACTION_TAPPING
59//#define NO_ACTION_ONESHOT
60//#define NO_ACTION_MACRO
61//#define NO_ACTION_FUNCTION
62
39#endif 63#endif
diff --git a/keyboards/converter/usb_usb/keymaps/coloneljesus/Makefile b/keyboards/converter/usb_usb/keymaps/coloneljesus/Makefile
new file mode 100644
index 000000000..f5c054505
--- /dev/null
+++ b/keyboards/converter/usb_usb/keymaps/coloneljesus/Makefile
@@ -0,0 +1,3 @@
1ifndef QUANTUM_DIR
2 include ../../../../../Makefile
3endif
diff --git a/keyboards/converter/usb_usb/keymaps/coloneljesus/config.h b/keyboards/converter/usb_usb/keymaps/coloneljesus/config.h
new file mode 100644
index 000000000..7fa3bf328
--- /dev/null
+++ b/keyboards/converter/usb_usb/keymaps/coloneljesus/config.h
@@ -0,0 +1,6 @@
1#ifndef CONFIG_USER_H
2#define CONFIG_USER_H
3
4#include "../../config.h"
5
6#endif
diff --git a/keyboards/converter/usb_usb/keymaps/coloneljesus/keymap.c b/keyboards/converter/usb_usb/keymaps/coloneljesus/keymap.c
new file mode 100644
index 000000000..0cc66fd53
--- /dev/null
+++ b/keyboards/converter/usb_usb/keymaps/coloneljesus/keymap.c
@@ -0,0 +1,307 @@
1/*
2Copyright 2017 Balz Guenat <balz.guenat@gmail.com>
3
4This program is free software: you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by
6the Free Software Foundation, either version 2 of the License, or
7(at your option) any later version.
8
9This program is distributed in the hope that it will be useful,
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17
18#include "usb_usb.h"
19
20const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
21 /* 0: plain Qwerty without layer switching
22 * ,---------------. ,---------------. ,---------------.
23 * |F13|F14|F15|F16| |F17|F18|F19|F20| |F21|F22|F23|F24|
24 * ,---. |---------------| |---------------| |---------------| ,-----------. ,---------------. ,-------.
25 * |Esc| |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau| |VDn|VUp|Mut|Pwr| | Help |
26 * `---' `---------------' `---------------' `---------------' `-----------' `---------------' `-------'
27 * ,-----------------------------------------------------------. ,-----------. ,---------------. ,-------.
28 * | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|JPY|Bsp| |Ins|Hom|PgU| |NmL| /| *| -| |Stp|Agn|
29 * |-----------------------------------------------------------| |-----------| |---------------| |-------|
30 * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \ | |Del|End|PgD| | 7| 8| 9| +| |Mnu|Und|
31 * |-----------------------------------------------------------| `-----------' |---------------| |-------|
32 * |CapsL | A| S| D| F| G| H| J| K| L| ;| :| #|Retn| | 4| 5| 6|KP,| |Sel|Cpy|
33 * |-----------------------------------------------------------| ,---. |---------------| |-------|
34 * |Shft| <| Z| X| C| V| B| N| M| ,| ,| /| RO|Shift | |Up | | 1| 2| 3|KP=| |Exe|Pst|
35 * |-----------------------------------------------------------| ,-----------. |---------------| |-------|
36 * |Ctl|Gui|Alt|MHEN|HNJ| Space |H/E|HENK|KANA|Alt|Gui|App|Ctl| |Lef|Dow|Rig| | 0 | .|Ent| |Fnd|Cut|
37 * `-----------------------------------------------------------' `-----------' `---------------' `-------'
38 */
39 // KEYMAP_ALL(
40 // F13, F14, F15, F16, F17, F18, F19, F20, F21, F22, F23, F24,
41 // ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PSCR,SLCK,PAUS, VOLD,VOLU,MUTE,PWR, HELP,
42 // GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, JYEN,BSPC, INS, HOME,PGUP, NLCK,PSLS,PAST,PMNS, STOP,AGIN,
43 // TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC, BSLS, DEL, END, PGDN, P7, P8, P9, PPLS, MENU,UNDO,
44 // CAPS,A, S, D, F, G, H, J, K, L, SCLN,QUOT, NUHS,ENT, P4, P5, P6, PCMM, SLCT,COPY,
45 // LSFT,NUBS,Z, X, C, V, B, N, M, COMM,DOT, SLSH, RO, RSFT, UP, P1, P2, P3, PEQL, EXEC,PSTE,
46 // LCTL,LGUI,LALT,MHEN,HANJ, SPC, HAEN,HENK,KANA,RALT,RGUI,APP, RCTL, LEFT,DOWN,RGHT, P0, PDOT,PENT, FIND,CUT
47 // ),
48 KEYMAP_ALL(
49 KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24,
50 KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, KC_VOLD, KC_VOLU, KC_MUTE, KC_PWR, KC_HELP,
51 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_JYEN, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, KC_STOP, KC_AGIN,
52 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_MENU, KC_UNDO,
53 MO(1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_P4, KC_P5, KC_P6, KC_PCMM, KC_SLCT, KC_COPY,
54 KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RO, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PEQL, KC_EXEC, KC_PSTE,
55 KC_LCTL, KC_LGUI, KC_LALT, KC_MHEN, KC_HANJ, KC_SPC, KC_HAEN, KC_HENK, KC_KANA, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT, KC_FIND, KC_CUT
56 ),
57 KEYMAP_ALL(
58 ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,
59 ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,______,______, ______,______,______,______, ______,
60 KC_GRV, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,______,______, ______,______,______,______, ______,______,
61 KC_CAPS, KC_MPRV, KC_VOLU, KC_MNXT, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,______,______, ______,______,______,______, ______,______,
62 ______, KC_MUTE, KC_VOLD, KC_MPLY, ______, ______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, ______, ______, ______, ______, ______,______,______,______, ______,______,
63 ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,______,______,______, ______,______,
64 ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, RESET, ______,______,______, ______, ______,______, ______,______
65 ),
66};
67
68const uint16_t PROGMEM fn_actions[] = {
69
70};
71
72const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
73 switch(id) {
74 default:
75 return MACRO_NONE;
76 }
77};
78
79
80void matrix_init_user(void) {
81
82}
83
84void matrix_scan_user(void) {
85
86}
87
88bool process_record_user(uint16_t keycode, keyrecord_t *record) {
89 return true;
90}
91
92void led_set_user(uint8_t usb_led) {
93
94}
95
96/*
97 * Keymap samples
98 */
99#if 0
100 /* ANSI layout
101 * ,---. ,---------------. ,---------------. ,---------------. ,-----------.
102 * |Esc| |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau|
103 * `---' `---------------' `---------------' `---------------' `-----------'
104 * ,-----------------------------------------------------------. ,-----------. ,---------------.
105 * | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| Bsp| |Ins|Hom|PgU| |NmL| /| *| -|
106 * |-----------------------------------------------------------| |-----------| |---------------|
107 * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \ | |Del|End|PgD| | 7| 8| 9| +|
108 * |-----------------------------------------------------------| `-----------' |-----------| |
109 * |CapsL | A| S| D| F| G| H| J| K| L| ;| '| Return| | 4| 5| 6| |
110 * |-----------------------------------------------------------| ,---. |---------------|
111 * |Shift | Z| X| C| V| B| N| M| ,| ,| /|Shift | |Up | | 1| 2| 3| |
112 * |-----------------------------------------------------------| ,-----------. |-----------| |
113 * |Ctl|Gui|Alt| Space |Alt|Gui|App|Ctl| |Lef|Dow|Rig| | 0| .|Ent|
114 * `-----------------------------------------------------------' `-----------' `---------------'
115 */
116 KEYMAP(
117 ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PSCR,SLCK,BRK,
118 GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC, INS, HOME,PGUP, NLCK,PSLS,PAST,PMNS,
119 TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC,BSLS, DEL, END, PGDN, P7, P8, P9,
120 LCTL,A, S, D, F, G, H, J, K, L, SCLN,QUOT, ENT, P4, P5, P6, PPLS,
121 LSFT,Z, X, C, V, B, N, M, COMM,DOT, SLSH, RSFT, UP, P1, P2, P3,
122 LCTL,LGUI,LALT, SPC, RALT,RGUI,APP, RCTL, LEFT,DOWN,RGHT, P0, PDOT,PENT
123 ),
124
125 /* ISO layout
126 * ,---. ,---------------. ,---------------. ,---------------. ,-----------.
127 * |Esc| |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau|
128 * `---' `---------------' `---------------' `---------------' `-----------'
129 * ,-----------------------------------------------------------. ,-----------. ,---------------.
130 * | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| ^| Bsp| |Ins|Hom|PgU| |NmL| /| *| -|
131 * |-----------------------------------------------------------| |-----------| |---------------|
132 * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| Retn| |Del|End|PgD| | 7| 8| 9| +|
133 * |------------------------------------------------------` | `-----------' |-----------| |
134 * |CapsL | A| S| D| F| G| H| J| K| L| ;| '| #| | | 4| 5| 6| |
135 * |-----------------------------------------------------------| ,---. |---------------|
136 * |Shft|\ | Z| X| C| V| B| N| M| ,| ,| /|Shift | |Up | | 1| 2| 3|Ent|
137 * |-----------------------------------------------------------| ,-----------. |-----------| |
138 * |Ctl|Gui|Alt| Space |HNK|KNA|Alt|Gui|App|Ctl| |Lef|Dow|Rig| | 0| .| |
139 * `-----------------------------------------------------------' `-----------' `---------------'
140 */
141 KEYMAP_ISO(
142 ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PSCR,SLCK,BRK,
143 GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC, INS, HOME,PGUP, NLCK,PSLS,PAST,PMNS,
144 TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC,ENT, DEL, END, PGDN, P7, P8, P9, PPLS,
145 LCTL,A, S, D, F, G, H, J, K, L, SCLN,QUOT,NUHS, P4, P5, P6,
146 LSFT,NUBS,Z, X, C, V, B, N, M, COMM,DOT, SLSH, RSFT, UP, P1, P2, P3, PENT,
147 LCTL,LGUI,LALT, SPC, RALT,RGUI,APP, RCTL, LEFT,DOWN,RGHT, P0, PDOT
148 ),
149
150 /* JIS layout
151 * ,---. ,---------------. ,---------------. ,---------------. ,-----------.
152 * |Esc| |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau|
153 * `---' `---------------' `---------------' `---------------' `-----------'
154 * ,-----------------------------------------------------------. ,-----------. ,---------------.
155 * | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| ^|JPY|Bsp| |Ins|Hom|PgU| |NmL| /| *| -|
156 * |-----------------------------------------------------------| |-----------| |---------------|
157 * |Tab | Q| W| E| R| T| Y| U| I| O| P| @| [| Retn| |Del|End|PgD| | 7| 8| 9| +|
158 * |------------------------------------------------------` | `-----------' |-----------| |
159 * |CapsL | A| S| D| F| G| H| J| K| L| ;| :| ]| | | 4| 5| 6| |
160 * |-----------------------------------------------------------| ,---. |---------------|
161 * |Shft | Z| X| C| V| B| N| M| ,| ,| /| RO|Shift | |Up | | 1| 2| 3|Ent|
162 * |-----------------------------------------------------------| ,-----------. |-----------| |
163 * |Ctl|Gui|Alt|MHEN| Space |HENK|KNA|Alt|Gui|App|Ctl| |Lef|Dow|Rig| | 0| .| |
164 * `-----------------------------------------------------------' `-----------' `---------------'
165 */
166 KEYMAP_JIS(
167 ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PSCR,SLCK,BRK,
168 GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, JPY, BSPC, INS, HOME,PGUP, NLCK,PSLS,PAST,PMNS,
169 TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC, ENT, DEL, END, PGDN, P7, P8, P9, PPLS,
170 LCTL,A, S, D, F, G, H, J, K, L, SCLN,QUOT,NUHS, P4, P5, P6,
171 LSFT,Z, X, C, V, B, N, M, COMM,DOT, SLSH, RO, RSFT, UP, P1, P2, P3, PENT,
172 LCTL,LGUI,LALT,MHEN, SPC, HENK,KANA,RALT,RGUI,APP, RCTL, LEFT,DOWN,RGHT, P0, PDOT
173 ),
174
175 /* Colemak http://colemak.com
176 * ,-----------------------------------------------------------.
177 * | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|Backspa|
178 * |-----------------------------------------------------------|
179 * |Tab | Q| W| F| P| G| J| L| U| Y| ;| [| ]| \|
180 * |-----------------------------------------------------------|
181 * |BackSp| A| R| S| T| D| H| N| E| I| O| '|Return |
182 * |-----------------------------------------------------------|
183 * |Shift | Z| X| C| V| B| K| M| ,| ,| /|Shift |
184 * |-----------------------------------------------------------|
185 * |Ctrl |Gui |Alt | Space |Alt |Gui |Menu|Ctrl|
186 * `----------------------------------------------------------'
187 */
188 KEYMAP_ALL(
189 F13, F14, F15, F16, F17, F18, F19, F20, F21, F22, F23, F24,
190 ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PSCR,SLCK,PAUS, VOLD,VOLU,MUTE,PWR, HELP,
191 GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, JYEN,BSPC, INS, HOME,PGUP, NLCK,PSLS,PAST,PMNS, STOP,AGIN,
192 TAB, Q, W, F, P, G, J, L, U, Y, SCLN,LBRC,RBRC, BSLS, DEL, END, PGDN, P7, P8, P9, PPLS, MENU,UNDO,
193 BSPC,A, R, S, T, D, H, N, E, I, O, QUOT, NUHS,ENT, P4, P5, P6, PCMM, SLCT,COPY,
194 LSFT,NUBS,Z, X, C, V, B, K, M, COMM,DOT, SLSH, RO, RSFT, UP, P1, P2, P3, PEQL, EXEC,PSTE,
195 LCTL,LGUI,LALT,MHEN,HANJ, SPC, HAEN,HENK,KANA,RALT,RGUI,APP, RCTL, LEFT,DOWN,RGHT, P0, PDOT,PENT, FIND,CUT
196 ),
197
198 /* Dvorak http://en.wikipedia.org/wiki/Dvorak_Simplified_Keyboard
199 * ,-----------------------------------------------------------.
200 * | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| [| ]|Backspa|
201 * |-----------------------------------------------------------|
202 * |Tab | '| ,| .| P| Y| F| G| C| R| L| /| =| \|
203 * |-----------------------------------------------------------|
204 * |BackSp| A| O| E| U| I| D| H| T| N| S| -|Return |
205 * |-----------------------------------------------------------|
206 * |Shift | ;| Q| J| K| X| B| M| Wl V| Z|Shift |
207 * |-----------------------------------------------------------|
208 * |Ctrl |Gui |Alt | Space |Alt |Gui |Menu|Ctrl|
209 * `-----------------------------------------------------------'
210 */
211 KEYMAP_ALL(
212 F13, F14, F15, F16, F17, F18, F19, F20, F21, F22, F23, F24,
213 ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PSCR,SLCK,PAUS, VOLD,VOLU,MUTE,PWR, HELP,
214 GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, LBRC,RBRC,JYEN,BSPC, INS, HOME,PGUP, NLCK,PSLS,PAST,PMNS, STOP,AGIN,
215 TAB, QUOT,COMM,DOT, P, Y, F, G, C, R, L, SLSH,EQL, BSLS, DEL, END, PGDN, P7, P8, P9, PPLS, MENU,UNDO,
216 CAPS,A, O, E, U, I, D, H, T, N, S, MINS, NUHS,ENT, P4, P5, P6, PCMM, SLCT,COPY,
217 LSFT,NUBS,SCLN,Q, J, K, X, B, M, W, V, Z, RO, RSFT, UP, P1, P2, P3, PEQL, EXEC,PSTE,
218 LCTL,LGUI,LALT,MHEN,HANJ, SPC, HAEN,HENK,KANA,RALT,RGUI,APP, RCTL, LEFT,DOWN,RGHT, P0, PDOT,PENT, FIND,CUT
219 ),
220
221 /* Workman http://viralintrospection.wordpress.com/2010/09/06/a-different-philosophy-in-designing-keyboard-layouts/
222 * ,-----------------------------------------------------------.
223 * | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|Backspa|
224 * |-----------------------------------------------------------|
225 * |Tab | Q| D| R| W| B| J| F| U| P| ;| [| ]| \|
226 * |-----------------------------------------------------------|
227 * |CapsLo| A| S| H| T| G| Y| N| E| O| I| '|Return |
228 * |-----------------------------------------------------------|
229 * |Shift | Z| X| M| C| V| K| L| ,| ,| /|Shift |
230 * |-----------------------------------------------------------|
231 * |Ctrl |Gui |Alt | Space |Alt |Gui |Menu|Ctrl|
232 * `-----------------------------------------------------------'
233 */
234 KEYMAP_ALL(
235 F13, F14, F15, F16, F17, F18, F19, F20, F21, F22, F23, F24,
236 ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PSCR,SLCK,PAUS, VOLD,VOLU,MUTE,PWR, HELP,
237 GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, JYEN,BSPC, INS, HOME,PGUP, NLCK,PSLS,PAST,PMNS, STOP,AGIN,
238 TAB, Q, D, R, W, B, J, F, U, P, SCLN,LBRC,RBRC, BSLS, DEL, END, PGDN, P7, P8, P9, PPLS, MENU,UNDO,
239 CAPS,A, S, H, T, G, Y, N, E, O, I, QUOT, NUHS,ENT, P4, P5, P6, PCMM, SLCT,COPY,
240 LSFT,NUBS,Z, X, M, C, V, K, L, COMM,DOT, SLSH, RO, RSFT, UP, P1, P2, P3, PEQL, EXEC,PSTE,
241 LCTL,LGUI,LALT,MHEN,HANJ, SPC, HAEN,HENK,KANA,RALT,RGUI,APP, RCTL, LEFT,DOWN,RGHT, P0, PDOT,PENT, FIND,CUT
242 ),
243
244
245/*
246 * SpaceFN layout
247 * http://geekhack.org/index.php?topic=51069.0
248 */
249const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
250 /* 0: plain Qwerty
251 * ,---------------. ,---------------. ,---------------.
252 * |F13|F14|F15|F16| |F17|F18|F19|F20| |F21|F22|F23|F24|
253 * ,---. |---------------| |---------------| |---------------| ,-----------. ,---------------. ,-------.
254 * |Esc| |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau| |VDn|VUp|Mut|Pwr| | Help |
255 * `---' `---------------' `---------------' `---------------' `-----------' `---------------' `-------'
256 * ,-----------------------------------------------------------. ,-----------. ,---------------. ,-------.
257 * | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|JPY|Bsp| |Ins|Hom|PgU| |NmL| /| *| -| |Stp|Agn|
258 * |-----------------------------------------------------------| |-----------| |---------------| |-------|
259 * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \ | |Del|End|PgD| | 7| 8| 9| +| |Mnu|Und|
260 * |-----------------------------------------------------------| `-----------' |---------------| |-------|
261 * |LCtrl | A| S| D| F| G| H| J| K| L| ;| :| #|Retn| | 4| 5| 6|KP,| |Sel|Cpy|
262 * |-----------------------------------------------------------| ,---. |---------------| |-------|
263 * |Shft| <| Z| X| C| V| B| N| M| ,| ,| /| RO|Shift | |Up | | 1| 2| 3|KP=| |Exe|Pst|
264 * |-----------------------------------------------------------| ,-----------. |---------------| |-------|
265 * |Ctl|Gui|Alt|MHEN|HNJ| Space |H/E|HENK|KANA|Alt|Gui|App|Ctl| |Lef|Dow|Rig| | 0 | .|Ent| |Fnd|Cut|
266 * `-----------------------------------------------------------' `-----------' `---------------' `-------'
267 */
268 [0] = KEYMAP_ALL(
269 F13, F14, F15, F16, F17, F18, F19, F20, F21, F22, F23, F24,
270 ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PSCR,SLCK,PAUS, VOLD,VOLU,MUTE,PWR, HELP,
271 ESC, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, JYEN,BSPC, INS, HOME,PGUP, NLCK,PSLS,PAST,PMNS, STOP,AGIN,
272 TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC, BSLS, DEL, END, PGDN, P7, P8, P9, PPLS, MENU,UNDO,
273 LCTL,A, S, D, F, G, H, J, K, L, SCLN,QUOT, NUHS,ENT, P4, P5, P6, PCMM, SLCT,COPY,
274 LSFT,NUBS,Z, X, C, V, B, N, M, COMM,DOT, SLSH, RO, RSFT, UP, P1, P2, P3, PEQL, EXEC,PSTE,
275 LCTL,LGUI,LALT,MHEN,HANJ, FN0, HAEN,HENK,KANA,RALT,RGUI,APP, RCTL, LEFT,DOWN,RGHT, P0, PDOT,PENT, FIND,CUT
276 ),
277
278 /* 1: SpaceFN
279 * ,-----------------------------------------------------------.
280 * |` | F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Delete |
281 * |-----------------------------------------------------------|
282 * |Caps | | |Esc| | | |Hom|Up |End|Psc|Slk|Pau|Ins |
283 * |-----------------------------------------------------------|
284 * | | | | | | |PgU|Lef|Dow|Rig| | | |
285 * |-----------------------------------------------------------|
286 * | | | | | |Spc|PgD|` |~ | |Men| |
287 * |-----------------------------------------------------------|
288 * | | | | | | | | |
289 * `-----------------------------------------------------------'
290 */
291 [1] = KEYMAP_ALL(
292 TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,
293 TRNS, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS,TRNS,TRNS, TRNS,TRNS,TRNS,TRNS, TRNS,
294 GRV, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, TRNS,DEL, TRNS,TRNS,TRNS, TRNS,TRNS,TRNS,TRNS, TRNS,TRNS,
295 CAPS,TRNS,TRNS,ESC, TRNS,TRNS,TRNS,HOME,UP, END, PSCR,SLCK,PAUS, INS, TRNS,TRNS,TRNS, TRNS,TRNS,TRNS,TRNS, TRNS,TRNS,
296 TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,PGUP,LEFT,DOWN,RGHT,TRNS,TRNS, TRNS,TRNS, TRNS,TRNS,TRNS,TRNS, TRNS,TRNS,
297 TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,SPC, PGDN,GRV, FN1, TRNS,APP, TRNS,TRNS, TRNS, TRNS,TRNS,TRNS,TRNS, TRNS,TRNS,
298 TRNS,TRNS,TRNS,TRNS,TRNS, TRNS, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS,TRNS,TRNS, TRNS, TRNS,TRNS, TRNS,TRNS
299 ),
300};
301
302const action_t PROGMEM fn_actions[] = {
303 [0] = ACTION_LAYER_TAP_KEY(1, KC_SPACE),
304 [1] = ACTION_MODS_KEY(MOD_LSFT, KC_GRV), // tilde
305};
306
307#endif
diff --git a/keyboards/converter/usb_usb/keymaps/default/Makefile b/keyboards/converter/usb_usb/keymaps/default/Makefile
index 05c674ae1..f5c054505 100644
--- a/keyboards/converter/usb_usb/keymaps/default/Makefile
+++ b/keyboards/converter/usb_usb/keymaps/default/Makefile
@@ -1,3 +1,3 @@
1ifndef QUANTUM_DIR 1ifndef QUANTUM_DIR
2 include ../../../../../Makefile 2 include ../../../../../Makefile
3endif \ No newline at end of file 3endif
diff --git a/keyboards/converter/usb_usb/keymaps/default/keymap.c b/keyboards/converter/usb_usb/keymaps/default/keymap.c
index b916855f5..9817a607d 100644
--- a/keyboards/converter/usb_usb/keymaps/default/keymap.c
+++ b/keyboards/converter/usb_usb/keymaps/default/keymap.c
@@ -15,18 +15,8 @@ You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>. 15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/ 16*/
17 17
18#include <stdint.h>
19#include <stdbool.h>
20#include "keycode.h"
21#include "print.h"
22#include "debug.h"
23//#include "action.h"
24//#include "action_macro.h"
25//#include "report.h"
26
27#include "usb_usb.h" 18#include "usb_usb.h"
28 19
29
30const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = { 20const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
31 /* 0: plain Qwerty without layer switching 21 /* 0: plain Qwerty without layer switching
32 * ,---------------. ,---------------. ,---------------. 22 * ,---------------. ,---------------. ,---------------.
@@ -46,252 +36,50 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
46 * |Ctl|Gui|Alt|MHEN|HNJ| Space |H/E|HENK|KANA|Alt|Gui|App|Ctl| |Lef|Dow|Rig| | 0 | .|Ent| |Fnd|Cut| 36 * |Ctl|Gui|Alt|MHEN|HNJ| Space |H/E|HENK|KANA|Alt|Gui|App|Ctl| |Lef|Dow|Rig| | 0 | .|Ent| |Fnd|Cut|
47 * `-----------------------------------------------------------' `-----------' `---------------' `-------' 37 * `-----------------------------------------------------------' `-----------' `---------------' `-------'
48 */ 38 */
49 // KEYMAP_ALL( 39 [0] = KEYMAP_ALL(
50 // F13, F14, F15, F16, F17, F18, F19, F20, F21, F22, F23, F24,
51 // ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PSCR,SLCK,PAUS, VOLD,VOLU,MUTE,PWR, HELP,
52 // GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, JYEN,BSPC, INS, HOME,PGUP, NLCK,PSLS,PAST,PMNS, STOP,AGIN,
53 // TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC, BSLS, DEL, END, PGDN, P7, P8, P9, PPLS, MENU,UNDO,
54 // CAPS,A, S, D, F, G, H, J, K, L, SCLN,QUOT, NUHS,ENT, P4, P5, P6, PCMM, SLCT,COPY,
55 // LSFT,NUBS,Z, X, C, V, B, N, M, COMM,DOT, SLSH, RO, RSFT, UP, P1, P2, P3, PEQL, EXEC,PSTE,
56 // LCTL,LGUI,LALT,MHEN,HANJ, SPC, HAEN,HENK,KANA,RALT,RGUI,APP, RCTL, LEFT,DOWN,RGHT, P0, PDOT,PENT, FIND,CUT
57 // ),
58 KEYMAP_ALL(
59 KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, 40 KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24,
60 KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, KC_VOLD, KC_VOLU, KC_MUTE, KC_PWR, KC_HELP, 41 KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, KC_VOLD, KC_VOLU, KC_MUTE, KC_PWR, KC_HELP,
61 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_JYEN, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, KC_STOP, KC_AGIN, 42 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_JYEN, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, KC_STOP, KC_AGIN,
62 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_MENU, KC_UNDO, 43 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_MENU, KC_UNDO,
63 MO(1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_P4, KC_P5, KC_P6, KC_PCMM, KC_SLCT, KC_COPY, 44 KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_P4, KC_P5, KC_P6, KC_PCMM, KC_SLCT, KC_COPY,
64 KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RO, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PEQL, KC_EXEC, KC_PSTE, 45 KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RO, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PEQL, KC_EXEC, KC_PSTE,
65 KC_LCTL, KC_LGUI, KC_LALT, KC_MHEN, KC_HANJ, KC_SPC, KC_HAEN, KC_HENK, KC_KANA, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT, KC_FIND, KC_CUT 46 KC_LCTL, KC_LGUI, KC_LALT, KC_MHEN, KC_HANJ, KC_SPC, KC_HAEN, KC_HENK, KC_KANA, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT, KC_FIND, KC_CUT
66 ), 47 ),
67 KEYMAP_ALL( 48 [1] = KEYMAP_ALL(
68 ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, 49 ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,
69 ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,______,______, ______,______,______,______, ______, 50 ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,______,______, ______,______,______,______, ______,
70 KC_GRV, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,______,______, ______,______,______,______, ______,______, 51 ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,______,______, ______,______,______,______, ______,______,
71 KC_CAPS, KC_MPRV, KC_VOLU, KC_MNXT, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,______,______, ______,______,______,______, ______,______, 52 ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,______,______, ______,______,______,______, ______,______,
72 ______, KC_MUTE, KC_VOLD, KC_MPLY, ______, ______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, ______, ______, ______, ______, ______,______,______,______, ______,______, 53 ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,______,______,______, ______,______,
73 ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,______,______,______, ______,______, 54 ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,______,______,______, ______,______,
74 ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, RESET, ______,______,______, ______, ______,______, ______,______ 55 ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,______,______, ______, ______,______, ______,______
75 ), 56 ),
76}; 57};
77 58
78// const action_t fn_actions[] PROGMEM = {}; 59const uint16_t PROGMEM fn_actions[] = {
79
80// const action_t PROGMEM fn_actions[] = {
81// [0] = ACTION_LAYER_MOMENTARY(1),
82// };
83
84 60
61};
85 62
86/* 63const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
87 * Keymap samples 64 switch(id) {
88 */ 65 default:
89#if 0 66 return MACRO_NONE;
90 /* ANSI layout 67 }
91 * ,---. ,---------------. ,---------------. ,---------------. ,-----------. 68};
92 * |Esc| |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau|
93 * `---' `---------------' `---------------' `---------------' `-----------'
94 * ,-----------------------------------------------------------. ,-----------. ,---------------.
95 * | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| Bsp| |Ins|Hom|PgU| |NmL| /| *| -|
96 * |-----------------------------------------------------------| |-----------| |---------------|
97 * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \ | |Del|End|PgD| | 7| 8| 9| +|
98 * |-----------------------------------------------------------| `-----------' |-----------| |
99 * |CapsL | A| S| D| F| G| H| J| K| L| ;| '| Return| | 4| 5| 6| |
100 * |-----------------------------------------------------------| ,---. |---------------|
101 * |Shift | Z| X| C| V| B| N| M| ,| ,| /|Shift | |Up | | 1| 2| 3| |
102 * |-----------------------------------------------------------| ,-----------. |-----------| |
103 * |Ctl|Gui|Alt| Space |Alt|Gui|App|Ctl| |Lef|Dow|Rig| | 0| .|Ent|
104 * `-----------------------------------------------------------' `-----------' `---------------'
105 */
106 KEYMAP(
107 ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PSCR,SLCK,BRK,
108 GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC, INS, HOME,PGUP, NLCK,PSLS,PAST,PMNS,
109 TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC,BSLS, DEL, END, PGDN, P7, P8, P9,
110 LCTL,A, S, D, F, G, H, J, K, L, SCLN,QUOT, ENT, P4, P5, P6, PPLS,
111 LSFT,Z, X, C, V, B, N, M, COMM,DOT, SLSH, RSFT, UP, P1, P2, P3,
112 LCTL,LGUI,LALT, SPC, RALT,RGUI,APP, RCTL, LEFT,DOWN,RGHT, P0, PDOT,PENT
113 ),
114 69
115 /* ISO layout
116 * ,---. ,---------------. ,---------------. ,---------------. ,-----------.
117 * |Esc| |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau|
118 * `---' `---------------' `---------------' `---------------' `-----------'
119 * ,-----------------------------------------------------------. ,-----------. ,---------------.
120 * | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| ^| Bsp| |Ins|Hom|PgU| |NmL| /| *| -|
121 * |-----------------------------------------------------------| |-----------| |---------------|
122 * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| Retn| |Del|End|PgD| | 7| 8| 9| +|
123 * |------------------------------------------------------` | `-----------' |-----------| |
124 * |CapsL | A| S| D| F| G| H| J| K| L| ;| '| #| | | 4| 5| 6| |
125 * |-----------------------------------------------------------| ,---. |---------------|
126 * |Shft|\ | Z| X| C| V| B| N| M| ,| ,| /|Shift | |Up | | 1| 2| 3|Ent|
127 * |-----------------------------------------------------------| ,-----------. |-----------| |
128 * |Ctl|Gui|Alt| Space |HNK|KNA|Alt|Gui|App|Ctl| |Lef|Dow|Rig| | 0| .| |
129 * `-----------------------------------------------------------' `-----------' `---------------'
130 */
131 KEYMAP_ISO(
132 ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PSCR,SLCK,BRK,
133 GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC, INS, HOME,PGUP, NLCK,PSLS,PAST,PMNS,
134 TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC,ENT, DEL, END, PGDN, P7, P8, P9, PPLS,
135 LCTL,A, S, D, F, G, H, J, K, L, SCLN,QUOT,NUHS, P4, P5, P6,
136 LSFT,NUBS,Z, X, C, V, B, N, M, COMM,DOT, SLSH, RSFT, UP, P1, P2, P3, PENT,
137 LCTL,LGUI,LALT, SPC, RALT,RGUI,APP, RCTL, LEFT,DOWN,RGHT, P0, PDOT
138 ),
139 70
140 /* JIS layout 71void matrix_init_user(void) {
141 * ,---. ,---------------. ,---------------. ,---------------. ,-----------.
142 * |Esc| |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau|
143 * `---' `---------------' `---------------' `---------------' `-----------'
144 * ,-----------------------------------------------------------. ,-----------. ,---------------.
145 * | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| ^|JPY|Bsp| |Ins|Hom|PgU| |NmL| /| *| -|
146 * |-----------------------------------------------------------| |-----------| |---------------|
147 * |Tab | Q| W| E| R| T| Y| U| I| O| P| @| [| Retn| |Del|End|PgD| | 7| 8| 9| +|
148 * |------------------------------------------------------` | `-----------' |-----------| |
149 * |CapsL | A| S| D| F| G| H| J| K| L| ;| :| ]| | | 4| 5| 6| |
150 * |-----------------------------------------------------------| ,---. |---------------|
151 * |Shft | Z| X| C| V| B| N| M| ,| ,| /| RO|Shift | |Up | | 1| 2| 3|Ent|
152 * |-----------------------------------------------------------| ,-----------. |-----------| |
153 * |Ctl|Gui|Alt|MHEN| Space |HENK|KNA|Alt|Gui|App|Ctl| |Lef|Dow|Rig| | 0| .| |
154 * `-----------------------------------------------------------' `-----------' `---------------'
155 */
156 KEYMAP_JIS(
157 ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PSCR,SLCK,BRK,
158 GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, JPY, BSPC, INS, HOME,PGUP, NLCK,PSLS,PAST,PMNS,
159 TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC, ENT, DEL, END, PGDN, P7, P8, P9, PPLS,
160 LCTL,A, S, D, F, G, H, J, K, L, SCLN,QUOT,NUHS, P4, P5, P6,
161 LSFT,Z, X, C, V, B, N, M, COMM,DOT, SLSH, RO, RSFT, UP, P1, P2, P3, PENT,
162 LCTL,LGUI,LALT,MHEN, SPC, HENK,KANA,RALT,RGUI,APP, RCTL, LEFT,DOWN,RGHT, P0, PDOT
163 ),
164 72
165 /* Colemak http://colemak.com 73}
166 * ,-----------------------------------------------------------.
167 * | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|Backspa|
168 * |-----------------------------------------------------------|
169 * |Tab | Q| W| F| P| G| J| L| U| Y| ;| [| ]| \|
170 * |-----------------------------------------------------------|
171 * |BackSp| A| R| S| T| D| H| N| E| I| O| '|Return |
172 * |-----------------------------------------------------------|
173 * |Shift | Z| X| C| V| B| K| M| ,| ,| /|Shift |
174 * |-----------------------------------------------------------|
175 * |Ctrl |Gui |Alt | Space |Alt |Gui |Menu|Ctrl|
176 * `----------------------------------------------------------'
177 */
178 KEYMAP_ALL(
179 F13, F14, F15, F16, F17, F18, F19, F20, F21, F22, F23, F24,
180 ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PSCR,SLCK,PAUS, VOLD,VOLU,MUTE,PWR, HELP,
181 GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, JYEN,BSPC, INS, HOME,PGUP, NLCK,PSLS,PAST,PMNS, STOP,AGIN,
182 TAB, Q, W, F, P, G, J, L, U, Y, SCLN,LBRC,RBRC, BSLS, DEL, END, PGDN, P7, P8, P9, PPLS, MENU,UNDO,
183 BSPC,A, R, S, T, D, H, N, E, I, O, QUOT, NUHS,ENT, P4, P5, P6, PCMM, SLCT,COPY,
184 LSFT,NUBS,Z, X, C, V, B, K, M, COMM,DOT, SLSH, RO, RSFT, UP, P1, P2, P3, PEQL, EXEC,PSTE,
185 LCTL,LGUI,LALT,MHEN,HANJ, SPC, HAEN,HENK,KANA,RALT,RGUI,APP, RCTL, LEFT,DOWN,RGHT, P0, PDOT,PENT, FIND,CUT
186 ),
187 74
188 /* Dvorak http://en.wikipedia.org/wiki/Dvorak_Simplified_Keyboard 75void matrix_scan_user(void) {
189 * ,-----------------------------------------------------------.
190 * | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| [| ]|Backspa|
191 * |-----------------------------------------------------------|
192 * |Tab | '| ,| .| P| Y| F| G| C| R| L| /| =| \|
193 * |-----------------------------------------------------------|
194 * |BackSp| A| O| E| U| I| D| H| T| N| S| -|Return |
195 * |-----------------------------------------------------------|
196 * |Shift | ;| Q| J| K| X| B| M| Wl V| Z|Shift |
197 * |-----------------------------------------------------------|
198 * |Ctrl |Gui |Alt | Space |Alt |Gui |Menu|Ctrl|
199 * `-----------------------------------------------------------'
200 */
201 KEYMAP_ALL(
202 F13, F14, F15, F16, F17, F18, F19, F20, F21, F22, F23, F24,
203 ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PSCR,SLCK,PAUS, VOLD,VOLU,MUTE,PWR, HELP,
204 GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, LBRC,RBRC,JYEN,BSPC, INS, HOME,PGUP, NLCK,PSLS,PAST,PMNS, STOP,AGIN,
205 TAB, QUOT,COMM,DOT, P, Y, F, G, C, R, L, SLSH,EQL, BSLS, DEL, END, PGDN, P7, P8, P9, PPLS, MENU,UNDO,
206 CAPS,A, O, E, U, I, D, H, T, N, S, MINS, NUHS,ENT, P4, P5, P6, PCMM, SLCT,COPY,
207 LSFT,NUBS,SCLN,Q, J, K, X, B, M, W, V, Z, RO, RSFT, UP, P1, P2, P3, PEQL, EXEC,PSTE,
208 LCTL,LGUI,LALT,MHEN,HANJ, SPC, HAEN,HENK,KANA,RALT,RGUI,APP, RCTL, LEFT,DOWN,RGHT, P0, PDOT,PENT, FIND,CUT
209 ),
210 76
211 /* Workman http://viralintrospection.wordpress.com/2010/09/06/a-different-philosophy-in-designing-keyboard-layouts/ 77}
212 * ,-----------------------------------------------------------.
213 * | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|Backspa|
214 * |-----------------------------------------------------------|
215 * |Tab | Q| D| R| W| B| J| F| U| P| ;| [| ]| \|
216 * |-----------------------------------------------------------|
217 * |CapsLo| A| S| H| T| G| Y| N| E| O| I| '|Return |
218 * |-----------------------------------------------------------|
219 * |Shift | Z| X| M| C| V| K| L| ,| ,| /|Shift |
220 * |-----------------------------------------------------------|
221 * |Ctrl |Gui |Alt | Space |Alt |Gui |Menu|Ctrl|
222 * `-----------------------------------------------------------'
223 */
224 KEYMAP_ALL(
225 F13, F14, F15, F16, F17, F18, F19, F20, F21, F22, F23, F24,
226 ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PSCR,SLCK,PAUS, VOLD,VOLU,MUTE,PWR, HELP,
227 GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, JYEN,BSPC, INS, HOME,PGUP, NLCK,PSLS,PAST,PMNS, STOP,AGIN,
228 TAB, Q, D, R, W, B, J, F, U, P, SCLN,LBRC,RBRC, BSLS, DEL, END, PGDN, P7, P8, P9, PPLS, MENU,UNDO,
229 CAPS,A, S, H, T, G, Y, N, E, O, I, QUOT, NUHS,ENT, P4, P5, P6, PCMM, SLCT,COPY,
230 LSFT,NUBS,Z, X, M, C, V, K, L, COMM,DOT, SLSH, RO, RSFT, UP, P1, P2, P3, PEQL, EXEC,PSTE,
231 LCTL,LGUI,LALT,MHEN,HANJ, SPC, HAEN,HENK,KANA,RALT,RGUI,APP, RCTL, LEFT,DOWN,RGHT, P0, PDOT,PENT, FIND,CUT
232 ),
233 78
79bool process_record_user(uint16_t keycode, keyrecord_t *record) {
80 return true;
81}
234 82
235/* 83void led_set_user(uint8_t usb_led) {
236 * SpaceFN layout
237 * http://geekhack.org/index.php?topic=51069.0
238 */
239const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
240 /* 0: plain Qwerty
241 * ,---------------. ,---------------. ,---------------.
242 * |F13|F14|F15|F16| |F17|F18|F19|F20| |F21|F22|F23|F24|
243 * ,---. |---------------| |---------------| |---------------| ,-----------. ,---------------. ,-------.
244 * |Esc| |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau| |VDn|VUp|Mut|Pwr| | Help |
245 * `---' `---------------' `---------------' `---------------' `-----------' `---------------' `-------'
246 * ,-----------------------------------------------------------. ,-----------. ,---------------. ,-------.
247 * | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|JPY|Bsp| |Ins|Hom|PgU| |NmL| /| *| -| |Stp|Agn|
248 * |-----------------------------------------------------------| |-----------| |---------------| |-------|
249 * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \ | |Del|End|PgD| | 7| 8| 9| +| |Mnu|Und|
250 * |-----------------------------------------------------------| `-----------' |---------------| |-------|
251 * |LCtrl | A| S| D| F| G| H| J| K| L| ;| :| #|Retn| | 4| 5| 6|KP,| |Sel|Cpy|
252 * |-----------------------------------------------------------| ,---. |---------------| |-------|
253 * |Shft| <| Z| X| C| V| B| N| M| ,| ,| /| RO|Shift | |Up | | 1| 2| 3|KP=| |Exe|Pst|
254 * |-----------------------------------------------------------| ,-----------. |---------------| |-------|
255 * |Ctl|Gui|Alt|MHEN|HNJ| Space |H/E|HENK|KANA|Alt|Gui|App|Ctl| |Lef|Dow|Rig| | 0 | .|Ent| |Fnd|Cut|
256 * `-----------------------------------------------------------' `-----------' `---------------' `-------'
257 */
258 [0] = KEYMAP_ALL(
259 F13, F14, F15, F16, F17, F18, F19, F20, F21, F22, F23, F24,
260 ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PSCR,SLCK,PAUS, VOLD,VOLU,MUTE,PWR, HELP,
261 ESC, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, JYEN,BSPC, INS, HOME,PGUP, NLCK,PSLS,PAST,PMNS, STOP,AGIN,
262 TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC, BSLS, DEL, END, PGDN, P7, P8, P9, PPLS, MENU,UNDO,
263 LCTL,A, S, D, F, G, H, J, K, L, SCLN,QUOT, NUHS,ENT, P4, P5, P6, PCMM, SLCT,COPY,
264 LSFT,NUBS,Z, X, C, V, B, N, M, COMM,DOT, SLSH, RO, RSFT, UP, P1, P2, P3, PEQL, EXEC,PSTE,
265 LCTL,LGUI,LALT,MHEN,HANJ, FN0, HAEN,HENK,KANA,RALT,RGUI,APP, RCTL, LEFT,DOWN,RGHT, P0, PDOT,PENT, FIND,CUT
266 ),
267
268 /* 1: SpaceFN
269 * ,-----------------------------------------------------------.
270 * |` | F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Delete |
271 * |-----------------------------------------------------------|
272 * |Caps | | |Esc| | | |Hom|Up |End|Psc|Slk|Pau|Ins |
273 * |-----------------------------------------------------------|
274 * | | | | | | |PgU|Lef|Dow|Rig| | | |
275 * |-----------------------------------------------------------|
276 * | | | | | |Spc|PgD|` |~ | |Men| |
277 * |-----------------------------------------------------------|
278 * | | | | | | | | |
279 * `-----------------------------------------------------------'
280 */
281 [1] = KEYMAP_ALL(
282 TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,
283 TRNS, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS,TRNS,TRNS, TRNS,TRNS,TRNS,TRNS, TRNS,
284 GRV, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, TRNS,DEL, TRNS,TRNS,TRNS, TRNS,TRNS,TRNS,TRNS, TRNS,TRNS,
285 CAPS,TRNS,TRNS,ESC, TRNS,TRNS,TRNS,HOME,UP, END, PSCR,SLCK,PAUS, INS, TRNS,TRNS,TRNS, TRNS,TRNS,TRNS,TRNS, TRNS,TRNS,
286 TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,PGUP,LEFT,DOWN,RGHT,TRNS,TRNS, TRNS,TRNS, TRNS,TRNS,TRNS,TRNS, TRNS,TRNS,
287 TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,SPC, PGDN,GRV, FN1, TRNS,APP, TRNS,TRNS, TRNS, TRNS,TRNS,TRNS,TRNS, TRNS,TRNS,
288 TRNS,TRNS,TRNS,TRNS,TRNS, TRNS, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS,TRNS,TRNS, TRNS, TRNS,TRNS, TRNS,TRNS
289 ),
290};
291
292const action_t PROGMEM fn_actions[] = {
293 [0] = ACTION_LAYER_TAP_KEY(1, KC_SPACE),
294 [1] = ACTION_MODS_KEY(MOD_LSFT, KC_GRV), // tilde
295};
296 84
297#endif 85}
diff --git a/keyboards/converter/usb_usb/rules.mk b/keyboards/converter/usb_usb/rules.mk
index 298bc5c40..4ee6cdb1c 100644
--- a/keyboards/converter/usb_usb/rules.mk
+++ b/keyboards/converter/usb_usb/rules.mk
@@ -1,51 +1,3 @@
1#----------------------------------------------------------------------------
2# On command line:
3#
4# make all = Make software.
5#
6# make clean = Clean out built project files.
7#
8# make coff = Convert ELF to AVR COFF.
9#
10# make extcoff = Convert ELF to AVR Extended COFF.
11#
12# make program = Download the hex file to the device.
13# Please customize your programmer settings(PROGRAM_CMD)
14#
15# make teensy = Download the hex file to the device, using teensy_loader_cli.
16# (must have teensy_loader_cli installed).
17#
18# make dfu = Download the hex file to the device, using dfu-programmer (must
19# have dfu-programmer installed).
20#
21# make flip = Download the hex file to the device, using Atmel FLIP (must
22# have Atmel FLIP installed).
23#
24# make dfu-ee = Download the eeprom file to the device, using dfu-programmer
25# (must have dfu-programmer installed).
26#
27# make flip-ee = Download the eeprom file to the device, using Atmel FLIP
28# (must have Atmel FLIP installed).
29#
30# make debug = Start either simulavr or avarice as specified for debugging,
31# with avr-gdb or avr-insight as the front end for debugging.
32#
33# make filename.s = Just compile filename.c into the assembler code only.
34#
35# make filename.i = Create a preprocessed source file for use in submitting
36# bug reports to the GCC project.
37#
38# To rebuild project do "make clean" then "make all".
39#----------------------------------------------------------------------------
40
41# Target file name (without extension).
42# TARGET ?= usb_usb
43
44# TMK_DIR ?= ../../tmk_core
45
46# Directory keyboard dependent files exist
47# TARGET_DIR ?= .
48
49# MCU name 1# MCU name
50MCU ?= atmega32u4 2MCU ?= atmega32u4
51 3
@@ -64,12 +16,12 @@ MCU ?= atmega32u4
64F_CPU ?= 8000000 16F_CPU ?= 8000000
65 17
66 18
67
68# 19#
69# LUFA specific 20# LUFA specific
70# 21#
71# Target architecture (see library "Board Types" documentation). 22# Target architecture (see library "Board Types" documentation).
72ARCH ?= AVR8 23ARCH ?= AVR8
24
73# Input clock frequency. 25# Input clock frequency.
74# This will define a symbol, F_USB, in all source code files equal to the 26# This will define a symbol, F_USB, in all source code files equal to the
75# input clock frequency (before any prescaling is performed) in Hz. This value may 27# input clock frequency (before any prescaling is performed) in Hz. This value may
@@ -82,71 +34,33 @@ ARCH ?= AVR8
82# If no clock division is performed on the input clock inside the AVR (via the 34# If no clock division is performed on the input clock inside the AVR (via the
83# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. 35# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
84F_USB ?= $(F_CPU) 36F_USB ?= $(F_CPU)
37
85# Interrupt driven control endpoint task 38# Interrupt driven control endpoint task
86OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT 39OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
87 40
88 41
89 42# Boot Section Size in *bytes*
90# Build Options
91# comment out to disable the options.
92#
93#MOUSEKEY_ENABLE ?= yes # Mouse keys
94EXTRAKEY_ENABLE ?= yes # Media control and System control
95# CONSOLE_ENABLE ?= yes # Console for debug
96CONSOLE_ENABLE ?= no # Console for debug
97#COMMAND_ENABLE ?= yes # Commands for debug and configuration
98#NKRO_ENABLE ?= yes # USB Nkey Rollover
99
100# Boot Section Size in bytes
101# Teensy halfKay 512 43# Teensy halfKay 512
44# Teensy++ halfKay 1024
102# Atmel DFU loader 4096 45# Atmel DFU loader 4096
103# LUFA bootloader 4096 46# LUFA bootloader 4096
47# USBaspLoader 2048
104OPT_DEFS += -DBOOTLOADER_SIZE=4096 48OPT_DEFS += -DBOOTLOADER_SIZE=4096
105 49
106#LDFLAGS += -Wl,--relax
107
108#OPT_DEFS += -DNO_ACTION_TAPPING
109#OPT_DEFS += -DNO_ACTION_LAYER
110#OPT_DEFS += -DNO_ACTION_MACRO
111 50
112CUSTOM_MATRIX = yes 51# Build Options
113 52# comment out to disable the options.
114SRC = custom_matrix.cpp
115
116#
117# Keymap file
118# 53#
119# ifeq (yes,$(strip $(UNIMAP_ENABLE))) 54# BOOTMAGIC_ENABLE ?= yes # Virtual DIP switch configuration(+1000)
120# KEYMAP_FILE = unimap 55# MOUSEKEY_ENABLE ?= yes # Mouse keys(+4700)
121# else 56EXTRAKEY_ENABLE ?= yes # Audio control and System control(+450)
122# ifeq (yes,$(strip $(ACTIONMAP_ENABLE))) 57# CONSOLE_ENABLE ?= yes # Console for debug(+400)
123# KEYMAP_FILE = actionmap 58# COMMAND_ENABLE ?= yes # Commands for debug and configuration
124# else 59# SLEEP_LED_ENABLE ?= yes # Breathing sleep LED during USB suspend
125# KEYMAP_FILE = keymap 60# NKRO_ENABLE ?= yes # USB Nkey Rollover - not yet supported in LUFA
126# endif 61# BACKLIGHT_ENABLE ?= yes
127# endif
128# ifdef KEYMAP
129# SRC := $(KEYMAP_FILE)_$(KEYMAP).c $(SRC)
130# else
131# SRC := $(KEYMAP_FILE).c $(SRC)
132# endif
133
134# CONFIG_H ?= config.h
135
136
137
138# Search Path
139# VPATH += $(TARGET_DIR)
140# VPATH += $(TMK_DIR)
141
142
143
144# program Leonardo
145# PROGRAM_CMD = avrdude -p$(MCU) -cavr109 -b57600 -Uflash:w:$(TARGET).hex -P$(DEV)
146
147 62
148 63
64CUSTOM_MATRIX = yes
65SRC = custom_matrix.cpp
149include $(TMK_DIR)/protocol/usb_hid.mk 66include $(TMK_DIR)/protocol/usb_hid.mk
150# include $(TMK_DIR)/protocol/lufa.mk
151# include $(TMK_DIR)/common.mk
152# include $(TMK_DIR)/rules.mk
diff --git a/keyboards/converter/usb_usb/unimap.c b/keyboards/converter/usb_usb/unimap.c
deleted file mode 100644
index 0f34ece85..000000000
--- a/keyboards/converter/usb_usb/unimap.c
+++ /dev/null
@@ -1,45 +0,0 @@
1/*
2Copyright 2016 Jun Wako <wakojun@gmail.com>
3
4This program is free software: you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by
6the Free Software Foundation, either version 2 of the License, or
7(at your option) any later version.
8
9This program is distributed in the hope that it will be useful,
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17#include "unimap_trans.h"
18
19
20#define AC_FN0 ACTION_LAYER_MOMENTARY(1)
21
22#ifdef KEYMAP_SECTION_ENABLE
23const action_t actionmaps[][UNIMAP_ROWS][UNIMAP_COLS] __attribute__ ((section (".keymap.keymaps"))) = {
24#else
25const action_t actionmaps[][UNIMAP_ROWS][UNIMAP_COLS] PROGMEM = {
26#endif
27 UNIMAP(
28 F13, F14, F15, F16, F17, F18, F19, F20, F21, F22, F23, F24,
29 ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PSCR,SLCK,PAUS, VOLD,VOLU,MUTE,
30 GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, JYEN,BSPC, INS, HOME,PGUP, NLCK,PSLS,PAST,PMNS,
31 TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC, BSLS, DEL, END, PGDN, P7, P8, P9, PPLS,
32 CAPS,A, S, D, F, G, H, J, K, L, SCLN,QUOT, NUHS,ENT, P4, P5, P6, PCMM,
33 LSFT,NUBS,Z, X, C, V, B, N, M, COMM,DOT, SLSH, RO, RSFT, UP, P1, P2, P3, PENT,
34 LCTL,LGUI,LALT,MHEN, SPC, HENK,KANA,RALT,RGUI,FN0, RCTL, LEFT,DOWN,RGHT, P0, PDOT,PEQL
35 ),
36 UNIMAP(
37 TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,
38 GRV, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS,TRNS,TRNS, TRNS,TRNS,TRNS,
39 ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, INS, DEL, TRNS,TRNS,TRNS, TRNS,TRNS,TRNS,TRNS,
40 TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,PSCR,SLCK,PAUS,UP, INS, TRNS, TRNS,TRNS,TRNS, TRNS,TRNS,TRNS,TRNS,
41 TRNS,VOLD,VOLU,MUTE,TRNS,TRNS,TRNS,TRNS,HOME,PGUP,LEFT,RGHT, TRNS,TRNS, TRNS,TRNS,TRNS,TRNS,
42 TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,END, PGDN,DOWN, TRNS,TRNS, PGUP, TRNS,TRNS,TRNS,TRNS,
43 TRNS,TRNS,TRNS,TRNS, TRNS, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, HOME,PGDN,END, TRNS, TRNS,TRNS
44 ),
45};
diff --git a/keyboards/converter/usb_usb/usb_usb.h b/keyboards/converter/usb_usb/usb_usb.h
index 91c000731..c31fae1d0 100644
--- a/keyboards/converter/usb_usb/usb_usb.h
+++ b/keyboards/converter/usb_usb/usb_usb.h
@@ -14,6 +14,7 @@ GNU General Public License for more details.
14You should have received a copy of the GNU General Public License 14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>. 15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/ 16*/
17
17#ifndef USB_USB_H 18#ifndef USB_USB_H
18#define USB_USB_H 19#define USB_USB_H
19 20
diff --git a/tmk_core/protocol/usb_hid.mk b/tmk_core/protocol/usb_hid.mk
index 1f79bda3b..e72008097 100644
--- a/tmk_core/protocol/usb_hid.mk
+++ b/tmk_core/protocol/usb_hid.mk
@@ -43,7 +43,6 @@ SRC += $(USB_HID_DIR)/override_Serial.cpp
43 43
44# replace arduino/wiring.c 44# replace arduino/wiring.c
45SRC += $(USB_HID_DIR)/override_wiring.c 45SRC += $(USB_HID_DIR)/override_wiring.c
46SRC += common/avr/timer.c
47 46
48SRC += $(USB_HOST_SHIELD_SRC) 47SRC += $(USB_HOST_SHIELD_SRC)
49SRC += $(ARDUINO_CORES_SRC) 48SRC += $(ARDUINO_CORES_SRC)
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-19 13:21:04 +0000