Skip to content

Commit

Permalink
Merge branch 'platform6.5'
Browse files Browse the repository at this point in the history
  • Loading branch information
Peter-Simpson committed Jul 16, 2020
2 parents 8e7b529 + 1c73957 commit 47fc305
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 19 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ class DeviceRotator

#region IRotator Implementation

private float rotatorPosition = 0; // Synced or mechanical position angle of the rotator depending on the value of CanSync
private float mechanicalPosition = 0; // Mechanical position angle of the rotator
private float rotatorPosition = 0; // Synced or mechanical position angle of the rotator
private float mechanicalPosition = 0; // Mechanical position angle of the rotator

public bool CanReverse
{
Expand Down Expand Up @@ -100,15 +100,6 @@ public float TargetPosition

// IRotatorV3 methods

public bool CanSync
{
get
{
tl.LogMessage("CanSync Get", false.ToString());
return false;
}
}

public float MechanicalPosition
{
get
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Class DeviceRotator

#Region "IRotator Implementation"

Private rotatorPosition As Single = 0 ' Synced or mechanical position angle of the rotator depending on the value of CanSync
Private rotatorPosition As Single = 0 ' Synced or mechanical position angle of the rotator
Private rotatorMechanicalPosition As Single = 0 ' Mechanical position angle Of the rotator

Public ReadOnly Property CanReverse() As Boolean Implements IRotatorV3.CanReverse
Expand Down Expand Up @@ -83,13 +83,6 @@ Class DeviceRotator

' IRotatorV3 methods

Public ReadOnly Property CanSync As Boolean Implements IRotatorV3.CanSync
Get
TL.LogMessage("CanSync Get", False.ToString())
Return False
End Get
End Property

Public ReadOnly Property MechanicalPosition As Single Implements IRotatorV3.MechanicalPosition
Get
TL.LogMessage("MechanicalPosition Get", rotatorMechanicalPosition.ToString())
Expand Down

0 comments on commit 47fc305

Please sign in to comment.