summaryrefslogtreecommitdiff
path: root/users
diff options
context:
space:
mode:
Diffstat (limited to 'users')
-rw-r--r--users/xtonhasvim/fancylighting.c7
-rw-r--r--users/xtonhasvim/fancylighting.h9
-rw-r--r--users/xtonhasvim/xtonhasvim.h6
3 files changed, 13 insertions, 9 deletions
diff --git a/users/xtonhasvim/fancylighting.c b/users/xtonhasvim/fancylighting.c
index f4af5ec55d..dc13df03f7 100644
--- a/users/xtonhasvim/fancylighting.c
+++ b/users/xtonhasvim/fancylighting.c
@@ -34,9 +34,14 @@ void matrix_scan_keymap(void) {
#define FADE_BACK_TIME 500
#define BREATH_FIRE_TIME 1000
#define ANIMATION_STEP_INTERVAL 20
+
+#if RGBLED_NUM >= 2
#define POWER_KEY_OFFSET (RGBLED_NUM / 2)
#define SPACE_OFFSET_MAX (RGBLED_NUM / 2)
-
+#else
+#define POWER_KEY_OFFSET 1
+#define SPACE_OFFSET_MAX 1
+#endif
uint16_t effect_start_timer = 0;
uint8_t user_rgb_mode = 0;
diff --git a/users/xtonhasvim/fancylighting.h b/users/xtonhasvim/fancylighting.h
index 982010d3d5..02fb58b84a 100644
--- a/users/xtonhasvim/fancylighting.h
+++ b/users/xtonhasvim/fancylighting.h
@@ -1,4 +1,4 @@
-p /* Copyright 2015-2017 Christon DeWan
+/* Copyright 2015-2017 Christon DeWan
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -20,16 +20,17 @@ p /* Copyright 2015-2017 Christon DeWan
#include "xtonhasvim.h"
+
extern uint8_t user_rgb_mode;
extern LED_TYPE shadowed_led[];
-void start_firey_return(void);
-#endif //_fancy_lighting_h
+#endif //RGBLIGHT_ENABLE
+void start_firey_return(void);
enum xtonhasvim_rgbmodes {
BREATH_FIRE = 1,
FADE_BACK
};
-#endif //RGBLIGHT_ENABLE
+#endif //_fancy_lighting_h
diff --git a/users/xtonhasvim/xtonhasvim.h b/users/xtonhasvim/xtonhasvim.h
index 5ff4932a48..2d6670a5e6 100644
--- a/users/xtonhasvim/xtonhasvim.h
+++ b/users/xtonhasvim/xtonhasvim.h
@@ -22,11 +22,9 @@
#define X_____X KC_NO
-bool process_record_xtonhasvim(uint16_t keycode, keyrecord_t *record);
-
enum xtonhasvim_keycodes {
- DUMMY = SAFE_RANGE,
- FIREY_RETURN, // kick off special effects
+ // 20: give keyboard-specific codes some room
+ FIREY_RETURN = SAFE_RANGE + 20, // kick off special effects
VIM_START, // bookend for vim states
VIM_A,
VIM_B,