Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add split usb detect, rgb, encoder #2

Open
wants to merge 1 commit into
base: hillside_52
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions keyboards/handwired/hillside/52/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,11 @@

#pragma once


#include "config_common.h"


#define SPLIT_USB_DETECT
/* key matrix size */
// Rows are doubled-up
#define MATRIX_ROWS 10
Expand Down
2 changes: 2 additions & 0 deletions keyboards/handwired/hillside/52/keymaps/vial/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@

#define VIAL_UNLOCK_COMBO_ROWS { 0, 2 }
#define VIAL_UNLOCK_COMBO_COLS { 2, 5 }

#define RGBLIGHT_ANIMATIONS
9 changes: 9 additions & 0 deletions keyboards/handwired/hillside/52/keymaps/vial/keymap.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,15 @@ enum layers {
// (For OS X, you'll want to change these editing keys to LGUI(KC_Z) etc.)


#if defined(ENCODER_MAP_ENABLE)
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
[_QWERTY] = { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[_NAV] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI), ENCODER_CCW_CW(RGB_SAD, RGB_SAI) },
[_SYM] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(RGB_SPD, RGB_SPI) },
[_ADJUST] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD), ENCODER_CCW_CW(KC_RIGHT, KC_LEFT) },
};
#endif

// clang-format off
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_QWERTY] = LAYOUT(
Expand Down
3 changes: 3 additions & 0 deletions keyboards/handwired/hillside/52/keymaps/vial/rules.mk
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
RGBLIGHT_ENABLE = yes
CAPS_WORD_ENABLE = yes
VIA_ENABLE = yes
VIAL_ENABLE = yes
Expand All @@ -7,3 +8,5 @@ VIAL_ENABLE = yes
TAP_DANCE_ENABLE = no
COMBO_ENABLE = no
KEY_OVERRIDE_ENABLE = no
VIAL_ENCODERS_ENABLE = yes
ENCODER_MAP_ENABLE = yes
15 changes: 14 additions & 1 deletion keyboards/handwired/hillside/52/keymaps/vial/vial.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "Hillside 52",
"vendorId": "0x4D4D",
"productId": "0x4852",
"lighting": "none",
"lighting": "qmk_rgblight",
"matrix": {"rows": 10, "cols": 6},

"layouts": {
Expand Down Expand Up @@ -105,6 +105,19 @@
},
"7,5"
],
[
{
"y": 2.53,
"x": 3
},
"0,0\n\n\n\n\n\n\n\n\ne",
"0,1\n\n\n\n\n\n\n\n\ne",
{
"x": 5.5
},
"1,0\n\n\n\n\n\n\n\n\ne",
"1,1\n\n\n\n\n\n\n\n\ne"
],
[
{
"rx": 3.92,
Expand Down