Merge remote-tracking branch 'origin/master' into develop
QMK Bot
commit
7a28c6ede3
|
|
@ -62,8 +62,3 @@
|
||||||
|
|
||||||
#define EECONFIG_KB_DATA_SIZE 57
|
#define EECONFIG_KB_DATA_SIZE 57
|
||||||
|
|
||||||
/* 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
|
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,12 @@
|
||||||
"build": {
|
"build": {
|
||||||
"lto": true
|
"lto": true
|
||||||
},
|
},
|
||||||
|
"qmk": {
|
||||||
|
"locking": {
|
||||||
|
"enabled": true,
|
||||||
|
"resync": true
|
||||||
|
}
|
||||||
|
},
|
||||||
"diode_direction": "COL2ROW",
|
"diode_direction": "COL2ROW",
|
||||||
"features": {
|
"features": {
|
||||||
"bootmagic": false,
|
"bootmagic": false,
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
CUSTOM_MATRIX = lite
|
CUSTOM_MATRIX = lite
|
||||||
ANALOG_DRIVER_REQUIRED = yes
|
ANALOG_DRIVER_REQUIRED = yes
|
||||||
SRC += keyboards/cipulot/common/matrix.c keyboards/cipulot/common/ec_board.c keyboards/cipulot/common/ec_switch_matrix.c
|
VPATH += keyboards/cipulot/common
|
||||||
|
SRC += matrix.c ec_board.c ec_switch_matrix.c
|
||||||
OPT = 2
|
OPT = 2
|
||||||
|
|
|
||||||
|
|
@ -64,9 +64,3 @@
|
||||||
// #define DEBUG_MATRIX_SCAN_RATE
|
// #define DEBUG_MATRIX_SCAN_RATE
|
||||||
|
|
||||||
#define EECONFIG_KB_DATA_SIZE 159
|
#define EECONFIG_KB_DATA_SIZE 159
|
||||||
|
|
||||||
/* 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
|
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,12 @@
|
||||||
"build": {
|
"build": {
|
||||||
"lto": true
|
"lto": true
|
||||||
},
|
},
|
||||||
|
"qmk": {
|
||||||
|
"locking": {
|
||||||
|
"enabled": true,
|
||||||
|
"resync": true
|
||||||
|
}
|
||||||
|
},
|
||||||
"diode_direction": "COL2ROW",
|
"diode_direction": "COL2ROW",
|
||||||
"features": {
|
"features": {
|
||||||
"bootmagic": false,
|
"bootmagic": false,
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
CUSTOM_MATRIX = lite
|
CUSTOM_MATRIX = lite
|
||||||
ANALOG_DRIVER_REQUIRED = yes
|
ANALOG_DRIVER_REQUIRED = yes
|
||||||
SRC += keyboards/cipulot/common/matrix.c keyboards/cipulot/common/ec_board.c keyboards/cipulot/common/ec_switch_matrix.c
|
VPATH += keyboards/cipulot/common
|
||||||
|
SRC += matrix.c ec_board.c ec_switch_matrix.c
|
||||||
OPT = 3
|
OPT = 3
|
||||||
|
|
|
||||||
|
|
@ -63,9 +63,3 @@
|
||||||
// #define DEBUG_MATRIX_SCAN_RATE
|
// #define DEBUG_MATRIX_SCAN_RATE
|
||||||
|
|
||||||
#define EECONFIG_KB_DATA_SIZE 169
|
#define EECONFIG_KB_DATA_SIZE 169
|
||||||
|
|
||||||
/* 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
|
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,12 @@
|
||||||
"build": {
|
"build": {
|
||||||
"lto": true
|
"lto": true
|
||||||
},
|
},
|
||||||
|
"qmk": {
|
||||||
|
"locking": {
|
||||||
|
"enabled": true,
|
||||||
|
"resync": true
|
||||||
|
}
|
||||||
|
},
|
||||||
"diode_direction": "COL2ROW",
|
"diode_direction": "COL2ROW",
|
||||||
"features": {
|
"features": {
|
||||||
"bootmagic": false,
|
"bootmagic": false,
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
CUSTOM_MATRIX = lite
|
CUSTOM_MATRIX = lite
|
||||||
ANALOG_DRIVER_REQUIRED = yes
|
ANALOG_DRIVER_REQUIRED = yes
|
||||||
SRC += keyboards/cipulot/common/matrix.c keyboards/cipulot/common/ec_board.c keyboards/cipulot/common/ec_switch_matrix.c
|
VPATH += keyboards/cipulot/common
|
||||||
|
SRC += matrix.c ec_board.c ec_switch_matrix.c
|
||||||
OPT = 3
|
OPT = 3
|
||||||
|
|
|
||||||
|
|
@ -63,9 +63,3 @@
|
||||||
// #define DEBUG_MATRIX_SCAN_RATE
|
// #define DEBUG_MATRIX_SCAN_RATE
|
||||||
|
|
||||||
#define EECONFIG_KB_DATA_SIZE 169
|
#define EECONFIG_KB_DATA_SIZE 169
|
||||||
|
|
||||||
/* 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
|
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,12 @@
|
||||||
"build": {
|
"build": {
|
||||||
"lto": true
|
"lto": true
|
||||||
},
|
},
|
||||||
|
"qmk": {
|
||||||
|
"locking": {
|
||||||
|
"enabled": true,
|
||||||
|
"resync": true
|
||||||
|
}
|
||||||
|
},
|
||||||
"diode_direction": "COL2ROW",
|
"diode_direction": "COL2ROW",
|
||||||
"features": {
|
"features": {
|
||||||
"bootmagic": false,
|
"bootmagic": false,
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
CUSTOM_MATRIX = lite
|
CUSTOM_MATRIX = lite
|
||||||
ANALOG_DRIVER_REQUIRED = yes
|
ANALOG_DRIVER_REQUIRED = yes
|
||||||
SRC += keyboards/cipulot/common/matrix.c keyboards/cipulot/common/ec_board.c keyboards/cipulot/common/ec_switch_matrix.c
|
VPATH += keyboards/cipulot/common
|
||||||
|
SRC += matrix.c ec_board.c ec_switch_matrix.c
|
||||||
OPT = 3
|
OPT = 3
|
||||||
|
|
|
||||||
|
|
@ -65,8 +65,3 @@
|
||||||
|
|
||||||
#define EECONFIG_KB_DATA_SIZE 159
|
#define EECONFIG_KB_DATA_SIZE 159
|
||||||
|
|
||||||
/* 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
|
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,12 @@
|
||||||
"build": {
|
"build": {
|
||||||
"lto": true
|
"lto": true
|
||||||
},
|
},
|
||||||
|
"qmk": {
|
||||||
|
"locking": {
|
||||||
|
"enabled": true,
|
||||||
|
"resync": true
|
||||||
|
}
|
||||||
|
},
|
||||||
"diode_direction": "COL2ROW",
|
"diode_direction": "COL2ROW",
|
||||||
"features": {
|
"features": {
|
||||||
"bootmagic": false,
|
"bootmagic": false,
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
CUSTOM_MATRIX = lite
|
CUSTOM_MATRIX = lite
|
||||||
ANALOG_DRIVER_REQUIRED = yes
|
ANALOG_DRIVER_REQUIRED = yes
|
||||||
SRC += keyboards/cipulot/common/matrix.c keyboards/cipulot/common/ec_board.c keyboards/cipulot/common/ec_switch_matrix.c
|
VPATH += keyboards/cipulot/common
|
||||||
|
SRC += matrix.c ec_board.c ec_switch_matrix.c
|
||||||
OPT = 2
|
OPT = 2
|
||||||
|
|
|
||||||
|
|
@ -64,9 +64,3 @@
|
||||||
// #define DEBUG_MATRIX_SCAN_RATE
|
// #define DEBUG_MATRIX_SCAN_RATE
|
||||||
|
|
||||||
#define EECONFIG_KB_DATA_SIZE 159
|
#define EECONFIG_KB_DATA_SIZE 159
|
||||||
|
|
||||||
/* 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
|
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,12 @@
|
||||||
"build": {
|
"build": {
|
||||||
"lto": true
|
"lto": true
|
||||||
},
|
},
|
||||||
|
"qmk": {
|
||||||
|
"locking": {
|
||||||
|
"enabled": true,
|
||||||
|
"resync": true
|
||||||
|
}
|
||||||
|
},
|
||||||
"diode_direction": "COL2ROW",
|
"diode_direction": "COL2ROW",
|
||||||
"features": {
|
"features": {
|
||||||
"bootmagic": false,
|
"bootmagic": false,
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
CUSTOM_MATRIX = lite
|
CUSTOM_MATRIX = lite
|
||||||
ANALOG_DRIVER_REQUIRED = yes
|
ANALOG_DRIVER_REQUIRED = yes
|
||||||
SRC += keyboards/cipulot/common/matrix.c keyboards/cipulot/common/ec_board.c keyboards/cipulot/common/ec_switch_matrix.c
|
VPATH += keyboards/cipulot/common
|
||||||
|
SRC += matrix.c ec_board.c ec_switch_matrix.c
|
||||||
OPT = 2
|
OPT = 2
|
||||||
|
|
|
||||||
|
|
@ -64,9 +64,3 @@
|
||||||
// #define DEBUG_MATRIX_SCAN_RATE
|
// #define DEBUG_MATRIX_SCAN_RATE
|
||||||
|
|
||||||
#define EECONFIG_KB_DATA_SIZE 149
|
#define EECONFIG_KB_DATA_SIZE 149
|
||||||
|
|
||||||
/* 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
|
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,12 @@
|
||||||
"build": {
|
"build": {
|
||||||
"lto": true
|
"lto": true
|
||||||
},
|
},
|
||||||
|
"qmk": {
|
||||||
|
"locking": {
|
||||||
|
"enabled": true,
|
||||||
|
"resync": true
|
||||||
|
}
|
||||||
|
},
|
||||||
"diode_direction": "COL2ROW",
|
"diode_direction": "COL2ROW",
|
||||||
"features": {
|
"features": {
|
||||||
"bootmagic": false,
|
"bootmagic": false,
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
CUSTOM_MATRIX = lite
|
CUSTOM_MATRIX = lite
|
||||||
ANALOG_DRIVER_REQUIRED = yes
|
ANALOG_DRIVER_REQUIRED = yes
|
||||||
SRC += keyboards/cipulot/common/matrix.c keyboards/cipulot/common/ec_board.c keyboards/cipulot/common/ec_switch_matrix.c
|
VPATH += keyboards/cipulot/common
|
||||||
|
SRC += matrix.c ec_board.c ec_switch_matrix.c
|
||||||
OPT = 2
|
OPT = 2
|
||||||
|
|
|
||||||
|
|
@ -63,9 +63,3 @@
|
||||||
// #define DEBUG_MATRIX_SCAN_RATE
|
// #define DEBUG_MATRIX_SCAN_RATE
|
||||||
#define DYNAMIC_KEYMAP_LAYER_COUNT 3
|
#define DYNAMIC_KEYMAP_LAYER_COUNT 3
|
||||||
#define EECONFIG_KB_DATA_SIZE 201
|
#define EECONFIG_KB_DATA_SIZE 201
|
||||||
|
|
||||||
/* 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
|
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,12 @@
|
||||||
"build": {
|
"build": {
|
||||||
"lto": true
|
"lto": true
|
||||||
},
|
},
|
||||||
|
"qmk": {
|
||||||
|
"locking": {
|
||||||
|
"enabled": true,
|
||||||
|
"resync": true
|
||||||
|
}
|
||||||
|
},
|
||||||
"diode_direction": "COL2ROW",
|
"diode_direction": "COL2ROW",
|
||||||
"features": {
|
"features": {
|
||||||
"bootmagic": false,
|
"bootmagic": false,
|
||||||
|
|
@ -27,10 +33,6 @@
|
||||||
"LAYOUT_all": "LAYOUT_tkl_ansi",
|
"LAYOUT_all": "LAYOUT_tkl_ansi",
|
||||||
"LAYOUT_tkl_ansi_tsangan_wkl": "LAYOUT_tkl_ansi_wkl"
|
"LAYOUT_tkl_ansi_tsangan_wkl": "LAYOUT_tkl_ansi_wkl"
|
||||||
},
|
},
|
||||||
"community_layouts": [
|
|
||||||
"tkl_ansi",
|
|
||||||
"tkl_ansi_tsangan"
|
|
||||||
],
|
|
||||||
"layouts": {
|
"layouts": {
|
||||||
"LAYOUT_tkl_ansi": {
|
"LAYOUT_tkl_ansi": {
|
||||||
"layout": [
|
"layout": [
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
CUSTOM_MATRIX = lite
|
CUSTOM_MATRIX = lite
|
||||||
ANALOG_DRIVER_REQUIRED = yes
|
ANALOG_DRIVER_REQUIRED = yes
|
||||||
SRC += keyboards/cipulot/common/matrix.c keyboards/cipulot/common/ec_board.c keyboards/cipulot/common/ec_switch_matrix.c
|
VPATH += keyboards/cipulot/common
|
||||||
|
SRC += matrix.c ec_board.c ec_switch_matrix.c
|
||||||
OPT = 3
|
OPT = 3
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,66 @@
|
||||||
|
/* 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 3 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 6
|
||||||
|
#define MATRIX_COLS 18
|
||||||
|
|
||||||
|
#define MATRIX_ROW_PINS \
|
||||||
|
{ B6, B7, B5, B4, B3, A15 }
|
||||||
|
|
||||||
|
#define AMUX_COUNT 2
|
||||||
|
#define AMUX_MAX_COLS_COUNT 16
|
||||||
|
|
||||||
|
#define AMUX_EN_PINS \
|
||||||
|
{ A9, A8 }
|
||||||
|
|
||||||
|
#define AMUX_SEL_PINS \
|
||||||
|
{ B12, B13, B15, B14 }
|
||||||
|
|
||||||
|
#define AMUX_COL_CHANNELS_SIZES \
|
||||||
|
{ 7, 11 }
|
||||||
|
|
||||||
|
#define AMUX_0_COL_CHANNELS \
|
||||||
|
{ 2, 1, 0, 3, 5, 4, 7 }
|
||||||
|
|
||||||
|
#define AMUX_1_COL_CHANNELS \
|
||||||
|
{ 2, 1, 0, 15, 14, 13, 12, 8, 11, 10, 9 }
|
||||||
|
|
||||||
|
#define AMUX_COL_CHANNELS AMUX_0_COL_CHANNELS, AMUX_1_COL_CHANNELS
|
||||||
|
|
||||||
|
#define DISCHARGE_PIN A4
|
||||||
|
#define ANALOG_PORT A3
|
||||||
|
|
||||||
|
#define DEFAULT_ACTUATION_MODE 0
|
||||||
|
#define DEFAULT_MODE_0_ACTUATION_LEVEL 550
|
||||||
|
#define DEFAULT_MODE_0_RELEASE_LEVEL 500
|
||||||
|
#define DEFAULT_MODE_1_INITIAL_DEADZONE_OFFSET DEFAULT_MODE_0_ACTUATION_LEVEL
|
||||||
|
#define DEFAULT_MODE_1_ACTUATION_OFFSET 70
|
||||||
|
#define DEFAULT_MODE_1_RELEASE_OFFSET 70
|
||||||
|
#define DEFAULT_EXTREMUM 1023
|
||||||
|
#define EXPECTED_NOISE_FLOOR 0
|
||||||
|
#define NOISE_FLOOR_THRESHOLD 50
|
||||||
|
#define BOTTOMING_CALIBRATION_THRESHOLD 50
|
||||||
|
#define DEFAULT_NOISE_FLOOR_SAMPLING_COUNT 30
|
||||||
|
#define DEFAULT_BOTTOMING_READING 1023
|
||||||
|
#define DEFAULT_CALIBRATION_STARTER true
|
||||||
|
|
||||||
|
#define DISCHARGE_TIME 10
|
||||||
|
|
||||||
|
// #define DEBUG_MATRIX_SCAN_RATE
|
||||||
|
|
||||||
|
#define EECONFIG_KB_DATA_SIZE 225
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
/* Copyright 2022 Cipulot
|
/* Copyright 2023 Cipulot
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* 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
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
|
@ -16,7 +16,6 @@
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
|
#define HAL_USE_ADC TRUE
|
||||||
#define LOCKING_SUPPORT_ENABLE
|
|
||||||
/* Locking resynchronize hack */
|
#include_next <halconf.h>
|
||||||
#define LOCKING_RESYNC_ENABLE
|
|
||||||
|
|
@ -0,0 +1,136 @@
|
||||||
|
{
|
||||||
|
"manufacturer": "Cipulot",
|
||||||
|
"keyboard_name": "Virgo EC",
|
||||||
|
"maintainer": "Cipulot",
|
||||||
|
"bootloader": "stm32-dfu",
|
||||||
|
"build": {
|
||||||
|
"lto": true
|
||||||
|
},
|
||||||
|
"diode_direction": "COL2ROW",
|
||||||
|
"eeprom": {
|
||||||
|
"wear_leveling": {
|
||||||
|
"backing_size": 4096
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"features": {
|
||||||
|
"bootmagic": false,
|
||||||
|
"console": true,
|
||||||
|
"extrakey": true,
|
||||||
|
"mousekey": true,
|
||||||
|
"nkro": true
|
||||||
|
},
|
||||||
|
"processor": "STM32F411",
|
||||||
|
"qmk": {
|
||||||
|
"locking": {
|
||||||
|
"enabled": true,
|
||||||
|
"resync": true
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"usb": {
|
||||||
|
"device_version": "0.0.1",
|
||||||
|
"pid": "0x6BC0",
|
||||||
|
"shared_endpoint": {
|
||||||
|
"keyboard": true
|
||||||
|
},
|
||||||
|
"vid": "0x6369"
|
||||||
|
},
|
||||||
|
"layouts": {
|
||||||
|
"LAYOUT": {
|
||||||
|
"layout": [
|
||||||
|
{"matrix": [0, 0], "x": 0, "y": 0},
|
||||||
|
{"matrix": [0, 1], "x": 1.25, "y": 0},
|
||||||
|
{"matrix": [0, 2], "x": 2.25, "y": 0},
|
||||||
|
{"matrix": [0, 3], "x": 3.25, "y": 0},
|
||||||
|
{"matrix": [0, 4], "x": 4.25, "y": 0},
|
||||||
|
{"matrix": [0, 5], "x": 5.5, "y": 0},
|
||||||
|
{"matrix": [0, 7], "x": 9, "y": 0},
|
||||||
|
{"matrix": [0, 8], "x": 10, "y": 0},
|
||||||
|
{"matrix": [0, 9], "x": 11, "y": 0},
|
||||||
|
{"matrix": [0, 10], "x": 12.25, "y": 0},
|
||||||
|
{"matrix": [0, 11], "x": 13.25, "y": 0},
|
||||||
|
{"matrix": [0, 12], "x": 14.25, "y": 0},
|
||||||
|
{"matrix": [0, 13], "x": 15.25, "y": 0},
|
||||||
|
{"matrix": [0, 15], "x": 17.25, "y": 0},
|
||||||
|
{"matrix": [0, 16], "x": 18.25, "y": 0},
|
||||||
|
{"matrix": [0, 17], "x": 19.25, "y": 0},
|
||||||
|
{"matrix": [1, 0], "x": 0, "y": 1.5},
|
||||||
|
{"matrix": [1, 1], "x": 1, "y": 1.5},
|
||||||
|
{"matrix": [1, 2], "x": 2, "y": 1.5},
|
||||||
|
{"matrix": [1, 3], "x": 3, "y": 1.5},
|
||||||
|
{"matrix": [1, 4], "x": 4, "y": 1.5},
|
||||||
|
{"matrix": [1, 5], "x": 5, "y": 1.5},
|
||||||
|
{"matrix": [1, 6], "x": 6, "y": 1.5},
|
||||||
|
{"matrix": [1, 7], "x": 9, "y": 1.5},
|
||||||
|
{"matrix": [1, 8], "x": 10, "y": 1.5},
|
||||||
|
{"matrix": [1, 9], "x": 11, "y": 1.5},
|
||||||
|
{"matrix": [1, 10], "x": 12, "y": 1.5},
|
||||||
|
{"matrix": [1, 11], "x": 13, "y": 1.5},
|
||||||
|
{"matrix": [1, 12], "x": 14, "y": 1.5},
|
||||||
|
{"matrix": [1, 13], "x": 15, "y": 1.5},
|
||||||
|
{"matrix": [1, 14], "x": 16, "y": 1.5},
|
||||||
|
{"matrix": [1, 15], "x": 17.25, "y": 1.5},
|
||||||
|
{"matrix": [1, 16], "x": 18.25, "y": 1.5},
|
||||||
|
{"matrix": [1, 17], "x": 19.25, "y": 1.5},
|
||||||
|
{"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
|
||||||
|
{"matrix": [2, 1], "x": 1.5, "y": 2.5},
|
||||||
|
{"matrix": [2, 2], "x": 2.5, "y": 2.5},
|
||||||
|
{"matrix": [2, 3], "x": 3.5, "y": 2.5},
|
||||||
|
{"matrix": [2, 4], "x": 4.5, "y": 2.5},
|
||||||
|
{"matrix": [2, 5], "x": 5.5, "y": 2.5},
|
||||||
|
{"matrix": [2, 6], "x": 8.5, "y": 2.5},
|
||||||
|
{"matrix": [2, 7], "x": 9.5, "y": 2.5},
|
||||||
|
{"matrix": [2, 8], "x": 10.5, "y": 2.5},
|
||||||
|
{"matrix": [2, 9], "x": 11.5, "y": 2.5},
|
||||||
|
{"matrix": [2, 10], "x": 12.5, "y": 2.5},
|
||||||
|
{"matrix": [2, 11], "x": 13.5, "y": 2.5},
|
||||||
|
{"matrix": [2, 12], "x": 14.5, "y": 2.5},
|
||||||
|
{"matrix": [2, 13], "x": 15.5, "y": 2.5},
|
||||||
|
{"matrix": [2, 14], "x": 16.5, "y": 2.5, "w": 0.5},
|
||||||
|
{"matrix": [2, 15], "x": 17.25, "y": 2.5},
|
||||||
|
{"matrix": [2, 16], "x": 18.25, "y": 2.5},
|
||||||
|
{"matrix": [2, 17], "x": 19.25, "y": 2.5},
|
||||||
|
{"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
|
||||||
|
{"matrix": [3, 1], "x": 1.75, "y": 3.5},
|
||||||
|
{"matrix": [3, 2], "x": 2.75, "y": 3.5},
|
||||||
|
{"matrix": [3, 3], "x": 3.75, "y": 3.5},
|
||||||
|
{"matrix": [3, 4], "x": 4.75, "y": 3.5},
|
||||||
|
{"matrix": [3, 5], "x": 5.75, "y": 3.5},
|
||||||
|
{"matrix": [3, 6], "x": 8.75, "y": 3.5},
|
||||||
|
{"matrix": [3, 7], "x": 9.75, "y": 3.5},
|
||||||
|
{"matrix": [3, 8], "x": 10.75, "y": 3.5},
|
||||||
|
{"matrix": [3, 9], "x": 11.75, "y": 3.5},
|
||||||
|
{"matrix": [3, 10], "x": 12.75, "y": 3.5},
|
||||||
|
{"matrix": [3, 11], "x": 13.75, "y": 3.5},
|
||||||
|
{"matrix": [3, 12], "x": 14.75, "y": 3.5},
|
||||||
|
{"matrix": [3, 13], "x": 15.75, "y": 3.5, "w": 1.25},
|
||||||
|
{"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
|
||||||
|
{"matrix": [4, 1], "x": 1.25, "y": 4.5},
|
||||||
|
{"matrix": [4, 2], "x": 2.25, "y": 4.5},
|
||||||
|
{"matrix": [4, 3], "x": 3.25, "y": 4.5},
|
||||||
|
{"matrix": [4, 4], "x": 4.25, "y": 4.5},
|
||||||
|
{"matrix": [4, 5], "x": 5.25, "y": 4.5},
|
||||||
|
{"matrix": [4, 6], "x": 6.25, "y": 4.5},
|
||||||
|
{"matrix": [5, 6], "x": 8.25, "y": 4.5},
|
||||||
|
{"matrix": [4, 7], "x": 9.25, "y": 4.5},
|
||||||
|
{"matrix": [4, 8], "x": 10.25, "y": 4.5},
|
||||||
|
{"matrix": [4, 9], "x": 11.25, "y": 4.5},
|
||||||
|
{"matrix": [4, 10], "x": 12.25, "y": 4.5},
|
||||||
|
{"matrix": [4, 11], "x": 13.25, "y": 4.5},
|
||||||
|
{"matrix": [4, 13], "x": 14.25, "y": 4.5, "w": 1.75},
|
||||||
|
{"matrix": [4, 14], "x": 16, "y": 4.5},
|
||||||
|
{"matrix": [4, 16], "x": 18.25, "y": 4.5},
|
||||||
|
{"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
|
||||||
|
{"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
|
||||||
|
{"matrix": [5, 3], "x": 3.75, "y": 5.5, "w": 1.25},
|
||||||
|
{"matrix": [5, 5], "x": 5, "y": 5.5, "w": 2.25},
|
||||||
|
{"matrix": [5, 7], "x": 8.25, "y": 5.5, "w": 2.75},
|
||||||
|
{"matrix": [5, 9], "x": 11, "y": 5.5, "w": 1.25},
|
||||||
|
{"matrix": [5, 10], "x": 12.25, "y": 5.5, "w": 1.25},
|
||||||
|
{"matrix": [5, 13], "x": 14.5, "y": 5.5, "w": 1.5},
|
||||||
|
{"matrix": [5, 15], "x": 17.25, "y": 5.5},
|
||||||
|
{"matrix": [5, 16], "x": 18.25, "y": 5.5},
|
||||||
|
{"matrix": [5, 17], "x": 19.25, "y": 5.5}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,37 @@
|
||||||
|
/* 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 3 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(
|
||||||
|
KC_ESC, 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_PSCR, KC_SCRL, KC_PAUS,
|
||||||
|
KC_GRV, 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_BSPC, KC_BSPC, KC_INS, KC_HOME, KC_PGUP,
|
||||||
|
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_BSLS, KC_ENTER, KC_DEL, KC_END, KC_PGDN,
|
||||||
|
KC_CAPS, 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_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_UP,
|
||||||
|
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT),
|
||||||
|
[1] = LAYOUT(
|
||||||
|
QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||||
|
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||||
|
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||||
|
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||||
|
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||||
|
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)
|
||||||
|
|
||||||
|
// clang-format on
|
||||||
|
};
|
||||||
|
|
@ -0,0 +1,37 @@
|
||||||
|
/* 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 3 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(
|
||||||
|
KC_ESC, 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_PSCR, KC_SCRL, KC_PAUS,
|
||||||
|
KC_GRV, 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_BSPC, KC_BSPC, KC_INS, KC_HOME, KC_PGUP,
|
||||||
|
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_BSLS, KC_ENTER, KC_DEL, KC_END, KC_PGDN,
|
||||||
|
KC_CAPS, 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_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_UP,
|
||||||
|
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT),
|
||||||
|
[1] = LAYOUT(
|
||||||
|
QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||||
|
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||||
|
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||||
|
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||||
|
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||||
|
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)
|
||||||
|
|
||||||
|
// clang-format on
|
||||||
|
};
|
||||||
|
|
@ -0,0 +1 @@
|
||||||
|
VIA_ENABLE = yes
|
||||||
|
|
@ -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 3 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,3 @@
|
||||||
|
ifeq ($(strip $(VIA_ENABLE)), yes)
|
||||||
|
SRC += keyboards/cipulot/common/via_ec.c
|
||||||
|
endif
|
||||||
|
|
@ -0,0 +1,26 @@
|
||||||
|
# Virgo EC
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
EC version of the Virgo keyboard.
|
||||||
|
|
||||||
|
* Keyboard Maintainer: [cipulot](https://github.com/cipulot)
|
||||||
|
* Hardware Supported: Virgo EC PCB
|
||||||
|
* Hardware Availability: [Antipode](https://www.antipode.no/)
|
||||||
|
|
||||||
|
Make example for this keyboard (after setting up your build environment):
|
||||||
|
|
||||||
|
make cipulot/ec_virgo:default
|
||||||
|
|
||||||
|
Flashing example for this keyboard:
|
||||||
|
|
||||||
|
make cipulot/ec_virgo: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 2 ways:
|
||||||
|
|
||||||
|
* **Physical reset**: Long short the exposed pads on the top of the PCB
|
||||||
|
* **Keycode in layout**: Press the key mapped to QK_BOOT if it is available
|
||||||
|
|
@ -0,0 +1,5 @@
|
||||||
|
CUSTOM_MATRIX = lite
|
||||||
|
ANALOG_DRIVER_REQUIRED = yes
|
||||||
|
VPATH += keyboards/cipulot/common
|
||||||
|
SRC += matrix.c ec_board.c ec_switch_matrix.c
|
||||||
|
OPT = 3
|
||||||
|
|
@ -1,23 +0,0 @@
|
||||||
/*
|
|
||||||
Copyright 2022 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
|
|
||||||
|
|
||||||
/* 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
|
|
||||||
|
|
@ -42,6 +42,12 @@
|
||||||
"cols": ["F5", "F6", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "F7", "D2", "D1", "B7"],
|
"cols": ["F5", "F6", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "F7", "D2", "D1", "B7"],
|
||||||
"rows": ["B3", "B2", "F0", "C7", "F4", "F1"]
|
"rows": ["B3", "B2", "F0", "C7", "F4", "F1"]
|
||||||
},
|
},
|
||||||
|
"qmk": {
|
||||||
|
"locking": {
|
||||||
|
"enabled": true,
|
||||||
|
"resync": true
|
||||||
|
}
|
||||||
|
},
|
||||||
"diode_direction": "COL2ROW",
|
"diode_direction": "COL2ROW",
|
||||||
"processor": "atmega32u4",
|
"processor": "atmega32u4",
|
||||||
"bootloader": "atmel-dfu",
|
"bootloader": "atmel-dfu",
|
||||||
|
|
|
||||||
|
|
@ -15,6 +15,12 @@
|
||||||
"cols": ["B10", "A0", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14", "A4", "A3", "A2", "A1"],
|
"cols": ["B10", "A0", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14", "A4", "A3", "A2", "A1"],
|
||||||
"rows": ["B1", "B12", "C13", "A7", "B0"]
|
"rows": ["B1", "B12", "C13", "A7", "B0"]
|
||||||
},
|
},
|
||||||
|
"qmk": {
|
||||||
|
"locking": {
|
||||||
|
"enabled": true,
|
||||||
|
"resync": true
|
||||||
|
}
|
||||||
|
},
|
||||||
"diode_direction": "COL2ROW",
|
"diode_direction": "COL2ROW",
|
||||||
"processor": "STM32F411",
|
"processor": "STM32F411",
|
||||||
"bootloader": "stm32-dfu",
|
"bootloader": "stm32-dfu",
|
||||||
|
|
|
||||||
|
|
@ -63,9 +63,3 @@
|
||||||
// #define DEBUG_MATRIX_SCAN_RATE
|
// #define DEBUG_MATRIX_SCAN_RATE
|
||||||
#define DYNAMIC_KEYMAP_LAYER_COUNT 3
|
#define DYNAMIC_KEYMAP_LAYER_COUNT 3
|
||||||
#define EECONFIG_KB_DATA_SIZE 201
|
#define EECONFIG_KB_DATA_SIZE 201
|
||||||
|
|
||||||
/* 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
|
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,12 @@
|
||||||
"build": {
|
"build": {
|
||||||
"lto": true
|
"lto": true
|
||||||
},
|
},
|
||||||
|
"qmk": {
|
||||||
|
"locking": {
|
||||||
|
"enabled": true,
|
||||||
|
"resync": true
|
||||||
|
}
|
||||||
|
},
|
||||||
"diode_direction": "COL2ROW",
|
"diode_direction": "COL2ROW",
|
||||||
"features": {
|
"features": {
|
||||||
"bootmagic": false,
|
"bootmagic": false,
|
||||||
|
|
@ -47,7 +53,6 @@
|
||||||
},
|
},
|
||||||
"vid": "0x6369"
|
"vid": "0x6369"
|
||||||
},
|
},
|
||||||
"community_layouts": ["tkl_jis", "tkl_iso_tsangan", "tkl_ansi_tsangan"],
|
|
||||||
"layouts": {
|
"layouts": {
|
||||||
"LAYOUT_all": {
|
"LAYOUT_all": {
|
||||||
"layout": [
|
"layout": [
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
CUSTOM_MATRIX = lite
|
CUSTOM_MATRIX = lite
|
||||||
ANALOG_DRIVER_REQUIRED = yes
|
ANALOG_DRIVER_REQUIRED = yes
|
||||||
SRC += keyboards/cipulot/common/matrix.c keyboards/cipulot/common/ec_board.c keyboards/cipulot/common/ec_switch_matrix.c
|
VPATH += keyboards/cipulot/common
|
||||||
|
SRC += matrix.c ec_board.c ec_switch_matrix.c
|
||||||
OPT = 2
|
OPT = 2
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue