fn_actions is now of type action_t

diff --git a/keyboard/ergodox/keymap_blazak.c b/keyboard/ergodox/keymap_blazak.c
index da92696f394521c9c44b3a3952d6ccaf32ec1c38..233ab0497465e1b2a15fb109675c839f1b1d3333 100644 (file)
--- 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 8ddd51c5db9171be2b9328757049b77b37cd3065..bf91d9538e32daecb10314e4832649df375209d4 100644 (file)
--- 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 656c28ffe225a27c8d86d3be129b238eec112395..39c4d6b686fc542ac7fc6e55d4a63e8a62976438 100644 (file)
--- a/keyboard/ergodox/keymap_common.h
+++ b/keyboard/ergodox/keymap_common.h
@@ -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 */

diff --git a/keyboard/ergodox/keymap_cub.c b/keyboard/ergodox/keymap_cub.c
index aba7c79a81d106b9b8f7d5ea5b62b44dad3e6755..f9ef8252538e505b7d6b00b941a8662be5d9ff97 100644 (file)
--- 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 a4995188cafd20b4ac200a38a469a888f1514cd5..e64378c69e934d9ada1e9a7f75c4472f50df357e 100644 (file)
--- 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 809067870950b8f7bbf83020810b2cf035ad9b8f..8036630657d958e01af1e94da536703cfe79f6ce 100644 (file)
--- 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