diff options
Diffstat (limited to 'converter')
| -rw-r--r-- | converter/adb_usb/Makefile | 14 | ||||
| -rw-r--r-- | converter/m0110_usb/Makefile | 7 | ||||
| -rw-r--r-- | converter/news_usb/Makefile.pjrc | 7 | ||||
| -rw-r--r-- | converter/ps2_usb/Makefile | 7 | ||||
| -rw-r--r-- | converter/ps2_usb/Makefile.pjrc_usart | 7 | ||||
| -rw-r--r-- | converter/ps2_usb/Makefile.vusb | 15 | ||||
| -rw-r--r-- | converter/terminal_usb/Makefile.102_pjrc | 7 | ||||
| -rw-r--r-- | converter/terminal_usb/Makefile.122_pjrc | 7 | ||||
| -rw-r--r-- | converter/x68k_usb/Makefile | 7 |
9 files changed, 52 insertions, 26 deletions
diff --git a/converter/adb_usb/Makefile b/converter/adb_usb/Makefile index 248261df0..e9a90695b 100644 --- a/converter/adb_usb/Makefile +++ b/converter/adb_usb/Makefile | |||
| @@ -8,8 +8,7 @@ TOP_DIR = ../.. | |||
| 8 | TARGET_DIR = . | 8 | TARGET_DIR = . |
| 9 | 9 | ||
| 10 | # keyboard dependent files | 10 | # keyboard dependent files |
| 11 | SRC = main.c \ | 11 | SRC = keymap.c \ |
| 12 | keymap.c \ | ||
| 13 | matrix.c \ | 12 | matrix.c \ |
| 14 | led.c \ | 13 | led.c \ |
| 15 | adb.c | 14 | adb.c |
| @@ -42,16 +41,11 @@ EXTRAKEY_ENABLE = yes # Audio control and System control | |||
| 42 | #NKRO_ENABLE = yes # USB Nkey Rollover | 41 | #NKRO_ENABLE = yes # USB Nkey Rollover |
| 43 | 42 | ||
| 44 | 43 | ||
| 45 | 44 | # Search Path | |
| 46 | #---------------- Programming Options -------------------------- | 45 | VPATH += $(TARGET_DIR) |
| 47 | PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex | 46 | VPATH += $(TOP_DIR) |
| 48 | |||
| 49 | |||
| 50 | 47 | ||
| 51 | include $(TOP_DIR)/protocol/pjrc.mk | 48 | include $(TOP_DIR)/protocol/pjrc.mk |
| 52 | include $(TOP_DIR)/protocol.mk | 49 | include $(TOP_DIR)/protocol.mk |
| 53 | include $(TOP_DIR)/common.mk | 50 | include $(TOP_DIR)/common.mk |
| 54 | include $(TOP_DIR)/rules.mk | 51 | include $(TOP_DIR)/rules.mk |
| 55 | |||
| 56 | dfu: PROGRAM_CMD = dfu-programmer atmega32u4 flash $(TARGET).hex | ||
| 57 | dfu: program | ||
diff --git a/converter/m0110_usb/Makefile b/converter/m0110_usb/Makefile index 4a687b933..1fee258a6 100644 --- a/converter/m0110_usb/Makefile +++ b/converter/m0110_usb/Makefile | |||
| @@ -8,8 +8,7 @@ TOP_DIR = ../.. | |||
| 8 | TARGET_DIR = . | 8 | TARGET_DIR = . |
| 9 | 9 | ||
| 10 | # keyboard dependent files | 10 | # keyboard dependent files |
| 11 | SRC = main.c \ | 11 | SRC = keymap.c \ |
| 12 | keymap.c \ | ||
| 13 | matrix.c \ | 12 | matrix.c \ |
| 14 | led.c \ | 13 | led.c \ |
| 15 | m0110.c | 14 | m0110.c |
| @@ -47,6 +46,10 @@ EXTRAKEY_ENABLE = yes # Audio control and System control | |||
| 47 | PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex | 46 | PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex |
| 48 | 47 | ||
| 49 | 48 | ||
| 49 | # Search Path | ||
| 50 | VPATH += $(TARGET_DIR) | ||
| 51 | VPATH += $(TOP_DIR) | ||
| 52 | |||
| 50 | 53 | ||
| 51 | include $(TOP_DIR)/protocol/pjrc.mk | 54 | include $(TOP_DIR)/protocol/pjrc.mk |
| 52 | include $(TOP_DIR)/protocol.mk | 55 | include $(TOP_DIR)/protocol.mk |
diff --git a/converter/news_usb/Makefile.pjrc b/converter/news_usb/Makefile.pjrc index 376133ad5..3233463d5 100644 --- a/converter/news_usb/Makefile.pjrc +++ b/converter/news_usb/Makefile.pjrc | |||
| @@ -13,8 +13,7 @@ TOP_DIR = ../.. | |||
| 13 | TARGET_DIR = . | 13 | TARGET_DIR = . |
| 14 | 14 | ||
| 15 | # keyboard dependent files | 15 | # keyboard dependent files |
| 16 | SRC = main.c \ | 16 | SRC = keymap.c \ |
| 17 | keymap.c \ | ||
| 18 | matrix.c \ | 17 | matrix.c \ |
| 19 | led.c \ | 18 | led.c \ |
| 20 | news.c | 19 | news.c |
| @@ -51,6 +50,10 @@ NKRO_ENABLE = yes # USB Nkey Rollover | |||
| 51 | PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex | 50 | PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex |
| 52 | 51 | ||
| 53 | 52 | ||
| 53 | # Search Path | ||
| 54 | VPATH += $(TARGET_DIR) | ||
| 55 | VPATH += $(TOP_DIR) | ||
| 56 | |||
| 54 | 57 | ||
| 55 | include $(TOP_DIR)/protocol/pjrc.mk | 58 | include $(TOP_DIR)/protocol/pjrc.mk |
| 56 | include $(TOP_DIR)/protocol.mk | 59 | include $(TOP_DIR)/protocol.mk |
diff --git a/converter/ps2_usb/Makefile b/converter/ps2_usb/Makefile index 0bba191a3..1278a74be 100644 --- a/converter/ps2_usb/Makefile +++ b/converter/ps2_usb/Makefile | |||
| @@ -13,8 +13,7 @@ TOP_DIR = ../.. | |||
| 13 | TARGET_DIR = . | 13 | TARGET_DIR = . |
| 14 | 14 | ||
| 15 | # keyboard dependent files | 15 | # keyboard dependent files |
| 16 | SRC = main.c \ | 16 | SRC = keymap.c \ |
| 17 | keymap.c \ | ||
| 18 | matrix.c \ | 17 | matrix.c \ |
| 19 | led.c \ | 18 | led.c \ |
| 20 | ps2.c | 19 | ps2.c |
| @@ -51,6 +50,10 @@ NKRO_ENABLE = yes # USB Nkey Rollover | |||
| 51 | PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex | 50 | PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex |
| 52 | 51 | ||
| 53 | 52 | ||
| 53 | # Search Path | ||
| 54 | VPATH += $(TARGET_DIR) | ||
| 55 | VPATH += $(TOP_DIR) | ||
| 56 | |||
| 54 | 57 | ||
| 55 | include $(TOP_DIR)/protocol/pjrc.mk | 58 | include $(TOP_DIR)/protocol/pjrc.mk |
| 56 | include $(TOP_DIR)/protocol.mk | 59 | include $(TOP_DIR)/protocol.mk |
diff --git a/converter/ps2_usb/Makefile.pjrc_usart b/converter/ps2_usb/Makefile.pjrc_usart index 3dad7e2f8..dd74712e4 100644 --- a/converter/ps2_usb/Makefile.pjrc_usart +++ b/converter/ps2_usb/Makefile.pjrc_usart | |||
| @@ -13,8 +13,7 @@ TOP_DIR = ../.. | |||
| 13 | TARGET_DIR = . | 13 | TARGET_DIR = . |
| 14 | 14 | ||
| 15 | # keyboard dependent files | 15 | # keyboard dependent files |
| 16 | SRC = main.c \ | 16 | SRC = keymap.c \ |
| 17 | keymap.c \ | ||
| 18 | matrix.c \ | 17 | matrix.c \ |
| 19 | led.c \ | 18 | led.c \ |
| 20 | ps2_usart.c | 19 | ps2_usart.c |
| @@ -51,6 +50,10 @@ NKRO_ENABLE = yes # USB Nkey Rollover | |||
| 51 | PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex | 50 | PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex |
| 52 | 51 | ||
| 53 | 52 | ||
| 53 | # Search Path | ||
| 54 | VPATH += $(TARGET_DIR) | ||
| 55 | VPATH += $(TOP_DIR) | ||
| 56 | |||
| 54 | 57 | ||
| 55 | include $(TOP_DIR)/protocol/pjrc.mk | 58 | include $(TOP_DIR)/protocol/pjrc.mk |
| 56 | include $(TOP_DIR)/protocol.mk | 59 | include $(TOP_DIR)/protocol.mk |
diff --git a/converter/ps2_usb/Makefile.vusb b/converter/ps2_usb/Makefile.vusb index 4d5240c30..b08d30d57 100644 --- a/converter/ps2_usb/Makefile.vusb +++ b/converter/ps2_usb/Makefile.vusb | |||
| @@ -13,8 +13,7 @@ TOP_DIR = ../.. | |||
| 13 | TARGET_DIR = . | 13 | TARGET_DIR = . |
| 14 | 14 | ||
| 15 | # keyboard dependent files | 15 | # keyboard dependent files |
| 16 | SRC = main.c \ | 16 | SRC = keymap.c \ |
| 17 | keymap.c \ | ||
| 18 | matrix.c \ | 17 | matrix.c \ |
| 19 | led.c \ | 18 | led.c \ |
| 20 | ps2_usart.c | 19 | ps2_usart.c |
| @@ -85,6 +84,18 @@ AVRDUDE_FLAGS += $(AVRDUDE_ERASE_COUNTER) | |||
| 85 | PROGRAM_CMD = $(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE_EEPROM) | 84 | PROGRAM_CMD = $(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE_EEPROM) |
| 86 | 85 | ||
| 87 | 86 | ||
| 87 | # Boot Section Size in bytes | ||
| 88 | # Teensy halfKay 512 | ||
| 89 | # Atmel DFU loader 4096 | ||
| 90 | # LUFA bootloader 4096 | ||
| 91 | # USBasp 2048 | ||
| 92 | OPT_DEFS += -DBOOT_SIZE=2048 | ||
| 93 | |||
| 94 | |||
| 95 | # Search Path | ||
| 96 | VPATH += $(TARGET_DIR) | ||
| 97 | VPATH += $(TOP_DIR) | ||
| 98 | |||
| 88 | 99 | ||
| 89 | include $(TOP_DIR)/protocol/vusb.mk | 100 | include $(TOP_DIR)/protocol/vusb.mk |
| 90 | include $(TOP_DIR)/protocol.mk | 101 | include $(TOP_DIR)/protocol.mk |
diff --git a/converter/terminal_usb/Makefile.102_pjrc b/converter/terminal_usb/Makefile.102_pjrc index e9d14e7a0..e2d1a00a5 100644 --- a/converter/terminal_usb/Makefile.102_pjrc +++ b/converter/terminal_usb/Makefile.102_pjrc | |||
| @@ -13,8 +13,7 @@ TOP_DIR = ../.. | |||
| 13 | TARGET_DIR = . | 13 | TARGET_DIR = . |
| 14 | 14 | ||
| 15 | # keyboard dependent files | 15 | # keyboard dependent files |
| 16 | SRC = main.c \ | 16 | SRC = keymap_102.c \ |
| 17 | keymap_102.c \ | ||
| 18 | matrix.c \ | 17 | matrix.c \ |
| 19 | led.c \ | 18 | led.c \ |
| 20 | ps2.c | 19 | ps2.c |
| @@ -51,6 +50,10 @@ NKRO_ENABLE = yes # USB Nkey Rollover | |||
| 51 | PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex | 50 | PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex |
| 52 | 51 | ||
| 53 | 52 | ||
| 53 | # Search Path | ||
| 54 | VPATH += $(TARGET_DIR) | ||
| 55 | VPATH += $(TOP_DIR) | ||
| 56 | |||
| 54 | 57 | ||
| 55 | include $(TOP_DIR)/protocol/pjrc.mk | 58 | include $(TOP_DIR)/protocol/pjrc.mk |
| 56 | include $(TOP_DIR)/protocol.mk | 59 | include $(TOP_DIR)/protocol.mk |
diff --git a/converter/terminal_usb/Makefile.122_pjrc b/converter/terminal_usb/Makefile.122_pjrc index bec00510e..ee42dd743 100644 --- a/converter/terminal_usb/Makefile.122_pjrc +++ b/converter/terminal_usb/Makefile.122_pjrc | |||
| @@ -13,8 +13,7 @@ TOP_DIR = ../.. | |||
| 13 | TARGET_DIR = . | 13 | TARGET_DIR = . |
| 14 | 14 | ||
| 15 | # keyboard dependent files | 15 | # keyboard dependent files |
| 16 | SRC = main.c \ | 16 | SRC = keymap_122.c \ |
| 17 | keymap_122.c \ | ||
| 18 | matrix.c \ | 17 | matrix.c \ |
| 19 | led.c \ | 18 | led.c \ |
| 20 | ps2.c | 19 | ps2.c |
| @@ -51,6 +50,10 @@ F_CPU = 16000000 | |||
| 51 | PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex | 50 | PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex |
| 52 | 51 | ||
| 53 | 52 | ||
| 53 | # Search Path | ||
| 54 | VPATH += $(TARGET_DIR) | ||
| 55 | VPATH += $(TOP_DIR) | ||
| 56 | |||
| 54 | 57 | ||
| 55 | include $(TOP_DIR)/protocol/pjrc.mk | 58 | include $(TOP_DIR)/protocol/pjrc.mk |
| 56 | include $(TOP_DIR)/protocol.mk | 59 | include $(TOP_DIR)/protocol.mk |
diff --git a/converter/x68k_usb/Makefile b/converter/x68k_usb/Makefile index c3b5fa29f..62b976c56 100644 --- a/converter/x68k_usb/Makefile +++ b/converter/x68k_usb/Makefile | |||
| @@ -13,8 +13,7 @@ TOP_DIR = ../.. | |||
| 13 | TARGET_DIR = . | 13 | TARGET_DIR = . |
| 14 | 14 | ||
| 15 | # keyboard dependent files | 15 | # keyboard dependent files |
| 16 | SRC = main.c \ | 16 | SRC = keymap.c \ |
| 17 | keymap.c \ | ||
| 18 | matrix.c \ | 17 | matrix.c \ |
| 19 | led.c \ | 18 | led.c \ |
| 20 | x68k.c | 19 | x68k.c |
| @@ -80,6 +79,10 @@ AVRDUDE_FLAGS += $(AVRDUDE_ERASE_COUNTER) | |||
| 80 | PROGRAM_CMD = dfu-programmer atmega32u4 flash $(TARGET).hex | 79 | PROGRAM_CMD = dfu-programmer atmega32u4 flash $(TARGET).hex |
| 81 | 80 | ||
| 82 | 81 | ||
| 82 | # Search Path | ||
| 83 | VPATH += $(TARGET_DIR) | ||
| 84 | VPATH += $(TOP_DIR) | ||
| 85 | |||
| 83 | 86 | ||
| 84 | include $(TOP_DIR)/protocol/pjrc.mk | 87 | include $(TOP_DIR)/protocol/pjrc.mk |
| 85 | include $(TOP_DIR)/protocol.mk | 88 | include $(TOP_DIR)/protocol.mk |
