Fix redox wrapper

struckmb · Apr 8, 2023 · 56a4a86 · 56a4a86
1 parent cf87fd3
commit 56a4a86
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 21 deletions.
diff --git a/users/struckmb/config.h b/users/struckmb/config.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #define EE_HANDS
+#define ENABLE_COMPILE_KEYCODE
 
 // Space saving
 #ifdef LOCKING_SUPPORT_ENABLE
@@ -10,25 +11,25 @@
 # undef LOCKING_RESYNC_ENABLE
 #endif
 #ifndef NO_DEBUG
-# define NO_DEBUG
+#  define NO_DEBUG
 #endif
 #define NO_MUSIC_MODE
 
 #if !defined(NO_PRINT) && !defined(CONSOLE_ENABLE)
-# define NO_PRINT
+#  define NO_PRINT
 #endif
 
 // Mousekey mode
 #ifdef MOUSEKEY_ENABLE
-# define MK_COMBINED
-# define MOUSEKEY_MAX_SPEED 4
-# define MOUSEKEY_TIME_TO_MAX 45
-# define MOUSEKEY_WHEEL_MAX_SPEED 20
-# define MOUSEKEY_WHEEL_TIME_TO_MAX 60
+#  define MK_COMBINED
+#  define MOUSEKEY_MAX_SPEED 4
+#  define MOUSEKEY_TIME_TO_MAX 45
+#  define MOUSEKEY_WHEEL_MAX_SPEED 20
+#  define MOUSEKEY_WHEEL_TIME_TO_MAX 60
 #endif // MOUSEKEY_ENABLE
 
 #ifdef COMBO_ENABLE
-# define COMBO_SHOULD_TRIGGER
+#  define COMBO_SHOULD_TRIGGER
 #endif // COMBO_ENABLE
 
 // Tap-hold settings

diff --git a/users/struckmb/keycodes.h b/users/struckmb/keycodes.h
@@ -34,14 +34,15 @@
 #define LILYPND KC_NO
 #endif // LILYPOND_ENABLE
 #ifdef ASETNIOP_ENABLE
-#define ASETNIO DF(_ASETNIOP)
+#define ASET DF(_ASETNIOP)
 #else
-#define ASETNIO KC_NO
+#define ASET KC_NO
 #endif // ASETNIOP_ENABLE
 #ifdef ARTSENIO_ENABLE
-#define ARTSENI DF(_ARTSENIO)
+#define ARTSEN DF(_ARTSENIO)
 #else
-#define ARTSENI KC_NO
+#define ARTSEN KC_NO
+
 #endif // ARTSENIO_ENABLE
 
 // Thumb / layer keys
@@ -329,20 +330,20 @@ to add/remove underscores to keep the lengths consistent.
 #define ______________________MOUSE_TB____________________6_ ___MOUSE_TL___2_, KC_BTN3, _______, ___MOUSE_TR___2_
 
 // ┌─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┐
-// │ TOGG│Plain│Brthe│Rainb│Swirl│ │EEClr│QWERT│BONEO│COLDH│LYPND│
+// │ TOGG│Plain│Brthe│Rainb│Swirl│ │(BtC)│(Bt←)│(Bt0)│(Bt→)│(Out)│
 // ├─────┼─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┼─────┼─────┤
-// │Speed│ Val │ Sat │ Hue │ Mode│ │(BtC)│(Bt←)│ XXX │(Bt→)│ XXX │
+// │Speed│ Val │ Sat │ Hue │ Mode│ │EEClr│QWERT│COLDH│BONEO│LYPND│
 // ├─────┼─────┼─────┼─────┼─────┤ ├─────┼─────┼Mouse┼─────┼─────┤
-// │ Test│ Xmas│Grdnt│Knght│Snake│ │Reset│Build│ASETN│ARTSN│ Sft │
+// │ Test│ Xmas│Grdnt│Knght│Snake│ │Reset│ ASET│ARTSN│ XXX │ Sft │
 // └─────┴─────┴─────┼─────┼─────┼─────┐ ┌─────┼─────┼─────┼─────┴─────┴─────┘
 // │ │ │ │ │ │ │ │
 // └─────┴─────┴─────┘ └─────┴─────┴─────┘
 #define _________________CONFIG_L1_______________5_ RGB_TOG, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW
 #define _________________CONFIG_L2_______________5_ RGB_SPI, RGB_VAI, RGB_SAI, RGB_HUI, RGB_MOD
 #define _________________CONFIG_L3_______________5_ RGB_M_T, RGB_M_X, RGB_M_G, RGB_M_K, RGB_M_SN
-#define _________________CONFIG_R1_______________5_ EE_CLR, QWERTZ, BONE, COLMAK, LILYPND
-#define _________________CONFIG_R2_______________5_ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-#define _________________CONFIG_R3_______________5_ QK_BOOT, QK_MAKE, ASETNIO, ARTSENI, KC_LSFT
+#define _________________CONFIG_R1_______________5_ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
+#define _________________CONFIG_R2_______________5_ EE_CLR, QWERTZ, COLMAK, BONE, LILYPND
+#define _________________CONFIG_R3_______________5_ QK_BOOT, ASET, ARTSEN, XXXXXXX, KC_LSFT
 
 #define ____________________CONFIG_L1_____________________6_ _______, _________________CONFIG_L1_______________5_
 #define ____________________CONFIG_L2_____________________6_ _______, _________________CONFIG_L2_______________5_
@@ -352,3 +353,4 @@ to add/remove underscores to keep the lengths consistent.
 #define ____________________CONFIG_R3_____________________6_ _________________CONFIG_R3_______________5_, _______
 
 #define ____________________CONFIG_TB_____________________6_ _______________________BLANK______________________6_
+
diff --git a/users/struckmb/wrappers.h b/users/struckmb/wrappers.h
@@ -74,7 +74,7 @@ expanded before being used as arguments to the LAYOUT_xxx macro.
  K00, K01, K02, K03, K04, K05, K08, K09, K0A, K0B, K0C, K0D, \
  K10, K11, K12, K13, K14, K15, KC_NO, KC_NO, K18, K19, K1A, LT(_MSE_CTL,K1B), K1C, K1D, \
  CTL_T(K20), K21, K22, GUI_T(K23), CTL_T(K24), ALT_T(K25), KC_NO, KC_NO, ALT_T(K28), CTL_T(K29), GUI_T(K2A), K2B, K2C, ALT_T(K2D), \
- K30, SFT_T(K31), K32, K33, K34, K35, KC_NO, KC_NO, KC_NO, KC_NO, K28, K39, K3A, K3B, RSFT_T(K3C), K3D, \
+ K30, SFT_T(K31), K32, K33, K34, K35, KC_NO, KC_NO, KC_NO, KC_NO, K38, K39, K3A, K3B, RSFT_T(K3C), K3D, \
  KC_NO, KC_NO, K41, K42, K43, K44, K45, K48, K49, K4A, K4B, K4C, KC_NO, KC_NO \
  )
 #define LAYOUT_4x6_11_layer( \
@@ -87,8 +87,8 @@ expanded before being used as arguments to the LAYOUT_xxx macro.
  K00, K01, K02, K03, K04, K05, K08, K09, K0A, K0B, K0C, K0D, \
  K10, K11, K12, K13, K14, K15, KC_NO, KC_NO, K18, K19, K1A, K1B, K1C, K1D, \
  K20, K21, K22, K23, K24, K25, KC_NO, KC_NO, K28, K29, K2A, K2B, K2C, K2D, \
- K30, K31, K32, K33, K34, K35, KC_NO, KC_NO, KC_NO, KC_NO, K28, K39, K3A, K3B, K3C, K3D, \
- KC_TRNS, KC_TRNS, KC_TRNS,  K43, K44, K45, KC_NO, KC_NO, K48, K49, K4A, KC_TRNS, KC_TRNS, KC_TRNS \
+ K30, K31, K32, K33, K34, K35, KC_NO, KC_NO, KC_NO, KC_NO, K38, K39, K3A, K3B, K3C, K3D, \
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, K43, K44, K45,  K48, K49,  K4A, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS \
  )
 
 #define LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__)