Revert + disable encoder.

trankillity · Dec 12, 2023 · e7618ec · e7618ec
1 parent 837aac9
commit e7618ec
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 19 deletions.
diff --git a/.github/workflows/build-firmware.yml b/.github/workflows/build-firmware.yml
@@ -28,7 +28,7 @@ jobs:
     #     path: keyboards/splitkb/kyria/keymaps/andrewjrae
 
     - name: Build firmware
-      run: make fingerpunch/vulpes_majora/v1:${{ github.actor }} FP_TRACKBALL_ENABLE=yes      
+      run: make fingerpunch/vulpes_majora/v1:${{ github.actor }} FP_TRACKBALL_ENABLE=yes FP_VM_RGB_6COL_WITH_CENTER=yes      
 
     - name: Archive firmware
       uses: actions/upload-artifact@v3

diff --git a/config.h b/config.h
@@ -1,8 +1,8 @@
 #pragma once
 
-// #define COMBO_VARIABLE_LEN
-// #undef COMBO_TERM
-// #define COMBO_TERM 30
+#define COMBO_VARIABLE_LEN
+#undef COMBO_TERM
+#define COMBO_TERM 30
 
 #define PERMISSIVE_HOLD
 #define HOLD_ON_OTHER_KEY_PRESS

diff --git a/keymap.c b/keymap.c
@@ -1,7 +1,7 @@
 #include QMK_KEYBOARD_H
 
 #include "config.h"
-// #include "g/keymap_combo.h"
+#include "g/keymap_combo.h"
 // #include "casemodes.h"
 
 // Defines names for use in layer keycodes and the keymap
@@ -10,9 +10,12 @@ enum layer_names {
     // _GAME,
     _NUMB,
     _NAVI,
-    _SYST
+    _SYST,
+    _COMB
 };
 
+#define COMBO_ONLY_FROM_LAYER _COMB
+
 #define C_SELA      C(KC_A)
 #define C_UNDO      C(KC_Z)
 #define C_CUT       C(KC_X)
@@ -129,15 +132,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
               _______,                                                                                                                                            _______
 ),
 
-// [_COMB] = LAYOUT_vulpes_majora(
-//   KC_1,       KC_Q,       KC_W,       KC_F,       KC_P,       KC_B,                                               KC_J,       KC_L,       KC_U,       KC_Y,       KC_QUOT,    KC_4,
-//   KC_2,       KC_A,       KC_R,       KC_S,       KC_T,       KC_G,                                               KC_M,       KC_N,       KC_E,       KC_I,       KC_O,       KC_5,
-//   KC_3,       KC_Z,       KC_X,       KC_C,       KC_D,       KC_V,                                               KC_K,       KC_H,       KC_COMM,    KC_DOT,     KC_SLSH,    KC_6,
-//                                       _______,    _______,    _______,      _______,    _______,    _______,      _______,    _______,    _______,    
-//               _______,                _______,    _______,    _______,                                            _______,    _______,    _______,                _______,
-//   _______,    _______,    _______,                                                                                                                    _______,    _______,    _______,    
-//               _______,                                                                                                                                            _______
-// ),
+[_COMB] = LAYOUT_vulpes_majora(
+  KC_1,       KC_Q,       KC_W,       KC_F,       KC_P,       KC_B,                                               KC_J,       KC_L,       KC_U,       KC_Y,       KC_QUOT,    KC_4,
+  KC_2,       KC_A,       KC_R,       KC_S,       KC_T,       KC_G,                                               KC_M,       KC_N,       KC_E,       KC_I,       KC_O,       KC_5,
+  KC_3,       KC_Z,       KC_X,       KC_C,       KC_D,       KC_V,                                               KC_K,       KC_H,       KC_COMM,    KC_DOT,     KC_SLSH,    KC_6,
+                                      _______,    _______,    _______,      _______,    _______,    _______,      _______,    _______,    _______,    
+              _______,                _______,    _______,    _______,                                            _______,    _______,    _______,                _______,
+  _______,    _______,    _______,                                                                                                                    _______,    _______,    _______,    
+              _______,                                                                                                                                            _______
+),
 
 };
 

diff --git a/rules.mk b/rules.mk
@@ -1,10 +1,9 @@
-# FP_VM_RGB_6COL_WITH_CENTER=yes
 RGBLIGHT_ENABLE=yes
-ENCODER_ENABLE=yes
+# ENCODER_ENABLE=yes
 HAPTIC_ENABLE=yes
 AUDIO_ENABLE=yes
 
-# COMBO_ENABLE = yes
+COMBO_ENABLE = yes
 KEY_OVERRIDE_ENABLE = yes
 
-# VPATH += keyboards/gboards
+VPATH += keyboards/gboards