aboutsummaryrefslogtreecommitdiff
path: root/waffle
diff options
context:
space:
mode:
Diffstat (limited to 'waffle')
-rw-r--r--waffle/config.h1
-rw-r--r--waffle/oled.c4
-rw-r--r--waffle/waffle.h4
3 files changed, 5 insertions, 4 deletions
diff --git a/waffle/config.h b/waffle/config.h
index 9351c96..a9178ac 100644
--- a/waffle/config.h
+++ b/waffle/config.h
@@ -26,6 +26,7 @@
#define SPLIT_LAYER_STATE_ENABLE
#define SPLIT_OLED_ENABLE
#define SPLIT_LED_STATE_ENABLE
+#define SPLIT_ACTIVITY_ENABLE
#define SPLIT_TRANSACTION_IDS_USER RPC_ID_USER_KEYLOG_STR
#endif
diff --git a/waffle/oled.c b/waffle/oled.c
index f6734e5..d8a618c 100644
--- a/waffle/oled.c
+++ b/waffle/oled.c
@@ -146,7 +146,7 @@ void render_mod_status(void) {
oled_write(off_off_1, false);
oled_write(mods & MOD_MASK_ALT ? alt_on_1 : alt_off_1, false);
oled_write(mods & MOD_MASK_GUI ? gui_on_2 : gui_off_2, false);
- if (mods & MOD_MASK_GUI & MOD_MASK_ALT)
+ if ((mods & MOD_MASK_GUI) && (mods & MOD_MASK_ALT))
oled_write(on_on_2, false);
else if (mods & MOD_MASK_GUI)
oled_write(on_off_2, false);
@@ -166,7 +166,7 @@ void render_mod_status(void) {
oled_write(off_off_1, false);
oled_write(mods & MOD_MASK_SHIFT ? shift_on_1 : shift_off_1, false);
oled_write(mods & MOD_MASK_CTRL ? ctrl_on_2 : ctrl_off_2, false);
- if (mods & MOD_MASK_CTRL & MOD_MASK_SHIFT)
+ if ((mods & MOD_MASK_CTRL) && (mods & MOD_MASK_SHIFT))
oled_write(on_on_2, false);
else if (mods & MOD_MASK_CTRL)
oled_write(on_off_2, false);
diff --git a/waffle/waffle.h b/waffle/waffle.h
index d95b5a7..3a74276 100644
--- a/waffle/waffle.h
+++ b/waffle/waffle.h
@@ -67,12 +67,12 @@ void raise_paste(tap_dance_state_t *state, void *user_data);
#define ___LOWER1___ KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0
#define ___LOWER2___ HRML(KC_EXLM, KC_AT, KC_HASH, KC_DLR), KC_PERC, KC_CIRC, HRMR(KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN)
#define ___LOWER3___ KC_VOLD, KC_TAB, KC_CAPS, SELWORD, KC_GRV, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_VOLU
-#define ___LOWER4___ _______, _______, _______, _______, _______, _______
+#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 ___RAISE3___ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10
-#define ___RAISE4___ _______, _______, _______, _______, _______, _______
+#define ___RAISE4___ _______, RWORD, _______, _______, _______, _______
// clang-format on
#define LAYOUT_waffle_60_ts(...) LAYOUT_60_ansi_tsangan(__VA_ARGS__)