diff options
| -rw-r--r-- | macway/Makefile | 60 | ||||
| -rw-r--r-- | macway/config.h | 12 | ||||
| -rw-r--r-- | macway/keymap.c | 9 | ||||
| -rw-r--r-- | macway/led.c | 7 | ||||
| -rw-r--r-- | macway/matrix.c | 2 |
5 files changed, 33 insertions, 57 deletions
diff --git a/macway/Makefile b/macway/Makefile index 49dba6746a..c603ca7b98 100644 --- a/macway/Makefile +++ b/macway/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_macway +TARGET = macway # 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 = main_pjrc.c \ + keymap.c \ + matrix.c \ + led.c + +CONFIG_H = config.h # MCU name, you MUST set this to match the board you are using @@ -73,9 +36,16 @@ F_CPU = 16000000 # comment out to disable the options. # MOUSEKEY_ENABLE = yes # Mouse keys -PS2_MOUSE_ENABLE = yes # PS/2 mouse(TrackPoint) support +#PS2_MOUSE_ENABLE = yes # PS/2 mouse(TrackPoint) support USB_EXTRA_ENABLE = yes # Enhanced feature for Windows(Audio control and System control) #USB_NKRO_ENABLE = yes # USB Nkey Rollover + +#---------------- Programming Options -------------------------- +PROGRAM_CMD = teensy_loader_cli.exe -mmcu=$(MCU) -w -v $(TARGET).hex + + + +include $(COMMON_DIR)/Makefile.pjrc include $(COMMON_DIR)/Makefile.common diff --git a/macway/config.h b/macway/config.h index 1403ef1274..9e443ba777 100644 --- a/macway/config.h +++ b/macway/config.h @@ -10,21 +10,27 @@ #define PRODUCT Macway mod #define DESCRIPTION t.m.k. keyboard firmware for Macway mod + /* matrix size */ #define MATRIX_ROWS 9 #define MATRIX_COLS 8 /* define if matrix has ghost */ #define MATRIX_HAS_GHOST -/* USB NKey Rollover */ -#ifdef USB_NKRO_ENABLE -#endif + +/* key combination for command */ +#define IS_COMMAND() ( \ + keyboard_report->mods == (BIT_LSHIFT | BIT_RSHIFT) || \ + keyboard_report->mods == (BIT_LCTRL | BIT_RSHIFT) \ +) + /* mouse keys */ #ifdef MOUSEKEY_ENABLE # define MOUSEKEY_DELAY_TIME 192 #endif + /* PS/2 mouse */ #ifdef PS2_MOUSE_ENABLE # define PS2_CLOCK_PORT PORTF diff --git a/macway/keymap.c b/macway/keymap.c index f26267fd04..610d62cb8a 100644 --- a/macway/keymap.c +++ b/macway/keymap.c @@ -4,12 +4,11 @@ #include <stdint.h> #include <stdbool.h> #include <avr/pgmspace.h> -#include "usb_keyboard.h" #include "usb_keycodes.h" #include "print.h" #include "debug.h" #include "util.h" -#include "keymap_skel.h" +#include "keymap.h" // Convert physical keyboard layout to matrix array. @@ -177,9 +176,3 @@ uint8_t keymap_fn_keycode(uint8_t fn_bits) { return pgm_read_byte(&fn_keycode[(biton(fn_bits))]); } - -// define a condition to enter special function mode -bool keymap_is_special_mode(uint8_t fn_bits) -{ - return usb_keyboard_mods == (BIT_LSHIFT | BIT_RSHIFT); -} diff --git a/macway/led.c b/macway/led.c new file mode 100644 index 0000000000..bdc838d498 --- /dev/null +++ b/macway/led.c @@ -0,0 +1,7 @@ +#include "stdint.h" +#include "led.h" + + +void led_set(uint8_t usb_led) +{ +} diff --git a/macway/matrix.c b/macway/matrix.c index f8c0640fd7..81c4042f5c 100644 --- a/macway/matrix.c +++ b/macway/matrix.c @@ -7,7 +7,7 @@ #include <util/delay.h> #include "print.h" #include "util.h" -#include "matrix_skel.h" +#include "matrix.h" #if (MATRIX_COLS > 16) |