From beac02c1ba05cc984ffcaa1592e998a71af09bd0 Mon Sep 17 00:00:00 2001 From: kemonine Date: Thu, 17 Sep 2020 18:12:05 -0400 Subject: [PATCH] Move mouse nav to dedicated layer, shift away from home row arrow keys ; colorize mouse as purple ; update firmware bin ; clean up main modifiers on l1 --- firmware/alt/kemonine/qmk/keymap.c | 43 ++++++++++++------ .../kemonine/qmk/massdrop_alt_kemonine.bin | Bin 47808 -> 48292 bytes .../massdrop/alt/keymaps/kemonine/keymap.c | 43 ++++++++++++------ 3 files changed, 60 insertions(+), 26 deletions(-) diff --git a/firmware/alt/kemonine/qmk/keymap.c b/firmware/alt/kemonine/qmk/keymap.c index 089b27d5..84603116 100644 --- a/firmware/alt/kemonine/qmk/keymap.c +++ b/firmware/alt/kemonine/qmk/keymap.c @@ -11,6 +11,7 @@ #define RGB_KMN_NO_COLOR 0, 0, 0 #define RGB_KMN_CYAN 128, 255, 255 +#define RGB_KMN_PRPL 215, 195, 42 #define RGB_KMN_CYAN_HILIGHT 0, 191, 255 #define HS_KMN_ORANGE 10,255 @@ -54,7 +55,8 @@ qk_tap_dance_action_t tap_dance_actions[] = { const uint8_t PROGMEM layercolors[][2] = { [0] = {HS_KMN_ORANGE}, - [1] = {HS_KMN_CYAN} + [1] = {HS_KMN_CYAN}, + [2] = {HS_KMN_CYAN} }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -62,22 +64,34 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, LM(1, MOD_LALT), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, - KC_LCTL, KC_LGUI, TD(ALT_LAYER), KC_SPC, MO(1), KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT), + KC_LCTL, KC_LGUI, TD(ALT_LAYER), KC_SPC, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [1] = LAYOUT_65_ansi_blocker(KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, - KC_CAPS, KC_TRNS, KC_TRNS, KC_MS_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_WH_UP, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_INS, - KC_TRNS, KC_TRNS, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_BTN2, KC_MS_WH_DOWN, KC_TRNS, KC_TRNS, KC_MEDIA_PLAY_PAUSE, KC_RSFT, RGB_VAI, KC_MUTE, - KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_BTN1, KC_TRNS, KC_RCTL, KC_VOLD, RGB_VAD, KC_VOLU), + KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_INS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PLAY_PAUSE, KC_RSFT, RGB_VAI, KC_MUTE, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_RALT, KC_VOLD, RGB_VAD, KC_VOLU), + [2] = LAYOUT_65_ansi_blocker(KC_ESC, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_MS_UP, KC_NO, KC_NO, KC_NO, KC_MS_WH_UP, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, KC_NO, KC_NO, KC_MS_BTN1, KC_MS_BTN2, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_LSFT, KC_NO, KC_X, KC_C, KC_V, KC_NO, KC_NO, KC_MS_WH_DOWN, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_LCTL, KC_NO, TG(2), KC_NO, TG(2), KC_NO, KC_NO, KC_NO, KC_NO), }; const uint8_t PROGMEM ledcolors[][DRIVER_LED_TOTAL][3] = { [1] = { {RGB_KMN_CYAN}, {RGB_KMN_CYAN}, {RGB_KMN_CYAN}, {RGB_KMN_CYAN}, {RGB_KMN_CYAN}, {RGB_KMN_CYAN}, {RGB_KMN_CYAN}, {RGB_KMN_CYAN}, {RGB_KMN_CYAN}, {RGB_KMN_CYAN}, {RGB_KMN_CYAN}, {RGB_KMN_CYAN}, {RGB_KMN_CYAN}, {RGB_KMN_CYAN}, {RGB_KMN_CYAN}, - {RGB_KMN_CYAN}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_CYAN}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_CYAN}, {RGB_KMN_CYAN}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_CYAN}, {RGB_KMN_CYAN}, - {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_CYAN}, {RGB_KMN_CYAN}, {RGB_KMN_CYAN}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_CYAN}, {RGB_KMN_CYAN}, {RGB_KMN_CYAN}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_CYAN}, - {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_CYAN}, {RGB_KMN_CYAN}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_CYAN}, {RGB_KMN_NO_COLOR}, {RGB_KMN_CYAN}, {RGB_KMN_CYAN}, + {RGB_KMN_CYAN}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_CYAN}, {RGB_KMN_CYAN}, + {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_CYAN}, + {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_CYAN}, {RGB_KMN_NO_COLOR}, {RGB_KMN_CYAN}, {RGB_KMN_CYAN}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_CYAN}, {RGB_KMN_NO_COLOR}, {RGB_KMN_CYAN}, {RGB_KMN_CYAN}, {RGB_KMN_CYAN}, {RGB_KMN_CYAN} - } + }, + [2] = { + {RGB_KMN_PRPL}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, + {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_PRPL}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_PRPL}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, + {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_PRPL}, {RGB_KMN_PRPL}, {RGB_KMN_PRPL}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_PRPL}, {RGB_KMN_PRPL}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, + {RGB_KMN_PRPL}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_PRPL}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, + {RGB_KMN_PRPL}, {RGB_KMN_NO_COLOR}, {RGB_KMN_PRPL}, {RGB_KMN_NO_COLOR}, {RGB_KMN_PRPL}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR}, {RGB_KMN_NO_COLOR} + }, }; // Runs just one time when the keyboard initializes. @@ -119,12 +133,12 @@ void al_finished(qk_tap_dance_state_t *state, void *user_data) { break; case DOUBLE_TAP: // Check to see if the layer is already set - if (layer_state_is(1)) { + if (layer_state_is(2)) { // If already set, then switch it off - layer_off(1); + layer_off(2); } else { // If not already set, then switch the layer on - layer_on(1); + layer_on(2); } break; } @@ -174,6 +188,9 @@ void rgb_matrix_indicators_user(void) { case 1: set_leds_color(1); break; + case 2: + set_leds_color(2); + break; } } if (host_keyboard_leds() & (1<k3;0c3F^zkn%`yjKhdTKm==$Fx55~4Pam*0ZB%|M?qWD zFb1_bqYc4TsAeWQB@wPnlQs*C(WKg;g&Iql3}sO#gevuJ74O~Uar?XM^62A_*qr4% z-*>+AJHK=9nRCviXM&!$)4KY0Fz7x2(EJa;f0Vfx#h%mOk?Z~~(aDofme}0#Wbw+w zDrMoJw=6UoS{C#|!2j#9_NKVHwjO|Mi0g=6gi^kH>Tj2${Wxr!oyqaE!62HPb!ap zh~on+bE5+~sbH1@b3r_PZsU zx+B0ChEE-kPK3yh!61um@`F)Xte5YP23Yt{-3?UhX7Rwh8zzacXIfbSSp@dLV-!8?HU3gxhYZrRAp};<{x{WA@r$X{*-qdM=OTe6~7G>Z9o5uYGn4?rKwAMthm;f zxxA9H^I1ibDtCJ}boW@9d(c0kjuc|D99cZl4c&im={nS(Jn!^tQLknC;4h*kUT`{1 z=%l$K8R|lp--uen-1NUm(`|A_wxYA!rJGUry7WoZ6E1xmb%JZI2Gpg@t{>2kyPRL3 zvnt=2?I`L7Huk+y-*K0t#2fjckWEBWxEX`8=mupy3(ziPX`$g7^CEXOx@J~^uBKoi z)`YHxnbAG6$n{3|25O$yvsADw`*U+_$UlWs+*pC#h_DY~RIxjjLY+WQ|(*ij|v+ z-QJUC#EpEvNy}j-{_Ew*Tofq-7<>g_H}XcrHG~l9fb*XkDbU9>k zRQ9j{B#g<~)8Z+1Hc=lG>PVHARQ){TaMtR+Cfw=GYI18@4CeooSWf6`R`zW2VPfVj z$+rmU;MvniU-0FrS6~1{=79ZnWRoMZZ zviLxr6gSDTD9I3M?U)pY*s9EMlEQDz-0R~rcQq-@`tl>aE%xQXnfHiV7C&Zk{&m`7 zWj8jzqtLd3ccNOX7`F`4ci}k==v3#a*Ar72o*&b8l@N+=7&|44L%i;VkKAaNmH&L} zAJt3yaLDaQFqGhs(kL+OL`YWt;*NMq-em*DDW(o7z~HweaIRaVjki35adY4 zm7Nh=r^iQ0gKuDXD$6am3Q&7PMcfG2M7y*c1 z0)~B|VDLfKBl7vJ715NOWQQtOs!Z*;^3PYsyDh=g1D0R24#+*hZ{-`SL1% zLK<1^?mFt*!5q6^BL`V|btM^RgVmpqAMot;1a9d%oMs!M2b0Vo$`DVDu)plt5?b#_ z&%A&K;+a7|!?alI7?v*Ae}HXYY*n+|z1MKpXliuiJd3VbP2Ob1HRjMgnCd8^6>$|I zbw=ZjTJSq%OamWUdzMn`2p+}B)d${G$T3U&;e*v`PtE55 z2Y-);hM)e~N{*7x_|&)JINuSp`w?N~e#=fp(gV{>IJLx2 zg^mKBS>^+OxsU1|;WN@)Z982ri?v-<*|p0%_Bze^8fX29+Dop- zAF!~~$H-mQc6x;;0oRX>oYt5?aI;>k^eTnG*KiSTym$d(aUPSW z;IzSx@1-sLC)nWOtn&yaTs=<0HN+AE?x3Glj@f#yvZA1P`7SQ=Z9d1$h;RF^@H#w; zJHG{>ksmv=l8{zrYzd;5Z2Yq=4y`8X9A1C#1LPxjA}oC74kE$j5k(`C5Jmh@=N;9*08zKhq5uE@ delta 2711 zcmbtVeNo7j>(RdU#KuFt02ahs2rEKqKfm-(t8uyoR!v3oyfVgx&lR2d>vu3*!e7}?ASH7;VZei4|#2+1^0l|Ap- z9?l=P^!yLG)R@noRj4~?`O_d zTfuhxQvg#mnDmy20(LY5Ant&)Ep@*HDF>wO$RtHu@LBDCiAjMMLCB$L0rOVpOO;7u z*k5a%>aDdfLWiU)h^%D=mL&@U`$K z-h(!S2yt)9;#pa6$l}xT4Tl!5i0=(BF?zK%5Nqa-6JeWIxqDe;=vd%VvW_MP*}|f( z;&UxnC~2WOw|JSZ{bu)hV!&od&7MpBfd(W>MQCn8{{5sU>)HwUSc;`x=(~izke5*w66UYcNx0vbSt`=(&^k-bT#xS zy1Q?2L(tt#`_cXQ7I&-%Y#;L^YCTIX(2eGuWG}sDUK8}lI4&4a3njE5W<80fT`|96 zl*x@vS$NZ>at4vq9PJ#JZa$bnXX z0{S8I{QujFyDSe8XehPdI^$3;6$&yFU^d|CGPP&!;37xK1i?(FPQ zqL#%TI-}$w(>+A5l(Z_exwJLD8<#KK2^pJkt7Wb&0&^BB@Z4{k~0^j!dS?Up1}I8Ka?dbiw9aLZIj zl4e?lM=M`fJ%f-2+Pt-q@pjSRn$4t&*41nwgLI_kEwYk7_Ea)Eb1e?D1JR2`CJ+^f zd^^3q?NQ@icSiO}+!u>K4KsPgMz>vhW7n$~YcQ&%zux{1u~2hu1UW_1YM0^1;;Gt0 z##Su#M}!qIjF2qz@TFS%SEWx2pImpCVLW#F(atD^Zu%&!elohNey(CZQlF^Mp8CBC z1veH$MgUGwMcism`=QT}fEaN=S=lnjA)%2s?hp4-NTZnJiR~iz`cZ2PoVSq)$ z^vVlyOsl80Ej-MGhJu7i=40A+FcDhROo6_OSuTrpJ=M8@t)1^`|1Dv6$uj+AM`Ro_ z{*@B|KK;XxZtRGnU%eDS_jMfRf-#?NI`ka5PR9=|SReqI{JEgSuL!_nd6W8UaKhN6 zS^>pSM2kBO?6=^iRh