From e7289bb029b28b824eb0ef7be23dba279057d7ac Mon Sep 17 00:00:00 2001 From: Nathan Ross Powell Date: Fri, 16 Jan 2015 00:07:22 -0500 Subject: [PATCH 1/3] KC_INSERT should be KC_INS The short name was incorrectly set as `KC_INT` when we want `KC_INS`. --- doc/keycode.txt | 2 +- keyboard/planck/.keymap_nathan.c.swp | Bin 0 -> 20480 bytes 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 keyboard/planck/.keymap_nathan.c.swp diff --git a/doc/keycode.txt b/doc/keycode.txt index 4137566924..760c726e3b 100644 --- a/doc/keycode.txt +++ b/doc/keycode.txt @@ -81,7 +81,7 @@ KC_F12 45 Keyboard F12 KC_PSCREEN KC_PSCR 46 Keyboard PrintScreen1 KC_SCKLOCK KC_SLCK 47 Keyboard Scroll Lock11 KC_PAUSE KC_PAUS 48 Keyboard Pause1 -KC_INSERT KC_INT 49 Keyboard Insert1 +KC_INSERT KC_INS 49 Keyboard Insert1 KC_HOME 4A Keyboard Home1 KC_PGUP 4B Keyboard PageUp1 KC_DELETE KC_DELETE 4C Keyboard Delete Forward diff --git a/keyboard/planck/.keymap_nathan.c.swp b/keyboard/planck/.keymap_nathan.c.swp new file mode 100644 index 0000000000000000000000000000000000000000..d545015c2b4b9413460d15f512a9b4759ae860c7 GIT binary patch literal 20480 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 Date: Wed, 18 Mar 2015 23:39:01 -0400 Subject: [PATCH 2/3] Delete .keymap_nathan.c.swp --- keyboard/planck/.keymap_nathan.c.swp | Bin 20480 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 keyboard/planck/.keymap_nathan.c.swp diff --git a/keyboard/planck/.keymap_nathan.c.swp b/keyboard/planck/.keymap_nathan.c.swp deleted file mode 100644 index d545015c2b4b9413460d15f512a9b4759ae860c7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 20480 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 Date: Wed, 18 Mar 2015 23:58:21 -0400 Subject: [PATCH 3/3] Update keymap_nathan.c Remove macro for KEYMAP_GRID that is in keymap_common.h. Add comments with ASCII art for the two layouts in keymap_common.h. --- keyboard/planck/keymap_common.h | 22 +++++++++++++++ keyboard/planck/keymap_nathan.c | 49 ++++++++------------------------- 2 files changed, 33 insertions(+), 38 deletions(-) diff --git a/keyboard/planck/keymap_common.h b/keyboard/planck/keymap_common.h index 8a55fd9ee0..c74c7e9a28 100644 --- a/keyboard/planck/keymap_common.h +++ b/keyboard/planck/keymap_common.h @@ -35,6 +35,17 @@ extern const uint16_t fn_actions[]; // MIT Layout +/* + * ,-----------------------------------------------------------------------. + * | | | | | | | | | | | | | + * |-----------------------------------------------------------------------| + * | | | | | | | | | | | | | + * |-----------------------------------------------------------------------| + * | | | | | | | | | | | | | + * |-----------------------------------------------------------------------| + * | | | | | | | | | | | | + * `-----------------------------------------------------------------------' + */ #define KEYMAP( \ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \ @@ -48,6 +59,17 @@ extern const uint16_t fn_actions[]; } // Grid Layout +/* + * ,-----------------------------------------------------------------------. + * | | | | | | | | | | | | | + * |-----------------------------------------------------------------------| + * | | | | | | | | | | | | | + * |-----------------------------------------------------------------------| + * | | | | | | | | | | | | | + * |-----------------------------------------------------------------------| + * | | | | | | | | | | | | | + * `-----------------------------------------------------------------------' + */ #define KEYMAP_GRID( \ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \ diff --git a/keyboard/planck/keymap_nathan.c b/keyboard/planck/keymap_nathan.c index 47539188ed..5a0900b66d 100644 --- a/keyboard/planck/keymap_nathan.c +++ b/keyboard/planck/keymap_nathan.c @@ -3,31 +3,6 @@ #include "keymap_common.h" -#ifndef KEYMAP_GRID - /* Planck keymap definition macro for the 'grid' layout - * ,-----------------------------------------------------------------------. - * | | | | | | | | | | | | | - * |-----------------------------------------------------------------------| - * | | | | | | | | | | | | | - * |-----------------------------------------------------------------------| - * | | | | | | | | | | | | | - * |-----------------------------------------------------------------------| - * | | | | | | | | | | | | | - * `-----------------------------------------------------------------------' - */ -#define KEYMAP_GRID( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B \ -) { \ - { 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_##K10, KC_##K11, KC_##K12, KC_##K13, KC_##K14, KC_##K15, KC_##K16, KC_##K17, KC_##K18, KC_##K19, KC_##K1A, KC_##K1B }, \ - { 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_##K30, KC_##K31, KC_##K32, KC_##K33, KC_##K34, KC_##K35, KC_##K36, KC_##K37, KC_##K38, KC_##K39, KC_##K3A, KC_##K3B } \ -} -#endif - const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* 0: main layer * ,-----------------------------------------------------------------------. @@ -50,9 +25,9 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * The top row are Visual Studio combos: * 'Run', 'Breakpoint', 'Step over', 'Step into', 'Set cursor to line' * 2nd row are key combos: - * 'ctrl-alt-delete', 'ctrl-shift-escape' + * 'ctrl-alt-delete', 'ctrl-shift-escape' * 3rd row are macros keys: - * 'P0' - 'P5' execute a script on Windows machines + * 'P0' - 'P5' execute a script on Windows machines * ,-----------------------------------------------------------------------. * | ESC | F5 | F9 | F10 | F11 |S+F11|CSF10|NLock|Num7 |Num8 |Num9 | Del | * |-----------------------------------------------------------------------| @@ -113,7 +88,7 @@ const uint16_t PROGMEM fn_actions[] = { [11] = ACTION_MODS_KEY(MOD_LSFT, KC_LBRC), // { [12] = ACTION_MODS_KEY(MOD_LSFT, KC_COMMA), // < [13] = ACTION_MODS_KEY(MOD_LSFT, KC_0), // ) - [14] = ACTION_MODS_KEY(MOD_LSFT, KC_RBRC), // { + [14] = ACTION_MODS_KEY(MOD_LSFT, KC_RBRC), // } [15] = ACTION_MODS_KEY(MOD_LSFT, KC_DOT), // > // Combo [16] = ACTION_MODS_KEY(MOD_LALT | MOD_LCTL, KC_DEL), // Ctrl+Alt+Delete @@ -127,7 +102,7 @@ const uint16_t PROGMEM fn_actions[] = { [23] = ACTION_MODS_KEY(MOD_LSFT, KC_6), // ^ [24] = ACTION_MODS_KEY(MOD_LSFT, KC_7), // & [25] = ACTION_MODS_KEY(MOD_LSFT, KC_8), // * - [26] = ACTION_MODS_KEY(MOD_LSFT, KC_EQL), // + + [26] = ACTION_MODS_KEY(MOD_LSFT, KC_EQL), // + [27] = ACTION_MODS_KEY(MOD_LSFT, KC_MINUS), // _ [28] = ACTION_MODS_KEY(MOD_LSFT, KC_QUOTE), // " [29] = ACTION_MODS_KEY(MOD_LSFT, KC_GRAVE), // ~ @@ -142,39 +117,37 @@ const uint16_t PROGMEM fn_actions[] = { // *return* #define RUN_PYTHON_PROGRAM_ON_WIN MACRO( T(ENT), END ) -const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) -{ +const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { keyevent_t event = record->event; switch (id) { case M_P0: return event.pressed ? - ADD_PYTHON_PROGRAM_ON_WIN( 0 ) : + ADD_PYTHON_PROGRAM_ON_WIN( 0 ) : RUN_PYTHON_PROGRAM_ON_WIN; case M_P1: return event.pressed ? - ADD_PYTHON_PROGRAM_ON_WIN( 1 ) : + ADD_PYTHON_PROGRAM_ON_WIN( 1 ) : RUN_PYTHON_PROGRAM_ON_WIN; case M_P2: return event.pressed ? - ADD_PYTHON_PROGRAM_ON_WIN( 2 ) : + ADD_PYTHON_PROGRAM_ON_WIN( 2 ) : RUN_PYTHON_PROGRAM_ON_WIN; case M_P3: return event.pressed ? - ADD_PYTHON_PROGRAM_ON_WIN( 3 ) : + ADD_PYTHON_PROGRAM_ON_WIN( 3 ) : RUN_PYTHON_PROGRAM_ON_WIN; case M_P4: return event.pressed ? - ADD_PYTHON_PROGRAM_ON_WIN( 4 ) : + ADD_PYTHON_PROGRAM_ON_WIN( 4 ) : RUN_PYTHON_PROGRAM_ON_WIN; case M_P5: return event.pressed ? - ADD_PYTHON_PROGRAM_ON_WIN( 5 ) : + ADD_PYTHON_PROGRAM_ON_WIN( 5 ) : RUN_PYTHON_PROGRAM_ON_WIN; case M_USERNAME: return event.pressed ? MACRO( T(N), T(A), T(T), T(H), T(A), T(N), T(R), T(O), T(S), T(S), T(P), T(O), T(W), T(E), T(L), T(L), END ) : MACRO_NONE; - } return MACRO_NONE; }