di0ib/tmk_keyboard
1
0
Fork 0
Code Releases Activity

x68k_usb: Change config for TMK converter

Browse Source
This commit is contained in:
tmk 2016-03-29 10:52:25 +09:00
parent 79afcd5570
commit e3994a620b
2 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
converter/x68k_usb/Makefile
View File

@ -4,7 +4,7 @@
# Target file name (without extension). # Target file name (without extension).
TARGET = x68k_usb_pjrc TARGET = x68k_usb
# Directory common source filess exist # Directory common source filess exist
TMK_DIR = ../../tmk_core TMK_DIR = ../../tmk_core
@ -24,9 +24,10 @@ CONFIG_H = config_pjrc.h
# MCU name, you MUST set this to match the board you are using # MCU name, you MUST set this to match the board you are using
# type "make clean" after changing this, so all files will be rebuilt # type "make clean" after changing this, so all files will be rebuilt
#MCU = at90usb162 # Teensy 1.0 #MCU = at90usb162 # Teensy 1.0
MCU = atmega32u4 # Teensy 2.0 #MCU = atmega32u4 # Teensy 2.0
#MCU = at90usb646 # Teensy++ 1.0 #MCU = at90usb646 # Teensy++ 1.0
#MCU = at90usb1286 # Teensy++ 2.0 #MCU = at90usb1286 # Teensy++ 2.0
MCU = atmega32u2 # Teensy 2.0
# Processor frequency. # Processor frequency.
@ -37,6 +38,29 @@ MCU = atmega32u4 # Teensy 2.0
F_CPU = 16000000 F_CPU = 16000000
#
# LUFA specific
#
# Target architecture (see library "Board Types" documentation).
ARCH = AVR8
# Input clock frequency.
# This will define a symbol, F_USB, in all source code files equal to the
# input clock frequency (before any prescaling is performed) in Hz. This value may
# differ from F_CPU if prescaling is used on the latter, and is required as the
# raw input clock is fed directly to the PLL sections of the AVR for high speed
# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL'
# at the end, this will be done automatically to create a 32-bit value in your
# source code.
#
# If no clock division is performed on the input clock inside the AVR (via the
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
F_USB = $(F_CPU)
# Interrupt driven control endpoint task(+60)
#OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
# Boot Section Size in bytes # Boot Section Size in bytes
# Teensy halfKay 512 # Teensy halfKay 512
# Atmel DFU loader 4096 # Atmel DFU loader 4096
@ -85,9 +109,7 @@ AVRDUDE_FLAGS += $(AVRDUDE_NO_VERIFY)
AVRDUDE_FLAGS += $(AVRDUDE_VERBOSE) AVRDUDE_FLAGS += $(AVRDUDE_VERBOSE)
AVRDUDE_FLAGS += $(AVRDUDE_ERASE_COUNTER) AVRDUDE_FLAGS += $(AVRDUDE_ERASE_COUNTER)
#PROGRAM_CMD = $(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE_EEPROM) PROGRAM_CMD = $(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE_EEPROM)
#PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex
PROGRAM_CMD = dfu-programmer atmega32u4 flash $(TARGET).hex
# Search Path # Search Path
@ -95,7 +117,7 @@ VPATH += $(TARGET_DIR)
VPATH += $(TMK_DIR) VPATH += $(TMK_DIR)
include $(TMK_DIR)/protocol/pjrc.mk
include $(TMK_DIR)/protocol.mk include $(TMK_DIR)/protocol.mk
include $(TMK_DIR)/protocol/lufa.mk
include $(TMK_DIR)/common.mk include $(TMK_DIR)/common.mk
include $(TMK_DIR)/rules.mk include $(TMK_DIR)/rules.mk

3
converter/x68k_usb/config_pjrc.h
View File

@ -21,6 +21,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define VENDOR_ID 0xFEED #define VENDOR_ID 0xFEED
#define PRODUCT_ID 0x6800 #define PRODUCT_ID 0x6800
#define DEVICE_VER 0x0001
#define MANUFACTURER t.m.k. #define MANUFACTURER t.m.k.
#define PRODUCT SHARP X68000 keyboard converter #define PRODUCT SHARP X68000 keyboard converter
#define DESCRIPTION converts SHARP X68000 keyboard protocol into USB #define DESCRIPTION converts SHARP X68000 keyboard protocol into USB
@ -45,7 +46,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* USART configuration /* USART configuration
* asynchronous, 2400baud, 8-data bit, non parity, 1-stop bit, no flow control * asynchronous, 2400baud, 8-data bit, non parity, 1-stop bit, no flow control
*/ */
#ifdef __AVR_ATmega32U4__ #if defined(__AVR_ATmega32U4__) || defined(__AVR_ATmega32U2__)
#define SERIAL_UART_BAUD 2400 #define SERIAL_UART_BAUD 2400
#define SERIAL_UART_DATA UDR1 #define SERIAL_UART_DATA UDR1
#define SERIAL_UART_UBRR ((F_CPU/(16UL*SERIAL_UART_BAUD))-1) #define SERIAL_UART_UBRR ((F_CPU/(16UL*SERIAL_UART_BAUD))-1)