add directories for each keyboard: hhkb, macway

4 files changed, 408 insertions, 0 deletions

diff --git a/macway/Makefile b/macway/Makefile
new file mode 100644
index 0000000000..7559b2b057
--- /dev/null
+++ b/macway/Makefile
@@ -0,0 +1,67 @@
+# 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
+
+COMMON_DIR = ..
+TARGET_DIR = .
+TARGET_SRC =	$(TARGET_DIR)/keymap.c \
+  	        $(TARGET_DIR)/matrix.c
+
+
+# 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
+
+include $(COMMON_DIR)/Makefile.common
diff --git a/macway/keymap.c b/macway/keymap.c
new file mode 100644
index 0000000000..c690ce43a3
--- /dev/null
+++ b/macway/keymap.c
@@ -0,0 +1,140 @@
+/* 
+ * keymap for modified Macway
+ */
+#include <stdbool.h>
+#include <avr/pgmspace.h>
+#include "matrix.h"
+#include "keymap.h"
+#include "usb_keyboard.h"
+
+int current_layer = 0;
+bool key_sent = false;
+
+/*
+ * Layer0(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|  [|  ]|     |
+ * |----------------------------------------------------'     |
+ * |Contr|  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return  |
+ * |----------------------------------------------------------|
+ * |Shift  |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift |Fn2|
+ * |----------------------------------------------------------|
+ * |Fn3|Gui |Alt  |Space                |Fn1  |Lef|Dow|Up |Rig|
+ * `----------------------------------------------------------'
+ * 
+ * Layer1(with Fn1)
+ * ,----------------------------------------------------------.
+ * |  `| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Delete|
+ * |----------------------------------------------------------|
+ * |  \ |   |   |   |   |   |   |   |   |   |   |   |   |     |
+ * |----------------------------------------------------'     |
+ * |Contr|   |   |   |   |   |Lef|Dow|Up |Rig|   |   |  \     |
+ * |----------------------------------------------------------|
+ * |Shift  |   |   |   |   |   |Hom|PgD|PgU|End|   |Shift |   |
+ * |----------------------------------------------------------|
+ * |   |Gui |Alt  |                     |Fn1  |Lef|Dow|Up |Rig|
+ * `----------------------------------------------------------'
+ * 
+ * Layer2(with Fn2)
+ * ,----------------------------------------------------------.
+ * |  `| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Delete|
+ * |----------------------------------------------------------|
+ * |  \ |   |   |   |   |   |   |   |   |   |   |Up |   |     |
+ * |----------------------------------------------------'     |
+ * |Contr|VoD|VoU|Mut|F20|   |  *|  /|Hom|PgU|Lef|Rig|  \     |
+ * |----------------------------------------------------------|
+ * |Shift  |   |   |   |   |   |  +|  -|End|PgD|Dow|Shift |Fn2|
+ * |----------------------------------------------------------|
+ * |   |Gui |Alt  |                     |     |Lef|Dow|Up |Rig|
+ * `----------------------------------------------------------'
+ * 
+ * Layer3(with Fn3)
+ * ,----------------------------------------------------------.
+ * |  `| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Delete|
+ * |----------------------------------------------------------|
+ * |  \ |   |   |   |   |   |   |   |   |   |   |   |   |     |
+ * |----------------------------------------------------'     |
+ * |Contr|Mb1|Mb2|Mb3|   |   |McL|McD|McU|McR|   |   |  \     |
+ * |----------------------------------------------------------|
+ * |Shift  |   |   |   |   |   |MwL|MwD|MwU|MwR|   |Shift |   |
+ * |----------------------------------------------------------|
+ * |   |Gui |Alt  |Mb1                  |Mb2  |MsL|MsD|MsU|MsR|
+ * `----------------------------------------------------------'
+ * Mc: Mouse Cursor / Mb: Mouse Button / Mw: Mouse Wheel 
+ */
+static const uint8_t PROGMEM Keymap[][MATRIX_ROWS][MATRIX_COLS] = {
+    // 0: default
+    {
+        { KB_LALT, KB_NO,     KB_BSPACE,  KB_NO, KB_LEFT,   KB_NO,      KB_ENTER, KB_SPACE },
+        { KB_1,    KB_ESCAPE, KB_TAB,     KB_Q,  KB_A,      KB_LCTRL,   KB_Z,     KB_RIGHT },
+        { KB_2,    FN_1,      KB_LGUI,    KB_W,  KB_S,      KB_NO,      KB_X,     KB_UP },
+        { KB_3,    KB_NO,     KB_RSHIFT,  KB_E,  KB_D,      FN_2,       KB_C,     KB_DOWN },
+        { KB_4,    KB_5,      KB_T,       KB_R,  KB_F,      KB_G,       KB_V,     KB_B },
+        { KB_7,    KB_6,      KB_Y,       KB_U,  KB_J,      KB_H,       KB_M,     KB_N },
+        { KB_8,    KB_EQUAL,  KB_RBRACKET,KB_I,  KB_K,      KB_NO,      KB_COMMA, KB_LSHIFT },
+        { KB_9,    KB_NO,     KB_NO,      KB_O,  KB_L,      FN_3,       KB_DOT,   KB_NO },
+        { KB_0,    KB_MINUS,  KB_LBRACKET,KB_P,  KB_SCOLON, KB_QUOTE,   KB_NO,    KB_SLASH }
+    },
+    // 1: FN_1(RIGHT ALT)
+    {
+        { KB_LALT, KB_NO,     KB_DELETE,  KB_NO, KB_NO,     KB_NO,      KB_BSLASH,KB_NO },
+        { KB_F1,   KB_GRAVE,  KB_BSLASH,  KB_NO, KB_NO,     KB_LCTRL,   KB_NO,    KB_NO },
+        { KB_F2,   KB_NO,     KB_LGUI,    KB_NO, KB_NO,     KB_NO,      KB_NO,    KB_NO },
+        { KB_F3,   KB_NO,     KB_RSHIFT,  KB_NO, KB_NO,     KB_NO,      KB_NO,    KB_NO },
+        { KB_F4,   KB_F5,     KB_NO,      KB_NO, KB_NO,     KB_NO,      KB_NO,    KB_NO },
+        { KB_F7,   KB_F6,     KB_NO,      KB_NO, KB_DOWN,   KB_LEFT,    KB_PGDOWN,KB_HOME },
+        { KB_F8,   KB_F12,    KB_NO,      KB_NO, KB_UP,     KB_NO,      KB_PGUP,  KB_LSHIFT },
+        { KB_F9,   KB_NO,     KB_NO,      KB_NO, KB_RIGHT,  KB_NO,      KB_END,   KB_NO },
+        { KB_F10,  KB_F11,    KB_NO,      KB_NO, KB_NO,     KB_NO,      KB_NO,    KB_NO }
+    },
+    // 2: FN_2(HHKB Fn)
+    {
+        { KB_LALT, KB_NO,     KB_DELETE,  KB_NO, KB_NO,     KB_NO,      KB_BSLASH,KB_NO },
+        { KB_F1,   KB_GRAVE,  KB_BSLASH,  KB_NO, KB_VOLDOWN,KB_LCTRL,   KB_NO,    KB_NO },
+        { KB_F2,   KB_NO,     KB_LGUI,    KB_NO, KB_VOLUP,  KB_NO,      KB_NO,    KB_NO },
+        { KB_F3,   KB_NO,     KB_RSHIFT,  KB_NO, KB_MUTE,   KB_NO,      KB_NO,    KB_NO },
+        { KB_F4,   KB_F5,     KB_NO,      KB_NO, KB_F20,    KB_NO,      KB_NO,    KB_NO },
+        { KB_F7,   KB_F6,     KB_NO,      KB_NO, KP_SLASH,  KP_ASTERISK,KP_MINUS, KP_PLUS },
+        { KB_F8,   KB_F12,    KB_NO,      KB_NO, KB_HOME,   KB_NO,      KB_END,   KB_LSHIFT },
+        { KB_F9,   KB_NO,     KB_NO,      KB_NO, KB_PGUP,   KB_NO,      KB_PGDOWN,KB_NO },
+        { KB_F10,  KB_F11,    KB_UP,      KB_NO, KB_LEFT,   KB_RIGHT,   KB_NO,    KB_DOWN }
+    },
+    // 3: FN_3(LEFT Bottom)
+    {
+        { KB_LALT, KB_NO,     KB_DELETE,  KB_NO, MS_LEFT,   KB_NO,      KB_BSLASH,  MS_BTN1 },
+        { KB_F1,   KB_GRAVE,  KB_BSLASH,  KB_NO, MS_BTN1,   KB_LCTRL,   KB_NO,      MS_RIGHT },
+        { KB_F2,   MS_BTN2,   KB_LGUI,    KB_NO, MS_BTN2,   KB_NO,      KB_NO,      MS_UP },
+        { KB_F3,   KB_NO,     KB_RSHIFT,  KB_NO, MS_BTN3,   KB_NO,      KB_NO,      MS_DOWN },
+        { KB_F4,   KB_F5,     KB_NO,      KB_NO, KB_NO,     KB_NO,      KB_NO,      KB_NO },
+        { KB_F7,   KB_F6,     KB_NO,      KB_NO, MS_DOWN,   MS_LEFT,    MS_WH_UP,   MS_WH_LEFT },
+        { KB_F8,   KB_F12,    MS_BTN5,    KB_NO, MS_UP,     KB_NO,      MS_WH_DOWN, KB_LSHIFT },
+        { KB_F9,   KB_NO,     KB_NO,      KB_NO, MS_RIGHT,  KB_NO,      MS_WH_RIGHT,KB_NO },
+        { KB_F10,  KB_F11,    MS_BTN4,    KB_NO, KB_NO,     KB_NO,      KB_NO,      KB_NO }
+    },
+};
+
+
+uint8_t get_keycode(int layer, int row, int col)
+{
+    if (row >= MATRIX_ROWS)
+        return KB_NO;
+    if (col >= MATRIX_COLS)
+        return KB_NO;
+    return pgm_read_byte(&Keymap[layer][row][col]);
+}
+
+int get_layer(void) {
+    int layer = 0;
+    for (int row = 0; row < MATRIX_ROWS; row++) {
+        for (int col = 0; col < MATRIX_ROWS; col++) {
+            if (matrix[row] & 1<<col) continue;
+            if (get_keycode(0, row, col) == FN_1) layer = 1;
+            if (get_keycode(0, row, col) == FN_2) layer = 2;
+            if (get_keycode(0, row, col) == FN_3) layer = 3;
+        }
+    }
+    current_layer = layer;
+    return current_layer;
+}
diff --git a/macway/keymap.h b/macway/keymap.h
new file mode 100644
index 0000000000..b428b47a86
--- /dev/null
+++ b/macway/keymap.h
@@ -0,0 +1,20 @@
+#ifndef KEYMAP_H
+#define KEYMAP_H 1
+
+#include <stdint.h>
+#include <stdbool.h>
+#include "usb_keycodes.h"
+
+
+#define MATRIX_ROWS 9
+#define MATRIX_COLS 8
+
+
+extern int current_layer;
+extern bool key_sent;
+
+
+int get_layer(void);
+uint8_t get_keycode(int layer, int row, int col);
+
+#endif
diff --git a/macway/matrix.c b/macway/matrix.c
new file mode 100644
index 0000000000..cb52d79c30
--- /dev/null
+++ b/macway/matrix.c
@@ -0,0 +1,181 @@
+/*
+ * scan matrix
+ */
+#include <avr/io.h>
+#include <util/delay.h>
+#include "keymap.h"
+#include "matrix.h"
+
+// matrix is active low. (key on: 0/key off: 1)
+// row: Hi-Z(unselected)/low output(selected)
+//      PD0, PC7, PD7, PF6, PD6, PD1, PD2, PC6, PF7
+// col: input w/pullup
+//      PB0-PB7
+
+// matrix state buffer
+uint8_t *matrix;
+uint8_t *matrix_prev;
+static uint8_t _matrix0[MATRIX_ROWS];
+static uint8_t _matrix1[MATRIX_ROWS];
+
+static uint8_t read_col(void);
+static void unselect_rows(void);
+static void select_row(uint8_t row);
+
+
+// this must be called once before matrix_scan.
+void matrix_init(void)
+{
+    // initialize row and col
+    unselect_rows();
+    DDRB = 0x00;
+    PORTB = 0xFF;
+
+    // initialize matrix state: all keys off
+    for (int i=0; i < MATRIX_ROWS; i++) _matrix0[i] = 0xFF;
+    for (int i=0; i < MATRIX_ROWS; i++) _matrix1[i] = 0xFF;
+    matrix = _matrix0;
+    matrix_prev = _matrix1;
+}
+
+uint8_t matrix_scan(void)
+{
+    uint8_t row, state;
+    uint8_t *tmp;
+
+    tmp = matrix_prev;
+    matrix_prev = matrix;
+    matrix = tmp;
+
+    for (row = 0; row < MATRIX_ROWS; row++) {
+        select_row(row);
+        _delay_us(30);  // without this wait read unstable value.
+        state = read_col();
+        unselect_rows();
+
+        matrix[row] = state;
+    }
+    return 1;
+}
+
+bool matrix_is_modified(void) {
+    for (int i=0; i <MATRIX_ROWS; i++) {
+        if (matrix[i] != matrix_prev[i])
+            return true;
+    }
+    return false;
+}
+
+bool matrix_has_ghost(void) {
+    for (int i=0; i <MATRIX_ROWS; i++) {
+        if (matrix_has_ghost_in_row(i))
+            return true;
+    }
+    return false;
+}
+
+bool matrix_has_ghost_in_row(uint8_t row) {
+    uint8_t state = ~matrix[row];
+    // no ghost exists in case less than 2 keys on
+    if (((state - 1) & state) == 0)
+        return false;
+
+    // ghost exists in case same state as other row
+    for (int i=0; i < MATRIX_ROWS; i++) {
+        if (i == row) continue;
+        if ((~matrix[i] & state) == state) return true;
+    }
+    return false;
+}
+
+static uint8_t read_col(void)
+{
+    return PINB;
+}
+
+static void unselect_rows(void) {
+    DDRD  = 0x00;
+    PORTD = 0x00;
+    DDRC  = 0x00;
+    PORTC = 0x00;
+    DDRF  = 0x00;
+    PORTF = 0x00;
+}
+
+static void select_row(uint8_t row)
+{
+    switch (row) {
+        case 0:
+            DDRD  = (1<<0);
+            PORTD = 0x00;
+            DDRC  = 0x00;
+            PORTC = 0x00;
+            DDRF  = 0x00;
+            PORTF = 0x00;
+            break;
+        case 1:
+            DDRD  = 0x00;
+            PORTD = 0x00;
+            DDRC  = (1<<7);
+            PORTC = 0x00;
+            DDRF  = 0x00;
+            PORTF = 0x00;
+            break;
+        case 2:
+            DDRD  = (1<<7);
+            PORTD = 0x00;
+            DDRC  = 0x00;
+            PORTC = 0x00;
+            DDRF  = 0x00;
+            PORTF = 0x00;
+            break;
+        case 3:
+            DDRD  = 0x00;
+            PORTD = 0x00;
+            DDRC  = 0x00;
+            PORTC = 0x00;
+            DDRF  = (1<<6);
+            PORTF = 0x00;
+            break;
+        case 4:
+            DDRD  = (1<<6);
+            PORTD = 0x00;
+            DDRC  = 0x00;
+            PORTC = 0x00;
+            DDRF  = 0x00;
+            PORTF = 0x00;
+            break;
+        case 5:
+            DDRD  = (1<<1);
+            PORTD = 0x00;
+            DDRC  = 0x00;
+            PORTC = 0x00;
+            DDRF  = 0x00;
+            PORTF = 0x00;
+            break;
+        case 6:
+            DDRD  = (1<<2);
+            PORTD = 0x00;
+            DDRC  = 0x00;
+            PORTC = 0x00;
+            DDRF  = 0x00;
+            PORTF = 0x00;
+            break;
+        case 7:
+            DDRD  = 0x00;
+            PORTD = 0x00;
+            DDRC  = (1<<6);
+            PORTC = 0x00;
+            DDRF  = 0x00;
+            PORTF = 0x00;
+            break;
+        case 8:
+            DDRD  = 0x00;
+            PORTD = 0x00;
+            DDRC  = 0x00;
+            PORTC = 0x00;
+            DDRF  = (1<<7);
+            PORTF = 0x00;
+            break;
+    }
+}