aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack Sangdahl <[email protected]>2024-10-31 13:33:57 -0600
committerJack Sangdahl <[email protected]>2024-10-31 13:33:57 -0600
commit2ef7a462a119dd9365a72092fc5d7a4b5fb04de2 (patch)
treecad5e5bcfecc88678260b74fda6d5ccc85683c2c
parentb86176c7aae4be4a5b47ddd872585c43b63c78f2 (diff)
downloadqmk_me-2ef7a462a119dd9365a72092fc5d7a4b5fb04de2.tar.gz
qmk_me-2ef7a462a119dd9365a72092fc5d7a4b5fb04de2.zip
Fixup RGB keycodes, small keymap changes
-rw-r--r--keyboards/sweep/keymaps/waffle/keymap.c4
-rw-r--r--keyboards/sweep/rules.mk2
-rw-r--r--waffle/rules.mk2
-rw-r--r--waffle/waffle.h26
4 files changed, 28 insertions, 6 deletions
diff --git a/keyboards/sweep/keymaps/waffle/keymap.c b/keyboards/sweep/keymaps/waffle/keymap.c
index bc4bfe4..f9bab6b 100644
--- a/keyboards/sweep/keymaps/waffle/keymap.c
+++ b/keyboards/sweep/keymaps/waffle/keymap.c
@@ -14,13 +14,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
___LOWER1___,
___LOWER2___,
___LOWER3___,
- KC_NO, KC_NO, NUKE, PNP
+ KC_TRNS, KC_TRNS, KC_TRNS, PNP
),
[_RAISE] = LAYOUT_waffle(
___RAISE1___,
___RAISE2___,
___RAISE3___,
- UPDIR, RWORD, KC_NO, KC_NO
+ NUKE, KC_TRNS, KC_TRNS, KC_TRNS
)
};
// clang-format on
diff --git a/keyboards/sweep/rules.mk b/keyboards/sweep/rules.mk
index f7bdd1a..172fd27 100644
--- a/keyboards/sweep/rules.mk
+++ b/keyboards/sweep/rules.mk
@@ -1,6 +1,6 @@
POINTING_DEVICE_DRIVER = cirque_pinnacle_spi
-# depends on 21844 & 23699
+# depends on 21844
QUANTUM_PAINTER_DRIVERS += ls0xx_spi
ifeq ($(strip $(QUANTUM_PAINTER_ENABLE)), yes)
diff --git a/waffle/rules.mk b/waffle/rules.mk
index 37ab4ff..3f7e9e6 100644
--- a/waffle/rules.mk
+++ b/waffle/rules.mk
@@ -32,7 +32,7 @@ endif
ifeq ($(PLATFORM), CHIBIOS)
RANDWORD = yes
- EXTRAFLAGS += -O3
+ EXTRAFLAGS += -Os
endif
ifneq ($(findstring Gentoo, $(shell arm-none-eabi-gcc --version)),)
diff --git a/waffle/waffle.h b/waffle/waffle.h
index 3a74276..d0416f2 100644
--- a/waffle/waffle.h
+++ b/waffle/waffle.h
@@ -58,6 +58,28 @@ void raise_paste(tap_dance_state_t *state, void *user_data);
#define HRML(k1, k2, k3, k4) LALT_T(k1), LGUI_T(k2), LCTL_T(k3), LSFT_T(k4)
#define HRMR(k1, k2, k3, k4) RSFT_T(k1), RCTL_T(k2), RGUI_T(k3), RALT_T(k4)
+#ifdef RGB_MATRIX_ENABLE
+#define XRGB_TOG RM_TOGG
+#define XRGB_NXT RM_NEXT
+#define XRGB_PRV RM_PREV
+#define XRGB_HUI RM_HUEU
+#define XRGB_HUD RM_HUED
+#define XRGB_SAI RM_SATU
+#define XRGB_SAD RM_SATD
+#define XRGB_VAI RM_VALU
+#define XRGB_VAD RM_VALD
+#elif RGBLIGHT_ENABLE
+#define XRGB_TOG UG_TOGG
+#define XRGB_NXT UG_NEXT
+#define XRGB_PRV UG_PREV
+#define XRGB_HUI UG_HUEU
+#define XRGB_HUD UG_HUED
+#define XRGB_SAI UG_SATU
+#define XRGB_SAD UG_SATD
+#define XRGB_VAI UG_VALU
+#define XRGB_VAD UG_VALD
+#endif
+
// clang-format off
#define ___BASE1___ KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P
#define ___BASE2___ HRML(KC_A, KC_S, KC_D, KC_F), KC_G, KC_H, HRMR(KC_J, KC_K, KC_L, KC_SCLN)
@@ -69,8 +91,8 @@ void raise_paste(tap_dance_state_t *state, void *user_data);
#define ___LOWER3___ KC_VOLD, KC_TAB, KC_CAPS, SELWORD, KC_GRV, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_VOLU
#define ___LOWER4___ _______, _______, _______, _______, NUKE, _______
-#define ___RAISE1___ RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, KC_NOMODE, KC_SCRIPT, KC_BLOCKS, KC_REGIONAL, QK_MAKE
-#define ___RAISE2___ M_JIGGLE, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, KC_WIDE, KC_AUSSIE, KC_ZALGO, KC_SUPER, QK_BOOT
+#define ___RAISE1___ XRGB_TOG, XRGB_NXT, XRGB_HUI, XRGB_SAI, XRGB_VAI, KC_NOMODE, KC_SCRIPT, KC_BLOCKS, KC_REGIONAL, QK_MAKE
+#define ___RAISE2___ M_JIGGLE, XRGB_PRV, XRGB_HUD, XRGB_SAD, XRGB_VAD, KC_WIDE, KC_AUSSIE, KC_ZALGO, KC_SUPER, QK_BOOT
#define ___RAISE3___ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10
#define ___RAISE4___ _______, RWORD, _______, _______, _______, _______
// clang-format on