summaryrefslogtreecommitdiff
path: root/keyboards/yosino58
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/yosino58')
-rw-r--r--keyboards/yosino58/lib/host_led_state_reader.c1
-rw-r--r--keyboards/yosino58/lib/keylogger.c1
-rw-r--r--keyboards/yosino58/lib/layer_state_reader.c3
-rw-r--r--keyboards/yosino58/lib/logo_reader.c2
-rw-r--r--keyboards/yosino58/lib/mode_icon_reader.c1
-rw-r--r--keyboards/yosino58/lib/rgb_state_reader.c2
-rw-r--r--keyboards/yosino58/lib/timelogger.c1
-rw-r--r--keyboards/yosino58/rev1/config.h7
-rw-r--r--keyboards/yosino58/rev1/info.json84
-rw-r--r--keyboards/yosino58/rev1/rev1.c1
-rw-r--r--keyboards/yosino58/rev1/rev1.h23
-rw-r--r--keyboards/yosino58/yosino58.c1
-rw-r--r--keyboards/yosino58/yosino58.h5
13 files changed, 81 insertions, 51 deletions
diff --git a/keyboards/yosino58/lib/host_led_state_reader.c b/keyboards/yosino58/lib/host_led_state_reader.c
index 2a17e0a33b..abcfefffb4 100644
--- a/keyboards/yosino58/lib/host_led_state_reader.c
+++ b/keyboards/yosino58/lib/host_led_state_reader.c
@@ -1,5 +1,4 @@
#include <stdio.h>
-#include "yosino58.h"
char host_led_state_str[24];
diff --git a/keyboards/yosino58/lib/keylogger.c b/keyboards/yosino58/lib/keylogger.c
index c50de94c20..dc9c21406f 100644
--- a/keyboards/yosino58/lib/keylogger.c
+++ b/keyboards/yosino58/lib/keylogger.c
@@ -1,5 +1,4 @@
#include <stdio.h>
-#include "yosino58.h"
char keylog_str[24] = {};
char keylogs_str[21] = {};
diff --git a/keyboards/yosino58/lib/layer_state_reader.c b/keyboards/yosino58/lib/layer_state_reader.c
index 7e5747cb75..f9cd934568 100644
--- a/keyboards/yosino58/lib/layer_state_reader.c
+++ b/keyboards/yosino58/lib/layer_state_reader.c
@@ -1,7 +1,6 @@
-#include QMK_KEYBOARD_H
+#include "quantum.h"
#include <stdio.h>
-#include "yosino58.h"
#define L_BASE 0
#define L_LOWER 8
diff --git a/keyboards/yosino58/lib/logo_reader.c b/keyboards/yosino58/lib/logo_reader.c
index 96c9b897ef..b340979807 100644
--- a/keyboards/yosino58/lib/logo_reader.c
+++ b/keyboards/yosino58/lib/logo_reader.c
@@ -1,5 +1,3 @@
-#include "yosino58.h"
-
const char *read_logo(void) {
static char logo[] = {
0x2B,0x2C,0x2D,0x2E,0x2F,0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F,
diff --git a/keyboards/yosino58/lib/mode_icon_reader.c b/keyboards/yosino58/lib/mode_icon_reader.c
index 865d9537de..9dadd6ac86 100644
--- a/keyboards/yosino58/lib/mode_icon_reader.c
+++ b/keyboards/yosino58/lib/mode_icon_reader.c
@@ -1,5 +1,4 @@
#include <stdio.h>
-#include "yosino58.h"
char mode_icon[24];
diff --git a/keyboards/yosino58/lib/rgb_state_reader.c b/keyboards/yosino58/lib/rgb_state_reader.c
index e0efe2e528..daa008d849 100644
--- a/keyboards/yosino58/lib/rgb_state_reader.c
+++ b/keyboards/yosino58/lib/rgb_state_reader.c
@@ -1,6 +1,6 @@
#ifdef RGBLIGHT_ENABLE
-#include QMK_KEYBOARD_H
+#include "quantum.h"
#include <stdio.h>
extern rgblight_config_t rgblight_config;
diff --git a/keyboards/yosino58/lib/timelogger.c b/keyboards/yosino58/lib/timelogger.c
index ce8b0c270f..db75d77fac 100644
--- a/keyboards/yosino58/lib/timelogger.c
+++ b/keyboards/yosino58/lib/timelogger.c
@@ -1,5 +1,4 @@
#include <stdio.h>
-#include "yosino58.h"
char timelog_str[24] = {};
int last_time = 0;
diff --git a/keyboards/yosino58/rev1/config.h b/keyboards/yosino58/rev1/config.h
index 39c7907b48..4930c35c60 100644
--- a/keyboards/yosino58/rev1/config.h
+++ b/keyboards/yosino58/rev1/config.h
@@ -18,14 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 }
-#define DIODE_DIRECTION COL2ROW
-
/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
#define RGBLED_NUM 12 // Number of LEDs
/*
diff --git a/keyboards/yosino58/rev1/info.json b/keyboards/yosino58/rev1/info.json
index baf43c47a5..40ceef8705 100644
--- a/keyboards/yosino58/rev1/info.json
+++ b/keyboards/yosino58/rev1/info.json
@@ -8,19 +8,93 @@
"pid": "0x01B8",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "B1", "B3"],
+ "rows": ["D4", "C6", "D7", "E6", "B4"]
+ },
+ "diode_direction": "COL2ROW",
"split": {
"soft_serial_pin": "D2"
},
+ "ws2812": {
+ "pin": "D3"
+ },
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
"LAYOUT": {
"layout": [
- {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":0.25}, {"x":3, "y":0}, {"x":4, "y":0.25}, {"x":5, "y":0.5}, {"x":10.75, "y":0.5}, {"x":11.75, "y":0.25}, {"x":12.75, "y":0}, {"x":13.75, "y":0.25}, {"x":14.75, "y":1}, {"x":15.75, "y":1},
- {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":1.25}, {"x":3, "y":1}, {"x":4, "y":1.25}, {"x":5, "y":1.5}, {"x":10.75, "y":1.5}, {"x":11.75, "y":1.25}, {"x":12.75, "y":1}, {"x":13.75, "y":1.25}, {"x":14.75, "y":2}, {"x":15.75, "y":2},
- {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":2.25}, {"x":3, "y":2}, {"x":4, "y":2.25}, {"x":5, "y":2.5}, {"x":10.75, "y":2.5}, {"x":11.75, "y":2.25}, {"x":12.75, "y":2}, {"x":13.75, "y":2.25}, {"x":14.75, "y":3}, {"x":15.75, "y":3},
- {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":3.25}, {"x":3, "y":3}, {"x":4, "y":3.25}, {"x":5, "y":3.5}, {"x":6.5, "y":4.25}, {"x":7.5, "y":4.25, "h":2}, {"x":8.5, "y":4.25, "h":2}, {"x":9.5, "y":4.25}, {"x":10.75, "y":3.5}, {"x":11.75, "y":3.25}, {"x":12.75, "y":3}, {"x":13.75, "y":3.25}, {"x":14.75, "y":4}, {"x":15.75, "y":4},
- {"x":3.75, "y":4.25}, {"x":4.75, "y":4.5}, {"x":6.5, "y":5.25}, {"x":9.5, "y":5.25}, {"x":11, "y":4.5}, {"x":12, "y":4.25}
+ {"matrix": [0, 0], "x": 0, "y": 1},
+ {"matrix": [0, 1], "x": 1, "y": 1},
+ {"matrix": [0, 2], "x": 2, "y": 0.25},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0.25},
+ {"matrix": [0, 5], "x": 5, "y": 0.5},
+
+ {"matrix": [5, 5], "x": 10.75, "y": 0.5},
+ {"matrix": [5, 4], "x": 11.75, "y": 0.25},
+ {"matrix": [5, 3], "x": 12.75, "y": 0},
+ {"matrix": [5, 2], "x": 13.75, "y": 0.25},
+ {"matrix": [5, 1], "x": 14.75, "y": 1},
+ {"matrix": [5, 0], "x": 15.75, "y": 1},
+
+ {"matrix": [1, 0], "x": 0, "y": 2},
+ {"matrix": [1, 1], "x": 1, "y": 2},
+ {"matrix": [1, 2], "x": 2, "y": 1.25},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1.25},
+ {"matrix": [1, 5], "x": 5, "y": 1.5},
+
+ {"matrix": [6, 5], "x": 10.75, "y": 1.5},
+ {"matrix": [6, 4], "x": 11.75, "y": 1.25},
+ {"matrix": [6, 3], "x": 12.75, "y": 1},
+ {"matrix": [6, 2], "x": 13.75, "y": 1.25},
+ {"matrix": [6, 1], "x": 14.75, "y": 2},
+ {"matrix": [6, 0], "x": 15.75, "y": 2},
+
+ {"matrix": [2, 0], "x": 0, "y": 3},
+ {"matrix": [2, 1], "x": 1, "y": 3},
+ {"matrix": [2, 2], "x": 2, "y": 2.25},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2.25},
+ {"matrix": [2, 5], "x": 5, "y": 2.5},
+
+ {"matrix": [7, 5], "x": 10.75, "y": 2.5},
+ {"matrix": [7, 4], "x": 11.75, "y": 2.25},
+ {"matrix": [7, 3], "x": 12.75, "y": 2},
+ {"matrix": [7, 2], "x": 13.75, "y": 2.25},
+ {"matrix": [7, 1], "x": 14.75, "y": 3},
+ {"matrix": [7, 0], "x": 15.75, "y": 3},
+
+ {"matrix": [3, 0], "x": 0, "y": 4},
+ {"matrix": [3, 1], "x": 1, "y": 4},
+ {"matrix": [3, 2], "x": 2, "y": 3.25},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3.25},
+ {"matrix": [3, 5], "x": 5, "y": 3.5},
+
+ {"matrix": [4, 4], "x": 6.5, "y": 4.25},
+ {"matrix": [4, 5], "x": 7.5, "y": 4.25, "h": 2},
+
+ {"matrix": [9, 5], "x": 8.5, "y": 4.25, "h": 2},
+ {"matrix": [9, 4], "x": 9.5, "y": 4.25},
+
+ {"matrix": [8, 5], "x": 10.75, "y": 3.5},
+ {"matrix": [8, 4], "x": 11.75, "y": 3.25},
+ {"matrix": [8, 3], "x": 12.75, "y": 3},
+ {"matrix": [8, 2], "x": 13.75, "y": 3.25},
+ {"matrix": [8, 1], "x": 14.75, "y": 4},
+ {"matrix": [8, 0], "x": 15.75, "y": 4},
+
+ {"matrix": [4, 1], "x": 3.75, "y": 4.25},
+ {"matrix": [4, 2], "x": 4.75, "y": 4.5},
+
+ {"matrix": [4, 3], "x": 6.5, "y": 5.25},
+
+ {"matrix": [9, 3], "x": 9.5, "y": 5.25},
+
+ {"matrix": [9, 2], "x": 11, "y": 4.5},
+ {"matrix": [9, 1], "x": 12, "y": 4.25}
]
}
}
diff --git a/keyboards/yosino58/rev1/rev1.c b/keyboards/yosino58/rev1/rev1.c
deleted file mode 100644
index 45534122b3..0000000000
--- a/keyboards/yosino58/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "yosino58.h"
diff --git a/keyboards/yosino58/rev1/rev1.h b/keyboards/yosino58/rev1/rev1.h
deleted file mode 100644
index c643c9d729..0000000000
--- a/keyboards/yosino58/rev1/rev1.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
- L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
- L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
- L30, L31, L32, L33, L34, L35, LT4, LT5, RT5, RT4, R30, R31, R32, R33, R34, R35, \
- LT1, LT2, LT3, RT3, RT2, RT1 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05 }, \
- { L10, L11, L12, L13, L14, L15 }, \
- { L20, L21, L22, L23, L24, L25 }, \
- { L30, L31, L32, L33, L34, L35 }, \
- { KC_NO, LT1, LT2, LT3, LT4, LT5 }, \
- { R05, R04, R03, R02, R01, R00 }, \
- { R15, R14, R13, R12, R11, R10 }, \
- { R25, R24, R23, R22, R21, R20 }, \
- { R35, R34, R33, R32, R31, R30 }, \
- { KC_NO, RT1,RT2, RT3, RT4, RT5 }, \
- }
diff --git a/keyboards/yosino58/yosino58.c b/keyboards/yosino58/yosino58.c
deleted file mode 100644
index 85545f3f44..0000000000
--- a/keyboards/yosino58/yosino58.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "yosino58.h" \ No newline at end of file
diff --git a/keyboards/yosino58/yosino58.h b/keyboards/yosino58/yosino58.h
deleted file mode 100644
index 5414c31bd8..0000000000
--- a/keyboards/yosino58/yosino58.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma once
-
-#ifdef KEYBOARD_yosino58_rev1
- #include "rev1.h"
-#endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-02 16:17:24 +0000