SymbX/feedbackd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vibra-periodic: Honor max strength

Browse Source 
Since we scale down the magnitude we also scale down the fade in level
to keep the ratio between the two the same.

Closes: https://source.puri.sm/Librem5/feedbackd/-/issues/84

Signed-off-by: Guido Günther <agx@sigxcpu.org>
This commit is contained in:
Guido Günther
2025-03-09 12:28:08 +01:00
parent 6d6cd905fc
commit 41c1521790
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/fbd-feedback-vibra-periodic.c
+14 -6
View File
@@ -7,6 +7,7 @@
#define G_LOG_DOMAIN "fbd-feedback-vibra-periodic" #define G_LOG_DOMAIN "fbd-feedback-vibra-periodic"
#include "fbd-enums.h" #include "fbd-enums.h"
#include "fbd-feedback-vibra-priv.h"
#include "fbd-feedback-vibra-periodic.h" #include "fbd-feedback-vibra-periodic.h"
#include "fbd-feedback-manager.h" #include "fbd-feedback-manager.h"
@@ -20,6 +21,8 @@
* #FbdDevVibra for that. * #FbdDevVibra for that.
*/ */
#define MAX_MAGNITUDE 0xFFFF
enum { enum {
PROP_0, PROP_0,
PROP_MAGNITUDE, PROP_MAGNITUDE,
@@ -103,13 +106,18 @@ fbd_feedback_vibra_periodic_start_vibra (FbdFeedbackVibra *vibra)
FbdFeedbackManager *manager = fbd_feedback_manager_get_default (); FbdFeedbackManager *manager = fbd_feedback_manager_get_default ();
FbdDevVibra *dev = fbd_feedback_manager_get_dev_vibra (manager); FbdDevVibra *dev = fbd_feedback_manager_get_dev_vibra (manager);
guint duration = fbd_feedback_vibra_get_duration (vibra); guint duration = fbd_feedback_vibra_get_duration (vibra);
double max_strength = fbd_feedback_vibra_get_max_strength (FBD_FEEDBACK_VIBRA (self));
double fade_in_ratio = (double)self->fade_in_level / self->magnitude;
guint max_magnitude, fade_in_level;
g_return_if_fail (FBD_IS_DEV_VIBRA (dev)); g_return_if_fail (FBD_IS_DEV_VIBRA (dev));
g_debug ("Periodic Vibra: %d %d %d %d", max_magnitude = MIN (MAX_MAGNITUDE * max_strength, self->magnitude);
duration, self->magnitude, self->fade_in_level, self->fade_in_time); fade_in_level = MIN (max_magnitude * fade_in_ratio, self->fade_in_level);
fbd_dev_vibra_periodic (dev, duration, self->magnitude, self->fade_in_level, g_debug ("Periodic Vibra: %d %d %d %d",
self->fade_in_time); duration, max_magnitude, fade_in_level, self->fade_in_time);
fbd_dev_vibra_periodic (dev, duration, max_magnitude, fade_in_level, self->fade_in_time);
} }
static gboolean static gboolean
@@ -141,7 +149,7 @@ fbd_feedback_vibra_periodic_class_init (FbdFeedbackVibraPeriodicClass *klass)
"magnitude", "magnitude",
"Magnitude", "Magnitude",
"total magnitude", "total magnitude",
0, 0xFFFF, 0x7FFF, 0, MAX_MAGNITUDE, 0x7FFF,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
props[PROP_FADE_IN_TIME] = props[PROP_FADE_IN_TIME] =
@@ -157,7 +165,7 @@ fbd_feedback_vibra_periodic_class_init (FbdFeedbackVibraPeriodicClass *klass)
"fade-in-level", "fade-in-level",
"Fade in level", "Fade in level",
"Fade in start level", "Fade in start level",
0, 0xFFFF, 0x7FFF, 0, MAX_MAGNITUDE, 0x7FFF,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
g_object_class_install_properties (object_class, PROP_LAST_PROP, props); g_object_class_install_properties (object_class, PROP_LAST_PROP, props);