aboutsummaryrefslogtreecommitdiff
path: root/quantum/keycode_config.h
diff options
context:
space:
mode:
authorLuiz Ribeiro <luizribeiro@gmail.com>2017-07-04 11:17:28 -0400
committerLuiz Ribeiro <luizribeiro@gmail.com>2017-07-04 11:17:28 -0400
commitd5486265b8afcada68306c815b08c225fce287af (patch)
tree8fb7f8fee4aa3937003bd69d5c77ca867c010d12 /quantum/keycode_config.h
parent738b072bb0f25d0369a998c550c369e4f64cc7a5 (diff)
parent34c8bf47a76c8a2dcd3b1a19dd608f8fb2fafb31 (diff)
downloadqmk_firmware-d5486265b8afcada68306c815b08c225fce287af.tar.gz
qmk_firmware-d5486265b8afcada68306c815b08c225fce287af.zip
Merge branch 'master' into ps2avrGB
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 {