mirrors/qmk_userspace
1
0
Fork 1
mirror of https://github.com/qmk/qmk_userspace.git synced 2025-05-14 11:25:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
QMK Bot 2022-07-26 20:25:59 +00:00
commit 7944b7ef39
3 changed files with 8 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

3
keyboards/mechwild/mercutio/keymaps/via/config.h
View file

@ -15,6 +15,3 @@
*/ */
#pragma once #pragma once
/* Define custom font */
#define OLED_FONT_H "keyboards/mechwild/mercutio/lib/mercutiofont.c"

41
keyboards/mechwild/mercutio/keymaps/via/keymap.c
View file

@ -46,38 +46,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ) KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS )
}; };
#ifdef ENCODER_ENABLE #ifdef ENCODER_MAP_ENABLE
bool encoder_update_user(uint8_t index, bool clockwise) { const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
switch (index) { [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
case 0: [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
if (clockwise) { [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
tap_code(KC_VOLU); [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
} else { };
tap_code(KC_VOLD);
}
break;
}
return true;
}
#endif
#ifdef OLED_ENABLE
oled_rotation_t oled_init_user(oled_rotation_t rotation) {
return OLED_ROTATION_180; // flips the display 180 degrees if offhand
}
static void render_name(void) {
static const char PROGMEM mercutio_name[] = {
0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0x95, 0xB5, 0x96, 0xD5, 0xB6, 0xB6,
0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 0x90, 0x91, 0x92, 0x93, 0x94,
0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, 0xB0, 0xB1, 0xB2, 0xB3, 0xB4,
0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0x00
};
oled_write_P(mercutio_name, false);
}
bool oled_task_user(void) {
render_name();
return false;
}
#endif #endif

2
keyboards/mechwild/mercutio/keymaps/via/rules.mk
View file

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