aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakeshi ISHII <2170248+mtei@users.noreply.github.com>2020-03-12 06:23:31 +0900
committerGitHub <noreply@github.com>2020-03-11 21:23:31 +0000
commitf3afc716cb74e214441bb98c00ba2dca7397f25f (patch)
tree8d5450e1f259bf5cee82519251f65ce8d5049d3c
parente72562fe6fe3f3669559f88ba11d1074ad0e4ffa (diff)
downloadqmk_firmware-f3afc716cb74e214441bb98c00ba2dca7397f25f.tar.gz
qmk_firmware-f3afc716cb74e214441bb98c00ba2dca7397f25f.zip
fix keyboards/mxss/rgblight.h (#8388)
Since #7773 caused a build error for `mxss:default`, I made similar changes to 'keyboards/mxss/rgblight.h' as #7773 did to 'quantum/rgblight.h'. **This commit does not change the build result.** Testing script ```shell # build on versions earlier than PR #7773 git checkout 0.8.24 echo master > /tmp/master_md5.txt make mxss:default:clean make mxss:default md5 mxss_default.hex >> /tmp/master_md5.txt # build on this commit git checkout fix-keyboards-mxss-rgblight.h echo fix-keyboards-mxss-rgblight.h > /tmp/branch_md5.txt make mxss:default:clean make mxss:default md5 mxss_default.hex >> /tmp/branch_md5.txt diff -u /tmp/master_md5.txt /tmp/branch_md5.txt ``` Test result: ``` --- /tmp/master_md5.txt 2020-03-12 05:51:39.000000000 +0900 +++ /tmp/branch_md5.txt 2020-03-12 05:51:49.000000000 +0900 @@ -1,2 +1,2 @@ -master +fix-keyboards-mxss-rgblight.h MD5 (mxss_default.hex) = 3034b2504d0c7fc6bd8bf1dffb6b8486 ```
-rw-r--r--keyboards/mxss/rgblight.h44
1 files changed, 41 insertions, 3 deletions
diff --git a/keyboards/mxss/rgblight.h b/keyboards/mxss/rgblight.h
index f6746e50f..21eff627d 100644
--- a/keyboards/mxss/rgblight.h
+++ b/keyboards/mxss/rgblight.h
@@ -16,8 +16,6 @@
16#ifndef RGBLIGHT_H 16#ifndef RGBLIGHT_H
17#define RGBLIGHT_H 17#define RGBLIGHT_H
18 18
19#include "rgblight_reconfig.h"
20
21/***** rgblight_mode(mode)/rgblight_mode_noeeprom(mode) **** 19/***** rgblight_mode(mode)/rgblight_mode_noeeprom(mode) ****
22 20
23 old mode number (before 0.6.117) to new mode name table 21 old mode number (before 0.6.117) to new mode name table
@@ -64,6 +62,39 @@
64|-----------------|-----------------------------------| 62|-----------------|-----------------------------------|
65 *****/ 63 *****/
66 64
65#ifdef RGBLIGHT_ANIMATIONS
66// for backward compatibility
67# define RGBLIGHT_EFFECT_BREATHING
68# define RGBLIGHT_EFFECT_RAINBOW_MOOD
69# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
70# define RGBLIGHT_EFFECT_SNAKE
71# define RGBLIGHT_EFFECT_KNIGHT
72# define RGBLIGHT_EFFECT_CHRISTMAS
73# define RGBLIGHT_EFFECT_STATIC_GRADIENT
74# define RGBLIGHT_EFFECT_RGB_TEST
75# define RGBLIGHT_EFFECT_ALTERNATING
76#endif
77
78#ifdef RGBLIGHT_STATIC_PATTERNS
79# define RGBLIGHT_EFFECT_STATIC_GRADIENT
80#endif
81
82// clang-format off
83
84// check dynamic animation effects chose ?
85#if defined(RGBLIGHT_EFFECT_BREATHING) \
86 || defined(RGBLIGHT_EFFECT_RAINBOW_MOOD) \
87 || defined(RGBLIGHT_EFFECT_RAINBOW_SWIRL) \
88 || defined(RGBLIGHT_EFFECT_SNAKE) \
89 || defined(RGBLIGHT_EFFECT_KNIGHT) \
90 || defined(RGBLIGHT_EFFECT_CHRISTMAS) \
91 || defined(RGBLIGHT_EFFECT_RGB_TEST) \
92 || defined(RGBLIGHT_EFFECT_ALTERNATING)
93# define RGBLIGHT_USE_TIMER
94#endif
95
96// clang-format on
97
67#define _RGBM_SINGLE_STATIC(sym) RGBLIGHT_MODE_##sym, 98#define _RGBM_SINGLE_STATIC(sym) RGBLIGHT_MODE_##sym,
68#define _RGBM_SINGLE_DYNAMIC(sym) RGBLIGHT_MODE_##sym, 99#define _RGBM_SINGLE_DYNAMIC(sym) RGBLIGHT_MODE_##sym,
69#define _RGBM_MULTI_STATIC(sym) RGBLIGHT_MODE_##sym, 100#define _RGBM_MULTI_STATIC(sym) RGBLIGHT_MODE_##sym,
@@ -263,12 +294,19 @@ void rgblight_mode_eeprom_helper(uint8_t mode, bool write_to_eeprom);
263# define EZ_RGB(val) rgblight_show_solid_color((val >> 16) & 0xFF, (val >> 8) & 0xFF, val & 0xFF) 294# define EZ_RGB(val) rgblight_show_solid_color((val >> 16) & 0xFF, (val >> 8) & 0xFF, val & 0xFF)
264void rgblight_show_solid_color(uint8_t r, uint8_t g, uint8_t b); 295void rgblight_show_solid_color(uint8_t r, uint8_t g, uint8_t b);
265 296
297# ifdef RGBLIGHT_USE_TIMER
266void rgblight_task(void); 298void rgblight_task(void);
267
268void rgblight_timer_init(void); 299void rgblight_timer_init(void);
269void rgblight_timer_enable(void); 300void rgblight_timer_enable(void);
270void rgblight_timer_disable(void); 301void rgblight_timer_disable(void);
271void rgblight_timer_toggle(void); 302void rgblight_timer_toggle(void);
303# else
304# define rgblight_task()
305# define rgblight_timer_init()
306# define rgblight_timer_enable()
307# define rgblight_timer_disable()
308# define rgblight_timer_toggle()
309# endif
272 310
273# ifdef RGBLIGHT_SPLIT 311# ifdef RGBLIGHT_SPLIT
274# define RGBLIGHT_STATUS_CHANGE_MODE (1 << 0) 312# define RGBLIGHT_STATUS_CHANGE_MODE (1 << 0)