Merge pull request #1601 from dlaroe/master

[qmk_firmware.git] / keyboards / converter / usb_usb / config.h

diff --git a/keyboards/converter/usb_usb/config.h b/keyboards/converter/usb_usb/config.h
index ff764ee4fa618d0da74626dfde4bb06df32ec5ea..591d80f32dd8b2301b5f46d4972dee8c58de08c8 100644 (file)
--- a/keyboards/converter/usb_usb/config.h
+++ b/keyboards/converter/usb_usb/config.h
@@ -1,5 +1,5 @@
 /*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2017 Balz Guenat <balz.guenat@gmail.com>
 
 This program is free software: you can redistribute it and/or modify
 it 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/>.
 #ifndef CONFIG_H
 #define CONFIG_H
 
+// do not #include "config_common.h" because the pin names conflict with the USB HID code.
+// CUSTOM_MATRIX is defined it that file, though, and we need it, so we define it ourselves.
+// It's a hack, yeah...
+#define CUSTOM_MATRIX 2
 
+/* USB Device descriptor parameter */
 #define VENDOR_ID       0xFEED
 #define PRODUCT_ID      0x005B
 #define DEVICE_VER      0x0001
@@ -27,11 +32,32 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DESCRIPTION     USB to USB Keyboard Converter with QMK
 
 
-/* matrix size */
+/* size of virtual matrix */
 #define MATRIX_ROWS 16
 #define MATRIX_COLS 16
 
+/* matrix scanning is done in custom_matrix.cpp */
+#define DIODE_DIRECTION CUSTOM_MATRIX
+
 /* key combination for command */
 #define IS_COMMAND() (keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) 
 
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+//#define NO_ACTION_MACRO
+//#define NO_ACTION_FUNCTION
+
 #endif