X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=converter%2Fps2_usb%2FMakefile.vusb;h=79c11639ea1a74e3a7bd115d409d51900b6710b5;hb=c7160e29bb91a0f28bffb0994130ea064794187e;hp=d449e1e40f3eb0cf548f759cb9b4345a0b74d2c0;hpb=fce750a1767ed86e0967eacf075a9cd59cbf306c;p=max%2Ftmk_keyboard.git

diff --git a/converter/ps2_usb/Makefile.vusb b/converter/ps2_usb/Makefile.vusb
index d449e1e4..79c11639 100644
--- a/converter/ps2_usb/Makefile.vusb
+++ b/converter/ps2_usb/Makefile.vusb
@@ -2,23 +2,28 @@
 TARGET = ps2_usb_vusb
 
 # Directory common source filess exist
-TOP_DIR = ../..
+TMK_DIR = ../../tmk_core
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
 
 # keyboard dependent files
-SRC =	keymap.c \
-	matrix.c \
+SRC = 	matrix.c \
 	led.c
 
-# Use USART for PS/2. With V-USB INT and BUSYWAIT code is not useful.
-SRC += protocol/ps2_usart.c
-OPT_DEFS += -DPS2_USE_USART
+ifdef KEYMAP
+    SRC := keymap_$(KEYMAP).c $(SRC)
+else
+    SRC := keymap_plain.c $(SRC)
+endif
 
 CONFIG_H = config.h
 
 
+# Use USART for PS/2. With V-USB INT and BUSYWAIT code is not useful.
+PS2_USE_USART = yes
+
+
 # V-USB debug level: To use ps2_usart.c level must be 0
 # ps2_usart.c requires USART to receive PS/2 signal.
 OPT_DEFS += -DDEBUG_LEVEL=0
@@ -30,7 +35,8 @@ OPT_DEFS += -DDEBUG_LEVEL=0
 #MCU = atmega32u4       # Teensy 2.0
 #MCU = at90usb646       # Teensy++ 1.0
 #MCU = at90usb1286      # Teensy++ 2.0
-MCU = atmega168
+#MCU = atmega168
+MCU = atmega328p
 
 
 # Processor frequency.
@@ -38,7 +44,7 @@ MCU = atmega168
 #   so your program will run at the correct speed.  You should also set this
 #   variable to same clock speed.  The _delay_ms() macro uses this, and many
 #   examples use this variable to calculate timings.  Do not add a "UL" here.
-F_CPU = 20000000
+F_CPU = 12000000
 
 
 # Build Options
@@ -87,15 +93,15 @@ PROGRAM_CMD = $(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE
 #   Atmel DFU loader 4096
 #   LUFA bootloader  4096
 #   USBasp           2048
-OPT_DEFS += -DBOOT_SIZE=2048
+OPT_DEFS += -DBOOTLOADER_SIZE=2048
 
 
 # Search Path
 VPATH += $(TARGET_DIR)
-VPATH += $(TOP_DIR)
+VPATH += $(TMK_DIR)
 
 
-include $(TOP_DIR)/protocol/vusb.mk
-include $(TOP_DIR)/protocol.mk
-include $(TOP_DIR)/common.mk
-include $(TOP_DIR)/rules.mk
+include $(TMK_DIR)/protocol.mk
+include $(TMK_DIR)/common.mk
+include $(TMK_DIR)/protocol/vusb.mk
+include $(TMK_DIR)/rules.mk