TheWanderingCrow/vial-qmk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'qmk/master' into merge-2024-06-23

Browse source
This commit is contained in:
Ilya Zhuravlev 2024-06-23 22:54:29 -06:00
commit e9d70b410a
15675 changed files with 653160 additions and 679575 deletions
Download patch file Download diff file Expand all files Collapse all files

9
keyboards/keychron/q12/ansi_encoder/info.json → keyboards/keychron/q12/ansi_encoder/keyboard.json
View file

@ -15,6 +15,15 @@
},
"processor": "STM32L432",
"bootloader": "stm32-dfu",
"features": {
"bootmagic": true,
"mousekey": true,
"extrakey": true,
"nkro": true,
"rgb_matrix": true,
"encoder": true,
"dip_switch": true
},
"layouts": {
"LAYOUT_ansi_103": {
"layout": [

16
keyboards/keychron/q12/ansi_encoder/rules.mk
View file

@ -1,19 +1,3 @@
# Build Options
# change yes to no to disable.
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration
NKRO_ENABLE = yes # Enable USB N-key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
ENCODER_ENABLE = yes # Enable Encoder
DIP_SWITCH_ENABLE = yes
RGB_MATRIX_ENABLE = yes
# custom matrix setup
CUSTOM_MATRIX = lite

9
keyboards/keychron/q12/iso_encoder/info.json → keyboards/keychron/q12/iso_encoder/keyboard.json
View file

@ -15,6 +15,15 @@
},
"processor": "STM32L432",
"bootloader": "stm32-dfu",
"features": {
"bootmagic": true,
"mousekey": true,
"extrakey": true,
"nkro": true,
"rgb_matrix": true,
"encoder": true,
"dip_switch": true
},
"layouts": {
"LAYOUT_iso_104": {
"layout": [

17
keyboards/keychron/q12/iso_encoder/rules.mk
View file

@ -1,21 +1,4 @@
# Build Options
# change yes to no to disable.
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration
NKRO_ENABLE = yes # Enable USB N-key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
ENCODER_ENABLE = yes # Enable Encoder
DIP_SWITCH_ENABLE = yes
RGB_MATRIX_ENABLE = yes
# custom matrix setup
CUSTOM_MATRIX = lite
VPATH ?= keyboards/keychron/common
SRC += matrix.c

15
keyboards/keychron/q12/matrix.c
View file

@ -15,7 +15,8 @@
*/
#include "matrix.h"
#include "quantum.h"
#include "atomic_util.h"
#include <string.h>
// Pin connected to DS of 74HC595
#define DATA_PIN C15
@ -35,27 +36,27 @@ static pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
static inline void setPinOutput_writeLow(pin_t pin) {
ATOMIC_BLOCK_FORCEON {
setPinOutput(pin);
writePinLow(pin);
gpio_set_pin_output(pin);
gpio_write_pin_low(pin);
}
}
static inline void setPinOutput_writeHigh(pin_t pin) {
ATOMIC_BLOCK_FORCEON {
setPinOutput(pin);
writePinHigh(pin);
gpio_set_pin_output(pin);
gpio_write_pin_high(pin);
}
}
static inline void setPinInputHigh_atomic(pin_t pin) {
ATOMIC_BLOCK_FORCEON {
setPinInputHigh(pin);
gpio_set_pin_input_high(pin);
}
}
static inline uint8_t readMatrixPin(pin_t pin) {
if (pin != NO_PIN) {
return readPin(pin);
return gpio_read_pin(pin);
} else {
return 1;
}