summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortmk <nobody@nowhere>2013-04-18 15:54:26 +0900
committertmk <nobody@nowhere>2013-04-18 15:54:59 +0900
commit246031b6471a364f082c0eb4a0fb858821ae767b (patch)
treeffffc94793d42f1315f17f20817bc2db49d6203e
parent1eb67303ee7b8a037d035e97ffd2d19b030fe3f2 (diff)
Fix build options for NEWS converter
-rw-r--r--converter/news_usb/Makefile.pjrc19
-rw-r--r--converter/news_usb/config_pjrc.h4
-rw-r--r--converter/news_usb/matrix.c3
3 files changed, 20 insertions, 6 deletions
diff --git a/converter/news_usb/Makefile.pjrc b/converter/news_usb/Makefile.pjrc
index 3233463d58..98f8d57693 100644
--- a/converter/news_usb/Makefile.pjrc
+++ b/converter/news_usb/Makefile.pjrc
@@ -37,12 +37,25 @@ MCU = atmega32u4 # Teensy 2.0
F_CPU = 16000000
+# Boot Section Size in *bytes*
+# Teensy halfKay 512
+# Teensy++ halfKay 1024
+# Atmel DFU loader 4096
+# LUFA bootloader 4096
+# USBaspLoader 2048
+OPT_DEFS += -DBOOTLOADER_SIZE=4096
+
+
# Build Options
# *Comment out* to disable the options.
#
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-NKRO_ENABLE = yes # USB Nkey Rollover
+BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000)
+MOUSEKEY_ENABLE = yes # Mouse keys(+5000)
+EXTRAKEY_ENABLE = yes # Audio control and System control(+600)
+CONSOLE_ENABLE = yes # Console for debug
+COMMAND_ENABLE = yes # Commands for debug and configuration
+#SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend
+NKRO_ENABLE = yes # USB Nkey Rollover(+500)
diff --git a/converter/news_usb/config_pjrc.h b/converter/news_usb/config_pjrc.h
index 171a0e06d5..92751d1eea 100644
--- a/converter/news_usb/config_pjrc.h
+++ b/converter/news_usb/config_pjrc.h
@@ -31,6 +31,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_COLS 8 // keycode bit: 6-4
+/* legacy keymap support */
+#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/news_usb/matrix.c b/converter/news_usb/matrix.c
index f4e7281fbd..f0d5b58633 100644
--- a/converter/news_usb/matrix.c
+++ b/converter/news_usb/matrix.c
@@ -64,9 +64,6 @@ uint8_t matrix_cols(void)
void matrix_init(void)
{
- print_enable = true;
- debug_enable = true;
- debug_matrix = true;
news_init();
// initialize matrix state: all keys off