hailey
/
qmk_firmware
mirror of https://github.com/hailey/qmk_firmware.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

Browse Source
zvecr-patch-1
QMK Bot 3 years ago
parent cd2fca667b 6a6a333c75
commit 1d1d7c388d
7 changed files with 8 additions and 9 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 3
      keyboards/dztech/dz60rgb_wkl/v2/config.h
  2. 3
      keyboards/idobao/id87/v2/config.h
  3. 3
      keyboards/kbdfans/kbd67/mkiirgb/v4/config.h
  4. 2
      keyboards/keebio/iris/rev3/rev3.c
  5. 2
      keyboards/keebio/iris/rev4/rev4.c
  6. 2
      keyboards/keebio/iris/rev5/rev5.c
  7. 2
      keyboards/keebio/iris/rev6/rev6.c

3
keyboards/dztech/dz60rgb_wkl/v2/config.h
Unescape View File

@ -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

3
keyboards/idobao/id87/v2/config.h
Unescape View File

@ -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

3
keyboards/kbdfans/kbd67/mkiirgb/v4/config.h
Unescape View File

@ -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

2
keyboards/keebio/iris/rev3/rev3.c
Unescape View File

@ -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

2
keyboards/keebio/iris/rev4/rev4.c
Unescape View File

@ -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

2
keyboards/keebio/iris/rev5/rev5.c
Unescape View File

@ -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

2
keyboards/keebio/iris/rev6/rev6.c
Unescape View File

@ -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

Write Preview
Loading…
Cancel
Save