gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2025-03-04 18:58:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into xap

Browse Source
This commit is contained in:
QMK Bot 2023-03-07 21:06:38 +00:00
commit 39c0472371
6 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
keyboards/aidansmithdotdev/fine40/fine40.c
View File

@ -71,15 +71,15 @@ bool oled_task_kb(void) {
#ifdef ENCODER_ENABLE
bool encoder_update_kb(uint8_t index, bool clockwise) {
if (!encoder_update_user(index, clockwise)) {
return false;
}
// Volume control
if (clockwise) {
tap_code(KC_VOLU);
} else {
tap_code(KC_VOLD);
}
return false;
if (!encoder_update_user(index, clockwise)) {
return false;
}
// Volume control
if (clockwise) {
tap_code(KC_VOLU);
} else {
tap_code(KC_VOLD);
}
return true;
}
#endif

2
keyboards/aidansmithdotdev/fine40/info.json
View File

@ -27,7 +27,7 @@
},
"encoder": {
"rotary": [
{"pin_a": "D5", "pin_b": "B7", "resolution": 2}
{"pin_a": "B7", "pin_b": "D5", "resolution": 2}
]
},
"layouts": {

9
keyboards/aidansmithdotdev/fine40/keymaps/default/keymap.c
View File

@ -41,3 +41,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______ , _______ , _______ , _______ , _______ , _______ , _______ , KC_MS_L , KC_MS_D , KC_MS_U , KC_MS_R , _______
),
};
#if defined(ENCODER_MAP_ENABLE)
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
[_MAIN] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[_LEFT] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[_RIGHT] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[_TAB] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
};
#endif

1
keyboards/aidansmithdotdev/fine40/keymaps/default/rules.mk Normal file
View File

@ -0,0 +1 @@
ENCODER_MAP_ENABLE = yes

9
keyboards/aidansmithdotdev/fine40/keymaps/via/keymap.c
View File

@ -41,3 +41,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______ , _______ , _______ , _______ , _______ , _______ , _______ , KC_MS_L , KC_MS_D , KC_MS_U , KC_MS_R , _______
),
};
#if defined(ENCODER_MAP_ENABLE)
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
[_MAIN] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[_LEFT] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[_RIGHT] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[_TAB] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
};
#endif

3
keyboards/aidansmithdotdev/fine40/keymaps/via/rules.mk
View File

@ -1 +1,2 @@
VIA_ENABLE = yes
VIA_ENABLE = yes
ENCODER_MAP_ENABLE = yes