diff options
| author | William Chang <william@factual.com> | 2019-11-20 22:17:07 -0800 |
|---|---|---|
| committer | William Chang <william@factual.com> | 2019-11-20 22:17:07 -0800 |
| commit | e7f4d56592b3975c38af329e77b4efd9108495e8 (patch) | |
| tree | 0a416bccbf70bfdbdb9ffcdb3bf136b47378c014 /quantum/keymap.h | |
| parent | 71493b2f9bbd5f3d18373c518fa14ccafcbf48fc (diff) | |
| parent | 8416a94ad27b3ff058576f09f35f0704a8b39ff3 (diff) | |
Merge remote-tracking branch 'upstream/master'
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 bfcb2f7cd5..34a9c8f8c6 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/>. #include <stdbool.h> #include "action.h" #if defined(__AVR__) -#include <avr/pgmspace.h> +# include <avr/pgmspace.h> #elif defined PROTOCOL_CHIBIOS -//We need to ensure that chibios is include before redefining reset -#include "ch.h" +// We need to ensure that chibios is include before redefining reset +# include "ch.h" #endif #include "keycode.h" #include "action_macro.h" @@ -38,7 +38,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. // 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 +# define RESET QK_RESET #endif #include "quantum_keycodes.h" @@ -47,10 +47,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. uint16_t keymap_key_to_keycode(uint8_t layer, keypos_t key); // translates function id to action -uint16_t keymap_function_id_to_action( uint16_t function_id ); +uint16_t keymap_function_id_to_action(uint16_t function_id); extern const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS]; extern const uint16_t fn_actions[]; - #endif |