diff options
| author | tmk <nobody@nowhere> | 2014-09-22 10:53:35 +0900 |
|---|---|---|
| committer | tmk <nobody@nowhere> | 2014-09-22 10:53:35 +0900 |
| commit | dd3ab65ec348370e789f4136af2c6cdb95c2532c (patch) | |
| tree | 671949de54ed5fdbb938503bd417ddf4cb70c859 /converter | |
| parent | b9e265368fde73daff069788dcb58c8230d01b32 (diff) | |
| parent | e3f4f7d8c4dd821ff47caa8a22318c674f43a4e9 (diff) | |
| download | qmk_firmware-dd3ab65ec348370e789f4136af2c6cdb95c2532c.tar.gz qmk_firmware-dd3ab65ec348370e789f4136af2c6cdb95c2532c.zip | |
Merge branch 'usb_usb_fix'
Diffstat (limited to 'converter')
| -rw-r--r-- | converter/usb_usb/README | 4 | ||||
| -rw-r--r-- | converter/usb_usb/config.h | 1 | ||||
| -rw-r--r-- | converter/usb_usb/main.cpp | 1 |
3 files changed, 1 insertions, 5 deletions
diff --git a/converter/usb_usb/README b/converter/usb_usb/README index d0547cde9..a48937110 100644 --- a/converter/usb_usb/README +++ b/converter/usb_usb/README | |||
| @@ -14,12 +14,8 @@ Build firmware | |||
| 14 | -------------- | 14 | -------------- |
| 15 | $ git clone git://github.com/tmk/tmk_keyboard.git | 15 | $ git clone git://github.com/tmk/tmk_keyboard.git |
| 16 | $ cd tmk_keyboard | 16 | $ cd tmk_keyboard |
| 17 | $ git checkout usb_hid | ||
| 18 | $ git submodule init | 17 | $ git submodule init |
| 19 | $ git submodule update | 18 | $ git submodule update |
| 20 | |||
| 21 | and download LUFA and unzip under protocol/lufa and edit LUFA_PATH in protocol/lufa.mk. Then, | ||
| 22 | |||
| 23 | $ cd converter/usb_usb | 19 | $ cd converter/usb_usb |
| 24 | $ make | 20 | $ make |
| 25 | 21 | ||
diff --git a/converter/usb_usb/config.h b/converter/usb_usb/config.h index ecf4ed9b1..d614973f7 100644 --- a/converter/usb_usb/config.h +++ b/converter/usb_usb/config.h | |||
| @@ -33,6 +33,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 33 | #define MATRIX_ROWS 32 | 33 | #define MATRIX_ROWS 32 |
| 34 | #define MATRIX_COLS 8 | 34 | #define MATRIX_COLS 8 |
| 35 | 35 | ||
| 36 | #define USE_LEGACY_KEYMAP | ||
| 36 | 37 | ||
| 37 | /* key combination for command */ | 38 | /* key combination for command */ |
| 38 | #define IS_COMMAND() (keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) | 39 | #define IS_COMMAND() (keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) |
diff --git a/converter/usb_usb/main.cpp b/converter/usb_usb/main.cpp index 46c728e9b..20b7af66a 100644 --- a/converter/usb_usb/main.cpp +++ b/converter/usb_usb/main.cpp | |||
| @@ -59,7 +59,6 @@ int main(void) | |||
| 59 | LED_TX_INIT; | 59 | LED_TX_INIT; |
| 60 | LED_TX_ON; | 60 | LED_TX_ON; |
| 61 | 61 | ||
| 62 | print_enable = true; | ||
| 63 | debug_enable = true; | 62 | debug_enable = true; |
| 64 | debug_matrix = true; | 63 | debug_matrix = true; |
| 65 | debug_keyboard = true; | 64 | debug_keyboard = true; |
