diff --git a/converter/x68k_usb/Makefile b/converter/x68k_usb/Makefile index 62b976c5..fd66ed56 100644 --- a/converter/x68k_usb/Makefile +++ b/converter/x68k_usb/Makefile @@ -16,7 +16,8 @@ TARGET_DIR = . SRC = keymap.c \ matrix.c \ led.c \ - x68k.c + protocol/x68k.c +# protocol/serial_uart.c CONFIG_H = config_pjrc.h @@ -37,12 +38,23 @@ MCU = atmega32u4 # Teensy 2.0 F_CPU = 16000000 +# Boot Section Size in bytes +# Teensy halfKay 512 +# Atmel DFU loader 4096 +# LUFA bootloader 4096 +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(+4700) +EXTRAKEY_ENABLE = yes # Audio control and System control(+450) +CONSOLE_ENABLE = yes # Console for debug(+400) +COMMAND_ENABLE = yes # Commands for debug and configuration +#SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend +#NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA diff --git a/converter/x68k_usb/config_pjrc.h b/converter/x68k_usb/config_pjrc.h index 2df83a2c..dd277cff 100644 --- a/converter/x68k_usb/config_pjrc.h +++ b/converter/x68k_usb/config_pjrc.h @@ -40,11 +40,6 @@ along with this program. If not, see . /* legacy keymap support */ #define USE_LEGACY_KEYMAP -/* mouse keys */ -#ifdef MOUSEKEY_ENABLE -# define MOUSEKEY_DELAY_TIME 255 -#endif - /* USART configuration * asynchronous, 2400baud, 8-data bit, non parity, 1-stop bit, no flow control @@ -57,7 +52,23 @@ along with this program. If not, see . # define KBD_RX_INIT() do { \ UBRR1L = (uint8_t) KBD_RX_UBBR; \ UBRR1H = (uint8_t) (KBD_RX_UBBR>>8); \ - UCSR1B |= (1<>8); /* baud rate */ \ + UCSR1B = (1<. */ #include "stdint.h" -#include "x68k.h" +#include "serial.h" #include "led.h" +#include "debug.h" +#include "x68k.h" void led_set(uint8_t usb_led) { - // not supported now + /* X68000 LED bits 0: on, 1: off + * bit 7 1(fixed) + * bit 6 全角 + * bit 5 ひらがな + * bit 4 INS + * bit 3 CAPS + * bit 2 コード入力 + * bit 1 ローマ字 + * bit 0 かな + */ + uint8_t led = 0xFF; + xprintf("usb_led: %02X\n", usb_led); + if (usb_led&(1<