diff options
| -rw-r--r-- | keyboard/gh60/Makefile.lufa | 123 | ||||
| -rw-r--r-- | keyboard/gh60/Makefile.pjrc | 93 | ||||
| -rw-r--r-- | keyboard/gh60/README.md | 89 | ||||
| -rw-r--r-- | keyboard/gh60/config.h | 50 | ||||
| -rw-r--r-- | keyboard/gh60/keymap.c | 202 | ||||
| -rw-r--r-- | keyboard/gh60/led.c | 34 | ||||
| -rw-r--r-- | keyboard/gh60/matrix.c | 224 | ||||
| -rw-r--r-- | protocol/pjrc/main.c | 3 | 
8 files changed, 815 insertions, 3 deletions
diff --git a/keyboard/gh60/Makefile.lufa b/keyboard/gh60/Makefile.lufa new file mode 100644 index 000000000..45402bb38 --- /dev/null +++ b/keyboard/gh60/Makefile.lufa @@ -0,0 +1,123 @@ +#---------------------------------------------------------------------------- +# 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 = gh60_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 + +plain: OPT_DEFS += -DPLAIN_MAP +plain: all diff --git a/keyboard/gh60/Makefile.pjrc b/keyboard/gh60/Makefile.pjrc new file mode 100644 index 000000000..6b3a8d1ac --- /dev/null +++ b/keyboard/gh60/Makefile.pjrc @@ -0,0 +1,93 @@ +#---------------------------------------------------------------------------- +# 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 = gh60_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 + +plain: OPT_DEFS += -DPLAIN_MAP +plain: all diff --git a/keyboard/gh60/README.md b/keyboard/gh60/README.md new file mode 100644 index 000000000..73eb4b6d5 --- /dev/null +++ b/keyboard/gh60/README.md @@ -0,0 +1,89 @@ +GH60 keyboard firmware +====================== +DIY compact keyboard designed and run by komar007 and Geekhack community. + +## Threads on Geekhack.org +- [Prototyping](http://geekhack.org/index.php?topic=34959.0) +- [Beta-test](http://geekhack.org/index.php?topic=37570.0) + + +## Build +Move to this directory then just run `make` like: + +   $ make -f Makfile.pjrc + + +## Keymap +See keymap.c to define your own favourite keymap. + +###Keymap with funky layers. +    Layer 0: Default Layer +    ,-----------------------------------------------------------. +    |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp | +    |-----------------------------------------------------------| +    |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|    \| +    |-----------------------------------------------------------| +    |Caps  |  A|  S|  D|  F|  G|  H|  J|  K|  L|Fn3|  '|Return  | +    |-----------------------------------------------------------| +    |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|Fn2|Shift     | +    |-----------------------------------------------------------| +    |Ctrl|Gui |Alt |      Space             |Alt |Gui |App |Fn1 | +    `-----------------------------------------------------------' + +    Layer 1: HHKB mode +    ,-----------------------------------------------------------. +    |Esc| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Delete | +    |-----------------------------------------------------------| +    |Caps |   |   |   |   |   |   |   |Psc|Slk|Pus|Up |   |Inser| +    |-----------------------------------------------------------| +    |Contro|VoD|VoU|Mut|   |   |  *|  /|Hom|PgU|Lef|Rig|Enter   | +    |-----------------------------------------------------------| +    |Shift   |   |   |   |   |   |  +|  -|End|PgD|Dow|Shift     | +    |-----------------------------------------------------------| +    |Ctrl|Gui |Alt |      Space             |Alt |Gui |App |xxx | +    `-----------------------------------------------------------' + +    Layer 2: Vi mode +    ,-----------------------------------------------------------. +    |  `| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Backsp | +    |-----------------------------------------------------------| +    |Tab  |Hom|PgD|Up |PgU|End|Hom|PgD|PgU|End|   |   |   |     | +    |-----------------------------------------------------------| +    |Contro|   |Lef|Dow|Rig|   |Lef|Dow|Up |Rig|   |   |Return  | +    |-----------------------------------------------------------| +    |Shift   |   |   |   |   |   |Hom|PgD|PgU|End|xxx|Shift     | +    |-----------------------------------------------------------| +    |Ctrl|Gui |Alt |      Space             |Alt |Gui |App |Ctrl| +    `-----------------------------------------------------------' + +    Layer 3: Mouse mode +    ,-----------------------------------------------------------. +    |  `| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Backsp | +    |-----------------------------------------------------------| +    |Tab  |MwL|MwD|McU|MwU|MwR|MwL|MwD|MwU|MwR|   |   |   |     | +    |-----------------------------------------------------------| +    |Contro|   |McL|McD|McR|   |McL|McD|McU|McR|xxx|   |Return  | +    |-----------------------------------------------------------| +    |Shift   |   |   |Mb1|Mb2|Mb3|Mb2|Mb1|   |   |   |Shift     | +    |-----------------------------------------------------------| +    |Ctrl|Gui |Alt |      Space             |Alt |Gui |xxx |Ctrl| +    `-----------------------------------------------------------' +    Mc: Mouse Cursor / Mb: Mouse Button / Mw: Mouse Wheel  + +### Plain keymap without Fn layer. +This will be useful if you want to use key mapping tool like AHK. +To get this plain keymap run: + +    $ make -f Makefile.pjrc plain + +    ,-----------------------------------------------------------. +    |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp | +    |-----------------------------------------------------------| +    |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|    \| +    |-----------------------------------------------------------| +    |Caps  |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return  | +    |-----------------------------------------------------------| +    |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift     | +    |-----------------------------------------------------------| +    |Ctrl|Gui |Alt |      Space             |Alt |Gui |App |Ctrl| +    `-----------------------------------------------------------' diff --git a/keyboard/gh60/config.h b/keyboard/gh60/config.h new file mode 100644 index 000000000..6e7b1bd7a --- /dev/null +++ b/keyboard/gh60/config.h @@ -0,0 +1,50 @@ +/* +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      0x6060 +#define DEVICE_VER      0x0001 +#define MANUFACTURER    geekhack +#define PRODUCT         GH60 + + +/* message strings */ +#define DESCRIPTION     t.m.k. keyboard firmware for GH60 + + +/* matrix size */ +#define MATRIX_ROWS 5 +#define MATRIX_COLS 14 + +/* define if matrix has ghost */ +//#define MATRIX_HAS_GHOST + +/* Set 0 if need no debouncing */ +#define DEBOUNCE    5 + + +/* key combination for command */ +#define IS_COMMAND() ( \ +    keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ +) + +#endif diff --git a/keyboard/gh60/keymap.c b/keyboard/gh60/keymap.c new file mode 100644 index 000000000..2608c98c2 --- /dev/null +++ b/keyboard/gh60/keymap.c @@ -0,0 +1,202 @@ +/* +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 <stdint.h> +#include <stdbool.h> +#include <avr/pgmspace.h> +#include "keycode.h" +#include "print.h" +#include "debug.h" +#include "util.h" +#include "keymap.h" + + +/* GH60 keymap definition macro  + * K2C, K31 and  K3C are extra keys for ISO + */ +#define KEYMAP( \ +    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \ +    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ +    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \ +    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \ +    K40, K41, K42,           K45,                     K4A, K4B, K4C, K4D  \ +) { \ +    { KC_##K00, KC_##K01, KC_##K02, KC_##K03, KC_##K04, KC_##K05, KC_##K06, KC_##K07, KC_##K08, KC_##K09, KC_##K0A, KC_##K0B, KC_##K0C, KC_##K0D }, \ +    { KC_##K10, KC_##K11, KC_##K12, KC_##K13, KC_##K14, KC_##K15, KC_##K16, KC_##K17, KC_##K18, KC_##K19, KC_##K1A, KC_##K1B, KC_##K1C, KC_##K1D }, \ +    { KC_##K20, KC_##K21, KC_##K22, KC_##K23, KC_##K24, KC_##K25, KC_##K26, KC_##K27, KC_##K28, KC_##K29, KC_##K2A, KC_##K2B, KC_##K2C, KC_##K2D }, \ +    { KC_##K30, KC_##K31, KC_##K32, KC_##K33, KC_##K34, KC_##K35, KC_##K36, KC_##K37, KC_##K38, KC_##K39, KC_##K3A, KC_##K3B, KC_##K3C, KC_##K3D }, \ +    { KC_##K40, KC_##K41, KC_##K42, KC_NO,    KC_NO,    KC_##K45, KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_##K4A, KC_##K4B, KC_##K4C, KC_##K4D }  \ +} + +/* ANSI valiant. No extra keys for ISO */ +#define KEYMAP_ANSI( \ +    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \ +    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ +    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, \ +    K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,           K3D, \ +    K40, K41, K42,           K45,                     K4A, K4B, K4C, K4D  \ +) KEYMAP( \  +    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \ +    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ +    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, NO,  K2D, \ +    K30, NO,  K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, NO,  K3D, \ +    K40, K41, K42,           K45,                     K4A, K4B, K4C, K4D  \ +) + +#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 +    3,              // Fn4 +    0,              // Fn5 +    0,              // Fn6 +    0               // 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_SLSH,        // Fn2 +    KC_SCLN,        // Fn3 +    KC_NO,          // Fn4 +    KC_NO,          // Fn5 +    KC_NO,          // Fn6 +    KC_NO           // Fn7 +}; + +static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +#ifdef PLAIN_MAP +    /* Layer 0: Default Layer +     * ,-----------------------------------------------------------. +     * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp | +     * |-----------------------------------------------------------| +     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|    \| +     * |-----------------------------------------------------------| +     * |Caps  |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return  | +     * |-----------------------------------------------------------| +     * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift     | +     * |-----------------------------------------------------------| +     * |Ctrl|Gui |Alt |      Space             |Alt |Gui |App |Ctrl| +     * `-----------------------------------------------------------' +     */ +    KEYMAP(ESC, 1,   2,   3,   4,   5,   6,   7,   8,   9,   0,   MINS,EQL, BSPC, \ +           TAB, Q,   W,   E,   R,   T,   Y,   U,   I,   O,   P,   LBRC,RBRC,BSLS, \ +           CAPS,A,   S,   D,   F,   G,   H,   J,   K,   L,   SCLN,QUOT,NO,  ENT,  \ +           LSFT,NO,  Z,   X,   C,   V,   B,   N,   M,   COMM,DOT, SLSH,NO,  RSFT, \ +           LCTL,LGUI,LALT,          SPC,                     RALT,RGUI,APP, RCTL), +#else +    /* Layer 0: Default Layer +     * ,-----------------------------------------------------------. +     * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp | +     * |-----------------------------------------------------------| +     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|    \| +     * |-----------------------------------------------------------| +     * |Caps  |  A|  S|  D|  F|  G|  H|  J|  K|  L|Fn3|  '|Return  | +     * |-----------------------------------------------------------| +     * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|Fn2|Shift     | +     * |-----------------------------------------------------------| +     * |Ctrl|Gui |Alt |      Space             |Alt |Fn4 |Fn4 |Fn1 | +     * `-----------------------------------------------------------' +     */ +    KEYMAP_ANSI( +        ESC, 1,   2,   3,   4,   5,   6,   7,   8,   9,   0,   MINS,EQL, BSPC, \ +        TAB, Q,   W,   E,   R,   T,   Y,   U,   I,   O,   P,   LBRC,RBRC,BSLS, \ +        LCTL,A,   S,   D,   F,   G,   H,   J,   K,   L,   FN3, QUOT,     ENT,  \ +        LSFT,Z,   X,   C,   V,   B,   N,   M,   COMM,DOT, FN2,           RSFT, \ +        LCTL,LGUI,LALT,          SPC,                     RALT,FN4, FN4, FN1), +    /* Layer 1: HHKB mode +     * ,-----------------------------------------------------------. +     * |Esc| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Delete | +     * |-----------------------------------------------------------| +     * |Caps |   |   |   |   |   |   |   |Psc|Slk|Pus|Up |   |Inser| +     * |-----------------------------------------------------------| +     * |Contro|VoD|VoU|Mut|   |   |  *|  /|Hom|PgU|Lef|Rig|Enter   | +     * |-----------------------------------------------------------| +     * |Shift   |   |   |   |   |   |  +|  -|End|PgD|Dow|Shift     | +     * |-----------------------------------------------------------| +     * |Ctrl|Gui |Alt |      Space             |Alt |Gui |App |xxx | +     * `-----------------------------------------------------------' +     */  +    KEYMAP_ANSI( +        PWR, F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12, DEL,  \ +        CAPS,NO,  NO,  NO,  NO,  NO,  NO,  NO,  PSCR,SLCK,PAUS,UP,  NO,  INS,  \ +        LCTL,VOLD,VOLU,MUTE,NO,  NO,  PAST,PSLS,HOME,PGUP,LEFT,RGHT,     ENT,  \ +        LSFT,NO,  NO,  NO,  NO,  NO,  PPLS,PMNS,END, PGDN,DOWN,          RSFT, \ +        LCTL,LGUI,LALT,          SPC,                     RALT,RGUI,APP, FN1), +    /* Layer 2: Vi mode (Slash) +     * ,-----------------------------------------------------------. +     * |  `| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Backsp | +     * |-----------------------------------------------------------| +     * |Tab  |Hom|PgD|Up |PgU|End|Hom|PgD|PgU|End|   |   |   |     | +     * |-----------------------------------------------------------| +     * |Contro|   |Lef|Dow|Rig|   |Lef|Dow|Up |Rig|   |   |Return  | +     * |-----------------------------------------------------------| +     * |Shift   |   |   |   |   |   |Hom|PgD|PgU|End|xxx|Shift     | +     * |-----------------------------------------------------------| +     * |Ctrl|Gui |Alt |      Space             |Alt |Gui |App |Ctrl| +     * `-----------------------------------------------------------' +     */ +    KEYMAP_ANSI( +        GRV, F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12, BSPC, \ +        TAB, HOME,PGDN,UP,  PGUP,END, HOME,PGDN,PGUP,END, NO,  NO,  NO,  NO,   \ +        LCTL,NO,  LEFT,DOWN,RGHT,NO,  LEFT,DOWN,UP,  RGHT,NO,  NO,       ENT,  \ +        LSFT,NO,  NO,  NO,  NO,  NO,  HOME,PGDN,PGUP,END, FN2,           RSFT, \ +        LCTL,LGUI,LALT,          SPC,                     RALT,RGUI,APP, RCTL), +    /* Layer 3: Mouse mode (Semicolon/App) +     * ,-----------------------------------------------------------. +     * |  `| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Backsp | +     * |-----------------------------------------------------------| +     * |Tab  |   |   |   |   |   |MwL|MwD|MwU|MwR|   |   |   |     | +     * |-----------------------------------------------------------| +     * |Contro|   |Ac0|Ac1|Ac1|   |McL|McD|McU|McR|xxx|   |Return  | +     * |-----------------------------------------------------------| +     * |Shift   |   |   |   |   |Mb3|Mb2|Mb1|Mb4|Mb5|   |Shift     | +     * |-----------------------------------------------------------| +     * |Ctrl|Gui |Alt |      Space             |    |xxx |xxx |    | +     * `-----------------------------------------------------------' +     * Mc: Mouse Cursor / Mb: Mouse Button / Mw: Mouse Wheel  +     */ +    KEYMAP_ANSI( +        GRV, F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12, BSPC, \ +        TAB, NO,  NO,  NO,  NO,  NO,  WH_L,WH_D,WH_U,WH_R,NO,  NO,  NO,  NO,   \ +        LCTL,NO,  ACL0,ACL1,ACL2,NO,  MS_L,MS_D,MS_U,MS_R,FN3, NO,       ENT,  \ +        LSFT,NO,  NO,  NO,  NO,  BTN3,BTN2,BTN1,BTN4,BTN5,NO,            RSFT, \ +        LCTL,LGUI,LALT,          BTN1,                    NO,  FN4, FN4, NO  ), +#endif +}; + + +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]); +} diff --git a/keyboard/gh60/led.c b/keyboard/gh60/led.c new file mode 100644 index 000000000..62abcd79d --- /dev/null +++ b/keyboard/gh60/led.c @@ -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)) { +        // output low +        DDRB |= (1<<2); +        PORTB &= ~(1<<2); +    } else { +        // Hi-Z +        DDRB &= ~(1<<2); +        PORTB &= ~(1<<2); +    } +} diff --git a/keyboard/gh60/matrix.c b/keyboard/gh60/matrix.c new file mode 100644 index 000000000..6ded8158f --- /dev/null +++ b/keyboard/gh60/matrix.c @@ -0,0 +1,224 @@ +/* +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/>. +*/ + +/* + * scan matrix + */ +#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	5 +#endif +static uint8_t debouncing = DEBOUNCE; + +/* matrix state(1:on, 0:off) */ +static uint16_t *matrix; +static uint16_t *matrix_debouncing; +static uint16_t matrix0[MATRIX_ROWS]; +static uint16_t matrix1[MATRIX_ROWS]; +static bool is_modified; + +static uint16_t read_cols(void); +static void init_cols(void); +static void unselect_rows(void); +static void select_row(uint8_t row); + + +inline +uint8_t matrix_rows(void) +{ +    return MATRIX_ROWS; +} + +inline +uint8_t matrix_cols(void) +{ +    return MATRIX_COLS; +} + +void matrix_init(void) +{ +    // initialize row and col +    unselect_rows(); +    init_cols(); + +    // initialize matrix state: all keys off +    matrix = matrix0; +    matrix_debouncing = matrix1; +    for (uint8_t i=0; i < MATRIX_ROWS; i++) { +        matrix[i] = 0; +        matrix_debouncing[i] = 0; +    } +    is_modified = false; +} + +uint8_t matrix_scan(void) +{ +    for (uint8_t i = 0; i < MATRIX_ROWS; i++) { +        //unselect_rows(); +        select_row(i); +        _delay_us(30);  // without this wait read unstable value. +        uint16_t cols = read_cols(); +        if (matrix_debouncing[i] != cols) { +            matrix_debouncing[i] = cols; +            if (debouncing) { +                debug("bounce!: "); debug_hex(debouncing); debug("\n"); +            } +            debouncing = DEBOUNCE; +            is_modified = false; +        } +        unselect_rows(); +    } +    //unselect_rows(); + +    if (debouncing) { +        debouncing--; +        _delay_ms(1); +    } else { +        uint16_t *tmp = matrix; +        matrix = matrix_debouncing; +        matrix_debouncing = tmp; +        is_modified = true; +    } + +    return 1; +} + +bool matrix_is_modified(void) +{ +    return is_modified; +} + +inline +bool matrix_has_ghost(void) +{ +    return false; +} + +inline +bool matrix_is_on(uint8_t row, uint8_t col) +{ +    return (matrix[row] & (1<<col)); +} + +inline +uint16_t matrix_get_row(uint8_t row) +{ +    return matrix[row]; +} + +void matrix_print(void) +{ +    print("\nr/c 01234567890ABCDEF\n"); +    for (uint8_t row = 0; row < MATRIX_ROWS; row++) { +        phex(row); print(": "); +        pbin_reverse16(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++) { +        count += bitpop16(matrix[i]); +    } +    return count; +} + +/* Column pin configuration + * col: 0   1   2   3   4   5   6   7   8   9   10  11  12  13 + * pin: F0  F1  E6  C7  C6  B6  D4  B1  B0  B5  B4  D7  D6  B3 + */ +static void  init_cols(void) +{ +    // Input with pull-up(DDR:0, PORT:1) +    DDRF  &= ~(1<<0 | 1<<1); +    PORTF |=  (1<<0 | 1<<1); +    DDRE  &= ~(1<<6); +    PORTE |=  (1<<6); +    DDRD  &= ~(1<<7 | 1<<6 | 1<<4); +    PORTD |=  (1<<7 | 1<<6 | 1<<4); +    DDRC  &= ~(1<<7 | 1<<6); +    PORTC |=  (1<<7 | 1<<6); +    DDRB  &= ~(1<<6 | 1<< 5 | 1<<4 | 1<<3 | 1<<1 | 1<<0); +    PORTB |=  (1<<6 | 1<< 5 | 1<<4 | 1<<3 | 1<<1 | 1<<0); +} + +static uint16_t read_cols(void) +{ +    return (PINF&(1<<0) ? 0 : (1<<0)) | +           (PINF&(1<<1) ? 0 : (1<<1)) | +           (PINE&(1<<6) ? 0 : (1<<2)) | +           (PINC&(1<<7) ? 0 : (1<<3)) | +           (PINC&(1<<6) ? 0 : (1<<4)) | +           (PINB&(1<<6) ? 0 : (1<<5)) | +           (PIND&(1<<4) ? 0 : (1<<6)) | +           (PINB&(1<<1) ? 0 : (1<<7)) | +           (PINB&(1<<0) ? 0 : (1<<8)) | +           (PINB&(1<<5) ? 0 : (1<<9)) | +           (PINB&(1<<4) ? 0 : (1<<10)) | +           (PIND&(1<<7) ? 0 : (1<<11)) | +           (PIND&(1<<6) ? 0 : (1<<12)) | +           (PINB&(1<<3) ? 0 : (1<<13)); +} + +/* Row pin configuration + * row: 0   1   2   3   4 + * pin: D0  D1  D2  D3  D5 + */ +static void unselect_rows(void) +{ +    // Hi-Z(DDR:0, PORT:0) to unselect +    DDRD  &= ~0b00101111; +    PORTD &= ~0b00101111; +} + +static void select_row(uint8_t row) +{ +    // Output low(DDR:1, PORT:0) to select +    switch (row) { +        case 0: +            DDRD  |= (1<<0); +            PORTD &= ~(1<<0); +            break; +        case 1: +            DDRD  |= (1<<1); +            PORTD &= ~(1<<1); +            break; +        case 2: +            DDRD  |= (1<<2); +            PORTD &= ~(1<<2); +            break; +        case 3: +            DDRD  |= (1<<3); +            PORTD &= ~(1<<3); +            break; +        case 4: +            DDRD  |= (1<<5); +            PORTD &= ~(1<<5); +            break; +    } +} diff --git a/protocol/pjrc/main.c b/protocol/pjrc/main.c index 9f664bc43..776bfee9d 100644 --- a/protocol/pjrc/main.c +++ b/protocol/pjrc/main.c @@ -44,9 +44,6 @@  int main(void)  { -    DEBUG_LED_CONFIG; -    DEBUG_LED_OFF; -      // set for 16 MHz clock      CPU_PRESCALE(0);  | 
