Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						86b5c6b5c3
					
				
					 3 changed files with 11 additions and 3 deletions
				
			
		| 
						 | 
				
			
			@ -15,6 +15,12 @@
 | 
			
		|||
  #define INDICATOR_PIN_2 D4
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#ifdef KEYBOARD_mechlovin_adelais_standard_led_arm_rev4_stm32f303
 | 
			
		||||
  #define INDICATOR_PIN_0 B2
 | 
			
		||||
  #define INDICATOR_PIN_1 C15
 | 
			
		||||
  #define INDICATOR_PIN_2 B9
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#ifdef KEYBOARD_boardsource_the_mark
 | 
			
		||||
  #define RGB_MATRIX_KEYPRESSES
 | 
			
		||||
#endif
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -36,8 +36,10 @@ ifeq ($(strip $(KEYBOARD)), jacky_studio/bear_65)
 | 
			
		|||
endif
 | 
			
		||||
ifeq ($(strip $(KEYBOARD)), mechlovin/adelais/rgb_led/rev2)
 | 
			
		||||
  SRC += rgb_layers.c
 | 
			
		||||
  SRC += rgb_timeout.c
 | 
			
		||||
endif
 | 
			
		||||
ifeq ($(strip $(KEYBOARD)), mechlovin/adelais/standard_led/arm/rev4/stm32f303)
 | 
			
		||||
  OPT_DEFS += -DHAS_INDICATORS
 | 
			
		||||
  SRC += rgb_timeout.c
 | 
			
		||||
  SRC += layer_rgb.c
 | 
			
		||||
  SRC += indicator_layers_sneakbox.c
 | 
			
		||||
endif
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -68,7 +68,7 @@ void lock_unlock (qk_tap_dance_state_t *state, void *user_data) {
 | 
			
		|||
    tap_code16(KC_CAD);
 | 
			
		||||
    #if defined(HAS_INDICATORS)
 | 
			
		||||
      led_user = 0;
 | 
			
		||||
      #if defined(KEYBOARD_sneakbox_aliceclone)
 | 
			
		||||
      #if defined(KEYBOARD_sneakbox_aliceclone) || defined(KEYBOARD_mechlovin_adelais_standard_led_arm_rev4_stm32f303)
 | 
			
		||||
        led_user = 1;
 | 
			
		||||
      #endif
 | 
			
		||||
      writePin(INDICATOR_PIN_0, !led_user);
 | 
			
		||||
| 
						 | 
				
			
			@ -84,7 +84,7 @@ void lock_unlock (qk_tap_dance_state_t *state, void *user_data) {
 | 
			
		|||
    tap_code16(KC_LOCK);
 | 
			
		||||
    #if defined(HAS_INDICATORS)
 | 
			
		||||
      led_user = 1;
 | 
			
		||||
      #if defined(KEYBOARD_sneakbox_aliceclone)
 | 
			
		||||
      #if defined(KEYBOARD_sneakbox_aliceclone) || defined(KEYBOARD_mechlovin_adelais_standard_led_arm_rev4_stm32f303)
 | 
			
		||||
        led_user = 0;
 | 
			
		||||
      #endif
 | 
			
		||||
      writePin(INDICATOR_PIN_2, !led_user);
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue