diff --git a/build.sh b/build.sh index 4930797..46f103e 100755 --- a/build.sh +++ b/build.sh @@ -10,8 +10,8 @@ sudo docker run -it \ $IMAGE \ sh -c compile.sh -cp out/massdrop_alt_ashe.bin ~/bin/Massdrop/qmk/massdrop_alt_ashe.bin -cd ~/bin/Massdrop/ +# cp out/massdrop_alt_ashe.bin ~/bin/Massdrop/qmk/massdrop_alt_ashe.bin +# cd ~/bin/Massdrop/ -./md_loader_windows.exe --first --download ./qmk/massdrop_alt_ashe.bin --restart +# ./md_loader_windows.exe --first --download ./qmk/massdrop_alt_ashe.bin --restart diff --git a/keymap/keymap.c b/keymap/keymap.c index 07e8890..7a1eb4a 100644 --- a/keymap/keymap.c +++ b/keymap/keymap.c @@ -11,6 +11,7 @@ #define _F2 _FUNCTION2_LAYER #define _UL _UNB_W_LAY #define _U2 _UNB_W_LAY_2 +#define _SA _SOLAR_ASH #define _TT _TEAMS_LAYER #define _PL _POM_LAYER #define _P2 _POM_LAYER2 @@ -94,6 +95,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ _______, XXXXXXX, _______, _______, _______, XXXXXXX, _______, _______, _______ \ ), + [_SOLAR_ASH] = LAYOUT_65_ansi_blocker( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_F6, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_F5, \ + KC_C, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + ), [_FUNCTION_LAYER] = 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, RCTL(KC_BSPC), RALT(KC_PSCR), \ _______, RGB_SPD, RGB_VAI, RGB_SPI, RGB_HUI, TG(_TL), _______, U_T_AUTO,U_T_AGCR,_______, KC_PSCR, KC_SLCK, KC_PAUS, _______, KC_DEL, \ @@ -110,7 +118,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_WIN_LAYER] = LAYOUT_65_ansi_blocker( KC_ESC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, TG(_TT), _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, TG(_TT), _______, _______, _______, TG(_SA), _______, _______, _______, _______, _______, \ _______, AD_UASH, AD_LASH, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, _______, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ _______, _______, OSL(_PL), _______, _______, _______, _______, _______, _______ \ diff --git a/keymap/keymap.h b/keymap/keymap.h index 0776c36..31f511c 100644 --- a/keymap/keymap.h +++ b/keymap/keymap.h @@ -25,6 +25,7 @@ enum layout_names { _GAME_LAYER, _UNB_W_LAY, _UNB_W_LAY_2, + _SOLAR_ASH, _FUNCTION_LAYER, _FUNCTION2_LAYER, _WIN_LAYER, diff --git a/keymap/lighting_layers.h b/keymap/lighting_layers.h index ca2bf08..b5fb9c4 100644 --- a/keymap/lighting_layers.h +++ b/keymap/lighting_layers.h @@ -66,7 +66,7 @@ const uint8_t PROGMEM ledmap[][DRIVER_LED_TOTAL][3] = { }, [_WIN_LAYER] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, C_TALI, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, C_TALI, _______, _______, _______, C_SECO, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, C_PRIM, C_PRIM, C_PRIM, C_PRIM, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, C_PRIM, _______, _______, _______, _______, _______, _______, _______, C_PRIM, C_PRIM, C_PRIM, @@ -162,6 +162,20 @@ const uint8_t PROGMEM ledmap[][DRIVER_LED_TOTAL][3] = { C_PRIM, C_PRIM, C_PRIM, C_PRIM, C_PRIM, C_PRIM, C_PRIM, C_PRIM, C_PRIM, C_PRIM, C_PRIM, C_PRIM, C_PRIM, C_PRIM, C_PRIM, C_PRIM, C_PRIM }, + [_SOLAR_ASH] = { + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, C_PRIM, C_SECO, _______, C_PRIM, _______, _______, _______, _______, _______, _______, _______, _______, _______, C_GRN, + _______, C_SECO, C_SECO, C_SECO, C_PRIM, _______, _______, _______, _______, _______, _______, _______, _______, C_SECO, + C_GRN, _______, _______, C_GRN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, C_PRIM, _______, _______, _______, _______, _______, + //UnderGlow + C_SECO, C_SECO, C_SECO, C_SECO, C_SECO, C_SECO, C_SECO, C_SECO, C_SECO, C_SECO, C_SECO, C_SECO, C_SECO, C_SECO, C_SECO, + C_SECO, C_SECO, + C_SECO, C_SECO, + C_SECO, C_SECO, + C_SECO, C_SECO, + C_SECO, C_SECO, C_SECO, C_SECO, C_SECO, C_SECO, C_SECO, C_SECO, C_SECO, C_SECO, C_SECO, C_SECO, C_SECO, C_SECO, C_SECO + }, [_POM_LAYER] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,