fixed macway to comply new API.

This commit is contained in:
tmk 2011-02-21 23:46:08 +09:00
parent c958b2d19b
commit 60052acc0f
5 changed files with 33 additions and 57 deletions

View File

@ -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 file name (without extension).
TARGET = tmk_macway TARGET = macway
# Directory common source filess exist # Directory common source filess exist
COMMON_DIR = .. COMMON_DIR = ..
@ -49,8 +8,12 @@ COMMON_DIR = ..
TARGET_DIR = . TARGET_DIR = .
# keyboard dependent files # keyboard dependent files
TARGET_SRC = keymap.c \ TARGET_SRC = main_pjrc.c \
matrix.c keymap.c \
matrix.c \
led.c
CONFIG_H = config.h
# MCU name, you MUST set this to match the board you are using # 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. # comment out to disable the options.
# #
MOUSEKEY_ENABLE = yes # Mouse keys 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_EXTRA_ENABLE = yes # Enhanced feature for Windows(Audio control and System control)
#USB_NKRO_ENABLE = yes # USB Nkey Rollover #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 include $(COMMON_DIR)/Makefile.common

View File

@ -10,21 +10,27 @@
#define PRODUCT Macway mod #define PRODUCT Macway mod
#define DESCRIPTION t.m.k. keyboard firmware for Macway mod #define DESCRIPTION t.m.k. keyboard firmware for Macway mod
/* matrix size */ /* matrix size */
#define MATRIX_ROWS 9 #define MATRIX_ROWS 9
#define MATRIX_COLS 8 #define MATRIX_COLS 8
/* define if matrix has ghost */ /* define if matrix has ghost */
#define MATRIX_HAS_GHOST #define MATRIX_HAS_GHOST
/* USB NKey Rollover */
#ifdef USB_NKRO_ENABLE /* key combination for command */
#endif #define IS_COMMAND() ( \
keyboard_report->mods == (BIT_LSHIFT | BIT_RSHIFT) || \
keyboard_report->mods == (BIT_LCTRL | BIT_RSHIFT) \
)
/* mouse keys */ /* mouse keys */
#ifdef MOUSEKEY_ENABLE #ifdef MOUSEKEY_ENABLE
# define MOUSEKEY_DELAY_TIME 192 # define MOUSEKEY_DELAY_TIME 192
#endif #endif
/* PS/2 mouse */ /* PS/2 mouse */
#ifdef PS2_MOUSE_ENABLE #ifdef PS2_MOUSE_ENABLE
# define PS2_CLOCK_PORT PORTF # define PS2_CLOCK_PORT PORTF

View File

@ -4,12 +4,11 @@
#include <stdint.h> #include <stdint.h>
#include <stdbool.h> #include <stdbool.h>
#include <avr/pgmspace.h> #include <avr/pgmspace.h>
#include "usb_keyboard.h"
#include "usb_keycodes.h" #include "usb_keycodes.h"
#include "print.h" #include "print.h"
#include "debug.h" #include "debug.h"
#include "util.h" #include "util.h"
#include "keymap_skel.h" #include "keymap.h"
// Convert physical keyboard layout to matrix array. // 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))]); 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);
}

7
macway/led.c Normal file
View File

@ -0,0 +1,7 @@
#include "stdint.h"
#include "led.h"
void led_set(uint8_t usb_led)
{
}

View File

@ -7,7 +7,7 @@
#include <util/delay.h> #include <util/delay.h>
#include "print.h" #include "print.h"
#include "util.h" #include "util.h"
#include "matrix_skel.h" #include "matrix.h"
#if (MATRIX_COLS > 16) #if (MATRIX_COLS > 16)