Skip to content

Commit

Permalink
Fix Doosan exception at initialization
Browse files Browse the repository at this point in the history
  • Loading branch information
visose committed Jan 6, 2025
1 parent 67a6bee commit 97e14e1
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<Product>Robots</Product>
<Version>1.8.0</Version>
<Version>1.9.0</Version>
<Authors>Robots Authors</Authors>
<Description>Create and simulate ABB, KUKA, UR, and Staubli robot programs.</Description>
<PackageTags>Robots;ABB;KUKA;UR;Staubli;Robotics</PackageTags>
Expand Down
7 changes: 7 additions & 0 deletions RELEASE
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
- version: 1.9.0
changes:
- Added support for Igus robot.
- Changed to use .modx extension on Omnicore controllers.
- Fixed digital output declarations in Staubli.
- Fixed Doosan exception at initialization.

- version: 1.8.0
changes:
- Improved Franka Emika inverse kinematics.
Expand Down
2 changes: 1 addition & 1 deletion src/Robots.Grasshopper/Robots.Grasshopper.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<PackageIcon>iconRhino128.png</PackageIcon>
<Description>$(Description) This package is for development of Rhino and Grasshopper plug-ins.</Description>
<PackageTags>$(PackageTags);Rhino;Grasshopper</PackageTags>
<Rhino>7</Rhino>
<Rhino>8</Rhino>
</PropertyGroup>

<ItemGroup>
Expand Down
9 changes: 5 additions & 4 deletions src/Robots/Mechanisms/Mechanism.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,17 @@ internal Mechanism(string model, Manufacturers manufacturer, double payload, Pla
BasePlane = basePlane;
BaseMesh = baseMesh;
MovesRobot = movesRobot;
Joints = InitJoints(joints);
Joints = joints;
InitJoints();
DisplayMesh = CreateDisplayMesh();

SetStartPlanes();
}

Joint[] InitJoints(Joint[] joints)
void InitJoints()
{
var joints = Joints;

var alphas = DefaultAlpha ?? new double[joints.Length];
var thetas = DefaultTheta ?? new double[joints.Length];
var signs = DefaultSign ?? Enumerable.Repeat(1, joints.Length).ToArray();
Expand All @@ -62,8 +65,6 @@ Joint[] InitJoints(Joint[] joints)
range.MakeIncreasing();
joint.Range = range;
}

return joints;
}

Mesh CreateDisplayMesh()
Expand Down
2 changes: 1 addition & 1 deletion src/Robots/RobotArms/RobotDoosan.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ namespace Robots;
public class RobotDoosan : RobotArm
{
internal RobotDoosan(string model, double payload, Plane basePlane, Mesh baseMesh, Joint[] joints)
: base(model, Manufacturers.UR, payload, basePlane, baseMesh, joints) { }
: base(model, Manufacturers.Doosan, payload, basePlane, baseMesh, joints) { }

private protected override MechanismKinematics CreateSolver() => new SphericalWristKinematics(this);

Expand Down

0 comments on commit 97e14e1

Please sign in to comment.