diff options
Diffstat (limited to 'keyboards/kbdfans/maja_soldered')
-rw-r--r-- | keyboards/kbdfans/maja_soldered/info.json | 150 | ||||
-rwxr-xr-x | keyboards/kbdfans/maja_soldered/maja_soldered.c | 2 | ||||
-rwxr-xr-x | keyboards/kbdfans/maja_soldered/maja_soldered.h | 19 |
3 files changed, 83 insertions, 88 deletions
diff --git a/keyboards/kbdfans/maja_soldered/info.json b/keyboards/kbdfans/maja_soldered/info.json index b4bc430b3f..197f26870b 100644 --- a/keyboards/kbdfans/maja_soldered/info.json +++ b/keyboards/kbdfans/maja_soldered/info.json @@ -22,74 +22,88 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0.75, "y": 0.25}, - {"x": 1.75, "y": 0.25}, - {"x": 2.75, "y": 0}, - {"x": 3.75, "y": 0.25}, - {"x": 4.75, "y": 0.25}, - {"x": 5.75, "y": 0.25}, - {"x": 6.75, "y": 0.25}, - {"x": 8.75, "y": 0.25}, - {"x": 9.75, "y": 0.25}, - {"x": 10.75, "y": 0.25}, - {"x": 11.75, "y": 0.25}, - {"x": 12.75, "y": 0}, - {"x": 13.75, "y": 0.25}, - {"x": 14.75, "y": 0.25}, - {"x": 15.75, "y": 0.25}, - {"x": 17.75, "y": 0.25}, - {"x": 0.5, "y": 1.25, "w": 1.5}, - {"x": 2, "y": 1.25}, - {"x": 3, "y": 1.25}, - {"x": 4, "y": 1.25}, - {"x": 5, "y": 1.25}, - {"x": 6, "y": 1.25}, - {"x": 8.5, "y": 1.25}, - {"x": 9.5, "y": 1.25}, - {"x": 10.5, "y": 1.25}, - {"x": 11.5, "y": 1.25}, - {"x": 12.5, "y": 1.25}, - {"x": 13.5, "y": 1.25}, - {"x": 14.5, "y": 1.25}, - {"x": 15.5, "y": 1.25, "w": 1.5}, - {"x": 17.75, "y": 1.25}, - {"x": 0.25, "y": 2.25, "w": 1.75}, - {"x": 2, "y": 2.25}, - {"x": 3, "y": 2.25}, - {"x": 4, "y": 2.25}, - {"x": 5, "y": 2.25}, - {"x": 6, "y": 2.25}, - {"x": 9, "y": 2.25}, - {"x": 10, "y": 2.25}, - {"x": 11, "y": 2.25}, - {"x": 12, "y": 2.25}, - {"x": 13, "y": 2.25}, - {"x": 14, "y": 2.25}, - {"x": 15, "y": 2.25, "w": 2.25}, - {"x": 17.75, "y": 2.25}, - {"x": 0, "y": 3.25, "w": 2.25}, - {"x": 2.25, "y": 3.25}, - {"x": 3.25, "y": 3.25}, - {"x": 4.25, "y": 3.25}, - {"x": 5.25, "y": 3.25}, - {"x": 6.25, "y": 3.25}, - {"x": 8.25, "y": 3.25}, - {"x": 9.25, "y": 3.25}, - {"x": 10.25, "y": 3.25}, - {"x": 11.25, "y": 3.25}, - {"x": 12.25, "y": 3.25}, - {"x": 13.25, "y": 3.25}, - {"x": 14.25, "y": 3.25, "w": 2.25}, - {"x": 16.75, "y": 3.5}, - {"x": 0, "y": 4.25, "w": 1.5}, - {"x": 3, "y": 4.25, "w": 1.5}, - {"x": 4.5, "y": 4.25, "w": 2}, - {"x": 6.5, "y": 4.25, "w": 1.25}, - {"x": 8.25, "y": 4.25, "w": 2.75}, - {"x": 11, "y": 4.25, "w": 1.5}, - {"x": 15.75, "y": 4.5}, - {"x": 16.75, "y": 4.5}, - {"x": 17.75, "y": 4.5} + {"matrix": [0, 0], "x": 0.75, "y": 0.25}, + {"matrix": [0, 1], "x": 1.75, "y": 0.25}, + {"matrix": [0, 2], "x": 2.75, "y": 0}, + {"matrix": [0, 3], "x": 3.75, "y": 0.25}, + {"matrix": [0, 4], "x": 4.75, "y": 0.25}, + {"matrix": [0, 5], "x": 5.75, "y": 0.25}, + {"matrix": [0, 6], "x": 6.75, "y": 0.25}, + + {"matrix": [0, 7], "x": 8.75, "y": 0.25}, + {"matrix": [0, 8], "x": 9.75, "y": 0.25}, + {"matrix": [0, 9], "x": 10.75, "y": 0.25}, + {"matrix": [0, 10], "x": 11.75, "y": 0.25}, + {"matrix": [0, 11], "x": 12.75, "y": 0}, + {"matrix": [0, 12], "x": 13.75, "y": 0.25}, + {"matrix": [0, 13], "x": 14.75, "y": 0.25}, + {"matrix": [3, 14], "x": 15.75, "y": 0.25}, + + {"matrix": [0, 14], "x": 17.75, "y": 0.25}, + + {"matrix": [1, 0], "x": 0.5, "y": 1.25, "w": 1.5}, + {"matrix": [1, 1], "x": 2, "y": 1.25}, + {"matrix": [1, 2], "x": 3, "y": 1.25}, + {"matrix": [1, 3], "x": 4, "y": 1.25}, + {"matrix": [1, 4], "x": 5, "y": 1.25}, + {"matrix": [1, 5], "x": 6, "y": 1.25}, + + {"matrix": [1, 6], "x": 8.5, "y": 1.25}, + {"matrix": [1, 7], "x": 9.5, "y": 1.25}, + {"matrix": [1, 8], "x": 10.5, "y": 1.25}, + {"matrix": [1, 9], "x": 11.5, "y": 1.25}, + {"matrix": [1, 10], "x": 12.5, "y": 1.25}, + {"matrix": [1, 11], "x": 13.5, "y": 1.25}, + {"matrix": [1, 12], "x": 14.5, "y": 1.25}, + {"matrix": [1, 13], "x": 15.5, "y": 1.25, "w": 1.5}, + + {"matrix": [1, 14], "x": 17.75, "y": 1.25}, + + {"matrix": [2, 0], "x": 0.25, "y": 2.25, "w": 1.75}, + {"matrix": [2, 1], "x": 2, "y": 2.25}, + {"matrix": [2, 2], "x": 3, "y": 2.25}, + {"matrix": [2, 3], "x": 4, "y": 2.25}, + {"matrix": [2, 4], "x": 5, "y": 2.25}, + {"matrix": [2, 5], "x": 6, "y": 2.25}, + + {"matrix": [2, 6], "x": 9, "y": 2.25}, + {"matrix": [2, 7], "x": 10, "y": 2.25}, + {"matrix": [2, 8], "x": 11, "y": 2.25}, + {"matrix": [2, 9], "x": 12, "y": 2.25}, + {"matrix": [2, 10], "x": 13, "y": 2.25}, + {"matrix": [2, 11], "x": 14, "y": 2.25}, + {"matrix": [2, 13], "x": 15, "y": 2.25, "w": 2.25}, + + {"matrix": [2, 14], "x": 17.75, "y": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3.25}, + {"matrix": [3, 2], "x": 3.25, "y": 3.25}, + {"matrix": [3, 3], "x": 4.25, "y": 3.25}, + {"matrix": [3, 4], "x": 5.25, "y": 3.25}, + {"matrix": [3, 5], "x": 6.25, "y": 3.25}, + + {"matrix": [3, 6], "x": 8.25, "y": 3.25}, + {"matrix": [3, 7], "x": 9.25, "y": 3.25}, + {"matrix": [3, 8], "x": 10.25, "y": 3.25}, + {"matrix": [3, 9], "x": 11.25, "y": 3.25}, + {"matrix": [3, 10], "x": 12.25, "y": 3.25}, + {"matrix": [3, 11], "x": 13.25, "y": 3.25}, + {"matrix": [3, 12], "x": 14.25, "y": 3.25, "w": 2.25}, + + {"matrix": [3, 13], "x": 16.75, "y": 3.5}, + + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.5}, + {"matrix": [4, 2], "x": 3, "y": 4.25, "w": 1.5}, + {"matrix": [4, 3], "x": 4.5, "y": 4.25, "w": 2}, + {"matrix": [4, 5], "x": 6.5, "y": 4.25, "w": 1.25}, + + {"matrix": [4, 7], "x": 8.25, "y": 4.25, "w": 2.75}, + {"matrix": [4, 9], "x": 11, "y": 4.25, "w": 1.5}, + + {"matrix": [4, 12], "x": 15.75, "y": 4.5}, + {"matrix": [4, 13], "x": 16.75, "y": 4.5}, + {"matrix": [4, 14], "x": 17.75, "y": 4.5} ] } } diff --git a/keyboards/kbdfans/maja_soldered/maja_soldered.c b/keyboards/kbdfans/maja_soldered/maja_soldered.c index 1f0f48c4cd..c774027780 100755 --- a/keyboards/kbdfans/maja_soldered/maja_soldered.c +++ b/keyboards/kbdfans/maja_soldered/maja_soldered.c @@ -13,7 +13,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 "maja_soldered.h" +#include "quantum.h" void matrix_init_kb(void) { setPinOutput(D4); diff --git a/keyboards/kbdfans/maja_soldered/maja_soldered.h b/keyboards/kbdfans/maja_soldered/maja_soldered.h deleted file mode 100755 index 4834c2b74f..0000000000 --- a/keyboards/kbdfans/maja_soldered/maja_soldered.h +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K3E, K0E, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K2E, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \ - K40, K42, K43, K45, K47, K49, K4C, K4D, K4E \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D, K2E }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \ - { K40, XXX, K42, K43, XXX, K45, XXX, K47, XXX, K49, XXX, XXX, K4C, K4D, K4E } \ -} |