2020 February 29 Breaking Changes Update (#8064)

4 files changed, 11 insertions, 16 deletions

diff --git a/keyboards/sentraq/s60_x/keymaps/ansi_qwertz/keymap.c b/keyboards/sentraq/s60_x/keymaps/ansi_qwertz/keymap.c
index f7a66b96f..cfeda0a24 100644
--- a/keyboards/sentraq/s60_x/keymaps/ansi_qwertz/keymap.c
+++ b/keyboards/sentraq/s60_x/keymaps/ansi_qwertz/keymap.c
@@ -28,14 +28,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //GamingMode Lock (disables SpaceFn and OneShot LShift)
 //Function
 //Mute microphone
-#define KC_SPACEFN KC_FN0
+#define KC_SPACEFN LT(2, KC_SPACE)
 #define KC_OSLS KC_FN3
 #define KC_GMLK KC_FN1
 #define KC_FUNC MO(2)
 #define MICMUTE RCTL(KC_LCTL)
 
 enum function_codes {
-    F_SPACEFN = 0,
     F_OSLS = 3,
     F_GMLK = 1,
 };
@@ -151,7 +150,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 * Fn action definition
 */
 const uint16_t PROGMEM fn_actions[] = {
-    [F_SPACEFN] = ACTION_LAYER_TAP_KEY(2, KC_SPACE),    // SpaceFn layout 1
     [F_GMLK] = ACTION_LAYER_TOGGLE(1),                  // Disable SpaceFn and Oneshot Shift
     [F_OSLS] = ACTION_MODS_ONESHOT(MOD_LSFT)            // Oneshot Leftshift
 };
diff --git a/keyboards/sentraq/s60_x/keymaps/hasu/keymap.c b/keyboards/sentraq/s60_x/keymaps/hasu/keymap.c
index 077f1c627..c72c37d9d 100644
--- a/keyboards/sentraq/s60_x/keymaps/hasu/keymap.c
+++ b/keyboards/sentraq/s60_x/keymaps/hasu/keymap.c
@@ -4,6 +4,9 @@
 #define KC_MO6 MO(6)
 #define KC_MO7 MO(7)
 
+#define KC_LT5 LT(5, KC_SLSH)
+#define KC_LT6 LT(6, KC_SCLN)
+
 /*
  * Hasu
  */
@@ -24,8 +27,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         LAYOUT_kc(
          ESC,    1,    2,   3,   4,   5,   6,   7,   8,    9,    0, MINS,  EQL,   NO, BSPC, \
          TAB,    Q,    W,   E,   R,   T,   Y,   U,   I,    O,    P, LBRC, RBRC, BSLS,       \
-        CAPS,    A,    S,   D,   F,   G,   H,   J,   K,    L,  FN2, QUOT,   NO,  ENT,       \
-        LSFT,   NO,    Z,   X,   C,   V,   B,   N,   M, COMM,  DOT,  FN1,   NO,  FN9,   NO, \
+        CAPS,    A,    S,   D,   F,   G,   H,   J,   K,    L,  LT6, QUOT,   NO,  ENT,       \
+        LSFT,   NO,    Z,   X,   C,   V,   B,   N,   M, COMM,  DOT,  LT5,   NO,  FN9,   NO, \
         LCTL, LGUI, LALT,                SPC,                 RALT,  MO6,  MO6,  MO4),
     /* Keymap 1: colemak
 ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
@@ -173,8 +176,6 @@ Lw: set Workman layout
  * Fn action definition
  */
 const uint16_t PROGMEM fn_actions[] = {
-    [1] = ACTION_LAYER_TAP_KEY(5, KC_SLASH),
-    [2] = ACTION_LAYER_TAP_KEY(6, KC_SCLN),
     [5] = ACTION_DEFAULT_LAYER_SET(0),  // set qwerty layout
     [6] = ACTION_DEFAULT_LAYER_SET(1),  // set colemak layout
     [7] = ACTION_DEFAULT_LAYER_SET(2),  // set dvorak layout
diff --git a/keyboards/sentraq/s60_x/keymaps/jpec/keymap.c b/keyboards/sentraq/s60_x/keymaps/jpec/keymap.c
index 4b7208a9e..014554019 100644
--- a/keyboards/sentraq/s60_x/keymaps/jpec/keymap.c
+++ b/keyboards/sentraq/s60_x/keymaps/jpec/keymap.c
@@ -17,6 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include QMK_KEYBOARD_H
 
 #define KC_MO1 MO(1)
+#define KC_SPFN LT(1, KC_SPC)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         /* Layout 0: Default Layer
@@ -37,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                 TAB,  Q,    W,    E,    R,    T,    Y,    U,    I,    O,    P,    LBRC, RBRC, BSLS, \
                 LCTL, A,    S,    D,    F,    G,    H,    J,    K,    L, SCLN,    QUOT, NUHS, ENT,  \
                 LSFT, NUBS, Z,    X,    C,    V,    B,    N,    M, COMM,  DOT,    SLSH,   NO, RSFT, NO, \
-                MO1,  LGUI, LALT,             FN0,                          RALT, RGUI, APP,  RCTL),
+                MO1,  LGUI, LALT,             SPFN,                         RALT, RGUI, APP,  RCTL),
 
         /* Layout 1: Function Layer
         * ,-----------------------------------------------------------.
@@ -64,17 +65,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 * Fn action definition
 */
 const uint16_t PROGMEM fn_actions[] = {
-        [0] = ACTION_LAYER_TAP_KEY(1, KC_SPACE),    /* SpaceFn layout 1 */
         [2] = ACTION_MODS_KEY(MOD_LSFT, KC_DEL),    /* Cut  */
         [3] = ACTION_MODS_KEY(MOD_LCTL, KC_INS),    /* Copy  */
         [4] = ACTION_MODS_KEY(MOD_LSFT, KC_INS),    /* Paste */
 };
 
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-    return MACRO_NONE;
-};
-
 
 void matrix_init_user(void) {
 
diff --git a/keyboards/sentraq/s60_x/keymaps/spacefn/keymap.c b/keyboards/sentraq/s60_x/keymaps/spacefn/keymap.c
index b0d08202d..ee7ec6cd6 100644
--- a/keyboards/sentraq/s60_x/keymaps/spacefn/keymap.c
+++ b/keyboards/sentraq/s60_x/keymaps/spacefn/keymap.c
@@ -1,5 +1,7 @@
 #include QMK_KEYBOARD_H
 
+#define KC_LT1 LT(1, KC_SPC)
+
 /*
  * SpaceFN
  * http://geekhack.org/index.php?topic=51069.0
@@ -23,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
          TAB,    Q,    W,   E,   R,   T,   Y,   U,   I,    O,    P, LBRC, RBRC, BSLS,       \
         CAPS,    A,    S,   D,   F,   G,   H,   J,   K,    L, SCLN, QUOT,   NO,  ENT,       \
         LSFT,   NO,    Z,   X,   C,   V,   B,   N,   M, COMM,  DOT, SLSH,   NO, RSFT,   NO, \
-        LCTL, LGUI, LALT,                FN0,                 RALT, RGUI,  APP, RCTL),
+        LCTL, LGUI, LALT,                LT1,                 RALT, RGUI,  APP, RCTL),
 
     /* Overlay 1: SpaceFN
 ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
@@ -50,6 +52,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * Fn action definition
  */
 const uint16_t PROGMEM fn_actions[] = {
-    [0] = ACTION_LAYER_TAP_KEY(1, KC_SPACE),
     [1] = ACTION_MODS_KEY(MOD_LSFT, KC_GRV),    // tilde
 };