2020 February 29 Breaking Changes Update (#8064)

[jackhill/qmk/firmware.git] / keyboards / planck / keymaps / altgr / common / toggle_layout.h

diff --git a/keyboards/planck/keymaps/altgr/common/toggle_layout.h b/keyboards/planck/keymaps/altgr/common/toggle_layout.h
index 713d27b..ed74f42 100644 (file)
--- a/keyboards/planck/keymaps/altgr/common/toggle_layout.h
+++ b/keyboards/planck/keymaps/altgr/common/toggle_layout.h
@@ -14,16 +14,16 @@
   // |      |      |      |  f() | Space|      |      |   =  |   0  |      |      |      |
   // '-----------------------------------------------------------------------------------'
 
-  [_TTNUMBER] = {
-    {_______, KC_F,    MT_E,    KC_D,    _______, ___x___, ___x___, KC_SLSH, KC_7,    KC_8,    KC_9,    KC_ASTR},
-    {OS_GUI,  GT_C,    AT_B,    ST_A,    _______, ___x___, ___x___, TD_DOT,  KC_4,    KC_5,    KC_6,    KC_MINS},
-    {_______, KC_HASH, SM_G,    KC_BSLS, _______, ___x___, ___x___, TD_COMM, KC_1,    KC_2,    KC_3,    KC_PLUS},
+  [_TTNUMBER] = LAYOUT_planck_grid(
+    _______, KC_F,    MT_E,    KC_D,    _______, ___x___, ___x___, KC_SLSH, KC_7,    KC_8,    KC_9,    KC_ASTR,
+    OS_GUI,  GT_C,    AT_B,    ST_A,    _______, ___x___, ___x___, TD_DOT,  KC_4,    KC_5,    KC_6,    KC_MINS,
+    _______, KC_HASH, SM_G,    KC_BSLS, _______, ___x___, ___x___, TD_COMM, KC_1,    KC_2,    KC_3,    KC_PLUS,
 #ifdef THUMB_0
-    {_______, _______, _______, TT_ESC,  KC_SPC,  _______, _______, KC_0,    LT_EQL,  _______, _______, _______},
+    _______, _______, _______, TT_ESC,  KC_SPC,  _______, _______, KC_0,    LT_EQL,  _______, _______, _______
 #else
-    {_______, _______, _______, TT_ESC,  KC_SPC,  _______, _______, KC_EQL,  LT_0,    _______, _______, _______},
+    _______, _______, _______, TT_ESC,  KC_SPC,  _______, _______, KC_EQL,  LT_0,    _______, _______, _______
 #endif
-  },
+  ),
 
 // ............ .................................................. Function Keys
 
@@ -37,12 +37,12 @@
   // |      |      |      |  f() |      |      |      |   +  |      |      |      |      |
   // '-----------------------------------------------------------------------------------'
 
-  [_TTFNCKEY] = {
-    {_______, _______, _______, _______, _______, ___x___, ___x___, _______, KC_F7,   KC_F8,   KC_F9,   KC_F12 },
-    {OS_GUI,  OS_CTL,  OS_ALT,  OS_SFT,  _______, ___x___, ___x___, _______, KC_F4,   KC_F5,   KC_F6,   KC_F11 },
-    {_______, _______, _______, _______, _______, ___x___, ___x___, _______, KC_F1,   KC_F2,   KC_F3,   KC_F10 },
-    {_______, _______, _______, TT_ESC,  _______, _______, _______, KC_PLUS, _______, _______, _______, _______},
-  },
+  [_TTFNCKEY] = LAYOUT_planck_grid(
+    _______, _______, _______, _______, _______, ___x___, ___x___, _______, KC_F7,   KC_F8,   KC_F9,   KC_F12 ,
+    OS_GUI,  OS_CTL,  OS_ALT,  OS_SFT,  _______, ___x___, ___x___, _______, KC_F4,   KC_F5,   KC_F6,   KC_F11 ,
+    _______, _______, _______, _______, _______, ___x___, ___x___, _______, KC_F1,   KC_F2,   KC_F3,   KC_F10 ,
+    _______, _______, _______, TT_ESC,  _______, _______, _______, KC_PLUS, _______, _______, _______, _______
+  ),
 
 // ....................................................................... Regex
 
@@ -56,12 +56,12 @@
   // |      |      |      |  f() |   -  |      |      |   +  | Space|      |      |      |
   // `-----------------------------------------------------------------------------------'
 
-  [_TTREGEX] = {
-    {___x___, KC_TILD, KC_LCBR, KC_RCBR, KC_AMPR, ___x___, ___x___, KC_PERC, KC_LBRC, KC_RBRC, KC_AT,   ___x___},
-    {___x___, KC_CIRC, KC_LT,   KC_GT,   KC_QUES, ___x___, ___x___, KC_PIPE, KC_LPRN, KC_RPRN, KC_DLR,  ___x___},
-    {___x___, KC_COLN, KC_EXLM, KC_EQL,  KC_SLSH, ___x___, ___x___, KC_BSLS, KC_ASTR, KC_DOT,  KC_HASH, ___x___},
-    {_______, _______, _______, TT_ESC,  KC_MINS, _______, _______, KC_PLUS, KC_SPC,  _______, _______, _______},
-  },
+  [_TTREGEX] = LAYOUT_planck_grid(
+    ___x___, KC_TILD, KC_LCBR, KC_RCBR, KC_AMPR, ___x___, ___x___, KC_PERC, KC_LBRC, KC_RBRC, KC_AT,   ___x___,
+    ___x___, KC_CIRC, KC_LT,   KC_GT,   KC_QUES, ___x___, ___x___, KC_PIPE, KC_LPRN, KC_RPRN, KC_DLR,  ___x___,
+    ___x___, KC_COLN, KC_EXLM, KC_EQL,  KC_SLSH, ___x___, ___x___, KC_BSLS, KC_ASTR, KC_DOT,  KC_HASH, ___x___,
+    _______, _______, _______, TT_ESC,  KC_MINS, _______, _______, KC_PLUS, KC_SPC,  _______, _______, _______
+  ),
 
 // ............................................................ Navigation Layer
 
@@ -75,12 +75,12 @@
   // |      |      |      |  f() |      |      |      |      |      |      |      |      |
   // '-----------------------------------------------------------------------------------'
 
-  [_TTCURSOR] = {
-    {_______, _______, _______, _______, _______, ___x___, ___x___, _______, KC_HOME, KC_UP,   KC_END,  KC_PGUP},
-    {OS_GUI,  OS_CTL,  OS_ALT,  OS_SFT,  _______, ___x___, ___x___, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN},
-    {_______, _______, _______, _______, _______, ___x___, ___x___, _______, _______, _______, _______, _______},
-    {_______, _______, _______, TT_ESC,  _______, _______, _______, _______, _______, _______, _______, _______},
-  },
+  [_TTCURSOR] = LAYOUT_planck_grid(
+    _______, _______, _______, _______, _______, ___x___, ___x___, _______, KC_HOME, KC_UP,   KC_END,  KC_PGUP,
+    OS_GUI,  OS_CTL,  OS_ALT,  OS_SFT,  _______, ___x___, ___x___, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN,
+    _______, _______, _______, _______, _______, ___x___, ___x___, _______, _______, _______, _______, _______,
+    _______, _______, _______, TT_ESC,  _______, _______, _______, _______, _______, _______, _______, _______
+  ),
 
 // ............................................................... Mouse Actions
 
@@ -94,9 +94,9 @@
   // |      |      |      |  f() |      |      |      |      |      |      |      |      |
   // '-----------------------------------------------------------------------------------'
 
-  [_TTMOUSE] = {
-    {_______, _______, _______, _______, _______, ___x___, ___x___, _______, KC_WH_L, KC_MS_U, KC_WH_R, KC_WH_U},
-    {_______, KC_BTN3, KC_BTN2, KC_BTN1, _______, ___x___, ___x___, _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D},
-    {_______, _______, _______, _______, _______, ___x___, ___x___, _______, _______, _______, _______, _______},
-    {_______, _______, _______, TT_ESC,  _______, _______, _______, _______, _______, _______, _______, _______},
-  },
+  [_TTMOUSE] = LAYOUT_planck_grid(
+    _______, _______, _______, _______, _______, ___x___, ___x___, _______, KC_WH_L, KC_MS_U, KC_WH_R, KC_WH_U,
+    _______, KC_BTN3, KC_BTN2, KC_BTN1, _______, ___x___, ___x___, _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D,
+    _______, _______, _______, _______, _______, ___x___, ___x___, _______, _______, _______, _______, _______,
+    _______, _______, _______, TT_ESC,  _______, _______, _______, _______, _______, _______, _______, _______
+  ),