diff options
| author | skullY <skullydazed@gmail.com> | 2019-08-30 11:19:03 -0700 |
|---|---|---|
| committer | skullydazed <skullydazed@users.noreply.github.com> | 2019-08-30 15:01:52 -0700 |
| commit | b624f32f944acdc59dcb130674c09090c5c404cb (patch) | |
| tree | bc13adbba137d122d9a2c2fb2fafcbb08ac10e25 /quantum/keymap.h | |
| parent | 61af76a10d00aba185b8338604171de490a13e3b (diff) | |
| download | qmk_firmware-b624f32f944acdc59dcb130674c09090c5c404cb.tar.gz qmk_firmware-b624f32f944acdc59dcb130674c09090c5c404cb.zip | |
clang-format changes
Diffstat (limited to 'quantum/keymap.h')
| -rw-r--r-- | quantum/keymap.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/quantum/keymap.h b/quantum/keymap.h index bfcb2f7cd..34a9c8f8c 100644 --- a/quantum/keymap.h +++ b/quantum/keymap.h | |||
| @@ -22,10 +22,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 22 | #include <stdbool.h> | 22 | #include <stdbool.h> |
| 23 | #include "action.h" | 23 | #include "action.h" |
| 24 | #if defined(__AVR__) | 24 | #if defined(__AVR__) |
| 25 | #include <avr/pgmspace.h> | 25 | # include <avr/pgmspace.h> |
| 26 | #elif defined PROTOCOL_CHIBIOS | 26 | #elif defined PROTOCOL_CHIBIOS |
| 27 | //We need to ensure that chibios is include before redefining reset | 27 | // We need to ensure that chibios is include before redefining reset |
| 28 | #include "ch.h" | 28 | # include "ch.h" |
| 29 | #endif | 29 | #endif |
| 30 | #include "keycode.h" | 30 | #include "keycode.h" |
| 31 | #include "action_macro.h" | 31 | #include "action_macro.h" |
| @@ -38,7 +38,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 38 | // ChibiOS uses RESET in its FlagStatus enumeration | 38 | // ChibiOS uses RESET in its FlagStatus enumeration |
| 39 | // Therefore define it as QK_RESET here, to avoid name collision | 39 | // Therefore define it as QK_RESET here, to avoid name collision |
| 40 | #if defined(PROTOCOL_CHIBIOS) | 40 | #if defined(PROTOCOL_CHIBIOS) |
| 41 | #define RESET QK_RESET | 41 | # define RESET QK_RESET |
| 42 | #endif | 42 | #endif |
| 43 | 43 | ||
| 44 | #include "quantum_keycodes.h" | 44 | #include "quantum_keycodes.h" |
| @@ -47,10 +47,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 47 | uint16_t keymap_key_to_keycode(uint8_t layer, keypos_t key); | 47 | uint16_t keymap_key_to_keycode(uint8_t layer, keypos_t key); |
| 48 | 48 | ||
| 49 | // translates function id to action | 49 | // translates function id to action |
| 50 | uint16_t keymap_function_id_to_action( uint16_t function_id ); | 50 | uint16_t keymap_function_id_to_action(uint16_t function_id); |
| 51 | 51 | ||
| 52 | extern const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS]; | 52 | extern const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS]; |
| 53 | extern const uint16_t fn_actions[]; | 53 | extern const uint16_t fn_actions[]; |
| 54 | 54 | ||
| 55 | |||
| 56 | #endif | 55 | #endif |
