Skip to content

Instantly share code, notes, and snippets.

/gist:b3d6e0654a1e03c37f43 Secret

Created April 28, 2015 03:09
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save anonymous/b3d6e0654a1e03c37f43 to your computer and use it in GitHub Desktop.
Save anonymous/b3d6e0654a1e03c37f43 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
gistfile1.txt
diff -urN gh60/Makefile darkstar/Makefile
--- gh60/Makefile 2015-04-15 20:26:02.000000000 -0700
+++ darkstar/Makefile 2015-04-27 08:39:56.000000000 -0700
@@ -55,7 +55,7 @@
ifdef KEYMAP
SRC := keymap_$(KEYMAP).c $(SRC)
else
- SRC := keymap_poker.c $(SRC)
+ SRC := keymap_darkstar.c $(SRC)
endif
CONFIG_H = config.h
diff -urN gh60/config.h darkstar/config.h
--- gh60/config.h 2015-04-15 12:39:12.000000000 -0700
+++ darkstar/config.h 2015-04-27 18:34:36.000000000 -0700
@@ -29,7 +29,7 @@
/* key matrix size */
#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
+#define MATRIX_COLS 15
/* define if matrix has ghost */
//#define MATRIX_HAS_GHOST
@@ -38,9 +38,9 @@
#define DEBOUNCE 5
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
+#undef LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
+#undef LOCKING_RESYNC_ENABLE
/* key combination for command */
#define IS_COMMAND() ( \
diff -urN gh60/keymap_common.h darkstar/keymap_common.h
--- gh60/keymap_common.h 2015-04-15 12:39:12.000000000 -0700
+++ darkstar/keymap_common.h 2015-04-27 09:58:05.000000000 -0700
@@ -38,47 +38,17 @@
* 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, K49, K4A, K4B, K4C, K4D \
+ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
+ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
+ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \
+ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \
+ K40, K41, K42, K44, K47, K49, K4A, K4B, K4C, K4D, K4E \
) { \
- { 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_##K49, KC_##K4A, KC_##K4B, KC_##K4C, KC_##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_##K0E }, \
+ { 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_##K1E }, \
+ { 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_NO, KC_NO }, \
+ { 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_NO, KC_##K3D, KC_NO }, \
+ { KC_##K40, KC_##K41, KC_##K42, KC_NO, KC_##K44, KC_NO, KC_NO, KC_##K47, KC_NO, KC_##K49, KC_##K4A, KC_##K4B, KC_##K4C, KC_##K4D, KC_##K4E } \
}
-/* 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, NO, K4A, K4B, K4C, K4D \
-)
-
-
-#define KEYMAP_HHKB( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K49,\
- 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, K3C, \
- 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, K3C, K3D, \
- K40, K41, K42, K45, K49, K4A, K4B, K4C, K4D \
-)
-
#endif
diff -urN gh60/keymap_darkstar.c darkstar/keymap_darkstar.c
--- gh60/keymap_darkstar.c 1969-12-31 16:00:00.000000000 -0800
+++ darkstar/keymap_darkstar.c 2015-04-27 09:58:48.000000000 -0700
@@ -0,0 +1,102 @@
+#include "keymap_common.h"
+
+const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ /* 0: qwerty
+ * .------------------------. .------------------------------------.
+ * | Esc| 1| 2| 3| 4| 5| | 6| 7| 8| 9| 0| -| =| BS||PGU|
+ * '------------------------' '------------------------------------'
+ * | Tab| Q| W| E| R| T| | Y| U| I| O| P| [| ]| \||PGD|
+ * '------------------------' '------------------------------------'
+ * | Fn0| A| S| D| F| G| | H| J| K| L| ;| '| Enter| |
+ * '------------------------' '------------------------------------'
+ * |Shft| Z| X| C| V| B| | N| M| ,| .| /| Shift| Up| |
+ * '------------------------' '------------------------------------'
+ * |Ctrl|Alt| Cmd| Space| | Space| Cmd|Alt|Ctrl|Lft|Dwn|Rgt|
+ * '------------------------' '------------------------------------'
+ */
+ KEYMAP(
+ ESC, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC,PGUP, \
+ TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC,BSLS,PGDN, \
+ FN0, A, S, D, F, G, H, J, K, L, SCLN,QUOT, ENT, \
+ LSFT,Z, X, C, V, B, N, M, COMM,DOT, SLSH, RSFT,UP, \
+ LCTL,LGUI,LALT, SPC, SPC, RALT,RGUI,RCTL,LEFT,DOWN,RGHT),
+ KEYMAP(
+ ESC, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC,PGUP, \
+ TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC,BSLS,PGDN, \
+ FN0, A, S, D, F, G, H, J, K, L, SCLN,QUOT, ENT, \
+ LSFT,Z, X, C, V, B, N, M, COMM,DOT, SLSH, RSFT,UP, \
+ LCTL,LGUI,LALT, SPC, SPC, RALT,RGUI,RCTL,LEFT,DOWN,RGHT),
+ KEYMAP(
+ ESC, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC,PGUP, \
+ TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC,BSLS,PGDN, \
+ FN0, A, S, D, F, G, H, J, K, L, SCLN,QUOT, ENT, \
+ LSFT,Z, X, C, V, B, N, M, COMM,DOT, SLSH, RSFT,UP, \
+ LCTL,LGUI,LALT, SPC, SPC, RALT,RGUI,RCTL,LEFT,DOWN,RGHT),
+ KEYMAP(
+ ESC, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC,PGUP, \
+ TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC,BSLS,PGDN, \
+ FN0, A, S, D, F, G, H, J, K, L, SCLN,QUOT, ENT, \
+ LSFT,Z, X, C, V, B, N, M, COMM,DOT, SLSH, RSFT,UP, \
+ LCTL,LGUI,LALT, SPC, SPC, RALT,RGUI,RCTL,LEFT,DOWN,RGHT),
+ /* 1: Fn layer
+ * .------------------------. .------------------------------------.
+ * | ~| F1| F2| F3| F4| F5| | F6| F7| F8| F9| F0|F11|F12|Del|| |
+ * '------------------------' '------------------------------------'
+ * | | | | | | | | | | | | | | | || |
+ * '------------------------' '------------------------------------'
+ * | | | | | | | | | | | | | | Return| |
+ * '------------------------' '------------------------------------'
+ * | | | | | | | | | | | | | | | |
+ * '------------------------' '------------------------------------'
+ * | | | | | | | | | | | | |
+ * '------------------------' '------------------------------------'
+ */
+ KEYMAP(
+ GRV, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, DEL, TRNS, \
+ TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
+ TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, PENT, \
+ TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS,TRNS, \
+ TRNS,TRNS,TRNS, TRNS, TRNS, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS),
+ /* 1: qwerty
+ * .------------------------. .------------------------------------.
+ * | Esc| 1| 2| 3| 4| 5| | 6| 7| 8| 9| 0| -| =| BS||PGU|
+ * '------------------------' '------------------------------------'
+ * | Tab| Q| W| E| R| T| | Y| U| I| O| P| [| ]| \||PGD|
+ * '------------------------' '------------------------------------'
+ * | Fn0| A| S| D| F| G| | H| J| K| L| ;| '| Enter| |
+ * '------------------------' '------------------------------------'
+ * |Shft| Z| X| C| V| B| | N| M| ,| .| /| Shift| Up| |
+ * '------------------------' '------------------------------------'
+ * |Ctrl|Alt| Cmd| Space| | Space| Cmd|Alt|Ctrl|Lft|Dwn|Rgt|
+ * '------------------------' '------------------------------------'
+ */
+ KEYMAP(
+ ESC, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC,PGUP, \
+ TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC,BSLS,PGDN, \
+ FN0, A, S, D, F, G, H, J, K, L, SCLN,QUOT, ENT, \
+ LSFT,Z, X, C, V, B, N, M, COMM,DOT, SLSH, RSFT,UP, \
+ LCTL,LGUI,LALT, SPC, SPC, RALT,RGUI,RCTL,LEFT,DOWN,RGHT),
+ KEYMAP(
+ ESC, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC,PGUP, \
+ TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC,BSLS,PGDN, \
+ FN0, A, S, D, F, G, H, J, K, L, SCLN,QUOT, ENT, \
+ LSFT,Z, X, C, V, B, N, M, COMM,DOT, SLSH, RSFT,UP, \
+ LCTL,LGUI,LALT, SPC, SPC, RALT,RGUI,RCTL,LEFT,DOWN,RGHT),
+ KEYMAP(
+ ESC, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC,PGUP, \
+ TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC,BSLS,PGDN, \
+ FN0, A, S, D, F, G, H, J, K, L, SCLN,QUOT, ENT, \
+ LSFT,Z, X, C, V, B, N, M, COMM,DOT, SLSH, RSFT,UP, \
+ LCTL,LGUI,LALT, SPC, SPC, RALT,RGUI,RCTL,LEFT,DOWN,RGHT),
+ KEYMAP(
+ ESC, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC,PGUP, \
+ TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC,BSLS,PGDN, \
+ FN0, A, S, D, F, G, H, J, K, L, SCLN,QUOT, ENT, \
+ LSFT,Z, X, C, V, B, N, M, COMM,DOT, SLSH, RSFT,UP, \
+ LCTL,LGUI,LALT, SPC, SPC, RALT,RGUI,RCTL,LEFT,DOWN,RGHT),
+};
+
+
+const uint16_t PROGMEM fn_actions[] = {
+ ACTION_LAYER_MOMENTARY(4), // Fn0
+};
diff -urN gh60/keymap_poker.c darkstar/keymap_poker.c
--- gh60/keymap_poker.c 2015-04-15 12:39:12.000000000 -0700
+++ darkstar/keymap_poker.c 2015-04-25 07:59:54.000000000 -0700
@@ -1,57 +1,58 @@
#include "keymap_common.h"
+#if 0
const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* 0: qwerty */
KEYMAP_ANSI(
- GRV, 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, ENT, \
- LSFT,Z, X, C, V, B, N, M, COMM,DOT, SLSH, RSFT, \
- LCTL,LGUI,LALT, SPC, FN0, RGUI,APP, RCTL),
+ ESC, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC,PGUP, \
+ TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC,BSLS,PGDN, \
+ FN0 ,A, S, D, F, G, H, J, K, L, SCLN,QUOT, ENT, \
+ LSFT,Z, X, C, V, B, N, M, COMM,DOT, SLSH, RSFT,UP, \
+ LCTL,LGUI,LALT, SPC, SPC, RALT,RGUI,RCTL,LEFT,DOWN,RGHT),
/* 1: colemak */
KEYMAP_ANSI(
- GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC, \
- TAB, Q, W, F, P, G, J, L, U, Y, SCLN,LBRC,RBRC,BSLS, \
+ ESC, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC,PGUP, \
+ TAB, Q, W, F, P, G, J, L, U, Y, SCLN,LBRC,RBRC,BSLS,PGDN, \
BSPC,A, R, S, T, D, H, N, E, I, O, QUOT, ENT, \
- LSFT,Z, X, C, V, B, K, M, COMM,DOT, SLSH, RSFT, \
- LCTL,LGUI,LALT, SPC, FN0, RGUI,APP, RCTL),
+ LSFT,Z, X, C, V, B, K, M, COMM,DOT, SLSH, RSFT,UP, \
+ LCTL,LGUI,LALT, SPC, SPC, RALT,RGUI,RCTL,LEFT,DOWN,RGHT),
/* 2: dvorak */
KEYMAP_ANSI(
- GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, LBRC,RBRC,BSPC, \
- TAB, QUOT,COMM,DOT, P, Y, F, G, C, R, L, SLSH,EQL, BSLS, \
+ ESC, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, LBRC,RBRC,BSPC,PGUP, \
+ TAB, QUOT,COMM,DOT, P, Y, F, G, C, R, L, SLSH,EQL, BSLS,PGDN, \
CAPS,A, O, E, U, I, D, H, T, N, S, MINS, ENT, \
- LSFT,SCLN,Q, J, K, X, B, M, W, V, Z, RSFT, \
- LCTL,LGUI,LALT, SPC, FN0, RGUI,APP, RCTL),
+ LSFT,SCLN,Q, J, K, X, B, M, W, V, Z, RSFT,UP, \
+ LCTL,LGUI,LALT, SPC, SPC, RALT,RGUI,RCTL,LEFT,DOWN,RGHT),
/* 3: workman */
KEYMAP_ANSI(
- GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC, \
- TAB, Q, D, R, W, B, J, F, U, P, SCLN,LBRC,RBRC,BSLS, \
+ ESC, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC,PGUP, \
+ TAB, Q, D, R, W, B, J, F, U, P, SCLN,LBRC,RBRC,BSLS,PGDN, \
BSPC,A, S, H, T, G, Y, N, E, O, I, QUOT, ENT, \
- LSFT,Z, X, M, C, V, K, L, COMM,DOT, SLSH, RSFT, \
- LCTL,LGUI,LALT, SPC, FN0, RGUI,APP, RCTL),
+ LSFT,Z, X, M, C, V, K, L, COMM,DOT, SLSH, RSFT,UP, \
+ LCTL,LGUI,LALT, SPC, SPC, RALT,RGUI,RCTL,LEFT,DOWN,RGHT),
/* 4: Poker with Arrow */
KEYMAP_ANSI(
- TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
- TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
+ TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
+ TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS, \
- TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, UP, \
- TRNS,TRNS,TRNS, TRNS, TRNS,LEFT,DOWN,RGHT),
- /* 5: Poker with Esc */
+ TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS,TRNS, \
+ TRNS,TRNS,TRNS, TRNS, TRNS, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS),
+ /* 5: Poker with Tilde/Grave */
KEYMAP_ANSI(
- ESC, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
- TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
+ GRV, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
+ TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS, \
- TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS, \
- TRNS,TRNS,TRNS, TRNS, TRNS,TRNS,TRNS,TRNS),
+ TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS,TRNS, \
+ TRNS,TRNS,TRNS, TRNS, TRNS, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS),
/* 6: Poker Fn
* ,-----------------------------------------------------------.
* |Esc| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12| |
* |-----------------------------------------------------------|
- * | |FnQ| Up| | | | | | |Cal| |Hom|Ins|FnL |
+ * | | | | | | | | | | | | | | |
* |-----------------------------------------------------------|
- * | |Lef|Dow|Rig| | |Psc|Slk|Pau| |Tsk|End| |
+ * | | | | | | | | | | | | | |
* |-----------------------------------------------------------|
- * | |Del| |Web|Mut|VoU|VoD| |PgU|PgD|Del| |
+ * | | | | | | | | | | | | |
* |-----------------------------------------------------------|
* | | | | FnS | | | | |
* `-----------------------------------------------------------'
@@ -61,11 +62,119 @@
* FnS: toggle Arrow overlay
*/
KEYMAP_ANSI(
- ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, TRNS, \
- TRNS,FN2, UP, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,CALC,TRNS,HOME,INS, FN4, \
- TRNS,LEFT,DOWN,RGHT,TRNS,TRNS,PSCR,SLCK,PAUS,TRNS,FN3, END, TRNS, \
- TRNS,DEL, TRNS,WHOM,MUTE,VOLU,VOLD,TRNS,PGUP,PGDN,DEL, TRNS, \
- TRNS,TRNS,TRNS, FN1, TRNS,TRNS,TRNS,TRNS),
+ TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
+ TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
+ TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS, \
+ TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS,TRNS, \
+ TRNS,TRNS,TRNS, TRNS, TRNS, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS),
+/*
+ KEYMAP_ANSI(
+ GRV, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, TRNS,TRNS \
+ TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
+ TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS, \
+ TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS,TRNS, \
+ TRNS,TRNS,TRNS, TRNS, TRNS, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS),
+*/
+ /* 7: Layout selector
+ * ,-----------------------------------------------------------.
+ * | Lq| Lc| Ld| Lw| | | | | | | | | | |
+ * |-----------------------------------------------------------|
+ * | |Lq |Lw | | | | | | | | | | | |
+ * |-----------------------------------------------------------|
+ * | | | |Ld | | | | | | | | | |
+ * |-----------------------------------------------------------|
+ * | | | |Lc | | | | | | | | |
+ * |-----------------------------------------------------------|
+ * | | | | | | | | |
+ * `-----------------------------------------------------------'
+ * Lq: set Qwerty layout
+ * Lc: set Colemak layout
+ * Ld: set Dvorak layout
+ * Lw: set Workman layout
+ */
+ KEYMAP_ANSI(
+ TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
+ TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
+ TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS, \
+ TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS,TRNS, \
+ TRNS,TRNS,TRNS, TRNS, TRNS, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS),
+};
+#endif
+
+const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ /* 0: qwerty */
+ KEYMAP_ANSI(
+ ESC, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC,PGUP, \
+ TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC,BSLS,PGDN, \
+ FN0 ,A, S, D, F, G, H, J, K, L, SCLN,QUOT, ENT, \
+ LSFT,Z, X, C, V, B, N, M, COMM,DOT, SLSH, RSFT,UP, \
+ LCTL,LGUI,LALT, SPC, SPC, RALT,RGUI,RCTL,LEFT,DOWN,RGHT),
+ /* 1: colemak */
+ KEYMAP_ANSI(
+ ESC, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC,PGUP, \
+ TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC,BSLS,PGDN, \
+ FN0 ,A, S, D, F, G, H, J, K, L, SCLN,QUOT, ENT, \
+ LSFT,Z, X, C, V, B, N, M, COMM,DOT, SLSH, RSFT,UP, \
+ LCTL,LGUI,LALT, SPC, SPC, RALT,RGUI,RCTL,LEFT,DOWN,RGHT),
+ /* 2: dvorak */
+ KEYMAP_ANSI(
+ ESC, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC,PGUP, \
+ TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC,BSLS,PGDN, \
+ FN0 ,A, S, D, F, G, H, J, K, L, SCLN,QUOT, ENT, \
+ LSFT,Z, X, C, V, B, N, M, COMM,DOT, SLSH, RSFT,UP, \
+ LCTL,LGUI,LALT, SPC, SPC, RALT,RGUI,RCTL,LEFT,DOWN,RGHT),
+ /* 3: workman */
+ KEYMAP_ANSI(
+ ESC, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC,PGUP, \
+ TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC,BSLS,PGDN, \
+ FN0 ,A, S, D, F, G, H, J, K, L, SCLN,QUOT, ENT, \
+ LSFT,Z, X, C, V, B, N, M, COMM,DOT, SLSH, RSFT,UP, \
+ LCTL,LGUI,LALT, SPC, SPC, RALT,RGUI,RCTL,LEFT,DOWN,RGHT),
+ /* 4: Poker with Arrow */
+ KEYMAP_ANSI(
+ TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
+ TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
+ TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS, \
+ TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS,TRNS, \
+ TRNS,TRNS,TRNS, TRNS, TRNS, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS),
+ /* 5: Poker with Tilde/Grave */
+ KEYMAP_ANSI(
+ GRV, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
+ TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
+ TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS, \
+ TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS,TRNS, \
+ TRNS,TRNS,TRNS, TRNS, TRNS, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS),
+ /* 6: Poker Fn
+ * ,-----------------------------------------------------------.
+ * |Esc| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12| |
+ * |-----------------------------------------------------------|
+ * | | | | | | | | | | | | | | |
+ * |-----------------------------------------------------------|
+ * | | | | | | | | | | | | | |
+ * |-----------------------------------------------------------|
+ * | | | | | | | | | | | | |
+ * |-----------------------------------------------------------|
+ * | | | | FnS | | | | |
+ * `-----------------------------------------------------------'
+ * Fn: to Fn overlay
+ * FnL: to Layout selector overaly
+ * FnQ: toggle Esc overlay
+ * FnS: toggle Arrow overlay
+ */
+ KEYMAP_ANSI(
+ TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
+ TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
+ TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS, \
+ TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS,TRNS, \
+ TRNS,TRNS,TRNS, TRNS, TRNS, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS),
+/*
+ KEYMAP_ANSI(
+ GRV, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, TRNS,TRNS \
+ TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
+ TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS, \
+ TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS,TRNS, \
+ TRNS,TRNS,TRNS, TRNS, TRNS, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS),
+*/
/* 7: Layout selector
* ,-----------------------------------------------------------.
* | Lq| Lc| Ld| Lw| | | | | | | | | | |
@@ -84,12 +193,16 @@
* Lw: set Workman layout
*/
KEYMAP_ANSI(
- FN5, FN6, FN7, FN8, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
- TRNS,FN5, FN8, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
- TRNS,TRNS,TRNS,FN7, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS, \
- TRNS,TRNS,TRNS,FN6, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS, \
- TRNS,TRNS,TRNS, TRNS, TRNS,TRNS,TRNS,TRNS),
+ TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
+ TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
+ TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS, \
+ TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS,TRNS, \
+ TRNS,TRNS,TRNS, TRNS, TRNS, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS),
};
+
+
+
+
const uint16_t PROGMEM fn_actions[] = {
/* Poker Layout */
[0] = ACTION_LAYER_MOMENTARY(6), // to Fn overlay
@@ -97,7 +210,7 @@
[2] = ACTION_LAYER_TOGGLE(5), // toggle Esc overlay
[3] = ACTION_MODS_KEY(MOD_RCTL|MOD_RSFT, KC_ESC), // Task(RControl,RShift+Esc)
[4] = ACTION_LAYER_MOMENTARY(7), // to Layout selector
- [5] = ACTION_DEFAULT_LAYER_SET(0), // set qwerty layout
+
[6] = ACTION_DEFAULT_LAYER_SET(1), // set colemak layout
[7] = ACTION_DEFAULT_LAYER_SET(2), // set dvorak layout
[8] = ACTION_DEFAULT_LAYER_SET(3), // set workman layout
diff -urN gh60/matrix.c darkstar/matrix.c
--- gh60/matrix.c 2015-04-15 12:39:12.000000000 -0700
+++ darkstar/matrix.c 2015-04-22 17:39:24.000000000 -0700
@@ -135,41 +135,39 @@
}
/* 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 (Rev.A)
- * pin: B7 (Rev.B)
+ * col: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14
+ * pin: F7 F6 F5 F4 F1 F0 B7 B3 B0 D4 D7 B1 B2 C7 C6
*/
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);
+ DDRF &= ~(1<<0 | 1<<1 | 1<<4 | 1<<5 | 1<<6 | 1<<7);
+ PORTF |= (1<<0 | 1<<1 | 1<<4 | 1<<5 | 1<<6 | 1<<7);
+ DDRD &= ~(1<<7 | 1<<4);
+ PORTD |= (1<<7 | 1<<4);
DDRC &= ~(1<<7 | 1<<6);
PORTC |= (1<<7 | 1<<6);
- DDRB &= ~(1<<7 | 1<<6 | 1<< 5 | 1<<4 | 1<<3 | 1<<1 | 1<<0);
- PORTB |= (1<<7 | 1<<6 | 1<< 5 | 1<<4 | 1<<3 | 1<<1 | 1<<0);
+ DDRB &= ~(1<<7 | 1<<3 | 1<<2 | 1<<1 | 1<<0);
+ PORTB |= (1<<7 | 1<<3 | 1<<2 | 1<<1 | 1<<0);
}
static matrix_row_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) && PINB&(1<<7)) ? 0 : (1<<8)) | // Rev.A and B
- (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));
+ return (PINF&(1<<7) ? 0 : (1<<0)) |
+ (PINF&(1<<6) ? 0 : (1<<1)) |
+ (PINF&(1<<5) ? 0 : (1<<2)) |
+ (PINF&(1<<4) ? 0 : (1<<3)) |
+ (PINF&(1<<1) ? 0 : (1<<4)) |
+ (PINF&(1<<0) ? 0 : (1<<5)) |
+ (PINB&(1<<7) ? 0 : (1<<6)) |
+ (PINB&(1<<3) ? 0 : (1<<7)) |
+ (PINB&(1<<0) ? 0 : (1<<8)) |
+ (PIND&(1<<4) ? 0 : (1<<9)) |
+ (PIND&(1<<7) ? 0 : (1<<10)) |
+ (PINB&(1<<1) ? 0 : (1<<11)) |
+ (PINB&(1<<2) ? 0 : (1<<12)) |
+ (PINC&(1<<7) ? 0 : (1<<13)) |
+ (PINC&(1<<6) ? 0 : (1<<14));
}
/* Row pin configuration
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment