From 24567263f268c81d58afd6e272807dfd91192e01 Mon Sep 17 00:00:00 2001 From: gksygithub Date: Tue, 30 May 2023 11:53:51 +0800 Subject: [PATCH] Resolved requested changes --- keyboards/jukaie/jk01/info.json | 7 ++----- keyboards/jukaie/jk01/jk01.c | 16 ---------------- keyboards/jukaie/jk01/keymaps/default/keymap.c | 2 +- keyboards/jukaie/jk01/keymaps/via/keymap.c | 2 +- keyboards/jukaie/jk01/rules.mk | 4 ---- 5 files changed, 4 insertions(+), 27 deletions(-) diff --git a/keyboards/jukaie/jk01/info.json b/keyboards/jukaie/jk01/info.json index ac2ef36a757..8881bc8887b 100644 --- a/keyboards/jukaie/jk01/info.json +++ b/keyboards/jukaie/jk01/info.json @@ -13,8 +13,6 @@ ] }, "features": { - "audio": false, - "backlight": false, "bootmagic": true, "command": false, "console": false, @@ -22,8 +20,7 @@ "extrakey": true, "mousekey": true, "nkro": true, - "rgb_matrix": true, - "rgblight": false + "rgb_matrix": true }, "indicators": { "caps_lock": "C14" @@ -165,7 +162,7 @@ { "label": "-", "matrix": [8, 6], "x": 11, "y": 1 }, { "label": "=", "matrix": [6, 6], "x": 12, "y": 1 }, { "label": "Backspace", "matrix": [10, 1], "w": 2, "x": 13, "y": 1 }, - { "label": "Home", "matrix": [11, 6], " x": 15, "y": 1 }, + { "label": "Home", "matrix": [11, 6], "x": 15, "y": 1 }, { "label": "Tab", "matrix": [1, 1], "w": 1.5, "x": 0, "y": 2 }, { "label": "Q", "matrix": [1, 0], "x": 1.5, "y": 2 }, { "label": "W", "matrix": [2, 0], "x": 2.5, "y": 2 }, diff --git a/keyboards/jukaie/jk01/jk01.c b/keyboards/jukaie/jk01/jk01.c index f02204de671..22ab50f01d7 100644 --- a/keyboards/jukaie/jk01/jk01.c +++ b/keyboards/jukaie/jk01/jk01.c @@ -146,22 +146,6 @@ void spi_init(void) { #endif -#ifdef ENCODER_ENABLE - -bool encoder_update_kb(uint8_t index, bool clockwise) { - - if (!encoder_update_user(index, clockwise)) { return false; } - if (index == 0) { - if (clockwise) { - tap_code(KC_VOLD); - } else { - tap_code(KC_VOLU); - } - } - return true; -} -#endif - void keyboard_pre_init_kb(void) { setPinOutput(C0); setPinOutput(C15); diff --git a/keyboards/jukaie/jk01/keymaps/default/keymap.c b/keyboards/jukaie/jk01/keymaps/default/keymap.c index 18345267cee..0909bb22f38 100644 --- a/keyboards/jukaie/jk01/keymaps/default/keymap.c +++ b/keyboards/jukaie/jk01/keymaps/default/keymap.c @@ -111,7 +111,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [1] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, diff --git a/keyboards/jukaie/jk01/keymaps/via/keymap.c b/keyboards/jukaie/jk01/keymaps/via/keymap.c index 18345267cee..0909bb22f38 100644 --- a/keyboards/jukaie/jk01/keymaps/via/keymap.c +++ b/keyboards/jukaie/jk01/keymaps/via/keymap.c @@ -111,7 +111,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [1] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, diff --git a/keyboards/jukaie/jk01/rules.mk b/keyboards/jukaie/jk01/rules.mk index 09dd775ecb3..24d5f6f52ec 100644 --- a/keyboards/jukaie/jk01/rules.mk +++ b/keyboards/jukaie/jk01/rules.mk @@ -1,6 +1,2 @@ -# Build Options -# change yes to no to disable -# - EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = spi_flash