fix remaining keyboards

vial-kb · Sep 29, 2024 · a30c69d · a30c69d
1 parent 75d2ccf
commit a30c69d
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 14 deletions.
diff --git a/keyboards/doio/kb30/keymaps/vial/config.h b/keyboards/doio/kb30/keymaps/vial/config.h
@@ -15,8 +15,8 @@
 #undef OLED_TIMEOUT
 #define OLED_TIMEOUT 60000
 
-#undef ENCODERS_PAD_A
-#undef ENCODERS_PAD_B
-#define ENCODERS_PAD_A { B5, A1, A4 }
-#define ENCODERS_PAD_B { B6, A2, A3 }
+#undef ENCODER_A_PINS
+#undef ENCODER_B_PINS
+#define ENCODER_A_PINS { B5, A1, A4 }
+#define ENCODER_B_PINS { B6, A2, A3 }
 #define ENCODER_RESOLUTIONS { 4, 4, 4 }
diff --git a/keyboards/handwired/prkl30/keymaps/vial/rules.mk b/keyboards/handwired/prkl30/keymaps/vial/rules.mk
@@ -11,3 +11,5 @@ COMMAND_ENABLE = no
 ifeq ($(strip $(CONVERT_TO)), )
     QMK_SETTINGS = no
 endif
+
+COMBO_ENABLE = no
diff --git a/keyboards/jd45/keymaps/vial/rules.mk b/keyboards/jd45/keymaps/vial/rules.mk
@@ -3,4 +3,5 @@ VIAL_ENABLE = yes
 LTO_ENABLE = yes
 BACKLIGHT_ENABLE = no
 MIDI_ENABLE = no
-QMK_SETTINGS = no
+QMK_SETTINGS = no
+COMBO_ENABLE = no
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/keymaps/vial/rules.mk b/keyboards/mechlovin/adelais/rgb_led/rev3/keymaps/vial/rules.mk
@@ -5,4 +5,5 @@ LTO_ENABLE = yes
 KEY_OVERRIDE_ENABLE = no
 COMBO_ENABLE = no
 ENCODER_ENABLE = yes
-ENCODER_MAP_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
+QMK_SETTINGS = no
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev4/keymaps/vial/rules.mk b/keyboards/mechlovin/adelais/standard_led/arm/rev4/keymaps/vial/rules.mk
@@ -1,3 +1,4 @@
 VIA_ENABLE = yes
 VIAL_ENABLE = yes
 QMK_SETTINGS = no
+COMBO_ENABLE = no
diff --git a/keyboards/mt/ncr80/r2/hotswap/keymaps/vial/rules.mk b/keyboards/mt/ncr80/r2/hotswap/keymaps/vial/rules.mk
@@ -1,3 +1,5 @@
 VIA_ENABLE = yes
 VIAL_ENABLE = yes
 LTO_ENABLE = yes
+QMK_SETTINGS = no
+COMBO_ENABLE = no
diff --git a/keyboards/nachie/subtext/keymaps/vial/keymap.c b/keyboards/nachie/subtext/keymaps/vial/keymap.c
@@ -287,7 +287,7 @@ void matrix_scan_user(void) { // The very important timer.
         }
 
         //direction indicates which macro it is, with 1 being Macro 1, -1 being Macro 2, and 0 being no macro.
-        void dynamic_macro_record_start_user(int8_t direction){
+        bool dynamic_macro_record_start_user(int8_t direction){
             //prevEnabled = rgb_matrix_is_enabled();
             //if (!prevEnabled) { rgb_matrix_enable(); }
             //prevRGBmode = rgb_matrix_get_mode();
@@ -308,9 +308,10 @@ void matrix_scan_user(void) { // The very important timer.
                     macro2rec = false;
                     break;
             }
+            return true;
         }
 
-        void dynamic_macro_record_end_user(int8_t direction){
+        bool dynamic_macro_record_end_user(int8_t direction){
             //prevEnabled ? rgb_matrix_mode(prevRGBmode) : rgb_matrix_disable();
             switch(direction){
                 case 1:
@@ -324,6 +325,7 @@ void matrix_scan_user(void) { // The very important timer.
                     macro2 = false;
                     break;
             }
+            return true;
         }
     #endif
 

diff --git a/keyboards/nachie/syndrome/keymaps/vial/keymap.c b/keyboards/nachie/syndrome/keymaps/vial/keymap.c
@@ -292,7 +292,7 @@ void matrix_scan_user(void) { // The very important timer.
         }
 
         //direction indicates which macro it is, with 1 being Macro 1, -1 being Macro 2, and 0 being no macro.
-        void dynamic_macro_record_start_user(int8_t direction){
+        bool dynamic_macro_record_start_user(int8_t direction){
             prevEnabled = rgb_matrix_is_enabled();
             if (!prevEnabled) { rgb_matrix_enable(); }
             prevRGBmode = rgb_matrix_get_mode();
@@ -313,9 +313,10 @@ void matrix_scan_user(void) { // The very important timer.
                     macro2rec = false;
                     break;
             }
+            return true;
         }
 
-        void dynamic_macro_record_end_user(int8_t direction){
+        bool dynamic_macro_record_end_user(int8_t direction){
             prevEnabled ? rgb_matrix_mode(prevRGBmode) : rgb_matrix_disable();
             switch(direction){
                 case 1:
@@ -329,6 +330,7 @@ void matrix_scan_user(void) { // The very important timer.
                     macro2 = false;
                     break;
             }
+            return true;
         }
     #endif
 

diff --git a/keyboards/nachie/syndrome_ortho/keymaps/vial/keymap.c b/keyboards/nachie/syndrome_ortho/keymaps/vial/keymap.c
@@ -292,7 +292,7 @@ void matrix_scan_user(void) { // The very important timer.
         }
 
         //direction indicates which macro it is, with 1 being Macro 1, -1 being Macro 2, and 0 being no macro.
-        void dynamic_macro_record_start_user(int8_t direction){
+        bool dynamic_macro_record_start_user(int8_t direction){
             prevEnabled = rgb_matrix_is_enabled();
             if (!prevEnabled) { rgb_matrix_enable(); }
             prevRGBmode = rgb_matrix_get_mode();
@@ -313,9 +313,10 @@ void matrix_scan_user(void) { // The very important timer.
                     macro2rec = false;
                     break;
             }
+            return true;
         }
 
-        void dynamic_macro_record_end_user(int8_t direction){
+        bool dynamic_macro_record_end_user(int8_t direction){
             prevEnabled ? rgb_matrix_mode(prevRGBmode) : rgb_matrix_disable();
             switch(direction){
                 case 1:
@@ -329,6 +330,7 @@ void matrix_scan_user(void) { // The very important timer.
                     macro2 = false;
                     break;
             }
+            return true;
         }
     #endif
 

diff --git a/keyboards/sawnsprojects/bunnygirl65/keymaps/vial/keymap.c b/keyboards/sawnsprojects/bunnygirl65/keymaps/vial/keymap.c
@@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * │Ctrl│GUI │Alt │                        │ Alt│  Fn│ │ ← │ ↓ │ → │
      * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
      */
-    [0] = LAYOUT_all(
+    [0] = LAYOUT_65_ansi_blocker_tsangan_split_bs(
         KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_HOME,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGDN,
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * │    │    │    │                        │    │    │ │   │   │   │
      * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
      */
-    [1] = LAYOUT_all(
+    [1] = LAYOUT_65_ansi_blocker_tsangan_split_bs(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_DEL,  _______,
         _______, _______, _______, _______, _______, _______, KC_INS,  _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,