forked from mirrors/qmk_userspace
haptic: naming cleanups (#21551)
This commit is contained in:
parent
b20b360404
commit
b090354143
53 changed files with 667 additions and 660 deletions
|
|
@ -1,4 +1,4 @@
|
|||
VIA_ENABLE = yes
|
||||
HAPTIC_ENABLE = yes
|
||||
HAPTIC_DRIVER += SOLENOID
|
||||
HAPTIC_DRIVER = solenoid
|
||||
ENCODER_MAP_ENABLE = yes # Encoder mapping functionality
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
VIA_ENABLE = yes
|
||||
LTO_ENABLE = yes
|
||||
HAPTIC_ENABLE = yes
|
||||
HAPTIC_DRIVER += SOLENOID
|
||||
HAPTIC_DRIVER = solenoid
|
||||
|
|
@ -12,4 +12,4 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
|
|||
AUDIO_ENABLE = no # Audio output
|
||||
|
||||
HAPTIC_ENABLE = yes # Enable solenoid support
|
||||
HAPTIC_DRIVER += SOLENOID
|
||||
HAPTIC_DRIVER = solenoid
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@
|
|||
#define V_RMS 2.3
|
||||
#define V_PEAK 3.30
|
||||
/* Library Selection */
|
||||
#define LIB_SELECTION 4 /* For Empty:0' TS2200 library A to D:1-5, LRA Library: 6 */
|
||||
#define DRV2605L_LIBRARY 4 /* For Empty:0' TS2200 library A to D:1-5, LRA Library: 6 */
|
||||
|
||||
/* default 2V LRA voltage and library */
|
||||
#elif FB_ERM_LRA == 1
|
||||
|
|
@ -57,7 +57,7 @@
|
|||
#define V_PEAK 2.85
|
||||
#define F_LRA 200
|
||||
/* Library Selection */
|
||||
#define LIB_SELECTION 6 /* For Empty:0' TS2200 library A to D:1-5, LRA Library: 6 */
|
||||
#define DRV2605L_LIBRARY 6 /* For Empty:0' TS2200 library A to D:1-5, LRA Library: 6 */
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -12,6 +12,6 @@ AUDIO_ENABLE = yes # Audio output
|
|||
RGBLIGHT_ENABLE = no
|
||||
RGB_MATRIX_ENABLE = no
|
||||
HAPTIC_ENABLE = yes
|
||||
HAPTIC_DRIVER = DRV2605L
|
||||
HAPTIC_DRIVER = drv2605l
|
||||
OLED_ENABLE = yes
|
||||
OLED_DRIVER = SSD1306
|
||||
|
|
|
|||
|
|
@ -25,8 +25,8 @@
|
|||
#define NO_HAPTIC_PUNCTUATION
|
||||
#define NO_HAPTIC_NAV
|
||||
#define NO_HAPTIC_NUMERIC
|
||||
#define DRV_GREETING alert_750ms
|
||||
#define DRV_MODE_DEFAULT sharp_tick1
|
||||
#define DRV2605L_GREETING alert_750ms
|
||||
#define DRV2605L_DEFAULT_MODE sharp_tick1
|
||||
#endif
|
||||
|
||||
#ifdef PS2_MOUSE_ENABLE
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
#include "haptic_utils.h"
|
||||
|
||||
#ifdef HAPTIC_ENABLE
|
||||
#include "drivers/haptic/DRV2605L.h"
|
||||
#include "drivers/haptic/drv2605l.h"
|
||||
#endif
|
||||
|
||||
#ifdef HAPTIC_ENABLE
|
||||
|
|
@ -23,19 +23,19 @@ void process_layer_pulse(layer_state_t state) {
|
|||
#ifdef HAPTIC_ENABLE
|
||||
switch (get_highest_layer(state)) {
|
||||
case 1:
|
||||
DRV_pulse(soft_bump);
|
||||
drv2605l_pulse(soft_bump);
|
||||
break;
|
||||
case 2:
|
||||
DRV_pulse(sh_dblsharp_tick);
|
||||
drv2605l_pulse(sh_dblsharp_tick);
|
||||
break;
|
||||
case 3:
|
||||
DRV_pulse(lg_dblclick_str);
|
||||
drv2605l_pulse(lg_dblclick_str);
|
||||
break;
|
||||
case 4:
|
||||
DRV_pulse(soft_bump);
|
||||
drv2605l_pulse(soft_bump);
|
||||
break;
|
||||
case 5:
|
||||
DRV_pulse(pulsing_sharp);
|
||||
drv2605l_pulse(pulsing_sharp);
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ SRC += features/haptic_utils.c
|
|||
OLED_ENABLE = yes
|
||||
|
||||
HAPTIC_ENABLE = yes
|
||||
HAPTIC_DRIVER = DRV2605L
|
||||
HAPTIC_DRIVER = drv2605l
|
||||
|
||||
PS2_MOUSE_ENABLE = yes
|
||||
MOUSEKEY_ENABLE = yes
|
||||
|
|
|
|||
|
|
@ -25,8 +25,8 @@
|
|||
#define NO_HAPTIC_PUNCTUATION
|
||||
#define NO_HAPTIC_NAV
|
||||
#define NO_HAPTIC_NUMERIC
|
||||
#define DRV_GREETING alert_750ms
|
||||
#define DRV_MODE_DEFAULT sharp_tick1
|
||||
#define DRV2605L_GREETING alert_750ms
|
||||
#define DRV2605L_DEFAULT_MODE sharp_tick1
|
||||
#endif
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
OLED_ENABLE = yes # uncomment if you are using an OLED display
|
||||
|
||||
#HAPTIC_ENABLE = yes # uncomment only on the master side if you are using a Pimoroni haptic buzz
|
||||
#HAPTIC_DRIVER = DRV2605L # uncomment only on the master side if you are using a Pimoroni haptic buzz
|
||||
#HAPTIC_DRIVER = drv2605l # uncomment only on the master side if you are using a Pimoroni haptic buzz
|
||||
|
||||
#PS2_MOUSE_ENABLE = yes # uncomment only on the master side if you are usin a TrackPoint
|
||||
MOUSEKEY_ENABLE = yes
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
#include "quantum.h"
|
||||
|
||||
#ifdef HAPTIC_ENABLE
|
||||
#include "drivers/haptic/DRV2605L.h"
|
||||
#include "drivers/haptic/drv2605l.h"
|
||||
#endif
|
||||
|
||||
#ifdef SWAP_HANDS_ENABLE
|
||||
|
|
@ -100,27 +100,27 @@ __attribute__((weak)) layer_state_t layer_state_set_user(layer_state_t state) {
|
|||
switch (get_highest_layer(state)) {
|
||||
case 1:
|
||||
#ifdef HAPTIC_ENABLE
|
||||
DRV_pulse(soft_bump);
|
||||
drv2605l_pulse(soft_bump);
|
||||
#endif
|
||||
break;
|
||||
case 2:
|
||||
#ifdef HAPTIC_ENABLE
|
||||
DRV_pulse(sh_dblsharp_tick);
|
||||
drv2605l_pulse(sh_dblsharp_tick);
|
||||
#endif
|
||||
break;
|
||||
case 3:
|
||||
#ifdef HAPTIC_ENABLE
|
||||
DRV_pulse(lg_dblclick_str);
|
||||
drv2605l_pulse(lg_dblclick_str);
|
||||
#endif
|
||||
break;
|
||||
case 4:
|
||||
#ifdef HAPTIC_ENABLE
|
||||
DRV_pulse(soft_bump);
|
||||
drv2605l_pulse(soft_bump);
|
||||
#endif
|
||||
break;
|
||||
case 5:
|
||||
#ifdef HAPTIC_ENABLE
|
||||
DRV_pulse(pulsing_sharp);
|
||||
drv2605l_pulse(pulsing_sharp);
|
||||
#endif
|
||||
break;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@
|
|||
#define V_RMS 2.3
|
||||
#define V_PEAK 3.30
|
||||
/* Library Selection */
|
||||
#define LIB_SELECTION 4 /* For Empty:0' TS2200 library A to D:1-5, LRA Library: 6 */
|
||||
#define DRV2605L_LIBRARY 4 /* For Empty:0' TS2200 library A to D:1-5, LRA Library: 6 */
|
||||
|
||||
/* default 2V LRA voltage and library */
|
||||
#elif FB_ERM_LRA == 1
|
||||
|
|
@ -79,7 +79,7 @@
|
|||
#define V_PEAK 2.85
|
||||
#define F_LRA 200
|
||||
/* Library Selection */
|
||||
#define LIB_SELECTION 6 /* For Empty:0' TS2200 library A to D:1-5, LRA Library: 6 */
|
||||
#define DRV2605L_LIBRARY 6 /* For Empty:0' TS2200 library A to D:1-5, LRA Library: 6 */
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
#pragma once
|
||||
|
|
@ -239,12 +239,3 @@ bool music_mask_user(uint16_t keycode) {
|
|||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void matrix_init_keymap(void) {
|
||||
}
|
||||
|
||||
|
||||
void matrix_scan_keymap(void) {
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ AUDIO_ENABLE = yes
|
|||
RGBLIGHT_ENABLE = yes
|
||||
RGB_MATRIX_ENABLE = no # once arm_rgb is implemented
|
||||
HAPTIC_ENABLE = yes
|
||||
HAPTIC_DRIVER = DRV2605L
|
||||
HAPTIC_DRIVER = drv2605l
|
||||
OLED_ENABLE = yes
|
||||
OLED_DRIVER = SSD1306
|
||||
ENCODER_ENABLER = yes
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
HAPTIC_ENABLE = yes
|
||||
HAPTIC_DRIVER = SOLENOID
|
||||
HAPTIC_DRIVER = solenoid
|
||||
|
|
|
|||
|
|
@ -1,2 +1 @@
|
|||
AUDIO_ENABLE = yes
|
||||
HAPTIC_ENABLE += SOLENOID
|
||||
|
|
@ -1,5 +1,4 @@
|
|||
VIA_ENABLE = yes
|
||||
#HAPTIC_ENABLE += SOLENOID
|
||||
AUDIO_ENABLE = yes
|
||||
#either solenoid or audio not both can be enabled
|
||||
LTO_ENABLE = yes
|
||||
|
|
|
|||
|
|
@ -32,5 +32,5 @@
|
|||
|
||||
|
||||
#define FB_ERM_LRA 0
|
||||
#define DRV_GREETING alert_750ms
|
||||
#define DRV_MODE_DEFAULT buzz
|
||||
#define DRV2605L_GREETING alert_750ms
|
||||
#define DRV2605L_DEFAULT_MODE buzz
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ ifeq ($(strip $(KEYBOARD)), handwired/tractyl_manuform/5x6_right/f411)
|
|||
LTO_SUPPORTED = no
|
||||
OVERLOAD_FEATURES = yes
|
||||
HAPTIC_ENABLE = yes
|
||||
HAPTIC_DRIVER = DRV2605L
|
||||
HAPTIC_DRIVER = drv2605l
|
||||
endif
|
||||
|
||||
ifeq ($(strip $(OVERLOAD_FEATURES)), yes)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
LTO_ENABLE = yes
|
||||
HAPTIC_ENABLE = yes
|
||||
HAPTIC_DRIVER += SOLENOID
|
||||
HAPTIC_DRIVER = solenoid
|
||||
|
||||
OLED_ENABLE = yes
|
||||
OLED_DRIVER = SSD1306
|
||||
|
|
|
|||
|
|
@ -21,5 +21,5 @@
|
|||
|
||||
/* Haptic waveforms */
|
||||
// Two mild waveforms
|
||||
#define DRV_GREETING alert_750ms
|
||||
#define DRV_MODE_DEFAULT sharp_tick3_60
|
||||
#define DRV2605L_GREETING alert_750ms
|
||||
#define DRV2605L_DEFAULT_MODE sharp_tick3_60
|
||||
|
|
|
|||
|
|
@ -5,4 +5,4 @@ LTO_ENABLE = yes # Use link time optimization for smaller firmware
|
|||
# enable it and set its driver here or in your keymap folder
|
||||
# The Pimoroni board's driver is DRV2605L
|
||||
# HAPTIC_ENABLE = yes # Enable haptic driver
|
||||
# HAPTIC_DRIVER = DRV2605L
|
||||
# HAPTIC_DRIVER = drv2605l
|
||||
|
|
|
|||
|
|
@ -16,5 +16,5 @@
|
|||
|
||||
/* Haptic waveforms */
|
||||
// Two mild waveforms
|
||||
#define DRV_GREETING alert_750ms
|
||||
#define DRV_MODE_DEFAULT sharp_tick3_60
|
||||
#define DRV2605L_GREETING alert_750ms
|
||||
#define DRV2605L_DEFAULT_MODE sharp_tick3_60
|
||||
|
|
|
|||
|
|
@ -5,4 +5,4 @@ LTO_ENABLE = yes # Use link time optimization for smaller firmware
|
|||
# enable it and set its driver here or in your keymap folder
|
||||
# The Pimoroni board's driver is DRV2605L
|
||||
# HAPTIC_ENABLE = yes # Enable haptic driver
|
||||
# HAPTIC_DRIVER = DRV2605L
|
||||
# HAPTIC_DRIVER = drv2605l
|
||||
|
|
|
|||
|
|
@ -21,5 +21,5 @@
|
|||
|
||||
/* Haptic waveforms */
|
||||
// Two mild waveforms
|
||||
#define DRV_GREETING alert_750ms
|
||||
#define DRV_MODE_DEFAULT sharp_tick3_60
|
||||
#define DRV2605L_GREETING alert_750ms
|
||||
#define DRV2605L_DEFAULT_MODE sharp_tick3_60
|
||||
|
|
|
|||
|
|
@ -5,4 +5,4 @@ LTO_ENABLE = yes # Use link time optimization for smaller firmware
|
|||
# enable it and set its driver here or in your keymap folder
|
||||
# The Pimoroni board's driver is DRV2605L
|
||||
# HAPTIC_ENABLE = yes # Enable haptic driver
|
||||
# HAPTIC_DRIVER = DRV2605L
|
||||
# HAPTIC_DRIVER = drv2605l
|
||||
|
|
|
|||
|
|
@ -14,4 +14,4 @@ AUDIO_ENABLE = no # Audio output
|
|||
KEYBOARD_SHARED_EP = yes # Free up some extra endpoints - needed if console+mouse+extra
|
||||
|
||||
HAPTIC_ENABLE = yes
|
||||
HAPTIC_DRIVER = SOLENOID
|
||||
HAPTIC_DRIVER = solenoid
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
HAPTIC_DRIVER += SOLENOID
|
||||
HAPTIC_DRIVER = solenoid
|
||||
|
|
|
|||
|
|
@ -12,6 +12,6 @@ RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
|
|||
AUDIO_ENABLE = yes # Audio output
|
||||
ENCODER_ENABLE = yes
|
||||
HAPTIC_ENABLE = yes
|
||||
HAPTIC_DRIVER = DRV2605L
|
||||
HAPTIC_DRIVER = drv2605l
|
||||
|
||||
LTO_ENABLE = yes
|
||||
|
|
|
|||
|
|
@ -11,6 +11,6 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
|
|||
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
|
||||
AUDIO_ENABLE = yes # Audio output
|
||||
HAPTIC_ENABLE = yes
|
||||
HAPTIC_DRIVER = DRV2605L
|
||||
HAPTIC_DRIVER = drv2605l
|
||||
|
||||
LTO_ENABLE = yes
|
||||
|
|
|
|||
|
|
@ -12,6 +12,6 @@ RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
|
|||
AUDIO_ENABLE = yes # Audio output
|
||||
ENCODER_ENABLE = yes # Rotary encoder
|
||||
HAPTIC_ENABLE = yes # Rumble feefback
|
||||
HAPTIC_DRIVER = DRV2605L # Rumble motor
|
||||
HAPTIC_DRIVER = drv2605l # Rumble motor
|
||||
|
||||
LTO_ENABLE = yes # Link time optimization
|
||||
|
|
|
|||
|
|
@ -35,5 +35,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
#define RATED_VOLTAGE 3
|
||||
#define V_PEAK 5
|
||||
|
||||
#define DRV_GREETING alert_750ms
|
||||
#define DRV_MODE_DEFAULT buzz
|
||||
#define DRV2605L_GREETING alert_750ms
|
||||
#define DRV2605L_DEFAULT_MODE buzz
|
||||
|
|
|
|||
|
|
@ -15,6 +15,6 @@ ENCODER_ENABLE = yes # ENables the use of one or more encoders
|
|||
OLED_ENABLE = yes
|
||||
OLED_DRIVER = SSD1306 # Enables the use of OLED displays
|
||||
HAPTIC_ENABLE = yes # Supported but not included by defaut
|
||||
HAPTIC_DRIVER = DRV2605L
|
||||
HAPTIC_DRIVER = drv2605l
|
||||
|
||||
LTO_ENABLE = yes
|
||||
|
|
|
|||
|
|
@ -14,4 +14,4 @@ AUDIO_ENABLE = no # Audio output
|
|||
KEYBOARD_SHARED_EP = yes # Free up some extra endpoints - needed if console+mouse+extra
|
||||
|
||||
HAPTIC_ENABLE = yes
|
||||
HAPTIC_DRIVER = SOLENOID
|
||||
HAPTIC_DRIVER = solenoid
|
||||
|
|
|
|||
|
|
@ -14,4 +14,4 @@ AUDIO_ENABLE = no # Audio output
|
|||
KEYBOARD_SHARED_EP = yes # Free up some extra endpoints - needed if console+mouse+extra
|
||||
|
||||
HAPTIC_ENABLE = yes
|
||||
HAPTIC_DRIVER = SOLENOID
|
||||
HAPTIC_DRIVER = solenoid
|
||||
|
|
|
|||
|
|
@ -14,4 +14,4 @@ AUDIO_ENABLE = no # Audio output
|
|||
KEYBOARD_SHARED_EP = yes # Free up some extra endpoints - needed if console+mouse+extra
|
||||
|
||||
HAPTIC_ENABLE = yes
|
||||
HAPTIC_DRIVER = SOLENOID
|
||||
HAPTIC_DRIVER = solenoid
|
||||
|
|
|
|||
|
|
@ -14,4 +14,4 @@ AUDIO_ENABLE = no # Audio output
|
|||
KEYBOARD_SHARED_EP = yes # Free up some extra endpoints - needed if console+mouse+extra
|
||||
|
||||
HAPTIC_ENABLE = yes
|
||||
HAPTIC_DRIVER = SOLENOID
|
||||
HAPTIC_DRIVER = solenoid
|
||||
|
|
|
|||
|
|
@ -14,4 +14,4 @@ AUDIO_ENABLE = no # Audio output
|
|||
KEYBOARD_SHARED_EP = yes # Free up some extra endpoints - needed if console+mouse+extra
|
||||
|
||||
HAPTIC_ENABLE = yes
|
||||
HAPTIC_DRIVER = SOLENOID
|
||||
HAPTIC_DRIVER = solenoid
|
||||
|
|
|
|||
|
|
@ -12,4 +12,4 @@ RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
|
|||
AUDIO_ENABLE = no # Audio output
|
||||
|
||||
HAPTIC_ENABLE = yes
|
||||
HAPTIC_DRIVER += SOLENOID
|
||||
HAPTIC_DRIVER = solenoid
|
||||
|
|
|
|||
|
|
@ -11,4 +11,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
|
|||
AUDIO_ENABLE = no # Audio output
|
||||
RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
|
||||
HAPTIC_ENABLE = yes
|
||||
HAPTIC_DRIVER = SOLENOID
|
||||
HAPTIC_DRIVER = solenoid
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue