summaryrefslogtreecommitdiff
path: root/keyboards/converter
diff options
context:
space:
mode:
authorBalz Guenat <balz.guenat@gmail.com>2017-08-12 18:24:15 +0200
committerJack Humbert <jack.humb@gmail.com>2017-08-15 23:14:41 -0400
commit2aa5e4464010a9292b50571243d8ef6e749a5ca4 (patch)
tree81a485c561b87fbc5e4a43b7273fa631a6c8af99 /keyboards/converter
parent42f895a4bc232515d95d1fb93396ecd2c0032c0e (diff)
some major steps toward making the usb-usb converter work
Diffstat (limited to 'keyboards/converter')
-rw-r--r--keyboards/converter/usb_usb/config.h2
-rw-r--r--keyboards/converter/usb_usb/keymaps/default/keymap.c2
-rw-r--r--keyboards/converter/usb_usb/rules.mk2
3 files changed, 4 insertions, 2 deletions
diff --git a/keyboards/converter/usb_usb/config.h b/keyboards/converter/usb_usb/config.h
index ff764ee4fa..fa059feeaf 100644
--- a/keyboards/converter/usb_usb/config.h
+++ b/keyboards/converter/usb_usb/config.h
@@ -31,6 +31,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_ROWS 16
#define MATRIX_COLS 16
+#define DIODE_DIRECTION CUSTOM_MATRIX
+
/* key combination for command */
#define IS_COMMAND() (keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)))
diff --git a/keyboards/converter/usb_usb/keymaps/default/keymap.c b/keyboards/converter/usb_usb/keymaps/default/keymap.c
index fbbbd1cfa6..050332384c 100644
--- a/keyboards/converter/usb_usb/keymaps/default/keymap.c
+++ b/keyboards/converter/usb_usb/keymaps/default/keymap.c
@@ -27,7 +27,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "usb_usb.h"
-const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
+const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
/* 0: plain Qwerty without layer switching
* ,---------------. ,---------------. ,---------------.
* |F13|F14|F15|F16| |F17|F18|F19|F20| |F21|F22|F23|F24|
diff --git a/keyboards/converter/usb_usb/rules.mk b/keyboards/converter/usb_usb/rules.mk
index 2ae908fec7..f6b816966c 100644
--- a/keyboards/converter/usb_usb/rules.mk
+++ b/keyboards/converter/usb_usb/rules.mk
@@ -146,7 +146,7 @@ SRC = matrix.cpp
-# include $(TMK_DIR)/protocol/usb_hid.mk
+include $(TMK_DIR)/protocol/usb_hid.mk
# include $(TMK_DIR)/protocol/lufa.mk
# include $(TMK_DIR)/common.mk
# include $(TMK_DIR)/rules.mk