From 6d0c80165250afca5f78140a5770c1688f121f95 Mon Sep 17 00:00:00 2001 From: tmk Date: Wed, 30 Mar 2016 03:40:37 +0900 Subject: [PATCH] Fix: Use action_t in keymap files --- converter/adb_usb/keymap_ansi.c | 2 +- converter/adb_usb/keymap_common.h | 2 +- converter/adb_usb/keymap_hasu.c | 2 +- converter/adb_usb/keymap_iso.c | 2 +- converter/ibm4704_usb/keymap_50key.c | 2 +- converter/ibm4704_usb/keymap_alps102key.c | 2 +- converter/ibm4704_usb/keymap_common.h | 2 +- converter/ibm4704_usb/keymap_hasu.c | 2 +- converter/ibm4704_usb/keymap_plain.c | 2 +- converter/m0110_usb/keymap_common.h | 2 +- converter/m0110_usb/keymap_default.c | 4 ++-- converter/m0110_usb/keymap_hasu.c | 2 +- converter/m0110_usb/keymap_intl.c | 2 +- converter/m0110_usb/keymap_spacefn.c | 2 +- converter/next_usb/keymap.c | 2 +- converter/pc98_usb/keymap.c | 2 +- converter/ps2_usb/keymap_common.h | 2 +- converter/ps2_usb/keymap_jis.c | 2 +- converter/ps2_usb/keymap_plain.c | 2 +- converter/ps2_usb/keymap_spacefn.c | 2 +- converter/usb_usb/keymap.c | 2 +- converter/usb_usb/keymap_common.h | 2 +- converter/usb_usb/keymap_editor.c | 2 +- converter/usb_usb/keymap_hasu.c | 4 ++-- converter/usb_usb/keymap_iso.c | 2 +- converter/usb_usb/keymap_jis.c | 2 +- converter/usb_usb/keymap_spacefn.c | 2 +- keyboard/alps64/actionmap_hasu.c | 2 +- keyboard/alps64/actionmap_plain.c | 2 +- keyboard/alps64/keymap_common.h | 2 +- keyboard/alps64/keymap_editor.c | 4 ++-- keyboard/alps64/keymap_hasu.c | 2 +- keyboard/alps64/keymap_plain.c | 2 +- keyboard/gh60/keymap_common.h | 2 +- keyboard/gh60/keymap_hasu.c | 2 +- keyboard/gh60/keymap_hhkb.c | 2 +- keyboard/gh60/keymap_plain.c | 2 +- keyboard/gh60/keymap_poker.c | 2 +- keyboard/gh60/keymap_poker_bit.c | 2 +- keyboard/gh60/keymap_poker_set.c | 2 +- keyboard/gh60/keymap_spacefn.c | 2 +- keyboard/hhkb/keymap_common.h | 2 +- keyboard/hhkb/keymap_hasu.c | 4 ++-- keyboard/hhkb/keymap_hhkb.c | 4 ++-- keyboard/hhkb/keymap_jp.c | 4 ++-- keyboard/hhkb/keymap_spacefn.c | 2 +- keyboard/infinity/keymap.c | 2 +- keyboard/infinity/keymap_common.h | 2 +- keyboard/infinity_chibios/keymap_common.h | 2 +- keyboard/infinity_chibios/keymap_hasu.c | 2 +- keyboard/infinity_chibios/keymap_plain.c | 2 +- keyboard/onekey/keymap.c | 4 ++-- keyboard/stm32_f072_onekey/keymap_plain.c | 5 +++-- keyboard/stm32_f103_onekey/keymap_plain.c | 2 +- keyboard/teensy_lc_onekey/keymap_plain.c | 2 +- orphan/ghost_squid/keymap_ansi.h | 2 +- orphan/hid_liber/keymap_alaricljs.h | 2 +- orphan/hid_liber/keymap_ansi.h | 2 +- orphan/hid_liber/keymap_custom.h | 2 +- orphan/hid_liber/keymap_iso.h | 2 +- orphan/kitten_paw/keymap_ansi.h | 2 +- orphan/kmac/keymap_winkey.h | 2 +- orphan/kmac/keymap_winkeyless.h | 2 +- orphan/lightpad/keymap_lightpad.h | 2 +- orphan/lightsaber/keymap_winkey.h | 2 +- orphan/nerd/keymap_60_ansi150.c | 2 +- orphan/nerd/keymap_80_ansi150.c | 2 +- orphan/nerd/keymap_common.h | 2 +- orphan/phantom/keymap_7bit.h | 2 +- orphan/phantom/keymap_ansi.h | 2 +- orphan/phantom/keymap_ansi_150.h | 2 +- orphan/phantom/keymap_iso.h | 2 +- orphan/phantom/keymap_iso_150.h | 2 +- orphan/serialmouse_usb/keymap_common.h | 2 +- orphan/terminal_bluefruit/keymap.c | 2 +- 75 files changed, 84 insertions(+), 83 deletions(-) diff --git a/converter/adb_usb/keymap_ansi.c b/converter/adb_usb/keymap_ansi.c index aa993192..8d69ec5b 100644 --- a/converter/adb_usb/keymap_ansi.c +++ b/converter/adb_usb/keymap_ansi.c @@ -12,5 +12,5 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), }; -const uint16_t PROGMEM fn_actions[] = { +const action_t PROGMEM fn_actions[] = { }; diff --git a/converter/adb_usb/keymap_common.h b/converter/adb_usb/keymap_common.h index cb643c8f..e9d5b651 100644 --- a/converter/adb_usb/keymap_common.h +++ b/converter/adb_usb/keymap_common.h @@ -30,7 +30,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[]; /* Common layout: ANSI+ISO diff --git a/converter/adb_usb/keymap_hasu.c b/converter/adb_usb/keymap_hasu.c index a0b3f1fc..14701160 100644 --- a/converter/adb_usb/keymap_hasu.c +++ b/converter/adb_usb/keymap_hasu.c @@ -53,6 +53,6 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), }; -const uint16_t PROGMEM fn_actions[] = { +const action_t PROGMEM fn_actions[] = { [0] = ACTION_LAYER_TAP_KEY(1, KC_BSLS), }; diff --git a/converter/adb_usb/keymap_iso.c b/converter/adb_usb/keymap_iso.c index 1ccb17e2..ffb7f431 100644 --- a/converter/adb_usb/keymap_iso.c +++ b/converter/adb_usb/keymap_iso.c @@ -12,5 +12,5 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), }; -const uint16_t PROGMEM fn_actions[] = { +const action_t PROGMEM fn_actions[] = { }; diff --git a/converter/ibm4704_usb/keymap_50key.c b/converter/ibm4704_usb/keymap_50key.c index 97294fb4..c589ce05 100644 --- a/converter/ibm4704_usb/keymap_50key.c +++ b/converter/ibm4704_usb/keymap_50key.c @@ -11,7 +11,7 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), }; -const uint16_t PROGMEM fn_actions[] = { +const action_t PROGMEM fn_actions[] = { }; diff --git a/converter/ibm4704_usb/keymap_alps102key.c b/converter/ibm4704_usb/keymap_alps102key.c index f3dda718..aac8a423 100644 --- a/converter/ibm4704_usb/keymap_alps102key.c +++ b/converter/ibm4704_usb/keymap_alps102key.c @@ -45,6 +45,6 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), }; -const uint16_t PROGMEM fn_actions[] = { +const action_t PROGMEM fn_actions[] = { [0] = ACTION_LAYER_MOMENTARY(1), }; diff --git a/converter/ibm4704_usb/keymap_common.h b/converter/ibm4704_usb/keymap_common.h index 9cb23b0b..55e26de2 100644 --- a/converter/ibm4704_usb/keymap_common.h +++ b/converter/ibm4704_usb/keymap_common.h @@ -31,7 +31,7 @@ along with this program. If not, see . // 32*8(256) byte array which converts PS/2 code into USB code extern const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS]; -extern const uint16_t fn_actions[]; +extern const action_t fn_actions[]; /* 107-key */ diff --git a/converter/ibm4704_usb/keymap_hasu.c b/converter/ibm4704_usb/keymap_hasu.c index 14c17117..e235ce80 100644 --- a/converter/ibm4704_usb/keymap_hasu.c +++ b/converter/ibm4704_usb/keymap_hasu.c @@ -60,7 +60,7 @@ enum macro_id { ALT_TAB, }; -const uint16_t PROGMEM fn_actions[] = { +const action_t PROGMEM fn_actions[] = { [0] = ACTION_LAYER_MOMENTARY(1), [1] = ACTION_LAYER_TAP_KEY(2, KC_SCLN), [2] = ACTION_LAYER_TAP_KEY(3, KC_SLASH), diff --git a/converter/ibm4704_usb/keymap_plain.c b/converter/ibm4704_usb/keymap_plain.c index 4aed684e..9e78b021 100644 --- a/converter/ibm4704_usb/keymap_plain.c +++ b/converter/ibm4704_usb/keymap_plain.c @@ -45,6 +45,6 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), }; -const uint16_t PROGMEM fn_actions[] = { +const action_t PROGMEM fn_actions[] = { [0] = ACTION_LAYER_MOMENTARY(1), }; diff --git a/converter/m0110_usb/keymap_common.h b/converter/m0110_usb/keymap_common.h index 925556d9..42df5cce 100644 --- a/converter/m0110_usb/keymap_common.h +++ b/converter/m0110_usb/keymap_common.h @@ -21,7 +21,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[]; /* Common layout for M0110 and M0110A diff --git a/converter/m0110_usb/keymap_default.c b/converter/m0110_usb/keymap_default.c index 0f9b8d27..bfe8727d 100644 --- a/converter/m0110_usb/keymap_default.c +++ b/converter/m0110_usb/keymap_default.c @@ -98,9 +98,9 @@ const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = { * Fn action definition */ #ifdef KEYMAP_SECTION_ENABLE -const uint16_t fn_actions[] __attribute__ ((section (".keymap.fn_actions"))) = { +const action_t fn_actions[] __attribute__ ((section (".keymap.fn_actions"))) = { #else -const uint16_t fn_actions[] PROGMEM = { +const action_t fn_actions[] PROGMEM = { #endif [0] = ACTION_LAYER_MOMENTARY(1), [1] = ACTION_LAYER_MOMENTARY(2), diff --git a/converter/m0110_usb/keymap_hasu.c b/converter/m0110_usb/keymap_hasu.c index 11f1a4f3..3a6a308d 100644 --- a/converter/m0110_usb/keymap_hasu.c +++ b/converter/m0110_usb/keymap_hasu.c @@ -79,7 +79,7 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* * Fn action definition */ -const uint16_t fn_actions[] PROGMEM = { +const action_t fn_actions[] PROGMEM = { [0] = ACTION_LAYER_MOMENTARY(1), [1] = ACTION_LAYER_TAP_KEY(2, KC_SLASH), [2] = ACTION_LAYER_TAP_KEY(3, KC_SPACE), diff --git a/converter/m0110_usb/keymap_intl.c b/converter/m0110_usb/keymap_intl.c index 6cc251a2..547bebca 100644 --- a/converter/m0110_usb/keymap_intl.c +++ b/converter/m0110_usb/keymap_intl.c @@ -68,6 +68,6 @@ const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = { /* * Fn action definition */ -const uint16_t fn_actions[] PROGMEM = { +const action_t fn_actions[] PROGMEM = { [0] = ACTION_LAYER_MOMENTARY(1), }; diff --git a/converter/m0110_usb/keymap_spacefn.c b/converter/m0110_usb/keymap_spacefn.c index 5017861a..d941ea8f 100644 --- a/converter/m0110_usb/keymap_spacefn.c +++ b/converter/m0110_usb/keymap_spacefn.c @@ -65,7 +65,7 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* * Fn action definition */ -const uint16_t fn_actions[] PROGMEM = { +const action_t fn_actions[] PROGMEM = { [0] = ACTION_LAYER_TAP_KEY(1, KC_SPACE), [1] = ACTION_MODS_KEY(MOD_LSFT, KC_GRV), // tilde }; diff --git a/converter/next_usb/keymap.c b/converter/next_usb/keymap.c index 0041df54..3f2131aa 100644 --- a/converter/next_usb/keymap.c +++ b/converter/next_usb/keymap.c @@ -59,7 +59,7 @@ POSSIBILITY OF SUCH DAMAGE. #include "keycode.h" // 32*8(256) byte array which converts PS/2 code into USB code -static const uint16_t PROGMEM fn_actions[] = { +static const action_t PROGMEM fn_actions[] = { ACTION_LAYER_MOMENTARY(1), // FN0 - left command key ACTION_LAYER_MOMENTARY(1), // FN1 - right command key ACTION_KEY(KC_BSLS), // FN2 - number pad slash & backslash diff --git a/converter/pc98_usb/keymap.c b/converter/pc98_usb/keymap.c index 8922ea7b..c9ea5b0b 100644 --- a/converter/pc98_usb/keymap.c +++ b/converter/pc98_usb/keymap.c @@ -163,7 +163,7 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) /* * Fn actions */ -static const uint16_t PROGMEM fn_actions[] = { +static const action_t PROGMEM fn_actions[] = { ACTION_LAYER_TAP_TOGGLE(0), // FN0 ACTION_LAYER_TAP_KEY(1, KC_SLASH), // FN1 ACTION_LAYER_TAP_KEY(2, KC_SCLN), // FN2 diff --git a/converter/ps2_usb/keymap_common.h b/converter/ps2_usb/keymap_common.h index d783e01d..a24fa756 100644 --- a/converter/ps2_usb/keymap_common.h +++ b/converter/ps2_usb/keymap_common.h @@ -30,7 +30,7 @@ along with this program. If not, see . // 32*8(256) byte array which converts PS/2 code into USB code extern const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS]; -extern const uint16_t fn_actions[]; +extern const action_t fn_actions[]; /* All keys */ diff --git a/converter/ps2_usb/keymap_jis.c b/converter/ps2_usb/keymap_jis.c index 02585150..b430b907 100644 --- a/converter/ps2_usb/keymap_jis.c +++ b/converter/ps2_usb/keymap_jis.c @@ -30,5 +30,5 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), }; -const uint16_t PROGMEM fn_actions[] = { +const action_t PROGMEM fn_actions[] = { }; diff --git a/converter/ps2_usb/keymap_plain.c b/converter/ps2_usb/keymap_plain.c index 51b2fddb..ecb13d7d 100644 --- a/converter/ps2_usb/keymap_plain.c +++ b/converter/ps2_usb/keymap_plain.c @@ -28,5 +28,5 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), }; -const uint16_t PROGMEM fn_actions[] = { +const action_t PROGMEM fn_actions[] = { }; diff --git a/converter/ps2_usb/keymap_spacefn.c b/converter/ps2_usb/keymap_spacefn.c index bffd2bc6..8f087a85 100644 --- a/converter/ps2_usb/keymap_spacefn.c +++ b/converter/ps2_usb/keymap_spacefn.c @@ -54,7 +54,7 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), }; -const uint16_t PROGMEM fn_actions[] = { +const action_t PROGMEM fn_actions[] = { [0] = ACTION_LAYER_TAP_KEY(1, KC_SPACE), [1] = ACTION_MODS_KEY(MOD_LSFT, KC_GRV), // tilde }; diff --git a/converter/usb_usb/keymap.c b/converter/usb_usb/keymap.c index f1211147..5c9a1d1c 100644 --- a/converter/usb_usb/keymap.c +++ b/converter/usb_usb/keymap.c @@ -119,4 +119,4 @@ const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = { #endif }; -const uint16_t fn_actions[] PROGMEM = {}; +const action_t fn_actions[] PROGMEM = {}; diff --git a/converter/usb_usb/keymap_common.h b/converter/usb_usb/keymap_common.h index ee1c7c4d..a3234f5b 100644 --- a/converter/usb_usb/keymap_common.h +++ b/converter/usb_usb/keymap_common.h @@ -29,7 +29,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[]; /* ,---------------. ,---------------. ,---------------. diff --git a/converter/usb_usb/keymap_editor.c b/converter/usb_usb/keymap_editor.c index bd63ea23..553457c9 100644 --- a/converter/usb_usb/keymap_editor.c +++ b/converter/usb_usb/keymap_editor.c @@ -52,7 +52,7 @@ const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] __attribute__ ((section (".key ), }; -const uint16_t fn_actions[] __attribute__ ((section (".keymap.fn_actions"))) = { +const action_t fn_actions[] __attribute__ ((section (".keymap.fn_actions"))) = { [0] = ACTION_LAYER_MOMENTARY(1), [1] = ACTION_LAYER_MOMENTARY(2), [2] = ACTION_LAYER_MOMENTARY(3), diff --git a/converter/usb_usb/keymap_hasu.c b/converter/usb_usb/keymap_hasu.c index de19e230..600681eb 100644 --- a/converter/usb_usb/keymap_hasu.c +++ b/converter/usb_usb/keymap_hasu.c @@ -142,9 +142,9 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) * Fn action definition */ #ifdef KEYMAP_SECTION_ENABLE -const uint16_t fn_actions[] __attribute__ ((section (".keymap.fn_actions"))) = { +const action_t fn_actions[] __attribute__ ((section (".keymap.fn_actions"))) = { #else -const uint16_t fn_actions[] PROGMEM = { +const action_t fn_actions[] PROGMEM = { #endif [0] = ACTION_DEFAULT_LAYER_SET(0), // Default layer(not used) [1] = ACTION_LAYER_TAP_TOGGLE(1), // HHKB layer(toggle with 5 taps) diff --git a/converter/usb_usb/keymap_iso.c b/converter/usb_usb/keymap_iso.c index f22a8405..3df93f6d 100644 --- a/converter/usb_usb/keymap_iso.c +++ b/converter/usb_usb/keymap_iso.c @@ -32,5 +32,5 @@ const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = { /* * Fn action definition */ -const uint16_t fn_actions[] PROGMEM = { +const action_t fn_actions[] PROGMEM = { }; diff --git a/converter/usb_usb/keymap_jis.c b/converter/usb_usb/keymap_jis.c index d164dcec..24fdeec8 100644 --- a/converter/usb_usb/keymap_jis.c +++ b/converter/usb_usb/keymap_jis.c @@ -32,5 +32,5 @@ const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = { /* * Fn action definition */ -const uint16_t fn_actions[] PROGMEM = { +const action_t fn_actions[] PROGMEM = { }; diff --git a/converter/usb_usb/keymap_spacefn.c b/converter/usb_usb/keymap_spacefn.c index 69f8693e..96c17e15 100644 --- a/converter/usb_usb/keymap_spacefn.c +++ b/converter/usb_usb/keymap_spacefn.c @@ -58,7 +58,7 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), }; -const uint16_t PROGMEM fn_actions[] = { +const action_t PROGMEM fn_actions[] = { [0] = ACTION_LAYER_TAP_KEY(1, KC_SPACE), [1] = ACTION_MODS_KEY(MOD_LSFT, KC_GRV), // tilde }; diff --git a/keyboard/alps64/actionmap_hasu.c b/keyboard/alps64/actionmap_hasu.c index e5aee15d..4259720d 100644 --- a/keyboard/alps64/actionmap_hasu.c +++ b/keyboard/alps64/actionmap_hasu.c @@ -37,7 +37,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) } -const uint16_t PROGMEM actionmaps[][MATRIX_ROWS][MATRIX_COLS] = { +const action_t PROGMEM actionmaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Default Layer * ,-----------------------------------------------------------. * |Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| \ | diff --git a/keyboard/alps64/actionmap_plain.c b/keyboard/alps64/actionmap_plain.c index 4a78b7a1..de8fa992 100644 --- a/keyboard/alps64/actionmap_plain.c +++ b/keyboard/alps64/actionmap_plain.c @@ -10,7 +10,7 @@ #define AC_LM1 ACTION_LAYER_MOMENTARY(1) // HHKB layer -const uint16_t PROGMEM actionmaps[][MATRIX_ROWS][MATRIX_COLS] = { +const action_t PROGMEM actionmaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Default Layer * ,-----------------------------------------------------------. * |Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|BSpc | diff --git a/keyboard/alps64/keymap_common.h b/keyboard/alps64/keymap_common.h index 957db579..bfd6ccbd 100644 --- a/keyboard/alps64/keymap_common.h +++ b/keyboard/alps64/keymap_common.h @@ -31,7 +31,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[]; /* Alps64 keymap definition macro */ diff --git a/keyboard/alps64/keymap_editor.c b/keyboard/alps64/keymap_editor.c index 68c629f0..7abf6feb 100644 --- a/keyboard/alps64/keymap_editor.c +++ b/keyboard/alps64/keymap_editor.c @@ -27,9 +27,9 @@ const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = { }; #ifdef KEYMAP_SECTION_ENABLE -const uint16_t fn_actions[] __attribute__ ((section (".keymap.fn_actions"))) = { +const action_t fn_actions[] __attribute__ ((section (".keymap.fn_actions"))) = { #else -const uint16_t fn_actions[] PROGMEM = { +const action_t fn_actions[] PROGMEM = { #endif [0] = ACTION_LAYER_MOMENTARY(1), [1] = ACTION_LAYER_MOMENTARY(2), diff --git a/keyboard/alps64/keymap_hasu.c b/keyboard/alps64/keymap_hasu.c index d297d72f..17e3ac6a 100644 --- a/keyboard/alps64/keymap_hasu.c +++ b/keyboard/alps64/keymap_hasu.c @@ -121,7 +121,7 @@ enum macro_id { /* * Fn action definition */ -const uint16_t PROGMEM fn_actions[] = { +const action_t PROGMEM fn_actions[] = { [0] = ACTION_LAYER_MOMENTARY(1), // HHKB layer [1] = ACTION_LAYER_TAP_KEY(1, KC_ENTER), // HHKB layer [2] = ACTION_LAYER_TAP_KEY(2, KC_SLASH), // Cursor layer with Slash* diff --git a/keyboard/alps64/keymap_plain.c b/keyboard/alps64/keymap_plain.c index 11a43d59..034b8076 100644 --- a/keyboard/alps64/keymap_plain.c +++ b/keyboard/alps64/keymap_plain.c @@ -28,6 +28,6 @@ const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = { TRNS,TRNS,TRNS, TRNS, TRNS,TRNS,TRNS,TRNS), }; -const uint16_t fn_actions[] PROGMEM = { +const action_t fn_actions[] PROGMEM = { [0] = ACTION_LAYER_MOMENTARY(1), }; diff --git a/keyboard/gh60/keymap_common.h b/keyboard/gh60/keymap_common.h index 896badd7..471905e7 100644 --- a/keyboard/gh60/keymap_common.h +++ b/keyboard/gh60/keymap_common.h @@ -31,7 +31,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[]; /* GH60 keymap definition macro diff --git a/keyboard/gh60/keymap_hasu.c b/keyboard/gh60/keymap_hasu.c index e6af2858..cdeefb26 100644 --- a/keyboard/gh60/keymap_hasu.c +++ b/keyboard/gh60/keymap_hasu.c @@ -131,7 +131,7 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* * Fn action definition */ -const uint16_t PROGMEM fn_actions[] = { +const action_t PROGMEM fn_actions[] = { [0] = ACTION_LAYER_MOMENTARY(4), [1] = ACTION_LAYER_TAP_KEY(5, KC_SLASH), [2] = ACTION_LAYER_TAP_KEY(6, KC_SCLN), diff --git a/keyboard/gh60/keymap_hhkb.c b/keyboard/gh60/keymap_hhkb.c index ce1b816e..4253c385 100644 --- a/keyboard/gh60/keymap_hhkb.c +++ b/keyboard/gh60/keymap_hhkb.c @@ -47,6 +47,6 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* * Fn action definition */ -const uint16_t PROGMEM fn_actions[] = { +const action_t PROGMEM fn_actions[] = { [0] = ACTION_LAYER_MOMENTARY(1), }; diff --git a/keyboard/gh60/keymap_plain.c b/keyboard/gh60/keymap_plain.c index 3138c180..1cd52139 100644 --- a/keyboard/gh60/keymap_plain.c +++ b/keyboard/gh60/keymap_plain.c @@ -8,4 +8,4 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { LSFT,NO, Z, X, C, V, B, N, M, COMM,DOT, SLSH,NO, RSFT, \ LCTL,LGUI,LALT, SPC, RALT,RGUI,APP, RCTL), }; -const uint16_t PROGMEM fn_actions[] = {}; +const action_t PROGMEM fn_actions[] = {}; diff --git a/keyboard/gh60/keymap_poker.c b/keyboard/gh60/keymap_poker.c index 7a612ee4..5e94184f 100644 --- a/keyboard/gh60/keymap_poker.c +++ b/keyboard/gh60/keymap_poker.c @@ -90,7 +90,7 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { TRNS,TRNS,TRNS,FN6, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS, \ TRNS,TRNS,TRNS, TRNS, TRNS,TRNS,TRNS,TRNS), }; -const uint16_t PROGMEM fn_actions[] = { +const action_t PROGMEM fn_actions[] = { /* Poker Layout */ [0] = ACTION_LAYER_MOMENTARY(6), // to Fn overlay [1] = ACTION_LAYER_TOGGLE(4), // toggle arrow overlay diff --git a/keyboard/gh60/keymap_poker_bit.c b/keyboard/gh60/keymap_poker_bit.c index b8870fdd..f6045644 100644 --- a/keyboard/gh60/keymap_poker_bit.c +++ b/keyboard/gh60/keymap_poker_bit.c @@ -40,7 +40,7 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, UP, \ TRNS,TRNS,TRNS, TRNS, TRNS,LEFT,DOWN,RGHT), }; -const uint16_t PROGMEM fn_actions[] = { +const action_t PROGMEM fn_actions[] = { /* Poker Layout */ [0] = ACTION_LAYER_BIT_XOR(1, 0b0101, ON_BOTH), // Poker Fn(with fix for Esc) [1] = ACTION_LAYER_TOGGLE(5), // Poker Arrow toggle diff --git a/keyboard/gh60/keymap_poker_set.c b/keyboard/gh60/keymap_poker_set.c index aaa31fc5..ec17605d 100644 --- a/keyboard/gh60/keymap_poker_set.c +++ b/keyboard/gh60/keymap_poker_set.c @@ -65,7 +65,7 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* * Fn action definition */ -const uint16_t PROGMEM fn_actions[] = { +const action_t PROGMEM fn_actions[] = { /* Poker Layout */ [0] = ACTION_LAYER_SET(4, ON_PRESS), // FN0 move to Fn'd when press [1] = ACTION_LAYER_SET(5, ON_PRESS), // FN1 move to Fn'd arrow when press diff --git a/keyboard/gh60/keymap_spacefn.c b/keyboard/gh60/keymap_spacefn.c index 8077dcee..8724b56d 100644 --- a/keyboard/gh60/keymap_spacefn.c +++ b/keyboard/gh60/keymap_spacefn.c @@ -49,7 +49,7 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* * Fn action definition */ -const uint16_t PROGMEM fn_actions[] = { +const action_t PROGMEM fn_actions[] = { [0] = ACTION_LAYER_TAP_KEY(1, KC_SPACE), [1] = ACTION_MODS_KEY(MOD_LSFT, KC_GRV), // tilde }; diff --git a/keyboard/hhkb/keymap_common.h b/keyboard/hhkb/keymap_common.h index 3622665f..741ab21e 100644 --- a/keyboard/hhkb/keymap_common.h +++ b/keyboard/hhkb/keymap_common.h @@ -33,7 +33,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[]; #define KEYMAP( \ diff --git a/keyboard/hhkb/keymap_hasu.c b/keyboard/hhkb/keymap_hasu.c index a5602ded..b63265c9 100644 --- a/keyboard/hhkb/keymap_hasu.c +++ b/keyboard/hhkb/keymap_hasu.c @@ -192,9 +192,9 @@ enum macro_id { * Fn action definition */ #ifdef KEYMAP_SECTION_ENABLE -const uint16_t fn_actions[] __attribute__ ((section (".keymap.fn_actions"))) = { +const action_t fn_actions[] __attribute__ ((section (".keymap.fn_actions"))) = { #else -const uint16_t fn_actions[] PROGMEM = { +const action_t fn_actions[] PROGMEM = { #endif [0] = ACTION_DEFAULT_LAYER_SET(0), // Default layer(not used) [1] = ACTION_LAYER_TAP_TOGGLE(1), // HHKB layer(toggle with 5 taps) diff --git a/keyboard/hhkb/keymap_hhkb.c b/keyboard/hhkb/keymap_hhkb.c index 7807f436..ae96e834 100644 --- a/keyboard/hhkb/keymap_hhkb.c +++ b/keyboard/hhkb/keymap_hhkb.c @@ -54,7 +54,7 @@ const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = { * Fn action definition */ #ifdef KEYMAP_SECTION_ENABLE -const uint16_t fn_actions[] __attribute__ ((section (".keymap.fn_actions"))) = { +const action_t fn_actions[] __attribute__ ((section (".keymap.fn_actions"))) = { [0] = ACTION_LAYER_MOMENTARY(1), [1] = ACTION_LAYER_MOMENTARY(2), [2] = ACTION_LAYER_MOMENTARY(3), @@ -89,7 +89,7 @@ const uint16_t fn_actions[] __attribute__ ((section (".keymap.fn_actions"))) = { [31] = ACTION_MODS_TAP_KEY(MOD_RSFT, KC_BSLASH), }; #else -const uint16_t fn_actions[] PROGMEM = { +const action_t fn_actions[] PROGMEM = { [0] = ACTION_LAYER_MOMENTARY(1), }; #endif diff --git a/keyboard/hhkb/keymap_jp.c b/keyboard/hhkb/keymap_jp.c index 48d0ee70..152674d0 100644 --- a/keyboard/hhkb/keymap_jp.c +++ b/keyboard/hhkb/keymap_jp.c @@ -42,9 +42,9 @@ const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = { * Fn action definition */ #ifdef KEYMAP_SECTION_ENABLE -const uint16_t fn_actions[] __attribute__ ((section (".keymap.fn_actions"))) = { +const action_t fn_actions[] __attribute__ ((section (".keymap.fn_actions"))) = { #else -const uint16_t fn_actions[] PROGMEM = { +const action_t fn_actions[] PROGMEM = { #endif [0] = ACTION_LAYER_MOMENTARY(1), }; diff --git a/keyboard/hhkb/keymap_spacefn.c b/keyboard/hhkb/keymap_spacefn.c index deff920a..b5a8c8b4 100644 --- a/keyboard/hhkb/keymap_spacefn.c +++ b/keyboard/hhkb/keymap_spacefn.c @@ -108,7 +108,7 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) /* * Fn action definition */ -const uint16_t PROGMEM fn_actions[] = { +const action_t PROGMEM fn_actions[] = { [0] = ACTION_LAYER_MOMENTARY(1), [1] = ACTION_LAYER_TAP_KEY(2, KC_SPACE), [2] = ACTION_MODS_KEY(MOD_LSFT, KC_GRV), // tilde diff --git a/keyboard/infinity/keymap.c b/keyboard/infinity/keymap.c index 4726cee6..c2845b18 100644 --- a/keyboard/infinity/keymap.c +++ b/keyboard/infinity/keymap.c @@ -42,7 +42,7 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { TRNS,TRNS,TRNS, TRNS, TRNS,TRNS,TRNS,TRNS), }; -const uint16_t PROGMEM fn_actions[] = { +const action_t PROGMEM fn_actions[] = { [0] = ACTION_LAYER_MOMENTARY(1), }; diff --git a/keyboard/infinity/keymap_common.h b/keyboard/infinity/keymap_common.h index b0f765bf..77f4fed2 100644 --- a/keyboard/infinity/keymap_common.h +++ b/keyboard/infinity/keymap_common.h @@ -30,7 +30,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[]; #ifdef INFINITY_PROTOTYPE diff --git a/keyboard/infinity_chibios/keymap_common.h b/keyboard/infinity_chibios/keymap_common.h index 260822fc..7d053277 100644 --- a/keyboard/infinity_chibios/keymap_common.h +++ b/keyboard/infinity_chibios/keymap_common.h @@ -31,7 +31,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[]; #ifdef INFINITY_PROTOTYPE diff --git a/keyboard/infinity_chibios/keymap_hasu.c b/keyboard/infinity_chibios/keymap_hasu.c index 2d0635f0..538de746 100644 --- a/keyboard/infinity_chibios/keymap_hasu.c +++ b/keyboard/infinity_chibios/keymap_hasu.c @@ -119,7 +119,7 @@ enum macro_id { /* * Fn action definition */ -const uint16_t fn_actions[] = { +const action_t fn_actions[] = { [0] = ACTION_DEFAULT_LAYER_SET(0), // Default layer(not used) [1] = ACTION_LAYER_TAP_TOGGLE(1), // HHKB layer(toggle with 5 taps) [2] = ACTION_LAYER_TAP_KEY(2, KC_SLASH), // Cursor layer with Slash* diff --git a/keyboard/infinity_chibios/keymap_plain.c b/keyboard/infinity_chibios/keymap_plain.c index 2673d6aa..0015a0b2 100644 --- a/keyboard/infinity_chibios/keymap_plain.c +++ b/keyboard/infinity_chibios/keymap_plain.c @@ -42,7 +42,7 @@ const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = { TRNS,TRNS,TRNS, TRNS, TRNS,TRNS,TRNS,TRNS), }; -const uint16_t fn_actions[] = { +const action_t fn_actions[] = { [0] = ACTION_LAYER_MOMENTARY(1), }; diff --git a/keyboard/onekey/keymap.c b/keyboard/onekey/keymap.c index dce4e919..11804bf3 100644 --- a/keyboard/onekey/keymap.c +++ b/keyboard/onekey/keymap.c @@ -34,7 +34,7 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* * Fn action definition */ -static const uint16_t PROGMEM fn_actions[] = { +static const action_t PROGMEM fn_actions[] = { }; @@ -60,7 +60,7 @@ action_t keymap_fn_to_action(uint8_t keycode) if (FN_INDEX(keycode) < FN_ACTIONS_SIZE) { action.code = pgm_read_word(&fn_actions[FN_INDEX(keycode)]); } else { - action.code = ACTION_NO; + action = (action_t)ACTION_NO; } return action; } diff --git a/keyboard/stm32_f072_onekey/keymap_plain.c b/keyboard/stm32_f072_onekey/keymap_plain.c index 8de1c027..88c56baa 100644 --- a/keyboard/stm32_f072_onekey/keymap_plain.c +++ b/keyboard/stm32_f072_onekey/keymap_plain.c @@ -18,6 +18,7 @@ along with this program. If not, see . #include "keycode.h" #include "action.h" #include "action_macro.h" +#include "action_code.h" #include "report.h" #include "host.h" #include "print.h" @@ -28,7 +29,7 @@ static const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = { {{KC_CAPS}}, // test with KC_CAPS, KC_A, KC_BTLD }; -static const uint16_t fn_actions[] = { +static const action_t fn_actions[] = { }; /* translates key to keycode */ @@ -40,5 +41,5 @@ uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key) /* translates Fn keycode to action */ action_t keymap_fn_to_action(uint8_t keycode) { - return (action_t){ .code = fn_actions[FN_INDEX(keycode)] }; + return (action_t)fn_actions[FN_INDEX(keycode)]; } diff --git a/keyboard/stm32_f103_onekey/keymap_plain.c b/keyboard/stm32_f103_onekey/keymap_plain.c index 8de1c027..04011a29 100644 --- a/keyboard/stm32_f103_onekey/keymap_plain.c +++ b/keyboard/stm32_f103_onekey/keymap_plain.c @@ -28,7 +28,7 @@ static const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = { {{KC_CAPS}}, // test with KC_CAPS, KC_A, KC_BTLD }; -static const uint16_t fn_actions[] = { +static const action_t fn_actions[] = { }; /* translates key to keycode */ diff --git a/keyboard/teensy_lc_onekey/keymap_plain.c b/keyboard/teensy_lc_onekey/keymap_plain.c index 922fa537..250c6632 100644 --- a/keyboard/teensy_lc_onekey/keymap_plain.c +++ b/keyboard/teensy_lc_onekey/keymap_plain.c @@ -28,7 +28,7 @@ static const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = { {{KC_A}}, }; // to test: KC_CAPS, KT_BTLD, KC_A -static const uint16_t fn_actions[] = { +static const action_t fn_actions[] = { }; /* translates key to keycode */ diff --git a/orphan/ghost_squid/keymap_ansi.h b/orphan/ghost_squid/keymap_ansi.h index ed1088ba..e659d060 100644 --- a/orphan/ghost_squid/keymap_ansi.h +++ b/orphan/ghost_squid/keymap_ansi.h @@ -18,6 +18,6 @@ static const uint8_t PROGMEM keymaps[][MATRIX_COLS][MATRIX_ROWS] = { TRNS,TRNS,TRNS, TRNS, TRNS,TRNS,TRNS,TRNS, TRNS,TRNS,TRNS, TRNS,TRNS) }; -static const uint16_t PROGMEM fn_actions[] = { +static const action_t PROGMEM fn_actions[] = { [0] = ACTION_LAYER_MOMENTARY(1) }; diff --git a/orphan/hid_liber/keymap_alaricljs.h b/orphan/hid_liber/keymap_alaricljs.h index 8903fc68..3d10913f 100644 --- a/orphan/hid_liber/keymap_alaricljs.h +++ b/orphan/hid_liber/keymap_alaricljs.h @@ -56,6 +56,6 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; -static const uint16_t PROGMEM fn_actions[] = { +static const action_t PROGMEM fn_actions[] = { [1] = ACTION_LAYER_MOMENTARY(1), // activate layer 1 when FN1 pressed }; diff --git a/orphan/hid_liber/keymap_ansi.h b/orphan/hid_liber/keymap_ansi.h index 8ce85a49..1e67ed21 100644 --- a/orphan/hid_liber/keymap_ansi.h +++ b/orphan/hid_liber/keymap_ansi.h @@ -29,4 +29,4 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; -static const uint16_t PROGMEM fn_actions[] = {}; +static const action_t PROGMEM fn_actions[] = {}; diff --git a/orphan/hid_liber/keymap_custom.h b/orphan/hid_liber/keymap_custom.h index 03e1a1bf..db1d5c7b 100644 --- a/orphan/hid_liber/keymap_custom.h +++ b/orphan/hid_liber/keymap_custom.h @@ -59,6 +59,6 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; -static const uint16_t PROGMEM fn_actions[] = { +static const action_t PROGMEM fn_actions[] = { [1] = ACTION_LAYER_MOMENTARY(1), // activate layer 1 when FN1 pressed }; diff --git a/orphan/hid_liber/keymap_iso.h b/orphan/hid_liber/keymap_iso.h index c1845367..a3df0038 100644 --- a/orphan/hid_liber/keymap_iso.h +++ b/orphan/hid_liber/keymap_iso.h @@ -29,4 +29,4 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; -static const uint16_t PROGMEM fn_actions[] = {}; +static const action_t PROGMEM fn_actions[] = {}; diff --git a/orphan/kitten_paw/keymap_ansi.h b/orphan/kitten_paw/keymap_ansi.h index ed1088ba..e659d060 100644 --- a/orphan/kitten_paw/keymap_ansi.h +++ b/orphan/kitten_paw/keymap_ansi.h @@ -18,6 +18,6 @@ static const uint8_t PROGMEM keymaps[][MATRIX_COLS][MATRIX_ROWS] = { TRNS,TRNS,TRNS, TRNS, TRNS,TRNS,TRNS,TRNS, TRNS,TRNS,TRNS, TRNS,TRNS) }; -static const uint16_t PROGMEM fn_actions[] = { +static const action_t PROGMEM fn_actions[] = { [0] = ACTION_LAYER_MOMENTARY(1) }; diff --git a/orphan/kmac/keymap_winkey.h b/orphan/kmac/keymap_winkey.h index 3379789e..7ae1e881 100644 --- a/orphan/kmac/keymap_winkey.h +++ b/orphan/kmac/keymap_winkey.h @@ -17,7 +17,7 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { TRNS, TRNS,TRNS,CALC,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, CAPS, TRNS, \ TRNS,TRNS,TRNS, TRNS, TRNS,TRNS,TRNS,TRNS, TRNS,TRNS,TRNS) }; -static const uint16_t PROGMEM fn_actions[] = { +static const action_t PROGMEM fn_actions[] = { [0] = ACTION_LAYER_MOMENTARY(1), [1] = ACTION_BACKLIGHT_STEP() }; diff --git a/orphan/kmac/keymap_winkeyless.h b/orphan/kmac/keymap_winkeyless.h index 939ee379..b6244c42 100644 --- a/orphan/kmac/keymap_winkeyless.h +++ b/orphan/kmac/keymap_winkeyless.h @@ -17,7 +17,7 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { TRNS, TRNS,TRNS,CALC,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, CAPS, TRNS, \ TRNS,TRNS,TRNS, TRNS, TRNS,TRNS,TRNS, TRNS,TRNS,TRNS) }; -static const uint16_t PROGMEM fn_actions[] = { +static const action_t PROGMEM fn_actions[] = { [0] = ACTION_LAYER_MOMENTARY(1), [1] = ACTION_BACKLIGHT_STEP() }; diff --git a/orphan/lightpad/keymap_lightpad.h b/orphan/lightpad/keymap_lightpad.h index 9333964e..febdc6c7 100644 --- a/orphan/lightpad/keymap_lightpad.h +++ b/orphan/lightpad/keymap_lightpad.h @@ -17,7 +17,7 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { FN7, NO, MSTP) }; -static const uint16_t PROGMEM fn_actions[] = { +static const action_t PROGMEM fn_actions[] = { [0] = ACTION_LAYER_MOMENTARY(1), [1] = ACTION_BACKLIGHT_LEVEL(BACKLIGHT_FN1), [2] = ACTION_BACKLIGHT_LEVEL(BACKLIGHT_FN2), diff --git a/orphan/lightsaber/keymap_winkey.h b/orphan/lightsaber/keymap_winkey.h index 3e836708..99ceaa6f 100644 --- a/orphan/lightsaber/keymap_winkey.h +++ b/orphan/lightsaber/keymap_winkey.h @@ -17,7 +17,7 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { TRNS,TRNS,TRNS, TRNS, TRNS,TRNS,TRNS,TRNS, TRNS, TRNS, TRNS, TRNS) }; -static const uint16_t PROGMEM fn_actions[] = { +static const action_t PROGMEM fn_actions[] = { [0] = ACTION_LAYER_MOMENTARY(1), [1] = ACTION_BACKLIGHT_TOGGLE(), [2] = ACTION_BACKLIGHT_LEVEL(BACKLIGHT_ALPHA), diff --git a/orphan/nerd/keymap_60_ansi150.c b/orphan/nerd/keymap_60_ansi150.c index f85836ab..e974625b 100644 --- a/orphan/nerd/keymap_60_ansi150.c +++ b/orphan/nerd/keymap_60_ansi150.c @@ -22,7 +22,7 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { LEFT,DOWN,RGHT, TRNS, TRNS,TRNS,TRNS) }; -const uint16_t PROGMEM fn_actions[] = { +const action_t PROGMEM fn_actions[] = { [0] = ACTION_LAYER_MOMENTARY(2), [1] = ACTION_LAYER_TAP_KEY(2, KC_SPACE), [2] = ACTION_LAYER_TOGGLE(1), diff --git a/orphan/nerd/keymap_80_ansi150.c b/orphan/nerd/keymap_80_ansi150.c index 72a7d83c..79eb52b1 100644 --- a/orphan/nerd/keymap_80_ansi150.c +++ b/orphan/nerd/keymap_80_ansi150.c @@ -25,7 +25,7 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { TRNS,TRNS,TRNS, TRNS, TRNS,TRNS,TRNS, TRNS,TRNS,TRNS), }; -const uint16_t PROGMEM fn_actions[] = { +const action_t PROGMEM fn_actions[] = { [0] = ACTION_LAYER_MOMENTARY(2), [1] = ACTION_LAYER_TAP_KEY(2, KC_SPACE), [2] = ACTION_LAYER_TOGGLE(1), diff --git a/orphan/nerd/keymap_common.h b/orphan/nerd/keymap_common.h index e1166359..d342e4ba 100644 --- a/orphan/nerd/keymap_common.h +++ b/orphan/nerd/keymap_common.h @@ -30,7 +30,7 @@ along with this program. If not, see . #include "keymap.h" extern const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS]; -extern const uint16_t fn_actions[]; +extern const action_t fn_actions[]; #define KEYMAP( \ K08, K09, K18, K19, K28, K29, K38, K39, K48, K49, K58, K59, K68, K69, K88, K89, \ diff --git a/orphan/phantom/keymap_7bit.h b/orphan/phantom/keymap_7bit.h index e6c4eabb..8ab81a14 100644 --- a/orphan/phantom/keymap_7bit.h +++ b/orphan/phantom/keymap_7bit.h @@ -35,7 +35,7 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { TRNS,TRNS,TRNS,TRNS,CALC,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS,TRNS,TRNS, \ TRNS,TRNS,TRNS,TRNS, TRNS,TRNS,TRNS, TRNS,TRNS,TRNS,TRNS, TRNS,TRNS,TRNS) }; -static const uint16_t PROGMEM fn_actions[] = { +static const action_t PROGMEM fn_actions[] = { [0] = ACTION_LAYER_MOMENTARY(1), [1] = ACTION_MODS_KEY(MOD_LSFT, KC_9), [2] = ACTION_MODS_KEY(MOD_LSFT, KC_0) diff --git a/orphan/phantom/keymap_ansi.h b/orphan/phantom/keymap_ansi.h index 96a4c9df..a39b0125 100644 --- a/orphan/phantom/keymap_ansi.h +++ b/orphan/phantom/keymap_ansi.h @@ -17,6 +17,6 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { TRNS, TRNS,TRNS,CALC,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, CAPS, TRNS, \ TRNS,TRNS,TRNS, TRNS, TRNS,TRNS,TRNS,TRNS, TRNS,TRNS,TRNS) }; -static const uint16_t PROGMEM fn_actions[] = { +static const action_t PROGMEM fn_actions[] = { [0] = ACTION_LAYER_MOMENTARY(1) }; diff --git a/orphan/phantom/keymap_ansi_150.h b/orphan/phantom/keymap_ansi_150.h index 7fdb9eb1..7f18f95d 100644 --- a/orphan/phantom/keymap_ansi_150.h +++ b/orphan/phantom/keymap_ansi_150.h @@ -17,6 +17,6 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { TRNS, TRNS,TRNS,CALC,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, CAPS, TRNS, \ TRNS,TRNS,TRNS, TRNS, TRNS,TRNS,TRNS, TRNS,TRNS,TRNS) }; -static const uint16_t PROGMEM fn_actions[] = { +static const action_t PROGMEM fn_actions[] = { [0] = ACTION_LAYER_MOMENTARY(1) }; diff --git a/orphan/phantom/keymap_iso.h b/orphan/phantom/keymap_iso.h index 970f622e..80e50731 100644 --- a/orphan/phantom/keymap_iso.h +++ b/orphan/phantom/keymap_iso.h @@ -17,6 +17,6 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { TRNS,TRNS,TRNS,TRNS,CALC,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, CAPS, TRNS, \ TRNS,TRNS,TRNS, TRNS, TRNS,TRNS,TRNS,TRNS, TRNS,TRNS,TRNS) }; -static const uint16_t PROGMEM fn_actions[] = { +static const action_t PROGMEM fn_actions[] = { [0] = ACTION_LAYER_MOMENTARY(1) }; diff --git a/orphan/phantom/keymap_iso_150.h b/orphan/phantom/keymap_iso_150.h index ab9acda1..cf9ea787 100644 --- a/orphan/phantom/keymap_iso_150.h +++ b/orphan/phantom/keymap_iso_150.h @@ -17,6 +17,6 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { TRNS,TRNS,TRNS,TRNS,CALC,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, CAPS, TRNS, \ TRNS,TRNS,TRNS, TRNS, TRNS,TRNS,TRNS, TRNS,TRNS,TRNS) }; -static const uint16_t PROGMEM fn_actions[] = { +static const action_t PROGMEM fn_actions[] = { [0] = ACTION_LAYER_MOMENTARY(1) }; diff --git a/orphan/serialmouse_usb/keymap_common.h b/orphan/serialmouse_usb/keymap_common.h index 216a8dc0..59619097 100644 --- a/orphan/serialmouse_usb/keymap_common.h +++ b/orphan/serialmouse_usb/keymap_common.h @@ -31,7 +31,7 @@ along with this program. If not, see . // 32*8(256) byte array which converts PS/2 code into USB code extern const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS]; -extern const uint16_t fn_actions[]; +extern const action_t fn_actions[]; /* All keys */ diff --git a/orphan/terminal_bluefruit/keymap.c b/orphan/terminal_bluefruit/keymap.c index 8acd8cfb..cb5e0cca 100644 --- a/orphan/terminal_bluefruit/keymap.c +++ b/orphan/terminal_bluefruit/keymap.c @@ -177,7 +177,7 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; -static const uint16_t fn_actions[] PROGMEM = { +static const action_t fn_actions[] PROGMEM = { [0] = ACTION_DEFAULT_LAYER_SET(0), [1] = ACTION_LAYER_MOMENTARY(1), [2] = ACTION_LAYER_MOMENTARY(2), //ACTION_LAYER_ON(2, ON_RELEASE),