aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2018-12-06 10:28:43 +0200
committerRoy Ben-Shabat <Roy@Twine-s.com>2018-12-06 10:28:43 +0200
commit297ec486e7fea093acbde7726329371e15f28fde (patch)
tree29659591a185aaf60c251e4b4c9efb3af1c3a6a3
parent59f73fdea8ec23aa6c5482289f9acf96079affc3 (diff)
downloadTango-297ec486e7fea093acbde7726329371e15f28fde.tar.gz
Tango-297ec486e7fea093acbde7726329371e15f28fde.zip
Machine Studio v3.5.78
Added thread motion speed control.
-rw-r--r--Software/Graphics/thread-motion.gifbin0 -> 392831 bytes
-rw-r--r--Software/PMR/Messages/Diagnostics/ThreadJoggingRequest.proto3
-rw-r--r--Software/Visual_Studio/Build/Shortcuts/Machine Emulator.lnkbin1445 -> 1471 bytes
-rw-r--r--Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnkbin1516 -> 1532 bytes
-rw-r--r--Software/Visual_Studio/Build/Shortcuts/Proto Compiler GUI.lnkbin1444 -> 1464 bytes
-rw-r--r--Software/Visual_Studio/Build/Shortcuts/Stubs Execution GUI.lnkbin1322 -> 1462 bytes
-rw-r--r--Software/Visual_Studio/Build/Shortcuts/Transport Router.lnkbin1353 -> 1493 bytes
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DispenserElementEditor.xaml2
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MotorElementEditor.xaml2
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/ThreadMotionElementEditor.xaml72
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Images/thread-motion.gifbin0 -> 392831 bytes
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Tango.MachineStudio.Technician.csproj5
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs9
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs2
-rw-r--r--Software/Visual_Studio/Tango.PMR/Diagnostics/ThreadJoggingRequest.cs38
-rw-r--r--Software/Visual_Studio/Versioning/ChangeLog.txt9
16 files changed, 51 insertions, 91 deletions
diff --git a/Software/Graphics/thread-motion.gif b/Software/Graphics/thread-motion.gif
new file mode 100644
index 000000000..7a94536a2
--- /dev/null
+++ b/Software/Graphics/thread-motion.gif
Binary files differ
diff --git a/Software/PMR/Messages/Diagnostics/ThreadJoggingRequest.proto b/Software/PMR/Messages/Diagnostics/ThreadJoggingRequest.proto
index 7897a6131..8c8a4b94e 100644
--- a/Software/PMR/Messages/Diagnostics/ThreadJoggingRequest.proto
+++ b/Software/PMR/Messages/Diagnostics/ThreadJoggingRequest.proto
@@ -1,12 +1,9 @@
syntax = "proto3";
-import "MotorDirection.proto";
-
package Tango.PMR.Diagnostics;
option java_package = "com.twine.tango.pmr.diagnostics";
message ThreadJoggingRequest
{
- MotorDirection Direction = 1;
double Speed = 3;
} \ No newline at end of file
diff --git a/Software/Visual_Studio/Build/Shortcuts/Machine Emulator.lnk b/Software/Visual_Studio/Build/Shortcuts/Machine Emulator.lnk
index 5a116e8cc..e1c5dad34 100644
--- a/Software/Visual_Studio/Build/Shortcuts/Machine Emulator.lnk
+++ b/Software/Visual_Studio/Build/Shortcuts/Machine Emulator.lnk
Binary files differ
diff --git a/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk b/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk
index b8895c8ca..c7966c7a9 100644
--- a/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk
+++ b/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk
Binary files differ
diff --git a/Software/Visual_Studio/Build/Shortcuts/Proto Compiler GUI.lnk b/Software/Visual_Studio/Build/Shortcuts/Proto Compiler GUI.lnk
index 35e3748c5..3fb2d2136 100644
--- a/Software/Visual_Studio/Build/Shortcuts/Proto Compiler GUI.lnk
+++ b/Software/Visual_Studio/Build/Shortcuts/Proto Compiler GUI.lnk
Binary files differ
diff --git a/Software/Visual_Studio/Build/Shortcuts/Stubs Execution GUI.lnk b/Software/Visual_Studio/Build/Shortcuts/Stubs Execution GUI.lnk
index fd20869c1..8da1d6aa3 100644
--- a/Software/Visual_Studio/Build/Shortcuts/Stubs Execution GUI.lnk
+++ b/Software/Visual_Studio/Build/Shortcuts/Stubs Execution GUI.lnk
Binary files differ
diff --git a/Software/Visual_Studio/Build/Shortcuts/Transport Router.lnk b/Software/Visual_Studio/Build/Shortcuts/Transport Router.lnk
index fd8e11d3f..51ce1a265 100644
--- a/Software/Visual_Studio/Build/Shortcuts/Transport Router.lnk
+++ b/Software/Visual_Studio/Build/Shortcuts/Transport Router.lnk
Binary files differ
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DispenserElementEditor.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DispenserElementEditor.xaml
index 50b4a358a..96f966d20 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DispenserElementEditor.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DispenserElementEditor.xaml
@@ -171,7 +171,7 @@
<StackPanel HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0 0 -65 0">
<Border Background="#202020" CornerRadius="3" Padding="3">
- <mahapps:NumericUpDown BorderThickness="0" Background="Transparent" HideUpDownButtons="True" HasDecimals="False" Minimum="0" Maximum="5000" StringFormat="0" Value="{Binding Speed,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged,StringFormat=0,FallbackValue=5000}" HorizontalAlignment="Center" HorizontalContentAlignment="Center" FontSize="22" VerticalAlignment="Center" Foreground="#FF8585" FontFamily="{StaticResource digital-7}"></mahapps:NumericUpDown>
+ <mahapps:NumericUpDown BorderThickness="0" Background="Transparent" HideUpDownButtons="True" HasDecimals="False" Minimum="0" Maximum="10000" StringFormat="0" Value="{Binding Speed,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged,StringFormat=0,FallbackValue=5000}" HorizontalAlignment="Center" HorizontalContentAlignment="Center" FontSize="22" VerticalAlignment="Center" Foreground="#FF8585" FontFamily="{StaticResource digital-7}"></mahapps:NumericUpDown>
</Border>
<visuals:Knob Width="50" Height="50" TicksHighlightBrush="#FF8585" KnobType="MetroDark" TicksWidth="2" Margin="0 5 0 0" TicksHeight="5" Minimum="0" Maximum="5000" Value="{Binding Speed,Mode=TwoWay}" />
</StackPanel>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MotorElementEditor.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MotorElementEditor.xaml
index 16253937f..ecfea2f28 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MotorElementEditor.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MotorElementEditor.xaml
@@ -155,7 +155,7 @@
<StackPanel HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0 0 -65 5">
<Border Background="#202020" CornerRadius="3" Padding="3">
- <mahapps:NumericUpDown BorderThickness="0" Background="Transparent" HideUpDownButtons="True" HasDecimals="False" Minimum="0" Maximum="5000" StringFormat="0" Value="{Binding Speed,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged,StringFormat=0,FallbackValue=5000}" HorizontalAlignment="Center" HorizontalContentAlignment="Center" FontSize="22" VerticalAlignment="Center" Foreground="#FF8585" FontFamily="{StaticResource digital-7}"></mahapps:NumericUpDown>
+ <mahapps:NumericUpDown BorderThickness="0" Background="Transparent" HideUpDownButtons="True" HasDecimals="False" Minimum="0" Maximum="10000" StringFormat="0" Value="{Binding Speed,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged,StringFormat=0,FallbackValue=5000}" HorizontalAlignment="Center" HorizontalContentAlignment="Center" FontSize="22" VerticalAlignment="Center" Foreground="#FF8585" FontFamily="{StaticResource digital-7}"></mahapps:NumericUpDown>
</Border>
<visuals:Knob Width="50" Height="50" TicksHighlightBrush="#FF8585" KnobType="MetroDark" TicksWidth="2" Margin="0 5 0 0" TicksHeight="5" Minimum="0" Maximum="5000" Value="{Binding Speed,Mode=TwoWay}" />
</StackPanel>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/ThreadMotionElementEditor.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/ThreadMotionElementEditor.xaml
index 51de5dc95..3a7c7d53d 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/ThreadMotionElementEditor.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/ThreadMotionElementEditor.xaml
@@ -4,6 +4,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+ xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls"
xmlns:items="clr-namespace:Tango.MachineStudio.Technician.TechItems"
xmlns:sharedConverters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
xmlns:converters="clr-namespace:Tango.Editors.Converters;assembly=Tango.Editors"
@@ -21,17 +22,6 @@
<SolidColorBrush x:Key="BorderBrush" Color="Transparent"></SolidColorBrush>
<SolidColorBrush x:Key="CornersBrush" Color="Red"></SolidColorBrush>
- <Grid x:Key="gridHoming">
- <DockPanel>
- <Button Click="OnHomingStopped" DockPanel.Dock="Right" Padding="0" Style="{StaticResource MaterialDesignFlatButton}" VerticalAlignment="Center" Margin="0 0 5 0" ToolTip="Stop Homing">
- <materialDesign:PackIcon Kind="Stop" Foreground="#FF5F5F" HorizontalAlignment="Center" VerticalAlignment="Center" Width="32" Height="32" />
- </Button>
- <ProgressBar Foreground="DimGray" BorderBrush="DimGray" Maximum="{Binding HomingMaximumProgress}" BorderThickness="1" Value="{Binding HomingProgress}" VerticalAlignment="Center" Height="10" Margin="5 0 5 0" Background="Transparent">
-
- </ProgressBar>
- </DockPanel>
- </Grid>
-
<Grid x:Key="gridDefault">
<Viewbox Stretch="Fill">
<materialDesign:PackIcon Kind="Home" Margin="25 0" HorizontalAlignment="Center" VerticalAlignment="Center" Width="24" Height="24" Foreground="#202020" />
@@ -47,40 +37,42 @@
<Grid>
- <Grid Margin="5">
- <Grid.ColumnDefinitions>
- <ColumnDefinition Width="20*"/>
- <ColumnDefinition Width="100*"/>
- <ColumnDefinition Width="20*"/>
- </Grid.ColumnDefinitions>
+ <Viewbox Stretch="Uniform">
+ <Grid Margin="5" Width="530" Height="280">
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="100*"/>
+ <ColumnDefinition Width="20*"/>
+ </Grid.ColumnDefinitions>
- <Grid Grid.Column="1">
- <Border BorderThickness="1" BorderBrush="Gray" CornerRadius="5">
+ <Grid Grid.Column="0">
+ <Border BorderThickness="1" BorderBrush="#303030" CornerRadius="10" Background="#252525">
- <Grid>
- <Image x:Name="image" Margin="5" gif:ImageBehavior.AnimatedSource="../Images/cogs-small.gif" RenderOptions.BitmapScalingMode="Fant" gif:ImageBehavior.AutoStart="False" gif:ImageBehavior.AnimateInDesignMode="True" gif:ImageBehavior.RepeatBehavior="Forever"></Image>
- </Grid>
- </Border>
- </Grid>
-
- <Grid>
- <Border BorderBrush="Gray" BorderThickness="1 1 0 1" Margin="0 10" CornerRadius="5 0 0 5" PreviewMouseDown="OnBackwardPressed" PreviewMouseUp="OnBackwardReleased" Style="{StaticResource TechWidgetBorderLeft}">
+ <Grid>
+ <Image x:Name="image" Margin="5" RenderTransformOrigin="0.5,0.5" gif:ImageBehavior.AnimatedSource="../Images/thread-motion.gif" RenderOptions.BitmapScalingMode="Fant" gif:ImageBehavior.AutoStart="False" gif:ImageBehavior.AnimateInDesignMode="True" gif:ImageBehavior.RepeatBehavior="Forever">
+ <Image.RenderTransform>
+ <RotateTransform Angle="90" />
+ </Image.RenderTransform>
+ </Image>
+ </Grid>
+ </Border>
+ </Grid>
+ <Grid Grid.Column="2">
+ <Border BorderBrush="Gray" BorderThickness="0 1 1 1" Margin="0 10" CornerRadius="0 10 10 0" PreviewMouseDown="OnForwardPressed" PreviewMouseUp="OnForwardReleased" Style="{StaticResource TechWidgetBorderRight}">
- <Viewbox Stretch="Fill" Margin="-5 20">
- <materialDesign:PackIcon Kind="ChevronDoubleLeft" HorizontalAlignment="Center" VerticalAlignment="Center" Width="24" Height="24" Foreground="Gainsboro" />
- </Viewbox>
- </Border>
+ <Viewbox Stretch="Fill" Margin="-5 20">
+ <materialDesign:PackIcon Kind="ChevronDoubleRight" HorizontalAlignment="Center" VerticalAlignment="Center" Width="24" Height="24" Foreground="Gainsboro" />
+ </Viewbox>
+ </Border>
+ </Grid>
</Grid>
+ </Viewbox>
- <Grid Grid.Column="2">
- <Border BorderBrush="Gray" BorderThickness="0 1 1 1" Margin="0 10" CornerRadius="0 10 10 0" PreviewMouseDown="OnForwardPressed" PreviewMouseUp="OnForwardReleased" Style="{StaticResource TechWidgetBorderRight}">
-
- <Viewbox Stretch="Fill" Margin="-5 20">
- <materialDesign:PackIcon Kind="ChevronDoubleRight" HorizontalAlignment="Center" VerticalAlignment="Center" Width="24" Height="24" Foreground="Gainsboro" />
- </Viewbox>
- </Border>
- </Grid>
- </Grid>
+ <StackPanel HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0 0 -65 5">
+ <Border Background="#202020" CornerRadius="3" Padding="3">
+ <mahapps:NumericUpDown BorderThickness="0" Background="Transparent" HideUpDownButtons="True" HasDecimals="False" Minimum="0" Maximum="10000" StringFormat="0" Value="{Binding Speed,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged,StringFormat=0,FallbackValue=5000}" HorizontalAlignment="Center" HorizontalContentAlignment="Center" FontSize="22" VerticalAlignment="Center" Foreground="#FF8585" FontFamily="{StaticResource digital-7}"></mahapps:NumericUpDown>
+ </Border>
+ <visuals:Knob Width="50" Height="50" TicksHighlightBrush="#FF8585" KnobType="MetroDark" TicksWidth="2" Margin="0 5 0 0" TicksHeight="5" Minimum="0" Maximum="5000" Value="{Binding Speed,Mode=TwoWay}" />
+ </StackPanel>
<!--Content-->
<Grid>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Images/thread-motion.gif b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Images/thread-motion.gif
new file mode 100644
index 000000000..7a94536a2
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Images/thread-motion.gif
Binary files differ
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Tango.MachineStudio.Technician.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Tango.MachineStudio.Technician.csproj
index 4cb8c5cee..9de8dd5d8 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Tango.MachineStudio.Technician.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Tango.MachineStudio.Technician.csproj
@@ -722,10 +722,13 @@
<ItemGroup>
<Resource Include="Images\valve.png" />
</ItemGroup>
+ <ItemGroup>
+ <Resource Include="Images\thread-motion.gif" />
+ </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ProjectExtensions>
<VisualStudio>
- <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
+ <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
</VisualStudio>
</ProjectExtensions>
</Project> \ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
index 605ab8105..adf85516e 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
@@ -1553,14 +1553,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
{
await MachineOperator.StartThreadJogging(new ThreadJoggingRequest()
{
- Direction = MotorDirection.Forward,
- });
- }
- else if (action == MotorActionType.BackwardPressed)
- {
- await MachineOperator.StartThreadJogging(new ThreadJoggingRequest()
- {
- Direction = MotorDirection.Backward,
+ Speed = item.Speed,
});
}
else if (action == MotorActionType.ForwardReleased || action == MotorActionType.BackwardReleased)
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs
index 8f111100e..701fd50b9 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs
@@ -4,5 +4,5 @@ using System.Runtime.InteropServices;
[assembly: System.Windows.ThemeInfo(System.Windows.ResourceDictionaryLocation.None, System.Windows.ResourceDictionaryLocation.SourceAssembly)]
[assembly: AssemblyTitle("Tango - Machine Studio")]
-[assembly: AssemblyVersion("3.5.77.18305")]
+[assembly: AssemblyVersion("3.5.78.18305")]
[assembly: ComVisible(false)] \ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.PMR/Diagnostics/ThreadJoggingRequest.cs b/Software/Visual_Studio/Tango.PMR/Diagnostics/ThreadJoggingRequest.cs
index 34d9e4bec..a320c6885 100644
--- a/Software/Visual_Studio/Tango.PMR/Diagnostics/ThreadJoggingRequest.cs
+++ b/Software/Visual_Studio/Tango.PMR/Diagnostics/ThreadJoggingRequest.cs
@@ -23,14 +23,12 @@ namespace Tango.PMR.Diagnostics {
byte[] descriptorData = global::System.Convert.FromBase64String(
string.Concat(
"ChpUaHJlYWRKb2dnaW5nUmVxdWVzdC5wcm90bxIVVGFuZ28uUE1SLkRpYWdu",
- "b3N0aWNzGhRNb3RvckRpcmVjdGlvbi5wcm90byJfChRUaHJlYWRKb2dnaW5n",
- "UmVxdWVzdBI4CglEaXJlY3Rpb24YASABKA4yJS5UYW5nby5QTVIuRGlhZ25v",
- "c3RpY3MuTW90b3JEaXJlY3Rpb24SDQoFU3BlZWQYAyABKAFCIQofY29tLnR3",
- "aW5lLnRhbmdvLnBtci5kaWFnbm9zdGljc2IGcHJvdG8z"));
+ "b3N0aWNzIiUKFFRocmVhZEpvZ2dpbmdSZXF1ZXN0Eg0KBVNwZWVkGAMgASgB",
+ "QiEKH2NvbS50d2luZS50YW5nby5wbXIuZGlhZ25vc3RpY3NiBnByb3RvMw=="));
descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
- new pbr::FileDescriptor[] { global::Tango.PMR.Diagnostics.MotorDirectionReflection.Descriptor, },
+ new pbr::FileDescriptor[] { },
new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
- new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Diagnostics.ThreadJoggingRequest), global::Tango.PMR.Diagnostics.ThreadJoggingRequest.Parser, new[]{ "Direction", "Speed" }, null, null, null)
+ new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Diagnostics.ThreadJoggingRequest), global::Tango.PMR.Diagnostics.ThreadJoggingRequest.Parser, new[]{ "Speed" }, null, null, null)
}));
}
#endregion
@@ -61,7 +59,6 @@ namespace Tango.PMR.Diagnostics {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public ThreadJoggingRequest(ThreadJoggingRequest other) : this() {
- direction_ = other.direction_;
speed_ = other.speed_;
}
@@ -70,17 +67,6 @@ namespace Tango.PMR.Diagnostics {
return new ThreadJoggingRequest(this);
}
- /// <summary>Field number for the "Direction" field.</summary>
- public const int DirectionFieldNumber = 1;
- private global::Tango.PMR.Diagnostics.MotorDirection direction_ = 0;
- [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
- public global::Tango.PMR.Diagnostics.MotorDirection Direction {
- get { return direction_; }
- set {
- direction_ = value;
- }
- }
-
/// <summary>Field number for the "Speed" field.</summary>
public const int SpeedFieldNumber = 3;
private double speed_;
@@ -105,7 +91,6 @@ namespace Tango.PMR.Diagnostics {
if (ReferenceEquals(other, this)) {
return true;
}
- if (Direction != other.Direction) return false;
if (Speed != other.Speed) return false;
return true;
}
@@ -113,7 +98,6 @@ namespace Tango.PMR.Diagnostics {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public override int GetHashCode() {
int hash = 1;
- if (Direction != 0) hash ^= Direction.GetHashCode();
if (Speed != 0D) hash ^= Speed.GetHashCode();
return hash;
}
@@ -125,10 +109,6 @@ namespace Tango.PMR.Diagnostics {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public void WriteTo(pb::CodedOutputStream output) {
- if (Direction != 0) {
- output.WriteRawTag(8);
- output.WriteEnum((int) Direction);
- }
if (Speed != 0D) {
output.WriteRawTag(25);
output.WriteDouble(Speed);
@@ -138,9 +118,6 @@ namespace Tango.PMR.Diagnostics {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public int CalculateSize() {
int size = 0;
- if (Direction != 0) {
- size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Direction);
- }
if (Speed != 0D) {
size += 1 + 8;
}
@@ -152,9 +129,6 @@ namespace Tango.PMR.Diagnostics {
if (other == null) {
return;
}
- if (other.Direction != 0) {
- Direction = other.Direction;
- }
if (other.Speed != 0D) {
Speed = other.Speed;
}
@@ -168,10 +142,6 @@ namespace Tango.PMR.Diagnostics {
default:
input.SkipLastField();
break;
- case 8: {
- direction_ = (global::Tango.PMR.Diagnostics.MotorDirection) input.ReadEnum();
- break;
- }
case 25: {
Speed = input.ReadDouble();
break;
diff --git a/Software/Visual_Studio/Versioning/ChangeLog.txt b/Software/Visual_Studio/Versioning/ChangeLog.txt
index 7a01989a7..b253be8b8 100644
--- a/Software/Visual_Studio/Versioning/ChangeLog.txt
+++ b/Software/Visual_Studio/Versioning/ChangeLog.txt
@@ -1,9 +1,14 @@
# Change log
All notable changes to the core libraries will be documented in this file.
-## [3.5.77] - 12-95-2018
+## [3.5.77] - 12-05-2018
### Changed
- Statistics module 'Job Failed Reasons' pie chart displays failed message only when hovering.
### Added
-- Option to allow BETA updates on 'About View'. \ No newline at end of file
+- Option to allow BETA updates on 'About View'.
+
+
+## [3.5.78] - 12-06-2018
+### Changed
+- Improved thread motion widget on tech board. \ No newline at end of file