Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						29bc842fe2
					
				| @ -102,6 +102,8 @@ __attribute__((weak)) uint16_t combo_count(void) { | ||||
|     return combo_count_raw(); | ||||
| } | ||||
| 
 | ||||
| _Static_assert(ARRAY_SIZE(key_combos) <= (QK_KB), "Number of combos is abnormally high. Are you using SAFE_RANGE in an enum for combos?"); | ||||
| 
 | ||||
| combo_t* combo_get_raw(uint16_t combo_idx) { | ||||
|     if (combo_idx >= combo_count_raw()) { | ||||
|         return NULL; | ||||
| @ -127,6 +129,8 @@ __attribute__((weak)) uint16_t tap_dance_count(void) { | ||||
|     return tap_dance_count_raw(); | ||||
| } | ||||
| 
 | ||||
| _Static_assert(ARRAY_SIZE(tap_dance_actions) <= (QK_TAP_DANCE_MAX - QK_TAP_DANCE), "Number of tap dance actions exceeds maximum. Are you using SAFE_RANGE in tap dance enum?"); | ||||
| 
 | ||||
| tap_dance_action_t* tap_dance_get_raw(uint16_t tap_dance_idx) { | ||||
|     if (tap_dance_idx >= tap_dance_count_raw()) { | ||||
|         return NULL; | ||||
| @ -153,6 +157,8 @@ __attribute__((weak)) uint16_t key_override_count(void) { | ||||
|     return key_override_count_raw(); | ||||
| } | ||||
| 
 | ||||
| _Static_assert(ARRAY_SIZE(key_overrides) <= (QK_KB), "Number of key overrides is abnormally high. Are you using SAFE_RANGE in an enum for key overrides?"); | ||||
| 
 | ||||
| const key_override_t* key_override_get_raw(uint16_t key_override_idx) { | ||||
|     if (key_override_idx >= key_override_count_raw()) { | ||||
|         return NULL; | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user