From b624f32f944acdc59dcb130674c09090c5c404cb Mon Sep 17 00:00:00 2001 From: skullY Date: Fri, 30 Aug 2019 11:19:03 -0700 Subject: clang-format changes --- quantum/keymap_common.c | 99 +++++++++++++++++++++---------------------------- 1 file changed, 43 insertions(+), 56 deletions(-) (limited to 'quantum/keymap_common.c') diff --git a/quantum/keymap_common.c b/quantum/keymap_common.c index eef739a14a..9af9510081 100644 --- a/quantum/keymap_common.c +++ b/quantum/keymap_common.c @@ -20,8 +20,8 @@ along with this program. If not, see . #include "keycode.h" #include "action_layer.h" #if defined(__AVR__) -#include -#include +# include +# include #endif #include "action.h" #include "action_macro.h" @@ -30,7 +30,7 @@ along with this program. If not, see . #include "quantum.h" #ifdef MIDI_ENABLE - #include "process_midi.h" +# include "process_midi.h" #endif extern keymap_config_t keymap_config; @@ -38,8 +38,7 @@ extern keymap_config_t keymap_config; #include /* converts key to action */ -action_t action_for_key(uint8_t layer, keypos_t key) -{ +action_t action_for_key(uint8_t layer, keypos_t key) { // 16bit keycodes - important uint16_t keycode = keymap_key_to_keycode(layer, key); @@ -47,7 +46,7 @@ action_t action_for_key(uint8_t layer, keypos_t key) keycode = keycode_config(keycode); action_t action; - uint8_t action_layer, when, mod; + uint8_t action_layer, when, mod; switch (keycode) { case KC_FN0 ... KC_FN31: @@ -69,18 +68,18 @@ action_t action_for_key(uint8_t layer, keypos_t key) case KC_TRNS: action.code = ACTION_TRANSPARENT; break; - case QK_MODS ... QK_MODS_MAX: ; + case QK_MODS ... QK_MODS_MAX:; // Has a modifier // Split it up - action.code = ACTION_MODS_KEY(keycode >> 8, keycode & 0xFF); // adds modifier to key + action.code = ACTION_MODS_KEY(keycode >> 8, keycode & 0xFF); // adds modifier to key break; - case QK_FUNCTION ... QK_FUNCTION_MAX: ; + case QK_FUNCTION ... QK_FUNCTION_MAX:; // Is a shortcut for function action_layer, pull last 12bits // This means we have 4,096 FN macros at our disposal - action.code = keymap_function_id_to_action( (int)keycode & 0xFFF ); + action.code = keymap_function_id_to_action((int)keycode & 0xFFF); break; case QK_MACRO ... QK_MACRO_MAX: - if (keycode & 0x800) // tap macros have upper bit set + if (keycode & 0x800) // tap macros have upper bit set action.code = ACTION_MACRO_TAP(keycode & 0xFF); else action.code = ACTION_MACRO(keycode & 0xFF); @@ -88,50 +87,50 @@ action_t action_for_key(uint8_t layer, keypos_t key) case QK_LAYER_TAP ... QK_LAYER_TAP_MAX: action.code = ACTION_LAYER_TAP_KEY((keycode >> 0x8) & 0xF, keycode & 0xFF); break; - case QK_TO ... QK_TO_MAX: ; + case QK_TO ... QK_TO_MAX:; // Layer set "GOTO" - when = (keycode >> 0x4) & 0x3; + when = (keycode >> 0x4) & 0x3; action_layer = keycode & 0xF; - action.code = ACTION_LAYER_SET(action_layer, when); + action.code = ACTION_LAYER_SET(action_layer, when); break; - case QK_MOMENTARY ... QK_MOMENTARY_MAX: ; + case QK_MOMENTARY ... QK_MOMENTARY_MAX:; // Momentary action_layer action_layer = keycode & 0xFF; - action.code = ACTION_LAYER_MOMENTARY(action_layer); + action.code = ACTION_LAYER_MOMENTARY(action_layer); break; - case QK_DEF_LAYER ... QK_DEF_LAYER_MAX: ; + case QK_DEF_LAYER ... QK_DEF_LAYER_MAX:; // Set default action_layer action_layer = keycode & 0xFF; - action.code = ACTION_DEFAULT_LAYER_SET(action_layer); + action.code = ACTION_DEFAULT_LAYER_SET(action_layer); break; - case QK_TOGGLE_LAYER ... QK_TOGGLE_LAYER_MAX: ; + case QK_TOGGLE_LAYER ... QK_TOGGLE_LAYER_MAX:; // Set toggle action_layer = keycode & 0xFF; - action.code = ACTION_LAYER_TOGGLE(action_layer); + action.code = ACTION_LAYER_TOGGLE(action_layer); break; - case QK_ONE_SHOT_LAYER ... QK_ONE_SHOT_LAYER_MAX: ; + case QK_ONE_SHOT_LAYER ... QK_ONE_SHOT_LAYER_MAX:; // OSL(action_layer) - One-shot action_layer action_layer = keycode & 0xFF; - action.code = ACTION_LAYER_ONESHOT(action_layer); + action.code = ACTION_LAYER_ONESHOT(action_layer); break; - case QK_ONE_SHOT_MOD ... QK_ONE_SHOT_MOD_MAX: ; + case QK_ONE_SHOT_MOD ... QK_ONE_SHOT_MOD_MAX:; // OSM(mod) - One-shot mod - mod = mod_config(keycode & 0xFF); + mod = mod_config(keycode & 0xFF); action.code = ACTION_MODS_ONESHOT(mod); break; case QK_LAYER_TAP_TOGGLE ... QK_LAYER_TAP_TOGGLE_MAX: action.code = ACTION_LAYER_TAP_TOGGLE(keycode & 0xFF); break; case QK_LAYER_MOD ... QK_LAYER_MOD_MAX: - mod = mod_config(keycode & 0xF); + mod = mod_config(keycode & 0xF); action_layer = (keycode >> 4) & 0xF; - action.code = ACTION_LAYER_MODS(action_layer, mod); + action.code = ACTION_LAYER_MODS(action_layer, mod); break; case QK_MOD_TAP ... QK_MOD_TAP_MAX: - mod = mod_config((keycode >> 0x8) & 0x1F); + mod = mod_config((keycode >> 0x8) & 0x1F); action.code = ACTION_MODS_TAP_KEY(mod, keycode & 0xFF); break; - #ifdef BACKLIGHT_ENABLE +#ifdef BACKLIGHT_ENABLE case BL_ON: action.code = ACTION_BACKLIGHT_ON(); break; @@ -150,12 +149,12 @@ action_t action_for_key(uint8_t layer, keypos_t key) case BL_STEP: action.code = ACTION_BACKLIGHT_STEP(); break; - #endif - #ifdef SWAP_HANDS_ENABLE +#endif +#ifdef SWAP_HANDS_ENABLE case QK_SWAP_HANDS ... QK_SWAP_HANDS_MAX: action.code = ACTION(ACT_SWAP_HANDS, keycode & 0xff); break; - #endif +#endif default: action.code = ACTION_NO; @@ -164,42 +163,30 @@ action_t action_for_key(uint8_t layer, keypos_t key) return action; } -__attribute__ ((weak)) -const uint16_t PROGMEM fn_actions[] = { +__attribute__((weak)) const uint16_t PROGMEM fn_actions[] = { }; /* Macro */ -__attribute__ ((weak)) -const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) -{ - return MACRO_NONE; -} +__attribute__((weak)) const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { return MACRO_NONE; } /* Function */ -__attribute__ ((weak)) -void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) -{ -} +__attribute__((weak)) void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) {} // translates key to keycode -__attribute__ ((weak)) -uint16_t keymap_key_to_keycode(uint8_t layer, keypos_t key) -{ +__attribute__((weak)) uint16_t keymap_key_to_keycode(uint8_t layer, keypos_t key) { // Read entire word (16bits) return pgm_read_word(&keymaps[(layer)][(key.row)][(key.col)]); } // translates function id to action -__attribute__ ((weak)) -uint16_t keymap_function_id_to_action( uint16_t function_id ) -{ - // The compiler sees the empty (weak) fn_actions and generates a warning - // This function should not be called in that case, so the warning is too strict - // If this function is called however, the keymap should have overridden fn_actions, and then the compile - // is comparing against the wrong array - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Warray-bounds" - return pgm_read_word(&fn_actions[function_id]); - #pragma GCC diagnostic pop +__attribute__((weak)) uint16_t keymap_function_id_to_action(uint16_t function_id) { +// The compiler sees the empty (weak) fn_actions and generates a warning +// This function should not be called in that case, so the warning is too strict +// If this function is called however, the keymap should have overridden fn_actions, and then the compile +// is comparing against the wrong array +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Warray-bounds" + return pgm_read_word(&fn_actions[function_id]); +#pragma GCC diagnostic pop } -- cgit v1.2.3