ADD: macway/doc

FIX: keymap

14 files changed, 21 insertions, 17 deletions

diff --git a/hhkb/doc/HHKB.txt b/hhkb/doc/HHKB.txt
index bdd297dcdb..3ca272c800 100644
--- a/hhkb/doc/HHKB.txt
+++ b/hhkb/doc/HHKB.txt
@@ -8,7 +8,7 @@ Teensy++ has clean pinout and it makes programing and wiring easier.
 This is just a proof of concept for replacing controller of HHKB, not a complete firmware.
 
 My prototype firmware source tree is here:
-    branch: hhkb(http://github.com/tmk/tmk_keyboard/tree/hhkb)
+    github(http://github.com/tmk/tmk_keyboard)
 This firmware is a port of my previous project:
     HHKB style Mod(http://geekhack.org/showwiki.php?title=Island:11930)
 PJRC:
@@ -173,13 +173,17 @@ Matrix scan pseudo code:
             } else {
                 // not pressed
             }
+
+            UNALBLE_COL();      // set LS145(D) to high
+
+            _delay_us(150);
         }
     }
 
 
 Keymap layers
 -------------
-Followings are added layers with additional Fn keys. They are not final decision.
+Followings are added layers with additional Fn keys.
 
 see keymap.c
 
diff --git a/hhkb/keymap.c b/hhkb/keymap.c
index ca78200c08..2b887d9c7f 100644
--- a/hhkb/keymap.c
+++ b/hhkb/keymap.c
@@ -40,7 +40,7 @@ static bool layer_used = false;
 
 
 /* layer to change into while Fn key pressed */ 
-static const int PROGMEM fn_layer[] = { 0, 1, 2, 3, 4, 0, 0, 0 };
+static const int PROGMEM fn_layer[] = { 0, 1, 2, 3, 4, 0, 0, 1 };
 
 /* keycode to sent when Fn key released without using layer keys. */
 static const uint8_t PROGMEM fn_keycode[] = {
@@ -51,7 +51,7 @@ static const uint8_t PROGMEM fn_keycode[] = {
     KB_SPACE,       // FN_4 layer 4 [NOT USED]
     KB_NO,          // FN_5 [NOT USED]
     KB_NO,          // FN_6 [NOT USED]
-    KB_NO           // FN_7 [NOT USED]
+    KB_NO           // FN_7 layer 1
 };
 
 static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -65,14 +65,14 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * |-----------------------------------------------------------|
      * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift |Fn1|
      * `-----------------------------------------------------------'
-     *       |Gui|Alt  |Space                  |Alt  |Gui|
+     *       |Gui|Alt  |Space                  |Alt  |Fn7|
      *       `-------------------------------------------'
      */
     KEYMAP(KB_ESC, KB_1,   KB_2,   KB_3,   KB_4,   KB_5,   KB_6,   KB_7,   KB_8,   KB_9,   KB_0,   KB_MINS,KB_EQL, KB_BSLS,KB_GRV, \
            KB_TAB, KB_Q,   KB_W,   KB_E,   KB_R,   KB_T,   KB_Y,   KB_U,   KB_I,   KB_O,   KB_P,   KB_LBRC,KB_RBRC,KB_BSPC, \
            KB_LCTL,KB_A,   KB_S,   KB_D,   KB_F,   KB_G,   KB_H,   KB_J,   KB_K,   KB_L,   FN_3,   FN_2,   KB_ENT, \
            KB_LSFT,KB_Z,   KB_X,   KB_C,   KB_V,   KB_B,   KB_N,   KB_M,   KB_COMM,KB_DOT, KB_SLSH,KB_RSFT,FN_1, \
-           KB_LGUI,KB_LALT,KB_SPC, KB_RALT,KB_RGUI),
+           KB_LGUI,KB_LALT,KB_SPC, KB_RALT,FN_7),
 
     /* Layer 1: HHKB mode (HHKB Fn)
      * ,-----------------------------------------------------------.
@@ -84,14 +84,14 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * |-----------------------------------------------------------|
      * |Shift   |   |   |   |   |   |  +|  -|End|PgD|Dow|Shift |xxx|
      * `-----------------------------------------------------------'
-     *      |Gui |Alt  |Space                  |Alt  |Gui|
+     *      |Gui |Alt  |Space                  |Alt  |xxx|
      *      `--------------------------------------------'
      */ 
     KEYMAP(KB_PWR, KB_F1,  KB_F2,  KB_F3,  KB_F4,  KB_F5,  KB_F6,  KB_F7,  KB_F8,  KB_F9,  KB_F10, KB_F11, KB_F12, KB_INS, KB_DEL, \
            KB_CAPS,KB_NO,  KB_NO,  KB_NO,  KB_NO,  KB_NO,  KB_NO,  KB_NO,  KB_PSCR,KB_SLCK,KB_BRK, KB_UP,  KB_NO,  KB_BSPC, \
            KB_LCTL,KB_NO,  KB_NO,  KB_NO,  KB_NO,  KB_NO,  KP_ASTR,KP_SLSH,KB_HOME,KB_PGUP,KB_LEFT,KB_RGHT,KB_ENT, \
            KB_LSFT,KB_NO,  KB_NO,  KB_NO,  KB_NO,  KB_NO,  KP_PLUS,KP_MINS,KB_END, KB_PGDN,KB_DOWN,KB_RSFT,FN_1, \
-           KB_LGUI,KB_LALT,KB_SPC, KB_RALT,KB_RGUI),
+           KB_LGUI,KB_LALT,KB_SPC, KB_RALT,FN_7),
 
     /* Layer 2: Vi mode (Quote/Rmeta)
      * ,-----------------------------------------------------------.
@@ -114,7 +114,7 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     /* Layer 3: Mouse mode (Semicolon)
      * ,-----------------------------------------------------------.
-     * |Esc|   |   |   |   |   |   |   |   |   |   |   |   |   |   |
+     * |Esc| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Ins|Del|
      * |-----------------------------------------------------------|
      * |Tab  |MwL|MwU|McU|MwD|MwL|MwR|MwD|MwU|MwR|   |   |   |Backs|
      * |-----------------------------------------------------------|
@@ -181,15 +181,15 @@ int keymap_set_layer(int layer)
 }
 
 inline
-bool keymap_is_special_mode(int fn_bits)
+bool keymap_is_special_mode(uint8_t fn_bits)
 {
     return (keyboard_modifier_keys == (BIT_LCTRL | BIT_LSHIFT | BIT_LALT | BIT_LGUI));
 }
 
-void keymap_fn_proc(int fn_bits)
+void keymap_fn_proc(uint8_t fn_bits)
 {
     // layer switching
-    static int last_bits = 0;
+    static uint8_t last_bits = 0;
     static uint8_t last_mod = 0;
 
     if (usb_keyboard_has_key() || fn_bits == last_bits) {
diff --git a/key_process.c b/key_process.c
index e4d66e303c..9ba0d83a16 100644
--- a/key_process.c
+++ b/key_process.c
@@ -36,7 +36,7 @@ void proc_matrix(void) {
     int8_t mouse_y = 0;
     int8_t mouse_vwheel = 0;
     int8_t mouse_hwheel = 0;
-    int fn_bits = 0;
+    uint8_t fn_bits = 0;
 
     matrix_scan();
     modified = matrix_is_modified();
diff --git a/keymap_skel.h b/keymap_skel.h
index ab8cce7ae4..c2b94177e7 100644
--- a/keymap_skel.h
+++ b/keymap_skel.h
@@ -11,8 +11,8 @@ uint8_t keymap_get_keycodel(int layer, int row, int col);
 int keymap_get_layer(void);
 int keymap_set_layer(int layer);
 
-bool keymap_is_special_mode(int fn_bits);
+bool keymap_is_special_mode(uint8_t fn_bits);
 /* process Fn keys. This.should be called every scan. */
-void keymap_fn_proc(int fn_bits);
+void keymap_fn_proc(uint8_t fn_bits);
 
 #endif
diff --git a/macway/doc/back.jpg b/macway/doc/back.jpg
new file mode 100755
index 0000000000..0774401f69
--- /dev/null
+++ b/macway/doc/back.jpg
diff --git a/macway/doc/case.jpg b/macway/doc/case.jpg
new file mode 100755
index 0000000000..c776d5e054
--- /dev/null
+++ b/macway/doc/case.jpg
diff --git a/macway/doc/keys.jpg b/macway/doc/keys.jpg
new file mode 100755
index 0000000000..f340ebe8e4
--- /dev/null
+++ b/macway/doc/keys.jpg
diff --git a/macway/doc/side.jpg b/macway/doc/side.jpg
new file mode 100755
index 0000000000..bdf8268f25
--- /dev/null
+++ b/macway/doc/side.jpg
diff --git a/macway/doc/switch.jpg b/macway/doc/switch.jpg
new file mode 100755
index 0000000000..a1500d707d
--- /dev/null
+++ b/macway/doc/switch.jpg
diff --git a/macway/doc/teensy.jpg b/macway/doc/teensy.jpg
new file mode 100755
index 0000000000..07207475d5
--- /dev/null
+++ b/macway/doc/teensy.jpg
diff --git a/macway/doc/wiring.jpg b/macway/doc/wiring.jpg
new file mode 100755
index 0000000000..0f3490f105
--- /dev/null
+++ b/macway/doc/wiring.jpg
diff --git a/macway/doc/withHHKB.jpg b/macway/doc/withHHKB.jpg
new file mode 100755
index 0000000000..9921856e7b
--- /dev/null
+++ b/macway/doc/withHHKB.jpg
diff --git a/macway/doc/withThinkPad.jpg b/macway/doc/withThinkPad.jpg
new file mode 100755
index 0000000000..231c61d036
--- /dev/null
+++ b/macway/doc/withThinkPad.jpg
diff --git a/macway/keymap.c b/macway/keymap.c
index 09dafc5c89..652a530666 100644
--- a/macway/keymap.c
+++ b/macway/keymap.c
@@ -180,12 +180,12 @@ int keymap_set_layer(int layer)
 }
 
 inline
-bool keymap_is_special_mode(int fn_bits)
+bool keymap_is_special_mode(uint8_t fn_bits)
 {
     return (keyboard_modifier_keys == (BIT_LCTRL | BIT_LSHIFT | BIT_LALT | BIT_LGUI));
 }
 
-void keymap_fn_proc(int fn_bits)
+void keymap_fn_proc(uint8_t fn_bits)
 {
     // layer switching
     static int last_bits = 0;