From 3dbb7f261dab573a3b55390394444ac3ceb3d257 Mon Sep 17 00:00:00 2001 From: Ryo Maeda Date: Sat, 10 Apr 2021 09:37:49 +0900 Subject: [Keymap] Remove LAYOUT_kc macros from edvorakjp keymaps (#12217) --- users/edvorakjp/edvorakjp.c | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) (limited to 'users/edvorakjp/edvorakjp.c') diff --git a/users/edvorakjp/edvorakjp.c b/users/edvorakjp/edvorakjp.c index 892ce4be3b..d0cd106fff 100644 --- a/users/edvorakjp/edvorakjp.c +++ b/users/edvorakjp/edvorakjp.c @@ -1,32 +1,22 @@ #include "edvorakjp.h" void matrix_init_user(void) { - edvorakjp_status_init(); - matrix_init_keymap(); + edvorakjp_status_init(); + matrix_init_keymap(); } -__attribute__ ((weak)) -void matrix_init_keymap() {} +__attribute__((weak)) void matrix_init_keymap() {} uint32_t layer_state_set_user(uint32_t state) { - state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); - return layer_state_set_keymap(state); + state = update_tri_layer_state(state, L_EDVORAKJP_LOWER, L_EDVORAKJP_RAISE, L_EDVORAKJP_ADJUST); + return layer_state_set_keymap(state); } -__attribute__ ((weak)) -uint32_t layer_state_set_keymap(uint32_t state) { - return state; -} +__attribute__((weak)) uint32_t layer_state_set_keymap(uint32_t state) { return state; } bool process_record_user(uint16_t keycode, keyrecord_t *record) { - return process_record_keymap(keycode, record) &&\ - process_record_edvorakjp_swap_scln(keycode, record) &&\ - process_record_edvorakjp_config(keycode, record) &&\ - process_record_layer(keycode, record) &&\ - process_record_ime(keycode, record); + bool process_record_user_result = process_record_keymap(keycode, record) && process_record_edvorakjp_swap_scln(keycode, record) && process_record_edvorakjp_config(keycode, record) && process_record_layer(keycode, record) && process_record_ime(keycode, record); + return process_record_user_result; } -__attribute__ ((weak)) -bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { - return true; -} +__attribute__((weak)) bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { return true; } -- cgit v1.2.3