Merge remote-tracking branch 'upstream/develop' into xap

This commit is contained in:
Nick Brassel 2021-11-28 12:56:26 +11:00
commit bf66b91433
5591 changed files with 131128 additions and 54530 deletions

View file

@ -54,6 +54,10 @@
#include <stddef.h>
#include <stdlib.h>
#ifdef DEFERRED_EXEC_ENABLE
# include "deferred_exec.h"
#endif
extern layer_state_t default_layer_state;
#ifndef NO_ACTION_LAYER
@ -121,6 +125,10 @@ extern layer_state_t layer_state;
# include "process_auto_shift.h"
#endif
#ifdef DYNAMIC_TAPPING_TERM_ENABLE
# include "process_dynamic_tapping_term.h"
#endif
#ifdef COMBO_ENABLE
# include "process_combo.h"
#endif
@ -208,6 +216,10 @@ extern layer_state_t layer_state;
# include "encoder.h"
#endif
#ifdef POINTING_DEVICE_ENABLE
# include "pointing_device.h"
#endif
// For tri-layer
void update_tri_layer(uint8_t layer1, uint8_t layer2, uint8_t layer3);
layer_state_t update_tri_layer_state(layer_state_t state, uint8_t layer1, uint8_t layer2, uint8_t layer3);
@ -242,4 +254,6 @@ void led_set_kb(uint8_t usb_led);
bool led_update_user(led_t led_state);
bool led_update_kb(led_t led_state);
void api_send_unicode(uint32_t unicode);
const char *get_numeric_str(char *buf, size_t buf_len, uint32_t curr_num, char curr_pad);
const char *get_u8_str(uint8_t curr_num, char curr_pad);
const char *get_u16_str(uint16_t curr_num, char curr_pad);