Skip to content

Commit

Permalink
Move single LAYOUTs to data driven (qmk#20365)
Browse files Browse the repository at this point in the history
  • Loading branch information
@jpskenn
jpskenn committed Nov 3, 2023
1 parent 0901ae2 commit 7ea1708
Show file tree
Hide file tree
Showing 9 changed files with 264 additions and 207 deletions.
2 changes: 1 addition & 1 deletion keyboards/sandy/dn0020/dn0020.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#include "dn0020.h"
#include QMK_KEYBOARD_H


#ifdef ENCODER_ENABLE
Expand Down
67 changes: 0 additions & 67 deletions keyboards/sandy/dn0020/dn0020.h
View file

This file was deleted.

88 changes: 87 additions & 1 deletion keyboards/sandy/dn0020/info.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,93 @@
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT": {
"layout": [{"label":"0,0", "x":0, "y":0}, {"label":"5,0", "x":1, "y":0}, {"label":"0,1", "x":2, "y":0}, {"label":"5,1", "x":3, "y":0}, {"label":"0,2", "x":4, "y":0}, {"label":"5,2", "x":5, "y":0}, {"label":"0,3", "x":6, "y":0}, {"label":"5,3", "x":7, "y":0}, {"label":"0,4", "x":8, "y":0}, {"label":"5,4", "x":9, "y":0}, {"label":"0,5", "x":10, "y":0}, {"label":"5,5", "x":11, "y":0}, {"label":"0,6", "x":12, "y":0}, {"label":"5,6", "x":13, "y":0}, {"label":"0,7", "x":14, "y":0}, {"label":"1,0", "x":0, "y":1, "w":1.5}, {"label":"6,0", "x":1.5, "y":1}, {"label":"1,1", "x":2.5, "y":1}, {"label":"6,1", "x":3.5, "y":1}, {"label":"1,2", "x":4.5, "y":1}, {"label":"6,2", "x":5.5, "y":1}, {"label":"1,3", "x":6.5, "y":1}, {"label":"6,3", "x":7.5, "y":1}, {"label":"1,4", "x":8.5, "y":1}, {"label":"6,4", "x":9.5, "y":1}, {"label":"1,5", "x":10.5, "y":1}, {"label":"6,5", "x":11.5, "y":1}, {"label":"1,6", "x":12.5, "y":1}, {"label":"6,6", "x":13.5, "y":1, "w":1.5}, {"label":"2,0", "x":0, "y":2, "w":1.5}, {"label":"7,0", "x":1.5, "y":2}, {"label":"2,1", "x":2.5, "y":2}, {"label":"7,1", "x":3.5, "y":2}, {"label":"2,2", "x":4.5, "y":2}, {"label":"7,2", "x":5.5, "y":2}, {"label":"2,3", "x":6.5, "y":2}, {"label":"7,3", "x":7.5, "y":2}, {"label":"2,4", "x":8.5, "y":2}, {"label":"7,4", "x":9.5, "y":2}, {"label":"2,5", "x":10.5, "y":2}, {"label":"7,5", "x":11.5, "y":2}, {"label":"2,6", "x":12.5, "y":2}, {"label":"7,6", "x":13.5, "y":2, "w":1.5}, {"label":"3,0", "x":0, "y":3}, {"label":"8,0", "x":1, "y":3}, {"label":"3,1", "x":2, "y":3}, {"label":"8,1", "x":3, "y":3}, {"label":"3,2", "x":4, "y":3}, {"label":"8,2", "x":5, "y":3}, {"label":"3,3", "x":6, "y":3}, {"label":"8,3", "x":7, "y":3}, {"label":"3,4", "x":8, "y":3}, {"label":"8,4", "x":9, "y":3}, {"label":"3,5", "x":10, "y":3}, {"label":"8,5", "x":11, "y":3}, {"label":"3,6", "x":12, "y":3}, {"label":"8,6", "x":13, "y":3}, {"label":"3,7", "x":14, "y":3}, {"label":"4,0", "x":0, "y":4}, {"label":"9,0", "x":1, "y":4}, {"label":"4,1", "x":2, "y":4, "w":1.25}, {"label":"9,1", "x":3.25, "y":4, "w":1.25}, {"label":"9,2", "x":4.5, "y":4, "w":1.5}, {"label":"4,3", "x":6, "y":4}, {"label":"9,3", "x":7, "y":4}, {"label":"4,4", "x":8, "y":4}, {"label":"9,4", "x":9, "y":4, "w":1.5}, {"label":"9,5", "x":10.5, "y":4, "w":1.25}, {"label":"4,6", "x":11.75, "y":4, "w":1.25}, {"label":"9,6", "x":13, "y":4}, {"label":"4,7", "x":14, "y":4}, {"label":"5,7", "x":0, "y":5.25}, {"label":"9,7", "x":1, "y":5.25}, {"label":"1,7", "x":7, "y":5.25}, {"label":"4,2", "x":13, "y":5.25}, {"label":"4,5", "x":14, "y":5.25}, {"label":"2,7", "x":6, "y":6.25}, {"label":"8,7", "x":7, "y":6.25}, {"label":"7,7", "x":8, "y":6.25}, {"label":"6,7", "x":7, "y":7.25}]
"layout": [
{"label": "", "matrix": [0,0], "x":0, "y":0},
{"label": "", "matrix": [5,0], "x":1, "y":0},
{"label": "", "matrix": [0,1], "x":2, "y":0},
{"label": "", "matrix": [5,1], "x":3, "y":0},
{"label": "", "matrix": [0,2], "x":4, "y":0},
{"label": "", "matrix": [5,2], "x":5, "y":0},
{"label": "", "matrix": [0,3], "x":6, "y":0},
{"label": "", "matrix": [5,3], "x":7, "y":0},
{"label": "", "matrix": [0,4], "x":8, "y":0},
{"label": "", "matrix": [5,4], "x":9, "y":0},
{"label": "", "matrix": [0,5], "x":10, "y":0},
{"label": "", "matrix": [5,5], "x":11, "y":0},
{"label": "", "matrix": [0,6], "x":12, "y":0},
{"label": "", "matrix": [5,6], "x":13, "y":0},
{"label": "", "matrix": [0,7], "x":14, "y":0},

{"label": "", "matrix": [1,0], "x":0, "y":1, "w":1.5},
{"label": "", "matrix": [6,0], "x":1.5, "y":1},
{"label": "", "matrix": [1,1], "x":2.5, "y":1},
{"label": "", "matrix": [6,1], "x":3.5, "y":1},
{"label": "", "matrix": [1,2], "x":4.5, "y":1},
{"label": "", "matrix": [6,2], "x":5.5, "y":1},
{"label": "", "matrix": [1,3], "x":6.5, "y":1},
{"label": "", "matrix": [6,3], "x":7.5, "y":1},
{"label": "", "matrix": [1,4], "x":8.5, "y":1},
{"label": "", "matrix": [6,4], "x":9.5, "y":1},
{"label": "", "matrix": [1,5], "x":10.5, "y":1},
{"label": "", "matrix": [6,5], "x":11.5, "y":1},
{"label": "", "matrix": [1,6], "x":12.5, "y":1},
{"label": "", "matrix": [6,6], "x":13.5, "y":1, "w":1.5},

{"label": "", "matrix": [2,0], "x":0, "y":2, "w":1.5},
{"label": "", "matrix": [7,0], "x":1.5, "y":2},
{"label": "", "matrix": [2,1], "x":2.5, "y":2},
{"label": "", "matrix": [7,1], "x":3.5, "y":2},
{"label": "", "matrix": [2,2], "x":4.5, "y":2},
{"label": "", "matrix": [7,2], "x":5.5, "y":2},
{"label": "", "matrix": [2,3], "x":6.5, "y":2},
{"label": "", "matrix": [7,3], "x":7.5, "y":2},
{"label": "", "matrix": [2,4], "x":8.5, "y":2},
{"label": "", "matrix": [7,4], "x":9.5, "y":2},
{"label": "", "matrix": [2,5], "x":10.5, "y":2},
{"label": "", "matrix": [7,5], "x":11.5, "y":2},
{"label": "", "matrix": [2,6], "x":12.5, "y":2},
{"label": "", "matrix": [7,6], "x":13.5, "y":2, "w":1.5},

{"label": "", "matrix": [3,0], "x":0, "y":3},
{"label": "", "matrix": [8,0], "x":1, "y":3},
{"label": "", "matrix": [3,1], "x":2, "y":3},
{"label": "", "matrix": [8,1], "x":3, "y":3},
{"label": "", "matrix": [3,2], "x":4, "y":3},
{"label": "", "matrix": [8,2], "x":5, "y":3},
{"label": "", "matrix": [3,3], "x":6, "y":3},
{"label": "", "matrix": [8,3], "x":7, "y":3},
{"label": "", "matrix": [3,4], "x":8, "y":3},
{"label": "", "matrix": [8,4], "x":9, "y":3},
{"label": "", "matrix": [3,5], "x":10, "y":3},
{"label": "", "matrix": [8,5], "x":11, "y":3},
{"label": "", "matrix": [3,6], "x":12, "y":3},
{"label": "", "matrix": [8,6], "x":13, "y":3},
{"label": "", "matrix": [3,7], "x":14, "y":3},

{"label": "", "matrix": [4,0], "x":0, "y":4},
{"label": "", "matrix": [9,0], "x":1, "y":4},
{"label": "", "matrix": [4,1], "x":2, "y":4, "w":1.25},
{"label": "", "matrix": [9,1], "x":3.25, "y":4, "w":1.25},
{"label": "", "matrix": [9,2], "x":4.5, "y":4, "w":1.5},
{"label": "", "matrix": [4,3], "x":6, "y":4},
{"label": "", "matrix": [9,3], "x":7, "y":4},
{"label": "", "matrix": [4,4], "x":8, "y":4},
{"label": "", "matrix": [9,4], "x":9, "y":4, "w":1.5},
{"label": "", "matrix": [9,5], "x":10.5, "y":4, "w":1.25},
{"label": "", "matrix": [4,6], "x":11.75, "y":4, "w":1.25},
{"label": "", "matrix": [9,6], "x":13, "y":4},
{"label": "", "matrix": [4,7], "x":14, "y":4},

{"label": "", "matrix": [5,7], "x":0, "y":5.25},
{"label": "", "matrix": [9,7], "x":1, "y":5.25},
{"label": "", "matrix": [1,7], "x":7, "y":5.25},
{"label": "", "matrix": [4,2], "x":13, "y":5.25},
{"label": "", "matrix": [4,5], "x":14, "y":5.25},
{"label": "", "matrix": [2,7], "x":6, "y":6.25},
{"label": "", "matrix": [8,7], "x":7, "y":6.25},
{"label": "", "matrix": [7,7], "x":8, "y":6.25},
{"label": "", "matrix": [6,7], "x":7, "y":7.25}
]
}
}
}
2 changes: 1 addition & 1 deletion keyboards/sandy/dn0030/dn0030.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#include "dn0030.h"
#include QMK_KEYBOARD_H

#ifdef ENCODER_ENABLE
//------------------------------------------------------------------------------
Expand Down
67 changes: 0 additions & 67 deletions keyboards/sandy/dn0030/dn0030.h
View file

This file was deleted.

Loading

0 comments on commit 7ea1708

Please sign in to comment.