From f7b0c6f1fcbe56574a6544ecbe82f9284d7cf206 Mon Sep 17 00:00:00 2001 From: Mark Sikora Date: Sun, 23 Apr 2017 17:10:39 -0400 Subject: [PATCH] fn_actions is now of type action_t --- keyboard/ergodox/keymap_blazak.c | 2 +- keyboard/ergodox/keymap_colemak.c | 2 +- keyboard/ergodox/keymap_common.h | 2 +- keyboard/ergodox/keymap_cub.c | 8 ++++---- keyboard/ergodox/keymap_dvorak.c | 2 +- keyboard/ergodox/keymap_micro.c | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/keyboard/ergodox/keymap_blazak.c b/keyboard/ergodox/keymap_blazak.c index da92696f..233ab049 100644 --- a/keyboard/ergodox/keymap_blazak.c +++ b/keyboard/ergodox/keymap_blazak.c @@ -137,7 +137,7 @@ enum function_id { /* * Fn action definition */ -const uint16_t PROGMEM fn_actions[32] = { +const action_t PROGMEM fn_actions[] = { ACTION_FUNCTION(TEENSY_KEY), // FN0 - Teensy key ACTION_LAYER_MOMENTARY(1), // FN1 - switch to Layer1 ACTION_LAYER_SET(2, ON_PRESS), // FN2 - set Layer2 diff --git a/keyboard/ergodox/keymap_colemak.c b/keyboard/ergodox/keymap_colemak.c index 8ddd51c5..bf91d953 100644 --- a/keyboard/ergodox/keymap_colemak.c +++ b/keyboard/ergodox/keymap_colemak.c @@ -180,7 +180,7 @@ enum function_id { /* * Fn action definition */ -const uint16_t PROGMEM fn_actions[] = { +const action_t PROGMEM fn_actions[] = { // Layer shifting [0] = ACTION_LAYER_SET(0, ON_PRESS), // Switch to Layer 0 [1] = ACTION_LAYER_MOMENTARY(1), // Momentarily switch to layer 1 diff --git a/keyboard/ergodox/keymap_common.h b/keyboard/ergodox/keymap_common.h index 656c28ff..39c4d6b6 100644 --- a/keyboard/ergodox/keymap_common.h +++ b/keyboard/ergodox/keymap_common.h @@ -32,7 +32,7 @@ along with this program. If not, see . extern const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS]; -extern const uint16_t fn_actions[]; +extern const action_t fn_actions[]; /* ErgoDox keymap definition macro */ diff --git a/keyboard/ergodox/keymap_cub.c b/keyboard/ergodox/keymap_cub.c index aba7c79a..f9ef8252 100644 --- a/keyboard/ergodox/keymap_cub.c +++ b/keyboard/ergodox/keymap_cub.c @@ -385,7 +385,7 @@ enum macro_id { /* * Fn action definition */ -const uint16_t PROGMEM fn_actions[] = { +const action_t PROGMEM fn_actions[] = { [0] = ACTION_FUNCTION(TEENSY_KEY), // FN0 - Teensy key [1] = ACTION_MODS_KEY(MOD_LSFT, KC_BSLS), // FN1 = Shifted BackSlash // " in Workman @@ -432,7 +432,7 @@ const uint16_t PROGMEM fn_actions[] = { [27] = ACTION_LAYER_TAP_KEY(9, KC_V), // FN27 = momentary Layer9 on V key, to use with application-specific shortcuts }; -const uint16_t PROGMEM fn_actions_4[] = { +const action_t PROGMEM fn_actions_4[] = { [1] = ACTION_MODS_KEY(MOD_LSFT, KC_BSLS), // FN1 = Shifted BackSlash // " in Workman [2] = ACTION_MODS_KEY(MOD_LSFT, KC_MINS), // FN2 = Shifted Minus // \ in Workman [3] = ACTION_MODS_KEY(MOD_LSFT, KC_COMM), // FN3 = Shifted comma // < in Workman @@ -440,14 +440,14 @@ const uint16_t PROGMEM fn_actions_4[] = { [5] = ACTION_MODS_KEY(MOD_LSFT, KC_SLSH), // FN5 = Shifted slash // ? in Workman }; -const uint16_t PROGMEM fn_actions_7[] = { +const action_t PROGMEM fn_actions_7[] = { [0] = ACTION_MACRO(XMONAD_RESET), // FN0 = xmonad-reanimator [1] = ACTION_MACRO(PASSWORD1), // FN1 = default password [2] = ACTION_MACRO(PASSWORD1), // FN2 = other password [3] = ACTION_MACRO(PASSWORD1), // FN3 = mega password }; -const uint16_t PROGMEM fn_actions_9[] = { +const action_t PROGMEM fn_actions_9[] = { [0] = ACTION_MODS_KEY(MOD_LCTL, KC_P0), // FN0 = Ctrl+0 [1] = ACTION_MODS_KEY(MOD_LALT, KC_P1), // FN1 = Alt+1 [2] = ACTION_MODS_KEY(MOD_LALT, KC_P2), // FN2 = Alt+2 diff --git a/keyboard/ergodox/keymap_dvorak.c b/keyboard/ergodox/keymap_dvorak.c index a4995188..e64378c6 100644 --- a/keyboard/ergodox/keymap_dvorak.c +++ b/keyboard/ergodox/keymap_dvorak.c @@ -201,7 +201,7 @@ enum function_id { /* * Fn action definition */ -const uint16_t PROGMEM fn_actions[] = { +const action_t PROGMEM fn_actions[] = { ACTION_FUNCTION(TEENSY_KEY), // FN0 - Teensy key ACTION_LAYER_MOMENTARY(1), // FN1 - switch to Layer1 ACTION_LAYER_MOMENTARY(2), // FN2 - switch to Layer2 diff --git a/keyboard/ergodox/keymap_micro.c b/keyboard/ergodox/keymap_micro.c index 80906787..80366306 100644 --- a/keyboard/ergodox/keymap_micro.c +++ b/keyboard/ergodox/keymap_micro.c @@ -365,7 +365,7 @@ enum function_id { /* * Fn action definition */ -const uint16_t PROGMEM fn_actions[] = { +const action_t PROGMEM fn_actions[] = { ACTION_FUNCTION(TEENSY_KEY), // FN0 - Teensy key // Layer4: unconvenient keys on right hand -- 2.46.2