diff --git a/keyboards/cipulot/ec_tkl/config.h b/keyboards/cipulot/ec_tkl/config.h
new file mode 100644
index 0000000000..95a7f9137a
--- /dev/null
+++ b/keyboards/cipulot/ec_tkl/config.h
@@ -0,0 +1,69 @@
+/* Copyright 2023 Cipulot
+ *
+ * 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 3 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 .
+ */
+
+#pragma once
+
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 16
+
+#define MATRIX_ROW_PINS \
+ { B6, B5, B12, B10, B13, B7 }
+
+#define AMUX_COUNT 1
+#define AMUX_MAX_COLS_COUNT 16
+
+#define AMUX_EN_PINS \
+ { A8 }
+
+#define AMUX_SEL_PINS \
+ { B14, B15, A9, A10 }
+
+#define AMUX_COL_CHANNELS_SIZES \
+ { 16 }
+
+#define AMUX_0_COL_CHANNELS \
+ { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}
+
+#define AMUX_COL_CHANNELS AMUX_0_COL_CHANNELS
+
+#define DISCHARGE_PIN A4
+#define ANALOG_PORT A2
+
+#define DEFAULT_ACTUATION_MODE 0
+#define DEFAULT_MODE_0_ACTUATION_LEVEL 550
+#define DEFAULT_MODE_0_RELEASE_LEVEL 500
+#define DEFAULT_MODE_1_INITIAL_DEADZONE_OFFSET DEFAULT_MODE_0_ACTUATION_LEVEL
+#define DEFAULT_MODE_1_ACTUATION_OFFSET 70
+#define DEFAULT_MODE_1_RELEASE_OFFSET 70
+#define DEFAULT_EXTREMUM 1023
+#define EXPECTED_NOISE_FLOOR 0
+#define NOISE_FLOOR_THRESHOLD 50
+#define BOTTOMING_CALIBRATION_THRESHOLD 50
+#define DEFAULT_NOISE_FLOOR_SAMPLING_COUNT 30
+#define DEFAULT_BOTTOMING_READING 1023
+#define DEFAULT_CALIBRATION_STARTER true
+
+#define DISCHARGE_TIME 10
+
+// #define DEBUG_MATRIX_SCAN_RATE
+#define EECONFIG_KB_DATA_SIZE 201
+
+// PWM driver with direct memory access (DMA) support
+#define WS2812_PWM_DRIVER PWMD3
+#define WS2812_PWM_CHANNEL 1
+#define WS2812_PWM_PAL_MODE 2
+#define WS2812_DMA_STREAM STM32_DMA1_STREAM2
+#define WS2812_DMA_CHANNEL 5
diff --git a/keyboards/cipulot/ec_tkl/halconf.h b/keyboards/cipulot/ec_tkl/halconf.h
new file mode 100644
index 0000000000..f2c2220231
--- /dev/null
+++ b/keyboards/cipulot/ec_tkl/halconf.h
@@ -0,0 +1,23 @@
+/* Copyright 2023 Cipulot
+ *
+ * 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 3 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 .
+ */
+
+#pragma once
+
+#define HAL_USE_ADC TRUE
+#define HAL_USE_PAL TRUE
+#define HAL_USE_PWM TRUE
+
+#include_next
diff --git a/keyboards/cipulot/ec_tkl/info.json b/keyboards/cipulot/ec_tkl/info.json
new file mode 100644
index 0000000000..0c56fb838d
--- /dev/null
+++ b/keyboards/cipulot/ec_tkl/info.json
@@ -0,0 +1,433 @@
+{
+ "manufacturer": "Cipulot",
+ "keyboard_name": "EC TKL",
+ "maintainer": "Cipulot",
+ "bootloader": "stm32-dfu",
+ "build": {
+ "lto": true
+ },
+ "diode_direction": "COL2ROW",
+ "eeprom": {
+ "wear_leveling": {
+ "backing_size": 4096
+ }
+ },
+ "features": {
+ "bootmagic": false,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgblight": true
+ },
+ "processor": "STM32F411",
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "rgblight": {
+ "animations": {
+ "alternating": true,
+ "breathing": true,
+ "christmas": true,
+ "knight": true,
+ "rainbow_mood": true,
+ "rainbow_swirl": true,
+ "rgb_test": true,
+ "snake": true,
+ "static_gradient": true,
+ "twinkle": true
+ },
+ "led_count": 22
+ },
+ "usb": {
+ "device_version": "0.0.1",
+ "pid": "0x6BC3",
+ "shared_endpoint": {
+ "keyboard": true
+ },
+ "vid": "0x6369"
+ },
+ "ws2812": {
+ "driver": "pwm",
+ "pin": "B4"
+ },
+ "layouts": {
+ "LAYOUT_all": {
+ "layout": [
+ {"label": "0,0", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "0,1", "matrix": [0, 1], "x": 2, "y": 0},
+ {"label": "0,2", "matrix": [0, 2], "x": 3, "y": 0},
+ {"label": "0,3", "matrix": [0, 3], "x": 4, "y": 0},
+ {"label": "0,4", "matrix": [0, 4], "x": 5, "y": 0},
+ {"label": "0,5", "matrix": [0, 5], "x": 6.5, "y": 0},
+ {"label": "0,6", "matrix": [0, 6], "x": 7.5, "y": 0},
+ {"label": "0,7", "matrix": [0, 7], "x": 8.5, "y": 0},
+ {"label": "0,8", "matrix": [0, 8], "x": 9.5, "y": 0},
+ {"label": "0,9", "matrix": [0, 9], "x": 11, "y": 0},
+ {"label": "0,10", "matrix": [0, 10], "x": 12, "y": 0},
+ {"label": "0,11", "matrix": [0, 11], "x": 13, "y": 0},
+ {"label": "0,12", "matrix": [0, 12], "x": 14, "y": 0},
+ {"label": "0,13", "matrix": [0, 13], "x": 15.25, "y": 0},
+ {"label": "0,14", "matrix": [0, 14], "x": 16.25, "y": 0},
+ {"label": "0,15", "matrix": [0, 15], "x": 17.25, "y": 0},
+ {"label": "1,0", "matrix": [1, 0], "x": 0, "y": 1.25},
+ {"label": "1,1", "matrix": [1, 1], "x": 1, "y": 1.25},
+ {"label": "1,2", "matrix": [1, 2], "x": 2, "y": 1.25},
+ {"label": "1,3", "matrix": [1, 3], "x": 3, "y": 1.25},
+ {"label": "1,4", "matrix": [1, 4], "x": 4, "y": 1.25},
+ {"label": "1,5", "matrix": [1, 5], "x": 5, "y": 1.25},
+ {"label": "1,6", "matrix": [1, 6], "x": 6, "y": 1.25},
+ {"label": "1,7", "matrix": [1, 7], "x": 7, "y": 1.25},
+ {"label": "1,8", "matrix": [1, 8], "x": 8, "y": 1.25},
+ {"label": "1,9", "matrix": [1, 9], "x": 9, "y": 1.25},
+ {"label": "1,10", "matrix": [1, 10], "x": 10, "y": 1.25},
+ {"label": "1,11", "matrix": [1, 11], "x": 11, "y": 1.25},
+ {"label": "1,12", "matrix": [1, 12], "x": 12, "y": 1.25},
+ {"label": "1,13", "matrix": [1, 13], "x": 13, "y": 1.25},
+ {"label": "1,14", "matrix": [1, 14], "x": 14, "y": 1.25},
+ {"label": "3,14", "matrix": [3, 14], "x": 15.25, "y": 1.25},
+ {"label": "2,15", "matrix": [2, 15], "x": 16.25, "y": 1.25},
+ {"label": "1,15", "matrix": [1, 15], "x": 17.25, "y": 1.25},
+ {"label": "2,0", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"label": "2,1", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"label": "2,2", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"label": "2,3", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"label": "2,4", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"label": "2,5", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"label": "2,6", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"label": "2,7", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"label": "2,8", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"label": "2,9", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"label": "2,10", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"label": "2,11", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"label": "2,12", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+ {"label": "2,13", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 0.75},
+ {"label": "2,14", "matrix": [2, 14], "x": 14.25, "y": 2.25, "w": 0.75},
+ {"label": "4,14", "matrix": [4, 14], "x": 15.25, "y": 2.25},
+ {"label": "4,15", "matrix": [4, 15], "x": 16.25, "y": 2.25},
+ {"label": "3,15", "matrix": [3, 15], "x": 17.25, "y": 2.25},
+ {"label": "3,0", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"label": "3,1", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+ {"label": "3,2", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+ {"label": "3,3", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+ {"label": "3,4", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+ {"label": "3,5", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+ {"label": "3,6", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+ {"label": "3,7", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+ {"label": "3,8", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+ {"label": "3,9", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+ {"label": "3,10", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+ {"label": "3,11", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+ {"label": "3,12", "matrix": [3, 12], "x": 12.75, "y": 3.25},
+ {"label": "3,13", "matrix": [3, 13], "x": 13.75, "y": 3.25, "w": 1.25},
+ {"label": "4,0", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+ {"label": "4,1", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+ {"label": "4,2", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+ {"label": "4,3", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+ {"label": "4,4", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+ {"label": "4,5", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+ {"label": "4,6", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+ {"label": "4,7", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+ {"label": "4,8", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+ {"label": "4,9", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+ {"label": "4,10", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+ {"label": "4,11", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+ {"label": "4,12", "matrix": [4, 12], "x": 12.25, "y": 4.25},
+ {"label": "4,13", "matrix": [4, 13], "x": 13.25, "y": 4.25, "w": 1.75},
+ {"label": "5,14", "matrix": [5, 14], "x": 16.25, "y": 4.25},
+ {"label": "5,0", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+ {"label": "5,1", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+ {"label": "5,2", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+ {"label": "5,4", "matrix": [5, 4], "x": 4, "y": 5.25, "w": 1.5},
+ {"label": "5,6", "matrix": [5, 6], "x": 5.5, "y": 5.25, "w": 2.5},
+ {"label": "5,7", "matrix": [5, 7], "x": 8, "y": 5.25, "w": 1.5},
+ {"label": "5,8", "matrix": [5, 8], "x": 9.5, "y": 5.25, "w": 1.5},
+ {"label": "5,9", "matrix": [5, 9], "x": 11, "y": 5.25, "w": 1.5},
+ {"label": "5,10", "matrix": [5, 10], "x": 12.5, "y": 5.25},
+ {"label": "5,11", "matrix": [5, 11], "x": 13.5, "y": 5.25, "w": 1.5},
+ {"label": "5,12", "matrix": [5, 12], "x": 15.25, "y": 5.25},
+ {"label": "5,13", "matrix": [5, 13], "x": 16.25, "y": 5.25},
+ {"label": "5,15", "matrix": [5, 15], "x": 17.25, "y": 5.25}
+ ]
+ },
+ "LAYOUT_tkl_ansi_tsangan": {
+ "layout": [
+ {"label": "0,0", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "0,1", "matrix": [0, 1], "x": 2, "y": 0},
+ {"label": "0,2", "matrix": [0, 2], "x": 3, "y": 0},
+ {"label": "0,3", "matrix": [0, 3], "x": 4, "y": 0},
+ {"label": "0,4", "matrix": [0, 4], "x": 5, "y": 0},
+ {"label": "0,5", "matrix": [0, 5], "x": 6.5, "y": 0},
+ {"label": "0,6", "matrix": [0, 6], "x": 7.5, "y": 0},
+ {"label": "0,7", "matrix": [0, 7], "x": 8.5, "y": 0},
+ {"label": "0,8", "matrix": [0, 8], "x": 9.5, "y": 0},
+ {"label": "0,9", "matrix": [0, 9], "x": 11, "y": 0},
+ {"label": "0,10", "matrix": [0, 10], "x": 12, "y": 0},
+ {"label": "0,11", "matrix": [0, 11], "x": 13, "y": 0},
+ {"label": "0,12", "matrix": [0, 12], "x": 14, "y": 0},
+ {"label": "0,13", "matrix": [0, 13], "x": 15.25, "y": 0},
+ {"label": "0,14", "matrix": [0, 14], "x": 16.25, "y": 0},
+ {"label": "0,15", "matrix": [0, 15], "x": 17.25, "y": 0},
+ {"label": "1,0", "matrix": [1, 0], "x": 0, "y": 1.25},
+ {"label": "1,1", "matrix": [1, 1], "x": 1, "y": 1.25},
+ {"label": "1,2", "matrix": [1, 2], "x": 2, "y": 1.25},
+ {"label": "1,3", "matrix": [1, 3], "x": 3, "y": 1.25},
+ {"label": "1,4", "matrix": [1, 4], "x": 4, "y": 1.25},
+ {"label": "1,5", "matrix": [1, 5], "x": 5, "y": 1.25},
+ {"label": "1,6", "matrix": [1, 6], "x": 6, "y": 1.25},
+ {"label": "1,7", "matrix": [1, 7], "x": 7, "y": 1.25},
+ {"label": "1,8", "matrix": [1, 8], "x": 8, "y": 1.25},
+ {"label": "1,9", "matrix": [1, 9], "x": 9, "y": 1.25},
+ {"label": "1,10", "matrix": [1, 10], "x": 10, "y": 1.25},
+ {"label": "1,11", "matrix": [1, 11], "x": 11, "y": 1.25},
+ {"label": "1,12", "matrix": [1, 12], "x": 12, "y": 1.25},
+ {"label": "1,14", "matrix": [1, 14], "x": 13, "y": 1.25, "w": 2},
+ {"label": "3,14", "matrix": [3, 14], "x": 15.25, "y": 1.25},
+ {"label": "2,15", "matrix": [2, 15], "x": 16.25, "y": 1.25},
+ {"label": "1,15", "matrix": [1, 15], "x": 17.25, "y": 1.25},
+ {"label": "2,0", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"label": "2,1", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"label": "2,2", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"label": "2,3", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"label": "2,4", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"label": "2,5", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"label": "2,6", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"label": "2,7", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"label": "2,8", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"label": "2,9", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"label": "2,10", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"label": "2,11", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"label": "2,12", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+ {"label": "2,13", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+ {"label": "4,14", "matrix": [4, 14], "x": 15.25, "y": 2.25},
+ {"label": "4,15", "matrix": [4, 15], "x": 16.25, "y": 2.25},
+ {"label": "3,15", "matrix": [3, 15], "x": 17.25, "y": 2.25},
+ {"label": "3,0", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"label": "3,1", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+ {"label": "3,2", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+ {"label": "3,3", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+ {"label": "3,4", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+ {"label": "3,5", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+ {"label": "3,6", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+ {"label": "3,7", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+ {"label": "3,8", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+ {"label": "3,9", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+ {"label": "3,10", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+ {"label": "3,11", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+ {"label": "3,13", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+ {"label": "4,0", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+ {"label": "4,2", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+ {"label": "4,3", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+ {"label": "4,4", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+ {"label": "4,5", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+ {"label": "4,6", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+ {"label": "4,7", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+ {"label": "4,8", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+ {"label": "4,9", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+ {"label": "4,10", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+ {"label": "4,11", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+ {"label": "4,13", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+ {"label": "5,14", "matrix": [5, 14], "x": 16.25, "y": 4.25},
+ {"label": "5,0", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+ {"label": "5,1", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+ {"label": "5,2", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+ {"label": "5,6", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+ {"label": "5,9", "matrix": [5, 9], "x": 11, "y": 5.25, "w": 1.5},
+ {"label": "5,10", "matrix": [5, 10], "x": 12.5, "y": 5.25},
+ {"label": "5,11", "matrix": [5, 11], "x": 13.5, "y": 5.25, "w": 1.5},
+ {"label": "5,12", "matrix": [5, 12], "x": 15.25, "y": 5.25},
+ {"label": "5,13", "matrix": [5, 13], "x": 16.25, "y": 5.25},
+ {"label": "5,15", "matrix": [5, 15], "x": 17.25, "y": 5.25}
+ ]
+ },
+ "LAYOUT_tkl_iso_tsangan": {
+ "layout": [
+ {"label": "0,0", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "0,1", "matrix": [0, 1], "x": 2, "y": 0},
+ {"label": "0,2", "matrix": [0, 2], "x": 3, "y": 0},
+ {"label": "0,3", "matrix": [0, 3], "x": 4, "y": 0},
+ {"label": "0,4", "matrix": [0, 4], "x": 5, "y": 0},
+ {"label": "0,5", "matrix": [0, 5], "x": 6.5, "y": 0},
+ {"label": "0,6", "matrix": [0, 6], "x": 7.5, "y": 0},
+ {"label": "0,7", "matrix": [0, 7], "x": 8.5, "y": 0},
+ {"label": "0,8", "matrix": [0, 8], "x": 9.5, "y": 0},
+ {"label": "0,9", "matrix": [0, 9], "x": 11, "y": 0},
+ {"label": "0,10", "matrix": [0, 10], "x": 12, "y": 0},
+ {"label": "0,11", "matrix": [0, 11], "x": 13, "y": 0},
+ {"label": "0,12", "matrix": [0, 12], "x": 14, "y": 0},
+ {"label": "0,13", "matrix": [0, 13], "x": 15.25, "y": 0},
+ {"label": "0,14", "matrix": [0, 14], "x": 16.25, "y": 0},
+ {"label": "0,15", "matrix": [0, 15], "x": 17.25, "y": 0},
+ {"label": "1,0", "matrix": [1, 0], "x": 0, "y": 1.25},
+ {"label": "1,1", "matrix": [1, 1], "x": 1, "y": 1.25},
+ {"label": "1,2", "matrix": [1, 2], "x": 2, "y": 1.25},
+ {"label": "1,3", "matrix": [1, 3], "x": 3, "y": 1.25},
+ {"label": "1,4", "matrix": [1, 4], "x": 4, "y": 1.25},
+ {"label": "1,5", "matrix": [1, 5], "x": 5, "y": 1.25},
+ {"label": "1,6", "matrix": [1, 6], "x": 6, "y": 1.25},
+ {"label": "1,7", "matrix": [1, 7], "x": 7, "y": 1.25},
+ {"label": "1,8", "matrix": [1, 8], "x": 8, "y": 1.25},
+ {"label": "1,9", "matrix": [1, 9], "x": 9, "y": 1.25},
+ {"label": "1,10", "matrix": [1, 10], "x": 10, "y": 1.25},
+ {"label": "1,11", "matrix": [1, 11], "x": 11, "y": 1.25},
+ {"label": "1,12", "matrix": [1, 12], "x": 12, "y": 1.25},
+ {"label": "1,14", "matrix": [1, 14], "x": 13, "y": 1.25, "w": 2},
+ {"label": "3,14", "matrix": [3, 14], "x": 15.25, "y": 1.25},
+ {"label": "2,15", "matrix": [2, 15], "x": 16.25, "y": 1.25},
+ {"label": "1,15", "matrix": [1, 15], "x": 17.25, "y": 1.25},
+ {"label": "2,0", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"label": "2,1", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"label": "2,2", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"label": "2,3", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"label": "2,4", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"label": "2,5", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"label": "2,6", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"label": "2,7", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"label": "2,8", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"label": "2,9", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"label": "2,10", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"label": "2,11", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"label": "2,12", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+ {"label": "2,14", "matrix": [2, 14], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+ {"label": "4,14", "matrix": [4, 14], "x": 15.25, "y": 2.25},
+ {"label": "4,15", "matrix": [4, 15], "x": 16.25, "y": 2.25},
+ {"label": "3,15", "matrix": [3, 15], "x": 17.25, "y": 2.25},
+ {"label": "3,0", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"label": "3,1", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+ {"label": "3,2", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+ {"label": "3,3", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+ {"label": "3,4", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+ {"label": "3,5", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+ {"label": "3,6", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+ {"label": "3,7", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+ {"label": "3,8", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+ {"label": "3,9", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+ {"label": "3,10", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+ {"label": "3,11", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+ {"label": "3,12", "matrix": [3, 12], "x": 12.75, "y": 3.25},
+ {"label": "4,0", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+ {"label": "4,1", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+ {"label": "4,2", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+ {"label": "4,3", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+ {"label": "4,4", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+ {"label": "4,5", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+ {"label": "4,6", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+ {"label": "4,7", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+ {"label": "4,8", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+ {"label": "4,9", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+ {"label": "4,10", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+ {"label": "4,11", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+ {"label": "4,13", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+ {"label": "5,14", "matrix": [5, 14], "x": 16.25, "y": 4.25},
+ {"label": "5,0", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+ {"label": "5,1", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+ {"label": "5,2", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+ {"label": "5,6", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+ {"label": "5,9", "matrix": [5, 9], "x": 11, "y": 5.25, "w": 1.5},
+ {"label": "5,10", "matrix": [5, 10], "x": 12.5, "y": 5.25},
+ {"label": "5,11", "matrix": [5, 11], "x": 13.5, "y": 5.25, "w": 1.5},
+ {"label": "5,12", "matrix": [5, 12], "x": 15.25, "y": 5.25},
+ {"label": "5,13", "matrix": [5, 13], "x": 16.25, "y": 5.25},
+ {"label": "5,15", "matrix": [5, 15], "x": 17.25, "y": 5.25}
+ ]
+ },
+ "LAYOUT_tkl_jis": {
+ "layout": [
+ {"label": "0,0", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "0,1", "matrix": [0, 1], "x": 2, "y": 0},
+ {"label": "0,2", "matrix": [0, 2], "x": 3, "y": 0},
+ {"label": "0,3", "matrix": [0, 3], "x": 4, "y": 0},
+ {"label": "0,4", "matrix": [0, 4], "x": 5, "y": 0},
+ {"label": "0,5", "matrix": [0, 5], "x": 6.5, "y": 0},
+ {"label": "0,6", "matrix": [0, 6], "x": 7.5, "y": 0},
+ {"label": "0,7", "matrix": [0, 7], "x": 8.5, "y": 0},
+ {"label": "0,8", "matrix": [0, 8], "x": 9.5, "y": 0},
+ {"label": "0,9", "matrix": [0, 9], "x": 11, "y": 0},
+ {"label": "0,10", "matrix": [0, 10], "x": 12, "y": 0},
+ {"label": "0,11", "matrix": [0, 11], "x": 13, "y": 0},
+ {"label": "0,12", "matrix": [0, 12], "x": 14, "y": 0},
+ {"label": "0,13", "matrix": [0, 13], "x": 15.25, "y": 0},
+ {"label": "0,14", "matrix": [0, 14], "x": 16.25, "y": 0},
+ {"label": "0,15", "matrix": [0, 15], "x": 17.25, "y": 0},
+ {"label": "1,0", "matrix": [1, 0], "x": 0, "y": 1.25},
+ {"label": "1,1", "matrix": [1, 1], "x": 1, "y": 1.25},
+ {"label": "1,2", "matrix": [1, 2], "x": 2, "y": 1.25},
+ {"label": "1,3", "matrix": [1, 3], "x": 3, "y": 1.25},
+ {"label": "1,4", "matrix": [1, 4], "x": 4, "y": 1.25},
+ {"label": "1,5", "matrix": [1, 5], "x": 5, "y": 1.25},
+ {"label": "1,6", "matrix": [1, 6], "x": 6, "y": 1.25},
+ {"label": "1,7", "matrix": [1, 7], "x": 7, "y": 1.25},
+ {"label": "1,8", "matrix": [1, 8], "x": 8, "y": 1.25},
+ {"label": "1,9", "matrix": [1, 9], "x": 9, "y": 1.25},
+ {"label": "1,10", "matrix": [1, 10], "x": 10, "y": 1.25},
+ {"label": "1,11", "matrix": [1, 11], "x": 11, "y": 1.25},
+ {"label": "1,12", "matrix": [1, 12], "x": 12, "y": 1.25},
+ {"label": "1,13", "matrix": [1, 13], "x": 13, "y": 1.25},
+ {"label": "1,14", "matrix": [1, 14], "x": 14, "y": 1.25},
+ {"label": "3,14", "matrix": [3, 14], "x": 15.25, "y": 1.25},
+ {"label": "2,15", "matrix": [2, 15], "x": 16.25, "y": 1.25},
+ {"label": "1,15", "matrix": [1, 15], "x": 17.25, "y": 1.25},
+ {"label": "2,0", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"label": "2,1", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"label": "2,2", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"label": "2,3", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"label": "2,4", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"label": "2,5", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"label": "2,6", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"label": "2,7", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"label": "2,8", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"label": "2,9", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"label": "2,10", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"label": "2,11", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"label": "2,12", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+ {"label": "2,14", "matrix": [2, 14], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+ {"label": "4,14", "matrix": [4, 14], "x": 15.25, "y": 2.25},
+ {"label": "4,15", "matrix": [4, 15], "x": 16.25, "y": 2.25},
+ {"label": "3,15", "matrix": [3, 15], "x": 17.25, "y": 2.25},
+ {"label": "3,0", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"label": "3,1", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+ {"label": "3,2", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+ {"label": "3,3", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+ {"label": "3,4", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+ {"label": "3,5", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+ {"label": "3,6", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+ {"label": "3,7", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+ {"label": "3,8", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+ {"label": "3,9", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+ {"label": "3,10", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+ {"label": "3,11", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+ {"label": "3,12", "matrix": [3, 12], "x": 12.75, "y": 3.25},
+ {"label": "4,0", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+ {"label": "4,2", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+ {"label": "4,3", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+ {"label": "4,4", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+ {"label": "4,5", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+ {"label": "4,6", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+ {"label": "4,7", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+ {"label": "4,8", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+ {"label": "4,9", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+ {"label": "4,10", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+ {"label": "4,11", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+ {"label": "4,12", "matrix": [4, 12], "x": 12.25, "y": 4.25},
+ {"label": "4,13", "matrix": [4, 13], "x": 13.25, "y": 4.25, "w": 1.75},
+ {"label": "5,14", "matrix": [5, 14], "x": 16.25, "y": 4.25},
+ {"label": "5,0", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+ {"label": "5,1", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+ {"label": "5,2", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+ {"label": "5,4", "matrix": [5, 4], "x": 4, "y": 5.25, "w": 1.5},
+ {"label": "5,6", "matrix": [5, 6], "x": 5.5, "y": 5.25, "w": 2.5},
+ {"label": "5,7", "matrix": [5, 7], "x": 8, "y": 5.25, "w": 1.5},
+ {"label": "5,8", "matrix": [5, 8], "x": 9.5, "y": 5.25, "w": 1.5},
+ {"label": "5,9", "matrix": [5, 9], "x": 11, "y": 5.25, "w": 1.5},
+ {"label": "5,10", "matrix": [5, 10], "x": 12.5, "y": 5.25},
+ {"label": "5,11", "matrix": [5, 11], "x": 13.5, "y": 5.25, "w": 1.5},
+ {"label": "5,12", "matrix": [5, 12], "x": 15.25, "y": 5.25},
+ {"label": "5,13", "matrix": [5, 13], "x": 16.25, "y": 5.25},
+ {"label": "5,15", "matrix": [5, 15], "x": 17.25, "y": 5.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/cipulot/ec_tkl/keymaps/default/keymap.c b/keyboards/cipulot/ec_tkl/keymaps/default/keymap.c
new file mode 100644
index 0000000000..983bdefe8a
--- /dev/null
+++ b/keyboards/cipulot/ec_tkl/keymaps/default/keymap.c
@@ -0,0 +1,39 @@
+/* Copyright 2023 Cipulot
+ *
+ * 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 3 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 .
+ */
+
+#include QMK_KEYBOARD_H
+
+#include "keymap_japanese.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ // clang-format off
+ [0] = LAYOUT_all(
+ 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,
+ 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, JP_YEN, KC_BSPC, KC_INS, KC_HOME, KC_PGUP,
+ 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,
+ 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,
+ KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, JP_UNDS, KC_RSFT, KC_UP,
+ KC_LCTL, KC_LGUI, KC_LALT, JP_MHEN, KC_SPC, JP_KANA, KC_RALT, KC_RGUI, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT),
+
+ [1] = LAYOUT_all(
+ QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)
+ // clang-format on
+};
diff --git a/keyboards/cipulot/ec_tkl/keymaps/tkl_ansi_tsangan/keymap.c b/keyboards/cipulot/ec_tkl/keymaps/tkl_ansi_tsangan/keymap.c
new file mode 100644
index 0000000000..ba948b4fc1
--- /dev/null
+++ b/keyboards/cipulot/ec_tkl/keymaps/tkl_ansi_tsangan/keymap.c
@@ -0,0 +1,37 @@
+/* Copyright 2023 Cipulot
+ *
+ * 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 3 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 .
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ // clang-format off
+ [0] = LAYOUT_tkl_ansi_tsangan(
+ 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,
+ 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,
+ 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,
+ 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,
+ 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,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT),
+
+ [1] = LAYOUT_tkl_ansi_tsangan(
+ QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)
+ // clang-format on
+};
diff --git a/keyboards/cipulot/ec_tkl/keymaps/tkl_iso_tsangan/keymap.c b/keyboards/cipulot/ec_tkl/keymaps/tkl_iso_tsangan/keymap.c
new file mode 100644
index 0000000000..1689d44d40
--- /dev/null
+++ b/keyboards/cipulot/ec_tkl/keymaps/tkl_iso_tsangan/keymap.c
@@ -0,0 +1,37 @@
+/* Copyright 2023 Cipulot
+ *
+ * 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 3 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 .
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ // clang-format off
+ [0] = LAYOUT_tkl_iso_tsangan(
+ 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,
+ 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,
+ 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_ENT, KC_DEL, KC_END, KC_PGDN,
+ 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_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_UP,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT),
+
+ [1] = LAYOUT_tkl_iso_tsangan(
+ QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)
+ // clang-format on
+};
diff --git a/keyboards/cipulot/ec_tkl/keymaps/tkl_jis/keymap.c b/keyboards/cipulot/ec_tkl/keymaps/tkl_jis/keymap.c
new file mode 100644
index 0000000000..e44575f74f
--- /dev/null
+++ b/keyboards/cipulot/ec_tkl/keymaps/tkl_jis/keymap.c
@@ -0,0 +1,39 @@
+/* Copyright 2023 Cipulot
+ *
+ * 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 3 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 .
+ */
+
+#include QMK_KEYBOARD_H
+
+#include "keymap_japanese.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ // clang-format off
+ [0] = LAYOUT_tkl_jis(
+ 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,
+ 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,
+ 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,
+ 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,
+ 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,
+ 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),
+
+ [1] = LAYOUT_tkl_jis(
+ QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)
+ // clang-format on
+};
diff --git a/keyboards/cipulot/ec_tkl/keymaps/via/config.h b/keyboards/cipulot/ec_tkl/keymaps/via/config.h
new file mode 100644
index 0000000000..1ab0d3d9aa
--- /dev/null
+++ b/keyboards/cipulot/ec_tkl/keymaps/via/config.h
@@ -0,0 +1,20 @@
+/* Copyright 2023 Cipulot
+ *
+ * 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 3 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 .
+ */
+
+#pragma once
+
+// This is the firmware version for VIA support to avoid conflicts on menu fetching
+#define VIA_FIRMWARE_VERSION 1
diff --git a/keyboards/cipulot/ec_tkl/keymaps/via/keymap.c b/keyboards/cipulot/ec_tkl/keymaps/via/keymap.c
new file mode 100644
index 0000000000..983bdefe8a
--- /dev/null
+++ b/keyboards/cipulot/ec_tkl/keymaps/via/keymap.c
@@ -0,0 +1,39 @@
+/* Copyright 2023 Cipulot
+ *
+ * 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 3 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 .
+ */
+
+#include QMK_KEYBOARD_H
+
+#include "keymap_japanese.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ // clang-format off
+ [0] = LAYOUT_all(
+ 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,
+ 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, JP_YEN, KC_BSPC, KC_INS, KC_HOME, KC_PGUP,
+ 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,
+ 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,
+ KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, JP_UNDS, KC_RSFT, KC_UP,
+ KC_LCTL, KC_LGUI, KC_LALT, JP_MHEN, KC_SPC, JP_KANA, KC_RALT, KC_RGUI, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT),
+
+ [1] = LAYOUT_all(
+ QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)
+ // clang-format on
+};
diff --git a/keyboards/cipulot/ec_tkl/keymaps/via/rules.mk b/keyboards/cipulot/ec_tkl/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/cipulot/ec_tkl/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/cipulot/ec_tkl/mcuconf.h b/keyboards/cipulot/ec_tkl/mcuconf.h
new file mode 100644
index 0000000000..206928272f
--- /dev/null
+++ b/keyboards/cipulot/ec_tkl/mcuconf.h
@@ -0,0 +1,25 @@
+/* Copyright 2023 Cipulot
+ *
+ * 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 3 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 .
+ */
+
+#pragma once
+
+#include_next
+
+#undef STM32_ADC_USE_ADC1
+#define STM32_ADC_USE_ADC1 TRUE
+
+#undef STM32_PWM_USE_TIM3
+#define STM32_PWM_USE_TIM3 TRUE
diff --git a/keyboards/cipulot/ec_tkl/post_rules.mk b/keyboards/cipulot/ec_tkl/post_rules.mk
new file mode 100644
index 0000000000..d726a112a8
--- /dev/null
+++ b/keyboards/cipulot/ec_tkl/post_rules.mk
@@ -0,0 +1,3 @@
+ifeq ($(strip $(VIA_ENABLE)), yes)
+ SRC += keyboards/cipulot/common/via_ec.c
+endif
diff --git a/keyboards/cipulot/ec_tkl/readme.md b/keyboards/cipulot/ec_tkl/readme.md
new file mode 100644
index 0000000000..31467b94d7
--- /dev/null
+++ b/keyboards/cipulot/ec_tkl/readme.md
@@ -0,0 +1,26 @@
+# EC TKL
+
+![EC TKL PCB](https://i.imgur.com/jQTHGzBh.png)
+
+Universal TKL Electrostatic Capacitive PCB, with multi-layout support.
+
+* Keyboard Maintainer: [cipulot](https://github.com/cipulot)
+* Hardware Supported: EC TKL PCB Rev 1.1
+* Hardware Availability: TBD
+
+Make example for this keyboard (after setting up your build environment):
+
+ make cipulot/ec_tkl:default
+
+Flashing example for this keyboard:
+
+ make cipulot/ec_tkl:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+* **Physical reset**: Long short the exposed pins on the PCB
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/cipulot/ec_tkl/rules.mk b/keyboards/cipulot/ec_tkl/rules.mk
new file mode 100644
index 0000000000..318e0215ce
--- /dev/null
+++ b/keyboards/cipulot/ec_tkl/rules.mk
@@ -0,0 +1,5 @@
+CUSTOM_MATRIX = lite
+ANALOG_DRIVER_REQUIRED = yes
+VPATH += keyboards/cipulot/common
+SRC += matrix.c ec_board.c ec_switch_matrix.c
+OPT = 2