aboutsummaryrefslogtreecommitdiff
path: root/quantum/keycode_config.h
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2017-06-27 14:21:42 -0400
committerJack Humbert <jack.humb@gmail.com>2017-06-27 14:21:42 -0400
commit9f5b4e1d7a37f873acbc19b8385964121566653e (patch)
tree78a51918d16a84148af5276170d2c30525dee661 /quantum/keycode_config.h
parentb82604dadad81872abdb9fdde18086ee69e66671 (diff)
parent4ba9438c3f71e6ea3433be4f9e1a28d36471d247 (diff)
downloadqmk_firmware-9f5b4e1d7a37f873acbc19b8385964121566653e.tar.gz
qmk_firmware-9f5b4e1d7a37f873acbc19b8385964121566653e.zip
Merge branch 'master' of https://github.com/qmk/qmk_firmware into dual_audio
Diffstat (limited to 'quantum/keycode_config.h')
-rw-r--r--quantum/keycode_config.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/quantum/keycode_config.h b/quantum/keycode_config.h
index 293fefecf..022f4bd19 100644
--- a/quantum/keycode_config.h
+++ b/quantum/keycode_config.h
@@ -16,11 +16,13 @@
16 16
17#include "eeconfig.h" 17#include "eeconfig.h"
18#include "keycode.h" 18#include "keycode.h"
19#include "action_code.h"
19 20
20#ifndef KEYCODE_CONFIG_H 21#ifndef KEYCODE_CONFIG_H
21#define KEYCODE_CONFIG_H 22#define KEYCODE_CONFIG_H
22 23
23uint16_t keycode_config(uint16_t keycode); 24uint16_t keycode_config(uint16_t keycode);
25uint8_t mod_config(uint8_t mod);
24 26
25/* NOTE: Not portable. Bit field order depends on implementation */ 27/* NOTE: Not portable. Bit field order depends on implementation */
26typedef union { 28typedef union {