max/tmk_keyboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fn_actions is now of type action_t

Browse source
This commit is contained in:
Mark Sikora 2017-04-23 17:10:39 -04:00
parent 34f376868e
commit f7b0c6f1fc
6 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
keyboard/ergodox/keymap_blazak.c
View file

@ -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

2
keyboard/ergodox/keymap_colemak.c
View file

@ -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

2
keyboard/ergodox/keymap_common.h
View file

@ -32,7 +32,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
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 */

8
keyboard/ergodox/keymap_cub.c
View file

@ -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

2
keyboard/ergodox/keymap_dvorak.c
View file

@ -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

2
keyboard/ergodox/keymap_micro.c
View file

@ -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