Add split usb detect, rgb, encoder

mmccoyd · Aug 27, 2022 · 117ea89 · 117ea89
1 parent 75db758
commit 117ea89
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 1 deletion.
diff --git a/keyboards/handwired/hillside/52/config.h b/keyboards/handwired/hillside/52/config.h
@@ -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

diff --git a/keyboards/handwired/hillside/52/keymaps/vial/config.h b/keyboards/handwired/hillside/52/keymaps/vial/config.h
@@ -6,3 +6,5 @@
 
 #define VIAL_UNLOCK_COMBO_ROWS { 0, 2 }
 #define VIAL_UNLOCK_COMBO_COLS { 2, 5 }
+
+#define RGBLIGHT_ANIMATIONS
diff --git a/keyboards/handwired/hillside/52/keymaps/vial/keymap.c b/keyboards/handwired/hillside/52/keymaps/vial/keymap.c
@@ -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(

diff --git a/keyboards/handwired/hillside/52/keymaps/vial/rules.mk b/keyboards/handwired/hillside/52/keymaps/vial/rules.mk
@@ -1,3 +1,5 @@
+RGBLIGHT_ENABLE = yes
+
 CAPS_WORD_ENABLE = yes
 VIA_ENABLE = yes
 VIAL_ENABLE = yes
@@ -7,3 +9,7 @@ VIAL_ENABLE = yes
 TAP_DANCE_ENABLE = no
 COMBO_ENABLE = no
 KEY_OVERRIDE_ENABLE = no
+VIAL_INSECURE = yes
+VIAL_ENCODERS_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
+
diff --git a/keyboards/handwired/hillside/52/keymaps/vial/vial.json b/keyboards/handwired/hillside/52/keymaps/vial/vial.json
@@ -2,7 +2,7 @@
     "name": "Hillside 52",
     "vendorId": "0x4D4D",
     "productId": "0x4852",
-    "lighting": "none",
+    "lighting": "qmk_rgblight",
     "matrix": {"rows": 10, "cols": 6},
 
     "layouts": {
@@ -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,
@@ -286,6 +299,7 @@
     "2,2"
   ]
 ]
+
 }
 }
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