From d75151670fcaf412cfde9ddd240aff702791b994 Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Thu, 23 Feb 2023 00:54:41 +0100 Subject: [PATCH 01/24] EC Pro 2 firmware --- keyboards/cipulot/ec_pro2/config.h | 43 ++++ keyboards/cipulot/ec_pro2/ec_pro2.c | 159 +++++++++++++++ keyboards/cipulot/ec_pro2/ec_switch_matrix.c | 185 ++++++++++++++++++ keyboards/cipulot/ec_pro2/ec_switch_matrix.h | 36 ++++ keyboards/cipulot/ec_pro2/halconf.h | 21 ++ keyboards/cipulot/ec_pro2/info.json | 124 ++++++++++++ .../cipulot/ec_pro2/keymaps/default/keymap.c | 48 +++++ .../cipulot/ec_pro2/keymaps/via/keymap.c | 48 +++++ .../cipulot/ec_pro2/keymaps/via/rules.mk | 1 + keyboards/cipulot/ec_pro2/matrix.c | 45 +++++ keyboards/cipulot/ec_pro2/mcuconf.h | 22 +++ keyboards/cipulot/ec_pro2/readme.md | 19 ++ keyboards/cipulot/ec_pro2/rules.mk | 2 + 13 files changed, 753 insertions(+) create mode 100644 keyboards/cipulot/ec_pro2/config.h create mode 100644 keyboards/cipulot/ec_pro2/ec_pro2.c create mode 100644 keyboards/cipulot/ec_pro2/ec_switch_matrix.c create mode 100644 keyboards/cipulot/ec_pro2/ec_switch_matrix.h create mode 100644 keyboards/cipulot/ec_pro2/halconf.h create mode 100644 keyboards/cipulot/ec_pro2/info.json create mode 100644 keyboards/cipulot/ec_pro2/keymaps/default/keymap.c create mode 100644 keyboards/cipulot/ec_pro2/keymaps/via/keymap.c create mode 100644 keyboards/cipulot/ec_pro2/keymaps/via/rules.mk create mode 100644 keyboards/cipulot/ec_pro2/matrix.c create mode 100644 keyboards/cipulot/ec_pro2/mcuconf.h create mode 100644 keyboards/cipulot/ec_pro2/readme.md create mode 100644 keyboards/cipulot/ec_pro2/rules.mk diff --git a/keyboards/cipulot/ec_pro2/config.h b/keyboards/cipulot/ec_pro2/config.h new file mode 100644 index 000000000000..f4eb4edb8647 --- /dev/null +++ b/keyboards/cipulot/ec_pro2/config.h @@ -0,0 +1,43 @@ +/* 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 . + */ + +#pragma once + +#include "config_common.h" + +/* 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 + +// This is the size of the EEPROM for the custom VIA-specific data +#define EECONFIG_KB_DATA_SIZE 4 + diff --git a/keyboards/cipulot/ec_pro2/ec_pro2.c b/keyboards/cipulot/ec_pro2/ec_pro2.c new file mode 100644 index 000000000000..377ee3161637 --- /dev/null +++ b/keyboards/cipulot/ec_pro2/ec_pro2.c @@ -0,0 +1,159 @@ +/* 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 . + */ + +#ifdef VIA_ENABLE +# include "ec_switch_matrix.h" +# include "print.h" +# include "eeconfig.h" +# include "quantum.h" + +void apc_init_thresholds(void); +void apc_set_threshold(bool is_for_actuation); + +// Declaring an _apc_config_t struct that will store our data +typedef struct _apc_config_t { + uint16_t actuation_threshold; + uint16_t release_threshold; +} apc_config; + +// Check if the size of the reserved persistent memory is the same as the size of struct apc_config +_Static_assert(sizeof(apc_config) == EECONFIG_KB_DATA_SIZE, "Mismatch in keyboard EECONFIG stored data"); + +// Declaring a new variable apc of type apc_config +apc_config apc; + +// Declaring enums for VIA config menu +enum via_apc_enums { + // clang-format off + id_apc_actuation_threshold = 1, + id_apc_release_threshold = 2 + // clang-format on +}; + +// Initializing persistent memory configuration: default values are declared and stored in PMEM +void eeconfig_init_kb(void) { + // Default values + apc.actuation_threshold = 550; + apc.release_threshold = 500; + // Write default value to EEPROM now + eeconfig_update_kb_datablock(&apc); +} + +// On Keyboard startup +void keyboard_post_init_kb(void) { + // Read custom menu variables from memory + eeconfig_read_kb_datablock(&apc); + apc_init_thresholds(); +} + +// Handle the data received by the keyboard from the VIA menus +void apc_config_set_value(uint8_t *data) { + // data = [ value_id, value_data ] + uint8_t *value_id = &(data[0]); + uint8_t *value_data = &(data[1]); + + switch (*value_id) { + case id_apc_actuation_threshold: { + apc.actuation_threshold = value_data[1] | (value_data[0] << 8); + apc_set_threshold(true); + break; + } + case id_apc_release_threshold: { + apc.release_threshold = value_data[1] | (value_data[0] << 8); + apc_set_threshold(false); + break; + } + } +} + +// Handle the data sent by the keyboard to the VIA menus +void apc_config_get_value(uint8_t *data) { + // data = [ value_id, value_data ] + uint8_t *value_id = &(data[0]); + uint8_t *value_data = &(data[1]); + + switch (*value_id) { + case id_apc_actuation_threshold: { + value_data[0] = apc.actuation_threshold >> 8; + value_data[1] = apc.actuation_threshold & 0xFF; + break; + } + case id_apc_release_threshold: { + value_data[0] = apc.release_threshold >> 8; + value_data[1] = apc.release_threshold & 0xFF; + break; + } + } +} + +// Save the data to persistent memory after changes are made +void apc_config_save(void) { + eeconfig_update_kb_datablock(&apc); +} + +void via_custom_value_command_kb(uint8_t *data, uint8_t length) { + // data = [ command_id, channel_id, value_id, value_data ] + uint8_t *command_id = &(data[0]); + uint8_t *channel_id = &(data[1]); + uint8_t *value_id_and_data = &(data[2]); + + if (*channel_id == id_custom_channel) { + switch (*command_id) { + case id_custom_set_value: { + apc_config_set_value(value_id_and_data); + break; + } + case id_custom_get_value: { + apc_config_get_value(value_id_and_data); + break; + } + case id_custom_save: { + apc_config_save(); + break; + } + default: { + // Unhandled message. + *command_id = id_unhandled; + break; + } + } + return; + } + + *command_id = id_unhandled; +} + +// Initialize the thresholds +void apc_init_thresholds(void) { + ecsm_config.ecsm_actuation_threshold = apc.actuation_threshold; + ecsm_config.ecsm_release_threshold = apc.release_threshold; + + // Update the ecsm_config + ecsm_update(&ecsm_config); +} + +// Set the thresholds +void apc_set_threshold(bool is_for_actuation) { + if (is_for_actuation) { + ecsm_config.ecsm_actuation_threshold = apc.actuation_threshold; + + } else { + ecsm_config.ecsm_release_threshold = apc.release_threshold; + } + // Update the ecsm_config + ecsm_update(&ecsm_config); +} +#endif diff --git a/keyboards/cipulot/ec_pro2/ec_switch_matrix.c b/keyboards/cipulot/ec_pro2/ec_switch_matrix.c new file mode 100644 index 000000000000..fd0e8ed5874e --- /dev/null +++ b/keyboards/cipulot/ec_pro2/ec_switch_matrix.c @@ -0,0 +1,185 @@ +/* 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 . + */ + +#include "ec_switch_matrix.h" +#include "analog.h" +#include "atomic_util.h" +#include "print.h" + +#define WAIT_DISCHARGE() +#define WAIT_CHARGE() + +/* 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) { + ATOMIC_BLOCK_FORCEON { + writePinLow(DISCHARGE_PIN); + } +} +static inline void charge_capacitor(uint8_t row) { + ATOMIC_BLOCK_FORCEON { + 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); + + // 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]); + + // Set the row pin to high state and have capacitor charge + charge_capacitor(row); + + ATOMIC_BLOCK_FORCEON { + sw_value = adc_read(adcMux); + } + // Discharge peak hold capacitor + discharge_capacitor(); + + 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(¤t_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(¤t_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_pro2/ec_switch_matrix.h b/keyboards/cipulot/ec_pro2/ec_switch_matrix.h new file mode 100644 index 000000000000..9dcb216caa3f --- /dev/null +++ b/keyboards/cipulot/ec_pro2/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 . + */ + +#pragma once + +#include +#include + +#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_pro2/halconf.h b/keyboards/cipulot/ec_pro2/halconf.h new file mode 100644 index 000000000000..5b71acecbbc8 --- /dev/null +++ b/keyboards/cipulot/ec_pro2/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 . + */ + +#pragma once + +#define HAL_USE_ADC TRUE + +#include_next diff --git a/keyboards/cipulot/ec_pro2/info.json b/keyboards/cipulot/ec_pro2/info.json new file mode 100644 index 000000000000..a5b53c6359f0 --- /dev/null +++ b/keyboards/cipulot/ec_pro2/info.json @@ -0,0 +1,124 @@ +{ + "manufacturer": "Cipulot", + "keyboard_name": "EC Pro2", + "maintainer": "Cipulot", + "board": "GENERIC_STM32_F401XC", + "bootloader": "stm32-dfu", + "build": { + "lto": true + }, + "diode_direction": "COL2ROW", + "matrix_size": { + "rows": 5, + "cols": 15 + }, + "features": { + "audio": false, + "backlight": false, + "bootmagic": true, + "command": false, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, + "keyboard_folder": "cipulot/ec_pro2", + "mouse_key": { + "enabled": true + }, + "processor": "STM32F401", + "rgblight": { + "led_count": 22, + "pin": "B14", + "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 + } + }, + "url": "https://www.github.com/Cipulot/EC-Pro-2", + "usb": { + "device_version": "0.0.1", + "pid": "0x6B8E", + "shared_endpoint": { + "keyboard": true + }, + "vid": "0x6369" + }, + "layouts": { + "LAYOUT": { + "layout": [ + { "label": "0,0", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, + { "label": "0,1", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, + { "label": "0,2", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, + { "label": "0,3", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, + { "label": "0,4", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 }, + { "label": "0,5", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 }, + { "label": "0,6", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 }, + { "label": "0,7", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 }, + { "label": "0,8", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 }, + { "label": "0,9", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 }, + { "label": "0,10", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 }, + { "label": "0,11", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 }, + { "label": "0,12", "matrix": [0, 12], "w": 1, "x": 12, "y": 0 }, + { "label": "0,13", "matrix": [0, 13], "w": 1, "x": 13, "y": 0 }, + { "label": "0,14", "matrix": [0, 14], "w": 1, "x": 14, "y": 0 }, + { "label": "1,0", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, + { "label": "1,1", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 }, + { "label": "1,2", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 }, + { "label": "1,3", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 }, + { "label": "1,4", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 }, + { "label": "1,5", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 }, + { "label": "1,6", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 }, + { "label": "1,7", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 }, + { "label": "1,8", "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1 }, + { "label": "1,9", "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1 }, + { "label": "1,10", "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1 }, + { "label": "1,11", "matrix": [1, 11], "w": 1, "x": 11.5, "y": 1 }, + { "label": "1,12", "matrix": [1, 12], "w": 1, "x": 12.5, "y": 1 }, + { "label": "1,13", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 }, + { "label": "2,0", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, + { "label": "2,1", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 }, + { "label": "2,2", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 }, + { "label": "2,3", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 }, + { "label": "2,4", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 }, + { "label": "2,5", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 }, + { "label": "2,6", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 }, + { "label": "2,7", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 }, + { "label": "2,8", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 }, + { "label": "2,9", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 }, + { "label": "2,10", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 }, + { "label": "2,11", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 }, + { "label": "2,13", "matrix": [2, 12], "w": 2.25, "x": 12.75, "y": 2 }, + { "label": "2,12", "matrix": [2, 13], "w": 1, "x": 15.25, "y": 2 }, + { "label": "3,0", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 }, + { "label": "3,1", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 3 }, + { "label": "3,2", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 }, + { "label": "3,3", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 }, + { "label": "3,4", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 }, + { "label": "3,5", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 }, + { "label": "3,6", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 }, + { "label": "3,7", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 }, + { "label": "3,8", "matrix": [3, 8], "w": 1, "x": 8.25, "y": 3 }, + { "label": "3,9", "matrix": [3, 9], "w": 1, "x": 9.25, "y": 3 }, + { "label": "3,10", "matrix": [3, 10], "w": 1, "x": 10.25, "y": 3 }, + { "label": "3,11", "matrix": [3, 11], "w": 1, "x": 11.25, "y": 3 }, + { "label": "3,13", "matrix": [3, 13], "w": 1.75, "x": 12.25, "y": 3 }, + { "label": "3,14", "matrix": [3, 14], "w": 1, "x": 14, "y": 3 }, + { "label": "4,1", "matrix": [4, 1], "w": 1, "x": 1.5, "y": 4 }, + { "label": "4,2", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 }, + { "label": "4,6", "matrix": [4, 6], "w": 6, "x": 4, "y": 4 }, + { "label": "4,9", "matrix": [4, 9], "w": 1.5, "x": 10, "y": 4 }, + { "label": "4,10", "matrix": [4, 10], "w": 1, "x": 11.5, "y": 4 } + ] + } + } +} diff --git a/keyboards/cipulot/ec_pro2/keymaps/default/keymap.c b/keyboards/cipulot/ec_pro2/keymaps/default/keymap.c new file mode 100644 index 000000000000..ad12d7ae8fe3 --- /dev/null +++ b/keyboards/cipulot/ec_pro2/keymaps/default/keymap.c @@ -0,0 +1,48 @@ +/* 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 . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + // clang-format off + [0] = LAYOUT( + KC_ESC, 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_BSLS, KC_GRV, + 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_DEL, + KC_LCTL, 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_BSLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI), + + [1] = LAYOUT( + _______, 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_INS, KC_DEL, + KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUSE, KC_UP, _______, KC_BSPC, + _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, S(KC_8), KC_SLSH, KC_HOME, KC_PGUP, KC_LEFT, KC_RIGHT, _______, _______, + _______, _______, _______, _______, _______, _______, _______, S(KC_EQL), KC_MINS, KC_END, KC_PGDN, KC_DOWN, _______, _______, + _______, _______, _______, _______, MO(2)), + + [2] = LAYOUT( + RGB_TOG, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______), + [3] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______) + // clang-format on +}; diff --git a/keyboards/cipulot/ec_pro2/keymaps/via/keymap.c b/keyboards/cipulot/ec_pro2/keymaps/via/keymap.c new file mode 100644 index 000000000000..ad12d7ae8fe3 --- /dev/null +++ b/keyboards/cipulot/ec_pro2/keymaps/via/keymap.c @@ -0,0 +1,48 @@ +/* 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 . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + // clang-format off + [0] = LAYOUT( + KC_ESC, 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_BSLS, KC_GRV, + 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_DEL, + KC_LCTL, 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_BSLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI), + + [1] = LAYOUT( + _______, 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_INS, KC_DEL, + KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUSE, KC_UP, _______, KC_BSPC, + _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, S(KC_8), KC_SLSH, KC_HOME, KC_PGUP, KC_LEFT, KC_RIGHT, _______, _______, + _______, _______, _______, _______, _______, _______, _______, S(KC_EQL), KC_MINS, KC_END, KC_PGDN, KC_DOWN, _______, _______, + _______, _______, _______, _______, MO(2)), + + [2] = LAYOUT( + RGB_TOG, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______), + [3] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______) + // clang-format on +}; diff --git a/keyboards/cipulot/ec_pro2/keymaps/via/rules.mk b/keyboards/cipulot/ec_pro2/keymaps/via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/cipulot/ec_pro2/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/cipulot/ec_pro2/matrix.c b/keyboards/cipulot/ec_pro2/matrix.c new file mode 100644 index 000000000000..0557992f2aca --- /dev/null +++ b/keyboards/cipulot/ec_pro2/matrix.c @@ -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 . + */ + +#include "ec_switch_matrix.h" +#include "matrix.h" +#include "debug.h" + +/* matrix state(1:on, 0:off) */ +extern matrix_row_t raw_matrix[MATRIX_ROWS]; // raw values +extern matrix_row_t matrix[MATRIX_ROWS]; // debounced values + +void matrix_init_custom(void) { + // Default values, overwritten by VIA if enabled later + ecsm_config.ecsm_actuation_threshold = 550; + ecsm_config.ecsm_release_threshold = 500; + + ecsm_init(&ecsm_config); +} + +bool matrix_scan_custom(matrix_row_t current_matrix[]) { + bool updated = ecsm_matrix_scan(current_matrix); + +// RAW matrix values on console +#ifdef CONSOLE_ENABLE + static int cnt = 0; + if (cnt++ == 350) { + cnt = 0; + ecsm_print_matrix(); + } +#endif + return updated; +} diff --git a/keyboards/cipulot/ec_pro2/mcuconf.h b/keyboards/cipulot/ec_pro2/mcuconf.h new file mode 100644 index 000000000000..d91f576bd48b --- /dev/null +++ b/keyboards/cipulot/ec_pro2/mcuconf.h @@ -0,0 +1,22 @@ +/* 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 . + */ + +#pragma once + +#include_next + +#undef STM32_ADC_USE_ADC1 +#define STM32_ADC_USE_ADC1 TRUE diff --git a/keyboards/cipulot/ec_pro2/readme.md b/keyboards/cipulot/ec_pro2/readme.md new file mode 100644 index 000000000000..d771a2f97146 --- /dev/null +++ b/keyboards/cipulot/ec_pro2/readme.md @@ -0,0 +1,19 @@ +# EC Pro2 + +![EC Pro 2 PCB](https://i.imgur.com/uYOgTYo.png) + +HHKB Pro2 replacement PCB. + +* Keyboard Maintainer: [cipulot](https://github.com/cipulot) +* Hardware Supported: EC Pro2 PCB +* Hardware Availability: [Github](https://github.com/Cipulot/EC-Pro-2) + +Make example for this keyboard (after setting up your build environment): + + make cipulot/ec_pro2:default + +Flashing example for this keyboard: + + make cipulot/ec_pro2: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). diff --git a/keyboards/cipulot/ec_pro2/rules.mk b/keyboards/cipulot/ec_pro2/rules.mk new file mode 100644 index 000000000000..b27b0f7ac071 --- /dev/null +++ b/keyboards/cipulot/ec_pro2/rules.mk @@ -0,0 +1,2 @@ +CUSTOM_MATRIX = lite +SRC += analog.c matrix.c ec_switch_matrix.c From a05d43b4df7d8b5da9b0c79f6778ec39c8584d8a Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Thu, 23 Feb 2023 14:07:19 +0100 Subject: [PATCH 02/24] Change from explicit value assignment to define based Changed the default actuation and release values that are assigned at first boot after flash and default eeprom to a `#define` based ones. This will make the change to the user easier and less confusing, avoiding the change of one value, leaving the one in the second file untouched. --- keyboards/cipulot/ec_pro2/config.h | 2 ++ keyboards/cipulot/ec_pro2/ec_pro2.c | 4 ++-- keyboards/cipulot/ec_pro2/matrix.c | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/keyboards/cipulot/ec_pro2/config.h b/keyboards/cipulot/ec_pro2/config.h index f4eb4edb8647..1529e97c76f2 100644 --- a/keyboards/cipulot/ec_pro2/config.h +++ b/keyboards/cipulot/ec_pro2/config.h @@ -41,3 +41,5 @@ // This is the size of the EEPROM for the custom VIA-specific data #define EECONFIG_KB_DATA_SIZE 4 +#define DEFAULT_ACTUATION_LEVEL 550 +#define DEFAULT_RELEASE_LEVEL 500 diff --git a/keyboards/cipulot/ec_pro2/ec_pro2.c b/keyboards/cipulot/ec_pro2/ec_pro2.c index 377ee3161637..78a86b39f27d 100644 --- a/keyboards/cipulot/ec_pro2/ec_pro2.c +++ b/keyboards/cipulot/ec_pro2/ec_pro2.c @@ -46,8 +46,8 @@ enum via_apc_enums { // Initializing persistent memory configuration: default values are declared and stored in PMEM void eeconfig_init_kb(void) { // Default values - apc.actuation_threshold = 550; - apc.release_threshold = 500; + apc.actuation_threshold = DEFAULT_ACTUATION_LEVEL; + apc.release_threshold = DEFAULT_RELEASE_LEVEL; // Write default value to EEPROM now eeconfig_update_kb_datablock(&apc); } diff --git a/keyboards/cipulot/ec_pro2/matrix.c b/keyboards/cipulot/ec_pro2/matrix.c index 0557992f2aca..a8425231f1d1 100644 --- a/keyboards/cipulot/ec_pro2/matrix.c +++ b/keyboards/cipulot/ec_pro2/matrix.c @@ -24,8 +24,8 @@ extern matrix_row_t matrix[MATRIX_ROWS]; // debounced values void matrix_init_custom(void) { // Default values, overwritten by VIA if enabled later - ecsm_config.ecsm_actuation_threshold = 550; - ecsm_config.ecsm_release_threshold = 500; + ecsm_config.ecsm_actuation_threshold = DEFAULT_ACTUATION_LEVEL; + ecsm_config.ecsm_release_threshold = DEFAULT_RELEASE_LEVEL; ecsm_init(&ecsm_config); } From 16f18bf87c6b917e8ccd4d4bfbcae8832f208375 Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Thu, 23 Feb 2023 14:15:49 +0100 Subject: [PATCH 03/24] Update ec_switch_matrix.c Removal of unused functions. Leftovers from a previous revision. --- keyboards/cipulot/ec_pro2/ec_switch_matrix.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/keyboards/cipulot/ec_pro2/ec_switch_matrix.c b/keyboards/cipulot/ec_pro2/ec_switch_matrix.c index fd0e8ed5874e..380c036cac55 100644 --- a/keyboards/cipulot/ec_pro2/ec_switch_matrix.c +++ b/keyboards/cipulot/ec_pro2/ec_switch_matrix.c @@ -19,9 +19,6 @@ #include "atomic_util.h" #include "print.h" -#define WAIT_DISCHARGE() -#define WAIT_CHARGE() - /* Pin and port array */ const uint32_t row_pins[] = MATRIX_ROW_PINS; const uint8_t col_channels[] = MATRIX_COL_CHANNELS; From 4ecd8a612aae247b15dde674192fec9390843422 Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Thu, 23 Feb 2023 14:48:52 +0100 Subject: [PATCH 04/24] Update keyboards/cipulot/ec_pro2/config.h Co-authored-by: Ryan --- keyboards/cipulot/ec_pro2/config.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/cipulot/ec_pro2/config.h b/keyboards/cipulot/ec_pro2/config.h index 1529e97c76f2..1abe4de3a0c9 100644 --- a/keyboards/cipulot/ec_pro2/config.h +++ b/keyboards/cipulot/ec_pro2/config.h @@ -16,8 +16,6 @@ #pragma once -#include "config_common.h" - /* Custom matrix pins and port select array */ #define MATRIX_ROW_PINS \ { B15, A8, B0, A7, B1 } From 5a446509149576aa6923e33673a4109fc0086024 Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Thu, 23 Feb 2023 14:53:14 +0100 Subject: [PATCH 05/24] Update keyboards/cipulot/ec_pro2/matrix.c Co-authored-by: Ryan --- keyboards/cipulot/ec_pro2/matrix.c | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/cipulot/ec_pro2/matrix.c b/keyboards/cipulot/ec_pro2/matrix.c index a8425231f1d1..1850acf26414 100644 --- a/keyboards/cipulot/ec_pro2/matrix.c +++ b/keyboards/cipulot/ec_pro2/matrix.c @@ -16,7 +16,6 @@ #include "ec_switch_matrix.h" #include "matrix.h" -#include "debug.h" /* matrix state(1:on, 0:off) */ extern matrix_row_t raw_matrix[MATRIX_ROWS]; // raw values From 155630101683907aa3431ac31a9d800f97e5dc0c Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Thu, 23 Feb 2023 14:54:53 +0100 Subject: [PATCH 06/24] Addition of Bootloader instructions --- keyboards/cipulot/ec_pro2/readme.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/keyboards/cipulot/ec_pro2/readme.md b/keyboards/cipulot/ec_pro2/readme.md index d771a2f97146..ab5a2ca90fce 100644 --- a/keyboards/cipulot/ec_pro2/readme.md +++ b/keyboards/cipulot/ec_pro2/readme.md @@ -17,3 +17,11 @@ Flashing example for this keyboard: make cipulot/ec_pro2: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 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical Boot0 pins**: Short the Boot0 pins on the back of the PCB while plugging in the keyboard +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available From d3187f19d68c95918d202caedbe4a362f92f6d75 Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Thu, 23 Feb 2023 15:01:57 +0100 Subject: [PATCH 07/24] Removal of unnecessary includes --- keyboards/cipulot/ec_pro2/ec_pro2.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/cipulot/ec_pro2/ec_pro2.c b/keyboards/cipulot/ec_pro2/ec_pro2.c index 78a86b39f27d..3cd5f817be44 100644 --- a/keyboards/cipulot/ec_pro2/ec_pro2.c +++ b/keyboards/cipulot/ec_pro2/ec_pro2.c @@ -16,8 +16,6 @@ #ifdef VIA_ENABLE # include "ec_switch_matrix.h" -# include "print.h" -# include "eeconfig.h" # include "quantum.h" void apc_init_thresholds(void); From 86beb95dbdea47e243b8cd699c661177fba2d7e1 Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Thu, 23 Feb 2023 15:17:21 +0100 Subject: [PATCH 08/24] Move of APC functionality to its own file. --- keyboards/cipulot/ec_pro2/{ec_pro2.c => apc.c} | 6 ++---- keyboards/cipulot/ec_pro2/rules.mk | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) rename keyboards/cipulot/ec_pro2/{ec_pro2.c => apc.c} (98%) diff --git a/keyboards/cipulot/ec_pro2/ec_pro2.c b/keyboards/cipulot/ec_pro2/apc.c similarity index 98% rename from keyboards/cipulot/ec_pro2/ec_pro2.c rename to keyboards/cipulot/ec_pro2/apc.c index 3cd5f817be44..4b74c7add54b 100644 --- a/keyboards/cipulot/ec_pro2/ec_pro2.c +++ b/keyboards/cipulot/ec_pro2/apc.c @@ -14,9 +14,8 @@ * along with this program. If not, see . */ -#ifdef VIA_ENABLE -# include "ec_switch_matrix.h" -# include "quantum.h" +#include "ec_switch_matrix.h" +#include "quantum.h" void apc_init_thresholds(void); void apc_set_threshold(bool is_for_actuation); @@ -154,4 +153,3 @@ void apc_set_threshold(bool is_for_actuation) { // Update the ecsm_config ecsm_update(&ecsm_config); } -#endif diff --git a/keyboards/cipulot/ec_pro2/rules.mk b/keyboards/cipulot/ec_pro2/rules.mk index b27b0f7ac071..962bc5db4274 100644 --- a/keyboards/cipulot/ec_pro2/rules.mk +++ b/keyboards/cipulot/ec_pro2/rules.mk @@ -1,2 +1,2 @@ CUSTOM_MATRIX = lite -SRC += analog.c matrix.c ec_switch_matrix.c +SRC += analog.c apc.c matrix.c ec_switch_matrix.c From afc14267154f719505464351f40de74ca54943b7 Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Thu, 23 Feb 2023 15:28:41 +0100 Subject: [PATCH 09/24] Revert "Move of APC functionality to its own file." This reverts commit 86beb95dbdea47e243b8cd699c661177fba2d7e1. --- keyboards/cipulot/ec_pro2/{apc.c => ec_pro2.c} | 6 ++++-- keyboards/cipulot/ec_pro2/rules.mk | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) rename keyboards/cipulot/ec_pro2/{apc.c => ec_pro2.c} (98%) diff --git a/keyboards/cipulot/ec_pro2/apc.c b/keyboards/cipulot/ec_pro2/ec_pro2.c similarity index 98% rename from keyboards/cipulot/ec_pro2/apc.c rename to keyboards/cipulot/ec_pro2/ec_pro2.c index 4b74c7add54b..3cd5f817be44 100644 --- a/keyboards/cipulot/ec_pro2/apc.c +++ b/keyboards/cipulot/ec_pro2/ec_pro2.c @@ -14,8 +14,9 @@ * along with this program. If not, see . */ -#include "ec_switch_matrix.h" -#include "quantum.h" +#ifdef VIA_ENABLE +# include "ec_switch_matrix.h" +# include "quantum.h" void apc_init_thresholds(void); void apc_set_threshold(bool is_for_actuation); @@ -153,3 +154,4 @@ void apc_set_threshold(bool is_for_actuation) { // Update the ecsm_config ecsm_update(&ecsm_config); } +#endif diff --git a/keyboards/cipulot/ec_pro2/rules.mk b/keyboards/cipulot/ec_pro2/rules.mk index 962bc5db4274..b27b0f7ac071 100644 --- a/keyboards/cipulot/ec_pro2/rules.mk +++ b/keyboards/cipulot/ec_pro2/rules.mk @@ -1,2 +1,2 @@ CUSTOM_MATRIX = lite -SRC += analog.c apc.c matrix.c ec_switch_matrix.c +SRC += analog.c matrix.c ec_switch_matrix.c From d9efda9d0053769f715ae41734b2d98da180cce8 Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Thu, 23 Feb 2023 15:49:07 +0100 Subject: [PATCH 10/24] Move of APC functions into VIA keymap folder --- keyboards/cipulot/ec_pro2/keymaps/via/rules.mk | 2 ++ keyboards/cipulot/ec_pro2/{ec_pro2.c => keymaps/via/via_apc.c} | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) rename keyboards/cipulot/ec_pro2/{ec_pro2.c => keymaps/via/via_apc.c} (99%) diff --git a/keyboards/cipulot/ec_pro2/keymaps/via/rules.mk b/keyboards/cipulot/ec_pro2/keymaps/via/rules.mk index 1e5b99807cb7..520b11f20312 100644 --- a/keyboards/cipulot/ec_pro2/keymaps/via/rules.mk +++ b/keyboards/cipulot/ec_pro2/keymaps/via/rules.mk @@ -1 +1,3 @@ VIA_ENABLE = yes + +SRC += via_apc.c diff --git a/keyboards/cipulot/ec_pro2/ec_pro2.c b/keyboards/cipulot/ec_pro2/keymaps/via/via_apc.c similarity index 99% rename from keyboards/cipulot/ec_pro2/ec_pro2.c rename to keyboards/cipulot/ec_pro2/keymaps/via/via_apc.c index 3cd5f817be44..91996f9f1a6d 100644 --- a/keyboards/cipulot/ec_pro2/ec_pro2.c +++ b/keyboards/cipulot/ec_pro2/keymaps/via/via_apc.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#ifdef VIA_ENABLE + # include "ec_switch_matrix.h" # include "quantum.h" @@ -154,4 +154,3 @@ void apc_set_threshold(bool is_for_actuation) { // Update the ecsm_config ecsm_update(&ecsm_config); } -#endif From 561ceb495ef8426c5d75aa14e6c54cc508db92b8 Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Thu, 23 Feb 2023 15:51:55 +0100 Subject: [PATCH 11/24] Consilidation of `ATOMIC_BLOCK_FORCEON` usage --- keyboards/cipulot/ec_pro2/ec_switch_matrix.c | 21 ++++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/keyboards/cipulot/ec_pro2/ec_switch_matrix.c b/keyboards/cipulot/ec_pro2/ec_switch_matrix.c index 380c036cac55..540282ef5d2c 100644 --- a/keyboards/cipulot/ec_pro2/ec_switch_matrix.c +++ b/keyboards/cipulot/ec_pro2/ec_switch_matrix.c @@ -30,15 +30,11 @@ static uint16_t ecsm_sw_value[MATRIX_ROWS][MATRIX_COLS]; static adc_mux adcMux; static inline void discharge_capacitor(void) { - ATOMIC_BLOCK_FORCEON { - writePinLow(DISCHARGE_PIN); - } + writePinLow(DISCHARGE_PIN); } static inline void charge_capacitor(uint8_t row) { - ATOMIC_BLOCK_FORCEON { - writePinHigh(DISCHARGE_PIN); - writePinHigh(row_pins[row]); - } + writePinHigh(DISCHARGE_PIN); + writePinHigh(row_pins[row]); } static inline void init_mux_sel(void) { @@ -111,15 +107,14 @@ uint16_t ecsm_readkey_raw(uint8_t channel, uint8_t row, uint8_t col) { // Set strobe pins to low state writePinLow(row_pins[row]); - - // Set the row pin to high state and have capacitor charge - charge_capacitor(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(); } - // Discharge peak hold capacitor - discharge_capacitor(); return sw_value; } From 3f89a8984107ed3bce93331e342b9d313d66cac5 Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Thu, 23 Feb 2023 15:59:16 +0100 Subject: [PATCH 12/24] Update keyboards/cipulot/ec_pro2/keymaps/via/via_apc.c Co-authored-by: Ryan --- keyboards/cipulot/ec_pro2/keymaps/via/via_apc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/keyboards/cipulot/ec_pro2/keymaps/via/via_apc.c b/keyboards/cipulot/ec_pro2/keymaps/via/via_apc.c index 91996f9f1a6d..bff7aa2275e8 100644 --- a/keyboards/cipulot/ec_pro2/keymaps/via/via_apc.c +++ b/keyboards/cipulot/ec_pro2/keymaps/via/via_apc.c @@ -14,9 +14,8 @@ * along with this program. If not, see . */ - -# include "ec_switch_matrix.h" -# include "quantum.h" +#include "ec_switch_matrix.h" +#include "eeconfig.h" void apc_init_thresholds(void); void apc_set_threshold(bool is_for_actuation); From 2e9a7222005f4a748bf1dc74cc51942f9b5886f7 Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Thu, 23 Feb 2023 16:27:26 +0100 Subject: [PATCH 13/24] Include only mnecessary `.h` in apc file --- keyboards/cipulot/ec_pro2/keymaps/via/via_apc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/keyboards/cipulot/ec_pro2/keymaps/via/via_apc.c b/keyboards/cipulot/ec_pro2/keymaps/via/via_apc.c index bff7aa2275e8..325c767b5808 100644 --- a/keyboards/cipulot/ec_pro2/keymaps/via/via_apc.c +++ b/keyboards/cipulot/ec_pro2/keymaps/via/via_apc.c @@ -16,6 +16,9 @@ #include "ec_switch_matrix.h" #include "eeconfig.h" +#include "keycodes.h" +#include "action.h" +#include "via.h" void apc_init_thresholds(void); void apc_set_threshold(bool is_for_actuation); From db7e2ed739cae4de3d8a82e9cb5e6c3292eaf360 Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Thu, 23 Feb 2023 17:15:12 +0100 Subject: [PATCH 14/24] Update ec_switch_matrix.c Added dummy `adc_read()` call to make sure that adcStart() has been called in the appropriate state and moved `discharge_capacitor()` out of `ATOMIC_BLOCK_FORCEON` given that the `adc_read()` reinstates interrupts after it finishes executing. --- keyboards/cipulot/ec_pro2/ec_switch_matrix.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/keyboards/cipulot/ec_pro2/ec_switch_matrix.c b/keyboards/cipulot/ec_pro2/ec_switch_matrix.c index 540282ef5d2c..a65b0fc2bb7b 100644 --- a/keyboards/cipulot/ec_pro2/ec_switch_matrix.c +++ b/keyboards/cipulot/ec_pro2/ec_switch_matrix.c @@ -65,6 +65,9 @@ int ecsm_init(ecsm_config_t const* const 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); @@ -112,9 +115,9 @@ uint16_t ecsm_readkey_raw(uint8_t channel, uint8_t row, uint8_t col) { charge_capacitor(row); // Read the ADC value sw_value = adc_read(adcMux); - // Discharge peak hold capacitor - discharge_capacitor(); } + // Discharge peak hold capacitor + discharge_capacitor(); return sw_value; } From 6cee6eb6758946134534e8e6f4876593f0498a4e Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Sat, 25 Feb 2023 09:24:14 +0100 Subject: [PATCH 15/24] Update keyboards/cipulot/ec_pro2/readme.md Co-authored-by: Drashna Jaelre --- keyboards/cipulot/ec_pro2/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/cipulot/ec_pro2/readme.md b/keyboards/cipulot/ec_pro2/readme.md index ab5a2ca90fce..0ada16ec1937 100644 --- a/keyboards/cipulot/ec_pro2/readme.md +++ b/keyboards/cipulot/ec_pro2/readme.md @@ -1,6 +1,6 @@ # EC Pro2 -![EC Pro 2 PCB](https://i.imgur.com/uYOgTYo.png) +![EC Pro 2 PCB](https://i.imgur.com/uYOgTYoh.png) HHKB Pro2 replacement PCB. From e655a9990c0b36b64bd6cd93b2da9aed6dabe65b Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Sat, 25 Feb 2023 09:26:16 +0100 Subject: [PATCH 16/24] Apply suggestions from code review Moved matrix size definition from data driven to config file. Co-authored-by: Ryan --- keyboards/cipulot/ec_pro2/config.h | 3 +++ keyboards/cipulot/ec_pro2/info.json | 4 ---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/keyboards/cipulot/ec_pro2/config.h b/keyboards/cipulot/ec_pro2/config.h index 1abe4de3a0c9..1c552d22638e 100644 --- a/keyboards/cipulot/ec_pro2/config.h +++ b/keyboards/cipulot/ec_pro2/config.h @@ -16,6 +16,9 @@ #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 } diff --git a/keyboards/cipulot/ec_pro2/info.json b/keyboards/cipulot/ec_pro2/info.json index a5b53c6359f0..14a3bbb93aa7 100644 --- a/keyboards/cipulot/ec_pro2/info.json +++ b/keyboards/cipulot/ec_pro2/info.json @@ -8,10 +8,6 @@ "lto": true }, "diode_direction": "COL2ROW", - "matrix_size": { - "rows": 5, - "cols": 15 - }, "features": { "audio": false, "backlight": false, From 0da9969eb7268e2fa063f383d19efa33c5b75800 Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Sat, 25 Feb 2023 11:58:31 +0100 Subject: [PATCH 17/24] Addition of LAYOUT_ to comply with standard --- keyboards/cipulot/ec_pro2/info.json | 70 ++++++++++++++++++- .../cipulot/ec_pro2/keymaps/60_hhkb/keymap.c | 48 +++++++++++++ .../cipulot/ec_pro2/keymaps/default/keymap.c | 8 +-- .../cipulot/ec_pro2/keymaps/via/keymap.c | 8 +-- 4 files changed, 123 insertions(+), 11 deletions(-) create mode 100644 keyboards/cipulot/ec_pro2/keymaps/60_hhkb/keymap.c diff --git a/keyboards/cipulot/ec_pro2/info.json b/keyboards/cipulot/ec_pro2/info.json index 14a3bbb93aa7..ecd1c0ac9c07 100644 --- a/keyboards/cipulot/ec_pro2/info.json +++ b/keyboards/cipulot/ec_pro2/info.json @@ -50,7 +50,7 @@ "vid": "0x6369" }, "layouts": { - "LAYOUT": { + "LAYOUT_all": { "layout": [ { "label": "0,0", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, { "label": "0,1", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, @@ -93,8 +93,8 @@ { "label": "2,9", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 }, { "label": "2,10", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 }, { "label": "2,11", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 }, - { "label": "2,13", "matrix": [2, 12], "w": 2.25, "x": 12.75, "y": 2 }, - { "label": "2,12", "matrix": [2, 13], "w": 1, "x": 15.25, "y": 2 }, + { "label": "2,12", "matrix": [2, 12], "x": 12.75, "y": 2 }, + { "label": "2,13", "matrix": [2, 13], "w": 1.25, "x": 13.75, "y": 2 }, { "label": "3,0", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 }, { "label": "3,1", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 3 }, { "label": "3,2", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 }, @@ -115,6 +115,70 @@ { "label": "4,9", "matrix": [4, 9], "w": 1.5, "x": 10, "y": 4 }, { "label": "4,10", "matrix": [4, 10], "w": 1, "x": 11.5, "y": 4 } ] + }, + "LAYOUT_60_hhkb": { + "layout": [ + { "label": "0,0", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, + { "label": "0,1", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, + { "label": "0,2", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, + { "label": "0,3", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, + { "label": "0,4", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 }, + { "label": "0,5", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 }, + { "label": "0,6", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 }, + { "label": "0,7", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 }, + { "label": "0,8", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 }, + { "label": "0,9", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 }, + { "label": "0,10", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 }, + { "label": "0,11", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 }, + { "label": "0,12", "matrix": [0, 12], "w": 1, "x": 12, "y": 0 }, + { "label": "0,13", "matrix": [0, 13], "w": 1, "x": 13, "y": 0 }, + { "label": "0,14", "matrix": [0, 14], "w": 1, "x": 14, "y": 0 }, + { "label": "1,0", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, + { "label": "1,1", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 }, + { "label": "1,2", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 }, + { "label": "1,3", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 }, + { "label": "1,4", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 }, + { "label": "1,5", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 }, + { "label": "1,6", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 }, + { "label": "1,7", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 }, + { "label": "1,8", "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1 }, + { "label": "1,9", "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1 }, + { "label": "1,10", "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1 }, + { "label": "1,11", "matrix": [1, 11], "w": 1, "x": 11.5, "y": 1 }, + { "label": "1,12", "matrix": [1, 12], "w": 1, "x": 12.5, "y": 1 }, + { "label": "1,13", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 }, + { "label": "2,0", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, + { "label": "2,1", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 }, + { "label": "2,2", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 }, + { "label": "2,3", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 }, + { "label": "2,4", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 }, + { "label": "2,5", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 }, + { "label": "2,6", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 }, + { "label": "2,7", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 }, + { "label": "2,8", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 }, + { "label": "2,9", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 }, + { "label": "2,10", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 }, + { "label": "2,11", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 }, + { "label": "2,13", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 }, + { "label": "3,0", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 }, + { "label": "3,2", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 }, + { "label": "3,3", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 }, + { "label": "3,4", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 }, + { "label": "3,5", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 }, + { "label": "3,6", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 }, + { "label": "3,7", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 }, + { "label": "3,8", "matrix": [3, 8], "w": 1, "x": 8.25, "y": 3 }, + { "label": "3,9", "matrix": [3, 9], "w": 1, "x": 9.25, "y": 3 }, + { "label": "3,10", "matrix": [3, 10], "w": 1, "x": 10.25, "y": 3 }, + { "label": "3,11", "matrix": [3, 11], "w": 1, "x": 11.25, "y": 3 }, + { "label": "3,13", "matrix": [3, 13], "w": 1.75, "x": 12.25, "y": 3 }, + { "label": "3,14", "matrix": [3, 14], "w": 1, "x": 14, "y": 3 }, + { "label": "4,1", "matrix": [4, 1], "w": 1, "x": 1.5, "y": 4 }, + { "label": "4,2", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 }, + { "label": "4,6", "matrix": [4, 6], "w": 6, "x": 4, "y": 4 }, + { "label": "4,9", "matrix": [4, 9], "w": 1.5, "x": 10, "y": 4 }, + { "label": "4,10", "matrix": [4, 10], "w": 1, "x": 11.5, "y": 4 } + ] } } } diff --git a/keyboards/cipulot/ec_pro2/keymaps/60_hhkb/keymap.c b/keyboards/cipulot/ec_pro2/keymaps/60_hhkb/keymap.c new file mode 100644 index 000000000000..10c7ffb65fdc --- /dev/null +++ b/keyboards/cipulot/ec_pro2/keymaps/60_hhkb/keymap.c @@ -0,0 +1,48 @@ +/* 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 . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + // clang-format off + [0] = LAYOUT_60_hhkb( + KC_ESC, 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_BSLS, KC_GRV, + 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_DEL, + KC_LCTL, 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, MO(1), + KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI), + + [1] = LAYOUT_60_hhkb( + _______, 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_INS, KC_DEL, + KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUSE, KC_UP, _______, KC_BSPC, + _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, S(KC_8), KC_SLSH, KC_HOME, KC_PGUP, KC_LEFT, KC_RIGHT, _______, + _______, _______, _______, _______, _______, _______, S(KC_EQL), KC_MINS, KC_END, KC_PGDN, KC_DOWN, _______, _______, + _______, _______, _______, _______, MO(2)), + + [2] = LAYOUT_60_hhkb( + RGB_TOG, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______), + [3] = LAYOUT_60_hhkb( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______) + // clang-format on +}; diff --git a/keyboards/cipulot/ec_pro2/keymaps/default/keymap.c b/keyboards/cipulot/ec_pro2/keymaps/default/keymap.c index ad12d7ae8fe3..767b76ea3e72 100644 --- a/keyboards/cipulot/ec_pro2/keymaps/default/keymap.c +++ b/keyboards/cipulot/ec_pro2/keymaps/default/keymap.c @@ -18,27 +18,27 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // clang-format off - [0] = LAYOUT( + [0] = LAYOUT_all( KC_ESC, 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_BSLS, KC_GRV, 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_DEL, KC_LCTL, 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_BSLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI), - [1] = LAYOUT( + [1] = LAYOUT_all( _______, 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_INS, KC_DEL, KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUSE, KC_UP, _______, KC_BSPC, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, S(KC_8), KC_SLSH, KC_HOME, KC_PGUP, KC_LEFT, KC_RIGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, S(KC_EQL), KC_MINS, KC_END, KC_PGDN, KC_DOWN, _______, _______, _______, _______, _______, _______, MO(2)), - [2] = LAYOUT( + [2] = LAYOUT_all( RGB_TOG, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), - [3] = LAYOUT( + [3] = LAYOUT_all( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/cipulot/ec_pro2/keymaps/via/keymap.c b/keyboards/cipulot/ec_pro2/keymaps/via/keymap.c index ad12d7ae8fe3..767b76ea3e72 100644 --- a/keyboards/cipulot/ec_pro2/keymaps/via/keymap.c +++ b/keyboards/cipulot/ec_pro2/keymaps/via/keymap.c @@ -18,27 +18,27 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // clang-format off - [0] = LAYOUT( + [0] = LAYOUT_all( KC_ESC, 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_BSLS, KC_GRV, 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_DEL, KC_LCTL, 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_BSLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI), - [1] = LAYOUT( + [1] = LAYOUT_all( _______, 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_INS, KC_DEL, KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUSE, KC_UP, _______, KC_BSPC, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, S(KC_8), KC_SLSH, KC_HOME, KC_PGUP, KC_LEFT, KC_RIGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, S(KC_EQL), KC_MINS, KC_END, KC_PGDN, KC_DOWN, _______, _______, _______, _______, _______, _______, MO(2)), - [2] = LAYOUT( + [2] = LAYOUT_all( RGB_TOG, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), - [3] = LAYOUT( + [3] = LAYOUT_all( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, From 24bdac7b18c4058c7d598622cf8694957a1a844d Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Tue, 28 Feb 2023 01:54:24 +0100 Subject: [PATCH 18/24] Removal of `keycodes.h` no longer needed Thanks to the changes in keycode inclusion with VIA 12 changes this inclusion is no longer needed. Tested working on hardware. --- keyboards/cipulot/ec_pro2/keymaps/via/via_apc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/cipulot/ec_pro2/keymaps/via/via_apc.c b/keyboards/cipulot/ec_pro2/keymaps/via/via_apc.c index 325c767b5808..a0412faf3f3f 100644 --- a/keyboards/cipulot/ec_pro2/keymaps/via/via_apc.c +++ b/keyboards/cipulot/ec_pro2/keymaps/via/via_apc.c @@ -16,7 +16,6 @@ #include "ec_switch_matrix.h" #include "eeconfig.h" -#include "keycodes.h" #include "action.h" #include "via.h" From 213f5dd933c2b7dacbc6b9ecf6378b13efc948b6 Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Tue, 28 Feb 2023 02:23:46 +0100 Subject: [PATCH 19/24] Removed `#include "eeconfig.h"` Removed `#include "eeconfig.h"` too since the inclusion is done in the `via.h` file itself. So, in the spirit of only including files actually needed, there's no need to include it 2 times of course. --- keyboards/cipulot/ec_pro2/keymaps/via/via_apc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/cipulot/ec_pro2/keymaps/via/via_apc.c b/keyboards/cipulot/ec_pro2/keymaps/via/via_apc.c index a0412faf3f3f..bbfd661c402b 100644 --- a/keyboards/cipulot/ec_pro2/keymaps/via/via_apc.c +++ b/keyboards/cipulot/ec_pro2/keymaps/via/via_apc.c @@ -15,7 +15,6 @@ */ #include "ec_switch_matrix.h" -#include "eeconfig.h" #include "action.h" #include "via.h" From 54c41683eea281651c0c1f9d01bf0004140624d7 Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Wed, 1 Mar 2023 02:51:32 +0100 Subject: [PATCH 20/24] Removal of `"w": 1` --- keyboards/cipulot/ec_pro2/info.json | 206 ++++++++++++++-------------- 1 file changed, 103 insertions(+), 103 deletions(-) diff --git a/keyboards/cipulot/ec_pro2/info.json b/keyboards/cipulot/ec_pro2/info.json index ecd1c0ac9c07..64b617ca8699 100644 --- a/keyboards/cipulot/ec_pro2/info.json +++ b/keyboards/cipulot/ec_pro2/info.json @@ -52,132 +52,132 @@ "layouts": { "LAYOUT_all": { "layout": [ - { "label": "0,0", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, - { "label": "0,1", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, - { "label": "0,2", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, - { "label": "0,3", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, - { "label": "0,4", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 }, - { "label": "0,5", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 }, - { "label": "0,6", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 }, - { "label": "0,7", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 }, - { "label": "0,8", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 }, - { "label": "0,9", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 }, - { "label": "0,10", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 }, - { "label": "0,11", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 }, - { "label": "0,12", "matrix": [0, 12], "w": 1, "x": 12, "y": 0 }, - { "label": "0,13", "matrix": [0, 13], "w": 1, "x": 13, "y": 0 }, - { "label": "0,14", "matrix": [0, 14], "w": 1, "x": 14, "y": 0 }, + { "label": "0,0", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "0,1", "matrix": [0, 1], "x": 1, "y": 0 }, + { "label": "0,2", "matrix": [0, 2], "x": 2, "y": 0 }, + { "label": "0,3", "matrix": [0, 3], "x": 3, "y": 0 }, + { "label": "0,4", "matrix": [0, 4], "x": 4, "y": 0 }, + { "label": "0,5", "matrix": [0, 5], "x": 5, "y": 0 }, + { "label": "0,6", "matrix": [0, 6], "x": 6, "y": 0 }, + { "label": "0,7", "matrix": [0, 7], "x": 7, "y": 0 }, + { "label": "0,8", "matrix": [0, 8], "x": 8, "y": 0 }, + { "label": "0,9", "matrix": [0, 9], "x": 9, "y": 0 }, + { "label": "0,10", "matrix": [0, 10], "x": 10, "y": 0 }, + { "label": "0,11", "matrix": [0, 11], "x": 11, "y": 0 }, + { "label": "0,12", "matrix": [0, 12], "x": 12, "y": 0 }, + { "label": "0,13", "matrix": [0, 13], "x": 13, "y": 0 }, + { "label": "0,14", "matrix": [0, 14], "x": 14, "y": 0 }, { "label": "1,0", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, - { "label": "1,1", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 }, - { "label": "1,2", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 }, - { "label": "1,3", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 }, - { "label": "1,4", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 }, - { "label": "1,5", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 }, - { "label": "1,6", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 }, - { "label": "1,7", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 }, - { "label": "1,8", "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1 }, - { "label": "1,9", "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1 }, - { "label": "1,10", "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1 }, - { "label": "1,11", "matrix": [1, 11], "w": 1, "x": 11.5, "y": 1 }, - { "label": "1,12", "matrix": [1, 12], "w": 1, "x": 12.5, "y": 1 }, + { "label": "1,1", "matrix": [1, 1], "x": 1.5, "y": 1 }, + { "label": "1,2", "matrix": [1, 2], "x": 2.5, "y": 1 }, + { "label": "1,3", "matrix": [1, 3], "x": 3.5, "y": 1 }, + { "label": "1,4", "matrix": [1, 4], "x": 4.5, "y": 1 }, + { "label": "1,5", "matrix": [1, 5], "x": 5.5, "y": 1 }, + { "label": "1,6", "matrix": [1, 6], "x": 6.5, "y": 1 }, + { "label": "1,7", "matrix": [1, 7], "x": 7.5, "y": 1 }, + { "label": "1,8", "matrix": [1, 8], "x": 8.5, "y": 1 }, + { "label": "1,9", "matrix": [1, 9], "x": 9.5, "y": 1 }, + { "label": "1,10", "matrix": [1, 10], "x": 10.5, "y": 1 }, + { "label": "1,11", "matrix": [1, 11], "x": 11.5, "y": 1 }, + { "label": "1,12", "matrix": [1, 12], "x": 12.5, "y": 1 }, { "label": "1,13", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 }, { "label": "2,0", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, - { "label": "2,1", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 }, - { "label": "2,2", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 }, - { "label": "2,3", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 }, - { "label": "2,4", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 }, - { "label": "2,5", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 }, - { "label": "2,6", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 }, - { "label": "2,7", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 }, - { "label": "2,8", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 }, - { "label": "2,9", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 }, - { "label": "2,10", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 }, - { "label": "2,11", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 }, + { "label": "2,1", "matrix": [2, 1], "x": 1.75, "y": 2 }, + { "label": "2,2", "matrix": [2, 2], "x": 2.75, "y": 2 }, + { "label": "2,3", "matrix": [2, 3], "x": 3.75, "y": 2 }, + { "label": "2,4", "matrix": [2, 4], "x": 4.75, "y": 2 }, + { "label": "2,5", "matrix": [2, 5], "x": 5.75, "y": 2 }, + { "label": "2,6", "matrix": [2, 6], "x": 6.75, "y": 2 }, + { "label": "2,7", "matrix": [2, 7], "x": 7.75, "y": 2 }, + { "label": "2,8", "matrix": [2, 8], "x": 8.75, "y": 2 }, + { "label": "2,9", "matrix": [2, 9], "x": 9.75, "y": 2 }, + { "label": "2,10", "matrix": [2, 10], "x": 10.75, "y": 2 }, + { "label": "2,11", "matrix": [2, 11], "x": 11.75, "y": 2 }, { "label": "2,12", "matrix": [2, 12], "x": 12.75, "y": 2 }, { "label": "2,13", "matrix": [2, 13], "w": 1.25, "x": 13.75, "y": 2 }, { "label": "3,0", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 }, - { "label": "3,1", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 3 }, - { "label": "3,2", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 }, - { "label": "3,3", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 }, - { "label": "3,4", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 }, - { "label": "3,5", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 }, - { "label": "3,6", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 }, - { "label": "3,7", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 }, - { "label": "3,8", "matrix": [3, 8], "w": 1, "x": 8.25, "y": 3 }, - { "label": "3,9", "matrix": [3, 9], "w": 1, "x": 9.25, "y": 3 }, - { "label": "3,10", "matrix": [3, 10], "w": 1, "x": 10.25, "y": 3 }, - { "label": "3,11", "matrix": [3, 11], "w": 1, "x": 11.25, "y": 3 }, + { "label": "3,1", "matrix": [3, 1], "x": 1.25, "y": 3 }, + { "label": "3,2", "matrix": [3, 2], "x": 2.25, "y": 3 }, + { "label": "3,3", "matrix": [3, 3], "x": 3.25, "y": 3 }, + { "label": "3,4", "matrix": [3, 4], "x": 4.25, "y": 3 }, + { "label": "3,5", "matrix": [3, 5], "x": 5.25, "y": 3 }, + { "label": "3,6", "matrix": [3, 6], "x": 6.25, "y": 3 }, + { "label": "3,7", "matrix": [3, 7], "x": 7.25, "y": 3 }, + { "label": "3,8", "matrix": [3, 8], "x": 8.25, "y": 3 }, + { "label": "3,9", "matrix": [3, 9], "x": 9.25, "y": 3 }, + { "label": "3,10", "matrix": [3, 10], "x": 10.25, "y": 3 }, + { "label": "3,11", "matrix": [3, 11], "x": 11.25, "y": 3 }, { "label": "3,13", "matrix": [3, 13], "w": 1.75, "x": 12.25, "y": 3 }, - { "label": "3,14", "matrix": [3, 14], "w": 1, "x": 14, "y": 3 }, - { "label": "4,1", "matrix": [4, 1], "w": 1, "x": 1.5, "y": 4 }, + { "label": "3,14", "matrix": [3, 14], "x": 14, "y": 3 }, + { "label": "4,1", "matrix": [4, 1], "x": 1.5, "y": 4 }, { "label": "4,2", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 }, { "label": "4,6", "matrix": [4, 6], "w": 6, "x": 4, "y": 4 }, { "label": "4,9", "matrix": [4, 9], "w": 1.5, "x": 10, "y": 4 }, - { "label": "4,10", "matrix": [4, 10], "w": 1, "x": 11.5, "y": 4 } + { "label": "4,10", "matrix": [4, 10], "x": 11.5, "y": 4 } ] }, "LAYOUT_60_hhkb": { "layout": [ - { "label": "0,0", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, - { "label": "0,1", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, - { "label": "0,2", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, - { "label": "0,3", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, - { "label": "0,4", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 }, - { "label": "0,5", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 }, - { "label": "0,6", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 }, - { "label": "0,7", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 }, - { "label": "0,8", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 }, - { "label": "0,9", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 }, - { "label": "0,10", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 }, - { "label": "0,11", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 }, - { "label": "0,12", "matrix": [0, 12], "w": 1, "x": 12, "y": 0 }, - { "label": "0,13", "matrix": [0, 13], "w": 1, "x": 13, "y": 0 }, - { "label": "0,14", "matrix": [0, 14], "w": 1, "x": 14, "y": 0 }, + { "label": "0,0", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "0,1", "matrix": [0, 1], "x": 1, "y": 0 }, + { "label": "0,2", "matrix": [0, 2], "x": 2, "y": 0 }, + { "label": "0,3", "matrix": [0, 3], "x": 3, "y": 0 }, + { "label": "0,4", "matrix": [0, 4], "x": 4, "y": 0 }, + { "label": "0,5", "matrix": [0, 5], "x": 5, "y": 0 }, + { "label": "0,6", "matrix": [0, 6], "x": 6, "y": 0 }, + { "label": "0,7", "matrix": [0, 7], "x": 7, "y": 0 }, + { "label": "0,8", "matrix": [0, 8], "x": 8, "y": 0 }, + { "label": "0,9", "matrix": [0, 9], "x": 9, "y": 0 }, + { "label": "0,10", "matrix": [0, 10], "x": 10, "y": 0 }, + { "label": "0,11", "matrix": [0, 11], "x": 11, "y": 0 }, + { "label": "0,12", "matrix": [0, 12], "x": 12, "y": 0 }, + { "label": "0,13", "matrix": [0, 13], "x": 13, "y": 0 }, + { "label": "0,14", "matrix": [0, 14], "x": 14, "y": 0 }, { "label": "1,0", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, - { "label": "1,1", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 }, - { "label": "1,2", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 }, - { "label": "1,3", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 }, - { "label": "1,4", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 }, - { "label": "1,5", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 }, - { "label": "1,6", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 }, - { "label": "1,7", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 }, - { "label": "1,8", "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1 }, - { "label": "1,9", "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1 }, - { "label": "1,10", "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1 }, - { "label": "1,11", "matrix": [1, 11], "w": 1, "x": 11.5, "y": 1 }, - { "label": "1,12", "matrix": [1, 12], "w": 1, "x": 12.5, "y": 1 }, + { "label": "1,1", "matrix": [1, 1], "x": 1.5, "y": 1 }, + { "label": "1,2", "matrix": [1, 2], "x": 2.5, "y": 1 }, + { "label": "1,3", "matrix": [1, 3], "x": 3.5, "y": 1 }, + { "label": "1,4", "matrix": [1, 4], "x": 4.5, "y": 1 }, + { "label": "1,5", "matrix": [1, 5], "x": 5.5, "y": 1 }, + { "label": "1,6", "matrix": [1, 6], "x": 6.5, "y": 1 }, + { "label": "1,7", "matrix": [1, 7], "x": 7.5, "y": 1 }, + { "label": "1,8", "matrix": [1, 8], "x": 8.5, "y": 1 }, + { "label": "1,9", "matrix": [1, 9], "x": 9.5, "y": 1 }, + { "label": "1,10", "matrix": [1, 10], "x": 10.5, "y": 1 }, + { "label": "1,11", "matrix": [1, 11], "x": 11.5, "y": 1 }, + { "label": "1,12", "matrix": [1, 12], "x": 12.5, "y": 1 }, { "label": "1,13", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 }, { "label": "2,0", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, - { "label": "2,1", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 }, - { "label": "2,2", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 }, - { "label": "2,3", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 }, - { "label": "2,4", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 }, - { "label": "2,5", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 }, - { "label": "2,6", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 }, - { "label": "2,7", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 }, - { "label": "2,8", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 }, - { "label": "2,9", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 }, - { "label": "2,10", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 }, - { "label": "2,11", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 }, + { "label": "2,1", "matrix": [2, 1], "x": 1.75, "y": 2 }, + { "label": "2,2", "matrix": [2, 2], "x": 2.75, "y": 2 }, + { "label": "2,3", "matrix": [2, 3], "x": 3.75, "y": 2 }, + { "label": "2,4", "matrix": [2, 4], "x": 4.75, "y": 2 }, + { "label": "2,5", "matrix": [2, 5], "x": 5.75, "y": 2 }, + { "label": "2,6", "matrix": [2, 6], "x": 6.75, "y": 2 }, + { "label": "2,7", "matrix": [2, 7], "x": 7.75, "y": 2 }, + { "label": "2,8", "matrix": [2, 8], "x": 8.75, "y": 2 }, + { "label": "2,9", "matrix": [2, 9], "x": 9.75, "y": 2 }, + { "label": "2,10", "matrix": [2, 10], "x": 10.75, "y": 2 }, + { "label": "2,11", "matrix": [2, 11], "x": 11.75, "y": 2 }, { "label": "2,13", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 }, { "label": "3,0", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 }, - { "label": "3,2", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 }, - { "label": "3,3", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 }, - { "label": "3,4", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 }, - { "label": "3,5", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 }, - { "label": "3,6", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 }, - { "label": "3,7", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 }, - { "label": "3,8", "matrix": [3, 8], "w": 1, "x": 8.25, "y": 3 }, - { "label": "3,9", "matrix": [3, 9], "w": 1, "x": 9.25, "y": 3 }, - { "label": "3,10", "matrix": [3, 10], "w": 1, "x": 10.25, "y": 3 }, - { "label": "3,11", "matrix": [3, 11], "w": 1, "x": 11.25, "y": 3 }, + { "label": "3,2", "matrix": [3, 2], "x": 2.25, "y": 3 }, + { "label": "3,3", "matrix": [3, 3], "x": 3.25, "y": 3 }, + { "label": "3,4", "matrix": [3, 4], "x": 4.25, "y": 3 }, + { "label": "3,5", "matrix": [3, 5], "x": 5.25, "y": 3 }, + { "label": "3,6", "matrix": [3, 6], "x": 6.25, "y": 3 }, + { "label": "3,7", "matrix": [3, 7], "x": 7.25, "y": 3 }, + { "label": "3,8", "matrix": [3, 8], "x": 8.25, "y": 3 }, + { "label": "3,9", "matrix": [3, 9], "x": 9.25, "y": 3 }, + { "label": "3,10", "matrix": [3, 10], "x": 10.25, "y": 3 }, + { "label": "3,11", "matrix": [3, 11], "x": 11.25, "y": 3 }, { "label": "3,13", "matrix": [3, 13], "w": 1.75, "x": 12.25, "y": 3 }, - { "label": "3,14", "matrix": [3, 14], "w": 1, "x": 14, "y": 3 }, - { "label": "4,1", "matrix": [4, 1], "w": 1, "x": 1.5, "y": 4 }, + { "label": "3,14", "matrix": [3, 14], "x": 14, "y": 3 }, + { "label": "4,1", "matrix": [4, 1], "x": 1.5, "y": 4 }, { "label": "4,2", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 }, { "label": "4,6", "matrix": [4, 6], "w": 6, "x": 4, "y": 4 }, { "label": "4,9", "matrix": [4, 9], "w": 1.5, "x": 10, "y": 4 }, - { "label": "4,10", "matrix": [4, 10], "w": 1, "x": 11.5, "y": 4 } + { "label": "4,10", "matrix": [4, 10], "x": 11.5, "y": 4 } ] } } From 0c2e6659f9c4bd51ff9f23b37e5af69ee5c86259 Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Tue, 7 Mar 2023 03:59:36 +0100 Subject: [PATCH 21/24] Added `DISCHARGE_TIME` Addition of a `DISCHARGE_TIME` time. This is to ensure that the ghost capacitor that is the row strobed for the ADC read, is fully drained and doesn't carry charges that deviates the readings. Tested on multiple hardware and confirmed working and improving the readings, both in terms of stability and consistency for baseline noise. --- keyboards/cipulot/ec_pro2/config.h | 2 ++ keyboards/cipulot/ec_pro2/ec_switch_matrix.c | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/keyboards/cipulot/ec_pro2/config.h b/keyboards/cipulot/ec_pro2/config.h index 1c552d22638e..39d16f2d59d3 100644 --- a/keyboards/cipulot/ec_pro2/config.h +++ b/keyboards/cipulot/ec_pro2/config.h @@ -44,3 +44,5 @@ #define DEFAULT_ACTUATION_LEVEL 550 #define DEFAULT_RELEASE_LEVEL 500 + +#define DISCHARGE_TIME 10 diff --git a/keyboards/cipulot/ec_pro2/ec_switch_matrix.c b/keyboards/cipulot/ec_pro2/ec_switch_matrix.c index a65b0fc2bb7b..0638b0e92b3b 100644 --- a/keyboards/cipulot/ec_pro2/ec_switch_matrix.c +++ b/keyboards/cipulot/ec_pro2/ec_switch_matrix.c @@ -18,6 +18,7 @@ #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; @@ -65,7 +66,7 @@ int ecsm_init(ecsm_config_t const* const 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 + // Dummy call to make sure that adcStart() has been called in the appropriate state adc_read(adcMux); // Initialize discharge pin as discharge mode @@ -113,11 +114,14 @@ uint16_t ecsm_readkey_raw(uint8_t channel, uint8_t row, uint8_t col) { ATOMIC_BLOCK_FORCEON { // Set the row pin to high state and have capacitor charge charge_capacitor(row); + //wait_us(10); // 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; } From 1f3b6884afcbc23fa2af824dc3530bf301b04963 Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Tue, 7 Mar 2023 04:02:11 +0100 Subject: [PATCH 22/24] removal of commented code not used --- keyboards/cipulot/ec_pro2/ec_switch_matrix.c | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/cipulot/ec_pro2/ec_switch_matrix.c b/keyboards/cipulot/ec_pro2/ec_switch_matrix.c index 0638b0e92b3b..d45e8c328120 100644 --- a/keyboards/cipulot/ec_pro2/ec_switch_matrix.c +++ b/keyboards/cipulot/ec_pro2/ec_switch_matrix.c @@ -114,7 +114,6 @@ uint16_t ecsm_readkey_raw(uint8_t channel, uint8_t row, uint8_t col) { ATOMIC_BLOCK_FORCEON { // Set the row pin to high state and have capacitor charge charge_capacitor(row); - //wait_us(10); // Read the ADC value sw_value = adc_read(adcMux); } From 54e4d21767b7b9892867be3b901157d211222a5c Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Wed, 8 Mar 2023 01:14:00 +0100 Subject: [PATCH 23/24] Removal of `info.json` lines as suggested --- keyboards/cipulot/ec_pro2/info.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/cipulot/ec_pro2/info.json b/keyboards/cipulot/ec_pro2/info.json index 64b617ca8699..ae92d44e7860 100644 --- a/keyboards/cipulot/ec_pro2/info.json +++ b/keyboards/cipulot/ec_pro2/info.json @@ -2,7 +2,6 @@ "manufacturer": "Cipulot", "keyboard_name": "EC Pro2", "maintainer": "Cipulot", - "board": "GENERIC_STM32_F401XC", "bootloader": "stm32-dfu", "build": { "lto": true @@ -19,7 +18,6 @@ "nkro": true, "rgblight": true }, - "keyboard_folder": "cipulot/ec_pro2", "mouse_key": { "enabled": true }, From dfd997d8b22c9df706c9eeee923af9f5c1dce550 Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Wed, 8 Mar 2023 02:09:27 +0100 Subject: [PATCH 24/24] Update to comply with `_kb` and `_user` separation --- keyboards/cipulot/ec_pro2/config.h | 3 --- .../cipulot/ec_pro2/keymaps/via/config.h | 20 +++++++++++++++++++ .../cipulot/ec_pro2/keymaps/via/via_apc.c | 12 +++++------ 3 files changed, 26 insertions(+), 9 deletions(-) create mode 100644 keyboards/cipulot/ec_pro2/keymaps/via/config.h diff --git a/keyboards/cipulot/ec_pro2/config.h b/keyboards/cipulot/ec_pro2/config.h index 39d16f2d59d3..083b71cc1363 100644 --- a/keyboards/cipulot/ec_pro2/config.h +++ b/keyboards/cipulot/ec_pro2/config.h @@ -39,9 +39,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -// This is the size of the EEPROM for the custom VIA-specific data -#define EECONFIG_KB_DATA_SIZE 4 - #define DEFAULT_ACTUATION_LEVEL 550 #define DEFAULT_RELEASE_LEVEL 500 diff --git a/keyboards/cipulot/ec_pro2/keymaps/via/config.h b/keyboards/cipulot/ec_pro2/keymaps/via/config.h new file mode 100644 index 000000000000..ebf954d07aca --- /dev/null +++ b/keyboards/cipulot/ec_pro2/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 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 . + */ + +#pragma once + +// This is the size of the EEPROM for the custom VIA-specific data +#define EECONFIG_USER_DATA_SIZE 4 diff --git a/keyboards/cipulot/ec_pro2/keymaps/via/via_apc.c b/keyboards/cipulot/ec_pro2/keymaps/via/via_apc.c index bbfd661c402b..5ea77af44c8b 100644 --- a/keyboards/cipulot/ec_pro2/keymaps/via/via_apc.c +++ b/keyboards/cipulot/ec_pro2/keymaps/via/via_apc.c @@ -28,7 +28,7 @@ typedef struct _apc_config_t { } apc_config; // Check if the size of the reserved persistent memory is the same as the size of struct apc_config -_Static_assert(sizeof(apc_config) == EECONFIG_KB_DATA_SIZE, "Mismatch in keyboard EECONFIG stored data"); +_Static_assert(sizeof(apc_config) == EECONFIG_USER_DATA_SIZE, "Mismatch in keyboard EECONFIG stored data"); // Declaring a new variable apc of type apc_config apc_config apc; @@ -42,18 +42,18 @@ enum via_apc_enums { }; // Initializing persistent memory configuration: default values are declared and stored in PMEM -void eeconfig_init_kb(void) { +void eeconfig_init_user(void) { // Default values apc.actuation_threshold = DEFAULT_ACTUATION_LEVEL; apc.release_threshold = DEFAULT_RELEASE_LEVEL; // Write default value to EEPROM now - eeconfig_update_kb_datablock(&apc); + eeconfig_update_user_datablock(&apc); } // On Keyboard startup -void keyboard_post_init_kb(void) { +void keyboard_post_init_user(void) { // Read custom menu variables from memory - eeconfig_read_kb_datablock(&apc); + eeconfig_read_user_datablock(&apc); apc_init_thresholds(); } @@ -99,7 +99,7 @@ void apc_config_get_value(uint8_t *data) { // Save the data to persistent memory after changes are made void apc_config_save(void) { - eeconfig_update_kb_datablock(&apc); + eeconfig_update_user_datablock(&apc); } void via_custom_value_command_kb(uint8_t *data, uint8_t length) {