forked from mirrors/qmk_userspace
		
	Merge branch 'hid_liber'
This commit is contained in:
		
				commit
				
					
						2ea4ee0ce6
					
				
			
		
					 8 changed files with 729 additions and 11 deletions
				
			
		| 
						 | 
				
			
			@ -19,6 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		|||
#define HOST_H
 | 
			
		||||
 | 
			
		||||
#include <stdint.h>
 | 
			
		||||
#include <stdbool.h>
 | 
			
		||||
#include "report.h"
 | 
			
		||||
#include "host_driver.h"
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										120
									
								
								keyboard/hid_liber/Makefile.lufa
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										120
									
								
								keyboard/hid_liber/Makefile.lufa
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,120 @@
 | 
			
		|||
#----------------------------------------------------------------------------
 | 
			
		||||
# 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 = hid_liber_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.c \
 | 
			
		||||
	matrix.c \
 | 
			
		||||
	led.c
 | 
			
		||||
 | 
			
		||||
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)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
# Build Options
 | 
			
		||||
#   comment out to disable the options.
 | 
			
		||||
#
 | 
			
		||||
#MOUSEKEY_ENABLE = yes	# Mouse keys
 | 
			
		||||
EXTRAKEY_ENABLE = yes	# Audio control and System control
 | 
			
		||||
CONSOLE_ENABLE = yes	# Console for debug
 | 
			
		||||
#NKRO_ENABLE = yes	# USB Nkey Rollover - not yet supported in LUFA
 | 
			
		||||
#PS2_MOUSE_ENABLE = yes	# PS/2 mouse(TrackPoint) support
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
# Boot Section Size in bytes
 | 
			
		||||
#   Teensy halfKay   512
 | 
			
		||||
#   Atmel DFU loader 4096
 | 
			
		||||
#   LUFA bootloader  4096
 | 
			
		||||
OPT_DEFS += -DBOOT_SIZE=4096
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
# Search Path
 | 
			
		||||
VPATH += $(TARGET_DIR)
 | 
			
		||||
VPATH += $(TOP_DIR)
 | 
			
		||||
 | 
			
		||||
include $(TOP_DIR)/protocol/lufa.mk
 | 
			
		||||
include $(TOP_DIR)/common.mk
 | 
			
		||||
include $(TOP_DIR)/rules.mk
 | 
			
		||||
							
								
								
									
										90
									
								
								keyboard/hid_liber/Makefile.pjrc
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										90
									
								
								keyboard/hid_liber/Makefile.pjrc
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,90 @@
 | 
			
		|||
#----------------------------------------------------------------------------
 | 
			
		||||
# 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 = hid_liber_pjrc
 | 
			
		||||
 | 
			
		||||
# Directory common source filess exist
 | 
			
		||||
TOP_DIR = ../..
 | 
			
		||||
 | 
			
		||||
# Directory keyboard dependent files exist
 | 
			
		||||
TARGET_DIR = .
 | 
			
		||||
 | 
			
		||||
# keyboard dependent files
 | 
			
		||||
SRC =	keymap.c \
 | 
			
		||||
	matrix.c \
 | 
			
		||||
	led.c
 | 
			
		||||
 | 
			
		||||
CONFIG_H = config.h
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
# MCU name, you MUST set this to match the board you are using
 | 
			
		||||
# type "make clean" after changing this, so all files will be rebuilt
 | 
			
		||||
#MCU = at90usb162       # Teensy 1.0
 | 
			
		||||
MCU = atmega32u4       # Teensy 2.0
 | 
			
		||||
#MCU = at90usb646       # Teensy++ 1.0
 | 
			
		||||
#MCU = at90usb1286      # Teensy++ 2.0
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
# Processor frequency.
 | 
			
		||||
#   Normally the first thing your program should do is set the clock prescaler,
 | 
			
		||||
#   so your program will run at the correct speed.  You should also set this
 | 
			
		||||
#   variable to same clock speed.  The _delay_ms() macro uses this, and many
 | 
			
		||||
#   examples use this variable to calculate timings.  Do not add a "UL" here.
 | 
			
		||||
F_CPU = 16000000
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
# Build Options
 | 
			
		||||
#   comment out to disable the options.
 | 
			
		||||
#
 | 
			
		||||
#MOUSEKEY_ENABLE = yes	# Mouse keys
 | 
			
		||||
#PS2_MOUSE_ENABLE = yes	# PS/2 mouse(TrackPoint) support
 | 
			
		||||
EXTRAKEY_ENABLE = yes	# Audio control and System control
 | 
			
		||||
NKRO_ENABLE = yes	# USB Nkey Rollover
 | 
			
		||||
CONSOLE_ENABLE = yes    # Console for debug
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
# Search Path
 | 
			
		||||
VPATH += $(TARGET_DIR)
 | 
			
		||||
VPATH += $(TOP_DIR)
 | 
			
		||||
 | 
			
		||||
include $(TOP_DIR)/protocol/pjrc.mk
 | 
			
		||||
include $(TOP_DIR)/common.mk
 | 
			
		||||
include $(TOP_DIR)/rules.mk
 | 
			
		||||
							
								
								
									
										56
									
								
								keyboard/hid_liber/config.h
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										56
									
								
								keyboard/hid_liber/config.h
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,56 @@
 | 
			
		|||
/*
 | 
			
		||||
Copyright 2012 Jun Wako <wakojun@gmail.com>
 | 
			
		||||
 | 
			
		||||
This program is free software: you can redistribute it and/or modify
 | 
			
		||||
it under the terms of the GNU General Public License as published by
 | 
			
		||||
the Free Software Foundation, either version 2 of the License, or
 | 
			
		||||
(at your option) any later version.
 | 
			
		||||
 | 
			
		||||
This program is distributed in the hope that it will be useful,
 | 
			
		||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
			
		||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
			
		||||
GNU General Public License for more details.
 | 
			
		||||
 | 
			
		||||
You should have received a copy of the GNU General Public License
 | 
			
		||||
along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		||||
*/
 | 
			
		||||
 | 
			
		||||
#ifndef CONFIG_H
 | 
			
		||||
#define CONFIG_H
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
/* USB Device descriptor parameter */
 | 
			
		||||
#define VENDOR_ID       0xFEED
 | 
			
		||||
#define PRODUCT_ID      0xB919
 | 
			
		||||
#define DEVICE_VER      0x0001
 | 
			
		||||
#define MANUFACTURER    t.m.k.
 | 
			
		||||
#define PRODUCT         HID Liberation
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
/* message strings */
 | 
			
		||||
#define DESCRIPTION     t.m.k. keyboard firmware for HID Liberation
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
/* matrix size */
 | 
			
		||||
#define MATRIX_ROWS 18
 | 
			
		||||
#define MATRIX_COLS 8
 | 
			
		||||
 | 
			
		||||
/* define if matrix has ghost */
 | 
			
		||||
//#define MATRIX_HAS_GHOST
 | 
			
		||||
 | 
			
		||||
/* Set 0 if need no debouncing */
 | 
			
		||||
#define DEBOUNCE    7
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
/* key combination for command */
 | 
			
		||||
#define IS_COMMAND() ( \
 | 
			
		||||
    keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
// TODO: configurable
 | 
			
		||||
#define DEBUG_LED 0
 | 
			
		||||
#define DEBUG_LED_CONFIG
 | 
			
		||||
#define DEBUG_LED_ON
 | 
			
		||||
#define DEBUG_LED_OFF
 | 
			
		||||
 | 
			
		||||
#endif
 | 
			
		||||
							
								
								
									
										184
									
								
								keyboard/hid_liber/keymap.c
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										184
									
								
								keyboard/hid_liber/keymap.c
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,184 @@
 | 
			
		|||
/*
 | 
			
		||||
Copyright 2011 Jun Wako <wakojun@gmail.com>
 | 
			
		||||
 | 
			
		||||
This program is free software: you can redistribute it and/or modify
 | 
			
		||||
it under the terms of the GNU General Public License as published by
 | 
			
		||||
the Free Software Foundation, either version 2 of the License, or
 | 
			
		||||
(at your option) any later version.
 | 
			
		||||
 | 
			
		||||
This program is distributed in the hope that it will be useful,
 | 
			
		||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
			
		||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
			
		||||
GNU General Public License for more details.
 | 
			
		||||
 | 
			
		||||
You should have received a copy of the GNU General Public License
 | 
			
		||||
along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		||||
*/
 | 
			
		||||
 | 
			
		||||
/* 
 | 
			
		||||
 * Keymap for HID Liberator controller
 | 
			
		||||
 */
 | 
			
		||||
#include <stdint.h>
 | 
			
		||||
#include <stdbool.h>
 | 
			
		||||
#include <avr/pgmspace.h>
 | 
			
		||||
#include "keycode.h"
 | 
			
		||||
#include "print.h"
 | 
			
		||||
#include "debug.h"
 | 
			
		||||
#include "util.h"
 | 
			
		||||
#include "keymap.h"
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
// Convert physical keyboard layout to matrix array.
 | 
			
		||||
// This is a macro to define keymap easily in keyboard layout form.
 | 
			
		||||
#define KEYMAP( \
 | 
			
		||||
    KG1, KH7, KJ7, KJ6, KJ1, KO5, KL1, KA6, KA7, KD7, KD5, KD1, KD2,      KB5, KB3, KO3, \
 | 
			
		||||
    KG7, KG5, KH5, KJ5, KI5, KI7, KK7, KK5, KL5, KA5, KC5, KC7, KL7, KD6, KQ7, KN7, KM7, \
 | 
			
		||||
    KG6, KG3, KH3, KJ3, KI3, KI6, KK6, KK3, KL3, KA3, KC3, KC6, KL6, KD4, KP7, KN5, KM5, \
 | 
			
		||||
    KH6, KG4, KH4, KJ4, KI4, KI1, KK1, KK4, KL4, KA4, KC4, KC1, KD0,                     \
 | 
			
		||||
    KF6, KQ0, KG0, KH0, KJ0, KI0, KI2, KK2, KK0, KL0, KA0, KC2, KF4,           KN1,      \
 | 
			
		||||
    KO7, KE6, KB1,           KP1,                     KB2, KR4, KA2, KO0, KN2, KP2, KQ2  \
 | 
			
		||||
) { \
 | 
			
		||||
/*             0         1         2         3         4         5         6         7     */ \
 | 
			
		||||
/* A */   { KC_##KA0, KC_NO   , KC_##KA2, KC_##KA3, KC_##KA4, KC_##KA5, KC_##KA6, KC_##KA7 }, \
 | 
			
		||||
/* B */   { KC_NO   , KC_##KB1, KC_##KB2, KC_##KB3, KC_NO   , KC_##KB5, KC_NO   , KC_NO    }, \
 | 
			
		||||
/* C */   { KC_NO   , KC_##KC1, KC_##KC2, KC_##KC3, KC_##KC4, KC_##KC5, KC_##KC6, KC_##KC7 }, \
 | 
			
		||||
/* D */   { KC_##KD0, KC_##KD1, KC_##KD2, KC_NO   , KC_##KD4, KC_##KD5, KC_##KD6, KC_##KD7 }, \
 | 
			
		||||
/* E */   { KC_NO   , KC_NO   , KC_NO   , KC_NO   , KC_NO   , KC_NO   , KC_##KE6, KC_NO    }, \
 | 
			
		||||
/* F */   { KC_NO   , KC_NO   , KC_NO   , KC_NO   , KC_##KF4, KC_NO   , KC_##KF6, KC_NO    }, \
 | 
			
		||||
/* G */   { KC_##KG0, KC_##KG1, KC_NO   , KC_##KG3, KC_##KG4, KC_##KG5, KC_##KG6, KC_##KG7  }, \
 | 
			
		||||
/* H */   { KC_##KH0, KC_NO   , KC_NO   , KC_##KH3, KC_##KH4, KC_##KH5, KC_##KH6, KC_##KH7 }, \
 | 
			
		||||
/* I */   { KC_##KI0, KC_##KI1, KC_##KI2, KC_##KI3, KC_##KI4, KC_##KI5, KC_##KI6, KC_##KI7 }, \
 | 
			
		||||
/* J */   { KC_##KJ0, KC_##KJ1, KC_NO   , KC_##KJ3, KC_##KJ4, KC_##KJ5, KC_##KJ6, KC_##KJ7 }, \
 | 
			
		||||
/* K */   { KC_##KK0, KC_##KK1, KC_##KK2, KC_##KK3, KC_##KK4, KC_##KK5, KC_##KK6, KC_##KK7 }, \
 | 
			
		||||
/* L */   { KC_##KL0, KC_##KL1, KC_NO   , KC_##KL3, KC_##KL4, KC_##KL5, KC_##KL6, KC_##KL7 }, \
 | 
			
		||||
/* M */   { KC_NO   , KC_NO   , KC_NO   , KC_NO   , KC_NO   , KC_##KM5, KC_NO   , KC_##KM7 }, \
 | 
			
		||||
/* N */   { KC_NO   , KC_##KN1, KC_##KN2, KC_NO   , KC_NO   , KC_##KN5, KC_NO   , KC_##KN7 }, \
 | 
			
		||||
/* O */   { KC_##KO0, KC_NO   , KC_NO   , KC_##KO3, KC_NO   , KC_##KO5, KC_NO   , KC_##KO7 }, \
 | 
			
		||||
/* P */   { KC_NO   , KC_##KP1, KC_##KP2, KC_NO   , KC_NO   , KC_NO   , KC_NO   , KC_##KP7 }, \
 | 
			
		||||
/* Q */   { KC_NO   , KC_NO   , KC_##KQ2, KC_NO   , KC_NO   , KC_NO   , KC_NO   , KC_##KQ7 }, \
 | 
			
		||||
/* R */   { KC_NO   , KC_NO   , KC_NO   , KC_NO   , KC_##KR4, KC_NO   , KC_NO   , KC_NO    }  \
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#define KEYCODE(layer, row, col) (pgm_read_byte(&keymaps[(layer)][(row)][(col)]))
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
// Assign Fn key(0-7) to a layer to which switch with the Fn key pressed.
 | 
			
		||||
static const uint8_t PROGMEM fn_layer[] = {
 | 
			
		||||
    0,              // Fn0
 | 
			
		||||
    1,              // Fn1
 | 
			
		||||
    2,              // Fn2
 | 
			
		||||
    3,              // Fn3
 | 
			
		||||
    4,              // Fn4
 | 
			
		||||
    5,              // Fn5
 | 
			
		||||
    6,              // Fn6
 | 
			
		||||
    7               // Fn7
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
// Assign Fn key(0-7) to a keycode sent when release Fn key without use of the layer.
 | 
			
		||||
// See layer.c for details.
 | 
			
		||||
static const uint8_t PROGMEM fn_keycode[] = {
 | 
			
		||||
    KC_NO,          // Fn0
 | 
			
		||||
    KC_NO,          // Fn1
 | 
			
		||||
    KC_NO,          // Fn2
 | 
			
		||||
    KC_NO,          // Fn3
 | 
			
		||||
    KC_NO,          // Fn4
 | 
			
		||||
    KC_NO,          // Fn5
 | 
			
		||||
    KC_NO,          // Fn6
 | 
			
		||||
    KC_NO           // Fn7
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
/*
 | 
			
		||||
 * Tenkeyless keyboard default layout, ISO & ANSI (ISO is next to right shift,
 | 
			
		||||
 * not present on ANSI, other ISO switches move from ANSI layout but are same
 | 
			
		||||
 * switch
 | 
			
		||||
 *
 | 
			
		||||
 * ,---.   ,---------------. ,---------------. ,---------------. ,-----------.
 | 
			
		||||
 * |Esc|   |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau|
 | 
			
		||||
 * `---'   `---------------' `---------------' `---------------' `-----------'
 | 
			
		||||
 * ,-----------------------------------------------------------. ,-----------.
 | 
			
		||||
 * |~  |  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp | |Ins|Hom|PgU|
 | 
			
		||||
 * |-----------------------------------------------------------| |-----------|
 | 
			
		||||
 * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|    \| |Del|End|PgD|
 | 
			
		||||
 * |-----------------------------------------------------------| `-----------'
 | 
			
		||||
 * |Caps  |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return  |              
 | 
			
		||||
 * |-----------------------------------------------------------|     ,---.    
 | 
			
		||||
 * |Shft|ISO|  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift     |     |Up |    
 | 
			
		||||
 * |-----------------------------------------------------------| ,-----------.
 | 
			
		||||
 * |Ctl|Gui|Alt|          Space                |Alt|Gui|App|Ctl| |Lef|Dow|Rig|
 | 
			
		||||
 * `-----------------------------------------------------------' `-----------'
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		||||
/* Layer 0: Default Layer
 | 
			
		||||
 *
 | 
			
		||||
 * ANSI:
 | 
			
		||||
 *
 | 
			
		||||
 * ,---.   ,---------------. ,---------------. ,---------------. ,-----------.
 | 
			
		||||
 * |Esc|   |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau|
 | 
			
		||||
 * `---'   `---------------' `---------------' `---------------' `-----------'
 | 
			
		||||
 * ,-----------------------------------------------------------. ,-----------.
 | 
			
		||||
 * |~  |  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp | |Ins|Hom|PgU|
 | 
			
		||||
 * |-----------------------------------------------------------| |-----------|
 | 
			
		||||
 * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|    \| |Del|End|PgD|
 | 
			
		||||
 * |-----------------------------------------------------------| `-----------'
 | 
			
		||||
 * |FN1   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return  |              
 | 
			
		||||
 * |-----------------------------------------------------------|     ,---.    
 | 
			
		||||
 * |Shft    |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift     |     |Up |    
 | 
			
		||||
 * |-----------------------------------------------------------| ,-----------.
 | 
			
		||||
 * |Ctl|Gui|Alt|          Space                |Alt|Gui|App|Ctl| |Lef|Dow|Rig|
 | 
			
		||||
 * `-----------------------------------------------------------' `-----------'
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
  KEYMAP(\
 | 
			
		||||
    ESC,  F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9, F10,  F11,  F12,       PSCR, SLCK,  BRK, \
 | 
			
		||||
    GRV,   1,   2,   3,   4,   5,   6,   7,   8,   9,   0, MINS,  EQL, BSPC,  INS, HOME, PGUP, \
 | 
			
		||||
    TAB,   Q,   W,   E,   R,   T,   Y,   U,   I,   O,   P, LBRC, RBRC, BSLS,  DEL,  END, PGDN, \
 | 
			
		||||
    FN1,   A,   S,   D,   F,   G,   H,   J,   K,   L, SCLN, QUOT,       ENT,                   \
 | 
			
		||||
    LSFT, 0,  Z,   X,   C,   V,   B,   N,   M, COMM,  DOT, SLSH,      RSFT,         UP,       \
 | 
			
		||||
    LCTL, LGUI, LALT,             SPC,                RALT, RGUI, APP, RCTL, LEFT, DOWN, RGHT),
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
/*  
 | 
			
		||||
 * ,---.   ,---------------. ,---------------. ,---------------. ,-----------.
 | 
			
		||||
 * |Esc|   |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Slp|
 | 
			
		||||
 * `---'   `---------------' `---------------' `---------------' `-----------'
 | 
			
		||||
 * ,-----------------------------------------------------------. ,-----------.
 | 
			
		||||
 * |~  |  1|  2|  3|  4|  5|  6|  7|  8|  9|Mut|V- |V+ |Backsp | |Ins|Hom|PgU|
 | 
			
		||||
 * |-----------------------------------------------------------| |-----------|
 | 
			
		||||
 * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|MSt|Ply|Prv|Nxt|Media| |Del|End|PgD|
 | 
			
		||||
 * |-----------------------------------------------------------| `-----------'
 | 
			
		||||
 * |FN1   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return  |              
 | 
			
		||||
 * |-----------------------------------------------------------|     ,---.    
 | 
			
		||||
 * |Shft    |  Z|  X|Clc|  V|  B|  N|  M|  ,|  .|  /|Caps      |     |Up |    
 | 
			
		||||
 * |-----------------------------------------------------------| ,-----------.
 | 
			
		||||
 * |Ctl|Gui|Alt|          Space                |Alt|Gui|App|Ctl| |Lef|Dow|Rig|
 | 
			
		||||
 * `-----------------------------------------------------------' `-----------'
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
 KEYMAP(\
 | 
			
		||||
    ESC,  F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9, F10,  F11,  F12,       PSCR, SLCK, SLEP, \
 | 
			
		||||
    GRV,   1,   2,   3,   4,   5,   6,   7,   8,   9,MUTE, VOLD, VOLU, BSPC,  INS, HOME, PGUP, \
 | 
			
		||||
    TAB,   Q,   W,   E,   R,   T,   Y,   U,   I,MSTP,MPLY, MPRV, MNXT, MSEL,  DEL,  END, PGDN, \
 | 
			
		||||
    FN1,   A,   S,   D,   F,   G,   H,   J,   K,   L, SCLN, QUOT,       ENT,                   \
 | 
			
		||||
    LSFT, NO,   Z,   X,CALC,   V,   B,   N,   M, COMM, DOT, SLSH,      CAPS,         UP,       \
 | 
			
		||||
    LCTL, LGUI, LALT,             SPC,                RALT, RGUI, APP, RCTL, LEFT, DOWN, RGHT),
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
uint8_t keymap_get_keycode(uint8_t layer, uint8_t row, uint8_t col)
 | 
			
		||||
{
 | 
			
		||||
    return KEYCODE(layer, row, col);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
uint8_t keymap_fn_layer(uint8_t index)
 | 
			
		||||
{
 | 
			
		||||
    return pgm_read_byte(&fn_layer[index]);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
uint8_t keymap_fn_keycode(uint8_t index)
 | 
			
		||||
{
 | 
			
		||||
    return pgm_read_byte(&fn_keycode[index]);
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										34
									
								
								keyboard/hid_liber/led.c
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										34
									
								
								keyboard/hid_liber/led.c
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,34 @@
 | 
			
		|||
/*
 | 
			
		||||
Copyright 2012 Jun Wako <wakojun@gmail.com>
 | 
			
		||||
 | 
			
		||||
This program is free software: you can redistribute it and/or modify
 | 
			
		||||
it under the terms of the GNU General Public License as published by
 | 
			
		||||
the Free Software Foundation, either version 2 of the License, or
 | 
			
		||||
(at your option) any later version.
 | 
			
		||||
 | 
			
		||||
This program is distributed in the hope that it will be useful,
 | 
			
		||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
			
		||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
			
		||||
GNU General Public License for more details.
 | 
			
		||||
 | 
			
		||||
You should have received a copy of the GNU General Public License
 | 
			
		||||
along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		||||
*/
 | 
			
		||||
 | 
			
		||||
#include <avr/io.h>
 | 
			
		||||
#include "stdint.h"
 | 
			
		||||
#include "led.h"
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
void led_set(uint8_t usb_led)
 | 
			
		||||
{
 | 
			
		||||
    if (usb_led & (1<<USB_LED_CAPS_LOCK))
 | 
			
		||||
        PORTB &= ~(1<<5);
 | 
			
		||||
    else
 | 
			
		||||
        PORTB |= (1<<5);
 | 
			
		||||
 | 
			
		||||
    if (usb_led & (1<<USB_LED_SCROLL_LOCK))
 | 
			
		||||
        PORTB &= ~(1<<6);
 | 
			
		||||
    else
 | 
			
		||||
        PORTB |= (1<<6);
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										233
									
								
								keyboard/hid_liber/matrix.c
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										233
									
								
								keyboard/hid_liber/matrix.c
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,233 @@
 | 
			
		|||
/* Copyright 2012 Jun Wako <wakojun@gmail.com>
 | 
			
		||||
 *
 | 
			
		||||
 * This is heavily based on hid_liber/board.{c|h}.
 | 
			
		||||
 * https://github.com/BathroomEpiphanies/AVR-Keyboard
 | 
			
		||||
 *
 | 
			
		||||
 * Copyright (c) 2012 Fredrik Atmer, Bathroom Epiphanies Inc
 | 
			
		||||
 * http://bathroomepiphanies.com
 | 
			
		||||
 *
 | 
			
		||||
 * As for liscensing consult with the original files or its author.
 | 
			
		||||
 */
 | 
			
		||||
#include <stdint.h>
 | 
			
		||||
#include <stdbool.h>
 | 
			
		||||
#include <avr/io.h>
 | 
			
		||||
#include <util/delay.h>
 | 
			
		||||
#include "print.h"
 | 
			
		||||
#include "debug.h"
 | 
			
		||||
#include "util.h"
 | 
			
		||||
#include "matrix.h"
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
#ifndef DEBOUNCE
 | 
			
		||||
#   define DEBOUNCE	0
 | 
			
		||||
#endif
 | 
			
		||||
static uint8_t debouncing = DEBOUNCE;
 | 
			
		||||
 | 
			
		||||
// bit array of key state(1:on, 0:off)
 | 
			
		||||
static matrix_row_t *matrix;
 | 
			
		||||
static matrix_row_t *matrix_debounced;
 | 
			
		||||
static matrix_row_t _matrix0[MATRIX_ROWS];
 | 
			
		||||
static matrix_row_t _matrix1[MATRIX_ROWS];
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
#define _DDRA (uint8_t *const)&DDRA
 | 
			
		||||
#define _DDRB (uint8_t *const)&DDRB
 | 
			
		||||
#define _DDRC (uint8_t *const)&DDRC
 | 
			
		||||
#define _DDRD (uint8_t *const)&DDRD
 | 
			
		||||
#define _DDRE (uint8_t *const)&DDRE
 | 
			
		||||
#define _DDRF (uint8_t *const)&DDRF
 | 
			
		||||
 | 
			
		||||
#define _PINA (uint8_t *const)&PINA
 | 
			
		||||
#define _PINB (uint8_t *const)&PINB
 | 
			
		||||
#define _PINC (uint8_t *const)&PINC
 | 
			
		||||
#define _PIND (uint8_t *const)&PIND
 | 
			
		||||
#define _PINE (uint8_t *const)&PINE
 | 
			
		||||
#define _PINF (uint8_t *const)&PINF
 | 
			
		||||
 | 
			
		||||
#define _PORTA (uint8_t *const)&PORTA
 | 
			
		||||
#define _PORTB (uint8_t *const)&PORTB
 | 
			
		||||
#define _PORTC (uint8_t *const)&PORTC
 | 
			
		||||
#define _PORTD (uint8_t *const)&PORTD
 | 
			
		||||
#define _PORTE (uint8_t *const)&PORTE
 | 
			
		||||
#define _PORTF (uint8_t *const)&PORTF
 | 
			
		||||
 | 
			
		||||
#define _BIT0 0x01
 | 
			
		||||
#define _BIT1 0x02
 | 
			
		||||
#define _BIT2 0x04
 | 
			
		||||
#define _BIT3 0x08
 | 
			
		||||
#define _BIT4 0x10
 | 
			
		||||
#define _BIT5 0x20
 | 
			
		||||
#define _BIT6 0x40
 | 
			
		||||
#define _BIT7 0x80
 | 
			
		||||
 | 
			
		||||
/* Specifies the ports and pin numbers for the rows */
 | 
			
		||||
static
 | 
			
		||||
uint8_t *const row_ddr[MATRIX_ROWS] = {
 | 
			
		||||
                                           _DDRB,                  _DDRB,
 | 
			
		||||
                                                           _DDRC,  _DDRC,
 | 
			
		||||
           _DDRD,  _DDRD,  _DDRD,  _DDRD,  _DDRD,  _DDRD,  _DDRD,  _DDRD,
 | 
			
		||||
           _DDRF,  _DDRF,                  _DDRF,  _DDRF,  _DDRF,  _DDRF};
 | 
			
		||||
 | 
			
		||||
static
 | 
			
		||||
uint8_t *const row_port[MATRIX_ROWS] = {
 | 
			
		||||
                                          _PORTB,                 _PORTB,
 | 
			
		||||
                                                          _PORTC, _PORTC,
 | 
			
		||||
          _PORTD, _PORTD, _PORTD, _PORTD, _PORTD, _PORTD, _PORTD, _PORTD,
 | 
			
		||||
          _PORTF, _PORTF,                 _PORTF, _PORTF, _PORTF, _PORTF};
 | 
			
		||||
 | 
			
		||||
static
 | 
			
		||||
uint8_t *const row_pin[MATRIX_ROWS] = {
 | 
			
		||||
                                           _PINB,                  _PINB,
 | 
			
		||||
                                                           _PINC,  _PINC,
 | 
			
		||||
           _PIND,  _PIND,  _PIND,  _PIND,  _PIND,  _PIND,  _PIND,  _PIND,
 | 
			
		||||
           _PINF,  _PINF,                  _PINF,  _PINF,  _PINF,  _PINF};
 | 
			
		||||
 | 
			
		||||
static
 | 
			
		||||
const uint8_t row_bit[MATRIX_ROWS] = {
 | 
			
		||||
                                           _BIT4,                  _BIT7,
 | 
			
		||||
                                                           _BIT6,  _BIT7,
 | 
			
		||||
           _BIT0,  _BIT1,  _BIT2,  _BIT3,  _BIT4,  _BIT5,  _BIT6,  _BIT7,
 | 
			
		||||
           _BIT0,  _BIT1,                  _BIT4,  _BIT5,  _BIT6,  _BIT7};
 | 
			
		||||
 | 
			
		||||
static
 | 
			
		||||
const uint8_t mask = 0x0E;
 | 
			
		||||
 | 
			
		||||
/* Specifies the ports and pin numbers for the columns */
 | 
			
		||||
static
 | 
			
		||||
const uint8_t   col_bit[MATRIX_COLS] = {  0x00,   0x02,   0x04,   0x06,   0x08,   0x0A,   0x0C,   0x0E};
 | 
			
		||||
 | 
			
		||||
static
 | 
			
		||||
inline void pull_column(int col) {
 | 
			
		||||
  PORTB = col_bit[col] | (PORTB & ~mask);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static
 | 
			
		||||
inline void release_column(int col) {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
/* PORTB is set as input with pull-up resistors
 | 
			
		||||
   PORTC,D,E,F are set to high output */
 | 
			
		||||
static
 | 
			
		||||
void setup_io_pins(void) {
 | 
			
		||||
  uint8_t row;
 | 
			
		||||
  DDRB  |=  0x0E;
 | 
			
		||||
  PORTB &= ~0x0E;
 | 
			
		||||
  for(row = 0; row < MATRIX_ROWS; row++) {
 | 
			
		||||
    *row_ddr[row]  &= ~row_bit[row];
 | 
			
		||||
    *row_port[row] &= ~row_bit[row];
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static
 | 
			
		||||
void setup_leds(void) {
 | 
			
		||||
  DDRB  |=  0x60;
 | 
			
		||||
  PORTB |=  0x60;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
inline
 | 
			
		||||
uint8_t matrix_rows(void)
 | 
			
		||||
{
 | 
			
		||||
    return MATRIX_ROWS;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
inline
 | 
			
		||||
uint8_t matrix_cols(void)
 | 
			
		||||
{
 | 
			
		||||
    return MATRIX_COLS;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void matrix_init(void)
 | 
			
		||||
{
 | 
			
		||||
    // To use PORTF disable JTAG with writing JTD bit twice within four cycles.
 | 
			
		||||
    MCUCR |= (1<<JTD);
 | 
			
		||||
    MCUCR |= (1<<JTD);
 | 
			
		||||
	
 | 
			
		||||
    // initialize row and col
 | 
			
		||||
    setup_io_pins();
 | 
			
		||||
    setup_leds();
 | 
			
		||||
 | 
			
		||||
    // initialize matrix state: all keys off
 | 
			
		||||
    for (uint8_t i=0; i < MATRIX_ROWS; i++) _matrix0[i] = 0x00;
 | 
			
		||||
    for (uint8_t i=0; i < MATRIX_ROWS; i++) _matrix1[i] = 0x00;
 | 
			
		||||
    matrix = _matrix0;
 | 
			
		||||
    matrix_debounced = _matrix1;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
uint8_t matrix_scan(void)
 | 
			
		||||
{
 | 
			
		||||
    if (!debouncing) {
 | 
			
		||||
        uint8_t *tmp = matrix_debounced;
 | 
			
		||||
        matrix_debounced = matrix;
 | 
			
		||||
        matrix = tmp;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    for (uint8_t col = 0; col < MATRIX_COLS; col++) {  // 0-7
 | 
			
		||||
        pull_column(col);   // output hi on theline
 | 
			
		||||
        _delay_us(3);       // without this wait it won't read stable value.
 | 
			
		||||
        for (uint8_t row = 0; row < MATRIX_ROWS; row++) {  // 0-17
 | 
			
		||||
            bool prev_bit = matrix[row] & (1<<col);
 | 
			
		||||
            bool curr_bit = *row_pin[row] & row_bit[row];
 | 
			
		||||
            if (prev_bit != curr_bit) {
 | 
			
		||||
                matrix[row] ^= (1<<col);
 | 
			
		||||
                if (debouncing) {
 | 
			
		||||
                    debug("bounce!: "); debug_hex(debouncing); print("\n");
 | 
			
		||||
                }
 | 
			
		||||
                debouncing = DEBOUNCE;
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
        release_column(col);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    if (debouncing) {
 | 
			
		||||
        debouncing--;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    return 1;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
bool matrix_is_modified(void)
 | 
			
		||||
{
 | 
			
		||||
    // NOTE: no longer used
 | 
			
		||||
    return true;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
inline
 | 
			
		||||
bool matrix_has_ghost(void)
 | 
			
		||||
{
 | 
			
		||||
    return false;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
inline
 | 
			
		||||
bool matrix_is_on(uint8_t row, uint8_t col)
 | 
			
		||||
{
 | 
			
		||||
    return (matrix_debounced[row] & (1<<col));
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
inline
 | 
			
		||||
matrix_row_t matrix_get_row(uint8_t row)
 | 
			
		||||
{
 | 
			
		||||
    return matrix_debounced[row];
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void matrix_print(void)
 | 
			
		||||
{
 | 
			
		||||
    print("\nr/c 01234567\n");
 | 
			
		||||
    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
 | 
			
		||||
        phex(row); print(": ");
 | 
			
		||||
        pbin_reverse(matrix_get_row(row));
 | 
			
		||||
        print("\n");
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
uint8_t matrix_key_count(void)
 | 
			
		||||
{
 | 
			
		||||
    uint8_t count = 0;
 | 
			
		||||
    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
 | 
			
		||||
        for (uint8_t j = 0; j < MATRIX_COLS; j++) {
 | 
			
		||||
            if (matrix_is_on(i, j))
 | 
			
		||||
                count++;
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
    return count;
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			@ -128,7 +128,7 @@ static const uint8_t PROGMEM endpoint_config_table[] = {
 | 
			
		|||
// spec and relevant portions of any USB class specifications!
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
static uint8_t PROGMEM device_descriptor[] = {
 | 
			
		||||
static const uint8_t PROGMEM device_descriptor[] = {
 | 
			
		||||
	18,					// bLength
 | 
			
		||||
	1,					// bDescriptorType
 | 
			
		||||
	0x00, 0x02,				// bcdUSB
 | 
			
		||||
| 
						 | 
				
			
			@ -146,7 +146,7 @@ static uint8_t PROGMEM device_descriptor[] = {
 | 
			
		|||
};
 | 
			
		||||
 | 
			
		||||
// Keyboard Protocol 1, HID 1.11 spec, Appendix B, page 59-60
 | 
			
		||||
static uint8_t PROGMEM keyboard_hid_report_desc[] = {
 | 
			
		||||
static const uint8_t PROGMEM keyboard_hid_report_desc[] = {
 | 
			
		||||
        0x05, 0x01,          // Usage Page (Generic Desktop),
 | 
			
		||||
        0x09, 0x06,          // Usage (Keyboard),
 | 
			
		||||
        0xA1, 0x01,          // Collection (Application),
 | 
			
		||||
| 
						 | 
				
			
			@ -181,7 +181,7 @@ static uint8_t PROGMEM keyboard_hid_report_desc[] = {
 | 
			
		|||
        0xc0                 // End Collection
 | 
			
		||||
};
 | 
			
		||||
#ifdef NKRO_ENABLE
 | 
			
		||||
static uint8_t PROGMEM keyboard2_hid_report_desc[] = {
 | 
			
		||||
static const uint8_t PROGMEM keyboard2_hid_report_desc[] = {
 | 
			
		||||
        0x05, 0x01,                     // Usage Page (Generic Desktop),
 | 
			
		||||
        0x09, 0x06,                     // Usage (Keyboard),
 | 
			
		||||
        0xA1, 0x01,                     // Collection (Application),
 | 
			
		||||
| 
						 | 
				
			
			@ -222,7 +222,7 @@ static uint8_t PROGMEM keyboard2_hid_report_desc[] = {
 | 
			
		|||
// http://www.microchip.com/forums/tm.aspx?high=&m=391435&mpage=1#391521
 | 
			
		||||
// http://www.keil.com/forum/15671/
 | 
			
		||||
// http://www.microsoft.com/whdc/device/input/wheel.mspx
 | 
			
		||||
static uint8_t PROGMEM mouse_hid_report_desc[] = {
 | 
			
		||||
static const uint8_t PROGMEM mouse_hid_report_desc[] = {
 | 
			
		||||
    /* mouse */
 | 
			
		||||
    0x05, 0x01,                    // USAGE_PAGE (Generic Desktop)
 | 
			
		||||
    0x09, 0x02,                    // USAGE (Mouse)
 | 
			
		||||
| 
						 | 
				
			
			@ -273,7 +273,7 @@ static uint8_t PROGMEM mouse_hid_report_desc[] = {
 | 
			
		|||
};
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
static uint8_t PROGMEM debug_hid_report_desc[] = {
 | 
			
		||||
static const uint8_t PROGMEM debug_hid_report_desc[] = {
 | 
			
		||||
	0x06, 0x31, 0xFF,			// Usage Page 0xFF31 (vendor defined)
 | 
			
		||||
	0x09, 0x74,				// Usage 0x74
 | 
			
		||||
	0xA1, 0x53,				// Collection 0x53
 | 
			
		||||
| 
						 | 
				
			
			@ -289,7 +289,7 @@ static uint8_t PROGMEM debug_hid_report_desc[] = {
 | 
			
		|||
#ifdef EXTRAKEY_ENABLE
 | 
			
		||||
// audio controls & system controls
 | 
			
		||||
// http://www.microsoft.com/whdc/archive/w2kbd.mspx
 | 
			
		||||
static uint8_t PROGMEM extra_hid_report_desc[] = {
 | 
			
		||||
static const uint8_t PROGMEM extra_hid_report_desc[] = {
 | 
			
		||||
    /* system control */
 | 
			
		||||
    0x05, 0x01,                    // USAGE_PAGE (Generic Desktop)
 | 
			
		||||
    0x09, 0x80,                    // USAGE (System Control)
 | 
			
		||||
| 
						 | 
				
			
			@ -348,7 +348,7 @@ static uint8_t PROGMEM extra_hid_report_desc[] = {
 | 
			
		|||
 | 
			
		||||
#define NUM_INTERFACES                  (KBD2_HID_DESC_NUM + 1)
 | 
			
		||||
#define CONFIG1_DESC_SIZE               (9+(9+9+7)*NUM_INTERFACES)
 | 
			
		||||
static uint8_t PROGMEM config1_descriptor[CONFIG1_DESC_SIZE] = {
 | 
			
		||||
static const uint8_t PROGMEM config1_descriptor[CONFIG1_DESC_SIZE] = {
 | 
			
		||||
	// configuration descriptor, USB spec 9.6.3, page 264-266, Table 9-10
 | 
			
		||||
	9, 					// bLength;
 | 
			
		||||
	2,					// bDescriptorType;
 | 
			
		||||
| 
						 | 
				
			
			@ -515,17 +515,17 @@ struct usb_string_descriptor_struct {
 | 
			
		|||
	uint8_t bDescriptorType;
 | 
			
		||||
	int16_t wString[];
 | 
			
		||||
};
 | 
			
		||||
static struct usb_string_descriptor_struct PROGMEM string0 = {
 | 
			
		||||
static const struct usb_string_descriptor_struct PROGMEM string0 = {
 | 
			
		||||
	4,
 | 
			
		||||
	3,
 | 
			
		||||
	{0x0409}
 | 
			
		||||
};
 | 
			
		||||
static struct usb_string_descriptor_struct PROGMEM string1 = {
 | 
			
		||||
static const struct usb_string_descriptor_struct PROGMEM string1 = {
 | 
			
		||||
	sizeof(STR_MANUFACTURER),
 | 
			
		||||
	3,
 | 
			
		||||
	STR_MANUFACTURER
 | 
			
		||||
};
 | 
			
		||||
static struct usb_string_descriptor_struct PROGMEM string2 = {
 | 
			
		||||
static const struct usb_string_descriptor_struct PROGMEM string2 = {
 | 
			
		||||
	sizeof(STR_PRODUCT),
 | 
			
		||||
	3,
 | 
			
		||||
	STR_PRODUCT
 | 
			
		||||
| 
						 | 
				
			
			@ -533,7 +533,7 @@ static struct usb_string_descriptor_struct PROGMEM string2 = {
 | 
			
		|||
 | 
			
		||||
// This table defines which descriptor data is sent for each specific
 | 
			
		||||
// request from the host (in wValue and wIndex).
 | 
			
		||||
static struct descriptor_list_struct {
 | 
			
		||||
static const struct descriptor_list_struct {
 | 
			
		||||
	uint16_t	wValue;     // descriptor type
 | 
			
		||||
	uint16_t	wIndex;
 | 
			
		||||
	const uint8_t	*addr;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue