From 4a638676978f79bcfc4766b0fa46dc5cea345899 Mon Sep 17 00:00:00 2001 From: girst Date: Wed, 13 Dec 2017 21:08:46 +0100 Subject: [PATCH] going to convert to actionmap now --- keyboard/tv44/keymap_tv44.c | 81 +++++++++----- keyboard/tv44/keymap_tv44.c-not-actionmap | 124 ++++++++++++++++++++++ tmk_core/common/.keycode.h.swp | Bin 16384 -> 0 bytes 3 files changed, 178 insertions(+), 27 deletions(-) create mode 100644 keyboard/tv44/keymap_tv44.c-not-actionmap delete mode 100644 tmk_core/common/.keycode.h.swp diff --git a/keyboard/tv44/keymap_tv44.c b/keyboard/tv44/keymap_tv44.c index 01eb2964..9fe9afab 100644 --- a/keyboard/tv44/keymap_tv44.c +++ b/keyboard/tv44/keymap_tv44.c @@ -1,4 +1,21 @@ #include "keymap_common.h" + // use ____ or TODO as keyboard keys in KEYMAP + #define KC_____ KC_NO + #define KC_TODO KC_NO + + +/* TODO XXX TODO: + * single apostrophe has not been placed (best on layer2) + * + * can.t hit ctrl-tab + * + * define bottom row Fn keys + * + * you can only have 32 Fn keys -- migrate shift+key and AltGr+key to actionmap + * see: https://github.com/tmk/tmk_keyboard/wiki/FAQ-Keymap#actionmap + * http://kb.sized.io/ + * currently not placed due to shortage: ctrl-left, ctrl-right, µ + */ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Layer: Base Layer @@ -9,69 +26,69 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |-------------------------------------------------| * |Shift| Y| X| C| V| B| N| M| ,| .| -|Sft| * |-------------------------------------------------| - * |Alt | XXX |XXX |Enter| Space |XXX |XXX | Fn3 | + * |Alt | XXX |XXX |Enter| Space |XXX |XXX | Fn3 | TODO: where to put Fn1 * `-------------------------------------------------' */ KEYMAP( ESC , Q, W, E, R, T, Y, U, I, O, P, BSPC, \ - LCTRL, A, S, D, F, G, H, J, K, L,FN11, FN2, \ + FN0 , A, S, D, F, G, H, J, K, L,FN11, FN2, \ LSHIFT, Z, X, C, V, B, N, M,COMM, DOT,SLSH, RSHIFT, \ LALT, FN1, LGUI, ENT, SPC, RALT, RSFT, FN3 ), /* Layer: Movement Layer (wrd=ctrl-right, bck=crtl-left) TOGGLE * ,-------------------------------------------------. - * | | |wrd| |END| | |PUp| | |Hom| Del | - * |-------------------------------------------------| + * |Esc| |wrd| |END| | |PUp| |Hom| | Del | TODO: move Home? + * |-------------------------------------------------| TODO: ctrl-right: use actionmap * | | | |PDn| | |Lft| Up| Dn| Rt| | | * |-------------------------------------------------| - * | |Psc| | | |bck| | | | | | | - * |-------------------------------------------------| + * | |Psc| | | |bck| | | | | | | TODO: where NUM, CAPS, SCROLL, PAUSE + * |-------------------------------------------------| TODO: ctrl-left: use actionmap * | | Gui | | | | | | | * `-------------------------------------------------' - */ + */ //TODO KEYMAP( - GRV , FN4, FN5, FN6, FN7, FN8, FN9,FN10,FN11,FN12,FN13, DEL, \ - TRNS ,BSLS,QUOT,MINS, EQL,LBRC,RBRC,DOWN, UP,LEFT,RGHT, TRNS, \ - TRNS , ESC,FN20,PSCR,TRNS,TRNS,TRNS,MSTP,MPLY,MPRV,MNXT,RSFT, \ - TRNS, LGUI, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS ), + ESC ,____,TODO,____, END,____,____,PGUP,____,HOME,____, DEL, \ + TRNS ,____,____,PGDN,____,TRNS,LEFT,DOWN, UP,RGHT,____, TRNS, \ + TRNS ,PSCR,____,____,____,TODO,____,____,____,____,____,____, \ + TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS ), /* Layer: Numbers and ASCII-Symbols Layer MOMENTARY+TOGGLE * ,-------------------------------------------------. * | ^| !| "| §| $| %| &| /| (| )| =| ? | * |-------------------------------------------------| - * | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| ' | + * | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0|Fn2 | TODO: where to put FN15=' * |-------------------------------------------------| - * | #| <| || >| +| *| {| [| ]| }| \| ~| TODO: < | > { [ ] } \ ~ + * | #| <| || >| +| *| {| [| ]| }| \| ~| * |-------------------------------------------------| * | | | | | | | | | * `-------------------------------------------------' */ KEYMAP( GRV , FN5, FN6, FN7, FN8, FN9,FN10,FN11,FN12,FN13,FN14, FN17, \ - FN18 , 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, FN15, \ - BSLS ,TRNS,TRNS,TRNS,RBRC,FN20,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \ + FN18 , 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, TRNS, \ + BSLS ,NUBS,FN30,FN31,RBRC,FN20,FN24,FN25,FN26,FN27,FN28,FN29, \ TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS ), /* Layer: Layer for Function keys and Unicode Symbols MOMENTARY * ,-------------------------------------------------. * | F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11| F12| * |-------------------------------------------------| - * | | | | | | | | | Ä| Ö| Ü|Entr| - * |-------------------------------------------------| - * | |LED|Fls| °| ²| ³| µ| ä| ö| ü| ß| | + * | | | | | | | | | Ä| Ö| Ü|Entr| Ä=" Ö=: Ü={ * |-------------------------------------------------| + * | | | | °| ²| ³| µ| ä| ö| ü| ß| | ä=' ö=; ü=[ ß=- + * |-------------------------------------------------| TODO: µ * | | | |Space| Enter | | | | * `-------------------------------------------------' */ KEYMAP( - TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, F1, F2, F3, F4, TRNS, \ - ESC ,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, F5, F6, F7, F8, ENT, \ - LSFT , 1, 2, 3, 4, 5, 6, F9, F10, F11, F12,RSFT, \ - TRNS, LSFT, B, SPC, C, TRNS, TRNS, TRNS ), + F1 , F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, \ + TRNS ,____,____,____,____,____,____,____,FN16,FN21,FN19, ENT, \ + TRNS ,____,____, FN4,FN22,FN23,TODO,QUOT,SCLN,LBRC,MINS,RSFT, \ + TRNS, TRNS, TRNS, SPC, ENT, TRNS, TRNS, TRNS ), }; const action_t PROGMEM fn_actions[] = { - /*[0] = ???,*/ + [0] = ACTION_MODS_TAP_KEY(MOD_LCTL, KC_TAB), [1] = ACTION_LAYER_MOMENTARY(1), [2] = ACTION_LAYER_MOMENTARY(2), [3] = ACTION_LAYER_MOMENTARY(3), @@ -81,17 +98,27 @@ const action_t PROGMEM fn_actions[] = { [7] = ACTION_MODS_KEY(MOD_LSFT, KC_3), [8] = ACTION_MODS_KEY(MOD_LSFT, KC_4), [9] = ACTION_MODS_KEY(MOD_LSFT, KC_5), - [10] = ACTION_MODS_KEY(MOD_LSFT, KC_6), + [10] = ACTION_MODS_KEY(MOD_LSFT, KC_6), [11] = ACTION_MODS_KEY(MOD_LSFT, KC_7), [12] = ACTION_MODS_KEY(MOD_LSFT, KC_8), [13] = ACTION_MODS_KEY(MOD_LSFT, KC_9), [14] = ACTION_MODS_KEY(MOD_LSFT, KC_0), [15] = ACTION_MODS_KEY(MOD_LSFT, KC_BSLS), // #' key - [16] = ACTION_MODS_KEY(MOD_LSFT, KC_QUOT), + [16] = ACTION_MODS_KEY(MOD_LSFT, KC_QUOT), // ä key [17] = ACTION_MODS_KEY(MOD_LSFT, KC_MINS), // ß?\ key [18] = ACTION_MODS_KEY(MOD_LSFT, KC_EQL), // ´` key [19] = ACTION_MODS_KEY(MOD_LSFT, KC_LBRC), // ü key [20] = ACTION_MODS_KEY(MOD_LSFT, KC_RBRC), // +*~ key - [21] = ACTION_MODS_TAP_KEY(MOD_LSFT, KC_ESC), - [22] = ACTION_MODS_TAP_KEY(MOD_LCTRL, KC_TAB) + [21] = ACTION_MODS_KEY(MOD_LSFT, KC_SCLN), // ö key + [22] = ACTION_MODS_KEY(MOD_RALT, KC_2), // ² + [23] = ACTION_MODS_KEY(MOD_RALT, KC_3), // ³ + [24] = ACTION_MODS_KEY(MOD_RALT, KC_7), // { + [25] = ACTION_MODS_KEY(MOD_RALT, KC_8), // [ + [26] = ACTION_MODS_KEY(MOD_RALT, KC_9), // ] + [27] = ACTION_MODS_KEY(MOD_RALT, KC_0), // } + [28] = ACTION_MODS_KEY(MOD_RALT, KC_MINS), // "\" + [29] = ACTION_MODS_KEY(MOD_RALT, KC_RBRC), // ~ + [30] = ACTION_MODS_KEY(MOD_RALT, KC_NUBS), // <|> + [31] = ACTION_MODS_KEY(MOD_LSFT, KC_NUBS), // <|> + //[32] = ACTION_MODS_KEY(MOD_RALT, KC_M), // µ TODO: use actionmap }; diff --git a/keyboard/tv44/keymap_tv44.c-not-actionmap b/keyboard/tv44/keymap_tv44.c-not-actionmap new file mode 100644 index 00000000..9fe9afab --- /dev/null +++ b/keyboard/tv44/keymap_tv44.c-not-actionmap @@ -0,0 +1,124 @@ +#include "keymap_common.h" + // use ____ or TODO as keyboard keys in KEYMAP + #define KC_____ KC_NO + #define KC_TODO KC_NO + + +/* TODO XXX TODO: + * single apostrophe has not been placed (best on layer2) + * + * can.t hit ctrl-tab + * + * define bottom row Fn keys + * + * you can only have 32 Fn keys -- migrate shift+key and AltGr+key to actionmap + * see: https://github.com/tmk/tmk_keyboard/wiki/FAQ-Keymap#actionmap + * http://kb.sized.io/ + * currently not placed due to shortage: ctrl-left, ctrl-right, µ + */ + +const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* Layer: Base Layer + * ,-------------------------------------------------. + * |Esc| Q| W| E| R| T| Z| U| I| O| P| BSp | + * |-------------------------------------------------| + * |C/^I| A| S| D| F| G| H| J| K| L| /|Fn2 | + * |-------------------------------------------------| + * |Shift| Y| X| C| V| B| N| M| ,| .| -|Sft| + * |-------------------------------------------------| + * |Alt | XXX |XXX |Enter| Space |XXX |XXX | Fn3 | TODO: where to put Fn1 + * `-------------------------------------------------' + */ + KEYMAP( + ESC , Q, W, E, R, T, Y, U, I, O, P, BSPC, \ + FN0 , A, S, D, F, G, H, J, K, L,FN11, FN2, \ + LSHIFT, Z, X, C, V, B, N, M,COMM, DOT,SLSH, RSHIFT, \ + LALT, FN1, LGUI, ENT, SPC, RALT, RSFT, FN3 ), + + /* Layer: Movement Layer (wrd=ctrl-right, bck=crtl-left) TOGGLE + * ,-------------------------------------------------. + * |Esc| |wrd| |END| | |PUp| |Hom| | Del | TODO: move Home? + * |-------------------------------------------------| TODO: ctrl-right: use actionmap + * | | | |PDn| | |Lft| Up| Dn| Rt| | | + * |-------------------------------------------------| + * | |Psc| | | |bck| | | | | | | TODO: where NUM, CAPS, SCROLL, PAUSE + * |-------------------------------------------------| TODO: ctrl-left: use actionmap + * | | Gui | | | | | | | + * `-------------------------------------------------' + */ //TODO + KEYMAP( + ESC ,____,TODO,____, END,____,____,PGUP,____,HOME,____, DEL, \ + TRNS ,____,____,PGDN,____,TRNS,LEFT,DOWN, UP,RGHT,____, TRNS, \ + TRNS ,PSCR,____,____,____,TODO,____,____,____,____,____,____, \ + TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS ), + + /* Layer: Numbers and ASCII-Symbols Layer MOMENTARY+TOGGLE + * ,-------------------------------------------------. + * | ^| !| "| §| $| %| &| /| (| )| =| ? | + * |-------------------------------------------------| + * | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0|Fn2 | TODO: where to put FN15=' + * |-------------------------------------------------| + * | #| <| || >| +| *| {| [| ]| }| \| ~| + * |-------------------------------------------------| + * | | | | | | | | | + * `-------------------------------------------------' + */ + KEYMAP( + GRV , FN5, FN6, FN7, FN8, FN9,FN10,FN11,FN12,FN13,FN14, FN17, \ + FN18 , 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, TRNS, \ + BSLS ,NUBS,FN30,FN31,RBRC,FN20,FN24,FN25,FN26,FN27,FN28,FN29, \ + TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS ), + + /* Layer: Layer for Function keys and Unicode Symbols MOMENTARY + * ,-------------------------------------------------. + * | F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11| F12| + * |-------------------------------------------------| + * | | | | | | | | | Ä| Ö| Ü|Entr| Ä=" Ö=: Ü={ + * |-------------------------------------------------| + * | | | | °| ²| ³| µ| ä| ö| ü| ß| | ä=' ö=; ü=[ ß=- + * |-------------------------------------------------| TODO: µ + * | | | |Space| Enter | | | | + * `-------------------------------------------------' + */ + KEYMAP( + F1 , F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, \ + TRNS ,____,____,____,____,____,____,____,FN16,FN21,FN19, ENT, \ + TRNS ,____,____, FN4,FN22,FN23,TODO,QUOT,SCLN,LBRC,MINS,RSFT, \ + TRNS, TRNS, TRNS, SPC, ENT, TRNS, TRNS, TRNS ), +}; + +const action_t PROGMEM fn_actions[] = { + [0] = ACTION_MODS_TAP_KEY(MOD_LCTL, KC_TAB), + [1] = ACTION_LAYER_MOMENTARY(1), + [2] = ACTION_LAYER_MOMENTARY(2), + [3] = ACTION_LAYER_MOMENTARY(3), + [4] = ACTION_MODS_KEY(MOD_LSFT, KC_GRV), + [5] = ACTION_MODS_KEY(MOD_LSFT, KC_1), + [6] = ACTION_MODS_KEY(MOD_LSFT, KC_2), + [7] = ACTION_MODS_KEY(MOD_LSFT, KC_3), + [8] = ACTION_MODS_KEY(MOD_LSFT, KC_4), + [9] = ACTION_MODS_KEY(MOD_LSFT, KC_5), + [10] = ACTION_MODS_KEY(MOD_LSFT, KC_6), + [11] = ACTION_MODS_KEY(MOD_LSFT, KC_7), + [12] = ACTION_MODS_KEY(MOD_LSFT, KC_8), + [13] = ACTION_MODS_KEY(MOD_LSFT, KC_9), + [14] = ACTION_MODS_KEY(MOD_LSFT, KC_0), + [15] = ACTION_MODS_KEY(MOD_LSFT, KC_BSLS), // #' key + [16] = ACTION_MODS_KEY(MOD_LSFT, KC_QUOT), // ä key + [17] = ACTION_MODS_KEY(MOD_LSFT, KC_MINS), // ß?\ key + [18] = ACTION_MODS_KEY(MOD_LSFT, KC_EQL), // ´` key + [19] = ACTION_MODS_KEY(MOD_LSFT, KC_LBRC), // ü key + [20] = ACTION_MODS_KEY(MOD_LSFT, KC_RBRC), // +*~ key + [21] = ACTION_MODS_KEY(MOD_LSFT, KC_SCLN), // ö key + [22] = ACTION_MODS_KEY(MOD_RALT, KC_2), // ² + [23] = ACTION_MODS_KEY(MOD_RALT, KC_3), // ³ + [24] = ACTION_MODS_KEY(MOD_RALT, KC_7), // { + [25] = ACTION_MODS_KEY(MOD_RALT, KC_8), // [ + [26] = ACTION_MODS_KEY(MOD_RALT, KC_9), // ] + [27] = ACTION_MODS_KEY(MOD_RALT, KC_0), // } + [28] = ACTION_MODS_KEY(MOD_RALT, KC_MINS), // "\" + [29] = ACTION_MODS_KEY(MOD_RALT, KC_RBRC), // ~ + [30] = ACTION_MODS_KEY(MOD_RALT, KC_NUBS), // <|> + [31] = ACTION_MODS_KEY(MOD_LSFT, KC_NUBS), // <|> + //[32] = ACTION_MODS_KEY(MOD_RALT, KC_M), // µ TODO: use actionmap +}; diff --git a/tmk_core/common/.keycode.h.swp b/tmk_core/common/.keycode.h.swp deleted file mode 100644 index 9423c8b68a42468b476e6cb8fb83005fe4d7343b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16384 zcmeI2TZ|i58OKjb3#Ie|w3RBQkq!h!yUW(MWRuWrBgW(Lde-9^XJ)+41|oOX9-~rT1C{Iwz|BT1>8E9@yoF5mgS|2aOMb9Oc|YjTC2NF5`%-c3mBYUxM1egNxQ86gWizbs@cZ9K?|*M?k9tXVqClcRqClcRqClcR zqClcRqCld+|Dysy|90{O0=q2=?n0Cvm`UG^u5U#77iY@<8I^x0%D*czFt+oyC_f*i zKb|R%vXdlHAWMxpFD&cSRT0Bo_Uu z)wf*RxAzJ_RP@jxQIQ0lw~nmSuINfm=;cVl~uSg|C6z zSg|Nn`C{A}e7Rc7hrO$sS~D7XLlKNpyu8Gfmu55+o0jXAxmFO#_aOiXyA9(M?s4q5= zW_x0J%)y(LF@;zeQb~_lEJ!0&kxKDtBB|y`Z`G7y-Ux=qec_!I28pnBuxo z97SZ5#nQ(^re)nfy$L*&NqH&Fu0rjB~B0bt_tdFPK<8LNk{#C*t*Zqs-<^+xcmz zveBq$nAl}$y&;IAq>P=JgRd21l$W8)kI|^$$dU0UNJS(r@3$iUoO=8~|q*YIX86^irp@@0xz(#gGR6^rwj{FCor zI8zI=o})+Re7Kn0!g+nACdZt|_h=7uLKMh;Q&c)@NJ`9}p#I19GM5l7AF8D5+RT_o zp|Yo#2EGCMUdlm^8kV%8tV#u5K!hu51*w6D6sPTCWu?=cXc_JVLI2TodV702HS{-9 z-e5D`vbXH6*S7~g``GMSzTaqhO+Q^42H8e7m+H6LYz4<7EL%c-x`Cy;MX_L)2X@nTw&0+J-ugT2 zS0(7!bVaSv72CB3@S-~0fCZ|ItPrwyS@=`c!^1azrvl6A`YD2Ms)z@7Q^?DTY_3!M zmK9}Fl?;OxHJu8yD(I#x))Yaf)tX+_3<(h#hy-qsjbT9RvRTq5E>I5*_?a~dK z4t={l>@E^AhkU$OKA>Ko{pQY7%iW<}E3gN23o`&&DZ=C`4&boiwFC5yJ8$T=EY@I= z+8D2CZJHYk9I3eoK?r(A1Jq)sV7up!YwaVog&DvG#_u4Qjh$VwwwX(QD~&Pfc`c{CgMBIHz`)t;1T>e)W*6}%M^}d~ty>p8y1b3Q7l!VKH+vY| z6yB;o%_b+?|F2<>{c-HM+5SHtZ6vQ_zkdx}0bd7S1D^+7@Hj9*2`qyQ_yBka+zkl$ z8_os(2wnv*gP()v!4JVR;7PCzE`al(3Pf-m%!7x)ec(2517`?-2G_s~;3wd-;5^8H zGN17`_;0oTDx;HTi*;49#BpaV2;8hj8u1a2Vi>)@B*1@L9?CGZSjn(Tn&N)$*G zNEApENEApENEApENEG<*6*z3WcxwR?K7K%XWV@!pc z=*LE9ZJZ2vbyZC;6Kb{LOLxW{JO<4h;-U#|1ajLBY**L~z47vbi#Y?lSG-faPrOUKCVc07-+b4x zp1F?4C#NhFTr4y(@&(hS=(7I}uqi=UDPqlQnyF|)0mo#ci?zrXM;6gyb=d3Ez@r-BmAC#RY&o01VumT*qy!|(aO0LZ|t3;+NC -- 2.39.3