847257c3c757c475eb9f47493252cc55b0e08f51
- Author
- Cipulot <40441626+Cipulot@users.noreply.github.com>
- Committer
- GitHub <noreply@github.com>
- Date
Message
Diff
This diff is truncated to protect this page.
1diff --git a/keyboards/cipulot/ec_tkl_x/config.h b/keyboards/cipulot/ec_tkl_x/config.h
2new file mode 100644
3index 0000000000000000000000000000000000000000..04d19a5f54eff05881eab7e3a57d06a8775a7efe
4--- /dev/null
5+++ b/keyboards/cipulot/ec_tkl_x/config.h
6@@ -0,0 +1,68 @@
7+/* Copyright 2024 Cipulot
8+ *
9+ * This program is free software: you can redistribute it and/or modify
10+ * it under the terms of the GNU General Public License as published by
11+ * the Free Software Foundation, either version 3 of the License, or
12+ * (at your option) any later version.
13+ *
14+ * This program is distributed in the hope that it will be useful,
15+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
16+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17+ * GNU General Public License for more details.
18+ *
19+ * You should have received a copy of the GNU General Public License
20+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
21+ */
22+
23+#pragma once
24+
25+#define MATRIX_ROWS 6
26+#define MATRIX_COLS 18
27+
28+#define UNUSED_POSITIONS_LIST { {0, 13}, {3, 14}, {3, 15}, {3, 16}, {3, 17}, {4, 15}, {4, 17}, {5, 3}, {5, 5}, {5, 7}, {5, 10}, {5, 15} }
29+
30+#define MATRIX_ROW_PINS {A15, B5, B12, B10, B6, B7}
31+
32+#define AMUX_COUNT 2
33+#define AMUX_MAX_COLS_COUNT 15
34+
35+#define AMUX_EN_PINS {B13, A10}
36+
37+#define AMUX_SEL_PINS {A8, A9, B14, B15}
38+
39+#define AMUX_COL_CHANNELS_SIZES {15, 3}
40+
41+#define AMUX_0_COL_CHANNELS {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14}
42+
43+#define AMUX_1_COL_CHANNELS {3, 0, 1}
44+
45+#define AMUX_COL_CHANNELS AMUX_0_COL_CHANNELS, AMUX_1_COL_CHANNELS
46+
47+#define DISCHARGE_PIN A4
48+#define ANALOG_PORT A2
49+
50+#define DEFAULT_ACTUATION_MODE 0
51+#define DEFAULT_MODE_0_ACTUATION_LEVEL 550
52+#define DEFAULT_MODE_0_RELEASE_LEVEL 500
53+#define DEFAULT_MODE_1_INITIAL_DEADZONE_OFFSET DEFAULT_MODE_0_ACTUATION_LEVEL
54+#define DEFAULT_MODE_1_ACTUATION_OFFSET 70
55+#define DEFAULT_MODE_1_RELEASE_OFFSET 70
56+#define DEFAULT_EXTREMUM 1023
57+#define EXPECTED_NOISE_FLOOR 0
58+#define NOISE_FLOOR_THRESHOLD 50
59+#define BOTTOMING_CALIBRATION_THRESHOLD 50
60+#define DEFAULT_NOISE_FLOOR_SAMPLING_COUNT 30
61+#define DEFAULT_BOTTOMING_READING 1023
62+#define DEFAULT_CALIBRATION_STARTER true
63+
64+#define DISCHARGE_TIME 10
65+
66+// #define DEBUG_MATRIX_SCAN_RATE
67+#define EECONFIG_KB_DATA_SIZE 225
68+
69+// PWM driver with direct memory access (DMA) support
70+#define WS2812_PWM_DRIVER PWMD3
71+#define WS2812_PWM_CHANNEL 1
72+#define WS2812_PWM_PAL_MODE 2
73+#define WS2812_DMA_STREAM STM32_DMA1_STREAM2
74+#define WS2812_DMA_CHANNEL 5
75diff --git a/keyboards/cipulot/ec_tkl_x/halconf.h b/keyboards/cipulot/ec_tkl_x/halconf.h
76new file mode 100644
77index 0000000000000000000000000000000000000000..fb0f77d82f9340651ef5fe0eeabc5079da56d09f
78--- /dev/null
79+++ b/keyboards/cipulot/ec_tkl_x/halconf.h
80@@ -0,0 +1,23 @@
81+/* Copyright 2024 Cipulot
82+ *
83+ * This program is free software: you can redistribute it and/or modify
84+ * it under the terms of the GNU General Public License as published by
85+ * the Free Software Foundation, either version 3 of the License, or
86+ * (at your option) any later version.
87+ *
88+ * This program is distributed in the hope that it will be useful,
89+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
90+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
91+ * GNU General Public License for more details.
92+ *
93+ * You should have received a copy of the GNU General Public License
94+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
95+ */
96+
97+#pragma once
98+
99+#define HAL_USE_ADC TRUE
100+#define HAL_USE_PAL TRUE
101+#define HAL_USE_PWM TRUE
102+
103+#include_next <halconf.h>
104diff --git a/keyboards/cipulot/ec_tkl_x/keyboard.json b/keyboards/cipulot/ec_tkl_x/keyboard.json
105new file mode 100644
106index 0000000000000000000000000000000000000000..9149fb1d3bcebc71de06461d216dc95e9af4af99
107--- /dev/null
108+++ b/keyboards/cipulot/ec_tkl_x/keyboard.json
109@@ -0,0 +1,714 @@
110+{
111+ "manufacturer": "Cipulot",
112+ "keyboard_name": "EC TKL X",
113+ "maintainer": "Cipulot",
114+ "bootloader": "stm32-dfu",
115+ "build": {
116+ "lto": true
117+ },
118+ "diode_direction": "COL2ROW",
119+ "eeprom": {
120+ "wear_leveling": {
121+ "backing_size": 8192
122+ }
123+ },
124+ "features": {
125+ "bootmagic": false,
126+ "console": true,
127+ "extrakey": true,
128+ "mousekey": true,
129+ "nkro": true,
130+ "rgblight": true
131+ },
132+ "processor": "STM32F411",
133+ "qmk": {
134+ "locking": {
135+ "enabled": true,
136+ "resync": true
137+ }
138+ },
139+ "rgblight": {
140+ "animations": {
141+ "alternating": true,
142+ "breathing": true,
143+ "christmas": true,
144+ "knight": true,
145+ "rainbow_mood": true,
146+ "rainbow_swirl": true,
147+ "rgb_test": true,
148+ "snake": true,
149+ "static_gradient": true,
150+ "twinkle": true
151+ },
152+ "led_count": 22
153+ },
154+ "usb": {
155+ "device_version": "0.0.1",
156+ "pid": "0x6BC8",
157+ "shared_endpoint": {
158+ "keyboard": true
159+ },
160+ "vid": "0x6369"
161+ },
162+ "ws2812": {
163+ "driver": "pwm",
164+ "pin": "B4"
165+ },
166+ "layouts": {
167+ "LAYOUT_all": {
168+ "layout": [
169+ {"matrix": [0, 0], "x": 0, "y": 0},
170+ {"matrix": [0, 1], "x": 1.25, "y": 0},
171+ {"matrix": [0, 2], "x": 2.25, "y": 0},
172+ {"matrix": [0, 3], "x": 3.25, "y": 0},
173+ {"matrix": [0, 4], "x": 4.25, "y": 0},
174+ {"matrix": [0, 5], "x": 5.5, "y": 0},
175+ {"matrix": [0, 6], "x": 6.5, "y": 0},
176+ {"matrix": [0, 7], "x": 7.5, "y": 0},
177+ {"matrix": [0, 8], "x": 8.5, "y": 0},
178+ {"matrix": [0, 9], "x": 9.75, "y": 0},
179+ {"matrix": [0, 10], "x": 10.75, "y": 0},
180+ {"matrix": [0, 11], "x": 11.75, "y": 0},
181+ {"matrix": [0, 12], "x": 12.75, "y": 0},
182+ {"matrix": [0, 14], "x": 14, "y": 0},
183+ {"matrix": [0, 15], "x": 15.25, "y": 0},
184+ {"matrix": [0, 16], "x": 16.25, "y": 0},
185+ {"matrix": [0, 17], "x": 17.25, "y": 0},
186+ {"matrix": [1, 0], "x": 0, "y": 1.25},
187+ {"matrix": [1, 1], "x": 1, "y": 1.25},
188+ {"matrix": [1, 2], "x": 2, "y": 1.25},
189+ {"matrix": [1, 3], "x": 3, "y": 1.25},
190+ {"matrix": [1, 4], "x": 4, "y": 1.25},
191+ {"matrix": [1, 5], "x": 5, "y": 1.25},
192+ {"matrix": [1, 6], "x": 6, "y": 1.25},
193+ {"matrix": [1, 7], "x": 7, "y": 1.25},
194+ {"matrix": [1, 8], "x": 8, "y": 1.25},
195+ {"matrix": [1, 9], "x": 9, "y": 1.25},
196+ {"matrix": [1, 10], "x": 10, "y": 1.25},
197+ {"matrix": [1, 11], "x": 11, "y": 1.25},
198+ {"matrix": [1, 12], "x": 12, "y": 1.25},
199+ {"matrix": [1, 13], "x": 13, "y": 1.25},
200+ {"matrix": [1, 14], "x": 14, "y": 1.25},
201+ {"matrix": [1, 15], "x": 15.25, "y": 1.25},
202+ {"matrix": [1, 16], "x": 16.25, "y": 1.25},
203+ {"matrix": [1, 17], "x": 17.25, "y": 1.25},
204+ {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
205+ {"matrix": [2, 1], "x": 1.5, "y": 2.25},
206+ {"matrix": [2, 2], "x": 2.5, "y": 2.25},
207+ {"matrix": [2, 3], "x": 3.5, "y": 2.25},
208+ {"matrix": [2, 4], "x": 4.5, "y": 2.25},
209diff --git a/keyboards/cipulot/ec_tkl_x/keymaps/default/keymap.c b/keyboards/cipulot/ec_tkl_x/keymaps/default/keymap.c
210new file mode 100644
211index 0000000000000000000000000000000000000000..9a357e2cf3f6aa87dc2f4f12fb8c342a8bfd23cb
212--- /dev/null
213+++ b/keyboards/cipulot/ec_tkl_x/keymaps/default/keymap.c
214@@ -0,0 +1,45 @@
215+/* Copyright 2024 Cipulot
216+ *
217+ * This program is free software: you can redistribute it and/or modify
218+ * it under the terms of the GNU General Public License as published by
219+ * the Free Software Foundation, either version 3 of the License, or
220+ * (at your option) any later version.
221+ *
222+ * This program is distributed in the hope that it will be useful,
223+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
224+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
225+ * GNU General Public License for more details.
226+ *
227+ * You should have received a copy of the GNU General Public License
228+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
229+ */
230+
231+#include QMK_KEYBOARD_H
232+
233+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
234+ // clang-format off
235+ [0] = LAYOUT_all(
236+ KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_PSCR, KC_SCRL, KC_PAUS,
237+ KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_INS, KC_HOME, KC_PGUP,
238+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_ENTER, KC_DEL, KC_END, KC_PGDN,
239+ KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENTER,
240+ KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, MO(1), KC_UP,
241+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT),
242+
243+ [1] = LAYOUT_all(
244+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
245+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
246+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
247+ _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
248+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
249+ _______, _______, _______, _______, _______, _______, _______, MO(2), _______, _______, _______, _______, _______),
250+
251+ [2] = LAYOUT_all(
252+ QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
253+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
254+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
255+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
256+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
257+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)
258+ // clang-format on
259+};
260diff --git a/keyboards/cipulot/ec_tkl_x/keymaps/tkl_ansi_tsangan/keymap.c b/keyboards/cipulot/ec_tkl_x/keymaps/tkl_ansi_tsangan/keymap.c
261new file mode 100644
262index 0000000000000000000000000000000000000000..86b06999864e0ebceb1549a4c7cf21444f8e7363
263--- /dev/null
264+++ b/keyboards/cipulot/ec_tkl_x/keymaps/tkl_ansi_tsangan/keymap.c
265@@ -0,0 +1,45 @@
266+/* Copyright 2024 Cipulot
267+ *
268+ * This program is free software: you can redistribute it and/or modify
269+ * it under the terms of the GNU General Public License as published by
270+ * the Free Software Foundation, either version 3 of the License, or
271+ * (at your option) any later version.
272+ *
273+ * This program is distributed in the hope that it will be useful,
274+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
275+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
276+ * GNU General Public License for more details.
277+ *
278+ * You should have received a copy of the GNU General Public License
279+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
280+ */
281+
282+#include QMK_KEYBOARD_H
283+
284+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
285+ // clang-format off
286+ [0] = LAYOUT_tkl_ansi_tsangan(
287+ KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS,
288+ KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP,
289+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN,
290+ KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENTER,
291+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
292+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT),
293+
294+ [1] = LAYOUT_tkl_ansi_tsangan(
295+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
296+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
297+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
298+ _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______,
299+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
300+ _______, _______, _______, _______, MO(2), _______, _______, _______, _______, _______),
301+
302+ [2] = LAYOUT_tkl_ansi_tsangan(
303+ QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
304+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
305+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
306+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
307+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
308+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)
309+ // clang-format on
310+};
311diff --git a/keyboards/cipulot/ec_tkl_x/keymaps/tkl_f13_ansi_tsangan/keymap.c b/keyboards/cipulot/ec_tkl_x/keymaps/tkl_f13_ansi_tsangan/keymap.c
312new file mode 100644
313index 0000000000000000000000000000000000000000..eece893fe4c263aaf5903e793b353b7de7b8da0f
314--- /dev/null
315+++ b/keyboards/cipulot/ec_tkl_x/keymaps/tkl_f13_ansi_tsangan/keymap.c
316@@ -0,0 +1,45 @@
317+/* Copyright 2024 Cipulot
318+ *
319+ * This program is free software: you can redistribute it and/or modify
320+ * it under the terms of the GNU General Public License as published by
321+ * the Free Software Foundation, either version 3 of the License, or
322+ * (at your option) any later version.
323+ *
324+ * This program is distributed in the hope that it will be useful,
325+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
326+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
327+ * GNU General Public License for more details.
328+ *
329+ * You should have received a copy of the GNU General Public License
330+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
331+ */
332+
333+#include QMK_KEYBOARD_H
334+
335+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
336+ // clang-format off
337+ [0] = LAYOUT_tkl_f13_ansi_tsangan(
338+ KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_PSCR, KC_SCRL, KC_PAUS,
339+ KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP,
340+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN,
341+ KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENTER,
342+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
343+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT),
344+
345+ [1] = LAYOUT_tkl_f13_ansi_tsangan(
346+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
347+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
348+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
349+ _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______,
350+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
351+ _______, _______, _______, _______, MO(2), _______, _______, _______, _______, _______),
352+
353+ [2] = LAYOUT_tkl_f13_ansi_tsangan(
354+ QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
355+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
356+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
357+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
358+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
359+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)
360+ // clang-format on
361+};
362diff --git a/keyboards/cipulot/ec_tkl_x/keymaps/tkl_f13_iso_tsangan/keymap.c b/keyboards/cipulot/ec_tkl_x/keymaps/tkl_f13_iso_tsangan/keymap.c
363new file mode 100644
364index 0000000000000000000000000000000000000000..9af7db900855f18ab6271b2549df42a8be6b98bf
365--- /dev/null
366+++ b/keyboards/cipulot/ec_tkl_x/keymaps/tkl_f13_iso_tsangan/keymap.c
367@@ -0,0 +1,45 @@
368+/* Copyright 2024 Cipulot
369+ *
370+ * This program is free software: you can redistribute it and/or modify
371+ * it under the terms of the GNU General Public License as published by
372+ * the Free Software Foundation, either version 3 of the License, or
373+ * (at your option) any later version.
374+ *
375+ * This program is distributed in the hope that it will be useful,
376+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
377+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
378+ * GNU General Public License for more details.
379+ *
380+ * You should have received a copy of the GNU General Public License
381+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
382+ */
383+
384+#include QMK_KEYBOARD_H
385+
386+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
387+ // clang-format off
388+ [0] = LAYOUT_tkl_f13_ansi_tsangan(
389+ KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_PSCR, KC_SCRL, KC_PAUS,
390+ KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP,
391+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN,
392+ KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENTER,
393+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
394+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT),
395+
396+ [1] = LAYOUT_tkl_f13_ansi_tsangan(
397+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
398+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
399+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
400+ _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______,
401+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
402+ _______, _______, _______, _______, MO(2), _______, _______, _______, _______, _______),
403+
404+ [2] = LAYOUT_tkl_f13_ansi_tsangan(
405+ QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
406+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
407+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
408+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
409+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
410+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)
411+ // clang-format on
412+};
413diff --git a/keyboards/cipulot/ec_tkl_x/keymaps/tkl_f13_jis/keymap.c b/keyboards/cipulot/ec_tkl_x/keymaps/tkl_f13_jis/keymap.c
414new file mode 100644
415index 0000000000000000000000000000000000000000..8e0fd18d0b9bda7d471a4ba2ed28a8d2274033b2
416--- /dev/null
417+++ b/keyboards/cipulot/ec_tkl_x/keymaps/tkl_f13_jis/keymap.c
418@@ -0,0 +1,47 @@
419+/* Copyright 2024 Cipulot
420+ *
421+ * This program is free software: you can redistribute it and/or modify
422+ * it under the terms of the GNU General Public License as published by
423+ * the Free Software Foundation, either version 3 of the License, or
424+ * (at your option) any later version.
425+ *
426+ * This program is distributed in the hope that it will be useful,
427+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
428+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
429+ * GNU General Public License for more details.
430+ *
431+ * You should have received a copy of the GNU General Public License
432+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
433+ */
434+
435+#include QMK_KEYBOARD_H
436+
437+#include "keymap_japanese.h"
438+
439+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
440+ // clang-format off
441+ [0] = LAYOUT_tkl_f13_jis(
442+ KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_PSCR, KC_SCRL, KC_PAUS,
443+ JP_ZKHK, JP_1, JP_2, JP_3, JP_4, JP_5, JP_6, JP_7, JP_8, JP_9, JP_0, JP_MINS, JP_CIRC, JP_YEN, KC_BSPC, KC_INS, KC_HOME, KC_PGUP,
444+ KC_TAB, JP_Q, JP_W, JP_E, JP_R, JP_T, JP_Y, JP_U, JP_I, JP_O, JP_P, JP_AT, JP_LBRC, KC_ENTER, KC_DEL, KC_END, KC_PGDN,
445+ JP_EISU, JP_A, JP_S, JP_D, JP_F, JP_G, JP_H, JP_J, JP_K, JP_L, JP_SCLN, JP_COLN, JP_RBRC,
446+ KC_LSFT, JP_Z, JP_X, JP_C, JP_V, JP_B, JP_N, JP_M, JP_COMM, JP_DOT, JP_SLSH, JP_BSLS, KC_RSFT, KC_UP,
447+ KC_LCTL, KC_LGUI, KC_LALT, JP_MHEN, KC_SPC, JP_HENK, JP_KANA, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT),
448+
449+ [1] = LAYOUT_tkl_f13_jis(
450+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
451+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
452+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
453+ _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______,
454+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
455+ _______, _______, _______, _______, _______, _______, _______, MO(2), _______, _______, _______, _______, _______),
456+
457+ [2] = LAYOUT_tkl_f13_jis(
458+ QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
459+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
460+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
461+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
462+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
463+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)
464+ // clang-format on
465+};
466diff --git a/keyboards/cipulot/ec_tkl_x/keymaps/tkl_iso_tsangan/keymap.c b/keyboards/cipulot/ec_tkl_x/keymaps/tkl_iso_tsangan/keymap.c
467new file mode 100644
468index 0000000000000000000000000000000000000000..bae33d072dc14c48336281749c5faf03d2934833
469--- /dev/null
470+++ b/keyboards/cipulot/ec_tkl_x/keymaps/tkl_iso_tsangan/keymap.c
471@@ -0,0 +1,45 @@
472+/* Copyright 2024 Cipulot
473+ *
474+ * This program is free software: you can redistribute it and/or modify
475+ * it under the terms of the GNU General Public License as published by
476+ * the Free Software Foundation, either version 3 of the License, or
477+ * (at your option) any later version.
478+ *
479+ * This program is distributed in the hope that it will be useful,
480+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
481+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
482+ * GNU General Public License for more details.
483+ *
484+ * You should have received a copy of the GNU General Public License
485+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
486+ */
487+
488+#include QMK_KEYBOARD_H
489+
490+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
491+ // clang-format off
492+ [0] = LAYOUT_tkl_ansi_tsangan(
493+ KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS,
494+ KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP,
495+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN,
496+ KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENTER,
497+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
498+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT),
499+
500+ [1] = LAYOUT_tkl_ansi_tsangan(
501+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
502+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
503+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
504+ _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______,
505+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
506+ _______, _______, _______, _______, MO(2), _______, _______, _______, _______, _______),
507+
508+ [2] = LAYOUT_tkl_ansi_tsangan(
509+ QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
510+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
511+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
512+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
513+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
514+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)
515+ // clang-format on
516+};
517diff --git a/keyboards/cipulot/ec_tkl_x/keymaps/tkl_jis/keymap.c b/keyboards/cipulot/ec_tkl_x/keymaps/tkl_jis/keymap.c
518new file mode 100644
519index 0000000000000000000000000000000000000000..f445d71d6ea39c9c180cb6c2163d62c4a3f044d3
520--- /dev/null
521+++ b/keyboards/cipulot/ec_tkl_x/keymaps/tkl_jis/keymap.c
522@@ -0,0 +1,47 @@
523+/* Copyright 2024 Cipulot
524+ *
525+ * This program is free software: you can redistribute it and/or modify
526+ * it under the terms of the GNU General Public License as published by
527+ * the Free Software Foundation, either version 3 of the License, or
528+ * (at your option) any later version.
529+ *
530+ * This program is distributed in the hope that it will be useful,
531+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
532+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
533+ * GNU General Public License for more details.
534+ *
535+ * You should have received a copy of the GNU General Public License
536+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
537+ */
538+
539+#include QMK_KEYBOARD_H
540+
541+#include "keymap_japanese.h"
542+
543+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
544+ // clang-format off
545+ [0] = LAYOUT_tkl_jis(
546+ KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS,
547+ JP_ZKHK, JP_1, JP_2, JP_3, JP_4, JP_5, JP_6, JP_7, JP_8, JP_9, JP_0, JP_MINS, JP_CIRC, JP_YEN, KC_BSPC, KC_INS, KC_HOME, KC_PGUP,
548+ KC_TAB, JP_Q, JP_W, JP_E, JP_R, JP_T, JP_Y, JP_U, JP_I, JP_O, JP_P, JP_AT, JP_LBRC, KC_ENTER, KC_DEL, KC_END, KC_PGDN,
549+ JP_EISU, JP_A, JP_S, JP_D, JP_F, JP_G, JP_H, JP_J, JP_K, JP_L, JP_SCLN, JP_COLN, JP_RBRC,
550+ KC_LSFT, JP_Z, JP_X, JP_C, JP_V, JP_B, JP_N, JP_M, JP_COMM, JP_DOT, JP_SLSH, JP_BSLS, KC_RSFT, KC_UP,
551+ KC_LCTL, KC_LGUI, KC_LALT, JP_MHEN, KC_SPC, JP_HENK, JP_KANA, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT),
552+
553+ [1] = LAYOUT_tkl_jis(
554+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
555+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
556+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
557+ _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______,
558+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
559+ _______, _______, _______, _______, _______, _______, _______, MO(2), _______, _______, _______, _______, _______),
560+
561+ [2] = LAYOUT_tkl_jis(
562+ QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
563+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
564+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
565+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
566+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
567+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)
568+ // clang-format on
569+};
570diff --git a/keyboards/cipulot/ec_tkl_x/mcuconf.h b/keyboards/cipulot/ec_tkl_x/mcuconf.h
571new file mode 100644
572index 0000000000000000000000000000000000000000..99b613c493a3d56c8203eeb29b5b4ffad94a3f34
573--- /dev/null
574+++ b/keyboards/cipulot/ec_tkl_x/mcuconf.h
575@@ -0,0 +1,25 @@
576+/* Copyright 2024 Cipulot
577+ *
578+ * This program is free software: you can redistribute it and/or modify
579+ * it under the terms of the GNU General Public License as published by
580+ * the Free Software Foundation, either version 3 of the License, or
581+ * (at your option) any later version.
582+ *
583+ * This program is distributed in the hope that it will be useful,
584+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
585+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
586+ * GNU General Public License for more details.
587+ *
588+ * You should have received a copy of the GNU General Public License
589+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
590+ */
591+
592+#pragma once
593+
594+#include_next <mcuconf.h>
595+
596+#undef STM32_ADC_USE_ADC1
597+#define STM32_ADC_USE_ADC1 TRUE
598+
599+#undef STM32_PWM_USE_TIM3
600+#define STM32_PWM_USE_TIM3 TRUE
601diff --git a/keyboards/cipulot/ec_tkl_x/post_rules.mk b/keyboards/cipulot/ec_tkl_x/post_rules.mk
602new file mode 100644
603index 0000000000000000000000000000000000000000..5dba48cc5fd61a291a6f48fa4f9f916e96275ff4
604--- /dev/null
605+++ b/keyboards/cipulot/ec_tkl_x/post_rules.mk
606@@ -0,0 +1 @@
607+include keyboards/cipulot/common/common_cipulot.mk
608diff --git a/keyboards/cipulot/ec_tkl_x/readme.md b/keyboards/cipulot/ec_tkl_x/readme.md
609new file mode 100644
610index 0000000000000000000000000000000000000000..0e37c237626b7d8418b7dcd55a72bc90b151d5ac
611--- /dev/null
612+++ b/keyboards/cipulot/ec_tkl_x/readme.md
613@@ -0,0 +1,26 @@
614+# EC TKL X
615+
616+
617+
618+Universal TKL Electrostatic Capacitive PCB, with multi-layout support (F12/F13 version).
619+
620+* Keyboard Maintainer: [cipulot](https://github.com/cipulot)
621+* Hardware Supported: EC TKL X PCB
622+* Hardware Availability: TBD
623+
624+Make example for this keyboard (after setting up your build environment):
625+
626+ make cipulot/ec_tkl_x:default
627+
628+Flashing example for this keyboard:
629+
630+ make cipulot/ec_tkl_x:default:flash
631+
632diff --git a/keyboards/cipulot/ec_tkl_x/rules.mk b/keyboards/cipulot/ec_tkl_x/rules.mk
633new file mode 100644
634index 0000000000000000000000000000000000000000..3aa0e2bf06154316e6315ba7742f3ce96bee8e31
635--- /dev/null
636+++ b/keyboards/cipulot/ec_tkl_x/rules.mk
637@@ -0,0 +1 @@
638+OPT = 2