From 2415ff1d1601e5310de4f0b2f62f6ef6cfd3cf02 Mon Sep 17 00:00:00 2001 From: NaturalZh Date: Fri, 30 Aug 2024 20:14:56 +0800 Subject: [PATCH] Delete skyloong/gk68/pro/keymaps/via --- keyboards/skyloong/gk68/pro/config.h | 3 +- .../skyloong/gk68/pro/keymaps/via/keymap.c | 54 ------- .../skyloong/gk68/pro/keymaps/via/rules.mk | 2 - keyboards/skyloong/gk68/pro/pro.c | 144 ------------------ 4 files changed, 1 insertion(+), 202 deletions(-) delete mode 100644 keyboards/skyloong/gk68/pro/keymaps/via/keymap.c delete mode 100644 keyboards/skyloong/gk68/pro/keymaps/via/rules.mk diff --git a/keyboards/skyloong/gk68/pro/config.h b/keyboards/skyloong/gk68/pro/config.h index eb8d507d075..a03409f2fdc 100644 --- a/keyboards/skyloong/gk68/pro/config.h +++ b/keyboards/skyloong/gk68/pro/config.h @@ -6,5 +6,4 @@ #define AW20216S_EN_PIN_1 B5 #define AW20216S_CS_PIN_1 B12 #define CAPS_LOCK_INDEX 30 -#define WIN_MOD_INDEX 17 -#define MAC_MOD_INDEX 18 + diff --git a/keyboards/skyloong/gk68/pro/keymaps/via/keymap.c b/keyboards/skyloong/gk68/pro/keymaps/via/keymap.c deleted file mode 100644 index f4c68f900ac..00000000000 --- a/keyboards/skyloong/gk68/pro/keymaps/via/keymap.c +++ /dev/null @@ -1,54 +0,0 @@ -// Copyright 2021 JZ-Skyloong (@JZ-Skyloong) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include QMK_KEYBOARD_H -enum layer_names { - _WIN, - _MAC, - _WIN_INDEX, - _MAC_INDEX, -}; - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_WIN] = LAYOUT_all( - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, - 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_DEL, - KC_CAPS, 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_PGUP, - 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_PGDN, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(_WIN_INDEX), KC_APP, KC_LEFT, KC_DOWN, KC_RIGHT - ), - - [_MAC] = LAYOUT_all( - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, - 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_DEL, - KC_CAPS, 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_PGUP, - 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_PGDN, - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_SPC, KC_SPC, KC_RGUI, MO(_MAC_INDEX), KC_RALT, KC_LEFT, KC_DOWN, KC_RIGHT - ), - - [_WIN_INDEX] = LAYOUT_all( - 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_MUTE, - _______, _______, TO(0), TO(1), _______, _______, _______, _______, _______, _______, _______, RGB_RMOD, RGB_MOD, RGB_TOG, KC_MPLY, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, KC_END, - _______, _______, _______, _______, _______, _______, KC_RALT, _______, KC_APP, RGB_SPD, RGB_VAD, RGB_SPI - ), - - [_MAC_INDEX] = LAYOUT_all( - KC_GRV , KC_F14, KC_F15, C(KC_UP), G(KC_D), G(KC_SPC), LSG(KC_4), KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL, KC_MUTE, - _______, _______, TO(0), TO(1), _______, _______, _______, _______, _______, _______, _______, RGB_RMOD, RGB_MOD, RGB_TOG, KC_MPLY, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, KC_END, - _______, KC_LALT, KC_LGUI, _______, _______, _______, KC_RGUI, _______, KC_RALT, RGB_SPD, RGB_VAD, RGB_SPI - ) -}; - -#if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { - [_WIN] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, - [_MAC] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, - [_WIN_INDEX] = { ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(RGB_HUD, RGB_HUI)}, - [_MAC_INDEX] = { ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(RGB_HUD, RGB_HUI)} -}; -#endif - diff --git a/keyboards/skyloong/gk68/pro/keymaps/via/rules.mk b/keyboards/skyloong/gk68/pro/keymaps/via/rules.mk deleted file mode 100644 index f1adcab005e..00000000000 --- a/keyboards/skyloong/gk68/pro/keymaps/via/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -VIA_ENABLE = yes -ENCODER_MAP_ENABLE = yes diff --git a/keyboards/skyloong/gk68/pro/pro.c b/keyboards/skyloong/gk68/pro/pro.c index c03e69805c3..da3b7209017 100644 --- a/keyboards/skyloong/gk68/pro/pro.c +++ b/keyboards/skyloong/gk68/pro/pro.c @@ -2,13 +2,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "quantum.h" -int FN_ON = 0; -_Bool WIN_LOCK = 0; -_Bool FN_WIN = 0; -_Bool FN_MAC = 0; -_Bool L_WIN = 0; -_Bool L_MAC = 0; - #if defined(RGB_MATRIX_ENABLE) /*&& defined(CAPS_LOCK_INDEX)*/ const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = { /* Refer to aw20216 manual for these locations @@ -105,57 +98,8 @@ bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) { RGB_MATRIX_INDICATOR_SET_COLOR(CAPS_LOCK_INDEX, 0, 0, 0); } } - - switch (get_highest_layer(layer_state)) { - case 2:{ - RGB_MATRIX_INDICATOR_SET_COLOR(WIN_MOD_INDEX, 255, 255, 255); - if (!rgb_matrix_get_flags()) { - RGB_MATRIX_INDICATOR_SET_COLOR(MAC_MOD_INDEX, 0, 0, 0); - } - } break; - case 3:{ - RGB_MATRIX_INDICATOR_SET_COLOR(MAC_MOD_INDEX, 255, 255, 255); - if (!rgb_matrix_get_flags()) { - RGB_MATRIX_INDICATOR_SET_COLOR(WIN_MOD_INDEX, 0, 0, 0); - } - } break; - - case 0:{ - if (L_WIN) { - RGB_MATRIX_INDICATOR_SET_COLOR(WIN_MOD_INDEX, 255, 255, 255); - if (!rgb_matrix_get_flags()) { - RGB_MATRIX_INDICATOR_SET_COLOR(MAC_MOD_INDEX, 0, 0, 0); - } - }else{ - if (!rgb_matrix_get_flags()) { - RGB_MATRIX_INDICATOR_SET_COLOR(WIN_MOD_INDEX, 0, 0, 0); - } - } - } break; - - case 1:{ - if (L_MAC) { - RGB_MATRIX_INDICATOR_SET_COLOR(MAC_MOD_INDEX, 255, 255, 255); - if (!rgb_matrix_get_flags()) { - RGB_MATRIX_INDICATOR_SET_COLOR(WIN_MOD_INDEX, 0, 0, 0); - } - }else{ - if (!rgb_matrix_get_flags()) { - RGB_MATRIX_INDICATOR_SET_COLOR(MAC_MOD_INDEX, 0, 0, 0); - } - } - } break; - - default:{ - if (!rgb_matrix_get_flags()) { - RGB_MATRIX_INDICATOR_SET_COLOR(WIN_MOD_INDEX, 0, 0, 0); - RGB_MATRIX_INDICATOR_SET_COLOR(MAC_MOD_INDEX, 0, 0, 0); - } - } - } return true; } - #endif void suspend_power_down_kb(void) { @@ -172,95 +116,7 @@ bool shutdown_kb(bool jump_to_bootloader) { return true; } -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - if (!process_record_user(keycode, record)) { - return false; - } - switch (keycode) { -# ifdef RGB_MATRIX_ENABLE - case RGB_TOG: - if (record->event.pressed) { - switch (rgb_matrix_get_flags()) { - case LED_FLAG_ALL: { - rgb_matrix_set_flags(LED_FLAG_NONE); - rgb_matrix_set_color_all(0, 0, 0); - } break; - default: { - rgb_matrix_set_flags(LED_FLAG_ALL); - } break; - } - } - return false; -# endif - case TO(0): - if (record->event.pressed) { - L_WIN = 1; - set_single_persistent_default_layer(0); // Save default layer 0 to eeprom - } else { - L_WIN = 0; - } - return true; // continue all further processing of this key - case TO(1): - if (record->event.pressed) { - L_MAC = 1; - set_single_persistent_default_layer(1); //Save default layer 1 to eeprom - } else { - L_MAC = 0; - } - return true; // continue all further processing of this key - - case MO(1): - if (record->event.pressed) { - FN_ON = 1; - } else { - FN_ON = 0; - } - return true; - - case MO(2): - if (record->event.pressed) { - FN_WIN = 1; - FN_ON = 1; - } else { - FN_WIN = 0; - FN_ON = 0; - } - return true; - - case MO(3): - if (record->event.pressed) { - FN_ON = 1; - FN_MAC = 1; - } else { - FN_ON = 0; - FN_MAC = 0; - - } - return true; - - case KC_LGUI: - if (FN_ON){ - if ( record->event.pressed){ - WIN_LOCK = !WIN_LOCK ; //change win lock state - } - if (!WIN_LOCK) { - return false; //windows key locked do nothing - } - } - if (WIN_LOCK) { - return false; //windows key locked do nothing - } - return true; // continue all further processing of this key - - case RGB_VAI: - rgb_matrix_set_flags(LED_FLAG_ALL); - return true; - - default: - return true; - } -} void board_init(void) { // JTAG-DP Disabled and SW-DP Disabled