summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--keyboards/cipulot/ec_60/config.h45
-rw-r--r--keyboards/cipulot/ec_60/ec_switch_matrix.c183
-rw-r--r--keyboards/cipulot/ec_60/ec_switch_matrix.h36
-rw-r--r--keyboards/cipulot/ec_60/halconf.h21
-rw-r--r--keyboards/cipulot/ec_60/info.json309
-rw-r--r--keyboards/cipulot/ec_60/keymaps/60_ansi_tsangan/keymap.c47
-rw-r--r--keyboards/cipulot/ec_60/keymaps/60_iso_tsangan/keymap.c47
-rw-r--r--keyboards/cipulot/ec_60/keymaps/60_jis/keymap.c49
-rw-r--r--keyboards/cipulot/ec_60/keymaps/default/keymap.c49
-rw-r--r--keyboards/cipulot/ec_60/keymaps/via/config.h20
-rw-r--r--keyboards/cipulot/ec_60/keymaps/via/keymap.c49
-rw-r--r--keyboards/cipulot/ec_60/keymaps/via/rules.mk3
-rw-r--r--keyboards/cipulot/ec_60/keymaps/via/via_apc.c156
-rw-r--r--keyboards/cipulot/ec_60/matrix.c44
-rw-r--r--keyboards/cipulot/ec_60/mcuconf.h22
-rw-r--r--keyboards/cipulot/ec_60/readme.md27
-rw-r--r--keyboards/cipulot/ec_60/rules.mk3
17 files changed, 1110 insertions, 0 deletions
diff --git a/keyboards/cipulot/ec_60/config.h b/keyboards/cipulot/ec_60/config.h
new file mode 100644
index 0000000000..083b71cc13
--- /dev/null
+++ b/keyboards/cipulot/ec_60/config.h
@@ -0,0 +1,45 @@
+/* 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 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
+
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+/* Custom matrix pins and port select array */
+#define MATRIX_ROW_PINS \
+ { B15, A8, B0, A7, B1 }
+#define MATRIX_COL_CHANNELS \
+ { 0, 3, 1, 2, 5, 7, 6, 4 }
+#define MUX_SEL_PINS \
+ { B6, B5, B4 }
+
+/* Hardware peripherals pins */
+#define APLEX_EN_PIN_0 B7
+#define APLEX_EN_PIN_1 B3
+#define DISCHARGE_PIN A6
+#define ANALOG_PORT A3
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+#define DEFAULT_ACTUATION_LEVEL 550
+#define DEFAULT_RELEASE_LEVEL 500
+
+#define DISCHARGE_TIME 10
diff --git a/keyboards/cipulot/ec_60/ec_switch_matrix.c b/keyboards/cipulot/ec_60/ec_switch_matrix.c
new file mode 100644
index 0000000000..72220b8733
--- /dev/null
+++ b/keyboards/cipulot/ec_60/ec_switch_matrix.c
@@ -0,0 +1,183 @@
+/* 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 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 "ec_switch_matrix.h"
+#include "analog.h"
+#include "atomic_util.h"
+#include "print.h"
+#include "wait.h"
+
+/* Pin and port array */
+const uint32_t row_pins[] = MATRIX_ROW_PINS;
+const uint8_t col_channels[] = MATRIX_COL_CHANNELS;
+const uint32_t mux_sel_pins[] = MUX_SEL_PINS;
+
+static ecsm_config_t config;
+static uint16_t ecsm_sw_value[MATRIX_ROWS][MATRIX_COLS];
+
+static adc_mux adcMux;
+
+static inline void discharge_capacitor(void) {
+ writePinLow(DISCHARGE_PIN);
+}
+static inline void charge_capacitor(uint8_t row) {
+ writePinHigh(DISCHARGE_PIN);
+ writePinHigh(row_pins[row]);
+}
+
+static inline void init_mux_sel(void) {
+ for (int idx = 0; idx < 3; idx++) {
+ setPinOutput(mux_sel_pins[idx]);
+ }
+}
+
+static inline void select_mux(uint8_t col) {
+ uint8_t ch = col_channels[col];
+ writePin(mux_sel_pins[0], ch & 1);
+ writePin(mux_sel_pins[1], ch & 2);
+ writePin(mux_sel_pins[2], ch & 4);
+}
+
+static inline void init_row(void) {
+ for (int idx = 0; idx < MATRIX_ROWS; idx++) {
+ setPinOutput(row_pins[idx]);
+ writePinLow(row_pins[idx]);
+ }
+}
+
+/* Initialize the peripherals pins */
+int ecsm_init(ecsm_config_t const* const ecsm_config) {
+ // Initialize config
+ config = *ecsm_config;
+
+ palSetLineMode(ANALOG_PORT, PAL_MODE_INPUT_ANALOG);
+ adcMux = pinToMux(ANALOG_PORT);
+
+ //Dummy call to make sure that adcStart() has been called in the appropriate state
+ adc_read(adcMux);
+
+ // Initialize discharge pin as discharge mode
+ writePinLow(DISCHARGE_PIN);
+ setPinOutputOpenDrain(DISCHARGE_PIN);
+
+ // Initialize drive lines
+ init_row();
+
+ // Initialize multiplexer select pin
+ init_mux_sel();
+
+ // Enable AMUX
+ setPinOutput(APLEX_EN_PIN_0);
+ writePinLow(APLEX_EN_PIN_0);
+ setPinOutput(APLEX_EN_PIN_1);
+ writePinLow(APLEX_EN_PIN_1);
+
+ return 0;
+}
+
+int ecsm_update(ecsm_config_t const* const ecsm_config) {
+ // Save config
+ config = *ecsm_config;
+ return 0;
+}
+
+// Read the capacitive sensor value
+uint16_t ecsm_readkey_raw(uint8_t channel, uint8_t row, uint8_t col) {
+ uint16_t sw_value = 0;
+
+ // Select the multiplexer
+ if (channel == 0) {
+ writePinHigh(APLEX_EN_PIN_0);
+ select_mux(col);
+ writePinLow(APLEX_EN_PIN_0);
+ } else {
+ writePinHigh(APLEX_EN_PIN_1);
+ select_mux(col);
+ writePinLow(APLEX_EN_PIN_1);
+ }
+
+ // Set strobe pins to low state
+ writePinLow(row_pins[row]);
+ ATOMIC_BLOCK_FORCEON {
+ // Set the row pin to high state and have capacitor charge
+ charge_capacitor(row);
+ // Read the ADC value
+ sw_value = adc_read(adcMux);
+ }
+ // Discharge peak hold capacitor
+ discharge_capacitor();
+ // Waiting for the ghost capacitor to discharge fully
+ wait_us(DISCHARGE_TIME);
+
+ return sw_value;
+}
+
+// Update press/release state of key
+bool ecsm_update_key(matrix_row_t* current_row, uint8_t row, uint8_t col, uint16_t sw_value) {
+ bool current_state = (*current_row >> col) & 1;
+
+ // Press to release
+ if (current_state && sw_value < config.ecsm_actuation_threshold) {
+ *current_row &= ~(1 << col);
+ return true;
+ }
+
+ // Release to press
+ if ((!current_state) && sw_value > config.ecsm_release_threshold) {
+ *current_row |= (1 << col);
+ return true;
+ }
+
+ return false;
+}
+
+// Scan key values and update matrix state
+bool ecsm_matrix_scan(matrix_row_t current_matrix[]) {
+ bool updated = false;
+
+ // Disable AMUX of channel 1
+ writePinHigh(APLEX_EN_PIN_1);
+ for (int col = 0; col < sizeof(col_channels); col++) {
+ for (int row = 0; row < MATRIX_ROWS; row++) {
+ ecsm_sw_value[row][col] = ecsm_readkey_raw(0, row, col);
+ updated |= ecsm_update_key(&current_matrix[row], row, col, ecsm_sw_value[row][col]);
+ }
+ }
+
+ // Disable AMUX of channel 1
+ writePinHigh(APLEX_EN_PIN_0);
+ for (int col = 0; col < (sizeof(col_channels) - 1); col++) {
+ for (int row = 0; row < MATRIX_ROWS; row++) {
+ ecsm_sw_value[row][col + 8] = ecsm_readkey_raw(1, row, col);
+ updated |= ecsm_update_key(&current_matrix[row], row, col + 8, ecsm_sw_value[row][col + 8]);
+ }
+ }
+ return updated;
+}
+
+// Debug print key values
+void ecsm_print_matrix(void) {
+ for (int row = 0; row < MATRIX_ROWS; row++) {
+ for (int col = 0; col < MATRIX_COLS; col++) {
+ uprintf("%4d", ecsm_sw_value[row][col]);
+ if (col < (MATRIX_COLS - 1)) {
+ print(",");
+ }
+ }
+ print("\n");
+ }
+ print("\n");
+}
diff --git a/keyboards/cipulot/ec_60/ec_switch_matrix.h b/keyboards/cipulot/ec_60/ec_switch_matrix.h
new file mode 100644
index 0000000000..9dcb216caa
--- /dev/null
+++ b/keyboards/cipulot/ec_60/ec_switch_matrix.h
@@ -0,0 +1,36 @@
+/* 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 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 <stdint.h>
+#include <stdbool.h>
+
+#include "matrix.h"
+
+typedef struct {
+ uint16_t ecsm_actuation_threshold; // threshold for key release
+ uint16_t ecsm_release_threshold; // threshold for key press
+} ecsm_config_t;
+
+ecsm_config_t ecsm_config;
+
+int ecsm_init(ecsm_config_t const* const ecsm_config);
+int ecsm_update(ecsm_config_t const* const ecsm_config);
+bool ecsm_matrix_scan(matrix_row_t current_matrix[]);
+uint16_t ecsm_readkey_raw(uint8_t channel, uint8_t row, uint8_t col);
+bool ecsm_update_key(matrix_row_t* current_row, uint8_t row, uint8_t col, uint16_t sw_value);
+void ecsm_print_matrix(void);
diff --git a/keyboards/cipulot/ec_60/halconf.h b/keyboards/cipulot/ec_60/halconf.h
new file mode 100644
index 0000000000..5b71acecbb
--- /dev/null
+++ b/keyboards/cipulot/ec_60/halconf.h
@@ -0,0 +1,21 @@
+/* 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 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
+
+#define HAL_USE_ADC TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/cipulot/ec_60/info.json b/keyboards/cipulot/ec_60/info.json
new file mode 100644
index 0000000000..0a9e83ec5b
--- /dev/null
+++ b/keyboards/cipulot/ec_60/info.json
@@ -0,0 +1,309 @@
+{
+ "manufacturer": "Cipulot",
+ "keyboard_name": "EC 60",
+ "maintainer": "Cipulot",
+ "bootloader": "stm32-dfu",
+ "build": {
+ "lto": true
+ },
+ "diode_direction": "COL2ROW",
+ "features": {
+ "audio": false,
+ "backlight": false,
+ "bootmagic": true,
+ "command": false,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgblight": false
+ },
+ "mouse_key": {
+ "enabled": true
+ },
+ "processor": "STM32F401",
+ "url": "https://www.github.com/Cipulot/EC60",
+ "usb": {
+ "device_version": "0.0.1",
+ "pid": "0x6B84",
+ "shared_endpoint": {
+ "keyboard": true
+ },
+ "vid": "0x6369"
+ },
+ "layouts": {
+ "LAYOUT_all": {
+ "layout": [
+ { "label": "0,0", "matrix": [0, 0], "x": 0.0, "y": 0.0 },
+ { "label": "0,1", "matrix": [0, 1], "x": 1.0, "y": 0.0 },
+ { "label": "0,2", "matrix": [0, 2], "x": 2.0, "y": 0.0 },
+ { "label": "0,3", "matrix": [0, 3], "x": 3.0, "y": 0.0 },
+ { "label": "0,4", "matrix": [0, 4], "x": 4.0, "y": 0.0 },
+ { "label": "0,5", "matrix": [0, 5], "x": 5.0, "y": 0.0 },
+ { "label": "0,6", "matrix": [0, 6], "x": 6.0, "y": 0.0 },
+ { "label": "0,7", "matrix": [0, 7], "x": 7.0, "y": 0.0 },
+ { "label": "0,8", "matrix": [0, 8], "x": 8.0, "y": 0.0 },
+ { "label": "0,9", "matrix": [0, 9], "x": 9.0, "y": 0.0 },
+ { "label": "0,10", "matrix": [0, 10], "x": 10.0, "y": 0.0 },
+ { "label": "0,11", "matrix": [0, 11], "x": 11.0, "y": 0.0 },
+ { "label": "0,12", "matrix": [0, 12], "x": 12.0, "y": 0.0 },
+ { "label": "0,13", "matrix": [0, 13], "x": 13.0, "y": 0.0 },
+ { "label": "0,14", "matrix": [0, 14], "x": 14.0, "y": 0.0 },
+ { "label": "1,0", "matrix": [1, 0], "w": 1.5, "x": 0.0, "y": 1.0 },
+ { "label": "1,1", "matrix": [1, 1], "x": 1.5, "y": 1.0 },
+ { "label": "1,2", "matrix": [1, 2], "x": 2.5, "y": 1.0 },
+ { "label": "1,3", "matrix": [1, 3], "x": 3.5, "y": 1.0 },
+ { "label": "1,4", "matrix": [1, 4], "x": 4.5, "y": 1.0 },
+ { "label": "1,5", "matrix": [1, 5], "x": 5.5, "y": 1.0 },
+ { "label": "1,6", "matrix": [1, 6], "x": 6.5, "y": 1.0 },
+ { "label": "1,7", "matrix": [1, 7], "x": 7.5, "y": 1.0 },
+ { "label": "1,8", "matrix": [1, 8], "x": 8.5, "y": 1.0 },
+ { "label": "1,9", "matrix": [1, 9], "x": 9.5, "y": 1.0 },
+ { "label": "1,10", "matrix": [1, 10], "x": 10.5, "y": 1.0 },
+ { "label": "1,11", "matrix": [1, 11], "x": 11.5, "y": 1.0 },
+ { "label": "1,12", "matrix": [1, 12], "x": 12.5, "y": 1.0 },
+ { "label": "1,13", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1.0 },
+ { "label": "2,0", "matrix": [2, 0], "w": 1.75, "x": 0.0, "y": 2.0 },
+ { "label": "2,1", "matrix": [2, 1], "x": 1.75, "y": 2.0 },
+ { "label": "2,2", "matrix": [2, 2], "x": 2.75, "y": 2.0 },
+ { "label": "2,3", "matrix": [2, 3], "x": 3.75, "y": 2.0 },
+ { "label": "2,4", "matrix": [2, 4], "x": 4.75, "y": 2.0 },
+ { "label": "2,5", "matrix": [2, 5], "x": 5.75, "y": 2.0 },
+ { "label": "2,6", "matrix": [2, 6], "x": 6.75, "y": 2.0 },
+ { "label": "2,7", "matrix": [2, 7], "x": 7.75, "y": 2.0 },
+ { "label": "2,8", "matrix": [2, 8], "x": 8.75, "y": 2.0 },
+ { "label": "2,9", "matrix": [2, 9], "x": 9.75, "y": 2.0 },
+ { "label": "2,10", "matrix": [2, 10], "x": 10.75, "y": 2.0 },
+ { "label": "2,11", "matrix": [2, 11], "x": 11.75, "y": 2.0 },
+ { "label": "2,12", "matrix": [2, 12], "x": 12.75, "y": 2.0 },
+ { "label": "2,13", "matrix": [2, 13], "w": 1.25, "x": 13.75, "y": 2.0 },
+ { "label": "3,0", "matrix": [3, 0], "w": 1.25, "x": 0.0, "y": 3.0 },
+ { "label": "3,1", "matrix": [3, 1], "x": 1.25, "y": 3.0 },
+ { "label": "3,2", "matrix": [3, 2], "x": 2.25, "y": 3.0 },
+ { "label": "3,3", "matrix": [3, 3], "x": 3.25, "y": 3.0 },
+ { "label": "3,4", "matrix": [3, 4], "x": 4.25, "y": 3.0 },
+ { "label": "3,5", "matrix": [3, 5], "x": 5.25, "y": 3.0 },
+ { "label": "3,6", "matrix": [3, 6], "x": 6.25, "y": 3.0 },
+ { "label": "3,7", "matrix": [3, 7], "x": 7.25, "y": 3.0 },
+ { "label": "3,8", "matrix": [3, 8], "x": 8.25, "y": 3.0 },
+ { "label": "3,9", "matrix": [3, 9], "x": 9.25, "y": 3.0 },
+ { "label": "3,10", "matrix": [3, 10], "x": 10.25, "y": 3.0 },
+ { "label": "3,11", "matrix": [3, 11], "x": 11.25, "y": 3.0 },
+ { "label": "3,12", "matrix": [3, 12], "w": 0.75, "x": 12.25, "y": 3.0 },
+ { "label": "3,13", "matrix": [3, 13], "w": 0.5, "x": 13.0, "y": 3.0 },
+ { "label": "3,14", "matrix": [3, 14], "w": 0.5, "x": 13.5, "y": 3.0 },
+ { "label": "4,13", "matrix": [4, 13], "w": 0.5, "x": 14.0, "y": 3.0 },
+ { "label": "4,14", "matrix": [4, 14], "w": 0.5, "x": 14.5, "y": 3.0 },
+ { "label": "4,0", "matrix": [4, 0], "w": 1.5, "x": 0.0, "y": 4.0 },
+ { "label": "4,1", "matrix": [4, 1], "x": 1.5, "y": 4.0 },
+ { "label": "4,2", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4.0 },
+ { "label": "4,4", "matrix": [4, 4], "w": 1.5, "x": 4.0, "y": 4.0 },
+ { "label": "4,5", "matrix": [4, 5], "w": 1.25, "x": 5.5, "y": 4.0 },
+ { "label": "4,6", "matrix": [4, 6], "w": 1.25, "x": 6.75, "y": 4.0 },
+ { "label": "4,7", "matrix": [4, 7], "w": 1.5, "x": 8.0, "y": 4.0 },
+ { "label": "4,9", "matrix": [4, 9], "w": 1.5, "x": 9.5, "y": 4.0 },
+ { "label": "4,10", "matrix": [4, 10], "w": 1.5, "x": 11.0, "y": 4.0 },
+ { "label": "4,11", "matrix": [4, 11], "x": 12.5, "y": 4.0 },
+ { "label": "4,12", "matrix": [4, 12], "w": 1.5, "x": 13.5, "y": 4.0 }
+ ]
+ },
+ "LAYOUT_60_ansi_tsangan": {
+ "layout": [
+ { "label": "0,0", "matrix": [0, 0], "x": 0.0, "y": 0.0 },
+ { "label": "0,1", "matrix": [0, 1], "x": 1.0, "y": 0.0 },
+ { "label": "0,2", "matrix": [0, 2], "x": 2.0, "y": 0.0 },
+ { "label": "0,3", "matrix": [0, 3], "x": 3.0, "y": 0.0 },
+ { "label": "0,4", "matrix": [0, 4], "x": 4.0, "y": 0.0 },
+ { "label": "0,5", "matrix": [0, 5], "x": 5.0, "y": 0.0 },
+ { "label": "0,6", "matrix": [0, 6], "x": 6.0, "y": 0.0 },
+ { "label": "0,7", "matrix": [0, 7], "x": 7.0, "y": 0.0 },
+ { "label": "0,8", "matrix": [0, 8], "x": 8.0, "y": 0.0 },
+ { "label": "0,9", "matrix": [0, 9], "x": 9.0, "y": 0.0 },
+ { "label": "0,10", "matrix": [0, 10], "x": 10.0, "y": 0.0 },
+ { "label": "0,11", "matrix": [0, 11], "x": 11.0, "y": 0.0 },
+ { "label": "0,12", "matrix": [0, 12], "x": 12.0, "y": 0.0 },
+ { "label": "0,14", "matrix": [0, 14], "w": 2, "x": 13.0, "y": 0.0 },
+ { "label": "1,0", "matrix": [1, 0], "w": 1.5, "x": 0.0, "y": 1.0 },
+ { "label": "1,1", "matrix": [1, 1], "x": 1.5, "y": 1.0 },
+ { "label": "1,2", "matrix": [1, 2], "x": 2.5, "y": 1.0 },
+ { "label": "1,3", "matrix": [1, 3], "x": 3.5, "y": 1.0 },
+ { "label": "1,4", "matrix": [1, 4], "x": 4.5, "y": 1.0 },
+ { "label": "1,5", "matrix": [1, 5], "x": 5.5, "y": 1.0 },
+ { "label": "1,6", "matrix": [1, 6], "x": 6.5, "y": 1.0 },
+ { "label": "1,7", "matrix": [1, 7], "x": 7.5, "y": 1.0 },
+ { "label": "1,8", "matrix": [1, 8], "x": 8.5, "y": 1.0 },
+ { "label": "1,9", "matrix": [1, 9], "x": 9.5, "y": 1.0 },
+ { "label": "1,10", "matrix": [1, 10], "x": 10.5, "y": 1.0 },
+ { "label": "1,11", "matrix": [1, 11], "x": 11.5, "y": 1.0 },
+ { "label": "1,12", "matrix": [1, 12], "x": 12.5, "y": 1.0 },
+ { "label": "1,13", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1.0 },
+ { "label": "2,0", "matrix": [2, 0], "w": 1.75, "x": 0.0, "y": 2.0 },
+ { "label": "2,1", "matrix": [2, 1], "x": 1.75, "y": 2.0 },
+ { "label": "2,2", "matrix": [2, 2], "x": 2.75, "y": 2.0 },
+ { "label": "2,3", "matrix": [2, 3], "x": 3.75, "y": 2.0 },
+ { "label": "2,4", "matrix": [2, 4], "x": 4.75, "y": 2.0 },
+ { "label": "2,5", "matrix": [2, 5], "x": 5.75, "y": 2.0 },
+ { "label": "2,6", "matrix": [2, 6], "x": 6.75, "y": 2.0 },
+ { "label": "2,7", "matrix": [2, 7], "x": 7.75, "y": 2.0 },
+ { "label": "2,8", "matrix": [2, 8], "x": 8.75, "y": 2.0 },
+ { "label": "2,9", "matrix": [2, 9], "x": 9.75, "y": 2.0 },
+ { "label": "2,10", "matrix": [2, 10], "x": 10.75, "y": 2.0 },
+ { "label": "2,11", "matrix": [2, 11], "x": 11.75, "y": 2.0 },
+ { "label": "2,13", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2.0 },
+ { "label": "3,0", "matrix": [3, 0], "w": 2.25, "x": 0.0, "y": 3.0 },
+ { "label": "3,2", "matrix": [3, 2], "x": 2.25, "y": 3.0 },
+ { "label": "3,3", "matrix": [3, 3], "x": 3.25, "y": 3.0 },
+ { "label": "3,4", "matrix": [3, 4], "x": 4.25, "y": 3.0 },
+ { "label": "3,5", "matrix": [3, 5], "x": 5.25, "y": 3.0 },
+ { "label": "3,6", "matrix": [3, 6], "x": 6.25, "y": 3.0 },
+ { "label": "3,7", "matrix": [3, 7], "x": 7.25, "y": 3.0 },
+ { "label": "3,8", "matrix": [3, 8], "x": 8.25, "y": 3.0 },
+ { "label": "3,9", "matrix": [3, 9], "x": 9.25, "y": 3.0 },
+ { "label": "3,10", "matrix": [3, 10], "x": 10.25, "y": 3.0 },
+ { "label": "3,11", "matrix": [3, 11], "x": 11.25, "y": 3.0 },
+ { "label": "4,13", "matrix": [4, 13], "w": 2.75, "x": 12.25, "y": 3.0 },
+ { "label": "4,0", "matrix": [4, 0], "w": 1.5, "x": 0.0, "y": 4.0 },
+ { "label": "4,1", "matrix": [4, 1], "x": 1.5, "y": 4.0 },
+ { "label": "4,2", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4.0 },
+ { "label": "4,6", "matrix": [4, 6], "w": 7, "x": 4.0, "y": 4.0 },
+ { "label": "4,10", "matrix": [4, 10], "w": 1.5, "x": 11.0, "y": 4.0 },
+ { "label": "4,11", "matrix": [4, 11], "x": 12.5, "y": 4.0 },
+ { "label": "4,12", "matrix": [4, 12], "w": 1.5, "x": 13.5, "y": 4.0 }
+ ]
+ },
+ "LAYOUT_60_iso_tsangan": {
+ "layout": [
+ { "label": "0,0", "matrix": [0, 0], "x": 0.0, "y": 0.0 },
+ { "label": "0,1", "matrix": [0, 1], "x": 1.0, "y": 0.0 },
+ { "label": "0,2", "matrix": [0, 2], "x": 2.0, "y": 0.0 },
+ { "label": "0,3", "matrix": [0, 3], "x": 3.0, "y": 0.0 },
+ { "label": "0,4", "matrix": [0, 4], "x": 4.0, "y": 0.0 },
+ { "label": "0,5", "matrix": [0, 5], "x": 5.0, "y": 0.0 },
+ { "label": "0,6", "matrix": [0, 6], "x": 6.0, "y": 0.0 },
+ { "label": "0,7", "matrix": [0, 7], "x": 7.0, "y": 0.0 },
+ { "label": "0,8", "matrix": [0, 8], "x": 8.0, "y": 0.0 },
+ { "label": "0,9", "matrix": [0, 9], "x": 9.0, "y": 0.0 },
+ { "label": "0,10", "matrix": [0, 10], "x": 10.0, "y": 0.0 },
+ { "label": "0,11", "matrix": [0, 11], "x": 11.0, "y": 0.0 },
+ { "label": "0,12", "matrix": [0, 12], "x": 12.0, "y": 0.0 },
+ { "label": "0,14", "matrix": [0, 14], "w": 2, "x": 13.0, "y": 0.0 },
+ { "label": "1,0", "matrix": [1, 0], "w": 1.5, "x": 0.0, "y": 1.0 },
+ { "label": "1,1", "matrix": [1, 1], "x": 1.5, "y": 1.0 },
+ { "label": "1,2", "matrix": [1, 2], "x": 2.5, "y": 1.0 },
+ { "label": "1,3", "matrix": [1, 3], "x": 3.5, "y": 1.0 },
+ { "label": "1,4", "matrix": [1, 4], "x": 4.5, "y": 1.0 },
+ { "label": "1,5", "matrix": [1, 5], "x": 5.5, "y": 1.0 },
+ { "label": "1,6", "matrix": [1, 6], "x": 6.5, "y": 1.0 },
+ { "label": "1,7", "matrix": [1, 7], "x": 7.5, "y": 1.0 },
+ { "label": "1,8", "matrix": [1, 8], "x": 8.5, "y": 1.0 },
+ { "label": "1,9", "matrix": [1, 9], "x": 9.5, "y": 1.0 },
+ { "label": "1,10", "matrix": [1, 10], "x": 10.5, "y": 1.0 },
+ { "label": "1,11", "matrix": [1, 11], "x": 11.5, "y": 1.0 },
+ { "label": "1,12", "matrix": [1, 12], "x": 12.5, "y": 1.0 },
+ { "h": 2, "label": "1,13", "matrix": [1, 13], "w": 1.25, "x": 13.75, "y": 1.0 },
+ { "label": "2,0", "matrix": [2, 0], "w": 1.75, "x": 0.0, "y": 2.0 },
+ { "label": "2,1", "matrix": [2, 1], "x": 1.75, "y": 2.0 },
+ { "label": "2,2", "matrix": [2, 2], "x": 2.75, "y": 2.0 },
+ { "label": "2,3", "matrix": [2, 3], "x": 3.75, "y": 2.0 },
+ { "label": "2,4", "matrix": [2, 4], "x": 4.75, "y": 2.0 },
+ { "label": "2,5", "matrix": [2, 5], "x": 5.75, "y": 2.0 },
+ { "label": "2,6", "matrix": [2, 6], "x": 6.75, "y": 2.0 },
+ { "label": "2,7", "matrix": [2, 7], "x": 7.75, "y": 2.0 },
+ { "label": "2,8", "matrix": [2, 8], "x": 8.75, "y": 2.0 },
+ { "label": "2,9", "matrix": [2, 9], "x": 9.75, "y": 2.0 },
+ { "label": "2,10", "matrix": [2, 10], "x": 10.75, "y": 2.0 },
+ { "label": "2,11", "matrix": [2, 11], "x": 11.75, "y": 2.0 },
+ { "label": "2,12", "matrix": [2, 12], "x": 12.75, "y": 2.0 },
+ { "label": "3,0", "matrix": [3, 0], "w": 1.25, "x": 0.0, "y": 3.0 },
+ { "label": "3,1", "matrix": [3, 1], "x": 1.25, "y": 3.0 },
+ { "label": "3,2", "matrix": [3, 2], "x": 2.25, "y": 3.0 },
+ { "label": "3,3", "matrix": [3, 3], "x": 3.25, "y": 3.0 },
+ { "label": "3,4", "matrix": [3, 4], "x": 4.25, "y": 3.0 },
+ { "label": "3,5", "matrix": [3, 5], "x": 5.25, "y": 3.0 },
+ { "label": "3,6", "matrix": [3, 6], "x": 6.25, "y": 3.0 },
+ { "label": "3,7", "matrix": [3, 7], "x": 7.25, "y": 3.0 },
+ { "label": "3,8", "matrix": [3, 8], "x": 8.25, "y": 3.0 },
+ { "label": "3,9", "matrix": [3, 9], "x": 9.25, "y": 3.0 },
+ { "label": "3,10", "matrix": [3, 10], "x": 10.25, "y": 3.0 },
+ { "label": "3,11", "matrix": [3, 11], "x": 11.25, "y": 3.0 },
+ { "label": "4,13", "matrix": [4, 13], "w": 2.75, "x": 12.25, "y": 3.0 },
+ { "label": "4,0", "matrix": [4, 0], "w": 1.5, "x": 0.0, "y": 4.0 },
+ { "label": "4,1", "matrix": [4, 1], "x": 1.5, "y": 4.0 },
+ { "label": "4,2", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4.0 },
+ { "label": "4,6", "matrix": [4, 6], "w": 7, "x": 4.0, "y": 4.0 },
+ { "label": "4,10", "matrix": [4, 10], "w": 1.5, "x": 11.0, "y": 4.0 },
+ { "label": "4,11", "matrix": [4, 11], "x": 12.5, "y": 4.0 },
+ { "label": "4,12", "matrix": [4, 12], "w": 1.5, "x": 13.5, "y": 4.0 }
+ ]
+ },
+ "LAYOUT_60_jis": {
+ "layout": [
+ { "label": "0,0", "matrix": [0, 0], "x": 0.0, "y": 0.0 },
+ { "label": "0,1", "matrix": [0, 1], "x": 1.0, "y": 0.0 },
+ { "label": "0,2", "matrix": [0, 2], "x": 2.0, "y": 0.0 },
+ { "label": "0,3", "matrix": [0, 3], "x": 3.0, "y": 0.0 },
+ { "label": "0,4", "matrix": [0, 4], "x": 4.0, "y": 0.0 },
+ { "label": "0,5", "matrix": [0, 5], "x": 5.0, "y": 0.0 },
+ { "label": "0,6", "matrix": [0, 6], "x": 6.0, "y": 0.0 },
+ { "label": "0,7", "matrix": [0, 7], "x": 7.0, "y": 0.0 },
+ { "label": "0,8", "matrix": [0, 8], "x": 8.0, "y": 0.0 },
+ { "label": "0,9", "matrix": [0, 9], "x": 9.0, "y": 0.0 },
+ { "label": "0,10", "matrix": [0, 10], "x": 10.0, "y": 0.0 },
+ { "label": "0,11", "matrix": [0, 11], "x": 11.0, "y": 0.0 },
+ { "label": "0,12", "matrix": [0, 12], "x": 12.0, "y": 0.0 },
+ { "label": "0,13", "matrix": [0, 13], "x": 13.0, "y": 0.0 },
+ { "label": "0,14", "matrix": [0, 14], "x": 14.0, "y": 0.0 },
+ { "label": "1,0", "matrix": [1, 0], "w": 1.5, "x": 0.0, "y": 1.0 },
+ { "label": "1,1", "matrix": [1, 1], "x": 1.5, "y": 1.0 },
+ { "label": "1,2", "matrix": [1, 2], "x": 2.5, "y": 1.0 },
+ { "label": "1,3", "matrix": [1, 3], "x": 3.5, "y": 1.0 },
+ { "label": "1,4", "matrix": [1, 4], "x": 4.5, "y": 1.0 },
+ { "label": "1,5", "matrix": [1, 5], "x": 5.5, "y": 1.0 },
+ { "label": "1,6", "matrix": [1, 6], "x": 6.5, "y": 1.0 },
+ { "label": "1,7", "matrix": [1, 7], "x": 7.5, "y": 1.0 },
+ { "label": "1,8", "matrix": [1, 8], "x": 8.5, "y": 1.0 },
+ { "label": "1,9", "matrix": [1, 9], "x": 9.5, "y": 1.0 },
+ { "label": "1,10", "matrix": [1, 10], "x": 10.5, "y": 1.0 },
+ { "label": "1,11", "matrix": [1, 11], "x": 11.5, "y": 1.0 },
+ { "label": "1,12", "matrix": [1, 12], "x": 12.5, "y": 1.0 },
+ { "h": 2, "label": "1,13", "matrix": [1, 13], "w": 1.25, "x": 13.75, "y": 1.0 },
+ { "label": "2,0", "matrix": [2, 0], "w": 1.75, "x": 0.0, "y": 2.0 },
+ { "label": "2,1", "matrix": [2, 1], "x": 1.75, "y": 2.0 },
+ { "label": "2,2", "matrix": [2, 2], "x": 2.75, "y": 2.0 },
+ { "label": "2,3", "matrix": [2, 3], "x": 3.75, "y": 2.0 },
+ { "label": "2,4", "matrix": [2, 4], "x": 4.75, "y": 2.0 },
+ { "label": "2,5", "matrix": [2, 5], "x": 5.75, "y": 2.0 },
+ { "label": "2,6", "matrix": [2, 6], "x": 6.75, "y": 2.0 },
+ { "label": "2,7", "matrix": [2, 7], "x": 7.75, "y": 2.0 },
+ { "label": "2,8", "matrix": [2, 8], "x": 8.75, "y": 2.0 },
+ { "label": "2,9", "matrix": [2, 9], "x": 9.75, "y": 2.0 },
+ { "label": "2,10", "matrix": [2, 10], "x": 10.75, "y": 2.0 },
+ { "label": "2,11", "matrix": [2, 11], "x": 11.75, "y": 2.0 },
+ { "label": "2,12", "matrix": [2, 12], "x": 12.75, "y": 2.0 },
+ { "label": "3,0", "matrix": [3, 0], "w": 2.25, "x": 0.0, "y": 3.0 },
+ { "label": "3,2", "matrix": [3, 2], "x": 2.25, "y": 3.0 },
+ { "label": "3,3", "matrix": [3, 3], "x": 3.25, "y": 3.0 },
+ { "label": "3,4", "matrix": [3, 4], "x": 4.25, "y": 3.0 },
+ { "label": "3,5", "matrix": [3, 5], "x": 5.25, "y": 3.0 },
+ { "label": "3,6", "matrix": [3, 6], "x": 6.25, "y": 3.0 },
+ { "label": "3,7", "matrix": [3, 7], "x": 7.25, "y": 3.0 },
+ { "label": "3,8", "matrix": [3, 8], "x": 8.25, "y": 3.0 },
+ { "label": "3,9", "matrix": [3, 9], "x": 9.25, "y": 3.0 },
+ { "label": "3,10", "matrix": [3, 10], "x": 10.25, "y": 3.0 },
+ { "label": "3,11", "matrix": [3, 11], "x": 11.25, "y": 3.0 },
+ { "label": "3,12", "matrix": [3, 12], "x": 12.25, "y": 3.0 },
+ { "label": "4,14", "matrix": [4, 14], "w": 1.75, "x": 13.25, "y": 3.0 },
+ { "label": "4,0", "matrix": [4, 0], "w": 1.5, "x": 0.0, "y": 4.0 },
+ { "label": "4,1", "matrix": [4, 1], "x": 1.5, "y": 4.0 },
+ { "label": "4,2", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4.0 },
+ { "label": "4,4", "matrix": [4, 4], "w": 1.5, "x": 4.0, "y": 4.0 },
+ { "label": "4,6", "matrix": [4, 6], "w": 2.5, "x": 5.5, "y": 4.0 },
+ { "label": "4,7", "matrix": [4, 7], "w": 1.5, "x": 8.0, "y": 4.0 },
+ { "label": "4,9", "matrix": [4, 9], "w": 1.5, "x": 9.5, "y": 4.0 },
+ { "label": "4,10", "matrix": [4, 10], "w": 1.5, "x": 11.0, "y": 4.0 },
+ { "label": "4,11", "matrix": [4, 11], "x": 12.5, "y": 4.0 },
+ { "label": "4,12", "matrix": [4, 12], "w": 1.5, "x": 13.5, "y": 4.0 }
+ ]
+ }
+ }
+}
diff --git a/keyboards/cipulot/ec_60/keymaps/60_ansi_tsangan/keymap.c b/keyboards/cipulot/ec_60/keymaps/60_ansi_tsangan/keymap.c
new file mode 100644
index 0000000000..82c1e711c9
--- /dev/null
+++ b/keyboards/cipulot/ec_60/keymaps/60_ansi_tsangan/keymap.c
@@ -0,0 +1,47 @@
+/* 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 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 QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT_60_ansi_tsangan(
+ 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_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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
+ 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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL),
+
+ [1] = LAYOUT_60_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_DEL,
+ _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______),
+
+ [2] = LAYOUT_60_ansi_tsangan(
+ QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______),
+
+ [3] = LAYOUT_60_ansi_tsangan(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______)
+};
diff --git a/keyboards/cipulot/ec_60/keymaps/60_iso_tsangan/keymap.c b/keyboards/cipulot/ec_60/keymaps/60_iso_tsangan/keymap.c
new file mode 100644
index 0000000000..530832885b
--- /dev/null
+++ b/keyboards/cipulot/ec_60/keymaps/60_iso_tsangan/keymap.c
@@ -0,0 +1,47 @@
+/* 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 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 QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT_60_iso_tsangan(
+ 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_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_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_LCTL, KC_LGUI, KC_