From 186878fdce1abfff7bdd37512d39f6bc34961ec1 Mon Sep 17 00:00:00 2001 From: yunzii keyboard <381957792@qq.com> Date: Wed, 14 Aug 2024 11:27:53 +0800 Subject: [PATCH] ENCODER MAP LAYER --- keyboards/yunzii/al68/al68.c | 6 -- keyboards/yunzii/al68/halconf.h | 2 - .../yunzii/al68/keymaps/default/keymap.c | 76 ++++++++++--------- .../yunzii/al68/keymaps/default/rules.mk | 1 + keyboards/yunzii/al68/keymaps/via/keymap.c | 15 ++++ 5 files changed, 56 insertions(+), 44 deletions(-) create mode 100644 keyboards/yunzii/al68/keymaps/default/rules.mk diff --git a/keyboards/yunzii/al68/al68.c b/keyboards/yunzii/al68/al68.c index 3e67da05020..91bf5b65402 100644 --- a/keyboards/yunzii/al68/al68.c +++ b/keyboards/yunzii/al68/al68.c @@ -27,12 +27,6 @@ void keyboard_pre_init_kb(void) { writePinHigh(A8); //ENABLE USB uart_init(460800); wait_ms(400); - // debug_enable=true; - // debug_keyboard=true; - // debug_matrix=true; - // debug_mouse=true; - setPinOutput(B8); - writePinLow(B8); } bool process_record_kb(uint16_t keycode, keyrecord_t* record) diff --git a/keyboards/yunzii/al68/halconf.h b/keyboards/yunzii/al68/halconf.h index 51161381540..5ac07642c62 100644 --- a/keyboards/yunzii/al68/halconf.h +++ b/keyboards/yunzii/al68/halconf.h @@ -16,8 +16,6 @@ #pragma once -//#define HAL_USE_SERIAL TRUE - #define HAL_USE_PWM TRUE #include_next \ No newline at end of file diff --git a/keyboards/yunzii/al68/keymaps/default/keymap.c b/keyboards/yunzii/al68/keymaps/default/keymap.c index f38f1c80dca..dd976872053 100644 --- a/keyboards/yunzii/al68/keymaps/default/keymap.c +++ b/keyboards/yunzii/al68/keymaps/default/keymap.c @@ -1,39 +1,43 @@ -/* -Copyright 2021 owlab -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - +/* Copyright 2022 Jacky + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ #include QMK_KEYBOARD_H -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - - [0] = LAYOUT( - KC_ESC, 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_PSCR, KC_PSCR, KC_PAUS, - KC_GRV, 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_HOME, KC_PGUP, - 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_END, KC_PGDN, - 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_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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT, - _______, _______ - ) - [1] = LAYOUT( - _______, KC_MYCM, KC_WHOM, KC_CALC, KC_MSEL, KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, - _______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, EE_CLR, QK_BOOT, _______, _______, - _______, _______, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, RGB_HUI, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, RGB_MOD, - _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_RMOD, RGB_SPI, - _______, _______ - - ) +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [1] = { ENCODER_CCW_CW(_______, _______) } }; +#endif + + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( + 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_MUTE, + 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_DELETE, + 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_PAGE_UP, + 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_PAGE_DOWN, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT + ), + [1] = LAYOUT( + KC_GRV, KC_BRID, KC_BRIU, _______, KC_MYCM, KC_MAIL, KC_WHOM, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_VOLD, KC_VOLU, _______, _______, + _______, KC_BLE1, KC_BLE2, KC_BLE3, KC_24G, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______, + _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI + ) +}; + + diff --git a/keyboards/yunzii/al68/keymaps/default/rules.mk b/keyboards/yunzii/al68/keymaps/default/rules.mk new file mode 100644 index 00000000000..a40474b4d5c --- /dev/null +++ b/keyboards/yunzii/al68/keymaps/default/rules.mk @@ -0,0 +1 @@ +ENCODER_MAP_ENABLE = yes \ No newline at end of file diff --git a/keyboards/yunzii/al68/keymaps/via/keymap.c b/keyboards/yunzii/al68/keymaps/via/keymap.c index 5e2cc279d85..dd976872053 100644 --- a/keyboards/yunzii/al68/keymaps/via/keymap.c +++ b/keyboards/yunzii/al68/keymaps/via/keymap.c @@ -1,3 +1,18 @@ +/* Copyright 2022 Jacky + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ #include QMK_KEYBOARD_H #if defined(ENCODER_MAP_ENABLE)