summaryrefslogtreecommitdiffstats
path: root/hhkb
diff options
context:
space:
mode:
authortmk <nobody@nowhere>2011-02-08 16:03:58 +0100
committertmk <nobody@nowhere>2011-02-21 19:08:59 +0100
commitacc974c64b1e17e6807133fdc50de5bb34aedda5 (patch)
tree7af7511a56d680a4d93b535c52891a8ffc15dd04 /hhkb
parent5552b5afeaa9ce7432f9ded3586984253f292d80 (diff)
downloadqmk_firmware-acc974c64b1e17e6807133fdc50de5bb34aedda5.tar.gz
qmk_firmware-acc974c64b1e17e6807133fdc50de5bb34aedda5.tar.xz
added protocol stack: pjrc, vusb
Diffstat (limited to 'hhkb')
-rw-r--r--hhkb/Makefile52
-rw-r--r--hhkb/keymap.c4
2 files changed, 10 insertions, 46 deletions
diff --git a/hhkb/Makefile b/hhkb/Makefile
index f2192888f..f008b6ec9 100644
--- a/hhkb/Makefile
+++ b/hhkb/Makefile
@@ -1,46 +1,5 @@
-# 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
+TARGET = hhkb
# Directory common source filess exist
COMMON_DIR = ..
@@ -49,8 +8,12 @@ COMMON_DIR = ..
TARGET_DIR = .
# keyboard dependent files
-TARGET_SRC = keymap.c \
- matrix.c
+TARGET_SRC = tmk.c \
+ key_process.c \
+ host_pjrc.c \
+ keymap.c \
+ matrix.c \
+ led.c
# MCU name, you MUST set this to match the board you are using
@@ -77,4 +40,5 @@ USB_EXTRA_ENABLE = yes # Enhanced feature for Windows(Audio control and System c
USB_NKRO_ENABLE = yes # USB Nkey Rollover
+include $(COMMON_DIR)/Makefile.pjrc
include $(COMMON_DIR)/Makefile.common
diff --git a/hhkb/keymap.c b/hhkb/keymap.c
index 176201756..8b43b2a03 100644
--- a/hhkb/keymap.c
+++ b/hhkb/keymap.c
@@ -4,7 +4,7 @@
#include <stdint.h>
#include <stdbool.h>
#include <avr/pgmspace.h>
-#include "usb_keyboard.h"
+#include "keyboard.h"
#include "usb_keycodes.h"
#include "print.h"
#include "debug.h"
@@ -177,5 +177,5 @@ uint8_t keymap_fn_keycode(uint8_t fn_bits)
// define a condition to enter special function mode
bool keymap_is_special_mode(uint8_t fn_bits)
{
- return (usb_keyboard_mods == (BIT_LCTRL | BIT_LSHIFT | BIT_LALT | BIT_LGUI));
+ return keyboard_get_mods() == (BIT_LSHIFT | BIT_RSHIFT) || keyboard_get_mods() == (BIT_LCTRL | BIT_RSHIFT);
}