Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						e68205db1b
					
				
					 6 changed files with 154 additions and 142 deletions
				
			
		| 
						 | 
				
			
			@ -15,7 +15,7 @@
 | 
			
		|||
  #define INDICATOR_PIN_2 D4
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#ifdef KEYBOARD_mechlovin_adelais_standard_led_arm_rev4_stm32f303
 | 
			
		||||
#if defined(KEYBOARD_mechlovin_adelais_standard_led_arm_rev4_stm32f303) || defined(KEYBOARD_mechlovin_adelais_standard_led_arm_rev4_apm32f103)
 | 
			
		||||
  #define INDICATOR_PIN_0 B2
 | 
			
		||||
  #define INDICATOR_PIN_1 C15
 | 
			
		||||
  #define INDICATOR_PIN_2 B9
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -48,3 +48,8 @@ ifeq ($(strip $(KEYBOARD)), nasu)
 | 
			
		|||
  SRC += startup_fanfare.c
 | 
			
		||||
  OPT_DEFS += -DHAS_INDICATORS
 | 
			
		||||
endif
 | 
			
		||||
ifeq ($(strip $(KEYBOARD)), mechlovin/adelais/standard_led/arm/rev4/apm32f103)
 | 
			
		||||
  OPT_DEFS += -DHAS_INDICATORS
 | 
			
		||||
  SRC += rgb_timeout.c
 | 
			
		||||
  SRC += indicator_layers_sneakbox.c
 | 
			
		||||
endif
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue