Move miscellaneous layouts to data driven (#20516)

2 files changed, 78 insertions, 107 deletions

diff --git a/keyboards/boardrun/classic/classic.h b/keyboards/boardrun/classic/classic.h
deleted file mode 100644
index 173c686c74..0000000000
--- a/keyboards/boardrun/classic/classic.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_classic( \
-  k11, k12, k13, k14, k15, k16, k17,          k18, k19, k110, k111, k112, k113, k114, \
-  k21, k22, k23, k24, k25, k26, k27,          k28, k29, k210, k211, k212, k213, k214, \
-  k31, k32, k33, k34, k35, k36, k37,          k38, k39, k310, k311, k312, k313, k314, \
-  k41, k42, k43, k44, k45, k46, k47,          k48, k49, k410, k411, k412, k413, k414, \
-       k52, k53, k54, k55, k56, k57,   k51,   k58, k59, k510, k511, k512, k513       \
-) \
-{ \
-  { k11, k12, k13, k14, k15, k16, k17, k18, k19, k110, k111, k112, k113, k114 , KC_NO, KC_NO, KC_NO,}, \
-  { k21, k22, k23, k24, k25, k26, k27, k28, k29, k210, k211, k212, k213, k214 , KC_NO, KC_NO, KC_NO,}, \
-  { k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, k311, k312, k313, k314 , KC_NO, KC_NO, KC_NO,}, \
-  { k41, k42, k43, k44, k45, k46, k47, k48, k49, k410, k411, k412, k413, k414 , KC_NO, KC_NO, KC_NO,}, \
-  { k51, k52, k53, k54, k55, k56, k57, k58, k59, k510, k511, k512, k513, KC_NO, KC_NO, KC_NO, KC_NO} \
-}
diff --git a/keyboards/boardrun/classic/info.json b/keyboards/boardrun/classic/info.json
index 74f53cf2cd..8259afcdcc 100644
--- a/keyboards/boardrun/classic/info.json
+++ b/keyboards/boardrun/classic/info.json
@@ -22,82 +22,86 @@
     "layouts": {
         "LAYOUT_classic": {
             "layout": [
-                {"y":0, "x":0,   "label":"Esc", "w":1.5},   
-                {"y":0, "x":1.5, "label":"1"},    
-                {"y":0, "x":2.5, "label":"2"},      
-                {"y":0, "x":3.5, "label":"3"}, 
-                {"y":0, "x":4.5, "label":"4"},          
-                {"y":0, "x":5.5, "label":"5"},        
-                {"y":0, "x":6.5, "label":"-"},
-                {"y":0, "x":9,   "label":"="},        
-                {"y":0, "x":10,  "label":"6"},
-                {"y":0, "x":11,  "label":"7"},
-                {"y":0, "x":12,  "label":"8"},
-                {"y":0, "x":13,  "label":"9"},
-                {"y":0, "x":14,  "label":"0"},
-                {"y":0, "x":15,  "label":"Backspace", "w":1.5},
-                
-                {"y":1, "x":0,   "label":"Tab", "w":1.5},
-                {"y":1, "x":1.5, "label":"Q"},    
-                {"y":1, "x":2.5, "label":"W"},      
-                {"y":1, "x":3.5, "label":"E"}, 
-                {"y":1, "x":4.5, "label":"R"},          
-                {"y":1, "x":5.5, "label":"T"},        
-                {"y":1, "x":6.5, "label":"["},
-                {"y":1, "x":9,   "label":"]"},        
-                {"y":1, "x":10,  "label":"Y"},
-                {"y":1, "x":11,  "label":"U"},
-                {"y":1, "x":12,  "label":"I"},
-                {"y":1, "x":13,  "label":"O"},
-                {"y":1, "x":14,  "label":"P"},
-                {"y":1, "x":15,  "label":"\\",    "w":1.5},
-                
-                {"y":2, "x":0,   "label":"LCtrl", "w":1.5},
-                {"y":2, "x":1.5, "label":"A"},    
-                {"y":2, "x":2.5, "label":"S"},      
-                {"y":2, "x":3.5, "label":"D"}, 
-                {"y":2, "x":4.5, "label":"F"},          
-                {"y":2, "x":5.5, "label":"G"},        
-                {"y":2, "x":6.5, "label":"Home"},
-                {"y":2, "x":9,   "label":"PgUp"},        
-                {"y":2, "x":10,  "label":"H"},
-                {"y":2, "x":11,  "label":"J"},
-                {"y":2, "x":12,  "label":"K"},
-                {"y":2, "x":13,  "label":"L"},
-                {"y":2, "x":14,  "label":";"},
-                {"y":2, "x":15,  "label":"'", "w":1.5},
-                
-                {"y":3, "x":0,   "label":"LShift", "w":1.5},
-                {"y":3, "x":1.5, "label":"Z"},    
-                {"y":3, "x":2.5, "label":"X"},      
-                {"y":3, "x":3.5, "label":"C"}, 
-                {"y":3, "x":4.5, "label":"V"},          
-                {"y":3, "x":5.5, "label":"B"},        
-                {"y":3, "x":6.5, "label":"End"},
-                {"y":3, "x":9,   "label":"PgDn"},        
-                {"y":3, "x":10,  "label":"N"},
-                {"y":3, "x":11,  "label":"M"},
-                {"y":3, "x":12,  "label":","},
-                {"y":3, "x":13,  "label":"."},
-                {"y":3, "x":14,  "label":"/"},
-                {"y":3, "x":15,  "label":"RShift / Enter", "w":1.5},
-                
-                {"y":4, "x":1.5, "label":"LGui"},    
-                {"y":4, "x":2.5, "label":"Del"},      
-                {"y":4, "x":3.5, "label":"`"}, 
-                {"y":4, "x":4.5, "label":"LAlt"},          
-                {"y":4, "x":5.5, "label":"Space"},        
-                {"y":4, "x":6.5, "label":"Space"},
-                {"y":4, "x":7.75,"label":"Fn"},
-                {"y":4, "x":9,   "label":"Space / AltGr"},        
-                {"y":4, "x":10,  "label":"Space / AltGr"},
-                {"y":4, "x":11,  "label":"Left"},
-                {"y":4, "x":12,  "label":"Down"},
-                {"y":4, "x":13,  "label":"Up"},
-                {"y":4, "x":14,  "label":"Right"}
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
 
+                {"matrix": [0, 7], "x": 9, "y": 0},
+                {"matrix": [0, 8], "x": 10, "y": 0},
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+                {"matrix": [0, 13], "x": 15, "y": 0, "w": 1.5},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+
+                {"matrix": [1, 7], "x": 9, "y": 1},
+                {"matrix": [1, 8], "x": 10, "y": 1},
+                {"matrix": [1, 9], "x": 11, "y": 1},
+                {"matrix": [1, 10], "x": 12, "y": 1},
+                {"matrix": [1, 11], "x": 13, "y": 1},
+                {"matrix": [1, 12], "x": 14, "y": 1},
+                {"matrix": [1, 13], "x": 15, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+
+                {"matrix": [2, 7], "x": 9, "y": 2},
+                {"matrix": [2, 8], "x": 10, "y": 2},
+                {"matrix": [2, 9], "x": 11, "y": 2},
+                {"matrix": [2, 10], "x": 12, "y": 2},
+                {"matrix": [2, 11], "x": 13, "y": 2},
+                {"matrix": [2, 12], "x": 14, "y": 2},
+                {"matrix": [2, 13], "x": 15, "y": 2, "w": 1.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 3},
+                {"matrix": [3, 2], "x": 2.5, "y": 3},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+
+                {"matrix": [3, 7], "x": 9, "y": 3},
+                {"matrix": [3, 8], "x": 10, "y": 3},
+                {"matrix": [3, 9], "x": 11, "y": 3},
+                {"matrix": [3, 10], "x": 12, "y": 3},
+                {"matrix": [3, 11], "x": 13, "y": 3},
+                {"matrix": [3, 12], "x": 14, "y": 3},
+                {"matrix": [3, 13], "x": 15, "y": 3, "w": 1.5},
+
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4},
+                {"matrix": [4, 3], "x": 3.5, "y": 4},
+                {"matrix": [4, 4], "x": 4.5, "y": 4},
+                {"matrix": [4, 5], "x": 5.5, "y": 4},
+                {"matrix": [4, 6], "x": 6.5, "y": 4},
+
+                {"matrix": [4, 0], "x": 7.75, "y": 4},
+
+                {"matrix": [4, 7], "x": 9, "y": 4},
+                {"matrix": [4, 8], "x": 10, "y": 4},
+                {"matrix": [4, 9], "x": 11, "y": 4},
+                {"matrix": [4, 10], "x": 12, "y": 4},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4}
             ]
         }
     }
-
 }