summaryrefslogtreecommitdiff
path: root/keyboards/chickenman
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/chickenman')
-rw-r--r--keyboards/chickenman/ciel/ciel.c17
-rw-r--r--keyboards/chickenman/ciel/ciel.h61
-rw-r--r--keyboards/chickenman/ciel/config.h17
-rw-r--r--keyboards/chickenman/ciel/info.json377
-rw-r--r--keyboards/chickenman/ciel65/info.json6
5 files changed, 195 insertions, 283 deletions
diff --git a/keyboards/chickenman/ciel/ciel.c b/keyboards/chickenman/ciel/ciel.c
deleted file mode 100644
index de8302bfb4..0000000000
--- a/keyboards/chickenman/ciel/ciel.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Koichi Katano
- *
- * 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/>.
- */
-
-#include "ciel.h"
diff --git a/keyboards/chickenman/ciel/ciel.h b/keyboards/chickenman/ciel/ciel.h
deleted file mode 100644
index 0f898f97c8..0000000000
--- a/keyboards/chickenman/ciel/ciel.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* Copyright 2020 Koichi Katano
- *
- * 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_60_ansi_split_bs_rshift( \
- k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, \
- k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k114, \
- k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k213, \
- k300, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k313, k314, \
- k400, k401, k402, k407, k410, k411, k413, k414 \
-) { \
- { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014 }, \
- { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, KC_NO, k114 }, \
- { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, KC_NO, k213, KC_NO}, \
- { k300, KC_NO, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, KC_NO, k313, k314 }, \
- { k400, k401, k402, KC_NO, KC_NO, KC_NO, KC_NO, k407, KC_NO, KC_NO, k410, k411, KC_NO, k413, k414 } \
-}
-
-#define LAYOUT_60_ansi( \
- k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, \
- k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k114, \
- k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k213, \
- k300, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k313, \
- k400, k401, k402, k407, k410, k411, k413, k414 \
-) { \
- { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, KC_NO}, \
- { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, KC_NO, k114 }, \
- { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, KC_NO, k213, KC_NO}, \
- { k300, KC_NO, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, KC_NO, k313, KC_NO}, \
- { k400, k401, k402, KC_NO, KC_NO, KC_NO, KC_NO, k407, KC_NO, KC_NO, k410, k411, KC_NO, k413, k414 } \
-}
-
-#define LAYOUT_60_tsangan_hhkb( \
- k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, \
- k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k114, \
- k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k213, \
- k300, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k313, k314, \
- k400, k401, k402, k407, k411, k413, k414 \
-) { \
- { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014 }, \
- { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, KC_NO, k114 }, \
- { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, KC_NO, k213, KC_NO}, \
- { k300, KC_NO, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, KC_NO, k313, k314 }, \
- { k400, k401, k402, KC_NO, KC_NO, KC_NO, KC_NO, k407, KC_NO, KC_NO, KC_NO, k411, KC_NO, k413, k414 } \
-}
diff --git a/keyboards/chickenman/ciel/config.h b/keyboards/chickenman/ciel/config.h
index c2cae71086..2a4bb26963 100644
--- a/keyboards/chickenman/ciel/config.h
+++ b/keyboards/chickenman/ciel/config.h
@@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { C5, C4, B0, C7, B7 }
-#define MATRIX_COL_PINS { C6, B6, B5, B4, B3, B2, B1, D6, D5, D4, D3, D2, D1, D0, C2 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
diff --git a/keyboards/chickenman/ciel/info.json b/keyboards/chickenman/ciel/info.json
index b6a4f5e8f7..1dc9812187 100644
--- a/keyboards/chickenman/ciel/info.json
+++ b/keyboards/chickenman/ciel/info.json
@@ -8,218 +8,223 @@
"pid": "0x0001",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["C6", "B6", "B5", "B4", "B3", "B2", "B1", "D6", "D5", "D4", "D3", "D2", "D1", "D0", "C2"],
+ "rows": ["C5", "C4", "B0", "C7", "B7"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u2",
"bootloader": "atmel-dfu",
"community_layouts": ["60_ansi_split_bs_rshift", "60_ansi", "60_tsangan_hhkb"],
"layouts": {
"LAYOUT_60_ansi_split_bs_rshift": {
"layout": [
- { "x":0, "y":0 },
- { "x":1, "y":0 },
- { "x":2, "y":0 },
- { "x":3, "y":0 },
- { "x":4, "y":0 },
- { "x":5, "y":0 },
- { "x":6, "y":0 },
- { "x":7, "y":0 },
- { "x":8, "y":0 },
- { "x":9, "y":0 },
- { "x":10, "y":0 },
- { "x":11, "y":0 },
- { "x":12, "y":0 },
- { "x":13, "y":0 },
- { "x":14, "y":0 },
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
- { "x":0, "y":1, "w":1.5 },
- { "x":1.5, "y":1 },
- { "x":2.5, "y":1 },
- { "x":3.5, "y":1 },
- { "x":4.5, "y":1 },
- { "x":5.5, "y":1 },
- { "x":6.5, "y":1 },
- { "x":7.5, "y":1 },
- { "x":8.5, "y":1 },
- { "x":9.5, "y":1 },
- { "x":10.5, "y":1 },
- { "x":11.5, "y":1 },
- { "x":12.5, "y":1 },
- { "x":13.5, "y":1, "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": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
- { "x":0, "y":2, "w":1.75 },
- { "x":1.75, "y":2 },
- { "x":2.75, "y":2 },
- { "x":3.75, "y":2 },
- { "x":4.75, "y":2 },
- { "x":5.75, "y":2 },
- { "x":6.75, "y":2 },
- { "x":7.75, "y":2 },
- { "x":8.75, "y":2 },
- { "x":9.75, "y":2 },
- { "x":10.75, "y":2 },
- { "x":11.75, "y":2 },
- { "x":12.75, "y":2, "w":2.25 },
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
- { "x":0, "y":3, "w":2.25 },
- { "x":2.25, "y":3 },
- { "x":3.25, "y":3 },
- { "x":4.25, "y":3 },
- { "x":5.25, "y":3 },
- { "x":6.25, "y":3 },
- { "x":7.25, "y":3 },
- { "x":8.25, "y":3 },
- { "x":9.25, "y":3 },
- { "x":10.25, "y":3 },
- { "x":11.25, "y":3 },
- { "x":12.25, "y":3, "w":1.75 },
- { "x":14, "y":3 },
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 14, "y": 3},
- { "x":0, "y":4, "w":1.25 },
- { "x":1.25, "y":4, "w":1.25 },
- { "x":2.5, "y":4, "w":1.25 },
- { "x":3.75, "y":4, "w":6.25 },
- { "x":10, "y":4, "w":1.25 },
- { "x":11.25, "y":4, "w":1.25 },
- { "x":12.5, "y":4, "w":1.25 },
- { "x":13.75, "y":4, "w":1.25 }
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
]
},
"LAYOUT_60_ansi": {
"layout": [
- { "x":0, "y":0 },
- { "x":1, "y":0 },
- { "x":2, "y":0 },
- { "x":3, "y":0 },
- { "x":4, "y":0 },
- { "x":5, "y":0 },
- { "x":6, "y":0 },
- { "x":7, "y":0 },
- { "x":8, "y":0 },
- { "x":9, "y":0 },
- { "x":10, "y":0 },
- { "x":11, "y":0 },
- { "x":12, "y":0 },
- { "x":13, "y":0, "w":2 },
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
- { "x":0, "y":1, "w":1.5 },
- { "x":1.5, "y":1 },
- { "x":2.5, "y":1 },
- { "x":3.5, "y":1 },
- { "x":4.5, "y":1 },
- { "x":5.5, "y":1 },
- { "x":6.5, "y":1 },
- { "x":7.5, "y":1 },
- { "x":8.5, "y":1 },
- { "x":9.5, "y":1 },
- { "x":10.5, "y":1 },
- { "x":11.5, "y":1 },
- { "x":12.5, "y":1 },
- { "x":13.5, "y":1, "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": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
- { "x":0, "y":2, "w":1.75 },
- { "x":1.75, "y":2 },
- { "x":2.75, "y":2 },
- { "x":3.75, "y":2 },
- { "x":4.75, "y":2 },
- { "x":5.75, "y":2 },
- { "x":6.75, "y":2 },
- { "x":7.75, "y":2 },
- { "x":8.75, "y":2 },
- { "x":9.75, "y":2 },
- { "x":10.75, "y":2 },
- { "x":11.75, "y":2 },
- { "x":12.75, "y":2, "w":2.25 },
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
- { "x":0, "y":3, "w":2.25 },
- { "x":2.25, "y":3 },
- { "x":3.25, "y":3 },
- { "x":4.25, "y":3 },
- { "x":5.25, "y":3 },
- { "x":6.25, "y":3 },
- { "x":7.25, "y":3 },
- { "x":8.25, "y":3 },
- { "x":9.25, "y":3 },
- { "x":10.25, "y":3 },
- { "x":11.25, "y":3 },
- { "x":12.25, "y":3, "w":2.75 },
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
- { "x":0, "y":4, "w":1.25 },
- { "x":1.25, "y":4, "w":1.25 },
- { "x":2.5, "y":4, "w":1.25 },
- { "x":3.75, "y":4, "w":6.25 },
- { "x":10, "y":4, "w":1.25 },
- { "x":11.25, "y":4, "w":1.25 },
- { "x":12.5, "y":4, "w":1.25 },
- { "x":13.75, "y":4, "w":1.25 }
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
]
},
"LAYOUT_60_tsangan_hhkb": {
"layout": [
- { "x":0, "y":0 },
- { "x":1, "y":0 },
- { "x":2, "y":0 },
- { "x":3, "y":0 },
- { "x":4, "y":0 },
- { "x":5, "y":0 },
- { "x":6, "y":0 },
- { "x":7, "y":0 },
- { "x":8, "y":0 },
- { "x":9, "y":0 },
- { "x":10, "y":0 },
- { "x":11, "y":0 },
- { "x":12, "y":0 },
- { "x":13, "y":0 },
- { "x":14, "y":0 },
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
- { "x":0, "y":1, "w":1.5 },
- { "x":1.5, "y":1 },
- { "x":2.5, "y":1 },
- { "x":3.5, "y":1 },
- { "x":4.5, "y":1 },
- { "x":5.5, "y":1 },
- { "x":6.5, "y":1 },
- { "x":7.5, "y":1 },
- { "x":8.5, "y":1 },
- { "x":9.5, "y":1 },
- { "x":10.5, "y":1 },
- { "x":11.5, "y":1 },
- { "x":12.5, "y":1 },
- { "x":13.5, "y":1, "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": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
- { "x":0, "y":2, "w":1.75 },
- { "x":1.75, "y":2 },
- { "x":2.75, "y":2 },
- { "x":3.75, "y":2 },
- { "x":4.75, "y":2 },
- { "x":5.75, "y":2 },
- { "x":6.75, "y":2 },
- { "x":7.75, "y":2 },
- { "x":8.75, "y":2 },
- { "x":9.75, "y":2 },
- { "x":10.75, "y":2 },
- { "x":11.75, "y":2 },
- { "x":12.75, "y":2, "w":2.25 },
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
- { "x":0, "y":3, "w":2.25 },
- { "x":2.25, "y":3 },
- { "x":3.25, "y":3 },
- { "x":4.25, "y":3 },
- { "x":5.25, "y":3 },
- { "x":6.25, "y":3 },
- { "x":7.25, "y":3 },
- { "x":8.25, "y":3 },
- { "x":9.25, "y":3 },
- { "x":10.25, "y":3 },
- { "x":11.25, "y":3 },
- { "x":12.25, "y":3, "w":1.75 },
- { "x":14, "y":3 },
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 14, "y": 3},
- { "x":0, "y":4, "w":1.5 },
- { "x":1.5, "y":4 },
- { "x":2.5, "y":4, "w":1.5 },
- { "x":4, "y":4, "w":7 },
- { "x":11, "y":4, "w":1.5 },
- { "x":12.5, "y":4 },
- { "x":13.5, "y":4, "w":1.5 }
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+ {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [4, 13], "x": 12.5, "y": 4},
+ {"matrix": [4, 14], "x": 13.5, "y": 4, "w": 1.5}
]
}
}
diff --git a/keyboards/chickenman/ciel65/info.json b/keyboards/chickenman/ciel65/info.json
index 648a60e030..7657812179 100644
--- a/keyboards/chickenman/ciel65/info.json
+++ b/keyboards/chickenman/ciel65/info.json
@@ -28,7 +28,6 @@
"key_lock": false
},
"rgblight": {
- "pin": "F0",
"led_count": 14,
"hue_steps": 8,
"saturation_steps": 8,
@@ -48,6 +47,9 @@
"twinkle": true
}
},
+ "ws2812": {
+ "pin": "F0"
+ },
"layouts": {
"LAYOUT": {
"layout": [
@@ -121,5 +123,5 @@
{"label": "K4F (F5,D0)", "matrix": [4, 15], "x": 15, "y": 4}
]
}
- },
+ }
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 11:43:34 +0000