add directories for each keyboard: hhkb, macway
tmk
parent
82637ded27
commit
54b5bafaac
|
|
@ -39,37 +39,28 @@
|
||||||
# To rebuild project do "make clean" then "make all".
|
# To rebuild project do "make clean" then "make all".
|
||||||
#----------------------------------------------------------------------------
|
#----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
# Following variables need to be set in <target>/Makefile:
|
||||||
# Target file name (without extension).
|
# TARGET
|
||||||
TARGET = tmk_hhkb
|
# COMMON_DIR
|
||||||
|
# TARGET_DIR
|
||||||
|
# TARGET_SRC
|
||||||
|
# MCU
|
||||||
|
# F_CPU
|
||||||
|
|
||||||
|
|
||||||
# List C source files here. (C dependencies are automatically generated.)
|
# List C source files here. (C dependencies are automatically generated.)
|
||||||
SRC = tmk.c \
|
SRC = tmk.c \
|
||||||
|
key_process.c \
|
||||||
usb.c \
|
usb.c \
|
||||||
usb_keyboard.c \
|
usb_keyboard.c \
|
||||||
usb_mouse.c \
|
usb_mouse.c \
|
||||||
usb_debug.c \
|
usb_debug.c \
|
||||||
keymap_hhkb.c \
|
|
||||||
matrix_hhkb.c \
|
|
||||||
jump_bootloader.c \
|
jump_bootloader.c \
|
||||||
print.c
|
print.c
|
||||||
|
SRC += $(TARGET_SRC)
|
||||||
|
|
||||||
|
# C source file search path
|
||||||
# MCU name, you MUST set this to match the board you are using
|
VPATH = $(TARGET_DIR):$(COMMON_DIR)
|
||||||
# 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)
|
# Output format. (can be srec, ihex, binary)
|
||||||
|
|
@ -113,7 +104,7 @@ DEBUG = dwarf-2
|
||||||
# Each directory must be seperated by a space.
|
# Each directory must be seperated by a space.
|
||||||
# Use forward slashes for directory separators.
|
# Use forward slashes for directory separators.
|
||||||
# For a directory that has spaces, enclose it in quotes.
|
# For a directory that has spaces, enclose it in quotes.
|
||||||
EXTRAINCDIRS =
|
EXTRAINCDIRS = $(TARGET_DIR) $(COMMON_DIR)
|
||||||
|
|
||||||
|
|
||||||
# Compiler flag to set the C Standard level.
|
# Compiler flag to set the C Standard level.
|
||||||
|
|
@ -161,7 +152,7 @@ CFLAGS += -Wstrict-prototypes
|
||||||
#CFLAGS += -Wundef
|
#CFLAGS += -Wundef
|
||||||
#CFLAGS += -Wunreachable-code
|
#CFLAGS += -Wunreachable-code
|
||||||
#CFLAGS += -Wsign-compare
|
#CFLAGS += -Wsign-compare
|
||||||
CFLAGS += -Wa,-adhlns=$(<:%.c=$(OBJDIR)/%.lst)
|
CFLAGS += -Wa,-adhlns=$(@:%.o=$(OBJDIR)/%.lst)
|
||||||
CFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
|
CFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
|
||||||
CFLAGS += $(CSTANDARD)
|
CFLAGS += $(CSTANDARD)
|
||||||
|
|
||||||
|
|
@ -376,10 +367,10 @@ MSG_CREATING_LIBRARY = Creating library:
|
||||||
|
|
||||||
|
|
||||||
# Define all object files.
|
# 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.
|
# 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.
|
# Compiler flags to generate dependency files.
|
||||||
620
Makefile.macway
620
Makefile.macway
|
|
@ -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
|
|
||||||
30
README
30
README
|
|
@ -2,7 +2,7 @@ t.m.k. Keyboard Firmware
|
||||||
========================
|
========================
|
||||||
http://github.com/tmk/tmk_keyboard
|
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.
|
OS see this as composite device which has keyboard and mouse.
|
||||||
|
|
||||||
The project is heavily based on PJRC USB Keyboard/Mouse Example and
|
The project is heavily based on PJRC USB Keyboard/Mouse Example and
|
||||||
|
|
@ -31,10 +31,23 @@ Version
|
||||||
Matrix wiring changed for casing.
|
Matrix wiring changed for casing.
|
||||||
(and my Teensy PD3 seems to be latchuped and unusable. :<)
|
(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
|
|
||||||
------------
|
Build
|
||||||
Teensy 2.0
|
-----
|
||||||
|
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
|
http://www.pjrc.com/teensy
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -72,8 +85,6 @@ debouncing logic
|
||||||
bouncing doesnt occur on my ALPS switch so far.
|
bouncing doesnt occur on my ALPS switch so far.
|
||||||
scan rate is too slow?(to be measure)
|
scan rate is too slow?(to be measure)
|
||||||
|
|
||||||
support for HHKB pro matrix signal
|
|
||||||
exchange controller board with teensy
|
|
||||||
Trackpoint(PS/2)
|
Trackpoint(PS/2)
|
||||||
receive PS/2 signal from TrackPoint
|
receive PS/2 signal from TrackPoint
|
||||||
send USB HID report
|
send USB HID report
|
||||||
|
|
@ -90,6 +101,13 @@ setting menu(configure without changing firmware)
|
||||||
matrix display
|
matrix display
|
||||||
PS/2 keyboard mode
|
PS/2 keyboard mode
|
||||||
with USB to PS/2 dumb adapter(possible?)
|
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
|
EOF
|
||||||
|
|
|
||||||
|
|
@ -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
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 146 KiB After Width: | Height: | Size: 146 KiB |
|
Before Width: | Height: | Size: 152 KiB After Width: | Height: | Size: 152 KiB |
|
Before Width: | Height: | Size: 145 KiB After Width: | Height: | Size: 145 KiB |
|
Before Width: | Height: | Size: 189 KiB After Width: | Height: | Size: 189 KiB |
|
Before Width: | Height: | Size: 132 KiB After Width: | Height: | Size: 132 KiB |
|
Before Width: | Height: | Size: 168 KiB After Width: | Height: | Size: 168 KiB |
|
Before Width: | Height: | Size: 188 KiB After Width: | Height: | Size: 188 KiB |
|
Before Width: | Height: | Size: 166 KiB After Width: | Height: | Size: 166 KiB |
|
Before Width: | Height: | Size: 204 KiB After Width: | Height: | Size: 204 KiB |
|
Before Width: | Height: | Size: 133 KiB After Width: | Height: | Size: 133 KiB |
|
Before Width: | Height: | Size: 151 KiB After Width: | Height: | Size: 151 KiB |
|
|
@ -1,10 +1,10 @@
|
||||||
/*
|
/*
|
||||||
* keymap for modified macway keyboarq
|
* keymap for HHKB pro
|
||||||
*/
|
*/
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
#include <avr/pgmspace.h>
|
#include <avr/pgmspace.h>
|
||||||
#include "matrix.h"
|
#include "matrix.h"
|
||||||
#include "keymap_hhkb.h"
|
#include "keymap.h"
|
||||||
#include "usb_keyboard.h"
|
#include "usb_keyboard.h"
|
||||||
|
|
||||||
int current_layer = 0;
|
int current_layer = 0;
|
||||||
|
|
@ -2,6 +2,7 @@
|
||||||
#define KEYMAP_H 1
|
#define KEYMAP_H 1
|
||||||
|
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
#include <stdbool.h>
|
||||||
#include "usb_keycodes.h"
|
#include "usb_keycodes.h"
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -50,7 +50,6 @@ void matrix_init(void)
|
||||||
|
|
||||||
uint8_t matrix_scan(void)
|
uint8_t matrix_scan(void)
|
||||||
{
|
{
|
||||||
uint8_t state;
|
|
||||||
uint8_t *tmp;
|
uint8_t *tmp;
|
||||||
|
|
||||||
tmp = matrix_prev;
|
tmp = matrix_prev;
|
||||||
|
|
@ -59,12 +58,10 @@ uint8_t matrix_scan(void)
|
||||||
|
|
||||||
for (int row = 0; row < MATRIX_ROWS; row++) {
|
for (int row = 0; row < MATRIX_ROWS; row++) {
|
||||||
for (int col = 0; col < MATRIX_COLS; col++) {
|
for (int col = 0; col < MATRIX_COLS; col++) {
|
||||||
//print("scan: "); phex(row); phex(col); print("\n");
|
|
||||||
KEY_SELELCT(row, col);
|
KEY_SELELCT(row, col);
|
||||||
_delay_us(50); // from logic analyzer chart
|
_delay_us(50); // from logic analyzer chart
|
||||||
KEY_ENABLE;
|
KEY_ENABLE;
|
||||||
_delay_us(10); // from logic analyzer chart
|
_delay_us(10); // from logic analyzer chart
|
||||||
//print("PINE: "); phex(PINE); print("\n");
|
|
||||||
if (KEY_ON) {
|
if (KEY_ON) {
|
||||||
matrix[row] &= ~(1<<col);
|
matrix[row] &= ~(1<<col);
|
||||||
} else {
|
} else {
|
||||||
|
|
@ -0,0 +1,174 @@
|
||||||
|
// TODO: clean unused headers
|
||||||
|
#include <stdbool.h>
|
||||||
|
#include <avr/io.h>
|
||||||
|
#include <avr/pgmspace.h>
|
||||||
|
#include <avr/interrupt.h>
|
||||||
|
#include <util/delay.h>
|
||||||
|
#include "usb.h"
|
||||||
|
#include "usb_keyboard.h"
|
||||||
|
#include "usb_mouse.h"
|
||||||
|
#include "print.h"
|
||||||
|
#include "matrix.h"
|
||||||
|
#include "keymap.h"
|
||||||
|
#include "jump_bootloader.h"
|
||||||
|
|
||||||
|
#include "key_process.h"
|
||||||
|
|
||||||
|
|
||||||
|
// for Teensy/Teensy++ 2.0
|
||||||
|
#define LED_CONFIG (DDRD |= (1<<6))
|
||||||
|
#define LED_ON (PORTD |= (1<<6))
|
||||||
|
#define LED_OFF (PORTD &= ~(1<<6))
|
||||||
|
|
||||||
|
#define MOUSE_MOVE_UNIT 10
|
||||||
|
#define MOUSE_DELAY_MS 200
|
||||||
|
#define MOUSE_DELAY_ACC 5
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
static void print_matrix(void);
|
||||||
|
static void print_keys(void);
|
||||||
|
static void print_mouse(int8_t mouse_x, int8_t mouse_y, int8_t wheel_v, int8_t wheel_h);
|
||||||
|
|
||||||
|
void proc_matrix(void) {
|
||||||
|
static int mouse_repeat = 0;
|
||||||
|
|
||||||
|
bool modified = false;
|
||||||
|
bool has_ghost = false;
|
||||||
|
int layer = 0;
|
||||||
|
int key_index = 0;
|
||||||
|
uint8_t mouse_btn = 0;
|
||||||
|
int8_t mouse_x = 0;
|
||||||
|
int8_t mouse_y = 0;
|
||||||
|
int8_t mouse_wheel = 0;
|
||||||
|
int8_t mouse_hwheel = 0;
|
||||||
|
|
||||||
|
matrix_scan();
|
||||||
|
modified = matrix_is_modified();
|
||||||
|
has_ghost = matrix_has_ghost();
|
||||||
|
layer = get_layer();
|
||||||
|
|
||||||
|
// print matrix state for debug
|
||||||
|
if (modified) {
|
||||||
|
print_matrix();
|
||||||
|
|
||||||
|
// LED flash for debug
|
||||||
|
LED_CONFIG;
|
||||||
|
LED_ON;
|
||||||
|
}
|
||||||
|
|
||||||
|
keyboard_modifier_keys = 0;
|
||||||
|
for (int i = 0; i < 3; i++) keyboard_keys[i] = KB_NO;
|
||||||
|
key_index = 0;
|
||||||
|
mouse_btn = 0;
|
||||||
|
mouse_x = 0;
|
||||||
|
mouse_y = 0;
|
||||||
|
mouse_wheel = 0;
|
||||||
|
mouse_hwheel = 0;
|
||||||
|
|
||||||
|
// convert matrix state to HID report
|
||||||
|
for (int row = 0; row < MATRIX_ROWS; row++) {
|
||||||
|
for (int col = 0; col < MATRIX_COLS; col++) {
|
||||||
|
if (matrix[row] & 1<<col) continue;
|
||||||
|
|
||||||
|
uint8_t code = get_keycode(layer, row, col);
|
||||||
|
if (code == KB_NO) {
|
||||||
|
continue;
|
||||||
|
} else if (KB_LCTRL <= code && code <= KB_RGUI) {
|
||||||
|
// modifier keys(0xE0-0xE7)
|
||||||
|
keyboard_modifier_keys |= 1<<(code & 0x07);
|
||||||
|
} else if (code >= MS_UP) {
|
||||||
|
// mouse
|
||||||
|
if (code == MS_UP) mouse_y -= MOUSE_MOVE_UNIT + (mouse_repeat < 50 ? mouse_repeat/5 : 10);
|
||||||
|
if (code == MS_DOWN) mouse_y += MOUSE_MOVE_UNIT + (mouse_repeat < 50 ? mouse_repeat/5 : 10);
|
||||||
|
if (code == MS_LEFT) mouse_x -= MOUSE_MOVE_UNIT + (mouse_repeat < 50 ? mouse_repeat/5 : 10);
|
||||||
|
if (code == MS_RIGHT) mouse_x += MOUSE_MOVE_UNIT + (mouse_repeat < 50 ? mouse_repeat/5 : 10);
|
||||||
|
if (code == MS_BTN1) mouse_btn |= 1<<0;
|
||||||
|
if (code == MS_BTN2) mouse_btn |= 1<<1;
|
||||||
|
if (code == MS_BTN3) mouse_btn |= 1<<2;
|
||||||
|
if (code == MS_BTN4) mouse_btn |= 1<<3;
|
||||||
|
if (code == MS_BTN5) mouse_btn |= 1<<4;
|
||||||
|
if (code == MS_WH_UP) mouse_wheel += 1;
|
||||||
|
if (code == MS_WH_DOWN) mouse_wheel -= 1;
|
||||||
|
if (code == MS_WH_LEFT) mouse_hwheel -= 1;
|
||||||
|
if (code == MS_WH_RIGHT) mouse_hwheel += 1;
|
||||||
|
} else {
|
||||||
|
// normal keys
|
||||||
|
if (key_index < 6)
|
||||||
|
keyboard_keys[key_index] = code;
|
||||||
|
key_index++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!has_ghost) {
|
||||||
|
// when 4 left modifier keys down
|
||||||
|
if (keyboard_modifier_keys == (MOD_LCTRL | MOD_LSHIFT | MOD_LALT | MOD_LGUI)) {
|
||||||
|
// cancel all keys
|
||||||
|
keyboard_modifier_keys = 0;
|
||||||
|
for (int i = 0; i < 6; i++) keyboard_keys[i] = KB_NO;
|
||||||
|
usb_keyboard_send();
|
||||||
|
|
||||||
|
print("jump to bootloader...\n");
|
||||||
|
_delay_ms(100);
|
||||||
|
jump_bootloader(); // not return
|
||||||
|
}
|
||||||
|
|
||||||
|
if (mouse_x || mouse_y || mouse_wheel || mouse_hwheel || mouse_btn != mouse_buttons) {
|
||||||
|
mouse_buttons = mouse_btn;
|
||||||
|
usb_mouse_move(mouse_x, mouse_y, mouse_wheel, mouse_hwheel);
|
||||||
|
print_mouse(mouse_x, mouse_y, mouse_wheel, mouse_hwheel);
|
||||||
|
key_sent = true;
|
||||||
|
|
||||||
|
// acceleration
|
||||||
|
_delay_ms(MOUSE_DELAY_MS >> (mouse_repeat < MOUSE_DELAY_ACC ? mouse_repeat : MOUSE_DELAY_ACC));
|
||||||
|
mouse_repeat++;
|
||||||
|
} else {
|
||||||
|
mouse_repeat = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// send keys to host
|
||||||
|
if (modified) {
|
||||||
|
if (key_index > 6) {
|
||||||
|
//Rollover
|
||||||
|
}
|
||||||
|
usb_keyboard_send();
|
||||||
|
if (keyboard_keys[0])
|
||||||
|
key_sent = true;
|
||||||
|
|
||||||
|
print_keys();
|
||||||
|
// LED flash for debug
|
||||||
|
LED_CONFIG;
|
||||||
|
LED_OFF;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void print_matrix(void) {
|
||||||
|
print("\nr/c 01234567\n");
|
||||||
|
for (int row = 0; row < MATRIX_ROWS; row++) {
|
||||||
|
phex(row); print(": ");
|
||||||
|
pbin_reverse(matrix[row]);
|
||||||
|
if (matrix_has_ghost_in_row(row)) {
|
||||||
|
print(" <ghost");
|
||||||
|
}
|
||||||
|
print("\n");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void print_keys(void) {
|
||||||
|
print("\nkeys: ");
|
||||||
|
for (int i = 0; i < 6; i++) { phex(keyboard_keys[i]); print(" "); }
|
||||||
|
print("\n");
|
||||||
|
print("mods: "); phex(keyboard_modifier_keys); print("\n");
|
||||||
|
}
|
||||||
|
|
||||||
|
static void print_mouse(int8_t mouse_x, int8_t mouse_y, int8_t wheel_v, int8_t wheel_h) {
|
||||||
|
print("\nmouse_x y v h: ");
|
||||||
|
phex(mouse_x); print(" ");
|
||||||
|
phex(mouse_y); print(" ");
|
||||||
|
phex(wheel_v); print(" ");
|
||||||
|
phex(wheel_h); print("\n");
|
||||||
|
print("buttons: "); phex(mouse_buttons); print("\n");
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,6 @@
|
||||||
|
#ifndef KEY_PROCESS_H
|
||||||
|
#define KEY_PROCESS_H 1
|
||||||
|
|
||||||
|
void proc_matrix(void);
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
@ -0,0 +1,67 @@
|
||||||
|
# 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_macway
|
||||||
|
|
||||||
|
COMMON_DIR = ..
|
||||||
|
TARGET_DIR = .
|
||||||
|
TARGET_SRC = $(TARGET_DIR)/keymap.c \
|
||||||
|
$(TARGET_DIR)/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
|
||||||
|
|
@ -1,11 +1,14 @@
|
||||||
/*
|
/*
|
||||||
* keymap for modified macway keyboarq
|
* keymap for modified Macway
|
||||||
*/
|
*/
|
||||||
|
#include <stdbool.h>
|
||||||
#include <avr/pgmspace.h>
|
#include <avr/pgmspace.h>
|
||||||
#include "matrix.h"
|
#include "matrix.h"
|
||||||
#include "keymap.h"
|
#include "keymap.h"
|
||||||
|
#include "usb_keyboard.h"
|
||||||
|
|
||||||
int current_layer = 0;
|
int current_layer = 0;
|
||||||
|
bool key_sent = false;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Layer0(Default Layer)
|
* Layer0(Default Layer)
|
||||||
|
|
@ -2,12 +2,19 @@
|
||||||
#define KEYMAP_H 1
|
#define KEYMAP_H 1
|
||||||
|
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
#include <stdbool.h>
|
||||||
#include "usb_keycodes.h"
|
#include "usb_keycodes.h"
|
||||||
|
|
||||||
int get_layer(void);
|
|
||||||
uint8_t get_keycode(int layer, int row, int col);
|
|
||||||
|
|
||||||
#define MATRIX_ROWS 9
|
#define MATRIX_ROWS 9
|
||||||
#define MATRIX_COLS 8
|
#define MATRIX_COLS 8
|
||||||
|
|
||||||
|
|
||||||
|
extern int current_layer;
|
||||||
|
extern bool key_sent;
|
||||||
|
|
||||||
|
|
||||||
|
int get_layer(void);
|
||||||
|
uint8_t get_keycode(int layer, int row, int col);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
145
tmk.c
145
tmk.c
|
|
@ -24,6 +24,7 @@
|
||||||
* THE SOFTWARE.
|
* THE SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
// TODO: clean unused headers
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
#include <avr/io.h>
|
#include <avr/io.h>
|
||||||
#include <avr/pgmspace.h>
|
#include <avr/pgmspace.h>
|
||||||
|
|
@ -34,22 +35,18 @@
|
||||||
#include "usb_mouse.h"
|
#include "usb_mouse.h"
|
||||||
#include "print.h"
|
#include "print.h"
|
||||||
#include "matrix.h"
|
#include "matrix.h"
|
||||||
#include "keymap_hhkb.h"
|
#include "keymap.h"
|
||||||
#include "jump_bootloader.h"
|
#include "jump_bootloader.h"
|
||||||
|
|
||||||
|
#include "key_process.h"
|
||||||
|
|
||||||
// for teensy 2.0
|
#define CPU_PRESCALE(n) (CLKPR = 0x80, CLKPR = (n))
|
||||||
|
|
||||||
|
// TODO: should go to hardware dependent file
|
||||||
|
// for Teensy/Teensy++ 2.0
|
||||||
#define LED_CONFIG (DDRD |= (1<<6))
|
#define LED_CONFIG (DDRD |= (1<<6))
|
||||||
#define LED_ON (PORTD |= (1<<6))
|
#define LED_ON (PORTD |= (1<<6))
|
||||||
#define LED_OFF (PORTD &= ~(1<<6))
|
#define LED_OFF (PORTD &= ~(1<<6))
|
||||||
#define CPU_PRESCALE(n) (CLKPR = 0x80, CLKPR = (n))
|
|
||||||
|
|
||||||
#define MOUSE_MOVE_UNIT 10
|
|
||||||
#define MOUSE_DELAY_MS 200
|
|
||||||
#define MOUSE_DELAY_ACC 5
|
|
||||||
|
|
||||||
|
|
||||||
static void print_matrix(void);
|
|
||||||
|
|
||||||
|
|
||||||
uint16_t idle_count=0;
|
uint16_t idle_count=0;
|
||||||
|
|
@ -88,137 +85,13 @@ int main(void)
|
||||||
|
|
||||||
|
|
||||||
matrix_init();
|
matrix_init();
|
||||||
|
print("\nt.m.k. keyboard 1.2\n");
|
||||||
bool modified = false;
|
|
||||||
bool has_ghost = false;
|
|
||||||
int layer = 0;
|
|
||||||
int key_index = 0;
|
|
||||||
uint8_t mouse_x = 0;
|
|
||||||
uint8_t mouse_y = 0;
|
|
||||||
uint8_t mouse_btn = 0;
|
|
||||||
int8_t mouse_wheel = 0;
|
|
||||||
int8_t mouse_hwheel = 0;
|
|
||||||
int mouse_repeat = 0;
|
|
||||||
|
|
||||||
print("\nt.m.k. keyboard 1.0 for hhkb\n");
|
|
||||||
while (1) {
|
while (1) {
|
||||||
matrix_scan();
|
proc_matrix();
|
||||||
modified = matrix_is_modified();
|
|
||||||
has_ghost = matrix_has_ghost();
|
|
||||||
layer = get_layer();
|
|
||||||
|
|
||||||
// print matrix state for debug
|
|
||||||
if (modified) {
|
|
||||||
print_matrix();
|
|
||||||
|
|
||||||
// LED flash for debug
|
|
||||||
LED_CONFIG;
|
|
||||||
LED_ON;
|
|
||||||
}
|
|
||||||
|
|
||||||
keyboard_modifier_keys = 0;
|
|
||||||
for (int i = 0; i < 3; i++) keyboard_keys[i] = KB_NO;
|
|
||||||
key_index = 0;
|
|
||||||
mouse_x = 0;
|
|
||||||
mouse_y = 0;
|
|
||||||
mouse_btn = 0;
|
|
||||||
mouse_wheel = 0;
|
|
||||||
mouse_hwheel = 0;
|
|
||||||
|
|
||||||
// convert matrix state to HID report
|
|
||||||
for (int row = 0; row < MATRIX_ROWS; row++) {
|
|
||||||
for (int col = 0; col < MATRIX_COLS; col++) {
|
|
||||||
if (matrix[row] & 1<<col) continue;
|
|
||||||
|
|
||||||
uint8_t code = get_keycode(layer, row, col);
|
|
||||||
if (code == KB_NO) {
|
|
||||||
continue;
|
|
||||||
} else if (KB_LCTRL <= code && code <= KB_RGUI) {
|
|
||||||
// modifier keys(0xE0-0xE7)
|
|
||||||
keyboard_modifier_keys |= 1<<(code & 0x07);
|
|
||||||
} else if (code >= MS_UP) {
|
|
||||||
// mouse
|
|
||||||
if (code == MS_UP) mouse_y -= MOUSE_MOVE_UNIT + (mouse_repeat < 50 ? mouse_repeat/5 : 10);
|
|
||||||
if (code == MS_DOWN) mouse_y += MOUSE_MOVE_UNIT + (mouse_repeat < 50 ? mouse_repeat/5 : 10);
|
|
||||||
if (code == MS_LEFT) mouse_x -= MOUSE_MOVE_UNIT + (mouse_repeat < 50 ? mouse_repeat/5 : 10);
|
|
||||||
if (code == MS_RIGHT) mouse_x += MOUSE_MOVE_UNIT + (mouse_repeat < 50 ? mouse_repeat/5 : 10);
|
|
||||||
if (code == MS_BTN1) mouse_btn |= 1<<0;
|
|
||||||
if (code == MS_BTN2) mouse_btn |= 1<<1;
|
|
||||||
if (code == MS_BTN3) mouse_btn |= 1<<2;
|
|
||||||
if (code == MS_BTN4) mouse_btn |= 1<<3;
|
|
||||||
if (code == MS_BTN5) mouse_btn |= 1<<4;
|
|
||||||
if (code == MS_WH_UP) mouse_wheel += 1;
|
|
||||||
if (code == MS_WH_DOWN) mouse_wheel -= 1;
|
|
||||||
if (code == MS_WH_LEFT) mouse_hwheel -= 1;
|
|
||||||
if (code == MS_WH_RIGHT) mouse_hwheel += 1;
|
|
||||||
} else {
|
|
||||||
// normal keys
|
|
||||||
if (key_index < 6)
|
|
||||||
keyboard_keys[key_index] = code;
|
|
||||||
key_index++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!has_ghost) {
|
|
||||||
// when 4 left modifier keys down
|
|
||||||
if (keyboard_modifier_keys == (MOD_LCTRL | MOD_LSHIFT | MOD_LALT | MOD_LGUI)) {
|
|
||||||
// cancel all keys
|
|
||||||
keyboard_modifier_keys = 0;
|
|
||||||
for (int i = 0; i < 6; i++) keyboard_keys[i] = KB_NO;
|
|
||||||
usb_keyboard_send();
|
|
||||||
|
|
||||||
print("jump to bootloader...\n");
|
|
||||||
_delay_ms(100);
|
|
||||||
jump_bootloader(); // not return
|
|
||||||
}
|
|
||||||
|
|
||||||
if (mouse_x || mouse_y || mouse_wheel || mouse_hwheel || mouse_btn != mouse_buttons) {
|
|
||||||
mouse_buttons = mouse_btn;
|
|
||||||
usb_mouse_move(mouse_x, mouse_y, mouse_wheel, mouse_hwheel);
|
|
||||||
key_sent = true;
|
|
||||||
|
|
||||||
// acceleration
|
|
||||||
_delay_ms(MOUSE_DELAY_MS >> (mouse_repeat < MOUSE_DELAY_ACC ? mouse_repeat : MOUSE_DELAY_ACC));
|
|
||||||
mouse_repeat++;
|
|
||||||
} else {
|
|
||||||
mouse_repeat = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// send keys to host
|
|
||||||
if (modified) {
|
|
||||||
if (key_index > 6) {
|
|
||||||
//Rollover
|
|
||||||
}
|
|
||||||
usb_keyboard_send();
|
|
||||||
if (keyboard_keys[0])
|
|
||||||
key_sent = true;
|
|
||||||
|
|
||||||
// LED flash for debug
|
|
||||||
LED_CONFIG;
|
|
||||||
LED_OFF;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
_delay_ms(2);
|
_delay_ms(2);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void print_matrix(void) {
|
|
||||||
print("\nr/c 01234567\n");
|
|
||||||
for (int row = 0; row < MATRIX_ROWS; row++) {
|
|
||||||
phex(row); print(": ");
|
|
||||||
pbin_reverse(matrix[row]);
|
|
||||||
if (matrix_has_ghost_in_row(row)) {
|
|
||||||
print(" <ghost");
|
|
||||||
}
|
|
||||||
print("\n");
|
|
||||||
}
|
|
||||||
print("keys: ");
|
|
||||||
for (int i = 0; i < 6; i++) { phex(keyboard_keys[i]); print(" "); }
|
|
||||||
print("\n");
|
|
||||||
print("mod: "); phex(keyboard_modifier_keys); print("\n");
|
|
||||||
}
|
|
||||||
|
|
||||||
// This interrupt routine is run approx 61 times per second.
|
// This interrupt routine is run approx 61 times per second.
|
||||||
// A very simple inactivity timeout is implemented, where we
|
// A very simple inactivity timeout is implemented, where we
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue