cleanup

Author: veypatch

keyboards/splitkb/kyria/rev3/keymaps/default_hlc/keymap.c

@@ -247,7 +247,7 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
 };
 #endif
 
-
+#if defined (HALCYON_ENABLE)
 const uint16_t left_halcyon_buttons[10][5] = {
     [_QWERTY] =     { KC_MUTE, _______, _______, _______, _______ },
     [_DVORAK] =     { _______, _______, _______, _______, _______ },
@@ -267,3 +267,4 @@ const uint16_t right_halcyon_buttons[10][5] = {
     [_FUNCTION] =   { _______, _______, _______, _______, _______ },
     [_ADJUST] =     { _______, _______, _______, _______, _______ }
 };
+#endif

keyboards/splitkb/kyria/rev3/keymaps/vial_hlc/keymap.json

@@ -53,12 +53,12 @@
         ]
     ],
     "encoders": [
-        [{"ccw": "KC_VOLD", "cw": "KC_VOLU"}, {"ccw": "KC_VOLD", "cw": "KC_VOLU"}],
-        [{"ccw": "KC_VOLD", "cw": "KC_VOLU"}, {"ccw": "KC_VOLD", "cw": "KC_VOLU"}],
-        [{"ccw": "KC_VOLD", "cw": "KC_VOLU"}, {"ccw": "KC_VOLD", "cw": "KC_VOLU"}],
-        [{"ccw": "KC_VOLD", "cw": "KC_VOLU"}, {"ccw": "KC_VOLD", "cw": "KC_VOLU"}],
-        [{"ccw": "KC_VOLD", "cw": "KC_VOLU"}, {"ccw": "KC_VOLD", "cw": "KC_VOLU"}],
-        [{"ccw": "KC_VOLD", "cw": "KC_VOLU"}, {"ccw": "KC_VOLD", "cw": "KC_VOLU"}],
-        [{"ccw": "KC_VOLD", "cw": "KC_VOLU"}, {"ccw": "KC_VOLD", "cw": "KC_VOLU"}]
+        [{"ccw": "KC_VOLD", "cw": "KC_VOLU"}, {"ccw": "KC_VOLD", "cw": "KC_VOLU"}, {"ccw": "KC_PGUP", "cw": "KC_PGDN"} ,{"ccw": "KC_PGUP", "cw": "KC_PGDN"}],
+        [{"ccw": "KC_VOLD", "cw": "KC_VOLU"}, {"ccw": "KC_VOLD", "cw": "KC_VOLU"}, {"ccw": "KC_PGUP", "cw": "KC_PGDN"} ,{"ccw": "KC_PGUP", "cw": "KC_PGDN"}],
+        [{"ccw": "KC_VOLD", "cw": "KC_VOLU"}, {"ccw": "KC_VOLD", "cw": "KC_VOLU"}, {"ccw": "KC_PGUP", "cw": "KC_PGDN"} ,{"ccw": "KC_PGUP", "cw": "KC_PGDN"}],
+        [{"ccw": "KC_VOLD", "cw": "KC_VOLU"}, {"ccw": "KC_VOLD", "cw": "KC_VOLU"}, {"ccw": "KC_PGUP", "cw": "KC_PGDN"} ,{"ccw": "KC_PGUP", "cw": "KC_PGDN"}],
+        [{"ccw": "KC_VOLD", "cw": "KC_VOLU"}, {"ccw": "KC_VOLD", "cw": "KC_VOLU"}, {"ccw": "KC_PGUP", "cw": "KC_PGDN"} ,{"ccw": "KC_PGUP", "cw": "KC_PGDN"}],
+        [{"ccw": "KC_VOLD", "cw": "KC_VOLU"}, {"ccw": "KC_VOLD", "cw": "KC_VOLU"}, {"ccw": "KC_PGUP", "cw": "KC_PGDN"} ,{"ccw": "KC_PGUP", "cw": "KC_PGDN"}],
+        [{"ccw": "KC_VOLD", "cw": "KC_VOLU"}, {"ccw": "KC_VOLD", "cw": "KC_VOLU"}, {"ccw": "KC_PGUP", "cw": "KC_PGDN"} ,{"ccw": "KC_PGUP", "cw": "KC_PGDN"}]
     ]
 }

users/halcyon_modules/splitkb/config.h

@@ -3,6 +3,8 @@
 
 #pragma once
 
+#define HALCYON_ENABLE
+
 #define SPLIT_TRANSACTION_IDS_KB MODULE_SYNC
 
 #define SPLIT_POINTING_ENABLE

users/halcyon_modules/splitkb/halcyon.c

@@ -187,12 +187,11 @@ void matrix_slave_scan_kb(void) {
     matrix_slave_scan_user();
 }
 
+#ifndef VIAL_ENABLE
 __attribute__((weak)) const uint16_t left_halcyon_buttons[10][5];
 __attribute__((weak)) const uint16_t right_halcyon_buttons[10][5];
 
 bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-
-#ifndef VIAL_ENABLE
     if (record->event.key.col >= VIRTUAL_COL_START) {
         uint8_t btn = record->event.key.col - VIRTUAL_COL_START;
 
@@ -219,7 +218,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
         }
         return false;
     }
-#endif // VIAL_ENABLE
 
     return process_record_user(keycode, record);
 }
+#endif // VIAL_ENABLE