From 03144d95fd91d4bdfffd73dd12b6abe23028ea48 Mon Sep 17 00:00:00 2001 From: Dan Royer Date: Thu, 22 Mar 2018 11:59:24 -0700 Subject: [PATCH] fixed acceleration --- stewartPlatform2Firmware/segment.ino | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/stewartPlatform2Firmware/segment.ino b/stewartPlatform2Firmware/segment.ino index 7ffc902..3d0b680 100644 --- a/stewartPlatform2Firmware/segment.ino +++ b/stewartPlatform2Firmware/segment.ino @@ -173,12 +173,12 @@ void recalculate_forward() { int intersection_time(float acceleration,float distance,float start_speed,float end_speed) { -#if 0 +//#if 0 return ( ( 2.0*acceleration*distance - start_speed*start_speed + end_speed*end_speed ) / (4.0*acceleration) ); -#else +/*#else float t2 = ( start_speed - end_speed + acceleration * distance ) / ( 2.0 * acceleration ); return distance - t2; -#endif +#endif*/ }