modifié : keyboards/electronlab/klor/config.h

modifié :         keyboards/electronlab/klor/keyboard.json
	modifié :         keyboards/electronlab/klor/keymaps/default/config.h
	modifié :         keyboards/electronlab/klor/keymaps/default/keymap.c
	supprimé :        keyboards/electronlab/klor/keymaps/default/rules.mk
	modifié :         keyboards/electronlab/klor/keymaps/electronlab/config.h
	modifié :         keyboards/electronlab/klor/keymaps/electronlab/keymap.c
	modifié :         keyboards/electronlab/klor/keymaps/electronlab/rules.mk
This commit is contained in:
Lefuneste83 2024-09-09 10:27:09 +02:00
parent 3ea84b53c2
commit 9f1307f7d6
8 changed files with 38 additions and 264 deletions

View File

@ -17,44 +17,18 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
// ┌─────────────────────────────────────────────────┐
// │ p i n c o n f i g │
// └─────────────────────────────────────────────────┘
/* The way how "handedness" is decided (which half is which), see https://docs.qmk.fm/#/feature_split_keyboard?id=setting-handedness for more options.*/
//#define EE_HANDS
#define MASTER_LEFT
//#define MASTER_RIGHT
//#define SPLIT_HAND_PIN GP10 //If handedness jumpers are bridged on KLOR REV 1.5 PCB onward
#define I2C1_SCL_PIN GP3
#define I2C1_SDA_PIN GP2
// ┌─────────────────────────────────────────────────┐
// │ s p l i t c o m m u n i c a t i o n │
// └─────────────────────────────────────────────────┘
//#define SPLIT_USB_DETECT
//Half Duplex communication
//#define SERIAL_USART_TX_PIN GP1 // USART TX pin
//
//Full Duplex communication
//#define SERIAL_USART_TX_PIN GP4 // USART TX pin
//#define SERIAL_USART_RX_PIN GP1 // USART RX pin
//#define SERIAL_USART_FULL_DUPLEX
//#define SERIAL_USART_PIN_SWAP
// ┌─────────────────────────────────────────────────┐
// │ o l e d s │
// └─────────────────────────────────────────────────┘
#ifdef OLED_ENABLE
# define OLED_DISPLAY_128X64
# define SPLIT_OLED_ENABLE
# define OLED_FONT_H "./glcdfont.c"
#endif
// ┌─────────────────────────────────────────────────┐
// │ a u d i o │
// └─────────────────────────────────────────────────┘
# define OLED_DISPLAY_128X64
# define SPLIT_OLED_ENABLE
# define OLED_FONT_H "./glcdfont.c"
#define AUDIO_PWM_DRIVER PWMD4
#define AUDIO_PWM_CHANNEL RP2040_PWM_CHANNEL_B
@ -62,39 +36,23 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define AUDIO_PIN GP9
#define AUDIO_DAC_SAMPLE_MAX 4095U
#define AUDIO_VOICE_DEFAULT butts_fader
#ifdef AUDIO_ENABLE
# define STARTUP_SONG SONG(W__NOTE(_DS0), W__NOTE(_DS1), H__NOTE(_DS2), H__NOTE(_DS3), Q__NOTE(_DS4), Q__NOTE(_DS5), E__NOTE(_DS6), E__NOTE(_DS7), S__NOTE(_DS8), Q__NOTE(_GS0))
# define GOODBYE_SONG SONG(H__NOTE(_DS4), H__NOTE(_DS3), W__NOTE(_DS1))
# define DEFAULT_LAYER_SONGS \
# define STARTUP_SONG SONG(W__NOTE(_DS0), W__NOTE(_DS1), H__NOTE(_DS2), H__NOTE(_DS3), Q__NOTE(_DS4), Q__NOTE(_DS5), E__NOTE(_DS6), E__NOTE(_DS7), S__NOTE(_DS8), Q__NOTE(_GS0))
# define GOODBYE_SONG SONG(H__NOTE(_DS4), H__NOTE(_DS3), W__NOTE(_DS1))
# define DEFAULT_LAYER_SONGS \
{ SONG(QWERTY_SOUND), SONG(COLEMAK_SOUND) }
#endif
#define DRV2605L_FB_ERM_LRA 1
#define DRV2605L_FB_BRAKEFACTOR 3
#define DRV2605L_FB_LOOPGAIN 1
#define DRV2605L_RATED_VOLTAGE 2
#define DRV2605L_V_PEAK 2.8
#define DRV2605L_V_RMS 2.0
#define DRV2605L_F_LRA 150
#define DRV2605L_DRV_GREETING alert_750ms
#define DRV2605L_DEFAULT_MODE 4
// ┌─────────────────────────────────────────────────┐
// │ h a p t i c f e e d b a c k │
// └─────────────────────────────────────────────────┘
#ifdef HAPTIC_ENABLE
# define FB_ERM_LRA 1
# define FB_BRAKEFACTOR 3 // For 1x:0, 2x:1, 3x:2, 4x:3, 6x:4, 8x:5, 16x:6, Disable Braking:7
# define FB_LOOPGAIN 1 // For Low:0, Medium:1, High:2, Very High:3
# define RATED_VOLTAGE 2
# define V_PEAK 2.8
# define V_RMS 2.0
# define F_LRA 150 // resonance freq
# define DRV_GREETING alert_750ms
# define SPLIT_HAPTIC_ENABLE
# define DRV2605L_DEFAULT_MODE 4
#endif
// ┌─────────────────────────────────────────────────┐
// │ t r a c k b a l l │
// └─────────────────────────────────────────────────┘
#ifdef POINTING_DEVICE_ENABLE
# define PAW3204_SCLK_PIN GP3
# define PAW3204_SDIO_PIN GP2
# define POINTING_DEVICE_AUTO_MOUSE_ENABLE
# define AUTO_MOUSE_DELAY 300
#endif
# define POINTING_DEVICE_SCLK_PIN GP3
# define POINTING_DEVICE_SDIO_PIN GP2
# define POINTING_DEVICE_AUTO_MOUSE_ENABLE
# define AUTO_MOUSE_DELAY 300

View File

@ -5,9 +5,6 @@
"bootmagic": {
"matrix": [0, 1]
},
"build": {
"lto": false
},
"development_board": "elite_pi",
"diode_direction": "COL2ROW",
"encoder": {
@ -15,13 +12,19 @@
{"pin_a": "GP28", "pin_b": "GP29", "resolution": 2}
]
},
"tapping": {
"term": 250
},
"combo": {
"term": 150
},
"features": {
"audio": true,
"bootmagic": true,
"encoder": true,
"extrakey": true,
"haptic": true,
"mousekey": false,
"mousekey": true,
"oled": true,
"pointing_device": false,
"rgb_matrix": true
@ -60,6 +63,7 @@
"cycle_up_down": true,
"digital_rain": true,
"dual_beacon": true,
"flower_blooming": true,
"gradient_left_right": true,
"gradient_up_down": true,
"hue_breathing": true,
@ -74,6 +78,7 @@
"rainbow_moving_chevron": true,
"rainbow_pinwheels": true,
"raindrops": true,
"riverflow": true,
"solid_multisplash": true,
"solid_reactive": true,
"solid_reactive_cross": true,
@ -85,6 +90,9 @@
"solid_reactive_wide": true,
"solid_splash": true,
"splash": true,
"starlight": true,
"starlight_dual_hue": true,
"starlight_dual_sat": true,
"typing_heatmap": true
},
"default": {

View File

@ -17,84 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
/* The way how "handedness" is decided (which half is which),
see https://docs.qmk.fm/#/feature_split_keyboard?id=setting-handedness
for more options.
*/
#define EE_HANDS
//#define MASTER_LEFT
//#define MASTER_RIGHT
#define TAPPING_TERM 300
// Enable rapid switch from tap to hold, disables double tap hold auto-repeat.
#define TAPPING_FORCE_HOLD
// Auto Shift
#define NO_AUTO_SHIFT_ALPHA
#define AUTO_SHIFT_TIMEOUT TAPPING_TERM
#define AUTO_SHIFT_TIMEOUT QUICK_TAP_TERM
#define AUTO_SHIFT_NO_SETUP
// RGB matrix support
#ifdef RGB_MATRIX_ENABLE
// RGB Matrix Animation modes. Explicitly enabled
// For full list of effects, see:
// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effect
# define ENABLE_RGB_MATRIX_ALPHAS_MODS
# define ENABLE_RGB_MATRIX_SOLID_COLOR
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
# define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
# define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
# define ENABLE_RGB_MATRIX_BREATHING
# define ENABLE_RGB_MATRIX_BAND_SAT
# define ENABLE_RGB_MATRIX_BAND_VAL
# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
# define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
# define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
# define ENABLE_RGB_MATRIX_CYCLE_ALL
# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
# define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
# define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
# define ENABLE_RGB_MATRIX_DUAL_BEACON
# define ENABLE_RGB_MATRIX_RAINBOW_BEACON
# define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
# define ENABLE_RGB_MATRIX_RAINDROPS
# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
# define ENABLE_RGB_MATRIX_HUE_BREATHING
# define ENABLE_RGB_MATRIX_HUE_PENDULUM
# define ENABLE_RGB_MATRIX_HUE_WAVE
# define ENABLE_RGB_MATRIX_PIXEL_RAIN
# define ENABLE_RGB_MATRIX_PIXEL_FLOW
# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined ├─────────────────────────────┐
# define ENABLE_RGB_MATRIX_TYPING_HEATMAP
# define ENABLE_RGB_MATRIX_DIGITAL_RAIN
// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined ├────────────┐
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
# define ENABLE_RGB_MATRIX_SPLASH
# define ENABLE_RGB_MATRIX_MULTISPLASH
# define ENABLE_RGB_MATRIX_SOLID_SPLASH
# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
#endif
// Haptic support
#ifdef HAPTIC_ENABLE
//# define NO_HAPTIC_ALPHA
//# define NO_HAPTIC_PUNCTUATION
//# define NO_HAPTIC_LOCKKEYS
//# define NO_HAPTIC_NAV
//# define NO_HAPTIC_NUMERIC
#endif

View File

@ -16,8 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include QMK_KEYBOARD_H
#include <stdio.h>
#include <string.h>
enum klor_layers {
_QWERTY,

View File

@ -1,19 +0,0 @@
OLED_ENABLE = yes
OLED_DRIVER = ssd1306
ENCODER_ENABLE = yes
#ENCODER_MAP_ENABLE = yes
EXTRAKEY_ENABLE = yes
AUDIO_ENABLE = yes
MUSIC_ENABLE = yes
DYNAMIC_MACRO_ENABLE = yes
#COMBO_ENABLE = yes
KEY_OVERRIDE_ENABLE = no
TRI_LAYER_ENABLE = yes
SPLIT_KEYBOARD = yes
#HAPTIC FEEBACK
HAPTIC_ENABLE = yes
SPLIT_HAPTIC_ENABLE = yes
#PER KEY RGB
RGB_MATRIX_ENABLE = yes

View File

@ -17,84 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
/* The way how "handedness" is decided (which half is which),
see https://docs.qmk.fm/#/feature_split_keyboard?id=setting-handedness
for more options.
*/
#define EE_HANDS
//#define MASTER_LEFT
//#define MASTER_RIGHT
#define TAPPING_TERM 300
// Enable rapid switch from tap to hold, disables double tap hold auto-repeat.
#define TAPPING_FORCE_HOLD
// Auto Shift
#define NO_AUTO_SHIFT_ALPHA
#define AUTO_SHIFT_TIMEOUT TAPPING_TERM
#define AUTO_SHIFT_NO_SETUP
// RGB matrix support
#ifdef RGB_MATRIX_ENABLE
// RGB Matrix Animation modes. Explicitly enabled
// For full list of effects, see:
// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effect
# define ENABLE_RGB_MATRIX_ALPHAS_MODS
# define ENABLE_RGB_MATRIX_SOLID_COLOR
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
# define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
# define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
# define ENABLE_RGB_MATRIX_BREATHING
# define ENABLE_RGB_MATRIX_BAND_SAT
# define ENABLE_RGB_MATRIX_BAND_VAL
# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
# define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
# define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
# define ENABLE_RGB_MATRIX_CYCLE_ALL
# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
# define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
# define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
# define ENABLE_RGB_MATRIX_DUAL_BEACON
# define ENABLE_RGB_MATRIX_RAINBOW_BEACON
# define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
# define ENABLE_RGB_MATRIX_RAINDROPS
# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
# define ENABLE_RGB_MATRIX_HUE_BREATHING
# define ENABLE_RGB_MATRIX_HUE_PENDULUM
# define ENABLE_RGB_MATRIX_HUE_WAVE
# define ENABLE_RGB_MATRIX_PIXEL_RAIN
# define ENABLE_RGB_MATRIX_PIXEL_FLOW
# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined ├─────────────────────────────┐
# define ENABLE_RGB_MATRIX_TYPING_HEATMAP
# define ENABLE_RGB_MATRIX_DIGITAL_RAIN
// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined ├────────────┐
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
# define ENABLE_RGB_MATRIX_SPLASH
# define ENABLE_RGB_MATRIX_MULTISPLASH
# define ENABLE_RGB_MATRIX_SOLID_SPLASH
# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
#endif
// Haptic support
#ifdef HAPTIC_ENABLE
//# define NO_HAPTIC_ALPHA
//# define NO_HAPTIC_PUNCTUATION
//# define NO_HAPTIC_LOCKKEYS
//# define NO_HAPTIC_NAV
//# define NO_HAPTIC_NUMERIC
#endif

View File

@ -33,8 +33,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include QMK_KEYBOARD_H
#include <stdio.h>
#include <string.h>
// ┌────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐

View File

@ -1,19 +1,4 @@
OLED_ENABLE = yes
OLED_DRIVER = ssd1306
ENCODER_ENABLE = yes
ENCODER_MAP_ENABLE = yes
EXTRAKEY_ENABLE = yes
AUDIO_ENABLE = yes
MUSIC_ENABLE = yes
DYNAMIC_MACRO_ENABLE = yes
COMBO_ENABLE = yes
KEY_OVERRIDE_ENABLE = no
TRI_LAYER_ENABLE = yes
SPLIT_KEYBOARD = yes
#HAPTIC FEEBACK
HAPTIC_ENABLE = yes
SPLIT_HAPTIC_ENABLE = yes
#PER KEY RGB
RGB_MATRIX_ENABLE = yes