Skip to content

Commit

Permalink
Gamepad bug fixed
Browse files Browse the repository at this point in the history
kin.move_to_straight had an erroneous fourth arg that previously did not do anything.
However a fourth arg was added to kin.xyz_to_jangles which caused it to error.
This fourth arg has been removed.

This bug is not expected to come up anywhere else.
  • Loading branch information
JamesWigglesworth committed May 9, 2018
1 parent 93e9294 commit 3ee4bec
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions user_tools/ezTeach_base.js
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ function Main_Create(){
if(!Kin.is_in_reach(xyz_2, position[1], position[2]) || !Kin.is_in_reach(xyz_1, position[1], position[2])){
//out("Robot limit reached", "blue")
}else{
res = Kin.move_to_straight(xyz_1, xyz_2, position[1], position[2], undefined, resolution, true)
res = Kin.move_to_straight(xyz_1, xyz_2, position[1], position[2], undefined, resolution)
for(let i = 0; i < res[0].length; i++){
if(Kin.is_in_reach(res[0][i], position[1], position[2])){
CMD.push(make_ins("S", "MaxSpeed", speed_factor * joy_mag * max_ang_vel))
Expand Down Expand Up @@ -796,7 +796,7 @@ function Edit_Coors_Run(){
let local_xyz_2 = Vector.add(local_xyz_1, xyzStep)
let xyz_2 = Coor.move_points_to_coor(local_xyz_2, local_coor, base_coor)

res = Kin.move_to_straight(xyz_1, xyz_2, position[1], position[2], undefined, resolution, true)
res = Kin.move_to_straight(xyz_1, xyz_2, position[1], position[2], undefined, resolution)
for(let i = 0; i < res[0].length; i++){
if(Kin.is_in_reach(res[0][i], position[1], position[2])){
CMD.push(make_ins("S", "MaxSpeed", speed_factor * joy_mag * max_ang_vel))
Expand Down Expand Up @@ -1118,4 +1118,5 @@ new Job({name: "ezRun",
clear_output()


} //End of ezTeach_init()
} //End of ezTeach_init()

0 comments on commit 3ee4bec

Please sign in to comment.