Merge branch 'felis:master' into master

This commit is contained in:
Dennis Frett 2024-02-06 22:13:27 +01:00 committed by GitHub
commit 869f0838ea
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -152,7 +152,7 @@ public:
* @param frequency Vibration frequency of the trigger * @param frequency Vibration frequency of the trigger
*/ */
void setTriggerForceEffect(uint8_t start, bool keep, uint8_t begin_force, uint8_t mid_force, uint8_t end_force, uint8_t frequency) { void setTriggerForceEffect(uint8_t start, bool keep, uint8_t begin_force, uint8_t mid_force, uint8_t end_force, uint8_t frequency) {
data.effectType = EffectType::SectionResitance; data.effectType = EffectType::EffectEx;
data.EffectEx.startPosition = start; data.EffectEx.startPosition = start;
data.EffectEx.keepEffect = keep; data.EffectEx.keepEffect = keep;
data.EffectEx.beginForce = begin_force; data.EffectEx.beginForce = begin_force;