X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=keyboard%2Fhhkb%2Funimap_hasu.c;h=1f1ff0b08a8578329c086ab81f24141fa4afe973;hb=12e5a3a13eb86852ad58c131e28ba29c5f09bb2d;hp=da16e9c830a9c8ddab081e37d48caf84a8b8b91f;hpb=74019c8e417dbfac0b925effa1b29769d04bd8d5;p=max%2Ftmk_keyboard.git

diff --git a/keyboard/hhkb/unimap_hasu.c b/keyboard/hhkb/unimap_hasu.c
index da16e9c8..1f1ff0b0 100644
--- a/keyboard/hhkb/unimap_hasu.c
+++ b/keyboard/hhkb/unimap_hasu.c
@@ -37,6 +37,10 @@ enum macro_id {
 #define AC_FRWD    ACTION_MODS_KEY(MOD_LALT, KC_RIGHT)
 #define AC_ENT_    ACTION_MODS_TAP_KEY(MOD_RCTL, KC_ENT)
 
+// Display Brightness Control
+// https://github.com/tmk/tmk_keyboard/issues/370#issuecomment-279113313
+// BRTI(increment) and BRTD(decrement) are defined in actionmap.h
+
 // Function: LShift with tap '('
 #define AC_LPRN     ACTION_FUNCTION_TAP(LSHIFT_LPAREN)
 // Macro: say hello
@@ -49,17 +53,17 @@ const action_t actionmaps[][UNIMAP_ROWS][UNIMAP_COLS] __attribute__ ((section ("
 const action_t actionmaps[][UNIMAP_ROWS][UNIMAP_COLS] PROGMEM = {
 #endif
     [0] = UNIMAP_HHKB(
-    ESC, 1,   2,   3,   4,   5,   6,   7,   8,   9,   0,   MINS,EQL, BSLS,GRV,
+    ESC, 1,   2,   3,   4,   5,   6,   7,   8,   9,   0,   MINS,EQL, BSLS,GRV ,
     TAB, Q,   W,   E,   R,   T,   Y,   U,   I,   O,   P,   LBRC,RBRC,     BSPC,
     LCTL,A,   S,   D,   F,   G,   H,   J,   K,   L,   SCLN,QUOT,          ENT_,
-    LPRN,     Z,   X,   C,   V,   B,   N,   M,   COMM,DOT, SLS2,     RSFT,L1,
+    LSFT,     Z,   X,   C,   V,   B,   N,   M,   COMM,DOT, SLS2,     RSFT,L1,
          LGUI,LALT,               SPC4,                    RALT,RGUI),
 
     [1] = UNIMAP_HHKB(
     PWR, F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12, INS, DEL,
     CAPS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,PSCR,SLCK,PAUS,UP,  TRNS,     TRNS,
     TRNS,VOLD,VOLU,MUTE,TRNS,TRNS,PAST,PSLS,HOME,PGUP,LEFT,RGHT,          PENT,
-    TRNS,     TRNS,TRNS,TRNS,TRNS,TRNS,PPLS,PMNS,END, PGDN,DOWN,     TRNS,TRNS,
+    TRNS,     BRTD,BRTI,SLEP,WAKE,TRNS,PPLS,PMNS,END, PGDN,DOWN,     TRNS,TRNS,
          TRNS,TRNS,               TRNS,                    TRNS,TRNS),
 
     [2] = UNIMAP_HHKB(
@@ -71,14 +75,14 @@ const action_t actionmaps[][UNIMAP_ROWS][UNIMAP_COLS] PROGMEM = {
 
     [3] = UNIMAP_HHKB(
     GRV, F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12, INS, DEL,
-    APSW,NO,  NO,  NO,  NO,  NO,  WH_L,WH_D,MS_U,WH_U,WH_R,BACK,FRWD,     APSW,
+    TAB, NO,  NO,  NO,  NO,  NO,  WH_L,WH_D,MS_U,WH_U,WH_R,BACK,FRWD,     TAB,
     LCTL,ACL0,ACL1,ACL2,ACL2,NO,  NO,  MS_L,MS_D,MS_R,TRNS,NO,            ENT,
     LSFT,     NO,  NO,  NO,  NO,  BTN3,BTN2,BTN1,BACK,FRWD,NO,       RSFT,TRNS,
          LGUI,LALT,               BTN1,                    TRNS,TRNS),
 
     [4] = UNIMAP_HHKB(
     GRV, F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12, INS, DEL,
-    APSW,NO,  NO,  NO,  NO,  NO,  WH_L,WH_D,MS_U,WH_U,WH_R,BTN4,BTN5,     APSW,
+    TAB, NO,  NO,  NO,  NO,  NO,  WH_L,WH_D,MS_U,WH_U,WH_R,BTN4,BTN5,     TAB,
     LCTL,VOLD,VOLU,MUTE,NO,  NO,  NO,  MS_L,MS_D,MS_R,BTN1,NO,            ENT,
     LSFT,     NO,  NO,  NO,  NO,  BTN3,BTN2,BTN1,BACK,FRWD,NO,       RSFT,TRNS,
          TRNS,TRNS,               TRNS,                    TRNS,TRNS),
@@ -101,6 +105,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
                     MACRO( D(VOLU), U(VOLU), END ) :
                     MACRO_NONE );
         case ALT_TAB:
+            // XXX: doesn't work after stuck key fix
             return (record->event.pressed ?
                     MACRO( D(LALT), D(TAB), END ) :
                     MACRO( U(TAB), END ));
@@ -122,6 +127,7 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt)
 
     switch (id) {
         case LSHIFT_LPAREN:
+            // XXX: doesn't work with other tap key. iffy at least
             // Shift parentheses example: LShft + tap '('
             // http://stevelosh.com/blog/2012/10/a-modern-space-cadet/#shift-parentheses
             // http://geekhack.org/index.php?topic=41989.msg1304899#msg1304899