diff options
| author | Christopher Browne <cbbrowne@ca.afilias.info> | 2016-07-04 12:32:08 -0400 |
|---|---|---|
| committer | Christopher Browne <cbbrowne@ca.afilias.info> | 2016-07-04 12:32:08 -0400 |
| commit | 2e1cfaf73fccdfaba2d7542f00bd7c3d49998d5d (patch) | |
| tree | 9d8e9c6b71116f01c56c870a9e1071760899ff77 /quantum/keymap.h | |
| parent | 44a5f7630f18b40b36270d49449a43cd42b802f0 (diff) | |
| parent | 9e01b219f32b0086728c10658928b8bffcc26ef7 (diff) | |
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'quantum/keymap.h')
| -rw-r--r-- | quantum/keymap.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/quantum/keymap.h b/quantum/keymap.h index a994f4f2e5..73f99f8211 100644 --- a/quantum/keymap.h +++ b/quantum/keymap.h @@ -21,7 +21,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include <stdint.h> #include <stdbool.h> #include "action.h" +#if defined(__AVR__) #include <avr/pgmspace.h> +#endif #include "keycode.h" #include "action_macro.h" #include "report.h" @@ -30,12 +32,15 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "debug.h" #include "keycode_config.h" +// ChibiOS uses RESET in its FlagStatus enumeration +// Therefore define it as QK_RESET here, to avoid name collision +#if defined(PROTOCOL_CHIBIOS) +#define RESET QK_RESET +#endif + /* translates key to keycode */ uint16_t keymap_key_to_keycode(uint8_t layer, keypos_t key); -/* translates Fn keycode to action */ -action_t keymap_fn_to_action(uint16_t keycode); - extern const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS]; extern const uint16_t fn_actions[]; |