g1smo
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EC 23U PCB (#20049) 

* Add EC 23U PCB firmware

* Moved from data driven row/col def to config def

* Implemented proper LAYOUT_ changes

* Removed unnecessary `.h` includes

* Updated default thresholds

* 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.

* Update readme.md

Added missing `cipulot/` in example commands.

* Removal of `info.json` lines as suggested

* Update to comply with `_kb` and `_user` separation

* Update rules.mk
master
Cipulot 2023-03-23 11:06:38 +01:00 committed by GitHub
parent 3303f7ea5d
commit 5428d922a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 814 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
keyboards/cipulot/ec_23u/config.h 100644
View File

@ -0,0 +1,47 @@
/* Copyright 2023 Cipulot
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#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 }
#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
#define DEFAULT_ACTUATION_LEVEL 550
#define DEFAULT_RELEASE_LEVEL 500
#define DISCHARGE_TIME 10

165
keyboards/cipulot/ec_23u/ec_switch_matrix.c 100644
View File

@ -0,0 +1,165 @@
/* Copyright 2023 Cipulot
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "ec_switch_matrix.h"
#include "analog.h"
#include "atomic_util.h"
#include "print.h"
#include "wait.h"
/* Pin and port array */
const uint32_t row_pins[] = MATRIX_ROW_PINS;
const uint8_t col_channels[] = MATRIX_COL_CHANNELS;
const uint32_t mux_sel_pins[] = MUX_SEL_PINS;
static ecsm_config_t config;
static uint16_t ecsm_sw_value[MATRIX_ROWS][MATRIX_COLS];
static adc_mux adcMux;
static inline void discharge_capacitor(void) {
writePinLow(DISCHARGE_PIN);
}
static inline void charge_capacitor(uint8_t row) {
writePinHigh(DISCHARGE_PIN);
writePinHigh(row_pins[row]);
}
static inline void init_mux_sel(void) {
for (int idx = 0; idx < 3; idx++) {
setPinOutput(mux_sel_pins[idx]);
}
}
static inline void select_mux(uint8_t col) {
uint8_t ch = col_channels[col];
writePin(mux_sel_pins[0], ch & 1);
writePin(mux_sel_pins[1], ch & 2);
writePin(mux_sel_pins[2], ch & 4);
}
static inline void init_row(void) {
for (int idx = 0; idx < MATRIX_ROWS; idx++) {
setPinOutput(row_pins[idx]);
writePinLow(row_pins[idx]);
}
}
/* Initialize the peripherals pins */
int ecsm_init(ecsm_config_t const* const ecsm_config) {
// Initialize config
config = *ecsm_config;
palSetLineMode(ANALOG_PORT, PAL_MODE_INPUT_ANALOG);
adcMux = pinToMux(ANALOG_PORT);
//Dummy call to make sure that adcStart() has been called in the appropriate state
adc_read(adcMux);
// Initialize discharge pin as discharge mode
writePinLow(DISCHARGE_PIN);
setPinOutputOpenDrain(DISCHARGE_PIN);
// Initialize drive lines
init_row();
// Initialize multiplexer select pin
init_mux_sel();
// Enable AMUX
setPinOutput(APLEX_EN_PIN);
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();
// Waiting for the ghost capacitor to discharge fully
wait_us(DISCHARGE_TIME);
return sw_value;
}
// Update press/release state of key
bool ecsm_update_key(matrix_row_t* current_row, uint8_t row, uint8_t col, uint16_t sw_value) {
bool current_state = (*current_row >> col) & 1;
// Press to release
if (current_state && sw_value < config.ecsm_actuation_threshold) {
*current_row &= ~(1 << col);
return true;
}
// Release to press
if ((!current_state) && sw_value > config.ecsm_release_threshold) {
*current_row |= (1 << col);
return true;
}
return false;
}
// Scan key values and update matrix state
bool ecsm_matrix_scan(matrix_row_t current_matrix[]) {
bool updated = false;
for (int col = 0; col < sizeof(col_channels); col++) {
for (int row = 0; row < MATRIX_ROWS; row++) {
ecsm_sw_value[row][col] = ecsm_readkey_raw(0, row, col);
updated |= ecsm_update_key(&current_matrix[row], row, col, ecsm_sw_value[row][col]);
}
}
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");
}

36
keyboards/cipulot/ec_23u/ec_switch_matrix.h 100644
View File

@ -0,0 +1,36 @@
/* Copyright 2023 Cipulot
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include <stdint.h>
#include <stdbool.h>
#include "matrix.h"
typedef struct {
uint16_t ecsm_actuation_threshold; // threshold for key release
uint16_t ecsm_release_threshold; // threshold for key press
} ecsm_config_t;
ecsm_config_t ecsm_config;
int ecsm_init(ecsm_config_t const* const ecsm_config);
int ecsm_update(ecsm_config_t const* const ecsm_config);
bool ecsm_matrix_scan(matrix_row_t current_matrix[]);
uint16_t ecsm_readkey_raw(uint8_t channel, uint8_t row, uint8_t col);
bool ecsm_update_key(matrix_row_t* current_row, uint8_t row, uint8_t col, uint16_t sw_value);
void ecsm_print_matrix(void);

21
keyboards/cipulot/ec_23u/halconf.h 100644
View File

@ -0,0 +1,21 @@
/* Copyright 2023 Cipulot
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#define HAL_USE_ADC TRUE
#include_next <halconf.h>

108
keyboards/cipulot/ec_23u/info.json 100644
View File

@ -0,0 +1,108 @@
{
"manufacturer": "Cipulot",
"keyboard_name": "EC 23U",
"maintainer": "Cipulot",
"bootloader": "stm32-dfu",
"build": {
"lto": true
},
"diode_direction": "COL2ROW",
"features": {
"audio": false,
"backlight": false,
"bootmagic": true,
"command": false,
"console": true,
"extrakey": true,
"mousekey": true,
"nkro": true,
"rgblight": true
},
"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_all": {
"layout": [
{ "label": "0,0", "matrix": [0, 0], "x": 0.0, "y": 0.0 },
{ "label": "0,1", "matrix": [0, 1], "x": 1.0, "y": 0.0 },
{ "label": "0,2", "matrix": [0, 2], "x": 2.0, "y": 0.0 },
{ "label": "0,3", "matrix": [0, 3], "x": 3.0, "y": 0.0 },
{ "label": "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 }
]
}
}
}

54
keyboards/cipulot/ec_23u/keymaps/default/keymap.c 100644
View File

@ -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 <http://www.gnu.org/licenses/>.
*/
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// clang-format off
[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,
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_all(
RGB_TOG, RGB_VAD, RGB_VAI, _______,
_______, _______, _______, _______,
_______, _______, _______, _______,
_______, _______, _______, _______,
_______, _______, _______, _______,
_______, _______, QK_BOOT, _______),
[2] = LAYOUT_all(
_______, _______, _______, _______,
_______, _______, _______, _______,
_______, _______, _______, _______,
_______, _______, _______, _______,
_______, _______, _______, _______,
_______, _______, _______, _______),
[3] = LAYOUT_all(
_______, _______, _______, _______,
_______, _______, _______, _______,
_______, _______, _______, _______,
_______, _______, _______, _______,
_______, _______, _______, _______,
_______, _______, _______, _______)
// clang-format on
};

54
keyboards/cipulot/ec_23u/keymaps/numpad_6x4/keymap.c 100644
View File

@ -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 <http://www.gnu.org/licenses/>.
*/
#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
};

20
keyboards/cipulot/ec_23u/keymaps/via/config.h 100644
View File

@ -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 <http://www.gnu.org/licenses/>.
*/
#pragma once
// This is the size of the EEPROM for the custom VIA-specific data
#define EECONFIG_USER_DATA_SIZE 4

54
keyboards/cipulot/ec_23u/keymaps/via/keymap.c 100644
View File

@ -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 <http://www.gnu.org/licenses/>.
*/
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// clang-format off
[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,
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_all(
RGB_TOG, RGB_VAD, RGB_VAI, _______,
_______, _______, _______, _______,
_______, _______, _______, _______,
_______, _______, _______, _______,
_______, _______, _______, _______,
_______, _______, QK_BOOT, _______),
[2] = LAYOUT_all(
_______, _______, _______, _______,
_______, _______, _______, _______,
_______, _______, _______, _______,
_______, _______, _______, _______,
_______, _______, _______, _______,
_______, _______, _______, _______),
[3] = LAYOUT_all(
_______, _______, _______, _______,
_______, _______, _______, _______,
_______, _______, _______, _______,
_______, _______, _______, _______,
_______, _______, _______, _______,
_______, _______, _______, _______)
// clang-format on
};

3
keyboards/cipulot/ec_23u/keymaps/via/rules.mk 100644
View File

@ -0,0 +1,3 @@
VIA_ENABLE = yes
SRC += via_apc.c

156
keyboards/cipulot/ec_23u/keymaps/via/via_apc.c 100644
View File

@ -0,0 +1,156 @@
/* Copyright 2023 Cipulot
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "ec_switch_matrix.h"
#include "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_USER_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_user(void) {
// Default values
apc.actuation_threshold = DEFAULT_ACTUATION_LEVEL;
apc.release_threshold = DEFAULT_RELEASE_LEVEL;
// Write default value to EEPROM now
eeconfig_update_user_datablock(&apc);
}
// On Keyboard startup
void keyboard_post_init_user(void) {
// Read custom menu variables from memory
eeconfig_read_user_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_user_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);
}

44
keyboards/cipulot/ec_23u/matrix.c 100644
View File

@ -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 <http://www.gnu.org/licenses/>.
*/
#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;
}

22
keyboards/cipulot/ec_23u/mcuconf.h 100644
View File

@ -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 <http://www.gnu.org/licenses/>.
*/
#pragma once
#include_next <mcuconf.h>
#undef STM32_ADC_USE_ADC1
#define STM32_ADC_USE_ADC1 TRUE

27
keyboards/cipulot/ec_23u/readme.md 100644
View File

@ -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 cipulot/ec_23u:default
Flashing example for this keyboard:
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).
## 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

3
keyboards/cipulot/ec_23u/rules.mk 100644
View File

@ -0,0 +1,3 @@
CUSTOM_MATRIX = lite
QUANTUM_LIB_SRC += analog.c
SRC += matrix.c ec_switch_matrix.c