EC ProX PCB (#20047)
* Add EC Pro X Addition of EC Pro X PCB series. This series comprises 2 versions: - ANSI/ISO - JIS The PCBs are different and are compatible only with their respective cases. * Moved from data driven row/col def to config def * Added project url in info.json * Implemented proper `LAYOUT_` changes * Removen unnecessary `.h` includes * Removal of `"w": 1` * 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. * Fixed keymap error in ordering * Update keyboards/cipulot/ec_prox/jis/readme.md Co-authored-by: Tom Barnes <barnestom@me.com> * Update keyboards/cipulot/ec_prox/ansi_iso/readme.md Co-authored-by: Tom Barnes <barnestom@me.com> * Removal of `info.json` lines as suggested * Update to comply with `_kb` and `_user` separation * Update keyboards/cipulot/ec_prox/jis/rules.mk Co-authored-by: Drashna Jaelre <drashna@live.com> * Update rules.mk --------- Co-authored-by: Tom Barnes <barnestom@me.com> Co-authored-by: Drashna Jaelre <drashna@live.com>master
Cipulot
GitHub
parent
5428d922a5
commit
15cb7ded76
|
|
@ -0,0 +1,45 @@
|
|||
/* Copyright 2023 Cipulot
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#define MATRIX_ROWS 5
|
||||
#define MATRIX_COLS 15
|
||||
|
||||
/* Custom matrix pins and port select array */
|
||||
#define MATRIX_ROW_PINS \
|
||||
{ A7, B0, A4, A5, A6 }
|
||||
#define MATRIX_COL_CHANNELS \
|
||||
{ 0, 3, 1, 2, 5, 7, 6, 4 }
|
||||
#define MUX_SEL_PINS \
|
||||
{ B4, B5, B6 }
|
||||
|
||||
/* Hardware peripherals pins */
|
||||
#define APLEX_EN_PIN_0 B7
|
||||
#define APLEX_EN_PIN_1 B3
|
||||
#define DISCHARGE_PIN A2
|
||||
#define ANALOG_PORT A1
|
||||
|
||||
/* 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
|
||||
|
|
@ -0,0 +1,183 @@
|
|||
/* Copyright 2023 Cipulot
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "ec_switch_matrix.h"
|
||||
#include "analog.h"
|
||||
#include "atomic_util.h"
|
||||
#include "print.h"
|
||||
#include "wait.h"
|
||||
|
||||
/* Pin and port array */
|
||||
const uint32_t row_pins[] = MATRIX_ROW_PINS;
|
||||
const uint8_t col_channels[] = MATRIX_COL_CHANNELS;
|
||||
const uint32_t mux_sel_pins[] = MUX_SEL_PINS;
|
||||
|
||||
static ecsm_config_t config;
|
||||
static uint16_t ecsm_sw_value[MATRIX_ROWS][MATRIX_COLS];
|
||||
|
||||
static adc_mux adcMux;
|
||||
|
||||
static inline void discharge_capacitor(void) {
|
||||
writePinLow(DISCHARGE_PIN);
|
||||
}
|
||||
static inline void charge_capacitor(uint8_t row) {
|
||||
writePinHigh(DISCHARGE_PIN);
|
||||
writePinHigh(row_pins[row]);
|
||||
}
|
||||
|
||||
static inline void init_mux_sel(void) {
|
||||
for (int idx = 0; idx < 3; idx++) {
|
||||
setPinOutput(mux_sel_pins[idx]);
|
||||
}
|
||||
}
|
||||
|
||||
static inline void select_mux(uint8_t col) {
|
||||
uint8_t ch = col_channels[col];
|
||||
writePin(mux_sel_pins[0], ch & 1);
|
||||
writePin(mux_sel_pins[1], ch & 2);
|
||||
writePin(mux_sel_pins[2], ch & 4);
|
||||
}
|
||||
|
||||
static inline void init_row(void) {
|
||||
for (int idx = 0; idx < MATRIX_ROWS; idx++) {
|
||||
setPinOutput(row_pins[idx]);
|
||||
writePinLow(row_pins[idx]);
|
||||
}
|
||||
}
|
||||
|
||||
/* Initialize the peripherals pins */
|
||||
int ecsm_init(ecsm_config_t const* const ecsm_config) {
|
||||
// Initialize config
|
||||
config = *ecsm_config;
|
||||
|
||||
palSetLineMode(ANALOG_PORT, PAL_MODE_INPUT_ANALOG);
|
||||
adcMux = pinToMux(ANALOG_PORT);
|
||||
|
||||
// Dummy call to make sure that adcStart() has been called in the appropriate state
|
||||
adc_read(adcMux);
|
||||
|
||||
// Initialize discharge pin as discharge mode
|
||||
writePinLow(DISCHARGE_PIN);
|
||||
setPinOutputOpenDrain(DISCHARGE_PIN);
|
||||
|
||||
// Initialize drive lines
|
||||
init_row();
|
||||
|
||||
// Initialize multiplexer select pin
|
||||
init_mux_sel();
|
||||
|
||||
// Enable AMUX
|
||||
setPinOutput(APLEX_EN_PIN_0);
|
||||
writePinLow(APLEX_EN_PIN_0);
|
||||
setPinOutput(APLEX_EN_PIN_1);
|
||||
writePinLow(APLEX_EN_PIN_1);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int ecsm_update(ecsm_config_t const* const ecsm_config) {
|
||||
// Save config
|
||||
config = *ecsm_config;
|
||||
return 0;
|
||||
}
|
||||
|
||||
// Read the capacitive sensor value
|
||||
uint16_t ecsm_readkey_raw(uint8_t channel, uint8_t row, uint8_t col) {
|
||||
uint16_t sw_value = 0;
|
||||
|
||||
// Select the multiplexer
|
||||
if (channel == 0) {
|
||||
writePinHigh(APLEX_EN_PIN_0);
|
||||
select_mux(col);
|
||||
writePinLow(APLEX_EN_PIN_0);
|
||||
} else {
|
||||
writePinHigh(APLEX_EN_PIN_1);
|
||||
select_mux(col);
|
||||
writePinLow(APLEX_EN_PIN_1);
|
||||
}
|
||||
|
||||
// Set strobe pins to low state
|
||||
writePinLow(row_pins[row]);
|
||||
ATOMIC_BLOCK_FORCEON {
|
||||
// Set the row pin to high state and have capacitor charge
|
||||
charge_capacitor(row);
|
||||
// Read the ADC value
|
||||
sw_value = adc_read(adcMux);
|
||||
}
|
||||
// Discharge peak hold capacitor
|
||||
discharge_capacitor();
|
||||
// Waiting for the ghost capacitor to discharge fully
|
||||
wait_us(DISCHARGE_TIME);
|
||||
|
||||
return sw_value;
|
||||
}
|
||||
|
||||
// Update press/release state of key
|
||||
bool ecsm_update_key(matrix_row_t* current_row, uint8_t row, uint8_t col, uint16_t sw_value) {
|
||||
bool current_state = (*current_row >> col) & 1;
|
||||
|
||||
// Press to release
|
||||
if (current_state && sw_value < config.ecsm_actuation_threshold) {
|
||||
*current_row &= ~(1 << col);
|
||||
return true;
|
||||
}
|
||||
|
||||
// Release to press
|
||||
if ((!current_state) && sw_value > config.ecsm_release_threshold) {
|
||||
*current_row |= (1 << col);
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
// Scan key values and update matrix state
|
||||
bool ecsm_matrix_scan(matrix_row_t current_matrix[]) {
|
||||
bool updated = false;
|
||||
|
||||
// Disable AMUX of channel 1
|
||||
writePinHigh(APLEX_EN_PIN_1);
|
||||
for (int col = 0; col < sizeof(col_channels); col++) {
|
||||
for (int row = 0; row < MATRIX_ROWS; row++) {
|
||||
ecsm_sw_value[row][col] = ecsm_readkey_raw(0, row, col);
|
||||
updated |= ecsm_update_key(¤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");
|
||||
}
|
||||
|
|
@ -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);
|
||||
|
|
@ -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>
|
||||
|
|
@ -0,0 +1,182 @@
|
|||
{
|
||||
"manufacturer": "Cipulot",
|
||||
"keyboard_name": "EC Pro X ANSI/ISO",
|
||||
"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
|
||||
},
|
||||
"processor": "STM32F401",
|
||||
"rgblight": {
|
||||
"led_count": 22,
|
||||
"pin": "B12",
|
||||
"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-X",
|
||||
"usb": {
|
||||
"device_version": "0.0.1",
|
||||
"pid": "0x6B98",
|
||||
"shared_endpoint": {
|
||||
"keyboard": true
|
||||
},
|
||||
"vid": "0x6369"
|
||||
},
|
||||
"layouts": {
|
||||
"LAYOUT_all": {
|
||||
"layout": [
|
||||
{ "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], "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], "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], "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], "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], "x": 11.5, "y": 4 }
|
||||
]
|
||||
},
|
||||
"LAYOUT_60_hhkb": {
|
||||
"layout": [
|
||||
{ "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], "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], "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], "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], "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], "x": 11.5, "y": 4 }
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -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 <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#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
|
||||
};
|
||||
|
|
@ -0,0 +1,49 @@
|
|||
/* 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_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_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, _______, _______,
|
||||
_______, _______, _______, _______, _______),
|
||||
|
||||
[2] = LAYOUT_all(
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______),
|
||||
|
||||
[3] = LAYOUT_all(
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______)
|
||||
// clang-format on
|
||||
};
|
||||
|
|
@ -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
|
||||
|
|
@ -0,0 +1,49 @@
|
|||
/* 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_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_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, _______, _______,
|
||||
_______, _______, _______, _______, _______),
|
||||
|
||||
[2] = LAYOUT_all(
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______),
|
||||
|
||||
[3] = LAYOUT_all(
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______)
|
||||
// clang-format on
|
||||
};
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
VIA_ENABLE = yes
|
||||
|
||||
SRC += via_apc.c
|
||||
|
|
@ -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);
|
||||
}
|
||||
|
|
@ -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;
|
||||
}
|
||||
|
|
@ -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
|
||||
|
|
@ -0,0 +1,27 @@
|
|||
# EC Pro X ANSI/ISO
|
||||
|
||||
|
||||
|
||||
Open source replacement PCB kit for the HHKB Pro 2 and Pro 3 keyboards using the ANSI case.
|
||||
|
||||
* Keyboard Maintainer: [cipulot](https://github.com/cipulot)
|
||||
* Hardware Supported: EC Pro X ANSI_ISO PCB
|
||||
* Hardware Availability: [EC Pro X](https://github.com/cipulot/EC-Pro-X)
|
||||
|
||||
Make example for this keyboard (after setting up your build environment):
|
||||
|
||||
make cipulot/ec_prox/ansi_iso:default
|
||||
|
||||
Flashing example for this keyboard:
|
||||
|
||||
make cipulot/ec_prox/ansi_iso: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
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
CUSTOM_MATRIX = lite
|
||||
QUANTUM_LIB_SRC += analog.c
|
||||
SRC += matrix.c ec_switch_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 <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#define MATRIX_ROWS 5
|
||||
#define MATRIX_COLS 14
|
||||
|
||||
/* Custom matrix pins and port select array */
|
||||
#define MATRIX_ROW_PINS \
|
||||
{ A7, B0, A4, A5, A6 }
|
||||
#define MATRIX_COL_CHANNELS \
|
||||
{ 2, 1, 0, 3, 5, 7, 4, 6 }
|
||||
#define MUX_SEL_PINS \
|
||||
{ B4, B5, B6 }
|
||||
|
||||
/* Hardware peripherals pins */
|
||||
#define APLEX_EN_PIN_0 B7
|
||||
#define APLEX_EN_PIN_1 B3
|
||||
#define DISCHARGE_PIN A2
|
||||
#define ANALOG_PORT A1
|
||||
|
||||
/* 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
|
||||
|
|
@ -0,0 +1,183 @@
|
|||
/* Copyright 2023 Cipulot
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "ec_switch_matrix.h"
|
||||
#include "analog.h"
|
||||
#include "atomic_util.h"
|
||||
#include "print.h"
|
||||
#include "wait.h"
|
||||
|
||||
/* Pin and port array */
|
||||
const uint32_t row_pins[] = MATRIX_ROW_PINS;
|
||||
const uint8_t col_channels[] = MATRIX_COL_CHANNELS;
|
||||
const uint32_t mux_sel_pins[] = MUX_SEL_PINS;
|
||||
|
||||
static ecsm_config_t config;
|
||||
static uint16_t ecsm_sw_value[MATRIX_ROWS][MATRIX_COLS];
|
||||
|
||||
static adc_mux adcMux;
|
||||
|
||||
static inline void discharge_capacitor(void) {
|
||||
writePinLow(DISCHARGE_PIN);
|
||||
}
|
||||
static inline void charge_capacitor(uint8_t row) {
|
||||
writePinHigh(DISCHARGE_PIN);
|
||||
writePinHigh(row_pins[row]);
|
||||
}
|
||||
|
||||
static inline void init_mux_sel(void) {
|
||||
for (int idx = 0; idx < 3; idx++) {
|
||||
setPinOutput(mux_sel_pins[idx]);
|
||||
}
|
||||
}
|
||||
|
||||
static inline void select_mux(uint8_t col) {
|
||||
uint8_t ch = col_channels[col];
|
||||
writePin(mux_sel_pins[0], ch & 1);
|
||||
writePin(mux_sel_pins[1], ch & 2);
|
||||
writePin(mux_sel_pins[2], ch & 4);
|
||||
}
|
||||
|
||||
static inline void init_row(void) {
|
||||
for (int idx = 0; idx < MATRIX_ROWS; idx++) {
|
||||
setPinOutput(row_pins[idx]);
|
||||
writePinLow(row_pins[idx]);
|
||||
}
|
||||
}
|
||||
|
||||
/* Initialize the peripherals pins */
|
||||
int ecsm_init(ecsm_config_t const* const ecsm_config) {
|
||||
// Initialize config
|
||||
config = *ecsm_config;
|
||||
|
||||
palSetLineMode(ANALOG_PORT, PAL_MODE_INPUT_ANALOG);
|
||||
adcMux = pinToMux(ANALOG_PORT);
|
||||
|
||||
//Dummy call to make sure that adcStart() has been called in the appropriate state
|
||||
adc_read(adcMux);
|
||||
|
||||
// Initialize discharge pin as discharge mode
|
||||
writePinLow(DISCHARGE_PIN);
|
||||
setPinOutputOpenDrain(DISCHARGE_PIN);
|
||||
|
||||
// Initialize drive lines
|
||||
init_row();
|
||||
|
||||
// Initialize multiplexer select pin
|
||||
init_mux_sel();
|
||||
|
||||
// Enable AMUX
|
||||
setPinOutput(APLEX_EN_PIN_0);
|
||||
writePinLow(APLEX_EN_PIN_0);
|
||||
setPinOutput(APLEX_EN_PIN_1);
|
||||
writePinLow(APLEX_EN_PIN_1);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int ecsm_update(ecsm_config_t const* const ecsm_config) {
|
||||
// Save config
|
||||
config = *ecsm_config;
|
||||
return 0;
|
||||
}
|
||||
|
||||
// Read the capacitive sensor value
|
||||
uint16_t ecsm_readkey_raw(uint8_t channel, uint8_t row, uint8_t col) {
|
||||
uint16_t sw_value = 0;
|
||||
|
||||
// Select the multiplexer
|
||||
if (channel == 0) {
|
||||
writePinHigh(APLEX_EN_PIN_0);
|
||||
select_mux(col);
|
||||
writePinLow(APLEX_EN_PIN_0);
|
||||
} else {
|
||||
writePinHigh(APLEX_EN_PIN_1);
|
||||
select_mux(col);
|
||||
writePinLow(APLEX_EN_PIN_1);
|
||||
}
|
||||
|
||||
// Set strobe pins to low state
|
||||
writePinLow(row_pins[row]);
|
||||
ATOMIC_BLOCK_FORCEON {
|
||||
// Set the row pin to high state and have capacitor charge
|
||||
charge_capacitor(row);
|
||||
// Read the ADC value
|
||||
sw_value = adc_read(adcMux);
|
||||
}
|
||||
// Discharge peak hold capacitor
|
||||
discharge_capacitor();
|
||||
// Waiting for the ghost capacitor to discharge fully
|
||||
wait_us(DISCHARGE_TIME);
|
||||
|
||||
return sw_value;
|
||||
}
|
||||
|
||||
// Update press/release state of key
|
||||
bool ecsm_update_key(matrix_row_t* current_row, uint8_t row, uint8_t col, uint16_t sw_value) {
|
||||
bool current_state = (*current_row >> col) & 1;
|
||||
|
||||
// Press to release
|
||||
if (current_state && sw_value < config.ecsm_actuation_threshold) {
|
||||
*current_row &= ~(1 << col);
|
||||
return true;
|
||||
}
|
||||
|
||||
// Release to press
|
||||
if ((!current_state) && sw_value > config.ecsm_release_threshold) {
|
||||
*current_row |= (1 << col);
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
// Scan key values and update matrix state
|
||||
bool ecsm_matrix_scan(matrix_row_t current_matrix[]) {
|
||||
bool updated = false;
|
||||
|
||||
// Disable AMUX of channel 1
|
||||
writePinHigh(APLEX_EN_PIN_1);
|
||||
for (int col = 0; col < sizeof(col_channels); col++) {
|
||||
for (int row = 0; row < MATRIX_ROWS; row++) {
|
||||
ecsm_sw_value[row][col] = ecsm_readkey_raw(0, row, col);
|
||||
updated |= ecsm_update_key(¤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) - 2); 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");
|
||||
}
|
||||
|
|
@ -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);
|
||||
|
|
@ -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>
|
||||
|
|
@ -0,0 +1,125 @@
|
|||
{
|
||||
"manufacturer": "Cipulot",
|
||||
"keyboard_name": "EC Pro X JIS",
|
||||
"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
|
||||
},
|
||||
"processor": "STM32F401",
|
||||
"rgblight": {
|
||||
"led_count": 22,
|
||||
"pin": "B12",
|
||||
"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-X",
|
||||
"usb": {
|
||||
"device_version": "0.0.1",
|
||||
"pid": "0x6B99",
|
||||
"shared_endpoint": {
|
||||
"keyboard": true
|
||||
},
|
||||
"vid": "0x6369"
|
||||
},
|
||||
"layouts": {
|
||||
"LAYOUT_jp": {
|
||||
"layout": [
|
||||
{ "label": "0,0", "matrix": [0, 0], "x": 0.0, "y": 0.0 },
|
||||
{ "label": "0,1", "matrix": [0, 1], "x": 1.0, "y": 0.0 },
|
||||
{ "label": "0,2", "matrix": [0, 2], "x": 2.0, "y": 0.0 },
|
||||
{ "label": "0,3", "matrix": [0, 3], "x": 3.0, "y": 0.0 },
|
||||
{ "label": "0,4", "matrix": [0, 4], "x": 4.0, "y": 0.0 },
|
||||
{ "label": "0,5", "matrix": [0, 5], "x": 5.0, "y": 0.0 },
|
||||
{ "label": "0,6", "matrix": [0, 6], "x": 6.0, "y": 0.0 },
|
||||
{ "label": "0,7", "matrix": [0, 7], "x": 7.0, "y": 0.0 },
|
||||
{ "label": "0,8", "matrix": [0, 8], "x": 8.0, "y": 0.0 },
|
||||
{ "label": "0,9", "matrix": [0, 9], "x": 9.0, "y": 0.0 },
|
||||
{ "label": "0,10", "matrix": [0, 10], "x": 10.0, "y": 0.0 },
|
||||
{ "label": "0,11", "matrix": [0, 11], "x": 11.0, "y": 0.0 },
|
||||
{ "label": "0,12", "matrix": [0, 12], "x": 12.0, "y": 0.0 },
|
||||
{ "label": "0,13", "matrix": [0, 13], "x": 13.0, "y": 0.0 },
|
||||
{ "label": "1,13", "matrix": [1, 13], "x": 14.0, "y": 0.0 },
|
||||
{ "label": "1,0", "matrix": [1, 0], "w": 1.5, "x": 0.0, "y": 1.0 },
|
||||
{ "label": "1,1", "matrix": [1, 1], "x": 1.5, "y": 1.0 },
|
||||
{ "label": "1,2", "matrix": [1, 2], "x": 2.5, "y": 1.0 },
|
||||
{ "label": "1,3", "matrix": [1, 3], "x": 3.5, "y": 1.0 },
|
||||
{ "label": "1,4", "matrix": [1, 4], "x": 4.5, "y": 1.0 },
|
||||
{ "label": "1,5", "matrix": [1, 5], "x": 5.5, "y": 1.0 },
|
||||
{ "label": "1,6", "matrix": [1, 6], "x": 6.5, "y": 1.0 },
|
||||
{ "label": "1,7", "matrix": [1, 7], "x": 7.5, "y": 1.0 },
|
||||
{ "label": "1,8", "matrix": [1, 8], "x": 8.5, "y": 1.0 },
|
||||
{ "label": "1,9", "matrix": [1, 9], "x": 9.5, "y": 1.0 },
|
||||
{ "label": "1,10", "matrix": [1, 10], "x": 10.5, "y": 1.0 },
|
||||
{ "label": "1,11", "matrix": [1, 11], "x": 11.5, "y": 1.0 },
|
||||
{ "label": "1,12", "matrix": [1, 12], "x": 12.5, "y": 1.0 },
|
||||
{ "h": 2, "label": "2,13", "matrix": [2, 13], "w": 1.25, "x": 13.75, "y": 1.0 },
|
||||
{ "label": "2,0", "matrix": [2, 0], "w": 1.75, "x": 0.0, "y": 2.0 },
|
||||
{ "label": "2,1", "matrix": [2, 1], "x": 1.75, "y": 2.0 },
|
||||
{ "label": "2,2", "matrix": [2, 2], "x": 2.75, "y": 2.0 },
|
||||
{ "label": "2,3", "matrix": [2, 3], "x": 3.75, "y": 2.0 },
|
||||
{ "label": "2,4", "matrix": [2, 4], "x": 4.75, "y": 2.0 },
|
||||
{ "label": "2,5", "matrix": [2, 5], "x": 5.75, "y": 2.0 },
|
||||
{ "label": "2,6", "matrix": [2, 6], "x": 6.75, "y": 2.0 },
|
||||
{ "label": "2,7", "matrix": [2, 7], "x": 7.75, "y": 2.0 },
|
||||
{ "label": "2,8", "matrix": [2, 8], "x": 8.75, "y": 2.0 },
|
||||
{ "label": "2,9", "matrix": [2, 9], "x": 9.75, "y": 2.0 },
|
||||
{ "label": "2,10", "matrix": [2, 10], "x": 10.75, "y": 2.0 },
|
||||
{ "label": "2,11", "matrix": [2, 11], "x": 11.75, "y": 2.0 },
|
||||
{ "label": "2,12", "matrix": [2, 12], "x": 12.75, "y": 2.0 },
|
||||
{ "label": "3,0", "matrix": [3, 0], "w": 2, "x": 0.0, "y": 3.0 },
|
||||
{ "label": "3,1", "matrix": [3, 1], "x": 2.0, "y": 3.0 },
|
||||
{ "label": "3,2", "matrix": [3, 2], "x": 3.0, "y": 3.0 },
|
||||
{ "label": "3,3", "matrix": [3, 3], "x": 4.0, "y": 3.0 },
|
||||
{ "label": "3,4", "matrix": [3, 4], "x": 5.0, "y": 3.0 },
|
||||
{ "label": "3,5", "matrix": [3, 5], "x": 6.0, "y": 3.0 },
|
||||
{ "label": "3,6", "matrix": [3, 6], "x": 7.0, "y": 3.0 },
|
||||
{ "label": "3,7", "matrix": [3, 7], "x": 8.0, "y": 3.0 },
|
||||
{ "label": "3,8", "matrix": [3, 8], "x": 9.0, "y": 3.0 },
|
||||
{ "label": "3,9", "matrix": [3, 9], "x": 10.0, "y": 3.0 },
|
||||
{ "label": "3,10", "matrix": [3, 10], "x": 11.0, "y": 3.0 },
|
||||
{ "label": "3,11", "matrix": [3, 11], "x": 12.0, "y": 3.0 },
|
||||
{ "label": "3,12", "matrix": [3, 12], "x": 13.0, "y": 3.0 },
|
||||
{ "label": "3,13", "matrix": [3, 13], "x": 14.0, "y": 3.0 },
|
||||
{ "label": "4,0", "matrix": [4, 0], "x": 0.0, "y": 4.0 },
|
||||
{ "label": "4,1", "matrix": [4, 1], "x": 1.25, "y": 4.0 },
|
||||
{ "label": "4,2", "matrix": [4, 2], "x": 2.25, "y": 4.0 },
|
||||
{ "label": "4,3", "matrix": [4, 3], "x": 3.25, "y": 4.0 },
|
||||
{ "label": "4,4", "matrix": [4, 4], "x": 4.25, "y": 4.0 },
|
||||
{ "label": "4,5", "matrix": [4, 5], "w": 2.5, "x": 5.25, "y": 4.0 },
|
||||
{ "label": "4,7", "matrix": [4, 7], "x": 7.75, "y": 4.0 },
|
||||
{ "label": "4,8", "matrix": [4, 8], "x": 8.75, "y": 4.0 },
|
||||
{ "label": "4,9", "matrix": [4, 9], "x": 9.75, "y": 4.0 },
|
||||
{ "label": "4,10", "matrix": [4, 10], "x": 10.75, "y": 4.0 },
|
||||
{ "label": "4,11", "matrix": [4, 11], "x": 12.0, "y": 4.0 },
|
||||
{ "label": "4,12", "matrix": [4, 12], "x": 13.0, "y": 4.0 },
|
||||
{ "label": "4,13", "matrix": [4, 13], "x": 14.0, "y": 4.0 }
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,51 @@
|
|||
/* 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
|
||||
|
||||
#include "keymap_japanese.h"
|
||||
|
||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
// clang-format off
|
||||
[0] = LAYOUT_jp(
|
||||
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, JP_YEN, KC_BSPC,
|
||||
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,
|
||||
KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
|
||||
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, JP_UNDS, KC_UP, KC_RSFT,
|
||||
MO(1), JP_ZKHK, KC_LGUI, KC_LALT, JP_MHEN, KC_SPC, JP_HENK, JP_KANA, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT),
|
||||
|
||||
[1] = LAYOUT_jp(
|
||||
_______, 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_PAUS, KC_UP, _______,
|
||||
_______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, KC_PENT,
|
||||
_______, _______, _______, _______, _______, _______, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, MO(2), _______, _______, _______, _______),
|
||||
|
||||
[2] = LAYOUT_jp(
|
||||
RGB_TOG, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
|
||||
|
||||
[3] = LAYOUT_jp(
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)
|
||||
// clang-format on
|
||||
};
|
||||
|
|
@ -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
|
||||
|
|
@ -0,0 +1,51 @@
|
|||
/* 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
|
||||
|
||||
#include "keymap_japanese.h"
|
||||
|
||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
// clang-format off
|
||||
[0] = LAYOUT_jp(
|
||||
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, JP_YEN, KC_BSPC,
|
||||
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT,
|
||||
KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS,
|
||||
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, JP_UNDS, KC_UP, KC_RSFT,
|
||||
MO(1), JP_ZKHK, KC_LGUI, KC_LALT, JP_MHEN, KC_SPC, JP_HENK, JP_KANA, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT),
|
||||
|
||||
[1] = LAYOUT_jp(
|
||||
_______, 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_PAUS, KC_UP, _______, KC_PENT,
|
||||
_______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______,
|
||||
_______, _______, _______, _______, _______, _______, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, MO(2), _______, _______, _______, _______),
|
||||
|
||||
[2] = LAYOUT_jp(
|
||||
RGB_TOG, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
|
||||
|
||||
[3] = LAYOUT_jp(
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)
|
||||
// clang-format on
|
||||
};
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
VIA_ENABLE = yes
|
||||
|
||||
SRC += via_apc.c
|
||||
|
|
@ -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);
|
||||
}
|
||||
|
|
@ -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;
|
||||
}
|
||||
|
|
@ -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
|
||||
|
|
@ -0,0 +1,27 @@
|
|||
# EC Pro X JIS
|
||||
|
||||
|
||||
|
||||
Open source replacement PCB kit for the HHKB Pro 2 and Pro 3 keyboards using the JIS case.
|
||||
|
||||
* Keyboard Maintainer: [cipulot](https://github.com/cipulot)
|
||||
* Hardware Supported: EC Pro X JP PCB
|
||||
* Hardware Availability: [EC Pro X](https://github.com/cipulot/EC-Pro-X)
|
||||
|
||||
Make example for this keyboard (after setting up your build environment):
|
||||
|
||||
make cipulot/ec_prox/jis:default
|
||||
|
||||
Flashing example for this keyboard:
|
||||
|
||||
make cipulot/ec_prox/jis: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
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
CUSTOM_MATRIX = lite
|
||||
QUANTUM_LIB_SRC += analog.c
|
||||
SRC += matrix.c ec_switch_matrix.c
|
||||
Loading…
Reference in New Issue