Fix: Use action_t in keymap files

diff --git a/converter/adb_usb/keymap_ansi.c b/converter/adb_usb/keymap_ansi.c
index aa9931928f8318f2334f6c12f83289ea8da3b2b4..8d69ec5b75d1ce45fed1702b5238209de3638113 100644 (file)
--- 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 cb643c8f7fe35c089923abb34227ea241f16df3a..e9d5b6517ae0cbffa0bb0f8bd0f83a90745f6ac2 100644 (file)
--- 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 <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[];
 
 
 /* Common layout: ANSI+ISO

diff --git a/converter/adb_usb/keymap_hasu.c b/converter/adb_usb/keymap_hasu.c
index a0b3f1fc6837344d7eebdcc5dfa4e4cbb393d226..147011608bf914d3ef3a8045518c4da2ee2cd1a6 100644 (file)
--- 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 1ccb17e264a4ce9bd0cec1acd00844fe948bca65..ffb7f431e0c97c532b42ed17142c32b402711b8c 100644 (file)
--- 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 97294fb45ddfa2c28282dae88f3dda4956f4cfbc..c589ce0585f3749e5c05c29a7265603f0c3b25ca 100644 (file)
--- 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 f3dda718ace0773e84ca26367fadedfbbd535d81..aac8a423017e457ebb705268f95a781cb32c3dde 100644 (file)
--- 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 9cb23b0b838c9f34986326542fa06bcfc1805526..55e26de278a31e99c9a3fb68263d697aab8121bb 100644 (file)
--- 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 <http://www.gnu.org/licenses/>.
 
 // 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 14c171179ca8d8d95906bb178553b83c8f50376b..e235ce80ce579a097fc46af8a95bba778613dcc0 100644 (file)
--- 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 4aed684e4ca149c416310b23ea6dae2342c8a270..9e78b0215eaf8c171aeb560dc5b0c5464278f566 100644 (file)
--- 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 925556d9776274ab5e02996b1c2c0ad41b2af4d8..42df5cce513f59ce6a6538631b53ae9754b5f2db 100644 (file)
--- 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 <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[];
 
 
 /* Common layout for M0110 and M0110A

diff --git a/converter/m0110_usb/keymap_default.c b/converter/m0110_usb/keymap_default.c
index 0f9b8d2754a07285e248a460d531e0c1dca32bb7..bfe8727d1e6414f432e3a6d338870fa57cd92bfa 100644 (file)
--- 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 11f1a4f394a7063844c90db4090acd6675b68271..3a6a308d8a8c3e2f493659c08a0e60a338089581 100644 (file)
--- 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 6cc251a28940bbdf69f30c195fb9940aaf6ddf22..547bebca3ed714a07da27059c8ebfbf9b8e7c2e1 100644 (file)
--- 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 5017861a34e6acdc1b730252ad2b2f2c0f83fdb6..d941ea8fa0a5e30c7a279ba4223d5b2854da2392 100644 (file)
--- 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 0041df543fdab8be07c6b9fe380cefae7b2b3c63..3f2131aa5e4a74ab4a44085ce8be45e21d8ab855 100644 (file)
--- 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 8922ea7baba87fc0ad385351603204bb7e96b918..c9ea5b0b43e8cbed10a532cc30b65b78077e127e 100644 (file)
--- 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 d783e01dedd8a28a38d8d12dbed2f1500072ce93..a24fa75629bec5b01dfd143c36f4e2623ab8d9b4 100644 (file)
--- 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 <http://www.gnu.org/licenses/>.
 
 // 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 02585150fbc9adde63c7c03d316bb95b669f8e39..b430b907cb3f4612362450f631ec0b4ce16114f9 100644 (file)
--- 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 51b2fddb5b2e98e8b0fdf289589a47db07cdf87b..ecb13d7d9e426624e54a1380b9e7639e24009adb 100644 (file)
--- 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 bffd2bc606f0403b56968400bdeda21ff1eaaab1..8f087a8591bf42d4a409ec33edad1222d9017010 100644 (file)
--- 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 f1211147e000acad30896bcf5b1cf210cd72d404..5c9a1d1c69594aa0b668e207e1aa823fd3615c83 100644 (file)
--- 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 ee1c7c4de997cf8aa01ddb45413d131f0bc8a5af..a3234f5b36722cd1d4fd06426f7075f01af06d99 100644 (file)
--- 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 <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[];
 
 
 /*         ,---------------. ,---------------. ,---------------.

diff --git a/converter/usb_usb/keymap_editor.c b/converter/usb_usb/keymap_editor.c
index bd63ea2310bd051907e355ca7c81f5939c4bccb6..553457c9a76e46dad47a2c75632ece99005a431e 100644 (file)
--- 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 de19e230762eb29491598a08e623a7ba15dd1d7b..600681eb24e11e79b342f65752ac69ff62e2e85a 100644 (file)
--- 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 f22a840524b0b31ae7dd0d26a9c6aee1513c87a4..3df93f6d869a40c41c361a8e75e0d57f63dc24fc 100644 (file)
--- 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 d164dcec54d9a43bedefdbfdba2e91d7b4049a3e..24fdeec8cf6f77122abbb071cdec60834df3e347 100644 (file)
--- 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 69f8693eb9204e83d8017bbaef8d3056b01a9264..96c17e15d932f89c2446bce55ecf7f8b9426e905 100644 (file)
--- 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 e5aee15d89f15b3fec5e10455d4dbea99fd4f45c..4259720df8a714e4c320fc8c4524592124e82460 100644 (file)
--- 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 4a78b7a196addb528b9c29ede189652cd7846f3d..de8fa99275967b188332ecd922bf3334cab02216 100644 (file)
--- 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 957db57922289c69b0d0193796a1b1cc77c46bad..bfd6ccbd76d57c9a7aa41fa043ae031073d6c651 100644 (file)
--- a/keyboard/alps64/keymap_common.h
+++ b/keyboard/alps64/keymap_common.h
@@ -31,7 +31,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[];
 
 
 /* Alps64 keymap definition macro */

diff --git a/keyboard/alps64/keymap_editor.c b/keyboard/alps64/keymap_editor.c
index 68c629f0919f9ae0d50102e40ece42ed7990befb..7abf6feb46a9cb021ee608ab5d1a5736beda0238 100644 (file)
--- 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 d297d72fea3bc493647cf1c2d0bb21e1af151e99..17e3ac6a41f51480f41012f98177bdb069b41a6e 100644 (file)
--- 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 11a43d5901edd83eb74e52d60f7de02aca94ba92..034b80761e9d306d5c0e72ee5af780250ba60bad 100644 (file)
--- 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 896badd7481a1765abcf3908e6f36b6a348db0b8..471905e7ba3edf6e8f5e3627730e1b74dbbc31f6 100644 (file)
--- a/keyboard/gh60/keymap_common.h
+++ b/keyboard/gh60/keymap_common.h
@@ -31,7 +31,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[];
 
 
 /* GH60 keymap definition macro

diff --git a/keyboard/gh60/keymap_hasu.c b/keyboard/gh60/keymap_hasu.c
index e6af28585b91bfbac97239edb5d8c28b58c275a2..cdeefb2622fa4826654213298f9564c2a38882e4 100644 (file)
--- 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 ce1b816ecb08f24ff4afb2197c81152bb17c1730..4253c385bc9439908ffac6e77b1bbbc4890f004d 100644 (file)
--- 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 3138c18077f2eb48955309874a7509285af5f9f5..1cd52139e450011e02268e90f1fe162886f8456f 100644 (file)
--- 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 7a612ee44d058ec54831f04d8e6ca6faa1e1c3c0..5e94184fa20d3e125535430150b78adc72cb0859 100644 (file)
--- 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 b8870fdd81d39d00eca4bbea156d056b5b7fcc6b..f604564467100450b4df0e94d2e9cf028e5d04ff 100644 (file)
--- 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 aaa31fc57177bd84d3432bf4b9d25491f33a15cb..ec17605da5d5632b043ba3e24adfcc937b28d7b1 100644 (file)
--- 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 8077dcee7b25fef87450a93bceffcbc555fc64bc..8724b56d55570084a8e1c355eb5721671855c407 100644 (file)
--- 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 3622665f3ad7ab0f4375970af3c2c8ea2f4814f8..741ab21e139bb57533424c65b2625ccb56a5be13 100644 (file)
--- a/keyboard/hhkb/keymap_common.h
+++ b/keyboard/hhkb/keymap_common.h
@@ -33,7 +33,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[];
 
 
 #define KEYMAP( \

diff --git a/keyboard/hhkb/keymap_hasu.c b/keyboard/hhkb/keymap_hasu.c
index a5602ded31550ba29bc489ab2d2985f6a1463fd2..b63265c9e2fe4bc79afd3646524073d6c9b16871 100644 (file)
--- 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 7807f43669797a6c327011d29de96b50426e5b34..ae96e834791b5871b919889d147a7e6ab50d798c 100644 (file)
--- 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 48d0ee70ba1d5f155bd74b99efadb7083263ffb2..152674d05d78acbe6c534a62d906213f50c1b69e 100644 (file)
--- 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 deff920ae28f68e55378d8e4e01123455e53bd3f..b5a8c8b461dbf216370db25653edc1ec8721f5f4 100644 (file)
--- 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 4726cee653878f3bab00b5329743dbb8b825af3a..c2845b18b6223b8bc1c1411049380f498af88630 100644 (file)
--- 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 b0f765bfeb3d437513eb5cde224a6f5980611439..77f4fed2f04dbb9248b1c05dcc87109b3f0d35e6 100644 (file)
--- a/keyboard/infinity/keymap_common.h
+++ b/keyboard/infinity/keymap_common.h
@@ -30,7 +30,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[];
 
 
 #ifdef INFINITY_PROTOTYPE

diff --git a/keyboard/infinity_chibios/keymap_common.h b/keyboard/infinity_chibios/keymap_common.h
index 260822fc70293bb3e69b2bb668fd0ddd30f0d14d..7d0532778d0ff99b073972bf07f7d76c8c7c9ce8 100644 (file)
--- 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 <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[];
 
 
 #ifdef INFINITY_PROTOTYPE

diff --git a/keyboard/infinity_chibios/keymap_hasu.c b/keyboard/infinity_chibios/keymap_hasu.c
index 2d0635f016d87ec995fa7386f772f1662b861a88..538de746d580bd93ba3072ecbe40be1aedc35eca 100644 (file)
--- 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 2673d6aaaa26438741bc2c5d71aacf784fa792bb..0015a0b2c9c801653eaf9ab45986e69873f3d1af 100644 (file)
--- 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 dce4e9191e788aa96bfab3cdda8964338f6da517..11804bf34cd8d7c2d4942de79ebc67ff8b7a046e 100644 (file)
--- 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 8de1c0279e0190b820c15df7cbd262b7a23a4de1..88c56baa69755492cc0e197c0586fa51b17d2e72 100644 (file)
--- 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 <http://www.gnu.org/licenses/>.
 #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 8de1c0279e0190b820c15df7cbd262b7a23a4de1..04011a295bb12c4c12a8b07752fb23dc3a781653 100644 (file)
--- 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 922fa5379cdcec48b99ad1653aaf48df2aa9c68b..250c6632f2167b733de5f7fa4997312675bed77f 100644 (file)
--- 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 ed1088baa9b646c55fb17a012cee979077377f0e..e659d060353a6a5ecfedd3078c24e6fba2182ad1 100644 (file)
--- 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 8903fc683b7015d5452bb58e42325f969c3f4a92..3d10913fb4e391653d1f902555d7a5d0229c09e7 100644 (file)
--- 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 8ce85a49973bdf84ee1560d92cb47a9b1bca22ef..1e67ed21b221ab617dfbd57d62c5aa11b729c9de 100644 (file)
--- 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 03e1a1bfafb9033ddbece442e6f22f5e7df33242..db1d5c7b268e18fce506068b612ba6b3a7337e8f 100644 (file)
--- 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 c18453675b0b175e7cd48cf5907ee048e4d29b9c..a3df00383e16e32a34784235f52fb844129537a0 100644 (file)
--- 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 ed1088baa9b646c55fb17a012cee979077377f0e..e659d060353a6a5ecfedd3078c24e6fba2182ad1 100644 (file)
--- 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 3379789ecf4b57643c0fa52456b5e600c3c52bee..7ae1e8815ced180edd872f283072808349b15a97 100644 (file)
--- 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 939ee379b7a6eb7043755747e2d70966966e8871..b6244c42fdc4b342b5d3c52bdef785783b50ea43 100644 (file)
--- 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 9333964e395b8c6af813da576900e5d2c9544fb1..febdc6c7f5bd38441c4dd134c8dc3fbfd572546f 100644 (file)
--- 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 3e8367083c6ddc24c554fce867e59a33e4571e99..99ceaa6f5110f99324e040cb00eaf3936e786462 100644 (file)
--- 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 f85836ab550c598e053fa49404c845a761fe06f5..e974625ba98921a4086f2eec2695f2719cdc0782 100644 (file)
--- 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 72a7d83c9b4ea85dba8d7704caaf53181b6db82b..79eb52b14795bbe10e11474e33c438bbe2146097 100644 (file)
--- 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 e116635918dc49166e4caf0a2f978f3c77648b6e..d342e4ba5bbfd40c25ff6afa39f0d85d0ad75465 100644 (file)
--- a/orphan/nerd/keymap_common.h
+++ b/orphan/nerd/keymap_common.h
@@ -30,7 +30,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #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 e6c4eabb2223c00d7ecf9d17891f7783ed4f5ff6..8ab81a14b3673af0013ac3aef5538fea564c7277 100644 (file)
--- 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 96a4c9dfb357b0e4c42b3ce3edc5492eec00cd3f..a39b0125222fb1c195bfa1b43cc450877fd42c45 100644 (file)
--- 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 7fdb9eb19a331dfbe2af96bfca9998395005dccf..7f18f95d5404552da2072e746c6af59eaedcaa12 100644 (file)
--- 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 970f622eee6c4b916d58e52ec0513731439579e5..80e507318c27cb55444ec159de2940ff6bdf46c7 100644 (file)
--- 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 ab9acda1c0a996bf2f5dcbce242eb5ce42a0de97..cf9ea7873cffbd4b1a9142d26ea9185ddc37d00c 100644 (file)
--- 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 216a8dc020c317582517b80bd70bce36ef9c631b..596190971c7d95d1d79a0e2a4f18694f67e9c3de 100644 (file)
--- 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 <http://www.gnu.org/licenses/>.
 
 // 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 8acd8cfb33ffd3af762fb4c8f8c4c123a75f07d2..cb5e0ccad17614193c94382f904342eaac394076 100644 (file)
--- 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),