From 4069776c022502f117b83b66c5a71700135acfbc Mon Sep 17 00:00:00 2001 From: tmk Date: Wed, 25 Jun 2014 13:57:36 +0900 Subject: Add initial files for RN-42 --- keyboard/hhkb_rn42/Makefile | 142 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 142 insertions(+) create mode 100644 keyboard/hhkb_rn42/Makefile (limited to 'keyboard/hhkb_rn42/Makefile') diff --git a/keyboard/hhkb_rn42/Makefile b/keyboard/hhkb_rn42/Makefile new file mode 100644 index 000000000..7b3b993b7 --- /dev/null +++ b/keyboard/hhkb_rn42/Makefile @@ -0,0 +1,142 @@ +#---------------------------------------------------------------------------- +# 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. +# Please customize your programmer settings(PROGRAM_CMD) +# +# make teensy = Download the hex file to the device, using teensy_loader_cli. +# (must have teensy_loader_cli installed). +# +# make dfu = Download the hex file to the device, using dfu-programmer (must +# have dfu-programmer installed). +# +# make flip = Download the hex file to the device, using Atmel FLIP (must +# have Atmel FLIP installed). +# +# make dfu-ee = Download the eeprom file to the device, using dfu-programmer +# (must have dfu-programmer installed). +# +# make flip-ee = Download the eeprom file to the device, using Atmel FLIP +# (must have Atmel FLIP installed). +# +# 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 = hhkb_lufa + +# Directory common source filess exist +TOP_DIR = ../.. + +# Directory keyboard dependent files exist +TARGET_DIR = . + + +# List C source files here. (C dependencies are automatically generated.) +SRC += keymap_common.c \ + matrix.c \ + led.c \ + main.c + +ifdef KEYMAP + SRC := keymap_$(KEYMAP).c $(SRC) +else + SRC := keymap_hhkb.c $(SRC) +endif + +CONFIG_H = config.h + + +# MCU name +# PJRC Teensy++ 2.0 +#MCU = at90usb1286 +# TMK Alt Controller or PJRC Teensy 2.0 +MCU = atmega32u4 + +# Processor frequency. +# This will define a symbol, F_CPU, in all source code files equal to the +# processor frequency in Hz. You can then use this symbol in your source code to +# calculate timings. Do NOT tack on a 'UL' at the end, this will be done +# automatically to create a 32-bit value in your source code. +# +# This will be an integer division of F_USB below, as it is sourced by +# F_USB after it has run through any CPU prescalers. Note that this value +# does not *change* the processor frequency - it should merely be updated to +# reflect the processor speed set externally so that the code can use accurate +# software delays. +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 +#OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT + + +# Boot Section Size in *bytes* +# Teensy halfKay 512 +# Teensy++ halfKay 1024 +# Atmel DFU loader 4096 (TMK Alt Controller) +# LUFA bootloader 4096 +# USBaspLoader 2048 +OPT_DEFS += -DBOOTLOADER_SIZE=4096 + + +# Build Options +# comment out to disable the options. +# +BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = yes # Console for debug +COMMAND_ENABLE = yes # Commands for debug and configuration +NKRO_ENABLE = yes # USB Nkey Rollover +KEYMAP_SECTION_ENABLE = yes # fixed address keymap for keymap editor + + +# Search Path +VPATH += $(TARGET_DIR) +VPATH += $(TOP_DIR) + +include $(TOP_DIR)/protocol/lufa.mk +include $(TOP_DIR)/common.mk +include $(TOP_DIR)/rules.mk + +debug-on: EXTRAFLAGS += -DDEBUG -DDEBUG_ACTION +debug-on: all + +debug-off: EXTRAFLAGS += -DNO_DEBUG -DNO_PRINT +debug-off: all -- cgit v1.2.3 From 31a298f9d9bc78f504d662e1590ec333c1f37735 Mon Sep 17 00:00:00 2001 From: tmk Date: Tue, 1 Jul 2014 04:29:45 +0900 Subject: Add RN-42 Bluetooth module support --- keyboard/hhkb_rn42/Makefile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'keyboard/hhkb_rn42/Makefile') diff --git a/keyboard/hhkb_rn42/Makefile b/keyboard/hhkb_rn42/Makefile index 7b3b993b7..8cfe3f118 100644 --- a/keyboard/hhkb_rn42/Makefile +++ b/keyboard/hhkb_rn42/Makefile @@ -52,12 +52,14 @@ TARGET_DIR = . SRC += keymap_common.c \ matrix.c \ led.c \ + serial_uart.c \ + rn42.c \ main.c ifdef KEYMAP SRC := keymap_$(KEYMAP).c $(SRC) else - SRC := keymap_hhkb.c $(SRC) + SRC := keymap_hasu.c $(SRC) endif CONFIG_H = config.h @@ -123,14 +125,15 @@ MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control CONSOLE_ENABLE = yes # Console for debug COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # USB Nkey Rollover -KEYMAP_SECTION_ENABLE = yes # fixed address keymap for keymap editor +#NKRO_ENABLE = yes # USB Nkey Rollover +#KEYMAP_SECTION_ENABLE = yes # fixed address keymap for keymap editor # Search Path VPATH += $(TARGET_DIR) VPATH += $(TOP_DIR) +include $(TOP_DIR)/protocol.mk include $(TOP_DIR)/protocol/lufa.mk include $(TOP_DIR)/common.mk include $(TOP_DIR)/rules.mk -- cgit v1.2.3 From 862f519e241b83113566eebde71841958b2d00b7 Mon Sep 17 00:00:00 2001 From: tmk Date: Mon, 14 Jul 2014 15:20:10 +0900 Subject: Add software UART and battery monitor --- keyboard/hhkb_rn42/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'keyboard/hhkb_rn42/Makefile') diff --git a/keyboard/hhkb_rn42/Makefile b/keyboard/hhkb_rn42/Makefile index 8cfe3f118..9e1acfa44 100644 --- a/keyboard/hhkb_rn42/Makefile +++ b/keyboard/hhkb_rn42/Makefile @@ -53,6 +53,7 @@ SRC += keymap_common.c \ matrix.c \ led.c \ serial_uart.c \ + suart.S \ rn42.c \ main.c -- cgit v1.2.3 From b4e4f599dfe1b3ecff69ab248866e7b801c35f1e Mon Sep 17 00:00:00 2001 From: tmk Date: Thu, 17 Jul 2014 16:59:22 +0900 Subject: Add rn42_task --- keyboard/hhkb_rn42/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'keyboard/hhkb_rn42/Makefile') diff --git a/keyboard/hhkb_rn42/Makefile b/keyboard/hhkb_rn42/Makefile index 9e1acfa44..7a27a43c0 100644 --- a/keyboard/hhkb_rn42/Makefile +++ b/keyboard/hhkb_rn42/Makefile @@ -55,6 +55,7 @@ SRC += keymap_common.c \ serial_uart.c \ suart.S \ rn42.c \ + rn42_task.c \ main.c ifdef KEYMAP -- cgit v1.2.3 From 59ea5e02f76a37e5021c5f9d02af149e48e7c07c Mon Sep 17 00:00:00 2001 From: tmk Date: Sat, 19 Jul 2014 02:33:23 +0900 Subject: Mkdir rn42 --- keyboard/hhkb_rn42/Makefile | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'keyboard/hhkb_rn42/Makefile') diff --git a/keyboard/hhkb_rn42/Makefile b/keyboard/hhkb_rn42/Makefile index 7a27a43c0..b46b77789 100644 --- a/keyboard/hhkb_rn42/Makefile +++ b/keyboard/hhkb_rn42/Makefile @@ -51,12 +51,7 @@ TARGET_DIR = . # List C source files here. (C dependencies are automatically generated.) SRC += keymap_common.c \ matrix.c \ - led.c \ - serial_uart.c \ - suart.S \ - rn42.c \ - rn42_task.c \ - main.c + led.c ifdef KEYMAP SRC := keymap_$(KEYMAP).c $(SRC) @@ -135,6 +130,7 @@ COMMAND_ENABLE = yes # Commands for debug and configuration VPATH += $(TARGET_DIR) VPATH += $(TOP_DIR) +include rn42.mk include $(TOP_DIR)/protocol.mk include $(TOP_DIR)/protocol/lufa.mk include $(TOP_DIR)/common.mk -- cgit v1.2.3 From 4f22a45b99abd6b018ac0ab8be915e45a9f88282 Mon Sep 17 00:00:00 2001 From: tmk Date: Wed, 20 Aug 2014 13:36:15 +0900 Subject: Add support for HHKB JP --- keyboard/hhkb_rn42/Makefile | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) (limited to 'keyboard/hhkb_rn42/Makefile') diff --git a/keyboard/hhkb_rn42/Makefile b/keyboard/hhkb_rn42/Makefile index b46b77789..e28b3e0be 100644 --- a/keyboard/hhkb_rn42/Makefile +++ b/keyboard/hhkb_rn42/Makefile @@ -53,12 +53,6 @@ SRC += keymap_common.c \ matrix.c \ led.c -ifdef KEYMAP - SRC := keymap_$(KEYMAP).c $(SRC) -else - SRC := keymap_hasu.c $(SRC) -endif - CONFIG_H = config.h @@ -124,6 +118,26 @@ CONSOLE_ENABLE = yes # Console for debug COMMAND_ENABLE = yes # Commands for debug and configuration #NKRO_ENABLE = yes # USB Nkey Rollover #KEYMAP_SECTION_ENABLE = yes # fixed address keymap for keymap editor +#HHKB_JP = yes # HHKB JP support + + +ifdef HHKB_JP + OPT_DEFS += -DHHKB_JP +endif + + +# +# Keymap file +# +ifdef KEYMAP + SRC := keymap_$(KEYMAP).c $(SRC) +else + ifdef HHKB_JP + SRC := keymap_jp.c $(SRC) + else + SRC := keymap_hasu.c $(SRC) + endif +endif # Search Path -- cgit v1.2.3 From 38714e8c8554f19279f167be0e0fae2404e21e49 Mon Sep 17 00:00:00 2001 From: tmk Date: Thu, 4 Sep 2014 17:10:29 +0900 Subject: Update MEMO and remove a build option to save flash --- keyboard/hhkb_rn42/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'keyboard/hhkb_rn42/Makefile') diff --git a/keyboard/hhkb_rn42/Makefile b/keyboard/hhkb_rn42/Makefile index e28b3e0be..3d9a602a5 100644 --- a/keyboard/hhkb_rn42/Makefile +++ b/keyboard/hhkb_rn42/Makefile @@ -111,7 +111,7 @@ OPT_DEFS += -DBOOTLOADER_SIZE=4096 # Build Options # comment out to disable the options. # -BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration +#BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control CONSOLE_ENABLE = yes # Console for debug -- cgit v1.2.3