keyboard/qmk-keychron-q3-colemak-dh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'qmk/master' into merge-2023-09-08

Browse Source
This commit is contained in:
Ilya Zhuravlev
2023-09-08 20:53:27 -06:00
parent fbf1c160eb 4875bcecc2
commit e390a34128
6126 changed files with 113768 additions and 45875 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
quantum/keymap_common.c
View File

@ -22,7 +22,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "action_layer.h"
#include "action.h"
#include "debug.h"
#include "quantum.h"
#include "keycode_config.h"
#include "quantum_keycodes.h"
#ifdef ENCODER_MAP_ENABLE
# include "encoder.h"
#endif
#ifdef BACKLIGHT_ENABLE
# include "backlight.h"
@ -32,6 +37,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# include "process_midi.h"
#endif
#ifdef VIAL_ENABLE
# include "vial.h"
#endif
extern keymap_config_t keymap_config;
#include <inttypes.h>
@ -187,8 +196,6 @@ action_t action_for_keycode(uint16_t keycode) {
return action;
}
extern uint16_t g_vial_magic_keycode_override;
// translates key to keycode
__attribute__((weak)) uint16_t keymap_key_to_keycode(uint8_t layer, keypos_t key) {
#ifdef VIAL_ENABLE