Merge remote-tracking branch 'origin/master' into develop
QMK Bot
commit
e84d1ca3e7
|
|
@ -0,0 +1,179 @@
|
||||||
|
/* Copyright 2023 Viktus Design LLC
|
||||||
|
*
|
||||||
|
* 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 "quantum.h"
|
||||||
|
#include "ec.h"
|
||||||
|
#include "analog.h"
|
||||||
|
//#include "debug.h" // needed for debugging
|
||||||
|
|
||||||
|
// sensing channel definitions
|
||||||
|
#define A0 0
|
||||||
|
#define A1 1
|
||||||
|
#define A2 2
|
||||||
|
#define A3 3
|
||||||
|
#define A4 4
|
||||||
|
#define A5 5
|
||||||
|
#define A6 6
|
||||||
|
#define A7 7
|
||||||
|
|
||||||
|
// analog connection settings
|
||||||
|
#define DISCHARGE_PIN D5
|
||||||
|
#define ANALOG_PORT D4
|
||||||
|
|
||||||
|
#ifndef MUX_SEL_PIN
|
||||||
|
# define MUX_SEL_PINS \
|
||||||
|
{ D1, D2, D3 }
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// pin connections
|
||||||
|
const uint8_t row_channels[] = MATRIX_ROW_PINS;
|
||||||
|
const uint8_t col_pins[] = MATRIX_COL_PINS;
|
||||||
|
const uint8_t mux_sel_pins[] = MUX_SEL_PINS;
|
||||||
|
|
||||||
|
_Static_assert(sizeof(mux_sel_pins) == 3, "invalid MUX_SEL_PINS");
|
||||||
|
|
||||||
|
static ec_config_t config;
|
||||||
|
static uint16_t ec_sw_value[MATRIX_COLS][MATRIX_ROWS];
|
||||||
|
|
||||||
|
static inline void discharge_capacitor(void) { setPinOutput(DISCHARGE_PIN); }
|
||||||
|
static inline void charge_capacitor(uint8_t col) {
|
||||||
|
setPinInput(DISCHARGE_PIN);
|
||||||
|
writePinHigh(col_pins[col]);
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline void clear_all_col_pins(void) {
|
||||||
|
for (int col = 0; col < sizeof(col_pins); col++) {
|
||||||
|
writePinLow(col_pins[col]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void init_mux_sel(void) {
|
||||||
|
for (int idx = 0; idx < sizeof(mux_sel_pins); idx++) {
|
||||||
|
setPinOutput(mux_sel_pins[idx]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void select_mux(uint8_t row) {
|
||||||
|
uint8_t ch = row_channels[row];
|
||||||
|
writePin(mux_sel_pins[0], ch & 1);
|
||||||
|
writePin(mux_sel_pins[1], ch & 2);
|
||||||
|
writePin(mux_sel_pins[2], ch & 4);
|
||||||
|
}
|
||||||
|
|
||||||
|
void init_col(void) {
|
||||||
|
for (int idx = 0; idx < sizeof(col_pins); idx++) {
|
||||||
|
setPinOutput(col_pins[idx]);
|
||||||
|
writePinLow(col_pins[idx]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void ec_init(ec_config_t const* const ec_config) {
|
||||||
|
// save config
|
||||||
|
config = *ec_config;
|
||||||
|
|
||||||
|
// initialize discharge pin as discharge mode
|
||||||
|
writePinLow(DISCHARGE_PIN);
|
||||||
|
setPinOutput(DISCHARGE_PIN);
|
||||||
|
|
||||||
|
// set analog reference
|
||||||
|
analogReference(ADC_REF_POWER);
|
||||||
|
|
||||||
|
// initialize drive lines
|
||||||
|
init_col();
|
||||||
|
|
||||||
|
// initialize multiplexer select pin
|
||||||
|
init_mux_sel();
|
||||||
|
|
||||||
|
// set discharge pin to charge mode
|
||||||
|
setPinInput(DISCHARGE_PIN);
|
||||||
|
}
|
||||||
|
|
||||||
|
uint16_t ec_readkey_raw(uint8_t col, uint8_t row) {
|
||||||
|
uint16_t sw_value = 0;
|
||||||
|
|
||||||
|
discharge_capacitor();
|
||||||
|
|
||||||
|
select_mux(row);
|
||||||
|
|
||||||
|
clear_all_col_pins();
|
||||||
|
|
||||||
|
cli();
|
||||||
|
|
||||||
|
charge_capacitor(col);
|
||||||
|
|
||||||
|
sw_value = analogReadPin(ANALOG_PORT);
|
||||||
|
|
||||||
|
sei();
|
||||||
|
|
||||||
|
return sw_value;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool ec_update_key(matrix_row_t* current_row, matrix_row_t col, uint16_t sw_value, uint16_t reset_pt, uint16_t actuation_pt) {
|
||||||
|
bool current_state = (*current_row >> col) & 1;
|
||||||
|
|
||||||
|
// press to release
|
||||||
|
if (current_state && sw_value < reset_pt) {
|
||||||
|
*current_row &= ~(MATRIX_ROW_SHIFTER << col);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
// release to press
|
||||||
|
if ((!current_state) && sw_value > actuation_pt) {
|
||||||
|
*current_row |= (MATRIX_ROW_SHIFTER << col);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool ec_matrix_scan(matrix_row_t current_matrix[]) {
|
||||||
|
bool updated = false;
|
||||||
|
|
||||||
|
for (int row = 0; row < sizeof(row_channels); row++) {
|
||||||
|
for (int col = 0; col < sizeof(col_pins); col++) {
|
||||||
|
uint16_t reset_pt = config.reset_pt;
|
||||||
|
uint16_t actuation_pt = config.actuation_pt;
|
||||||
|
|
||||||
|
//Modifying threshold values for overlapping pads
|
||||||
|
switch(row) {
|
||||||
|
case 3:
|
||||||
|
switch(col) {
|
||||||
|
case 1:
|
||||||
|
case 10: // lower threshold for bottom outside mods (40 rest, 50 act, 58 btm)
|
||||||
|
reset_pt = 45;
|
||||||
|
actuation_pt = 50;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
ec_sw_value[col][row] = ec_readkey_raw(col, row);
|
||||||
|
updated |= ec_update_key(¤t_matrix[row], col, ec_sw_value[col][row], reset_pt, actuation_pt);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return updated;
|
||||||
|
}
|
||||||
|
|
||||||
|
// console debugging for pad values
|
||||||
|
/*void ec_dprint_matrix(void) {
|
||||||
|
for (int row = 0; row < sizeof(row_channels); row++) {
|
||||||
|
for (int col = 0; col < sizeof(col_pins); col++) {
|
||||||
|
dprintf("%5d", ec_sw_value[col][row]);
|
||||||
|
}
|
||||||
|
dprintf("\n");
|
||||||
|
}
|
||||||
|
}*/
|
||||||
|
|
@ -0,0 +1,31 @@
|
||||||
|
/* Copyright 2023 Viktus Design LLC
|
||||||
|
*
|
||||||
|
* 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 <stdint.h>
|
||||||
|
#include <stdbool.h>
|
||||||
|
|
||||||
|
#include "matrix.h"
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
uint16_t reset_pt;
|
||||||
|
uint16_t actuation_pt;
|
||||||
|
} ec_config_t;
|
||||||
|
|
||||||
|
void ec_init(ec_config_t const* const ec_config);
|
||||||
|
bool ec_matrix_scan(matrix_row_t current_matrix[]);
|
||||||
|
//void ec_dprint_matrix(void); // needed for debugging
|
||||||
|
uint16_t ec_readkey_raw(uint8_t col, uint8_t row);
|
||||||
|
bool ec_update_key(matrix_row_t* current_row, matrix_row_t col, uint16_t sw_value, uint16_t reset_pt, uint16_t actuation_pt);
|
||||||
|
|
@ -0,0 +1,256 @@
|
||||||
|
{
|
||||||
|
"manufacturer": "Viktus Design LLC",
|
||||||
|
"keyboard_name": "Viktus Minne - Topre",
|
||||||
|
"maintainer": "BlindAssassin111",
|
||||||
|
"url": "https://viktus.design",
|
||||||
|
"usb": {
|
||||||
|
"device_version": "1.3.0",
|
||||||
|
"vid": "0x5644",
|
||||||
|
"pid": "0x4D54"
|
||||||
|
},
|
||||||
|
"bootloader": "atmel-dfu",
|
||||||
|
"processor": "atmega32u4",
|
||||||
|
"features": {
|
||||||
|
"bootmagic": true,
|
||||||
|
"command": false,
|
||||||
|
"console": false,
|
||||||
|
"extrakey": true,
|
||||||
|
"mousekey": true,
|
||||||
|
"nkro": true
|
||||||
|
},
|
||||||
|
"bootmagic": {
|
||||||
|
"matrix": [0,0]
|
||||||
|
},
|
||||||
|
"build": {
|
||||||
|
"lto": true
|
||||||
|
},
|
||||||
|
"diode_direction": "COL2ROW",
|
||||||
|
"matrix_pins": {
|
||||||
|
"cols": ["B7", "D0", "B6", "D6", "C6", "C7", "D7", "F7", "B4", "F6", "F5", "B5"],
|
||||||
|
"rows": ["A0", "A1", "A3", "A4"]
|
||||||
|
},
|
||||||
|
"layouts": {
|
||||||
|
"LAYOUT_all": {
|
||||||
|
"layout": [
|
||||||
|
{ "label": "K00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
|
||||||
|
{ "label": "K01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
|
||||||
|
{ "label": "K02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
|
||||||
|
{ "label": "K03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
|
||||||
|
{ "label": "K04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
|
||||||
|
{ "label": "K05", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
|
||||||
|
{ "label": "K06", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
|
||||||
|
{ "label": "K07", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
|
||||||
|
{ "label": "K08", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 },
|
||||||
|
{ "label": "K09", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 },
|
||||||
|
{ "label": "K0A", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 },
|
||||||
|
{ "label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0 },
|
||||||
|
{ "label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1 },
|
||||||
|
{ "label": "K11", "matrix": [1, 1], "w": 1, "x": 1.25, "y": 1 },
|
||||||
|
{ "label": "K12", "matrix": [1, 2], "w": 1, "x": 2.25, "y": 1 },
|
||||||
|
{ "label": "K13", "matrix": [1, 3], "w": 1, "x": 3.25, "y": 1 },
|
||||||
|
{ "label": "K14", "matrix": [1, 4], "w": 1, "x": 4.25, "y": 1 },
|
||||||
|
{ "label": "K15", "matrix": [1, 5], "w": 1, "x": 5.25, "y": 1 },
|
||||||
|
{ "label": "K16", "matrix": [1, 6], "w": 1, "x": 6.25, "y": 1 },
|
||||||
|
{ "label": "K17", "matrix": [1, 7], "w": 1, "x": 7.25, "y": 1 },
|
||||||
|
{ "label": "K18", "matrix": [1, 8], "w": 1, "x": 8.25, "y": 1 },
|
||||||
|
{ "label": "K19", "matrix": [1, 9], "w": 1, "x": 9.25, "y": 1 },
|
||||||
|
{ "label": "K1A", "matrix": [1, 10], "w": 1, "x": 10.25, "y": 1 },
|
||||||
|
{ "label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1 },
|
||||||
|
{ "label": "K20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
|
||||||
|
{ "label": "K21", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
|
||||||
|
{ "label": "K22", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
|
||||||
|
{ "label": "K23", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
|
||||||
|
{ "label": "K24", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
|
||||||
|
{ "label": "K25", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
|
||||||
|
{ "label": "K26", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
|
||||||
|
{ "label": "K27", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
|
||||||
|
{ "label": "K28", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 },
|
||||||
|
{ "label": "K29", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 },
|
||||||
|
{ "label": "K2A", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 },
|
||||||
|
{ "label": "K2B", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 },
|
||||||
|
{ "label": "K31", "matrix": [3, 1], "w": 1, "x": 1.375, "y": 3 },
|
||||||
|
{ "label": "K32", "matrix": [3, 2], "w": 1, "x": 2.375, "y": 3 },
|
||||||
|
{ "label": "K34", "matrix": [3, 4], "w": 2.5, "x": 3.375, "y": 3 },
|
||||||
|
{ "label": "K35", "matrix": [3, 5], "w": 1, "x": 5.875, "y": 3 },
|
||||||
|
{ "label": "K37", "matrix": [3, 7], "w": 2.5, "x": 6.875, "y": 3 },
|
||||||
|
{ "label": "K39", "matrix": [3, 9], "w": 1, "x": 9.375, "y": 3 },
|
||||||
|
{ "label": "K3A", "matrix": [3, 10], "w": 1, "x": 10.375, "y": 3 }
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"LAYOUT_dual_3u": {
|
||||||
|
"layout": [
|
||||||
|
{ "label": "K00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
|
||||||
|
{ "label": "K01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
|
||||||
|
{ "label": "K02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
|
||||||
|
{ "label": "K03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
|
||||||
|
{ "label": "K04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
|
||||||
|
{ "label": "K05", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
|
||||||
|
{ "label": "K06", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
|
||||||
|
{ "label": "K07", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
|
||||||
|
{ "label": "K08", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 },
|
||||||
|
{ "label": "K09", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 },
|
||||||
|
{ "label": "K0A", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 },
|
||||||
|
{ "label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0 },
|
||||||
|
{ "label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1 },
|
||||||
|
{ "label": "K11", "matrix": [1, 1], "w": 1, "x": 1.25, "y": 1 },
|
||||||
|
{ "label": "K12", "matrix": [1, 2], "w": 1, "x": 2.25, "y": 1 },
|
||||||
|
{ "label": "K13", "matrix": [1, 3], "w": 1, "x": 3.25, "y": 1 },
|
||||||
|
{ "label": "K14", "matrix": [1, 4], "w": 1, "x": 4.25, "y": 1 },
|
||||||
|
{ "label": "K15", "matrix": [1, 5], "w": 1, "x": 5.25, "y": 1 },
|
||||||
|
{ "label": "K16", "matrix": [1, 6], "w": 1, "x": 6.25, "y": 1 },
|
||||||
|
{ "label": "K17", "matrix": [1, 7], "w": 1, "x": 7.25, "y": 1 },
|
||||||
|
{ "label": "K18", "matrix": [1, 8], "w": 1, "x": 8.25, "y": 1 },
|
||||||
|
{ "label": "K19", "matrix": [1, 9], "w": 1, "x": 9.25, "y": 1 },
|
||||||
|
{ "label": "K1A", "matrix": [1, 10], "w": 1, "x": 10.25, "y": 1 },
|
||||||
|
{ "label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1 },
|
||||||
|
{ "label": "K20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
|
||||||
|
{ "label": "K21", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
|
||||||
|
{ "label": "K22", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
|
||||||
|
{ "label": "K23", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
|
||||||
|
{ "label": "K24", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
|
||||||
|
{ "label": "K25", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
|
||||||
|
{ "label": "K26", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
|
||||||
|
{ "label": "K27", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
|
||||||
|
{ "label": "K28", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 },
|
||||||
|
{ "label": "K29", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 },
|
||||||
|
{ "label": "K2A", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 },
|
||||||
|
{ "label": "K2B", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 },
|
||||||
|
{ "label": "K31", "matrix": [3, 1], "w": 1, "x": 1.375, "y": 3 },
|
||||||
|
{ "label": "K32", "matrix": [3, 2], "w": 1, "x": 2.375, "y": 3 },
|
||||||
|
{ "label": "K34", "matrix": [3, 4], "w": 3, "x": 3.375, "y": 3 },
|
||||||
|
{ "label": "K37", "matrix": [3, 7], "w": 3, "x": 6.375, "y": 3 },
|
||||||
|
{ "label": "K39", "matrix": [3, 9], "w": 1, "x": 9.375, "y": 3 },
|
||||||
|
{ "label": "K3A", "matrix": [3, 10], "w": 1, "x": 10.375, "y": 3 }
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"LAYOUT_6u": {
|
||||||
|
"layout": [
|
||||||
|
{ "label": "K00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
|
||||||
|
{ "label": "K01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
|
||||||
|
{ "label": "K02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
|
||||||
|
{ "label": "K03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
|
||||||
|
{ "label": "K04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
|
||||||
|
{ "label": "K05", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
|
||||||
|
{ "label": "K06", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
|
||||||
|
{ "label": "K07", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
|
||||||
|
{ "label": "K08", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 },
|
||||||
|
{ "label": "K09", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 },
|
||||||
|
{ "label": "K0A", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 },
|
||||||
|
{ "label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0 },
|
||||||
|
{ "label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1 },
|
||||||
|
{ "label": "K11", "matrix": [1, 1], "w": 1, "x": 1.25, "y": 1 },
|
||||||
|
{ "label": "K12", "matrix": [1, 2], "w": 1, "x": 2.25, "y": 1 },
|
||||||
|
{ "label": "K13", "matrix": [1, 3], "w": 1, "x": 3.25, "y": 1 },
|
||||||
|
{ "label": "K14", "matrix": [1, 4], "w": 1, "x": 4.25, "y": 1 },
|
||||||
|
{ "label": "K15", "matrix": [1, 5], "w": 1, "x": 5.25, "y": 1 },
|
||||||
|
{ "label": "K16", "matrix": [1, 6], "w": 1, "x": 6.25, "y": 1 },
|
||||||
|
{ "label": "K17", "matrix": [1, 7], "w": 1, "x": 7.25, "y": 1 },
|
||||||
|
{ "label": "K18", "matrix": [1, 8], "w": 1, "x": 8.25, "y": 1 },
|
||||||
|
{ "label": "K19", "matrix": [1, 9], "w": 1, "x": 9.25, "y": 1 },
|
||||||
|
{ "label": "K1A", "matrix": [1, 10], "w": 1, "x": 10.25, "y": 1 },
|
||||||
|
{ "label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1 },
|
||||||
|
{ "label": "K20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
|
||||||
|
{ "label": "K21", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
|
||||||
|
{ "label": "K22", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
|
||||||
|
{ "label": "K23", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
|
||||||
|
{ "label": "K24", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
|
||||||
|
{ "label": "K25", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
|
||||||
|
{ "label": "K26", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
|
||||||
|
{ "label": "K27", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
|
||||||
|
{ "label": "K28", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 },
|
||||||
|
{ "label": "K29", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 },
|
||||||
|
{ "label": "K2A", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 },
|
||||||
|
{ "label": "K2B", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 },
|
||||||
|
{ "label": "K31", "matrix": [3, 1], "w": 1, "x": 1.375, "y": 3 },
|
||||||
|
{ "label": "K32", "matrix": [3, 2], "w": 1, "x": 2.375, "y": 3 },
|
||||||
|
{ "label": "K35", "matrix": [3, 5], "w": 6, "x": 3.375, "y": 3 },
|
||||||
|
{ "label": "K39", "matrix": [3, 9], "w": 1, "x": 9.375, "y": 3 },
|
||||||
|
{ "label": "K3A", "matrix": [3, 10], "w": 1, "x": 10.375, "y": 3 }
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"LAYOUT_7u": {
|
||||||
|
"layout": [
|
||||||
|
{ "label": "K00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
|
||||||
|
{ "label": "K01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
|
||||||
|
{ "label": "K02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
|
||||||
|
{ "label": "K03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
|
||||||
|
{ "label": "K04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
|
||||||
|
{ "label": "K05", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
|
||||||
|
{ "label": "K06", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
|
||||||
|
{ "label": "K07", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
|
||||||
|
{ "label": "K08", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 },
|
||||||
|
{ "label": "K09", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 },
|
||||||
|
{ "label": "K0A", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 },
|
||||||
|
{ "label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0 },
|
||||||
|
{ "label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1 },
|
||||||
|
{ "label": "K11", "matrix": [1, 1], "w": 1, "x": 1.25, "y": 1 },
|
||||||
|
{ "label": "K12", "matrix": [1, 2], "w": 1, "x": 2.25, "y": 1 },
|
||||||
|
{ "label": "K13", "matrix": [1, 3], "w": 1, "x": 3.25, "y": 1 },
|
||||||
|
{ "label": "K14", "matrix": [1, 4], "w": 1, "x": 4.25, "y": 1 },
|
||||||
|
{ "label": "K15", "matrix": [1, 5], "w": 1, "x": 5.25, "y": 1 },
|
||||||
|
{ "label": "K16", "matrix": [1, 6], "w": 1, "x": 6.25, "y": 1 },
|
||||||
|
{ "label": "K17", "matrix": [1, 7], "w": 1, "x": 7.25, "y": 1 },
|
||||||
|
{ "label": "K18", "matrix": [1, 8], "w": 1, "x": 8.25, "y": 1 },
|
||||||
|
{ "label": "K19", "matrix": [1, 9], "w": 1, "x": 9.25, "y": 1 },
|
||||||
|
{ "label": "K1A", "matrix": [1, 10], "w": 1, "x": 10.25, "y": 1 },
|
||||||
|
{ "label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1 },
|
||||||
|
{ "label": "K20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
|
||||||
|
{ "label": "K21", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
|
||||||
|
{ "label": "K22", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
|
||||||
|
{ "label": "K23", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
|
||||||
|
{ "label": "K24", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
|
||||||
|
{ "label": "K25", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
|
||||||
|
{ "label": "K26", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
|
||||||
|
{ "label": "K27", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
|
||||||
|
{ "label": "K28", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 },
|
||||||
|
{ "label": "K29", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 },
|
||||||
|
{ "label": "K2A", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 },
|
||||||
|
{ "label": "K2B", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 },
|
||||||
|
{ "label": "K31", "matrix": [3, 1], "w": 1.5, "x": 1.375, "y": 3 },
|
||||||
|
{ "label": "K35", "matrix": [3, 5], "w": 7, "x": 2.875, "y": 3 },
|
||||||
|
{ "label": "K3A", "matrix": [3, 10], "w": 1.5, "x": 9.875, "y": 3 }
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"LAYOUT_10u": {
|
||||||
|
"layout": [
|
||||||
|
{ "label": "K00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
|
||||||
|
{ "label": "K01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
|
||||||
|
{ "label": "K02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
|
||||||
|
{ "label": "K03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
|
||||||
|
{ "label": "K04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
|
||||||
|
{ "label": "K05", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
|
||||||
|
{ "label": "K06", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
|
||||||
|
{ "label": "K07", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
|
||||||
|
{ "label": "K08", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 },
|
||||||
|
{ "label": "K09", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 },
|
||||||
|
{ "label": "K0A", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 },
|
||||||
|
{ "label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0 },
|
||||||
|
{ "label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1 },
|
||||||
|
{ "label": "K11", "matrix": [1, 1], "w": 1, "x": 1.25, "y": 1 },
|
||||||
|
{ "label": "K12", "matrix": [1, 2], "w": 1, "x": 2.25, "y": 1 },
|
||||||
|
{ "label": "K13", "matrix": [1, 3], "w": 1, "x": 3.25, "y": 1 },
|
||||||
|
{ "label": "K14", "matrix": [1, 4], "w": 1, "x": 4.25, "y": 1 },
|
||||||
|
{ "label": "K15", "matrix": [1, 5], "w": 1, "x": 5.25, "y": 1 },
|
||||||
|
{ "label": "K16", "matrix": [1, 6], "w": 1, "x": 6.25, "y": 1 },
|
||||||
|
{ "label": "K17", "matrix": [1, 7], "w": 1, "x": 7.25, "y": 1 },
|
||||||
|
{ "label": "K18", "matrix": [1, 8], "w": 1, "x": 8.25, "y": 1 },
|
||||||
|
{ "label": "K19", "matrix": [1, 9], "w": 1, "x": 9.25, "y": 1 },
|
||||||
|
{ "label": "K1A", "matrix": [1, 10], "w": 1, "x": 10.25, "y": 1 },
|
||||||
|
{ "label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1 },
|
||||||
|
{ "label": "K20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
|
||||||
|
{ "label": "K21", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
|
||||||
|
{ "label": "K22", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
|
||||||
|
{ "label": "K23", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
|
||||||
|
{ "label": "K24", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
|
||||||
|
{ "label": "K25", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
|
||||||
|
{ "label": "K26", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
|
||||||
|
{ "label": "K27", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
|
||||||
|
{ "label": "K28", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 },
|
||||||
|
{ "label": "K29", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 },
|
||||||
|
{ "label": "K2A", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 },
|
||||||
|
{ "label": "K2B", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 },
|
||||||
|
{ "label": "K35", "matrix": [3, 5], "w": 10, "x": 1.375, "y": 3 }
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,26 @@
|
||||||
|
/* Copyright 2023 Viktus Design LLC
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 2 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include QMK_KEYBOARD_H
|
||||||
|
|
||||||
|
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||||
|
[0] = LAYOUT_all(
|
||||||
|
KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
|
||||||
|
KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT,
|
||||||
|
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_RSFT, MO(1),
|
||||||
|
KC_LCTL, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RCTL
|
||||||
|
)
|
||||||
|
};
|
||||||
|
|
@ -0,0 +1,26 @@
|
||||||
|
/* Copyright 2023 Viktus Design LLC
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 2 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include QMK_KEYBOARD_H
|
||||||
|
|
||||||
|
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||||
|
[0] = LAYOUT_all(
|
||||||
|
KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
|
||||||
|
KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT,
|
||||||
|
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_RSFT, MO(1),
|
||||||
|
KC_LCTL, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RCTL
|
||||||
|
)
|
||||||
|
};
|
||||||
|
|
@ -0,0 +1 @@
|
||||||
|
VIA_ENABLE = yes
|
||||||
|
|
@ -0,0 +1,49 @@
|
||||||
|
/* Copyright 2023 Viktus Design LLC
|
||||||
|
*
|
||||||
|
* 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 "quantum.h"
|
||||||
|
#include "ec.h"
|
||||||
|
#include "matrix.h"
|
||||||
|
//#include "debug.h" // needed for debugging
|
||||||
|
|
||||||
|
#define RESET_PT 55
|
||||||
|
#define ACTUATION_PT 65
|
||||||
|
|
||||||
|
// console debugging for pad values
|
||||||
|
/*void keyboard_post_init_kb() {
|
||||||
|
debug_enable = true;
|
||||||
|
debug_matrix = true;
|
||||||
|
}*/
|
||||||
|
|
||||||
|
void matrix_init_custom(void) {
|
||||||
|
ec_config_t ec_config = {.reset_pt = RESET_PT, .actuation_pt = ACTUATION_PT};
|
||||||
|
|
||||||
|
ec_init(&ec_config);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool matrix_scan_custom(matrix_row_t current_matrix[]) {
|
||||||
|
bool updated = ec_matrix_scan(current_matrix);
|
||||||
|
|
||||||
|
// console debugging for pad values
|
||||||
|
/*static int cnt = 0;
|
||||||
|
if (cnt++ == 300) {
|
||||||
|
cnt = 0;
|
||||||
|
ec_dprint_matrix();
|
||||||
|
dprintf("\n");
|
||||||
|
}*/
|
||||||
|
|
||||||
|
return updated;
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,27 @@
|
||||||
|
# Viktus Minne - Topre
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
Minne is a 40% keyboard with an HHKB bottom row, Now with Topre.
|
||||||
|
|
||||||
|
- Keyboard Maintainer: BlindAssassin111
|
||||||
|
- Hardware Supported: Viktus Minne Topre PCB
|
||||||
|
- Hardware Availability: Viktus Design LLC
|
||||||
|
|
||||||
|
Make example for this keyboard (after setting up your build environment):
|
||||||
|
|
||||||
|
make viktus/minne_topre:default
|
||||||
|
|
||||||
|
Flashing example for this keyboard:
|
||||||
|
|
||||||
|
make viktus/minne_topre: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 reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
|
||||||
|
* **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 += ec.c
|
||||||
Loading…
Reference in New Issue