di0ib
/
tmk_keyboard_custom
Watch 1
Star 0
Fork 0
Code Releases 0 Activity
Browse Source

Add experimental code for testing with GH60's HW

old_master
Kai Ryu 9 years ago
parent
35df66906b
commit
27238c9023
3 changed files with 224 additions and 0 deletions
Split View Show Diff Stats
  1. 155
    0
      keyboard/tentapad/Makefile_gh60
  2. 12
    0
      keyboard/tentapad/backlight.c
  3. 57
    0
      keyboard/tentapad/matrix.c

+ 155
- 0
keyboard/tentapad/Makefile_gh60 View File

@@ -0,0 +1,155 @@
#----------------------------------------------------------------------------
# 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 = tentapad_lufa

# Directory common source filess exist
TOP_DIR = ../..

# Directory keyboard dependent files exist
TARGET_DIR = .

# project specific files
SRC = keymap_common.c \
matrix.c \
led.c \
backlight.c \
ledmap.c

ifdef KEYMAP
SRC := keymap_$(KEYMAP).c $(SRC)
else
SRC := keymap_default.c $(SRC)
endif


CONFIG_H = config.h


# MCU name
#MCU = at90usb1287
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(+60)
OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT


# Boot Section Size in *bytes*
# Teensy halfKay 512
# Teensy++ halfKay 1024
# Atmel DFU loader 4096
# LUFA bootloader 4096
# USBaspLoader 2048
OPT_DEFS += -DBOOTLOADER_SIZE=4096

# Additional definitions from command line
ifdef DEFS
OPT_DEFS += $(foreach DEF,$(DEFS),-D$(DEF))
endif

# Build Options
# comment out to disable the options.
#
BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000)
MOUSEKEY_ENABLE = yes # Mouse keys(+4700)
EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
CONSOLE_ENABLE = yes # Console for debug(+400)
COMMAND_ENABLE = yes # Commands for debug and configuration
#SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend
#NKRO_ENABLE = yes # USB Nkey Rollover
USB_6KRO_ENABLE = yes # USB 6key Rollover
#PS2_MOUSE_ENABLE = yes # PS/2 mouse(TrackPoint) support
#PS2_USE_BUSYWAIT = yes
BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
KEYMAP_IN_EEPROM_ENABLE = yes # Read keymap from eeprom
#KEYMAP_SECTION_ENABLE = yes # Fixed address keymap for keymap editor
SOFTPWM_LED_ENABLE = yes # Enable SoftPWM to drive backlight
BREATHING_LED_ENABLE = yes # Enable breathing backlight
#LEDMAP_ENABLE = yes # Enable LED mapping
#LEDMAP_IN_EEPROM_ENABLE = yes # Read LED mapping from eeprom

OPT_DEFS += -DEXPERIMENTAL


# Optimize size but this may cause error "relocation truncated to fit"
#EXTRALDFLAGS = -Wl,--relax

# Search Path
VPATH += $(TARGET_DIR)
VPATH += $(TOP_DIR)

include $(TOP_DIR)/protocol/lufa.mk
include $(TOP_DIR)/protocol.mk
include $(TOP_DIR)/common.mk
include $(TOP_DIR)/rules.mk

+ 12
- 0
keyboard/tentapad/backlight.c View File

@@ -55,23 +55,35 @@ void backlight_set(uint8_t level)
#ifndef LEDMAP_ENABLE
void softpwm_led_init(void)
{
#ifndef EXPERIMENTAL
DDRD |= (1<<PD0);
DDRB |= (1<<PB7);
DDRC |= (1<<PD5 | 1<<PD6);
#else
DDRB |= (1<<PB6);
#endif
}

void softpwm_led_on(uint8_t index)
{
#ifndef EXPERIMENTAL
PORTD |= (1<<PD0);
PORTB |= (1<<PB7);
PORTC |= (1<<PD5 | 1<<PD6);
#else
PORTB |= (1<<PB6);
#endif
}

void softpwm_led_off(uint8_t index)
{
#ifndef EXPERIMENTAL
PORTD &= ~(1<<PD0);
PORTB &= ~(1<<PB7);
PORTC &= ~(1<<PD5 | 1<<PD6);
#else
PORTB &= ~(1<<PB6);
#endif
}
#endif


+ 57
- 0
keyboard/tentapad/matrix.c View File

@@ -22,6 +22,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <stdbool.h>
#include <avr/io.h>
#include <util/delay.h>
#include "timer.h"
#include "print.h"
#include "debug.h"
#include "util.h"
@@ -29,12 +30,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifdef PS2_MOUSE_ENABLE
#include "ps2.h"
#endif
#include "keymap_common.h"


#ifndef DEBOUNCE
# define DEBOUNCE 5
#endif
static uint8_t debouncing = DEBOUNCE;
static uint16_t debouncing_last[MATRIX_COLS];

/* matrix state(1:on, 0:off) */
static matrix_row_t matrix;
@@ -79,6 +82,8 @@ void matrix_init(void)
PORTC &= ~(1<<PC2);
#endif

keymaps_cache_init();

// initialize cols
init_cols();

@@ -90,6 +95,36 @@ void matrix_init(void)
uint8_t matrix_scan(void)
{
matrix_row_t cols = read_cols();
for (uint8_t col = 0; col < MATRIX_COLS; col++) {
if ((cols & (1<<col)) != (matrix & (1<<col))) {
// state changed
if (debouncing & (1<<col)) {
// debouncing
if (timer_elapsed(debouncing_last[col]) > DEBOUNCE) {
// released
matrix &= ~(1<<col);
debouncing &= ~(1<<col);
}
else {
// reset debounce time
debouncing_last[col] = timer_read();
}
}
else {
if (cols & (1<<col)) {
// pressed
matrix |= (1<<col);
}
else {
// start debounce
debouncing_last[col] = timer_read();
debouncing |= (1<<col);
}
}
}
}

/*
if (matrix_debouncing != cols) {
matrix_debouncing = cols;
if (debouncing) {
@@ -105,6 +140,7 @@ uint8_t matrix_scan(void)
matrix = matrix_debouncing;
}
}
*/

return 1;
}
@@ -148,11 +184,24 @@ uint8_t matrix_key_count(void)
*/
static void init_cols(void)
{
#ifndef EXPERIMENTAL
// Input with pull-up(DDR:0, PORT:1)
DDRD &= ~(1<<PD1 | 1<<PD2 | 1<<PD5 | 1<<PD6);
PORTD |= (1<<PD1 | 1<<PD2 | 1<<PD5 | 1<<PD6);
DDRB &= ~(1<<PB3);
PORTB |= (1<<PB3);
#else
DDRD |= (1<<PD3);
PORTD &= ~(1<<PD3);
DDRE &= ~(1<<PE6);
PORTE |= (1<<PE6);
DDRC &= ~(1<<PC7 | 1<<PC6);
PORTC |= (1<<PC7 | 1<<PC6);
DDRB &= ~(1<<PB7);
PORTB |= (1<<PB7);
DDRD &= ~(1<<PD4);
PORTD |= (1<<PD4);
#endif
}

/* Column pin configuration
@@ -161,9 +210,17 @@ static void init_cols(void)
*/
static matrix_row_t read_cols(void)
{
#ifndef EXPERIMENTAL
return (PIND&(1<<PD1) ? 0 : (1<<0)) |
(PIND&(1<<PD2) ? 0 : (1<<1)) |
(PIND&(1<<PD5) ? 0 : (1<<2)) |
(PIND&(1<<PD6) ? 0 : (1<<3)) |
(PINB&(1<<PB3) ? 0 : (1<<4));
#else
return (PINE&(1<<PE6) ? 0 : (1<<0)) |
(PINC&(1<<PC7) ? 0 : (1<<1)) |
(PINC&(1<<PC6) ? 0 : (1<<2)) |
(PINB&(1<<PB7) ? 0 : (1<<3)) |
(PIND&(1<<PD4) ? 0 : (1<<4));
#endif
}