From 7a01ecb3fa0f375759525b6610ab51eecf33db2c Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Thu, 23 Feb 2023 22:49:33 +0100 Subject: [PATCH 01/10] Add EC 23U PCB firmware --- keyboards/cipulot/ec_23u/config.h | 45 +++++ keyboards/cipulot/ec_23u/ec_switch_matrix.c | 162 ++++++++++++++++++ keyboards/cipulot/ec_23u/ec_switch_matrix.h | 36 ++++ keyboards/cipulot/ec_23u/halconf.h | 21 +++ keyboards/cipulot/ec_23u/info.json | 89 ++++++++++ .../cipulot/ec_23u/keymaps/default/keymap.c | 54 ++++++ keyboards/cipulot/ec_23u/keymaps/via/keymap.c | 54 ++++++ keyboards/cipulot/ec_23u/keymaps/via/rules.mk | 3 + .../cipulot/ec_23u/keymaps/via/via_apc.c | 158 +++++++++++++++++ keyboards/cipulot/ec_23u/matrix.c | 44 +++++ keyboards/cipulot/ec_23u/mcuconf.h | 22 +++ keyboards/cipulot/ec_23u/readme.md | 27 +++ keyboards/cipulot/ec_23u/rules.mk | 2 + 13 files changed, 717 insertions(+) create mode 100644 keyboards/cipulot/ec_23u/config.h create mode 100644 keyboards/cipulot/ec_23u/ec_switch_matrix.c create mode 100644 keyboards/cipulot/ec_23u/ec_switch_matrix.h create mode 100644 keyboards/cipulot/ec_23u/halconf.h create mode 100644 keyboards/cipulot/ec_23u/info.json create mode 100644 keyboards/cipulot/ec_23u/keymaps/default/keymap.c create mode 100644 keyboards/cipulot/ec_23u/keymaps/via/keymap.c create mode 100644 keyboards/cipulot/ec_23u/keymaps/via/rules.mk create mode 100644 keyboards/cipulot/ec_23u/keymaps/via/via_apc.c create mode 100644 keyboards/cipulot/ec_23u/matrix.c create mode 100644 keyboards/cipulot/ec_23u/mcuconf.h create mode 100644 keyboards/cipulot/ec_23u/readme.md create mode 100644 keyboards/cipulot/ec_23u/rules.mk diff --git a/keyboards/cipulot/ec_23u/config.h b/keyboards/cipulot/ec_23u/config.h new file mode 100644 index 000000000000..09555cc62c12 --- /dev/null +++ b/keyboards/cipulot/ec_23u/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 . + */ + +#pragma once + +/* Custom matrix pins and port select array */ +#define MATRIX_ROW_PINS \ + { B13, B12, A7, B0 } +#define MATRIX_COL_CHANNELS \ + { 4, 6, 3, 2, 0, 1 } +#define MUX_SEL_PINS \ + { C14, C13, B6 } + +/* Hardware peripherals pins */ +#define APLEX_EN_PIN C15 +#define DISCHARGE_PIN A3 +#define ANALOG_PORT A2 + +/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ +//#define DEBOUNCE 5 + +/* 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 + +#define DEFAULT_ACTUATION_LEVEL 700 +#define DEFAULT_RELEASE_LEVEL 600 diff --git a/keyboards/cipulot/ec_23u/ec_switch_matrix.c b/keyboards/cipulot/ec_23u/ec_switch_matrix.c new file mode 100644 index 000000000000..f455acd76bf1 --- /dev/null +++ b/keyboards/cipulot/ec_23u/ec_switch_matrix.c @@ -0,0 +1,162 @@ +/* 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" + +/* 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); + writePinLow(APLEX_EN_PIN); + + 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 + writePinHigh(APLEX_EN_PIN); + select_mux(col); + writePinLow(APLEX_EN_PIN); + + // 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(); + + 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; + + 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]); + } + } + + 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_23u/ec_switch_matrix.h b/keyboards/cipulot/ec_23u/ec_switch_matrix.h new file mode 100644 index 000000000000..9dcb216caa3f --- /dev/null +++ b/keyboards/cipulot/ec_23u/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_23u/halconf.h b/keyboards/cipulot/ec_23u/halconf.h new file mode 100644 index 000000000000..5b71acecbbc8 --- /dev/null +++ b/keyboards/cipulot/ec_23u/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_23u/info.json b/keyboards/cipulot/ec_23u/info.json new file mode 100644 index 000000000000..d5e51d09465f --- /dev/null +++ b/keyboards/cipulot/ec_23u/info.json @@ -0,0 +1,89 @@ +{ + "manufacturer": "Cipulot", + "keyboard_name": "EC 23U", + "maintainer": "Cipulot", + "board": "GENERIC_STM32_F401XC", + "bootloader": "stm32-dfu", + "build": { + "lto": true + }, + "diode_direction": "COL2ROW", + "matrix_size": { + "rows": 4, + "cols": 6 + }, + "features": { + "audio": false, + "backlight": false, + "bootmagic": true, + "command": false, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, + "keyboard_folder": "cipulot/ec_23u", + "mouse_key": { + "enabled": true + }, + "indicators": { + "num_lock": "B14" + }, + "processor": "STM32F401", + "rgblight": { + "led_count": 21, + "pin": "B5", + "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/EC23U", + "usb": { + "device_version": "0.0.1", + "pid": "0x6B95", + "shared_endpoint": { + "keyboard": true + }, + "vid": "0x6369" + }, + "layouts": { + "LAYOUT": { + "layout": [ + { "label": "k00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, + { "label": "k01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, + { "label": "k02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, + { "label": "k03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, + { "label": "k10", "matrix": [1, 0], "w": 1, "x": 0, "y": 1.5 }, + { "label": "k11", "matrix": [1, 1], "w": 1, "x": 1, "y": 1.5 }, + { "label": "k12", "matrix": [1, 2], "w": 1, "x": 2, "y": 1.5 }, + { "label": "k13", "matrix": [1, 3], "w": 1, "x": 3, "y": 1.5 }, + { "label": "k20", "matrix": [2, 0], "w": 1, "x": 0, "y": 2.5 }, + { "label": "k21", "matrix": [2, 1], "w": 1, "x": 1, "y": 2.5 }, + { "label": "k22", "matrix": [2, 2], "w": 1, "x": 2, "y": 2.5 }, + { "label": "k23", "matrix": [2, 3], "w": 1, "x": 3, "y": 2.5 }, + { "label": "k30", "matrix": [3, 0], "w": 1, "x": 0, "y": 3.5 }, + { "label": "k31", "matrix": [3, 1], "w": 1, "x": 1, "y": 3.5 }, + { "label": "k32", "matrix": [3, 2], "w": 1, "x": 2, "y": 3.5 }, + { "label": "k33", "matrix": [3, 3], "w": 1, "x": 3, "y": 3.5 }, + { "label": "k24", "matrix": [2, 4], "w": 1, "x": 0, "y": 4.5 }, + { "label": "k04", "matrix": [0, 4], "w": 1, "x": 1, "y": 4.5 }, + { "label": "k14", "matrix": [1, 4], "w": 1, "x": 2, "y": 4.5 }, + { "label": "k34", "matrix": [3, 4], "w": 1, "x": 3, "y": 4.5 }, + { "label": "k25", "matrix": [2, 5], "w": 1, "x": 0, "y": 5.5 }, + { "label": "k05", "matrix": [0, 5], "w": 1, "x": 1, "y": 5.5 }, + { "label": "k15", "matrix": [1, 5], "w": 1, "x": 2, "y": 5.5 }, + { "label": "k35", "matrix": [3, 5], "w": 1, "x": 3, "y": 5.5 } + ] + } + } +} diff --git a/keyboards/cipulot/ec_23u/keymaps/default/keymap.c b/keyboards/cipulot/ec_23u/keymaps/default/keymap.c new file mode 100644 index 000000000000..8f17f97fb4af --- /dev/null +++ b/keyboards/cipulot/ec_23u/keymaps/default/keymap.c @@ -0,0 +1,54 @@ +/* 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_TAB, KC_BSPC, MO(1), + KC_NUM, KC_PSLS, KC_PAST, KC_PEQL, + KC_P7, KC_P8, KC_P9, KC_PMNS, + KC_P4, KC_P5, KC_P6, KC_PPLS, + KC_P1, KC_P2, KC_P3, KC_PENT, + KC_P0, KC_P0, KC_PDOT, KC_PENT), + + [1] = LAYOUT( + RGB_TOG, RGB_VAD, RGB_VAI, _______, + _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, QK_BOOT, _______), + + + [2] = LAYOUT( + _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______), + + [3] = LAYOUT( + _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______) + // clang-format on +}; diff --git a/keyboards/cipulot/ec_23u/keymaps/via/keymap.c b/keyboards/cipulot/ec_23u/keymaps/via/keymap.c new file mode 100644 index 000000000000..8f17f97fb4af --- /dev/null +++ b/keyboards/cipulot/ec_23u/keymaps/via/keymap.c @@ -0,0 +1,54 @@ +/* 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_TAB, KC_BSPC, MO(1), + KC_NUM, KC_PSLS, KC_PAST, KC_PEQL, + KC_P7, KC_P8, KC_P9, KC_PMNS, + KC_P4, KC_P5, KC_P6, KC_PPLS, + KC_P1, KC_P2, KC_P3, KC_PENT, + KC_P0, KC_P0, KC_PDOT, KC_PENT), + + [1] = LAYOUT( + RGB_TOG, RGB_VAD, RGB_VAI, _______, + _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, QK_BOOT, _______), + + + [2] = LAYOUT( + _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______), + + [3] = LAYOUT( + _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______) + // clang-format on +}; diff --git a/keyboards/cipulot/ec_23u/keymaps/via/rules.mk b/keyboards/cipulot/ec_23u/keymaps/via/rules.mk new file mode 100644 index 000000000000..520b11f20312 --- /dev/null +++ b/keyboards/cipulot/ec_23u/keymaps/via/rules.mk @@ -0,0 +1,3 @@ +VIA_ENABLE = yes + +SRC += via_apc.c diff --git a/keyboards/cipulot/ec_23u/keymaps/via/via_apc.c b/keyboards/cipulot/ec_23u/keymaps/via/via_apc.c new file mode 100644 index 000000000000..325c767b5808 --- /dev/null +++ b/keyboards/cipulot/ec_23u/keymaps/via/via_apc.c @@ -0,0 +1,158 @@ +/* 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 "eeconfig.h" +#include "keycodes.h" +#include "action.h" +#include "via.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 = DEFAULT_ACTUATION_LEVEL; + apc.release_threshold = DEFAULT_RELEASE_LEVEL; + // 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); +} diff --git a/keyboards/cipulot/ec_23u/matrix.c b/keyboards/cipulot/ec_23u/matrix.c new file mode 100644 index 000000000000..1850acf26414 --- /dev/null +++ b/keyboards/cipulot/ec_23u/matrix.c @@ -0,0 +1,44 @@ +/* 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" + +/* 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 = DEFAULT_ACTUATION_LEVEL; + ecsm_config.ecsm_release_threshold = DEFAULT_RELEASE_LEVEL; + + 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_23u/mcuconf.h b/keyboards/cipulot/ec_23u/mcuconf.h new file mode 100644 index 000000000000..d91f576bd48b --- /dev/null +++ b/keyboards/cipulot/ec_23u/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_23u/readme.md b/keyboards/cipulot/ec_23u/readme.md new file mode 100644 index 000000000000..e206e1428bf8 --- /dev/null +++ b/keyboards/cipulot/ec_23u/readme.md @@ -0,0 +1,27 @@ +# EC 23U + +![EC 23U PCB](https://i.imgur.com/G6QK1kU.png) + +Open source numpad Electrostatic Capacitive PCB. + +* Keyboard Maintainer: [cipulot](https://github.com/cipulot) +* Hardware Supported: EC23U +* Hardware Availability: [Github](https://github.com/Cipulot/EC23U) + +Make example for this keyboard (after setting up your build environment): + + make ec_23u:default + +Flashing example for this keyboard: + + make ec_23u: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 diff --git a/keyboards/cipulot/ec_23u/rules.mk b/keyboards/cipulot/ec_23u/rules.mk new file mode 100644 index 000000000000..b27b0f7ac071 --- /dev/null +++ b/keyboards/cipulot/ec_23u/rules.mk @@ -0,0 +1,2 @@ +CUSTOM_MATRIX = lite +SRC += analog.c matrix.c ec_switch_matrix.c From 918db89938e5c8fee5ac14b68e170e7df26b5606 Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Sat, 25 Feb 2023 09:33:48 +0100 Subject: [PATCH 02/10] Moved from data driven row/col def to config def --- keyboards/cipulot/ec_23u/config.h | 3 +++ keyboards/cipulot/ec_23u/info.json | 4 ---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/keyboards/cipulot/ec_23u/config.h b/keyboards/cipulot/ec_23u/config.h index 09555cc62c12..c69dc0a94f88 100644 --- a/keyboards/cipulot/ec_23u/config.h +++ b/keyboards/cipulot/ec_23u/config.h @@ -16,6 +16,9 @@ #pragma once +#define MATRIX_ROWS 4 +#define MATRIX_COLS 6 + /* Custom matrix pins and port select array */ #define MATRIX_ROW_PINS \ { B13, B12, A7, B0 } diff --git a/keyboards/cipulot/ec_23u/info.json b/keyboards/cipulot/ec_23u/info.json index d5e51d09465f..9c6421c06bc2 100644 --- a/keyboards/cipulot/ec_23u/info.json +++ b/keyboards/cipulot/ec_23u/info.json @@ -8,10 +8,6 @@ "lto": true }, "diode_direction": "COL2ROW", - "matrix_size": { - "rows": 4, - "cols": 6 - }, "features": { "audio": false, "backlight": false, From 2f666d7473360e7665462a894c3a56d37826de58 Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Sat, 25 Feb 2023 15:37:16 +0100 Subject: [PATCH 03/10] Implemented proper LAYOUT_ changes --- keyboards/cipulot/ec_23u/info.json | 75 ++++++++++++------- .../cipulot/ec_23u/keymaps/default/keymap.c | 8 +- .../ec_23u/keymaps/numpad_6x4/keymap.c | 54 +++++++++++++ keyboards/cipulot/ec_23u/keymaps/via/keymap.c | 8 +- 4 files changed, 112 insertions(+), 33 deletions(-) create mode 100644 keyboards/cipulot/ec_23u/keymaps/numpad_6x4/keymap.c diff --git a/keyboards/cipulot/ec_23u/info.json b/keyboards/cipulot/ec_23u/info.json index 9c6421c06bc2..41ef9ba53be8 100644 --- a/keyboards/cipulot/ec_23u/info.json +++ b/keyboards/cipulot/ec_23u/info.json @@ -53,32 +53,57 @@ "vid": "0x6369" }, "layouts": { - "LAYOUT": { + "LAYOUT_all": { "layout": [ - { "label": "k00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, - { "label": "k01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, - { "label": "k02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, - { "label": "k03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, - { "label": "k10", "matrix": [1, 0], "w": 1, "x": 0, "y": 1.5 }, - { "label": "k11", "matrix": [1, 1], "w": 1, "x": 1, "y": 1.5 }, - { "label": "k12", "matrix": [1, 2], "w": 1, "x": 2, "y": 1.5 }, - { "label": "k13", "matrix": [1, 3], "w": 1, "x": 3, "y": 1.5 }, - { "label": "k20", "matrix": [2, 0], "w": 1, "x": 0, "y": 2.5 }, - { "label": "k21", "matrix": [2, 1], "w": 1, "x": 1, "y": 2.5 }, - { "label": "k22", "matrix": [2, 2], "w": 1, "x": 2, "y": 2.5 }, - { "label": "k23", "matrix": [2, 3], "w": 1, "x": 3, "y": 2.5 }, - { "label": "k30", "matrix": [3, 0], "w": 1, "x": 0, "y": 3.5 }, - { "label": "k31", "matrix": [3, 1], "w": 1, "x": 1, "y": 3.5 }, - { "label": "k32", "matrix": [3, 2], "w": 1, "x": 2, "y": 3.5 }, - { "label": "k33", "matrix": [3, 3], "w": 1, "x": 3, "y": 3.5 }, - { "label": "k24", "matrix": [2, 4], "w": 1, "x": 0, "y": 4.5 }, - { "label": "k04", "matrix": [0, 4], "w": 1, "x": 1, "y": 4.5 }, - { "label": "k14", "matrix": [1, 4], "w": 1, "x": 2, "y": 4.5 }, - { "label": "k34", "matrix": [3, 4], "w": 1, "x": 3, "y": 4.5 }, - { "label": "k25", "matrix": [2, 5], "w": 1, "x": 0, "y": 5.5 }, - { "label": "k05", "matrix": [0, 5], "w": 1, "x": 1, "y": 5.5 }, - { "label": "k15", "matrix": [1, 5], "w": 1, "x": 2, "y": 5.5 }, - { "label": "k35", "matrix": [3, 5], "w": 1, "x": 3, "y": 5.5 } + { "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": "1,0", "matrix": [1, 0], "x": 0.0, "y": 1.5 }, + { "label": "1,1", "matrix": [1, 1], "x": 1.0, "y": 1.5 }, + { "label": "1,2", "matrix": [1, 2], "x": 2.0, "y": 1.5 }, + { "label": "1,3", "matrix": [1, 3], "x": 3.0, "y": 1.5 }, + { "label": "2,0", "matrix": [2, 0], "x": 0.0, "y": 2.5 }, + { "label": "2,1", "matrix": [2, 1], "x": 1.0, "y": 2.5 }, + { "label": "2,2", "matrix": [2, 2], "x": 2.0, "y": 2.5 }, + { "label": "2,3", "matrix": [2, 3], "x": 3.0, "y": 2.5 }, + { "label": "3,0", "matrix": [3, 0], "x": 0.0, "y": 3.5 }, + { "label": "3,1", "matrix": [3, 1], "x": 1.0, "y": 3.5 }, + { "label": "3,2", "matrix": [3, 2], "x": 2.0, "y": 3.5 }, + { "label": "3,3", "matrix": [3, 3], "x": 3.0, "y": 3.5 }, + { "label": "2,4", "matrix": [2, 4], "x": 0.0, "y": 4.5 }, + { "label": "0,4", "matrix": [0, 4], "x": 1.0, "y": 4.5 }, + { "label": "1,4", "matrix": [1, 4], "x": 2.0, "y": 4.5 }, + { "label": "3,4", "matrix": [3, 4], "x": 3.0, "y": 4.5 }, + { "label": "2,5", "matrix": [2, 5], "x": 0.0, "y": 5.5 }, + { "label": "0,5", "matrix": [0, 5], "x": 1.0, "y": 5.5 }, + { "label": "1,5", "matrix": [1, 5], "x": 2.0, "y": 5.5 }, + { "label": "3,5", "matrix": [3, 5], "x": 3.0, "y": 5.5 } + ] + }, + "LAYOUT_numpad_6x4": { + "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": "1,0", "matrix": [1, 0], "x": 0.0, "y": 1.5 }, + { "label": "1,1", "matrix": [1, 1], "x": 1.0, "y": 1.5 }, + { "label": "1,2", "matrix": [1, 2], "x": 2.0, "y": 1.5 }, + { "label": "1,3", "matrix": [1, 3], "x": 3.0, "y": 1.5 }, + { "label": "2,0", "matrix": [2, 0], "x": 0.0, "y": 2.5 }, + { "label": "2,1", "matrix": [2, 1], "x": 1.0, "y": 2.5 }, + { "label": "2,2", "matrix": [2, 2], "x": 2.0, "y": 2.5 }, + { "h": 2, "label": "3,3", "matrix": [3, 3], "x": 3.0, "y": 2.5 }, + { "label": "3,0", "matrix": [3, 0], "x": 0.0, "y": 3.5 }, + { "label": "3,1", "matrix": [3, 1], "x": 1.0, "y": 3.5 }, + { "label": "3,2", "matrix": [3, 2], "x": 2.0, "y": 3.5 }, + { "label": "2,4", "matrix": [2, 4], "x": 0.0, "y": 4.5 }, + { "label": "0,4", "matrix": [0, 4], "x": 1.0, "y": 4.5 }, + { "label": "1,4", "matrix": [1, 4], "x": 2.0, "y": 4.5 }, + { "h": 2, "label": "3,4", "matrix": [3, 4], "x": 3.0, "y": 4.5 }, + { "label": "2,5", "matrix": [2, 5], "w": 2, "x": 0.0, "y": 5.5 }, + { "label": "1,5", "matrix": [1, 5], "x": 2.0, "y": 5.5 } ] } } diff --git a/keyboards/cipulot/ec_23u/keymaps/default/keymap.c b/keyboards/cipulot/ec_23u/keymaps/default/keymap.c index 8f17f97fb4af..93ceadb842ca 100644 --- a/keyboards/cipulot/ec_23u/keymaps/default/keymap.c +++ b/keyboards/cipulot/ec_23u/keymaps/default/keymap.c @@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // clang-format off - [0] = LAYOUT( + [0] = LAYOUT_all( KC_ESC, KC_TAB, KC_BSPC, MO(1), KC_NUM, KC_PSLS, KC_PAST, KC_PEQL, KC_P7, KC_P8, KC_P9, KC_PMNS, @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_P1, KC_P2, KC_P3, KC_PENT, KC_P0, KC_P0, KC_PDOT, KC_PENT), - [1] = LAYOUT( + [1] = LAYOUT_all( RGB_TOG, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, QK_BOOT, _______), - [2] = LAYOUT( + [2] = LAYOUT_all( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______), - [3] = LAYOUT( + [3] = LAYOUT_all( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/cipulot/ec_23u/keymaps/numpad_6x4/keymap.c b/keyboards/cipulot/ec_23u/keymaps/numpad_6x4/keymap.c new file mode 100644 index 000000000000..9246aa0eb705 --- /dev/null +++ b/keyboards/cipulot/ec_23u/keymaps/numpad_6x4/keymap.c @@ -0,0 +1,54 @@ +/* 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_numpad_6x4( + KC_ESC, KC_TAB, KC_BSPC, MO(1), + KC_NUM, KC_PSLS, KC_PAST, KC_PEQL, + KC_P7, KC_P8, KC_P9, + KC_P4, KC_P5, KC_P6, KC_PPLS, + KC_P1, KC_P2, KC_P3, KC_PENT, + KC_P0, KC_PDOT), + + [1] = LAYOUT_numpad_6x4( + RGB_TOG, RGB_VAD, RGB_VAI, _______, + _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______, + _______, QK_BOOT), + + + [2] = LAYOUT_numpad_6x4( + _______, _______, _______, _______, + _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______), + + [3] = LAYOUT_numpad_6x4( + _______, _______, _______, _______, + _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______) + // clang-format on +}; diff --git a/keyboards/cipulot/ec_23u/keymaps/via/keymap.c b/keyboards/cipulot/ec_23u/keymaps/via/keymap.c index 8f17f97fb4af..93ceadb842ca 100644 --- a/keyboards/cipulot/ec_23u/keymaps/via/keymap.c +++ b/keyboards/cipulot/ec_23u/keymaps/via/keymap.c @@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // clang-format off - [0] = LAYOUT( + [0] = LAYOUT_all( KC_ESC, KC_TAB, KC_BSPC, MO(1), KC_NUM, KC_PSLS, KC_PAST, KC_PEQL, KC_P7, KC_P8, KC_P9, KC_PMNS, @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_P1, KC_P2, KC_P3, KC_PENT, KC_P0, KC_P0, KC_PDOT, KC_PENT), - [1] = LAYOUT( + [1] = LAYOUT_all( RGB_TOG, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, QK_BOOT, _______), - [2] = LAYOUT( + [2] = LAYOUT_all( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______), - [3] = LAYOUT( + [3] = LAYOUT_all( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, From 2dc638f22fe4630c51f10335b96a69e711277962 Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Tue, 28 Feb 2023 14:54:21 +0100 Subject: [PATCH 04/10] Removed unnecessary `.h` includes --- keyboards/cipulot/ec_23u/keymaps/via/via_apc.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/cipulot/ec_23u/keymaps/via/via_apc.c b/keyboards/cipulot/ec_23u/keymaps/via/via_apc.c index 325c767b5808..bbfd661c402b 100644 --- a/keyboards/cipulot/ec_23u/keymaps/via/via_apc.c +++ b/keyboards/cipulot/ec_23u/keymaps/via/via_apc.c @@ -15,8 +15,6 @@ */ #include "ec_switch_matrix.h" -#include "eeconfig.h" -#include "keycodes.h" #include "action.h" #include "via.h" From bd7243049b130e9271a3174bad73f5cbc6a19122 Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Fri, 3 Mar 2023 19:00:48 +0100 Subject: [PATCH 05/10] Updated default thresholds --- keyboards/cipulot/ec_23u/config.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/cipulot/ec_23u/config.h b/keyboards/cipulot/ec_23u/config.h index c69dc0a94f88..09cc2e02550c 100644 --- a/keyboards/cipulot/ec_23u/config.h +++ b/keyboards/cipulot/ec_23u/config.h @@ -44,5 +44,5 @@ // This is the size of the EEPROM for the custom VIA-specific data #define EECONFIG_KB_DATA_SIZE 4 -#define DEFAULT_ACTUATION_LEVEL 700 -#define DEFAULT_RELEASE_LEVEL 600 +#define DEFAULT_ACTUATION_LEVEL 550 +#define DEFAULT_RELEASE_LEVEL 500 From 3a05ab194220ec2237cc3b28dedfcf67320e0a86 Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Tue, 7 Mar 2023 05:15:34 +0100 Subject: [PATCH 06/10] 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_23u/config.h | 2 ++ keyboards/cipulot/ec_23u/ec_switch_matrix.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/keyboards/cipulot/ec_23u/config.h b/keyboards/cipulot/ec_23u/config.h index 09cc2e02550c..12aa58dedc84 100644 --- a/keyboards/cipulot/ec_23u/config.h +++ b/keyboards/cipulot/ec_23u/config.h @@ -46,3 +46,5 @@ #define DEFAULT_ACTUATION_LEVEL 550 #define DEFAULT_RELEASE_LEVEL 500 + +#define DISCHARGE_TIME 10 diff --git a/keyboards/cipulot/ec_23u/ec_switch_matrix.c b/keyboards/cipulot/ec_23u/ec_switch_matrix.c index f455acd76bf1..4059a80e5dbd 100644 --- a/keyboards/cipulot/ec_23u/ec_switch_matrix.c +++ b/keyboards/cipulot/ec_23u/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; @@ -110,6 +111,8 @@ uint16_t ecsm_readkey_raw(uint8_t channel, uint8_t row, uint8_t col) { } // Discharge peak hold capacitor discharge_capacitor(); + // Waiting for the ghost capacitor to discharge fully + wait_us(DISCHARGE_TIME); return sw_value; } From 7dea94ff1b8fe74e253c5b99d89c350b5baf7aef Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Tue, 7 Mar 2023 12:23:07 +0100 Subject: [PATCH 07/10] Update readme.md Added missing `cipulot/` in example commands. --- keyboards/cipulot/ec_23u/readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/cipulot/ec_23u/readme.md b/keyboards/cipulot/ec_23u/readme.md index e206e1428bf8..d4832edff5d1 100644 --- a/keyboards/cipulot/ec_23u/readme.md +++ b/keyboards/cipulot/ec_23u/readme.md @@ -10,11 +10,11 @@ Open source numpad Electrostatic Capacitive PCB. Make example for this keyboard (after setting up your build environment): - make ec_23u:default + make cipulot/ec_23u:default Flashing example for this keyboard: - make ec_23u:default:flash + make cipulot/ec_23u: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). From 9002befe0013937c617f3d6f4858bbdf27717408 Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Wed, 8 Mar 2023 01:17:57 +0100 Subject: [PATCH 08/10] Removal of `info.json` lines as suggested --- keyboards/cipulot/ec_23u/info.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/cipulot/ec_23u/info.json b/keyboards/cipulot/ec_23u/info.json index 41ef9ba53be8..e55d3b9e503d 100644 --- a/keyboards/cipulot/ec_23u/info.json +++ b/keyboards/cipulot/ec_23u/info.json @@ -2,7 +2,6 @@ "manufacturer": "Cipulot", "keyboard_name": "EC 23U", "maintainer": "Cipulot", - "board": "GENERIC_STM32_F401XC", "bootloader": "stm32-dfu", "build": { "lto": true @@ -19,7 +18,6 @@ "nkro": true, "rgblight": true }, - "keyboard_folder": "cipulot/ec_23u", "mouse_key": { "enabled": true }, From 401e7127578595d4c820d669eded66d6c93ccba3 Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Wed, 8 Mar 2023 02:14:52 +0100 Subject: [PATCH 09/10] Update to comply with `_kb` and `_user` separation --- keyboards/cipulot/ec_23u/config.h | 3 --- keyboards/cipulot/ec_23u/keymaps/via/config.h | 20 +++++++++++++++++++ .../cipulot/ec_23u/keymaps/via/via_apc.c | 12 +++++------ 3 files changed, 26 insertions(+), 9 deletions(-) create mode 100644 keyboards/cipulot/ec_23u/keymaps/via/config.h diff --git a/keyboards/cipulot/ec_23u/config.h b/keyboards/cipulot/ec_23u/config.h index 12aa58dedc84..8bb39367b94e 100644 --- a/keyboards/cipulot/ec_23u/config.h +++ b/keyboards/cipulot/ec_23u/config.h @@ -41,9 +41,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_23u/keymaps/via/config.h b/keyboards/cipulot/ec_23u/keymaps/via/config.h new file mode 100644 index 000000000000..ebf954d07aca --- /dev/null +++ b/keyboards/cipulot/ec_23u/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_23u/keymaps/via/via_apc.c b/keyboards/cipulot/ec_23u/keymaps/via/via_apc.c index bbfd661c402b..5ea77af44c8b 100644 --- a/keyboards/cipulot/ec_23u/keymaps/via/via_apc.c +++ b/keyboards/cipulot/ec_23u/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) { From 8c93e750d9065867730c92d90d2fd80e05916c49 Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Fri, 10 Mar 2023 13:23:44 +0100 Subject: [PATCH 10/10] Update rules.mk --- keyboards/cipulot/ec_23u/rules.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/keyboards/cipulot/ec_23u/rules.mk b/keyboards/cipulot/ec_23u/rules.mk index b27b0f7ac071..ed348e861860 100644 --- a/keyboards/cipulot/ec_23u/rules.mk +++ b/keyboards/cipulot/ec_23u/rules.mk @@ -1,2 +1,3 @@ CUSTOM_MATRIX = lite -SRC += analog.c matrix.c ec_switch_matrix.c +QUANTUM_LIB_SRC += analog.c +SRC += matrix.c ec_switch_matrix.c