summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--common.mk1
-rw-r--r--common/debug.c12
-rw-r--r--common/debug_config.h2
-rw-r--r--common/host.h4
-rw-r--r--common/print.h3
-rw-r--r--common/xprintf.h8
-rw-r--r--converter/usb_usb/README4
-rw-r--r--converter/usb_usb/config.h1
-rw-r--r--converter/usb_usb/main.cpp1
-rw-r--r--protocol/usb_hid/arduino-1.0.1/cores/arduino/WString.h2
-rw-r--r--protocol/usb_hid/override_wiring.c1
-rw-r--r--protocol/usb_hid/parser.cpp2
12 files changed, 27 insertions, 14 deletions
diff --git a/common.mk b/common.mk
index 62ac0ff787..1cffc3cc22 100644
--- a/common.mk
+++ b/common.mk
@@ -9,6 +9,7 @@ SRC += $(COMMON_DIR)/host.c \
$(COMMON_DIR)/keymap.c \
$(COMMON_DIR)/timer.c \
$(COMMON_DIR)/print.c \
+ $(COMMON_DIR)/debug.c \
$(COMMON_DIR)/bootloader.c \
$(COMMON_DIR)/suspend.c \
$(COMMON_DIR)/xprintf.S \
diff --git a/common/debug.c b/common/debug.c
new file mode 100644
index 0000000000..c4fa3a05b4
--- /dev/null
+++ b/common/debug.c
@@ -0,0 +1,12 @@
+#include <stdbool.h>
+#include "debug.h"
+
+
+//debug_config_t debug_config = { .enable = false, .matrix = false };
+debug_config_t debug_config = {
+ .enable = false,
+ .matrix = false,
+ .keyboard = false,
+ .mouse = false,
+};
+
diff --git a/common/debug_config.h b/common/debug_config.h
index e00fd10336..43e4c5c554 100644
--- a/common/debug_config.h
+++ b/common/debug_config.h
@@ -36,7 +36,7 @@ typedef union {
uint8_t reserved:4;
};
} debug_config_t;
-debug_config_t debug_config;
+extern debug_config_t debug_config;
/* for backward compatibility */
#define debug_enable (debug_config.enable)
diff --git a/common/host.h b/common/host.h
index a56e6c3b04..918af69e8f 100644
--- a/common/host.h
+++ b/common/host.h
@@ -32,8 +32,8 @@ extern "C" {
extern bool keyboard_nkro;
#endif
-uint8_t keyboard_idle;
-uint8_t keyboard_protocol;
+extern uint8_t keyboard_idle;
+extern uint8_t keyboard_protocol;
/* host driver */
diff --git a/common/print.h b/common/print.h
index 930e84be99..7799328910 100644
--- a/common/print.h
+++ b/common/print.h
@@ -34,10 +34,7 @@
// this macro allows you to write print("some text") and
// the string is automatically placed into flash memory :)
-// TODO: avoid collision with arduino/Print.h
-#ifndef __cplusplus
#define print(s) print_P(PSTR(s))
-#endif
#define println(s) print_P(PSTR(s "\n"))
/* for old name */
diff --git a/common/xprintf.h b/common/xprintf.h
index f58bca817b..59c6f25312 100644
--- a/common/xprintf.h
+++ b/common/xprintf.h
@@ -8,6 +8,10 @@
#include <inttypes.h>
#include <avr/pgmspace.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+
extern void (*xfunc_out)(uint8_t);
#define xdev_out(func) xfunc_out = (void(*)(uint8_t))(func)
@@ -99,5 +103,9 @@ char xatoi(char **str, long *ret);
Pointer to return value
*/
+#ifdef __cplusplus
+}
+#endif
+
#endif
diff --git a/converter/usb_usb/README b/converter/usb_usb/README
index d0547cde90..a489371107 100644
--- a/converter/usb_usb/README
+++ b/converter/usb_usb/README
@@ -14,12 +14,8 @@ Build firmware
--------------
$ git clone git://github.com/tmk/tmk_keyboard.git
$ cd tmk_keyboard
- $ git checkout usb_hid
$ git submodule init
$ git submodule update
-
-and download LUFA and unzip under protocol/lufa and edit LUFA_PATH in protocol/lufa.mk. Then,
-
$ cd converter/usb_usb
$ make
diff --git a/converter/usb_usb/config.h b/converter/usb_usb/config.h
index ecf4ed9b19..d614973f7e 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/>.
#define MATRIX_ROWS 32
#define MATRIX_COLS 8
+#define USE_LEGACY_KEYMAP
/* key combination for command */
#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 46c728e9b5..20b7af66a2 100644
--- a/converter/usb_usb/main.cpp
+++ b/converter/usb_usb/main.cpp
@@ -59,7 +59,6 @@ int main(void)
LED_TX_INIT;
LED_TX_ON;
- print_enable = true;
debug_enable = true;
debug_matrix = true;
debug_keyboard = true;
diff --git a/protocol/usb_hid/arduino-1.0.1/cores/arduino/WString.h b/protocol/usb_hid/arduino-1.0.1/cores/arduino/WString.h
index d76d2a33d4..947325e5f5 100644
--- a/protocol/usb_hid/arduino-1.0.1/cores/arduino/WString.h
+++ b/protocol/usb_hid/arduino-1.0.1/cores/arduino/WString.h
@@ -35,7 +35,7 @@
// -std=c++0x
class __FlashStringHelper;
-#define F(string_literal) (reinterpret_cast<__FlashStringHelper *>(PSTR(string_literal)))
+#define F(string_literal) (reinterpret_cast<const __FlashStringHelper *>(PSTR(string_literal)))
// An inherited class for holding the result of a concatenation. These
// result objects are assumed to be writable by subsequent concatenations.
diff --git a/protocol/usb_hid/override_wiring.c b/protocol/usb_hid/override_wiring.c
index 3b3f5e3028..1e9a94ce26 100644
--- a/protocol/usb_hid/override_wiring.c
+++ b/protocol/usb_hid/override_wiring.c
@@ -1,6 +1,7 @@
/*
* To keep Timer0 for common/timer.c override arduino/wiring.c.
*/
+#define __DELAY_BACKWARD_COMPATIBLE__
#include <util/delay.h>
#include "common/timer.h"
#include "Arduino.h"
diff --git a/protocol/usb_hid/parser.cpp b/protocol/usb_hid/parser.cpp
index 66e949518e..28151f9d59 100644
--- a/protocol/usb_hid/parser.cpp
+++ b/protocol/usb_hid/parser.cpp
@@ -1,5 +1,3 @@
-#include <cstring.h>
-
#include "parser.h"
#include "usb_hid.h"