diff --git a/python/examples/fixes_for_demo.md b/python/examples/fixes_for_demo.md index aa3489dbc6667a453d0c105c92eb56c559eb37b8..6a80169b6c6d89dd46f8b44f67efca0afb5851e1 100644 --- a/python/examples/fixes_for_demo.md +++ b/python/examples/fixes_for_demo.md @@ -1,3 +1,6 @@ +THERE WAS A NORM IN THE ERROR TERM IN MOVEJ THAT'S WHY IT KEPT GOING FORWARD +GOD DAMN IT +thank you jesus for showing me that one, good lord thank you 1. i'm pretty sure why it goes so far with movej is because you gave it a tight error. well, give it a lax error then. atm there is a single instance where you're running this command, so it's fine, you cares. bottom line is, be above the starting point, and then go down with diff --git a/python/ur_simple_control/basics/basics.py b/python/ur_simple_control/basics/basics.py index 20189aba72e996c68b77df0fa2e23b97744c7b39..748cd9eb7beba6994d26dffec9d0b856eab6ae96 100644 --- a/python/ur_simple_control/basics/basics.py +++ b/python/ur_simple_control/basics/basics.py @@ -25,13 +25,15 @@ def moveJControlLoop(q_desired, robot, i, past_data): q = q[:6] q_error = q_desired - q - # STOP MUCH BEFORE YOU NEED TO + # STOP MUCH BEFORE YOU NEED TO FOR THE DEMO # EVEN THIS MIGHT BE TOO MUCH - if np.linalg.norm(q_error) < 1e-1: + # TODO fix later obviously + if np.linalg.norm(q_error) < 1e-3: breakFlag = True # stupid hack, for the love of god remove this # but it should be small enough lel - qd = q_error / (np.linalg.norm(q_error) *14) + # there. fixed. tko radi taj i grijesi, al jebemu zivot sta je to bilo + qd = q_error * robot.dt robot.sendQd(qd) return breakFlag, {}, {}