Browse Source

Fixed up the encoder code; and reframed kyria layout to be in future layout folder.

pull/14484/head^2
Batuhan Başerdem 2 years ago
parent
commit
64b439e2b1
2 changed files with 13 additions and 11 deletions
  1. +12
    -10
      keyboards/splitkb/kyria/keymaps/bbaserdem/keymap.c
  2. +1
    -1
      users/bbaserdem/bb-encoder.c

+ 12
- 10
keyboards/splitkb/kyria/keymaps/bbaserdem/keymap.c View File

@ -13,6 +13,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include QMK_KEYBOARD_H
#include "bbaserdem.h"
#define LAYOUT_split_3x6_5_wrapper(...) LAYOUT_split_3x6_5(__VA_ARGS__)
/* F layout
*        
* W  F  G  Ğ  I  O          D  R  N  H  P  Q
@ -26,61 +28,61 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_BASE] = LAYOUT_wrapper(
[_BASE] = LAYOUT_split_3x6_5_wrapper(
_BL1_1_,_BL1_5_, _BR1_5_,_BR1_1_,
_BL2_1_,_BL2_5_, _BR2_5_,_BR2_1_,
_BL3_1_,_BL3_5_,xxx2xxx,xxx2xxx,_BR3_5_,_BR3_1_,
BB_ENC0, _BL4_3_,KC_LSFT,KC_RSFT,_BR4_3_,BB_ENC1
),
[_CHAR] = LAYOUT_wrapper(
[_CHAR] = LAYOUT_split_3x6_5_wrapper(
XXXXXXX,_CL1_5_, _CR1_5_,XXXXXXX,
XXXXXXX,_CL2_5_, _CR2_5_,XXXXXXX,
XXXXXXX,_CL3_5_,xxx2xxx,xxx2xxx,_CR3_5_,XXXXXXX,
_______,_CL4_3_,_______,_______,_CR4_3_,_______
),
[_GAME] = LAYOUT_wrapper(
[_GAME] = LAYOUT_split_3x6_5_wrapper(
_GA1_1_,_GA1_5_, ___5___,___1___,
_GA2_1_,_GA2_5_, ___5___,___1___,
_GA3_1_,_GA3_5_,xxx2xxx,xxx2xxx,___5___,___1___,
_______,_GA4_3_,_______,_______,___3___,_______
),
[_MEDI] = LAYOUT_wrapper(
[_MEDI] = LAYOUT_split_3x6_5_wrapper(
___1___,___5___, _ME1_5_,___1___,
___1___,___5___, _ME2_5_,___1___,
___1___,___5___,xxx2xxx,xxx2xxx,_ME3_5_,___1___,
___1___,___3___,_______,_______,_ME4_3_,___1___
),
[_NAVI] = LAYOUT_wrapper(
[_NAVI] = LAYOUT_split_3x6_5_wrapper(
___1___,___5___, _NA1_5_,___1___,
___1___,___5___, _NA2_5_,___1___,
___1___,___5___,xxx2xxx,xxx2xxx,_NA3_5_,___1___,
___1___,___3___,_______,_______,_NA4_3_,___1___
),
[_SYMB] = LAYOUT_wrapper(
[_SYMB] = LAYOUT_split_3x6_5_wrapper(
___1___,___5___, _SY1_5_,___1___,
___1___,___5___, _SY2_5_,___1___,
___1___,___5___,xxx2xxx,xxx2xxx,_SY3_5_,___1___,
___1___,___3___,_______,_______,_SY4_3_,___1___
),
[_NUMB] = LAYOUT_wrapper(
[_NUMB] = LAYOUT_split_3x6_5_wrapper(
___1___,_NU1_5_, ___5___,___1___,
___1___,_NU2_5_, ___5___,___1___,
___1___,_NU3_5_,xxx2xxx,xxx2xxx,___5___,___1___,
___1___,_NU4_3_,_______,_______,___3___,___1___
),
[_FUNC] = LAYOUT_wrapper(
[_FUNC] = LAYOUT_split_3x6_5_wrapper(
___1___,_FU1_5_, ___5___,___1___,
___1___,_FU2_5_, ___5___,___1___,
___1___,_FU3_5_,xxx2xxx,xxx2xxx,___5___,___1___,
___1___,_FU4_3_,_______,_______,___3___,___1___
),
[_MOUS] = LAYOUT_wrapper(
[_MOUS] = LAYOUT_split_3x6_5_wrapper(
___1___,_MO1_5_, ___5___,___1___,
___1___,_MO2_5_, ___5___,___1___,
___1___,_MO3_5_,xxx2xxx,xxx2xxx,___5___,___1___,
___1___,_MO4_3_,_______,_______,___3___,___1___
),
[_MUSI] = LAYOUT_wrapper(
[_MUSI] = LAYOUT_split_3x6_5_wrapper(
_MU_12_,_MU_12_,
_MU_06_,xxx2xxx,xxx2xxx,_MU_06_,
MU_TOG,_MUL_3_,_MU_02_,_MUR_3_,___1___


+ 1
- 1
users/bbaserdem/bb-encoder.c View File

@ -325,7 +325,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
}
break;
}
return true;
return false;
}
void encoder_click_action(uint8_t index) {


Loading…
Cancel
Save