1
0
Эх сурвалжийг харах

`handwired/swiftrax/bumblebee`: fix layout name (#24064)

Ryan 2 жил өмнө
parent
commit
e4dfbb075e

+ 4 - 1
keyboards/handwired/swiftrax/bumblebee/keyboard.json

@@ -36,8 +36,11 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT"
+    },
     "layouts": {
-        "LAYOUT_all": {
+        "LAYOUT": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
                 {"matrix": [1, 0], "x": 1, "y": 0, "w": 1.5},

+ 3 - 3
keyboards/handwired/swiftrax/bumblebee/keymaps/default/keymap.c

@@ -26,19 +26,19 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DRV2605L_V_PEAK 5
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_all(
+    [0] = LAYOUT(
         KC_ESC , KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSPC, KC_DEL , 
         KC_F13 , KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT, KC_ENT , KC_HOME,      
         KC_F14 , KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, KC_UP  , KC_END ,      
         KC_F15 , KC_LCTL,                   KC_LALT, KC_SPC , KC_MUTE,                   MO(1)  , MO(2)  ,          KC_LEFT, KC_DOWN, KC_RGHT       
     ),
-    [1] = LAYOUT_all(
+    [1] = LAYOUT(
         _______, _______, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , _______, _______, 
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      
         _______, _______,                   _______, _______, _______,                   _______, _______,          _______, _______, _______        
     ),
-    [2] = LAYOUT_all(
+    [2] = LAYOUT(
         _______, _______, KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , _______, _______, 
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      

+ 4 - 10
keyboards/handwired/swiftrax/bumblebee/keymaps/via/keymap.c

@@ -26,28 +26,22 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DRV2605L_V_PEAK 5
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_all(
+    [0] = LAYOUT(
         KC_ESC , KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSPC, KC_DEL , 
         KC_F13 , KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT, KC_ENT , KC_HOME,      
         KC_F14 , KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, KC_UP  , KC_END ,      
         KC_F15 , KC_LCTL,                   KC_LALT, KC_SPC , KC_MUTE,                   MO(1)  , MO(2)  ,          KC_LEFT, KC_DOWN, KC_RGHT       
     ),
-    [1] = LAYOUT_all(
+    [1] = LAYOUT(
         _______, _______, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , _______, _______, 
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      
         _______, _______,                   _______, _______, _______,                   _______, _______,          _______, _______, _______       
     ),
-    [2] = LAYOUT_all(
+    [2] = LAYOUT(
         _______, _______, KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , _______, _______, 
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      
         _______, _______,                   _______, _______, _______,                   _______, _______,          _______, _______, _______     
-    ),
-    [3] = LAYOUT_all(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      
-        _______, _______,                   _______, _______, _______,                   _______, _______,          _______, _______, _______     
-    ),
+    )
 };