diff options
| -rw-r--r-- | Makefile.common (renamed from Makefile.hhkb) | 39 | ||||
| -rw-r--r-- | Makefile.macway | 620 | ||||
| -rw-r--r-- | README | 30 | ||||
| -rw-r--r-- | hhkb/Makefile | 72 | ||||
| -rw-r--r-- | hhkb/doc/HHKB.txt (renamed from HHKB/HHKB.txt) | 0 | ||||
| -rwxr-xr-x | hhkb/doc/HHKB_TP1684.jpg (renamed from HHKB/HHKB_TP1684.jpg) | bin | 149074 -> 149082 bytes | |||
| -rwxr-xr-x | hhkb/doc/HHKB_chart1.jpg (renamed from HHKB/HHKB_chart1.jpg) | bin | 155342 -> 155342 bytes | |||
| -rwxr-xr-x | hhkb/doc/HHKB_chart2.jpg (renamed from HHKB/HHKB_chart2.jpg) | bin | 148225 -> 148225 bytes | |||
| -rwxr-xr-x | hhkb/doc/HHKB_connector.jpg (renamed from HHKB/HHKB_connector.jpg) | bin | 193900 -> 193900 bytes | |||
| -rwxr-xr-x | hhkb/doc/HHKB_controller.jpg (renamed from HHKB/HHKB_controller.jpg) | bin | 135100 -> 135100 bytes | |||
| -rwxr-xr-x | hhkb/doc/HHKB_keyswitch.jpg (renamed from HHKB/HHKB_keyswitch.jpg) | bin | 171469 -> 171469 bytes | |||
| -rwxr-xr-x | hhkb/doc/connector_contact.jpg (renamed from HHKB/connector_contact.jpg) | bin | 192830 -> 192830 bytes | |||
| -rwxr-xr-x | hhkb/doc/logic_analyzer.jpg (renamed from HHKB/logic_analyzer.jpg) | bin | 169564 -> 169564 bytes | |||
| -rwxr-xr-x | hhkb/doc/probe_contact.jpg (renamed from HHKB/probe_contact.jpg) | bin | 208477 -> 208477 bytes | |||
| -rwxr-xr-x | hhkb/doc/teensy_install.jpg (renamed from HHKB/teensy_install.jpg) | bin | 135851 -> 135851 bytes | |||
| -rwxr-xr-x | hhkb/doc/teensy_wiring.jpg (renamed from HHKB/teensy_wiring.jpg) | bin | 154695 -> 154695 bytes | |||
| -rw-r--r-- | hhkb/keymap.c (renamed from keymap_hhkb.c) | 4 | ||||
| -rw-r--r-- | hhkb/keymap.h (renamed from keymap_hhkb.h) | 1 | ||||
| -rw-r--r-- | hhkb/matrix.c (renamed from matrix_hhkb.c) | 3 | ||||
| -rw-r--r-- | key_process.c | 174 | ||||
| -rw-r--r-- | key_process.h | 6 | ||||
| -rw-r--r-- | macway/Makefile | 67 | ||||
| -rw-r--r-- | macway/keymap.c (renamed from keymap.c) | 5 | ||||
| -rw-r--r-- | macway/keymap.h (renamed from keymap.h) | 11 | ||||
| -rw-r--r-- | macway/matrix.c (renamed from matrix.c) | 0 | ||||
| -rw-r--r-- | tmk.c | 145 |
26 files changed, 383 insertions, 794 deletions
diff --git a/Makefile.hhkb b/Makefile.common index fbf7ede2ee..8037b07721 100644 --- a/Makefile.hhkb +++ b/Makefile.common @@ -39,37 +39,28 @@ # To rebuild project do "make clean" then "make all". #---------------------------------------------------------------------------- - -# Target file name (without extension). -TARGET = tmk_hhkb +# Following variables need to be set in <target>/Makefile: +# TARGET +# COMMON_DIR +# TARGET_DIR +# TARGET_SRC +# MCU +# F_CPU # List C source files here. (C dependencies are automatically generated.) SRC = tmk.c \ + key_process.c \ usb.c \ usb_keyboard.c \ usb_mouse.c \ usb_debug.c \ - keymap_hhkb.c \ - matrix_hhkb.c \ jump_bootloader.c \ print.c +SRC += $(TARGET_SRC) - -# 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 -#MCU = at90usb162 # Teensy 1.0 -#MCU = atmega32u4 # Teensy 2.0 -#MCU = at90usb646 # Teensy++ 1.0 -MCU = at90usb1286 # Teensy++ 2.0 - - -# Processor frequency. -# Normally the first thing your program should do is set the clock prescaler, -# 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 = 16000000 +# C source file search path +VPATH = $(TARGET_DIR):$(COMMON_DIR) # Output format. (can be srec, ihex, binary) @@ -113,7 +104,7 @@ DEBUG = dwarf-2 # Each directory must be seperated by a space. # Use forward slashes for directory separators. # For a directory that has spaces, enclose it in quotes. -EXTRAINCDIRS = +EXTRAINCDIRS = $(TARGET_DIR) $(COMMON_DIR) # Compiler flag to set the C Standard level. @@ -161,7 +152,7 @@ CFLAGS += -Wstrict-prototypes #CFLAGS += -Wundef #CFLAGS += -Wunreachable-code #CFLAGS += -Wsign-compare -CFLAGS += -Wa,-adhlns=$(<:%.c=$(OBJDIR)/%.lst) +CFLAGS += -Wa,-adhlns=$(@:%.o=$(OBJDIR)/%.lst) CFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS)) CFLAGS += $(CSTANDARD) @@ -376,10 +367,10 @@ MSG_CREATING_LIBRARY = Creating library: # Define all object files. -OBJ = $(SRC:%.c=$(OBJDIR)/%.o) $(CPPSRC:%.cpp=$(OBJDIR)/%.o) $(ASRC:%.S=$(OBJDIR)/%.o) +OBJ = $(SRC:%.c=$(OBJDIR)/%.o) $(CPPSRC:%.cpp=$(OBJDIR)/%.o) $(ASRC:%.S=$(OBJDIR)/%.o) # Define all listing files. -LST = $(SRC:%.c=$(OBJDIR)/%.lst) $(CPPSRC:%.cpp=$(OBJDIR)/%.lst) $(ASRC:%.S=$(OBJDIR)/%.lst) +LST = $(SRC:%.c=$(OBJDIR)/%.lst) $(CPPSRC:%.cpp=$(OBJDIR)/%.lst) $(ASRC:%.S=$(OBJDIR)/%.lst) # Compiler flags to generate dependency files. diff --git a/Makefile.macway b/Makefile.macway deleted file mode 100644 index d259fd2dbf..0000000000 --- a/Makefile.macway +++ /dev/null @@ -1,620 +0,0 @@ -# Hey Emacs, this is a -*- makefile -*- -#---------------------------------------------------------------------------- -# WinAVR Makefile Template written by Eric B. Weddington, Jörg Wunsch, et al. -# -# Released to the Public Domain -# -# Additional material for this makefile was written by: -# Peter Fleury -# Tim Henigan -# Colin O'Flynn -# Reiner Patommel -# Markus Pfaff -# Sander Pool -# Frederik Rouleau -# Carlos Lamas -# -#---------------------------------------------------------------------------- -# On command line: -# -# make all = Make software. -# -# make clean = Clean out built project files. -# -# make coff = Convert ELF to AVR COFF. -# -# make extcoff = Convert ELF to AVR Extended COFF. -# -# make program = Download the hex file to the device, using avrdude. -# Please customize the avrdude settings below first! -# -# make debug = Start either simulavr or avarice as specified for debugging, -# with avr-gdb or avr-insight as the front end for debugging. -# -# make filename.s = Just compile filename.c into the assembler code only. -# -# make filename.i = Create a preprocessed source file for use in submitting -# bug reports to the GCC project. -# -# To rebuild project do "make clean" then "make all". -#---------------------------------------------------------------------------- - - -# Target file name (without extension). -TARGET = tmk - - -# List C source files here. (C dependencies are automatically generated.) -SRC = $(TARGET).c \ - usb.c \ - usb_keyboard.c \ - usb_mouse.c \ - usb_debug.c \ - keymap.c \ - matrix.c \ - jump_bootloader.c \ - print.c - - -# 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 -#MCU = at90usb162 # Teensy 1.0 -MCU = atmega32u4 # Teensy 2.0 -#MCU = at90usb646 # Teensy++ 1.0 -#MCU = at90usb1286 # Teensy++ 2.0 - - -# Processor frequency. -# Normally the first thing your program should do is set the clock prescaler, -# 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 = 16000000 - - -# Output format. (can be srec, ihex, binary) -FORMAT = ihex - - -# Object files directory -# To put object files in current directory, use a dot (.), do NOT make -# this an empty or blank macro! -OBJDIR = . - - -# List C++ source files here. (C dependencies are automatically generated.) -CPPSRC = - - -# List Assembler source files here. -# Make them always end in a capital .S. Files ending in a lowercase .s -# will not be considered source files but generated files (assembler -# output from the compiler), and will be deleted upon "make clean"! -# Even though the DOS/Win* filesystem matches both .s and .S the same, -# it will preserve the spelling of the filenames, and gcc itself does -# care about how the name is spelled on its command-line. -ASRC = - - -# Optimization level, can be [0, 1, 2, 3, s]. -# 0 = turn off optimization. s = optimize for size. -# (Note: 3 is not always the best optimization level. See avr-libc FAQ.) -OPT = s - - -# Debugging format. -# Native formats for AVR-GCC's -g are dwarf-2 [default] or stabs. -# AVR Studio 4.10 requires dwarf-2. -# AVR [Extended] COFF format requires stabs, plus an avr-objcopy run. -DEBUG = dwarf-2 - - -# List any extra directories to look for include files here. -# Each directory must be seperated by a space. -# Use forward slashes for directory separators. -# For a directory that has spaces, enclose it in quotes. -EXTRAINCDIRS = - - -# Compiler flag to set the C Standard level. -# c89 = "ANSI" C -# gnu89 = c89 plus GCC extensions -# c99 = ISO C99 standard (not yet fully implemented) -# gnu99 = c99 plus GCC extensions -CSTANDARD = -std=gnu99 - - -# Place -D or -U options here for C sources -CDEFS = -DF_CPU=$(F_CPU)UL - - -# Place -D or -U options here for ASM sources -ADEFS = -DF_CPU=$(F_CPU) - - -# Place -D or -U options here for C++ sources -CPPDEFS = -DF_CPU=$(F_CPU)UL -#CPPDEFS += -D__STDC_LIMIT_MACROS -#CPPDEFS += -D__STDC_CONSTANT_MACROS - - - -#---------------- Compiler Options C ---------------- -# -g*: generate debugging information -# -O*: optimization level -# -f...: tuning, see GCC manual and avr-libc documentation -# -Wall...: warning level -# -Wa,...: tell GCC to pass this to the assembler. -# -adhlns...: create assembler listing -CFLAGS = -g$(DEBUG) -CFLAGS += $(CDEFS) -CFLAGS += -O$(OPT) -CFLAGS += -funsigned-char -CFLAGS += -funsigned-bitfields -CFLAGS += -ffunction-sections -CFLAGS += -fpack-struct -CFLAGS += -fshort-enums -CFLAGS += -Wall -CFLAGS += -Wstrict-prototypes -#CFLAGS += -mshort-calls -#CFLAGS += -fno-unit-at-a-time -#CFLAGS += -Wundef -#CFLAGS += -Wunreachable-code -#CFLAGS += -Wsign-compare -CFLAGS += -Wa,-adhlns=$(<:%.c=$(OBJDIR)/%.lst) -CFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS)) -CFLAGS += $(CSTANDARD) - - -#---------------- Compiler Options C++ ---------------- -# -g*: generate debugging information -# -O*: optimization level -# -f...: tuning, see GCC manual and avr-libc documentation -# -Wall...: warning level -# -Wa,...: tell GCC to pass this to the assembler. -# -adhlns...: create assembler listing -CPPFLAGS = -g$(DEBUG) -CPPFLAGS += $(CPPDEFS) -CPPFLAGS += -O$(OPT) -CPPFLAGS += -funsigned-char -CPPFLAGS += -funsigned-bitfields -CPPFLAGS += -fpack-struct -CPPFLAGS += -fshort-enums -CPPFLAGS += -fno-exceptions -CPPFLAGS += -Wall -CPPFLAGS += -Wundef -#CPPFLAGS += -mshort-calls -#CPPFLAGS += -fno-unit-at-a-time -#CPPFLAGS += -Wstrict-prototypes -#CPPFLAGS += -Wunreachable-code -#CPPFLAGS += -Wsign-compare -CPPFLAGS += -Wa,-adhlns=$(<:%.cpp=$(OBJDIR)/%.lst) -CPPFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS)) -#CPPFLAGS += $(CSTANDARD) - - -#---------------- Assembler Options ---------------- -# -Wa,...: tell GCC to pass this to the assembler. -# -adhlns: create listing -# -gstabs: have the assembler create line number information; note that -# for use in COFF files, additional information about filenames -# and function names needs to be present in the assembler source -# files -- see avr-libc docs [FIXME: not yet described there] -# -listing-cont-lines: Sets the maximum number of continuation lines of hex -# dump that will be displayed for a given single line of source input. -ASFLAGS = $(ADEFS) -Wa,-adhlns=$(<:%.S=$(OBJDIR)/%.lst),-gstabs,--listing-cont-lines=100 - - -#---------------- Library Options ---------------- -# Minimalistic printf version -PRINTF_LIB_MIN = -Wl,-u,vfprintf -lprintf_min - -# Floating point printf version (requires MATH_LIB = -lm below) -PRINTF_LIB_FLOAT = -Wl,-u,vfprintf -lprintf_flt - -# If this is left blank, then it will use the Standard printf version. -PRINTF_LIB = -#PRINTF_LIB = $(PRINTF_LIB_MIN) -#PRINTF_LIB = $(PRINTF_LIB_FLOAT) - - -# Minimalistic scanf version -SCANF_LIB_MIN = -Wl,-u,vfscanf -lscanf_min - -# Floating point + %[ scanf version (requires MATH_LIB = -lm below) -SCANF_LIB_FLOAT = -Wl,-u,vfscanf -lscanf_flt - -# If this is left blank, then it will use the Standard scanf version. -SCANF_LIB = -#SCANF_LIB = $(SCANF_LIB_MIN) -#SCANF_LIB = $(SCANF_LIB_FLOAT) - - -MATH_LIB = -lm - - -# List any extra directories to look for libraries here. -# Each directory must be seperated by a space. -# Use forward slashes for directory separators. -# For a directory that has spaces, enclose it in quotes. -EXTRALIBDIRS = - - - -#---------------- External Memory Options ---------------- - -# 64 KB of external RAM, starting after internal RAM (ATmega128!), -# used for variables (.data/.bss) and heap (malloc()). -#EXTMEMOPTS = -Wl,-Tdata=0x801100,--defsym=__heap_end=0x80ffff - -# 64 KB of external RAM, starting after internal RAM (ATmega128!), -# only used for heap (malloc()). -#EXTMEMOPTS = -Wl,--section-start,.data=0x801100,--defsym=__heap_end=0x80ffff - -EXTMEMOPTS = - - - -#---------------- Linker Options ---------------- -# -Wl,...: tell GCC to pass this to linker. -# -Map: create map file -# --cref: add cross reference to map file -LDFLAGS = -Wl,-Map=$(TARGET).map,--cref -LDFLAGS += -Wl,--relax -LDFLAGS += -Wl,--gc-sections -LDFLAGS += $(EXTMEMOPTS) -LDFLAGS += $(patsubst %,-L%,$(EXTRALIBDIRS)) -LDFLAGS += $(PRINTF_LIB) $(SCANF_LIB) $(MATH_LIB) -#LDFLAGS += -T linker_script.x - - - -#---------------- Programming Options (avrdude) ---------------- - -# Programming hardware -# Type: avrdude -c ? -# to get a full listing. -# -AVRDUDE_PROGRAMMER = stk500v2 - -# com1 = serial port. Use lpt1 to connect to parallel port. -AVRDUDE_PORT = com1 # programmer connected to serial device - -AVRDUDE_WRITE_FLASH = -U flash:w:$(TARGET).hex -#AVRDUDE_WRITE_EEPROM = -U eeprom:w:$(TARGET).eep - - -# Uncomment the following if you want avrdude's erase cycle counter. -# Note that this counter needs to be initialized first using -Yn, -# see avrdude manual. -#AVRDUDE_ERASE_COUNTER = -y - -# Uncomment the following if you do /not/ wish a verification to be -# performed after programming the device. -#AVRDUDE_NO_VERIFY = -V - -# Increase verbosity level. Please use this when submitting bug -# reports about avrdude. See <http://savannah.nongnu.org/projects/avrdude> -# to submit bug reports. -#AVRDUDE_VERBOSE = -v -v - -AVRDUDE_FLAGS = -p $(MCU) -P $(AVRDUDE_PORT) -c $(AVRDUDE_PROGRAMMER) -AVRDUDE_FLAGS += $(AVRDUDE_NO_VERIFY) -AVRDUDE_FLAGS += $(AVRDUDE_VERBOSE) -AVRDUDE_FLAGS += $(AVRDUDE_ERASE_COUNTER) - - - -#---------------- Debugging Options ---------------- - -# For simulavr only - target MCU frequency. -DEBUG_MFREQ = $(F_CPU) - -# Set the DEBUG_UI to either gdb or insight. -# DEBUG_UI = gdb -DEBUG_UI = insight - -# Set the debugging back-end to either avarice, simulavr. -DEBUG_BACKEND = avarice -#DEBUG_BACKEND = simulavr - -# GDB Init Filename. -GDBINIT_FILE = __avr_gdbinit - -# When using avarice settings for the JTAG -JTAG_DEV = /dev/com1 - -# Debugging port used to communicate between GDB / avarice / simulavr. -DEBUG_PORT = 4242 - -# Debugging host used to communicate between GDB / avarice / simulavr, normally -# just set to localhost unless doing some sort of crazy debugging when -# avarice is running on a different computer. -DEBUG_HOST = localhost - - - -#============================================================================ - - -# Define programs and commands. -SHELL = sh -CC = avr-gcc -OBJCOPY = avr-objcopy -OBJDUMP = avr-objdump -SIZE = avr-size -AR = avr-ar rcs -NM = avr-nm -AVRDUDE = avrdude -REMOVE = rm -f -REMOVEDIR = rm -rf -COPY = cp -WINSHELL = cmd - - -# Define Messages -# English -MSG_ERRORS_NONE = Errors: none -MSG_BEGIN = -------- begin -------- -MSG_END = -------- end -------- -MSG_SIZE_BEFORE = Size before: -MSG_SIZE_AFTER = Size after: -MSG_COFF = Converting to AVR COFF: -MSG_EXTENDED_COFF = Converting to AVR Extended COFF: -MSG_FLASH = Creating load file for Flash: -MSG_EEPROM = Creating load file for EEPROM: -MSG_EXTENDED_LISTING = Creating Extended Listing: -MSG_SYMBOL_TABLE = Creating Symbol Table: -MSG_LINKING = Linking: -MSG_COMPILING = Compiling C: -MSG_COMPILING_CPP = Compiling C++: -MSG_ASSEMBLING = Assembling: -MSG_CLEANING = Cleaning project: -MSG_CREATING_LIBRARY = Creating library: - - - - -# Define all object files. -OBJ = $(SRC:%.c=$(OBJDIR)/%.o) $(CPPSRC:%.cpp=$(OBJDIR)/%.o) $(ASRC:%.S=$(OBJDIR)/%.o) - -# Define all listing files. -LST = $(SRC:%.c=$(OBJDIR)/%.lst) $(CPPSRC:%.cpp=$(OBJDIR)/%.lst) $(ASRC:%.S=$(OBJDIR)/%.lst) - - -# Compiler flags to generate dependency files. -GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d - - -# Combine all necessary flags and optional flags. -# Add target processor to flags. -ALL_CFLAGS = -mmcu=$(MCU) -I. $(CFLAGS) $(GENDEPFLAGS) -ALL_CPPFLAGS = -mmcu=$(MCU) -I. -x c++ $(CPPFLAGS) $(GENDEPFLAGS) -ALL_ASFLAGS = -mmcu=$(MCU) -I. -x assembler-with-cpp $(ASFLAGS) - - - - - -# Default target. -all: begin gccversion sizebefore build sizeafter end - -# Change the build target to build a HEX file or a library. -build: elf hex eep lss sym -#build: lib - - -elf: $(TARGET).elf -hex: $(TARGET).hex -eep: $(TARGET).eep -lss: $(TARGET).lss -sym: $(TARGET).sym -LIBNAME=lib$(TARGET).a -lib: $(LIBNAME) - - - -# Eye candy. -# AVR Studio 3.x does not check make's exit code but relies on -# the following magic strings to be generated by the compile job. -begin: - @echo - @echo $(MSG_BEGIN) - -end: - @echo $(MSG_END) - @echo - - -# Display size of file. -HEXSIZE = $(SIZE) --target=$(FORMAT) $(TARGET).hex -#ELFSIZE = $(SIZE) --mcu=$(MCU) --format=avr $(TARGET).elf -ELFSIZE = $(SIZE) $(TARGET).elf - -sizebefore: - @if test -f $(TARGET).elf; then echo; echo $(MSG_SIZE_BEFORE); $(ELFSIZE); \ - 2>/dev/null; echo; fi - -sizeafter: - @if test -f $(TARGET).elf; then echo; echo $(MSG_SIZE_AFTER); $(ELFSIZE); \ - 2>/dev/null; echo; fi - - - -# Display compiler version information. -gccversion : - @$(CC) --version - - - -# Program the device. -program: $(TARGET).hex $(TARGET).eep - $(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE_EEPROM) - - -# Generate avr-gdb config/init file which does the following: -# define the reset signal, load the target file, connect to target, and set -# a breakpoint at main(). -gdb-config: - @$(REMOVE) $(GDBINIT_FILE) - @echo define reset >> $(GDBINIT_FILE) - @echo SIGNAL SIGHUP >> $(GDBINIT_FILE) - @echo end >> $(GDBINIT_FILE) - @echo file $(TARGET).elf >> $(GDBINIT_FILE) - @echo target remote $(DEBUG_HOST):$(DEBUG_PORT) >> $(GDBINIT_FILE) -ifeq ($(DEBUG_BACKEND),simulavr) - @echo load >> $(GDBINIT_FILE) -endif - @echo break main >> $(GDBINIT_FILE) - -debug: gdb-config $(TARGET).elf -ifeq ($(DEBUG_BACKEND), avarice) - @echo Starting AVaRICE - Press enter when "waiting to connect" message displays. - @$(WINSHELL) /c start avarice --jtag $(JTAG_DEV) --erase --program --file \ - $(TARGET).elf $(DEBUG_HOST):$(DEBUG_PORT) - @$(WINSHELL) /c pause - -else - @$(WINSHELL) /c start simulavr --gdbserver --device $(MCU) --clock-freq \ - $(DEBUG_MFREQ) --port $(DEBUG_PORT) -endif - @$(WINSHELL) /c start avr-$(DEBUG_UI) --command=$(GDBINIT_FILE) - - - - -# Convert ELF to COFF for use in debugging / simulating in AVR Studio or VMLAB. -COFFCONVERT = $(OBJCOPY) --debugging -COFFCONVERT += --change-section-address .data-0x800000 -COFFCONVERT += --change-section-address .bss-0x800000 -COFFCONVERT += --change-section-address .noinit-0x800000 -COFFCONVERT += --change-section-address .eeprom-0x810000 - - - -coff: $(TARGET).elf - @echo - @echo $(MSG_COFF) $(TARGET).cof - $(COFFCONVERT) -O coff-avr $< $(TARGET).cof - - -extcoff: $(TARGET).elf - @echo - @echo $(MSG_EXTENDED_COFF) $(TARGET).cof - $(COFFCONVERT) -O coff-ext-avr $< $(TARGET).cof - - - -# Create final output files (.hex, .eep) from ELF output file. -%.hex: %.elf - @echo - @echo $(MSG_FLASH) $@ - $(OBJCOPY) -O $(FORMAT) -R .eeprom -R .fuse -R .lock -R .signature $< $@ - -%.eep: %.elf - @echo - @echo $(MSG_EEPROM) $@ - -$(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" \ - --change-section-lma .eeprom=0 --no-change-warnings -O $(FORMAT) $< $@ || exit 0 - -# Create extended listing file from ELF output file. -%.lss: %.elf - @echo - @echo $(MSG_EXTENDED_LISTING) $@ - $(OBJDUMP) -h -S -z $< > $@ - -# Create a symbol table from ELF output file. -%.sym: %.elf - @echo - @echo $(MSG_SYMBOL_TABLE) $@ - $(NM) -n $< > $@ - - - -# Create library from object files. -.SECONDARY : $(TARGET).a -.PRECIOUS : $(OBJ) -%.a: $(OBJ) - @echo - @echo $(MSG_CREATING_LIBRARY) $@ - $(AR) $@ $(OBJ) - - -# Link: create ELF output file from object files. -.SECONDARY : $(TARGET).elf -.PRECIOUS : $(OBJ) -%.elf: $(OBJ) - @echo - @echo $(MSG_LINKING) $@ - $(CC) $(ALL_CFLAGS) $^ --output $@ $(LDFLAGS) - - -# Compile: create object files from C source files. -$(OBJDIR)/%.o : %.c - @echo - @echo $(MSG_COMPILING) $< - $(CC) -c $(ALL_CFLAGS) $< -o $@ - - -# Compile: create object files from C++ source files. -$(OBJDIR)/%.o : %.cpp - @echo - @echo $(MSG_COMPILING_CPP) $< - $(CC) -c $(ALL_CPPFLAGS) $< -o $@ - - -# Compile: create assembler files from C source files. -%.s : %.c - $(CC) -S $(ALL_CFLAGS) $< -o $@ - - -# Compile: create assembler files from C++ source files. -%.s : %.cpp - $(CC) -S $(ALL_CPPFLAGS) $< -o $@ - - -# Assemble: create object files from assembler source files. -$(OBJDIR)/%.o : %.S - @echo - @echo $(MSG_ASSEMBLING) $< - $(CC) -c $(ALL_ASFLAGS) $< -o $@ - - -# Create preprocessed source for use in sending a bug report. -%.i : %.c - $(CC) -E -mmcu=$(MCU) -I. $(CFLAGS) $< -o $@ - - -# Target: clean project. -clean: begin clean_list end - -clean_list : - @echo - @echo $(MSG_CLEANING) - $(REMOVE) $(TARGET).hex - $(REMOVE) $(TARGET).eep - $(REMOVE) $(TARGET).cof - $(REMOVE) $(TARGET).elf - $(REMOVE) $(TARGET).map - $(REMOVE) $(TARGET).sym - $(REMOVE) $(TARGET).lss - $(REMOVE) $(SRC:%.c=$(OBJDIR)/%.o) - $(REMOVE) $(SRC:%.c=$(OBJDIR)/%.lst) - $(REMOVE) $(SRC:.c=.s) - $(REMOVE) $(SRC:.c=.d) - $(REMOVE) $(SRC:.c=.i) - $(REMOVEDIR) .dep - - -# Create object files directory -$(shell mkdir $(OBJDIR) 2>/dev/null) - - -# Include the dependency files. --include $(shell mkdir .dep 2>/dev/null) $(wildcard .dep/*) - - -# Listing of phony targets. -.PHONY : all begin finish end sizebefore sizeafter gccversion \ -build elf hex eep lss sym coff extcoff \ -clean clean_list program debug gdb-config @@ -2,7 +2,7 @@ t.m.k. Keyboard Firmware ======================== http://github.com/tmk/tmk_keyboard -This is keyboard firmware for PFU HHKB style keyboard and teensy 2.0. +This is keyboard firmware for PFU HHKB style keyboard and Teensy/Teensy++ 2.0. OS see this as composite device which has keyboard and mouse. The project is heavily based on PJRC USB Keyboard/Mouse Example and @@ -31,10 +31,23 @@ Version Matrix wiring changed for casing. (and my Teensy PD3 seems to be latchuped and unusable. :<) +1.2 2010/10/13 + HHKB support + horizontal mouse wheel support + change keymaps -Target board ------------- -Teensy 2.0 + +Build +----- +Compiling sources need AVR GCC, AVR Libc and GNU make.(You can use WinAVR on Windows.) + +$ cd <target> (hhkb or macway) +$ make + + +AVR Target board +---------------- +Teensy/Teensy++ http://www.pjrc.com/teensy @@ -72,8 +85,6 @@ debouncing logic bouncing doesnt occur on my ALPS switch so far. scan rate is too slow?(to be measure) -support for HHKB pro matrix signal - exchange controller board with teensy Trackpoint(PS/2) receive PS/2 signal from TrackPoint send USB HID report @@ -90,6 +101,13 @@ setting menu(configure without changing firmware) matrix display PS/2 keyboard mode with USB to PS/2 dumb adapter(possible?) +AT90USBKEY support + and other AVR USB boards + +DONE: +support for HHKB pro matrix signal + exchange controller board with teensy + 2010/10/11 EOF diff --git a/hhkb/Makefile b/hhkb/Makefile new file mode 100644 index 0000000000..980980cfe8 --- /dev/null +++ b/hhkb/Makefile @@ -0,0 +1,72 @@ +# Hey Emacs, this is a -*- makefile -*- +#---------------------------------------------------------------------------- +# WinAVR Makefile Template written by Eric B. Weddington, Jörg Wunsch, et al. +# +# Released to the Public Domain +# +# Additional material for this makefile was written by: +# Peter Fleury +# Tim Henigan +# Colin O'Flynn +# Reiner Patommel +# Markus Pfaff +# Sander Pool +# Frederik Rouleau +# Carlos Lamas +# +#---------------------------------------------------------------------------- +# On command line: +# +# make all = Make software. +# +# make clean = Clean out built project files. +# +# make coff = Convert ELF to AVR COFF. +# +# make extcoff = Convert ELF to AVR Extended COFF. +# +# make program = Download the hex file to the device, using avrdude. +# Please customize the avrdude settings below first! +# +# make debug = Start either simulavr or avarice as specified for debugging, +# with avr-gdb or avr-insight as the front end for debugging. +# +# make filename.s = Just compile filename.c into the assembler code only. +# +# make filename.i = Create a preprocessed source file for use in submitting +# bug reports to the GCC project. +# +# To rebuild project do "make clean" then "make all". +#---------------------------------------------------------------------------- + + +# Target file name (without extension). +TARGET = tmk_hhkb + +# Directory common source filess exist +COMMON_DIR = .. + +# Directory keyboard dependent files exist +TARGET_DIR = . + +# keyboard dependent files +TARGET_SRC = keymap.c \ + matrix.c + + +# 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 +#MCU = at90usb162 # Teensy 1.0 +#MCU = atmega32u4 # Teensy 2.0 +#MCU = at90usb646 # Teensy++ 1.0 +MCU = at90usb1286 # Teensy++ 2.0 + + +# Processor frequency. +# Normally the first thing your program should do is set the clock prescaler, +# 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 = 16000000 + +include $(COMMON_DIR)/Makefile.common diff --git a/HHKB/HHKB.txt b/hhkb/doc/HHKB.txt index 9440efebf4..9440efebf4 100644 --- a/HHKB/HHKB.txt +++ b/hhkb/doc/HHKB.txt diff --git a/HHKB/HHKB_TP1684.jpg b/hhkb/doc/HHKB_TP1684.jpg Binary files differindex 7ff3573e23..0a03164094 100755 --- a/HHKB/HHKB_TP1684.jpg +++ b/hhkb/doc/HHKB_TP1684.jpg diff --git a/HHKB/HHKB_chart1.jpg b/hhkb/doc/HHKB_chart1.jpg Binary files differindex 1f09bd185c..1f09bd185c 100755 --- a/HHKB/HHKB_chart1.jpg +++ b/hhkb/doc/HHKB_chart1.jpg diff --git a/HHKB/HHKB_chart2.jpg b/hhkb/doc/HHKB_chart2.jpg Binary files differindex 45f5ada905..45f5ada905 100755 --- a/HHKB/HHKB_chart2.jpg +++ b/hhkb/doc/HHKB_chart2.jpg diff --git a/HHKB/HHKB_connector.jpg b/hhkb/doc/HHKB_connector.jpg Binary files differindex e8a09e9b28..e8a09e9b28 100755 --- a/HHKB/HHKB_connector.jpg +++ b/hhkb/doc/HHKB_connector.jpg diff --git a/HHKB/HHKB_controller.jpg b/hhkb/doc/HHKB_controller.jpg Binary files differindex e3dae8e86c..e3dae8e86c 100755 --- a/HHKB/HHKB_controller.jpg +++ b/hhkb/doc/HHKB_controller.jpg diff --git a/HHKB/HHKB_keyswitch.jpg b/hhkb/doc/HHKB_keyswitch.jpg Binary files differindex 3afc269e7b..3afc269e7b 100755 --- a/HHKB/HHKB_keyswitch.jpg +++ b/hhkb/doc/HHKB_keyswitch.jpg diff --git a/HHKB/connector_contact.jpg b/hhkb/doc/connector_contact.jpg Binary files differindex 5304bc8d7e..5304bc8d7e 100755 --- a/HHKB/connector_contact.jpg +++ b/hhkb/doc/connector_contact.jpg diff --git a/HHKB/logic_analyzer.jpg b/hhkb/doc/logic_analyzer.jpg Binary files differindex f1b438ae77..f1b438ae77 100755 --- a/HHKB/logic_analyzer.jpg +++ b/hhkb/doc/logic_analyzer.jpg diff --git a/HHKB/probe_contact.jpg b/hhkb/doc/probe_contact.jpg Binary files differindex dc79afa0cc..dc79afa0cc 100755 --- a/HHKB/probe_contact.jpg +++ b/hhkb/doc/probe_contact.jpg diff --git a/HHKB/teensy_install.jpg b/hhkb/doc/teensy_install.jpg Binary files differindex 873d988edb..873d988edb 100755 --- a/HHKB/teensy_install.jpg +++ b/hhkb/doc/teensy_install.jpg diff --git a/HHKB/teensy_wiring.jpg b/hhkb/doc/teensy_wiring.jpg Binary files differindex 1c4eb67434..1c4eb67434 100755 --- a/HHKB/teensy_wiring.jpg +++ b/hhkb/doc/teensy_wiring.jpg diff --git a/keymap_hhkb.c b/hhkb/keymap.c index 7074df4110..d7e6bbe3be 100644 --- a/keymap_hhkb.c +++ b/hhkb/keymap.c @@ -1,10 +1,10 @@ /* - * keymap for modified macway keyboarq + * keymap for HHKB pro */ #include <stdbool.h> #include <avr/pgmspace.h> #include "matrix.h" -#include "keymap_hhkb.h" +#include "keymap.h" #include "usb_keyboard.h" int current_layer = 0; diff --git a/keymap_hhkb.h b/hhkb/keymap.h index 1c2d100e61..be78609e61 100644 --- a/keymap_hhkb.h +++ b/hhkb/keymap.h @@ -2,6 +2,7 @@ #define KEYMAP_H 1 #include <stdint.h> +#include <stdbool.h> #include "usb_keycodes.h" diff --git a/matrix_hhkb.c b/hhkb/matrix.c index d1c0003b4a..3034a63612 100644 --- a/matrix_hhkb.c +++ b/hhkb/matrix.c @@ -50,7 +50,6 @@ void matrix_init(void) uint8_t matrix_scan(void) { - uint8_t state; uint8_t *tmp; tmp = matrix_prev; @@ -59,12 +58,10 @@ uint8_t matrix_scan(void) for (int row = 0; row < MATRIX_ROWS; row++) { for (int col = 0; col < MATRIX_COLS; col++) { -//print("scan: "); phex(row); phex(col); print("\n"); KEY_SELELCT(row, col); _delay_us(50); // from logic analyzer chart KEY_ENABLE; _delay_us(10 |
