Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						1690d72906
					
				
					 2 changed files with 13 additions and 13 deletions
				
			
		| 
						 | 
					@ -16,19 +16,7 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#pragma once
 | 
					#pragma once
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#ifdef RGB_DI_PIN
 | 
					 | 
				
			||||||
#define RGBLIGHT_EFFECT_BREATHING
 | 
					 | 
				
			||||||
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
 | 
					 | 
				
			||||||
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
 | 
					 | 
				
			||||||
#define RGBLIGHT_EFFECT_SNAKE
 | 
					 | 
				
			||||||
#define RGBLIGHT_EFFECT_KNIGHT
 | 
					 | 
				
			||||||
#define RGBLIGHT_EFFECT_CHRISTMAS
 | 
					 | 
				
			||||||
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
 | 
					 | 
				
			||||||
#define RGBLIGHT_EFFECT_RGB_TEST
 | 
					 | 
				
			||||||
#define RGBLIGHT_EFFECT_ALTERNATING
 | 
					 | 
				
			||||||
#define RGBLIGHT_EFFECT_TWINKLE
 | 
					 | 
				
			||||||
#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD + 6)
 | 
					#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD + 6)
 | 
				
			||||||
#define RGBLIGHT_DEFAULT_SPD 15
 | 
					#define RGBLIGHT_DEFAULT_SPD 15
 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
 | 
					#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -31,7 +31,19 @@
 | 
				
			||||||
        "led_count": 20,
 | 
					        "led_count": 20,
 | 
				
			||||||
        "pin": "B3",
 | 
					        "pin": "B3",
 | 
				
			||||||
        "saturation_steps": 10,
 | 
					        "saturation_steps": 10,
 | 
				
			||||||
        "sleep": true
 | 
					        "sleep": true,
 | 
				
			||||||
 | 
					        "animations": {
 | 
				
			||||||
 | 
					            "alternating": true,
 | 
				
			||||||
 | 
					            "breathing": true,
 | 
				
			||||||
 | 
					            "christmas": true,
 | 
				
			||||||
 | 
					            "knight": true,
 | 
				
			||||||
 | 
					            "rainbow_mood": true,
 | 
				
			||||||
 | 
					            "rainbow_swirl": true,
 | 
				
			||||||
 | 
					            "rgb_test": true,
 | 
				
			||||||
 | 
					            "snake": true,
 | 
				
			||||||
 | 
					            "static_gradient": true,
 | 
				
			||||||
 | 
					            "twinkle": true
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    "url": "",
 | 
					    "url": "",
 | 
				
			||||||
    "usb": {
 | 
					    "usb": {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue