Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
1d1d7c388d
7 changed files with 8 additions and 9 deletions
|
@ -69,9 +69,6 @@
|
||||||
# define ENABLE_RGB_MATRIX_HUE_BREATHING
|
# define ENABLE_RGB_MATRIX_HUE_BREATHING
|
||||||
# define ENABLE_RGB_MATRIX_HUE_PENDULUM
|
# define ENABLE_RGB_MATRIX_HUE_PENDULUM
|
||||||
# define ENABLE_RGB_MATRIX_HUE_WAVE
|
# define ENABLE_RGB_MATRIX_HUE_WAVE
|
||||||
# define ENABLE_RGB_MATRIX_PIXEL_RAIN
|
|
||||||
# define ENABLE_RGB_MATRIX_PIXEL_FLOW
|
|
||||||
# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
|
|
||||||
// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
|
// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
|
||||||
# define ENABLE_RGB_MATRIX_TYPING_HEATMAP
|
# define ENABLE_RGB_MATRIX_TYPING_HEATMAP
|
||||||
// # define ENABLE_RGB_MATRIX_DIGITAL_RAIN
|
// # define ENABLE_RGB_MATRIX_DIGITAL_RAIN
|
||||||
|
|
|
@ -79,9 +79,6 @@
|
||||||
# define ENABLE_RGB_MATRIX_HUE_BREATHING
|
# define ENABLE_RGB_MATRIX_HUE_BREATHING
|
||||||
# define ENABLE_RGB_MATRIX_HUE_PENDULUM
|
# define ENABLE_RGB_MATRIX_HUE_PENDULUM
|
||||||
# define ENABLE_RGB_MATRIX_HUE_WAVE
|
# define ENABLE_RGB_MATRIX_HUE_WAVE
|
||||||
# define ENABLE_RGB_MATRIX_PIXEL_RAIN
|
|
||||||
# define ENABLE_RGB_MATRIX_PIXEL_FLOW
|
|
||||||
# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
|
|
||||||
// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
|
// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
|
||||||
# define ENABLE_RGB_MATRIX_TYPING_HEATMAP
|
# define ENABLE_RGB_MATRIX_TYPING_HEATMAP
|
||||||
# define ENABLE_RGB_MATRIX_DIGITAL_RAIN
|
# define ENABLE_RGB_MATRIX_DIGITAL_RAIN
|
||||||
|
|
|
@ -94,9 +94,6 @@
|
||||||
# define ENABLE_RGB_MATRIX_HUE_BREATHING
|
# define ENABLE_RGB_MATRIX_HUE_BREATHING
|
||||||
# define ENABLE_RGB_MATRIX_HUE_PENDULUM
|
# define ENABLE_RGB_MATRIX_HUE_PENDULUM
|
||||||
# define ENABLE_RGB_MATRIX_HUE_WAVE
|
# define ENABLE_RGB_MATRIX_HUE_WAVE
|
||||||
# define ENABLE_RGB_MATRIX_PIXEL_RAIN
|
|
||||||
# define ENABLE_RGB_MATRIX_PIXEL_FLOW
|
|
||||||
# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
|
|
||||||
// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
|
// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
|
||||||
# define ENABLE_RGB_MATRIX_TYPING_HEATMAP
|
# define ENABLE_RGB_MATRIX_TYPING_HEATMAP
|
||||||
// #define ENABLE_RGB_MATRIX_DIGITAL_RAIN
|
// #define ENABLE_RGB_MATRIX_DIGITAL_RAIN
|
||||||
|
|
|
@ -36,6 +36,7 @@ void eeconfig_init_kb(void) {
|
||||||
eeconfig_init_user();
|
eeconfig_init_user();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef ENCODER_ENABLE
|
||||||
bool encoder_update_kb(uint8_t index, bool clockwise) {
|
bool encoder_update_kb(uint8_t index, bool clockwise) {
|
||||||
if (!encoder_update_user(index, clockwise)) { return false; }
|
if (!encoder_update_user(index, clockwise)) { return false; }
|
||||||
if (index == 0) {
|
if (index == 0) {
|
||||||
|
@ -53,3 +54,4 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
|
@ -17,6 +17,7 @@ void eeconfig_init_kb(void) {
|
||||||
eeconfig_init_user();
|
eeconfig_init_user();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef ENCODER_ENABLE
|
||||||
bool encoder_update_kb(uint8_t index, bool clockwise) {
|
bool encoder_update_kb(uint8_t index, bool clockwise) {
|
||||||
if (!encoder_update_user(index, clockwise)) { return false; }
|
if (!encoder_update_user(index, clockwise)) { return false; }
|
||||||
if (index == 0) {
|
if (index == 0) {
|
||||||
|
@ -34,3 +35,4 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
|
@ -13,6 +13,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
#include "rev5.h"
|
#include "rev5.h"
|
||||||
|
|
||||||
|
#ifdef ENCODER_ENABLE
|
||||||
bool encoder_update_kb(uint8_t index, bool clockwise) {
|
bool encoder_update_kb(uint8_t index, bool clockwise) {
|
||||||
if (!encoder_update_user(index, clockwise)) { return false; }
|
if (!encoder_update_user(index, clockwise)) { return false; }
|
||||||
if (index == 0) {
|
if (index == 0) {
|
||||||
|
@ -30,3 +31,4 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
|
@ -64,6 +64,7 @@ led_config_t g_led_config = { {
|
||||||
} };
|
} };
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef ENCODER_ENABLE
|
||||||
bool encoder_update_kb(uint8_t index, bool clockwise) {
|
bool encoder_update_kb(uint8_t index, bool clockwise) {
|
||||||
if (!encoder_update_user(index, clockwise)) { return false; }
|
if (!encoder_update_user(index, clockwise)) { return false; }
|
||||||
if (index == 0) {
|
if (index == 0) {
|
||||||
|
@ -81,3 +82,4 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue