Fixing constant force filter

Ultrawipf · Ultrawipf · commit 7a247d15ab78 · 2022-06-09T16:19:11.000+02:00
diff --git a/Firmware/FFBoard/Inc/constants.h b/Firmware/FFBoard/Inc/constants.h
@@ -11,7 +11,7 @@
 
 
 
-static const uint8_t SW_VERSION_INT[3] = {1,8,6}; // Version as array. 8 bit each!
+static const uint8_t SW_VERSION_INT[3] = {1,8,7}; // Version as array. 8 bit each!
 
 #define MAX_AXIS 2 // ONLY USE 2 for now else screws HID Reports
 
diff --git a/Firmware/FFBoard/Src/EffectsCalculator.cpp b/Firmware/FFBoard/Src/EffectsCalculator.cpp
@@ -331,7 +331,7 @@ int32_t EffectsCalculator::calcComponentForce(FFB_Effect *effect, int32_t forceV
 		// Optional filtering to reduce spikes
 		if (cfFilter_f < calcfrequency / 2 && cfFilter_f != 0 )
 		{
-			result_torque = effect->filter[con_idx]->process(forceVector);
+			forceVector = effect->filter[con_idx]->process(forceVector);
 		}
 	}
 	case FFB_EFFECT_RAMP:

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`
`12`	`12`
`13`	`13`
`14`		`-static const uint8_t SW_VERSION_INT[3] = {1,8,6}; // Version as array. 8 bit each!`
	`14`	`+static const uint8_t SW_VERSION_INT[3] = {1,8,7}; // Version as array. 8 bit each!`
`15`	`15`
`16`	`16`	`#define MAX_AXIS 2 // ONLY USE 2 for now else screws HID Reports`
`17`	`17`
Original file line number	Diff line number	Diff line change
`@@ -331,7 +331,7 @@ int32_t EffectsCalculator::calcComponentForce(FFB_Effect *effect, int32_t forceV`
`331`	`331`	`// Optional filtering to reduce spikes`
`332`	`332`	`if (cfFilter_f < calcfrequency / 2 && cfFilter_f != 0 )`
`333`	`333`	`{`
`334`		`- result_torque = effect->filter[con_idx]->process(forceVector);`
	`334`	`+ forceVector = effect->filter[con_idx]->process(forceVector);`
`335`	`335`	`}`
`336`	`336`	`}`
`337`	`337`	`case FFB_EFFECT_RAMP:`