alvierahman90/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix error_log complaint about Preonic layouts (#9443)

Browse Source
This commit is contained in:
Ryan 2020-06-18 14:23:09 +10:00 committed by GitHub
parent b0fd064491
commit faae375ccd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 627 additions and 625 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

250
keyboards/preonic/info.json
View File

@ -7,131 +7,139 @@
"height": 5, "height": 5,
"layouts": { "layouts": {
"LAYOUT_preonic_1x2uC": { "LAYOUT_preonic_1x2uC": {
"key_count": 59,
"layout": [ "layout": [
{ "w": 1, "x": 0, "y": 0 }, {"x": 0, "y": 0},
{ "w": 1, "x": 1, "y": 0 }, {"x": 1, "y": 0},
{ "w": 1, "x": 2, "y": 0 }, {"x": 2, "y": 0},
{ "w": 1, "x": 3, "y": 0 }, {"x": 3, "y": 0},
{ "w": 1, "x": 4, "y": 0 }, {"x": 4, "y": 0},
{ "w": 1, "x": 5, "y": 0 }, {"x": 5, "y": 0},
{ "w": 1, "x": 6, "y": 0 }, {"x": 6, "y": 0},
{ "w": 1, "x": 7, "y": 0 }, {"x": 7, "y": 0},
{ "w": 1, "x": 8, "y": 0 }, {"x": 8, "y": 0},
{ "w": 1, "x": 9, "y": 0 }, {"x": 9, "y": 0},
{ "w": 1, "x": 10, "y": 0 }, {"x": 10, "y": 0},
{ "w": 1, "x": 11, "y": 0 }, {"x": 11, "y": 0},
{ "w": 1, "x": 0, "y": 1 },
{ "w": 1, "x": 1, "y": 1 }, {"x": 0, "y": 1},
{ "w": 1, "x": 2, "y": 1 }, {"x": 1, "y": 1},
{ "w": 1, "x": 3, "y": 1 }, {"x": 2, "y": 1},
{ "w": 1, "x": 4, "y": 1 }, {"x": 3, "y": 1},
{ "w": 1, "x": 5, "y": 1 }, {"x": 4, "y": 1},
{ "w": 1, "x": 6, "y": 1 }, {"x": 5, "y": 1},
{ "w": 1, "x": 7, "y": 1 }, {"x": 6, "y": 1},
{ "w": 1, "x": 8, "y": 1 }, {"x": 7, "y": 1},
{ "w": 1, "x": 9, "y": 1 }, {"x": 8, "y": 1},
{ "w": 1, "x": 10, "y": 1 }, {"x": 9, "y": 1},
{ "w": 1, "x": 11, "y": 1 }, {"x": 10, "y": 1},
{ "w": 1, "x": 0, "y": 2 }, {"x": 11, "y": 1},
{ "w": 1, "x": 1, "y": 2 },
{ "w": 1, "x": 2, "y": 2 }, {"x": 0, "y": 2},
{ "w": 1, "x": 3, "y": 2 }, {"x": 1, "y": 2},
{ "w": 1, "x": 4, "y": 2 }, {"x": 2, "y": 2},
{ "w": 1, "x": 5, "y": 2 }, {"x": 3, "y": 2},
{ "w": 1, "x": 6, "y": 2 }, {"x": 4, "y": 2},
{ "w": 1, "x": 7, "y": 2 }, {"x": 5, "y": 2},
{ "w": 1, "x": 8, "y": 2 }, {"x": 6, "y": 2},
{ "w": 1, "x": 9, "y": 2 }, {"x": 7, "y": 2},
{ "w": 1, "x": 10, "y": 2 }, {"x": 8, "y": 2},
{ "w": 1, "x": 11, "y": 2 }, {"x": 9, "y": 2},
{ "w": 1, "x": 0, "y": 3 }, {"x": 10, "y": 2},
{ "w": 1, "x": 1, "y": 3 }, {"x": 11, "y": 2},
{ "w": 1, "x": 2, "y": 3 },
{ "w": 1, "x": 3, "y": 3 }, {"x": 0, "y": 3},
{ "w": 1, "x": 4, "y": 3 }, {"x": 1, "y": 3},
{ "w": 1, "x": 5, "y": 3 }, {"x": 2, "y": 3},
{ "w": 1, "x": 6, "y": 3 }, {"x": 3, "y": 3},
{ "w": 1, "x": 7, "y": 3 }, {"x": 4, "y": 3},
{ "w": 1, "x": 8, "y": 3 }, {"x": 5, "y": 3},
{ "w": 1, "x": 9, "y": 3 }, {"x": 6, "y": 3},
{ "w": 1, "x": 10, "y": 3 }, {"x": 7, "y": 3},
{ "w": 1, "x": 11, "y": 3 }, {"x": 8, "y": 3},
{ "w": 1, "x": 0, "y": 4 }, {"x": 9, "y": 3},
{ "w": 1, "x": 1, "y": 4 }, {"x": 10, "y": 3},
{ "w": 1, "x": 2, "y": 4 }, {"x": 11, "y": 3},
{ "w": 1, "x": 3, "y": 4 },
{ "w": 1, "x": 4, "y": 4 }, {"x": 0, "y": 4},
{ "w": 2, "x": 5, "y": 4 }, {"x": 1, "y": 4},
{ "w": 1, "x": 7, "y": 4 }, {"x": 2, "y": 4},
{ "w": 1, "x": 8, "y": 4 }, {"x": 3, "y": 4},
{ "w": 1, "x": 9, "y": 4 }, {"x": 4, "y": 4},
{ "w": 1, "x": 10, "y": 4 }, {"x": 5, "y": 4, "w": 2},
{ "w": 1, "x": 11, "y": 4 } ] {"x": 7, "y": 4},
{"x": 8, "y": 4},
{"x": 9, "y": 4},
{"x": 10, "y": 4},
{"x": 11, "y": 4}
]
}, },
"LAYOUT_ortho_5x12": { "LAYOUT_ortho_5x12": {
"key_count": 60,
"layout": [ "layout": [
{ "w": 1, "x": 0, "y": 0 }, {"x": 0, "y": 0},
{ "w": 1, "x": 1, "y": 0 }, {"x": 1, "y": 0},
{ "w": 1, "x": 2, "y": 0 }, {"x": 2, "y": 0},
{ "w": 1, "x": 3, "y": 0 }, {"x": 3, "y": 0},
{ "w": 1, "x": 4, "y": 0 }, {"x": 4, "y": 0},
{ "w": 1, "x": 5, "y": 0 }, {"x": 5, "y": 0},
{ "w": 1, "x": 6, "y": 0 }, {"x": 6, "y": 0},
{ "w": 1, "x": 7, "y": 0 }, {"x": 7, "y": 0},
{ "w": 1, "x": 8, "y": 0 }, {"x": 8, "y": 0},
{ "w": 1, "x": 9, "y": 0 }, {"x": 9, "y": 0},
{ "w": 1, "x": 10, "y": 0 }, {"x": 10, "y": 0},
{ "w": 1, "x": 11, "y": 0 }, {"x": 11, "y": 0},
{ "w": 1, "x": 0, "y": 1 },
{ "w": 1, "x": 1, "y": 1 }, {"x": 0, "y": 1},
{ "w": 1, "x": 2, "y": 1 }, {"x": 1, "y": 1},
{ "w": 1, "x": 3, "y": 1 }, {"x": 2, "y": 1},
{ "w": 1, "x": 4, "y": 1 }, {"x": 3, "y": 1},
{ "w": 1, "x": 5, "y": 1 }, {"x": 4, "y": 1},
{ "w": 1, "x": 6, "y": 1 }, {"x": 5, "y": 1},
{ "w": 1, "x": 7, "y": 1 }, {"x": 6, "y": 1},
{ "w": 1, "x": 8, "y": 1 }, {"x": 7, "y": 1},
{ "w": 1, "x": 9, "y": 1 }, {"x": 8, "y": 1},
{ "w": 1, "x": 10, "y": 1 }, {"x": 9, "y": 1},
{ "w": 1, "x": 11, "y": 1 }, {"x": 10, "y": 1},
{ "w": 1, "x": 0, "y": 2 }, {"x": 11, "y": 1},
{ "w": 1, "x": 1, "y": 2 },
{ "w": 1, "x": 2, "y": 2 }, {"x": 0, "y": 2},
{ "w": 1, "x": 3, "y": 2 }, {"x": 1, "y": 2},
{ "w": 1, "x": 4, "y": 2 }, {"x": 2, "y": 2},
{ "w": 1, "x": 5, "y": 2 }, {"x": 3, "y": 2},
{ "w": 1, "x": 6, "y": 2 }, {"x": 4, "y": 2},
{ "w": 1, "x": 7, "y": 2 }, {"x": 5, "y": 2},
{ "w": 1, "x": 8, "y": 2 }, {"x": 6, "y": 2},
{ "w": 1, "x": 9, "y": 2 }, {"x": 7, "y": 2},
{ "w": 1, "x": 10, "y": 2 }, {"x": 8, "y": 2},
{ "w": 1, "x": 11, "y": 2 }, {"x": 9, "y": 2},
{ "w": 1, "x": 0, "y": 3 }, {"x": 10, "y": 2},
{ "w": 1, "x": 1, "y": 3 }, {"x": 11, "y": 2},
{ "w": 1, "x": 2, "y": 3 },
{ "w": 1, "x": 3, "y": 3 }, {"x": 0, "y": 3},
{ "w": 1, "x": 4, "y": 3 }, {"x": 1, "y": 3},
{ "w": 1, "x": 5, "y": 3 }, {"x": 2, "y": 3},
{ "w": 1, "x": 6, "y": 3 }, {"x": 3, "y": 3},
{ "w": 1, "x": 7, "y": 3 }, {"x": 4, "y": 3},
{ "w": 1, "x": 8, "y": 3 }, {"x": 5, "y": 3},
{ "w": 1, "x": 9, "y": 3 }, {"x": 6, "y": 3},
{ "w": 1, "x": 10, "y": 3 }, {"x": 7, "y": 3},
{ "w": 1, "x": 11, "y": 3 }, {"x": 8, "y": 3},
{ "w": 1, "x": 0, "y": 4 }, {"x": 9, "y": 3},
{ "w": 1, "x": 1, "y": 4 }, {"x": 10, "y": 3},
{ "w": 1, "x": 2, "y": 4 }, {"x": 11, "y": 3},
{ "w": 1, "x": 3, "y": 4 },
{ "w": 1, "x": 4, "y": 4 }, {"x": 0, "y": 4},
{ "w": 1, "x": 5, "y": 4 }, {"x": 1, "y": 4},
{ "w": 1, "x": 6, "y": 4 }, {"x": 2, "y": 4},
{ "w": 1, "x": 7, "y": 4 }, {"x": 3, "y": 4},
{ "w": 1, "x": 8, "y": 4 }, {"x": 4, "y": 4},
{ "w": 1, "x": 9, "y": 4 }, {"x": 5, "y": 4},
{ "w": 1, "x": 10, "y": 4 }, {"x": 6, "y": 4},
{ "w": 1, "x": 11, "y": 4 } ] {"x": 7, "y": 4},
{"x": 8, "y": 4},
{"x": 9, "y": 4},
{"x": 10, "y": 4},
{"x": 11, "y": 4}
]
} }
} }
} }

2
keyboards/preonic/preonic.h
View File

@ -23,4 +23,4 @@
** ** ** **
** Name of Alias Matrix Name: ** ** Name of Alias Matrix Name: **
******* ----------------- ------------------- ****/ ******* ----------------- ------------------- ****/
#define LAYOUT_ortho_5x12 LAYOUT_preonic_grid #define LAYOUT_preonic_grid LAYOUT_ortho_5x12

12
keyboards/preonic/rev1/rev1.h
View File

@ -18,16 +18,13 @@
#include "preonic.h" #include "preonic.h"
#ifdef __AVR__ // Preonic revs. 1 & 2
#define LAYOUT_preonic_1x2uC( \ #define LAYOUT_preonic_1x2uC( \
k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \ k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
k40, k41, k42, k43, k44, k45, k47, k48, k49, k4a, k4b \ k40, k41, k42, k43, k44, k45, k47, k48, k49, k4a, k4b \
) \ ) { \
{ \
{ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \ { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
{ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \ { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
{ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \ { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
@ -35,19 +32,16 @@
{ k40, k41, k42, k43, k44, k45, k45, k47, k48, k49, k4a, k4b } \ { k40, k41, k42, k43, k44, k45, k45, k47, k48, k49, k4a, k4b } \
} }
#define LAYOUT_preonic_grid( \ #define LAYOUT_ortho_5x12( \
k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \ k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b \ k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b \
) \ ) { \
{ \
{ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \ { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
{ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \ { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
{ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \ { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
{ k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b }, \ { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b }, \
{ k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b } \ { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b } \
} }
#endif

12
keyboards/preonic/rev2/rev2.h
View File

@ -18,16 +18,13 @@
#include "preonic.h" #include "preonic.h"
#ifdef __AVR__ // Preonic revs. 1 & 2
#define LAYOUT_preonic_1x2uC( \ #define LAYOUT_preonic_1x2uC( \
k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \ k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
k40, k41, k42, k43, k44, k45, k47, k48, k49, k4a, k4b \ k40, k41, k42, k43, k44, k45, k47, k48, k49, k4a, k4b \
) \ ) { \
{ \
{ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \ { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
{ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \ { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
{ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \ { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
@ -35,19 +32,16 @@
{ k40, k41, k42, k43, k44, k45, k45, k47, k48, k49, k4a, k4b } \ { k40, k41, k42, k43, k44, k45, k45, k47, k48, k49, k4a, k4b } \
} }
#define LAYOUT_preonic_grid( \ #define LAYOUT_ortho_5x12( \
k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \ k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b \ k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b \
) \ ) { \
{ \
{ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \ { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
{ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \ { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
{ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \ { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
{ k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b }, \ { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b }, \
{ k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b } \ { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b } \
} }
#endif

615
keyboards/preonic/rev3/info.json
View File

@ -7,323 +7,338 @@
"height": 5, "height": 5,
"layouts": { "layouts": {
"LAYOUT_preonic_1x2uC": { "LAYOUT_preonic_1x2uC": {
"key_count": 59,
"layout": [ "layout": [
{"label":"k00", "x":0, "y":0}, {"x": 0, "y": 0},
{"label":"k01", "x":1, "y":0}, {"x": 1, "y": 0},
{"label":"k02", "x":2, "y":0}, {"x": 2, "y": 0},
{"label":"k03", "x":3, "y":0}, {"x": 3, "y": 0},
{"label":"k04", "x":4, "y":0}, {"x": 4, "y": 0},
{"label":"k05", "x":5, "y":0}, {"x": 5, "y": 0},
{"label":"k06", "x":6, "y":0}, {"x": 6, "y": 0},
{"label":"k07", "x":7, "y":0}, {"x": 7, "y": 0},
{"label":"k08", "x":8, "y":0}, {"x": 8, "y": 0},
{"label":"k09", "x":9, "y":0}, {"x": 9, "y": 0},
{"label":"k0a", "x":10, "y":0}, {"x": 10, "y": 0},
{"label":"k0b", "x":11, "y":0}, {"x": 11, "y": 0},
{"label":"k10", "x":0, "y":1},
{"label":"k11", "x":1, "y":1}, {"x": 0, "y": 1},
{"label":"k12", "x":2, "y":1}, {"x": 1, "y": 1},
{"label":"k13", "x":3, "y":1}, {"x": 2, "y": 1},
{"label":"k14", "x":4, "y":1}, {"x": 3, "y": 1},
{"label":"k15", "x":5, "y":1}, {"x": 4, "y": 1},
{"label":"k16", "x":6, "y":1}, {"x": 5, "y": 1},
{"label":"k17", "x":7, "y":1}, {"x": 6, "y": 1},
{"label":"k18", "x":8, "y":1}, {"x": 7, "y": 1},
{"label":"k19", "x":9, "y":1}, {"x": 8, "y": 1},
{"label":"k1a", "x":10, "y":1}, {"x": 9, "y": 1},
{"label":"k1b", "x":11, "y":1}, {"x": 10, "y": 1},
{"label":"k20", "x":0, "y":2}, {"x": 11, "y": 1},
{"label":"k21", "x":1, "y":2},
{"label":"k22", "x":2, "y":2}, {"x": 0, "y": 2},
{"label":"k23", "x":3, "y":2}, {"x": 1, "y": 2},
{"label":"k24", "x":4, "y":2}, {"x": 2, "y": 2},
{"label":"k25", "x":5, "y":2}, {"x": 3, "y": 2},
{"label":"k26", "x":6, "y":2}, {"x": 4, "y": 2},
{"label":"k27", "x":7, "y":2}, {"x": 5, "y": 2},
{"label":"k28", "x":8, "y":2}, {"x": 6, "y": 2},
{"label":"k29", "x":9, "y":2}, {"x": 7, "y": 2},
{"label":"k2a", "x":10, "y":2}, {"x": 8, "y": 2},
{"label":"k2b", "x":11, "y":2}, {"x": 9, "y": 2},
{"label":"k30", "x":0, "y":3}, {"x": 10, "y": 2},
{"label":"k31", "x":1, "y":3}, {"x": 11, "y": 2},
{"label":"k32", "x":2, "y":3},
{"label":"k33", "x":3, "y":3}, {"x": 0, "y": 3},
{"label":"k34", "x":4, "y":3}, {"x": 1, "y": 3},
{"label":"k35", "x":5, "y":3}, {"x": 2, "y": 3},
{"label":"k36", "x":6, "y":3}, {"x": 3, "y": 3},
{"label":"k37", "x":7, "y":3}, {"x": 4, "y": 3},
{"label":"k38", "x":8, "y":3}, {"x": 5, "y": 3},
{"label":"k39", "x":9, "y":3}, {"x": 6, "y": 3},
{"label":"k3a", "x":10, "y":3}, {"x": 7, "y": 3},
{"label":"k3b", "x":11, "y":3}, {"x": 8, "y": 3},
{"label":"k40", "x":0, "y":4}, {"x": 9, "y": 3},
{"label":"k41", "x":1, "y":4}, {"x": 10, "y": 3},
{"label":"k42", "x":2, "y":4}, {"x": 11, "y": 3},
{"label":"k43", "x":3, "y":4},
{"label":"k44", "x":4, "y":4}, {"x": 0, "y": 4},
{"label":"k45", "x":5, "y":4, "w":2}, {"x": 1, "y": 4},
{"label":"k47", "x":7, "y":4}, {"x": 2, "y": 4},
{"label":"k48", "x":8, "y":4}, {"x": 3, "y": 4},
{"label":"k49", "x":9, "y":4}, {"x": 4, "y": 4},
{"label":"k4a", "x":10, "y":4}, {"x": 5, "y": 4, "w": 2},
{"label":"k4b", "x":11, "y":4} {"x": 7, "y": 4},
{"x": 8, "y": 4},
{"x": 9, "y": 4},
{"x": 10, "y": 4},
{"x": 11, "y": 4}
] ]
}, },
"LAYOUT_preonic_1x2uR": { "LAYOUT_preonic_1x2uR": {
"key_count": 59,
"layout": [ "layout": [
{"label":"k00", "x":0, "y":0}, {"x": 0, "y": 0},
{"label":"k01", "x":1, "y":0}, {"x": 1, "y": 0},
{"label":"k02", "x":2, "y":0}, {"x": 2, "y": 0},
{"label":"k03", "x":3, "y":0}, {"x": 3, "y": 0},
{"label":"k04", "x":4, "y":0}, {"x": 4, "y": 0},
{"label":"k05", "x":5, "y":0}, {"x": 5, "y": 0},
{"label":"k06", "x":6, "y":0}, {"x": 6, "y": 0},
{"label":"k07", "x":7, "y":0}, {"x": 7, "y": 0},
{"label":"k08", "x":8, "y":0}, {"x": 8, "y": 0},
{"label":"k09", "x":9, "y":0}, {"x": 9, "y": 0},
{"label":"k0a", "x":10, "y":0}, {"x": 10, "y": 0},
{"label":"k0b", "x":11, "y":0}, {"x": 11, "y": 0},
{"label":"k10", "x":0, "y":1},
{"label":"k11", "x":1, "y":1}, {"x": 0, "y": 1},
{"label":"k12", "x":2, "y":1}, {"x": 1, "y": 1},
{"label":"k13", "x":3, "y":1}, {"x": 2, "y": 1},
{"label":"k14", "x":4, "y":1}, {"x": 3, "y": 1},
{"label":"k15", "x":5, "y":1}, {"x": 4, "y": 1},
{"label":"k16", "x":6, "y":1}, {"x": 5, "y": 1},
{"label":"k17", "x":7, "y":1}, {"x": 6, "y": 1},
{"label":"k18", "x":8, "y":1}, {"x": 7, "y": 1},
{"label":"k19", "x":9, "y":1}, {"x": 8, "y": 1},
{"label":"k1a", "x":10, "y":1}, {"x": 9, "y": 1},
{"label":"k1b", "x":11, "y":1}, {"x": 10, "y": 1},
{"label":"k20", "x":0, "y":2}, {"x": 11, "y": 1},
{"label":"k21", "x":1, "y":2},
{"label":"k22", "x":2, "y":2}, {"x": 0, "y": 2},
{"label":"k23", "x":3, "y":2}, {"x": 1, "y": 2},
{"label":"k24", "x":4, "y":2}, {"x": 2, "y": 2},
{"label":"k25", "x":5, "y":2}, {"x": 3, "y": 2},
{"label":"k26", "x":6, "y":2}, {"x": 4, "y": 2},
{"label":"k27", "x":7, "y":2}, {"x": 5, "y": 2},
{"label":"k28", "x":8, "y":2}, {"x": 6, "y": 2},
{"label":"k29", "x":9, "y":2}, {"x": 7, "y": 2},
{"label":"k2a", "x":10, "y":2}, {"x": 8, "y": 2},
{"label":"k2b", "x":11, "y":2}, {"x": 9, "y": 2},
{"label":"k30", "x":0, "y":3}, {"x": 10, "y": 2},
{"label":"k31", "x":1, "y":3}, {"x": 11, "y": 2},
{"label":"k32", "x":2, "y":3},
{"label":"k33", "x":3, "y":3}, {"x": 0, "y": 3},
{"label":"k34", "x":4, "y":3}, {"x": 1, "y": 3},
{"label":"k35", "x":5, "y":3}, {"x": 2, "y": 3},
{"label":"k36", "x":6, "y":3}, {"x": 3, "y": 3},
{"label":"k37", "x":7, "y":3}, {"x": 4, "y": 3},
{"label":"k38", "x":8, "y":3}, {"x": 5, "y": 3},
{"label":"k39", "x":9, "y":3}, {"x": 6, "y": 3},
{"label":"k3a", "x":10, "y":3}, {"x": 7, "y": 3},
{"label":"k3b", "x":11, "y":3}, {"x": 8, "y": 3},
{"label":"k40", "x":0, "y":4}, {"x": 9, "y": 3},
{"label":"k41", "x":1, "y":4}, {"x": 10, "y": 3},
{"label":"k42", "x":2, "y":4}, {"x": 11, "y": 3},
{"label":"k43", "x":3, "y":4},
{"label":"k44", "x":4, "y":4}, {"x": 0, "y": 4},
{"label":"k45", "x":5, "y":4}, {"x": 1, "y": 4},
{"label":"k47", "x":6, "y":4, "w":2}, {"x": 2, "y": 4},
{"label":"k48", "x":8, "y":4}, {"x": 3, "y": 4},
{"label":"k49", "x":9, "y":4}, {"x": 4, "y": 4},
{"label":"k4a", "x":10, "y":4}, {"x": 5, "y": 4},
{"label":"k4b", "x":11, "y":4} {"x": 6, "y": 4, "w": 2},
{"x": 8, "y": 4},
{"x": 9, "y": 4},
{"x": 10, "y": 4},
{"x": 11, "y": 4}
] ]
}, },
"LAYOUT_preonic_1x2uL": { "LAYOUT_preonic_1x2uL": {
"key_count": 59,
"layout": [ "layout": [
{"label":"k00", "x":0, "y":0}, {"x": 0, "y": 0},
{"label":"k01", "x":1, "y":0}, {"x": 1, "y": 0},
{"label":"k02", "x":2, "y":0}, {"x": 2, "y": 0},
{"label":"k03", "x":3, "y":0}, {"x": 3, "y": 0},
{"label":"k04", "x":4, "y":0}, {"x": 4, "y": 0},
{"label":"k05", "x":5, "y":0}, {"x": 5, "y": 0},
{"label":"k06", "x":6, "y":0}, {"x": 6, "y": 0},
{"label":"k07", "x":7, "y":0}, {"x": 7, "y": 0},
{"label":"k08", "x":8, "y":0}, {"x": 8, "y": 0},
{"label":"k09", "x":9, "y":0}, {"x": 9, "y": 0},
{"label":"k0a", "x":10, "y":0}, {"x": 10, "y": 0},
{"label":"k0b", "x":11, "y":0}, {"x": 11, "y": 0},
{"label":"k10", "x":0, "y":1},
{"label":"k11", "x":1, "y":1}, {"x": 0, "y": 1},
{"label":"k12", "x":2, "y":1}, {"x": 1, "y": 1},
{"label":"k13", "x":3, "y":1}, {"x": 2, "y": 1},
{"label":"k14", "x":4, "y":1}, {"x": 3, "y": 1},
{"label":"k15", "x":5, "y":1}, {"x": 4, "y": 1},
{"label":"k16", "x":6, "y":1}, {"x": 5, "y": 1},
{"label":"k17", "x":7, "y":1}, {"x": 6, "y": 1},
{"label":"k18", "x":8, "y":1}, {"x": 7, "y": 1},
{"label":"k19", "x":9, "y":1}, {"x": 8, "y": 1},
{"label":"k1a", "x":10, "y":1}, {"x": 9, "y": 1},
{"label":"k1b", "x":11, "y":1}, {"x": 10, "y": 1},
{"label":"k20", "x":0, "y":2}, {"x": 11, "y": 1},
{"label":"k21", "x":1, "y":2},
{"label":"k22", "x":2, "y":2}, {"x": 0, "y": 2},
{"label":"k23", "x":3, "y":2}, {"x": 1, "y": 2},
{"label":"k24", "x":4, "y":2}, {"x": 2, "y": 2},
{"label":"k25", "x":5, "y":2}, {"x": 3, "y": 2},
{"label":"k26", "x":6, "y":2}, {"x": 4, "y": 2},
{"label":"k27", "x":7, "y":2}, {"x": 5, "y": 2},
{"label":"k28", "x":8, "y":2}, {"x": 6, "y": 2},
{"label":"k29", "x":9, "y":2}, {"x": 7, "y": 2},
{"label":"k2a", "x":10, "y":2}, {"x": 8, "y": 2},
{"label":"k2b", "x":11, "y":2}, {"x": 9, "y": 2},
{"label":"k30", "x":0, "y":3}, {"x": 10, "y": 2},
{"label":"k31", "x":1, "y":3}, {"x": 11, "y": 2},
{"label":"k32", "x":2, "y":3},
{"label":"k33", "x":3, "y":3}, {"x": 0, "y": 3},
{"label":"k34", "x":4, "y":3}, {"x": 1, "y": 3},
{"label":"k35", "x":5, "y":3}, {"x": 2, "y": 3},
{"label":"k36", "x":6, "y":3}, {"x": 3, "y": 3},
{"label":"k37", "x":7, "y":3}, {"x": 4, "y": 3},
{"label":"k38", "x":8, "y":3}, {"x": 5, "y": 3},
{"label":"k39", "x":9, "y":3}, {"x": 6, "y": 3},
{"label":"k3a", "x":10, "y":3}, {"x": 7, "y": 3},
{"label":"k3b", "x":11, "y":3}, {"x": 8, "y": 3},
{"label":"k40", "x":0, "y":4}, {"x": 9, "y": 3},
{"label":"k41", "x":1, "y":4}, {"x": 10, "y": 3},
{"label":"k42", "x":2, "y":4}, {"x": 11, "y": 3},
{"label":"k43", "x":3, "y":4},
{"label":"k44", "x":4, "y":4, "w":2}, {"x": 0, "y": 4},
{"label":"k46", "x":6, "y":4}, {"x": 1, "y": 4},
{"label":"k47", "x":7, "y":4}, {"x": 2, "y": 4},
{"label":"k48", "x":8, "y":4}, {"x": 3, "y": 4},
{"label":"k49", "x":9, "y":4}, {"x": 4, "y": 4, "w": 2},
{"label":"k4a", "x":10, "y":4}, {"x": 6, "y": 4},
{"label":"k4b", "x":11, "y":4} {"x": 7, "y": 4},
{"x": 8, "y": 4},
{"x": 9, "y": 4},
{"x": 10, "y": 4},
{"x": 11, "y": 4}
] ]
}, },
"LAYOUT_preonic_2x2u": { "LAYOUT_preonic_2x2u": {
"key_count": 58,
"layout": [ "layout": [
{"label":"k00", "x":0, "y":0}, {"x": 0, "y": 0},
{"label":"k01", "x":1, "y":0}, {"x": 1, "y": 0},
{"label":"k02", "x":2, "y":0}, {"x": 2, "y": 0},
{"label":"k03", "x":3, "y":0}, {"x": 3, "y": 0},
{"label":"k04", "x":4, "y":0}, {"x": 4, "y": 0},
{"label":"k05", "x":5, "y":0}, {"x": 5, "y": 0},
{"label":"k06", "x":6, "y":0}, {"x": 6, "y": 0},
{"label":"k07", "x":7, "y":0}, {"x": 7, "y": 0},
{"label":"k08", "x":8, "y":0}, {"x": 8, "y": 0},
{"label":"k09", "x":9, "y":0}, {"x": 9, "y": 0},
{"label":"k0a", "x":10, "y":0}, {"x": 10, "y": 0},
{"label":"k0b", "x":11, "y":0}, {"x": 11, "y": 0},
{"label":"k10", "x":0, "y":1},
{"label":"k11", "x":1, "y":1}, {"x": 0, "y": 1},
{"label":"k12", "x":2, "y":1}, {"x": 1, "y": 1},
{"label":"k13", "x":3, "y":1}, {"x": 2, "y": 1},
{"label":"k14", "x":4, "y":1}, {"x": 3, "y": 1},
{"label":"k15", "x":5, "y":1}, {"x": 4, "y": 1},
{"label":"k16", "x":6, "y":1}, {"x": 5, "y": 1},
{"label":"k17", "x":7, "y":1}, {"x": 6, "y": 1},
{"label":"k18", "x":8, "y":1}, {"x": 7, "y": 1},
{"label":"k19", "x":9, "y":1}, {"x": 8, "y": 1},
{"label":"k1a", "x":10, "y":1}, {"x": 9, "y": 1},
{"label":"k1b", "x":11, "y":1}, {"x": 10, "y": 1},
{"label":"k20", "x":0, "y":2}, {"x": 11, "y": 1},
{"label":"k21", "x":1, "y":2},
{"label":"k22", "x":2, "y":2}, {"x": 0, "y": 2},
{"label":"k23", "x":3, "y":2}, {"x": 1, "y": 2},
{"label":"k24", "x":4, "y":2}, {"x": 2, "y": 2},
{"label":"k25", "x":5, "y":2}, {"x": 3, "y": 2},
{"label":"k26", "x":6, "y":2}, {"x": 4, "y": 2},
{"label":"k27", "x":7, "y":2}, {"x": 5, "y": 2},
{"label":"k28", "x":8, "y":2}, {"x": 6, "y": 2},
{"label":"k29", "x":9, "y":2}, {"x": 7, "y": 2},
{"label":"k2a", "x":10, "y":2}, {"x": 8, "y": 2},
{"label":"k2b", "x":11, "y":2}, {"x": 9, "y": 2},
{"label":"k30", "x":0, "y":3}, {"x": 10, "y": 2},
{"label":"k31", "x":1, "y":3}, {"x": 11, "y": 2},
{"label":"k32", "x":2, "y":3},
{"label":"k33", "x":3, "y":3}, {"x": 0, "y": 3},
{"label":"k34", "x":4, "y":3}, {"x": 1, "y": 3},
{"label":"k35", "x":5, "y":3}, {"x": 2, "y": 3},
{"label":"k36", "x":6, "y":3}, {"x": 3, "y": 3},
{"label":"k37", "x":7, "y":3}, {"x": 4, "y": 3},
{"label":"k38", "x":8, "y":3}, {"x": 5, "y": 3},
{"label":"k39", "x":9, "y":3}, {"x": 6, "y": 3},
{"label":"k3a", "x":10, "y":3}, {"x": 7, "y": 3},
{"label":"k3b", "x":11, "y":3}, {"x": 8, "y": 3},
{"label":"k40", "x":0, "y":4}, {"x": 9, "y": 3},
{"label":"k41", "x":1, "y":4}, {"x": 10, "y": 3},
{"label":"k42", "x":2, "y":4}, {"x": 11, "y": 3},
{"label":"k43", "x":3, "y":4},
{"label":"k44", "x":4, "y":4, "w":2}, {"x": 0, "y": 4},
{"label":"k46", "x":6, "y":4, "w":2}, {"x": 1, "y": 4},
{"label":"k48", "x":8, "y":4}, {"x": 2, "y": 4},
{"label":"k49", "x":9, "y":4}, {"x": 3, "y": 4},
{"label":"k4a", "x":10, "y":4}, {"x": 4, "y": 4, "w": 2},
{"label":"k4b", "x":11, "y":4} {"x": 6, "y": 4, "w": 2},
{"x": 8, "y": 4},
{"x": 9, "y": 4},
{"x": 10, "y": 4},
{"x": 11, "y": 4}
] ]
}, },
"LAYOUT_ortho_5x12": { "LAYOUT_ortho_5x12": {
"key_count": 60,
"layout": [ "layout": [
{"label":"k00", "x":0, "y":0}, {"x": 0, "y": 0},
{"label":"k01", "x":1, "y":0}, {"x": 1, "y": 0},
{"label":"k02", "x":2, "y":0}, {"x": 2, "y": 0},
{"label":"k03", "x":3, "y":0}, {"x": 3, "y": 0},
{"label":"k04", "x":4, "y":0}, {"x": 4, "y": 0},
{"label":"k05", "x":5, "y":0}, {"x": 5, "y": 0},
{"label":"k06", "x":6, "y":0}, {"x": 6, "y": 0},
{"label":"k07", "x":7, "y":0}, {"x": 7, "y": 0},
{"label":"k08", "x":8, "y":0}, {"x": 8, "y": 0},
{"label":"k09", "x":9, "y":0}, {"x": 9, "y": 0},
{"label":"k0a", "x":10, "y":0}, {"x": 10, "y": 0},
{"label":"k0b", "x":11, "y":0}, {"x": 11, "y": 0},
{"label":"k10", "x":0, "y":1},
{"label":"k11", "x":1, "y":1}, {"x": 0, "y": 1},
{"label":"k12", "x":2, "y":1}, {"x": 1, "y": 1},
{"label":"k13", "x":3, "y":1}, {"x": 2, "y": 1},
{"label":"k14", "x":4, "y":1}, {"x": 3, "y": 1},
{"label":"k15", "x":5, "y":1}, {"x": 4, "y": 1},
{"label":"k16", "x":6, "y":1}, {"x": 5, "y": 1},
{"label":"k17", "x":7, "y":1}, {"x": 6, "y": 1},
{"label":"k18", "x":8, "y":1}, {"x": 7, "y": 1},
{"label":"k19", "x":9, "y":1}, {"x": 8, "y": 1},
{"label":"k1a", "x":10, "y":1}, {"x": 9, "y": 1},
{"label":"k1b", "x":11, "y":1}, {"x": 10, "y": 1},
{"label":"k20", "x":0, "y":2}, {"x": 11, "y": 1},
{"label":"k21", "x":1, "y":2},
{"label":"k22", "x":2, "y":2}, {"x": 0, "y": 2},
{"label":"k23", "x":3, "y":2}, {"x": 1, "y": 2},
{"label":"k24", "x":4, "y":2}, {"x": 2, "y": 2},
{"label":"k25", "x":5, "y":2}, {"x": 3, "y": 2},
{"label":"k26", "x":6, "y":2}, {"x": 4, "y": 2},
{"label":"k27", "x":7, "y":2}, {"x": 5, "y": 2},
{"label":"k28", "x":8, "y":2}, {"x": 6, "y": 2},
{"label":"k29", "x":9, "y":2}, {"x": 7, "y": 2},
{"label":"k2a", "x":10, "y":2}, {"x": 8, "y": 2},
{"label":"k2b", "x":11, "y":2}, {"x": 9, "y": 2},
{"label":"k30", "x":0, "y":3}, {"x": 10, "y": 2},
{"label":"k31", "x":1, "y":3}, {"x": 11, "y": 2},
{"label":"k32", "x":2, "y":3},
{"label":"k33", "x":3, "y":3}, {"x": 0, "y": 3},
{"label":"k34", "x":4, "y":3}, {"x": 1, "y": 3},
{"label":"k35", "x":5, "y":3}, {"x": 2, "y": 3},
{"label":"k36", "x":6, "y":3}, {"x": 3, "y": 3},
{"label":"k37", "x":7, "y":3}, {"x": 4, "y": 3},
{"label":"k38", "x":8, "y":3}, {"x": 5, "y": 3},
{"label":"k39", "x":9, "y":3}, {"x": 6, "y": 3},
{"label":"k3a", "x":10, "y":3}, {"x": 7, "y": 3},
{"label":"k3b", "x":11, "y":3}, {"x": 8, "y": 3},
{"label":"k40", "x":0, "y":4}, {"x": 9, "y": 3},
{"label":"k41", "x":1, "y":4}, {"x": 10, "y": 3},
{"label":"k42", "x":2, "y":4}, {"x": 11, "y": 3},
{"label":"k43", "x":3, "y":4},
{"label":"k44", "x":4, "y":4}, {"x": 0, "y": 4},
{"label":"k45", "x":5, "y":4}, {"x": 1, "y": 4},
{"label":"k46", "x":6, "y":4}, {"x": 2, "y": 4},
{"label":"k47", "x":7, "y":4}, {"x": 3, "y": 4},
{"label":"k48", "x":8, "y":4}, {"x": 4, "y": 4},
{"label":"k49", "x":9, "y":4}, {"x": 5, "y": 4},
{"label":"k4a", "x":10, "y":4}, {"x": 6, "y": 4},
{"label":"k4b", "x":11, "y":4} {"x": 7, "y": 4},
{"x": 8, "y": 4},
{"x": 9, "y": 4},
{"x": 10, "y": 4},
{"x": 11, "y": 4}
] ]
} }
} }

21
keyboards/preonic/rev3/rev3.h
View File

@ -18,16 +18,13 @@
#include "preonic.h" #include "preonic.h"
#ifndef __AVR__ // Preonic rev. 3 and later
#define LAYOUT_preonic_1x2uC( \ #define LAYOUT_preonic_1x2uC( \
k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \ k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
k40, k41, k42, k43, k44, k45, k47, k48, k49, k4a, k4b \ k40, k41, k42, k43, k44, k45, k47, k48, k49, k4a, k4b \
) \ ) { \
{ \
{ k00, k01, k02, k03, k04, k05 }, \ { k00, k01, k02, k03, k04, k05 }, \
{ k10, k11, k12, k13, k14, k15 }, \ { k10, k11, k12, k13, k14, k15 }, \
{ k20, k21, k22, k23, k24, k25 }, \ { k20, k21, k22, k23, k24, k25 }, \
@ -46,8 +43,7 @@
k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \ k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
k40, k41, k42, k43, k44, k45, k47, k48, k49, k4a, k4b \ k40, k41, k42, k43, k44, k45, k47, k48, k49, k4a, k4b \
) \ ) { \
{ \
{ k00, k01, k02, k03, k04, k05 }, \ { k00, k01, k02, k03, k04, k05 }, \
{ k10, k11, k12, k13, k14, k15 }, \ { k10, k11, k12, k13, k14, k15 }, \
{ k20, k21, k22, k23, k24, k25 }, \ { k20, k21, k22, k23, k24, k25 }, \
@ -66,8 +62,7 @@
k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \ k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
k40, k41, k42, k43, k44, k46, k47, k48, k49, k4a, k4b \ k40, k41, k42, k43, k44, k46, k47, k48, k49, k4a, k4b \
) \ ) { \
{ \
{ k00, k01, k02, k03, k04, k05 }, \ { k00, k01, k02, k03, k04, k05 }, \
{ k10, k11, k12, k13, k14, k15 }, \ { k10, k11, k12, k13, k14, k15 }, \
{ k20, k21, k22, k23, k24, k25 }, \ { k20, k21, k22, k23, k24, k25 }, \
@ -86,8 +81,7 @@
k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \ k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
k40, k41, k42, k43, k44, k46, k48, k49, k4a, k4b \ k40, k41, k42, k43, k44, k46, k48, k49, k4a, k4b \
) \ ) { \
{ \
{ k00, k01, k02, k03, k04, k05 }, \ { k00, k01, k02, k03, k04, k05 }, \
{ k10, k11, k12, k13, k14, k15 }, \ { k10, k11, k12, k13, k14, k15 }, \
{ k20, k21, k22, k23, k24, k25 }, \ { k20, k21, k22, k23, k24, k25 }, \
@ -100,14 +94,13 @@
{ k46, k46, k48, k43, k44, k44 } \ { k46, k46, k48, k43, k44, k44 } \
} }
#define LAYOUT_preonic_grid( \ #define LAYOUT_ortho_5x12( \
k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \ k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b \ k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b \
) \ ) { \
{ \
{ k00, k01, k02, k03, k04, k05 }, \ { k00, k01, k02, k03, k04, k05 }, \
{ k10, k11, k12, k13, k14, k15 }, \ { k10, k11, k12, k13, k14, k15 }, \
{ k20, k21, k22, k23, k24, k25 }, \ { k20, k21, k22, k23, k24, k25 }, \
@ -119,5 +112,3 @@
{ k40, k41, k42, k49, k4a, k4b }, \ { k40, k41, k42, k49, k4a, k4b }, \
{ k46, k47, k48, k43, k44, k45 } \ { k46, k47, k48, k43, k44, k45 } \
} }
#endif