diff options
| author | Roy <roy.mail.net@gmail.com> | 2018-02-03 14:31:17 +0200 |
|---|---|---|
| committer | Roy <roy.mail.net@gmail.com> | 2018-02-03 14:31:17 +0200 |
| commit | 9fa032b7aea6f2fbfdae05d21c3c10db174e1662 (patch) | |
| tree | 86c6ad4309bddc7d0641d344584998bc51a22722 | |
| parent | be23e3a8def254ecb161ad21d82024987097ba1d (diff) | |
| download | Tango-9fa032b7aea6f2fbfdae05d21c3c10db174e1662.tar.gz Tango-9fa032b7aea6f2fbfdae05d21c3c10db174e1662.zip | |
Same as previous..
40 files changed, 571 insertions, 2786 deletions
diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf Binary files differindex 68b085631..1d7afd781 100644 --- a/Software/DB/Tango.mdf +++ b/Software/DB/Tango.mdf diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf Binary files differindex 00c57b0bd..bacb454a8 100644 --- a/Software/DB/Tango_log.ldf +++ b/Software/DB/Tango_log.ldf diff --git a/Software/Fonts/digital-7/digital-7 (italic).ttf b/Software/Fonts/digital-7/digital-7 (italic).ttf Binary files differnew file mode 100644 index 000000000..5a98d7a62 --- /dev/null +++ b/Software/Fonts/digital-7/digital-7 (italic).ttf diff --git a/Software/Fonts/digital-7/digital-7 (mono italic).ttf b/Software/Fonts/digital-7/digital-7 (mono italic).ttf Binary files differnew file mode 100644 index 000000000..a01db8a5d --- /dev/null +++ b/Software/Fonts/digital-7/digital-7 (mono italic).ttf diff --git a/Software/Fonts/digital-7/digital-7 (mono).ttf b/Software/Fonts/digital-7/digital-7 (mono).ttf Binary files differnew file mode 100644 index 000000000..a481b97b4 --- /dev/null +++ b/Software/Fonts/digital-7/digital-7 (mono).ttf diff --git a/Software/Fonts/digital-7/digital-7.ttf b/Software/Fonts/digital-7/digital-7.ttf Binary files differnew file mode 100644 index 000000000..5dbe6f908 --- /dev/null +++ b/Software/Fonts/digital-7/digital-7.ttf diff --git a/Software/Fonts/digital-7/readme.txt b/Software/Fonts/digital-7/readme.txt new file mode 100644 index 000000000..6894c2408 --- /dev/null +++ b/Software/Fonts/digital-7/readme.txt @@ -0,0 +1,73 @@ +True Type Fonts: DIGITAL-7 version 1.02 + + +EULA +-==- +The fonts Digital-7 is freeware for home using. + + +DESCRIPTION +-=========- + +This font created specially for program Calculator-7 (download shareware version: http://www.styleseven.com/ and use 7 days fo free). + +The program Calculator-7 offers you the following possibilities: +* calculate using seven operator: addition, subtraction, multiply, divide, percent, square root, 1 divide to X; +* set decimal position (0, 2, 3, float) and round type (up, mathematical, down); +* customize an appearance of work window: scale, fonts for digital panel and buttons, background color; +* customize an appearance of number in digital panel: leading zero for decimal, thousand separator, decimal separator, digit grouping; +* calculate total from clipboard (copy data to clipboard from table or text and press one button). + + +Files in digital-7_font.zip: + readme.txt this file; + digital-7.ttf digital-7 regular font; + digital-7 (italic).ttf digital-7 italic font; + digital-7 (mono).ttf digital-7 mono font; + digital-7 (mono italic).ttf digital-7 mono font. + +Please visit http://www.styleseven.com/ for download our other products as freeware as shareware. +We will welcome any useful suggestions and comments; please send them to ms-7@styleseven.com + + +FREEWARE USE (NOTES) +-=================- +Also you may: + * Use the font in freeware software (credit needed); + * Use the font for your education process. + + +COMMERCIAL OR BUSINESS USE +-========================- + +You can buy font for commercial use here ($24.95): http://store.esellerate.net/s.aspx?s=STR0331655240 +You may: + * Include the font to your installation; + * Use one license up to 100 computers in your office. +Please contact us for any questions. + + +WHAT IS NEW? +-==========- + + Version 1.01 April 05 2009 + -------------------------- + * Change Typeface name for fonts "Digital-7 (mono)" and "Digital-7 (italic)" (now available all fonts for select in application, for example Word Pad). + * Corrected symbol ':'. + + Version 1.01 April 07 2011 + -------------------------- + * Embedding is allowed. + + Version 1.1 June 07 2013 + -------------------------- + * Mono Italic font is added. + + +AUTHOR +-====- + +Sizenko Alexander +Style-7 +http://www.styleseven.com +Created: October 7 2008
\ No newline at end of file diff --git a/Software/PMR/Messages/Common/DoubleArray.proto b/Software/PMR/Messages/Common/DoubleArray.proto new file mode 100644 index 000000000..7543364da --- /dev/null +++ b/Software/PMR/Messages/Common/DoubleArray.proto @@ -0,0 +1,9 @@ +syntax = "proto3"; + +package Tango.PMR.Common; +option java_package = "com.twine.tango.pmr.common"; + +message DoubleArray +{ + repeated double Data = 1; +}
\ No newline at end of file diff --git a/Software/PMR/Messages/Common/KeepAliveRequest.proto b/Software/PMR/Messages/Common/KeepAliveRequest.proto index fb47ee43c..a488b4f26 100644 --- a/Software/PMR/Messages/Common/KeepAliveRequest.proto +++ b/Software/PMR/Messages/Common/KeepAliveRequest.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -package Tango.PMR.common; +package Tango.PMR.Common; option java_package = "com.twine.tango.pmr.common"; message KeepAliveRequest diff --git a/Software/PMR/Messages/Common/KeepAliveResponse.proto b/Software/PMR/Messages/Common/KeepAliveResponse.proto index 3a5f73f31..78ec5b296 100644 --- a/Software/PMR/Messages/Common/KeepAliveResponse.proto +++ b/Software/PMR/Messages/Common/KeepAliveResponse.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -package Tango.PMR.common; +package Tango.PMR.Common; option java_package = "com.twine.tango.pmr.common"; message KeepAliveResponse diff --git a/Software/PMR/Messages/Common/MessageType.proto b/Software/PMR/Messages/Common/MessageType.proto index b53e1e0a3..bbdbe6505 100644 --- a/Software/PMR/Messages/Common/MessageType.proto +++ b/Software/PMR/Messages/Common/MessageType.proto @@ -5,16 +5,8 @@ option java_package = "com.twine.tango.pmr.common"; enum MessageType { - //Common - RGB = 0; - Job = 1; - Segment = 2; - //Hardware - //Dispenser; - //Motor; - //Gradient; - - + //The first enum value must be zero so.. + None = 0; //Stubs CalculateRequest = 3; @@ -52,16 +44,6 @@ enum MessageType StubExtFlashWriteRequest = 35; StubExtFlashWriteResponse = 36; - //work - //Hardware = 200; - Dispenser = 200; - Motor = 201; - Gradient = 202; - Dancer = 203; - InternalWinder = 204; - Dispense = 205; - SegmentGradient = 206; - //Integration ExternalBridgeUdpDiscoveryPacket = 1000; @@ -74,9 +56,10 @@ enum MessageType KeepAliveRequest = 1007; KeepAliveResponse = 1008; + //Diagnostics - StartDiagnosticsRequest = 2000; - StartDiagnosticsResponse = 2001; + PushDiagnosticsRequest = 2000; + PushDiagnosticsResponse = 2001; ReportRequest = 2002; ReportResponse = 2003; StatusResponse = 2004; diff --git a/Software/PMR/Messages/Diagnostics/PushDiagnosticsRequest.proto b/Software/PMR/Messages/Diagnostics/PushDiagnosticsRequest.proto index 2148bb18e..c2dc51b19 100644 --- a/Software/PMR/Messages/Diagnostics/PushDiagnosticsRequest.proto +++ b/Software/PMR/Messages/Diagnostics/PushDiagnosticsRequest.proto @@ -3,7 +3,7 @@ syntax = "proto3"; package Tango.PMR.Diagnostics; option java_package = "com.twine.tango.pmr.diagnostics"; -message StartDiagnosticsRequest +message PushDiagnosticsRequest { bool PushSensors = 1; bool PushMotors = 2; diff --git a/Software/PMR/Messages/Diagnostics/PushDiagnosticsResponse.proto b/Software/PMR/Messages/Diagnostics/PushDiagnosticsResponse.proto index b6e81c257..c5779d382 100644 --- a/Software/PMR/Messages/Diagnostics/PushDiagnosticsResponse.proto +++ b/Software/PMR/Messages/Diagnostics/PushDiagnosticsResponse.proto @@ -3,9 +3,12 @@ syntax = "proto3"; package Tango.PMR.Diagnostics; option java_package = "com.twine.tango.pmr.diagnostics"; -message StartDiagnosticsResponse +import "DoubleArray.proto"; + +message PushDiagnosticsResponse { repeated double Dancer1Angle = 1; repeated double Dancer2Angle = 2; repeated double Dancer3Angle = 3; + repeated PMR.Common.DoubleArray DispensersMotorsFrequency = 4; }
\ No newline at end of file diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs index 4f045627d..08b8897d2 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs @@ -22,6 +22,7 @@ using Tango.Video.DirectCapture; using Tango.Integration.Operators; using Tango.PMR.Diagnostics; using System.Reflection; +using Tango.PMR.Common; namespace Tango.MachineStudio.Developer.ViewModels { @@ -470,7 +471,7 @@ namespace Tango.MachineStudio.Developer.ViewModels } } - private void MachineOperator_DiagnosticsDataAvailable(object sender, StartDiagnosticsResponse response) + private void MachineOperator_DiagnosticsDataAvailable(object sender, PushDiagnosticsResponse response) { foreach (var prop in response.GetType().GetProperties(BindingFlags.Public | BindingFlags.Instance)) { @@ -485,7 +486,8 @@ namespace Tango.MachineStudio.Developer.ViewModels } else { - //Multi Graph... + DoubleArray[] arrayOfDoubles = Enumerable.ToArray(prop.GetValue(response) as IEnumerable<DoubleArray>); + (controller as GraphMultiController).PushData(arrayOfDoubles.Select(x => x.Data.ToList()).ToList()); } } } @@ -911,11 +913,13 @@ namespace Tango.MachineStudio.Developer.ViewModels for (int i = 0; i < sensor.ChannelCount; i++) { + var randomColor = new SolidColorBrush(Core.Helpers.ColorHelper.GetRandomColor()); + (controller as GraphMultiController).AddSeries(new DataYSeries() { Name = sensor.Description.First().ToString() + (i + 1), UseFillAndStroke = true, - Stroke = new SolidColorBrush(Core.Helpers.ColorHelper.GetRandomColor()) + Stroke = randomColor }); } diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml index cf5d1e19e..65837bcf1 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml @@ -211,7 +211,7 @@ </Grid> <StackPanel DockPanel.Dock="Right"> <StackPanel Orientation="Horizontal"> - <TextBlock VerticalAlignment="Center" FontSize="30" FontFamily="digital-7" Margin="0 0 40 0" Foreground="#FF6464" Width="100" Text="{Binding RunningJobRemainingTime,StringFormat=hh\\:mm\\:ss}"></TextBlock> + <TextBlock VerticalAlignment="Center" FontSize="30" FontFamily="{StaticResource digital-7}" Margin="0 0 40 0" Foreground="#FF6464" Width="100" Text="{Binding RunningJobRemainingTime,StringFormat=hh\\:mm\\:ss}"></TextBlock> <Button Height="40" Width="170" Command="{Binding StopJobCommand}" Background="#FF6464" BorderBrush="#FF6464"> <StackPanel Orientation="Horizontal"> @@ -579,68 +579,104 @@ </Style.Triggers> </Style> </Border.Style> - <DockPanel> - <TextBox materialDesign:HintAssist.Hint="Table Name" DockPanel.Dock="Top" Text="{Binding Name}"></TextBox> - <WrapPanel Orientation="Vertical" Margin="0 5 0 0"> - <WrapPanel.Resources> - <Style TargetType="TextBlock" BasedOn="{StaticResource {x:Type TextBlock}}"> - <Setter Property="FontSize" Value="10"></Setter> - <Setter Property="Foreground" Value="#7A7A7A"></Setter> - <Setter Property="Margin" Value="0 5 0 5"></Setter> - <Setter Property="MinWidth" Value="80"></Setter> - </Style> + <Grid> + <DockPanel> + <TextBox materialDesign:HintAssist.Hint="Table Name" DockPanel.Dock="Top" Text="{Binding Name}"></TextBox> + <WrapPanel Orientation="Vertical" Margin="0 5 0 0"> + <WrapPanel.Resources> + <Style TargetType="TextBlock" BasedOn="{StaticResource {x:Type TextBlock}}"> + <Setter Property="FontSize" Value="10"></Setter> + <Setter Property="Foreground" Value="#7A7A7A"></Setter> + <Setter Property="Margin" Value="0 5 0 5"></Setter> + <Setter Property="MinWidth" Value="80"></Setter> + </Style> - <Style TargetType="mahapps:NumericUpDown"> - <Setter Property="FontFamily" Value="digital-7"></Setter> - </Style> + <Style TargetType="mahapps:NumericUpDown"> + <Setter Property="FontFamily" Value="{StaticResource digital-7}"></Setter> + </Style> - <Style TargetType="ContentControl"> - <!--<Setter Property="FontFamily" Value="digital-7"></Setter>--> - <Setter Property="Template"> - <Setter.Value> - <ControlTemplate TargetType="ContentControl"> - <Grid> - <Border> - <Border.Style> - <Style TargetType="Border"> - <Setter Property="BorderBrush" Value="Gainsboro"></Setter> - <Setter Property="BorderThickness" Value="1"></Setter> - <Setter Property="Padding" Value="2"></Setter> - <Setter Property="Margin" Value="5"></Setter> - <Setter Property="CornerRadius" Value="3"></Setter> - </Style> - </Border.Style> - <ContentPresenter Content="{TemplateBinding Content}"></ContentPresenter> - </Border> + <Style TargetType="ContentControl"> + <!--<Setter Property="FontFamily" Value="digital-7"></Setter>--> + <Setter Property="Template"> + <Setter.Value> + <ControlTemplate TargetType="ContentControl"> + <Grid> + <Border> + <Border.Style> + <Style TargetType="Border"> + <Setter Property="BorderBrush" Value="Gainsboro"></Setter> + <Setter Property="BorderThickness" Value="1"></Setter> + <Setter Property="Padding" Value="2"></Setter> + <Setter Property="Margin" Value="5"></Setter> + <Setter Property="CornerRadius" Value="3"></Setter> + </Style> + </Border.Style> + <ContentPresenter Content="{TemplateBinding Content}"></ContentPresenter> + </Border> - <materialDesign:PackIcon HorizontalAlignment="Left" VerticalAlignment="Top" Margin="0 0 0 0" Width="12" Height="12" Kind="Settings"></materialDesign:PackIcon> - </Grid> - </ControlTemplate> - </Setter.Value> - </Setter> - </Style> + <materialDesign:PackIcon HorizontalAlignment="Left" VerticalAlignment="Top" Margin="0 0 0 0" Width="12" Height="12" Kind="Settings"></materialDesign:PackIcon> + </Grid> + </ControlTemplate> + </Setter.Value> + </Setter> + </Style> - </WrapPanel.Resources> - <editors:ParameterizedEditor ParameterizedObject="{Binding}"> - <editors:ParameterizedEditor.ItemsPanel> - <ItemsPanelTemplate> - <WrapPanel IsItemsHost="True" Orientation="Vertical" /> - </ItemsPanelTemplate> - </editors:ParameterizedEditor.ItemsPanel> - <editors:ParameterizedEditor.DoubleTemplate> - <DataTemplate> - <ContentControl> - <StackPanel> - <TextBlock Text="{Binding Name}" FontSize="10"></TextBlock> - <mahapps:NumericUpDown Minimum="0" Maximum="10000" StringFormat="0.0" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Left" Value="{Binding Value,Mode=TwoWay}"></mahapps:NumericUpDown> - </StackPanel> - </ContentControl> - </DataTemplate> - </editors:ParameterizedEditor.DoubleTemplate> - </editors:ParameterizedEditor> - </WrapPanel> - </DockPanel> + </WrapPanel.Resources> + <editors:ParameterizedEditor ParameterizedObject="{Binding}"> + <editors:ParameterizedEditor.ItemsPanel> + <ItemsPanelTemplate> + <WrapPanel IsItemsHost="True" Orientation="Vertical" /> + </ItemsPanelTemplate> + </editors:ParameterizedEditor.ItemsPanel> + <editors:ParameterizedEditor.DoubleTemplate> + <DataTemplate> + <ContentControl> + <StackPanel> + <TextBlock Text="{Binding Name}" FontSize="10"></TextBlock> + <mahapps:NumericUpDown Minimum="0" Maximum="10000" StringFormat="0.0" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Left" Value="{Binding Value,Mode=TwoWay}"></mahapps:NumericUpDown> + </StackPanel> + </ContentControl> + </DataTemplate> + </editors:ParameterizedEditor.DoubleTemplate> + </editors:ParameterizedEditor> + </WrapPanel> + </DockPanel> + + <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="5" Visibility="{Binding RelativeSource={RelativeSource AncestorType=ListBoxItem},Path=IsSelected,Converter={StaticResource BooleanToVisibilityConverter}}"> + <TextBlock Text="Active" FontWeight="Bold" FontStyle="Italic" FontSize="13" VerticalAlignment="Center"></TextBlock> + <materialDesign:PackIcon Foreground="#90E990" Kind="CheckboxBlankCircle" VerticalAlignment="Center" Margin="5 0 0 0"> + <materialDesign:PackIcon.Style> + <Style TargetType="materialDesign:PackIcon"> + <Setter Property="Opacity" Value="0"></Setter> + <Style.Triggers> + <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType=ListBoxItem},Path=IsSelected,FallbackValue=False}" Value="True"> + <DataTrigger.EnterActions> + <BeginStoryboard> + <Storyboard> + <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Duration="00:00:01" RepeatBehavior="Forever"> + <DiscreteDoubleKeyFrame KeyTime="00:00:00" Value="1" /> + <DiscreteDoubleKeyFrame KeyTime="00:00:0.5" Value="0" /> + </DoubleAnimationUsingKeyFrames> + </Storyboard> + </BeginStoryboard> + </DataTrigger.EnterActions> + <DataTrigger.ExitActions> + <BeginStoryboard> + <Storyboard> + <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Duration="00:00:01"> + <DiscreteDoubleKeyFrame KeyTime="00:00:00" Value="0" /> + </DoubleAnimationUsingKeyFrames> + </Storyboard> + </BeginStoryboard> + </DataTrigger.ExitActions> + </DataTrigger> + </Style.Triggers> + </Style> + </materialDesign:PackIcon.Style> + </materialDesign:PackIcon> + </StackPanel> + </Grid> </Border> </DataTemplate> </ListBox.ItemTemplate> @@ -798,7 +834,7 @@ </StackPanel> <DockPanel LastChildFill="True"> <ToggleButton Margin="10 0 0 0" DockPanel.Dock="Right" VerticalAlignment="Bottom" HorizontalAlignment="Right" IsChecked="{Binding SelectedJob.EnableInterSegment}"></ToggleButton> - <mahapps:NumericUpDown StringFormat="{}{0:N1} m" FontFamily="digital-7" IsEnabled="{Binding SelectedJob.EnableInterSegment}" Margin="0 2 0 0" HideUpDownButtons="True" Minimum="0" Maximum="10000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0 0 0 1" BorderBrush="DimGray" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Left" Value="{Binding SelectedJob.InterSegmentLength,Mode=TwoWay}"></mahapps:NumericUpDown> + <mahapps:NumericUpDown StringFormat="{}{0:N1} m" FontFamily="{StaticResource digital-7}" IsEnabled="{Binding SelectedJob.EnableInterSegment}" Margin="0 2 0 0" HideUpDownButtons="True" Minimum="0" Maximum="10000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0 0 0 1" BorderBrush="DimGray" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Left" Value="{Binding SelectedJob.InterSegmentLength,Mode=TwoWay}"></mahapps:NumericUpDown> </DockPanel> </StackPanel> </Border> @@ -908,7 +944,7 @@ <Image Source="../Images/ruler.png" Width="32"></Image> <TextBlock VerticalAlignment="Center" Margin="5 0 0 0" FontSize="10">Length</TextBlock> </StackPanel> - <mahapps:NumericUpDown FontFamily="digital-7" StringFormat="{}{0:N1} m" Margin="0 2 0 0" Minimum="1" Maximum="10000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0 0 0 1" BorderBrush="DimGray" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Left" Value="{Binding SelectedSegment.Length,Mode=TwoWay}"></mahapps:NumericUpDown> + <mahapps:NumericUpDown FontFamily="{StaticResource digital-7}" StringFormat="{}{0:N1} m" Margin="0 2 0 0" Minimum="1" Maximum="10000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0 0 0 1" BorderBrush="DimGray" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Left" Value="{Binding SelectedSegment.Length,Mode=TwoWay}"></mahapps:NumericUpDown> </StackPanel> </Border> </StackPanel> @@ -997,7 +1033,7 @@ <Border.BorderBrush> <SolidColorBrush Color="{Binding IdsPack.LiquidType.Color,Converter={StaticResource ColorToIntegerConverter}}"></SolidColorBrush> </Border.BorderBrush> - <mahapps:NumericUpDown FontSize="14" FontFamily="digital-7" HorizontalAlignment="Center" Value="{Binding Volume, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0.0" HideUpDownButtons="True" Minimum="0" Maximum="1000" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center"> + <mahapps:NumericUpDown FontSize="14" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding Volume, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0.0" HideUpDownButtons="True" Minimum="0" Maximum="1000" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center"> <mahapps:NumericUpDown.Resources> <Style TargetType="TextBox"/> </mahapps:NumericUpDown.Resources> @@ -1015,7 +1051,7 @@ <Setter.Value> <StackPanel Orientation="Horizontal"> <Border BorderThickness="1" Width="50" Height="50" CornerRadius="50" Margin="10 0 0 0" BorderBrush="#FF6F6F"> - <mahapps:NumericUpDown FontSize="14" FontFamily="digital-7" HorizontalAlignment="Center" Value="{Binding Red, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0" HideUpDownButtons="True" Minimum="0" Maximum="255" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Center"> + <mahapps:NumericUpDown FontSize="14" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding Red, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0" HideUpDownButtons="True" Minimum="0" Maximum="255" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Center"> <mahapps:NumericUpDown.Resources> <Style TargetType="TextBox"/> </mahapps:NumericUpDown.Resources> @@ -1023,7 +1059,7 @@ </Border> <Border BorderThickness="1" Width="50" Height="50" CornerRadius="50" Margin="10 0 0 0" BorderBrush="#92FF92"> - <mahapps:NumericUpDown FontSize="14" FontFamily="digital-7" HorizontalAlignment="Center" Value="{Binding Green, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0" HideUpDownButtons="True" Minimum="0" Maximum="255" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Center"> + <mahapps:NumericUpDown FontSize="14" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding Green, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0" HideUpDownButtons="True" Minimum="0" Maximum="255" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Center"> <mahapps:NumericUpDown.Resources> <Style TargetType="TextBox"/> </mahapps:NumericUpDown.Resources> @@ -1031,7 +1067,7 @@ </Border> <Border BorderThickness="1" Width="50" Height="50" CornerRadius="50" Margin="10 0 0 0" BorderBrush="#3C7EF4"> - <mahapps:NumericUpDown FontSize="14" FontFamily="digital-7" HorizontalAlignment="Center" Value="{Binding Blue, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0" HideUpDownButtons="True" Minimum="0" Maximum="255" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Center"> + <mahapps:NumericUpDown FontSize="14" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding Blue, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0" HideUpDownButtons="True" Minimum="0" Maximum="255" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Center"> <mahapps:NumericUpDown.Resources> <Style TargetType="TextBox"/> </mahapps:NumericUpDown.Resources> @@ -1048,7 +1084,7 @@ <Setter.Value> <StackPanel Orientation="Horizontal"> <Border BorderThickness="1" Width="50" Height="50" CornerRadius="50" Margin="10 0 0 0" BorderBrush="Cyan"> - <mahapps:NumericUpDown FontSize="14" FontFamily="digital-7" HorizontalAlignment="Center" Value="{Binding Cyan, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0" HideUpDownButtons="True" Minimum="0" Maximum="100" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center"> + <mahapps:NumericUpDown FontSize="14" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding Cyan, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0" HideUpDownButtons="True" Minimum="0" Maximum="100" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center"> <mahapps:NumericUpDown.Resources> <Style TargetType="TextBox"/> </mahapps:NumericUpDown.Resources> @@ -1056,7 +1092,7 @@ </Border> <Border BorderThickness="1" Width="50" Height="50" CornerRadius="50" Margin="10 0 0 0" BorderBrush="Magenta"> - <mahapps:NumericUpDown FontSize="14" FontFamily="digital-7" HorizontalAlignment="Center" Value="{Binding Magenta, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0" HideUpDownButtons="True" Minimum="0" Maximum="100" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center"> + <mahapps:NumericUpDown FontSize="14" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding Magenta, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0" HideUpDownButtons="True" Minimum="0" Maximum="100" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center"> <mahapps:NumericUpDown.Resources> <Style TargetType="TextBox"/> </mahapps:NumericUpDown.Resources> @@ -1064,7 +1100,7 @@ </Border> <Border BorderThickness="1" Width="50" Height="50" CornerRadius="50" Margin="10 0 0 0" BorderBrush="Yellow"> - <mahapps:NumericUpDown FontSize="14" FontFamily="digital-7" HorizontalAlignment="Center" Value="{Binding Yellow, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0" HideUpDownButtons="True" Minimum="0" Maximum="100" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center"> + <mahapps:NumericUpDown FontSize="14" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding Yellow, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0" HideUpDownButtons="True" Minimum="0" Maximum="100" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center"> <mahapps:NumericUpDown.Resources> <Style TargetType="TextBox"/> </mahapps:NumericUpDown.Resources> @@ -1072,7 +1108,7 @@ </Border> <Border BorderThickness="1" Width="50" Height="50" CornerRadius="50" Margin="10 0 0 0" BorderBrush="Black"> - <mahapps:NumericUpDown FontSize="14" FontFamily="digital-7" HorizontalAlignment="Center" Value="{Binding Black, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0" HideUpDownButtons="True" Minimum="0" Maximum="100" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center"> + <mahapps:NumericUpDown FontSize="14" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding Black, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0" HideUpDownButtons="True" Minimum="0" Maximum="100" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center"> <mahapps:NumericUpDown.Resources> <Style TargetType="TextBox"/> </mahapps:NumericUpDown.Resources> @@ -1094,7 +1130,7 @@ <Setter.Value> <StackPanel Orientation="Horizontal"> <Border BorderThickness="1" Width="50" Height="50" CornerRadius="50" Margin="10 0 0 0" BorderBrush="Gray"> - <mahapps:NumericUpDown FontSize="14" FontFamily="digital-7" HorizontalAlignment="Center" Value="{Binding L, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0.0" HideUpDownButtons="True" Minimum="-100" Maximum="100" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center"> + <mahapps:NumericUpDown FontSize="14" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding L, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0.0" HideUpDownButtons="True" Minimum="-100" Maximum="100" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center"> <mahapps:NumericUpDown.Resources> <Style TargetType="TextBox"/> </mahapps:NumericUpDown.Resources> @@ -1102,7 +1138,7 @@ </Border> <Border BorderThickness="1" Width="50" Height="50" CornerRadius="50" Margin="10 0 0 0" BorderBrush="#FF8A8A"> - <mahapps:NumericUpDown FontSize="14" FontFamily="digital-7" HorizontalAlignment="Center" Value="{Binding A, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0.0" HideUpDownButtons="True" Minimum="-100" Maximum="100" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center"> + <mahapps:NumericUpDown FontSize="14" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding A, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0.0" HideUpDownButtons="True" Minimum="-100" Maximum="100" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center"> <mahapps:NumericUpDown.Resources> <Style TargetType="TextBox"/> </mahapps:NumericUpDown.Resources> @@ -1110,7 +1146,7 @@ </Border> <Border BorderThickness="1" Width="50" Height="50" CornerRadius="50" Margin="10 0 0 0" BorderBrush="#FFFF8A"> - <mahapps:NumericUpDown FontSize="14" FontFamily="digital-7" HorizontalAlignment="Center" Value="{Binding B, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0.0" HideUpDownButtons="True" Minimum="-100" Maximum="100" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center"> + <mahapps:NumericUpDown FontSize="14" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding B, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0.0" HideUpDownButtons="True" Minimum="-100" Maximum="100" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center"> <mahapps:NumericUpDown.Resources> <Style TargetType="TextBox"/> </mahapps:NumericUpDown.Resources> @@ -1145,7 +1181,7 @@ </Grid> <Grid> <StackPanel VerticalAlignment="Center"> - <TextBlock Width="150" TextAlignment="Center" HorizontalAlignment="Center"><Run FontWeight="Bold" FontStyle="Italic" Text="OFFSET:"></Run> <Run FontFamily="digital-7" Text="{Binding OffsetPercent,StringFormat={}{0:F1}%}"></Run></TextBlock> + <TextBlock Width="150" TextAlignment="Center" HorizontalAlignment="Center"><Run FontWeight="Bold" FontStyle="Italic" Text="OFFSET:"></Run> <Run FontFamily="{StaticResource digital-7}" Text="{Binding OffsetPercent,StringFormat={}{0:F1}%}"></Run></TextBlock> <Slider ValueChanged="Offset_Slider_ValueChanged" IsSnapToTickEnabled="True" TickFrequency="1" Margin="0 5 0 0" HorizontalAlignment="Center" Width="150" Value="{Binding OffsetPercent}"> <Slider.Minimum> <MultiBinding Converter="{StaticResource BrushStopToOffsetLimitConverter}" ConverterParameter="min"> @@ -1321,7 +1357,7 @@ <StackPanel HorizontalAlignment="Left" Margin="0 0 0 0"> <TextBlock FontSize="14" Margin="0 20 0 0"> <Run FontWeight="Bold">ESTIMATED DURATION:</Run> - <Run FontSize="18" Foreground="{StaticResource AccentColorBrush}" FontStyle="Italic" FontFamily="digital-7" Text="{Binding EstimatedDuration,StringFormat=hh\\:mm\\:ss,TargetNullValue='00:00:00'}"></Run> + <Run FontSize="18" Foreground="{StaticResource AccentColorBrush}" FontStyle="Italic" FontFamily="{StaticResource digital-7}" Text="{Binding EstimatedDuration,StringFormat=hh\\:mm\\:ss,TargetNullValue='00:00:00'}"></Run> </TextBlock> </StackPanel> </Grid> diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/SensorsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/SensorsViewVM.cs index 1a87ad4f3..5062f2584 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/SensorsViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/SensorsViewVM.cs @@ -126,7 +126,7 @@ namespace Tango.MachineStudio.Technician.ViewModels /// </summary> /// <param name="sender">The sender.</param> /// <param name="data">The data.</param> - private void MachineOperator_DiagnosticsDataAvailable(object sender, StartDiagnosticsResponse data) + private void MachineOperator_DiagnosticsDataAvailable(object sender, PushDiagnosticsResponse data) { //TemperatureController.PushData(data.Temperature.ToArray()); //PressureController.PushData(data.Temperature.ToArray()); diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Fonts/digital-7.ttf b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Fonts/digital-7.ttf Binary files differnew file mode 100644 index 000000000..5dbe6f908 --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Fonts/digital-7.ttf diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/MaterialDesign.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/MaterialDesign.xaml index 56ffcd5d1..8896a2d35 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/MaterialDesign.xaml +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/MaterialDesign.xaml @@ -63,6 +63,11 @@ <SolidColorBrush x:Key="IdealForegroundColorBrush" Color="{DynamicResource Primary500Foreground}" /> <SolidColorBrush x:Key="IdealForegroundDisabledBrush" Color="{DynamicResource Primary500}" Opacity="0.4" /> </ResourceDictionary> + + <!--Fonts--> + <ResourceDictionary> + <FontFamily x:Key="digital-7">../Fonts/#digital-7</FontFamily> + </ResourceDictionary> <!--Styles--> <ResourceDictionary> diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj index cc8ac8ac3..02e39c18f 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj @@ -139,6 +139,7 @@ <LastGenOutput>Resources.Designer.cs</LastGenOutput> </EmbeddedResource> <None Include="app.config" /> + <Resource Include="Fonts\digital-7.ttf" /> <None Include="packages.config" /> <None Include="Properties\Settings.settings"> <Generator>SettingsSingleFileGenerator</Generator> diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml.cs index bcded15cf..e6e1557f3 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml.cs @@ -22,6 +22,9 @@ using Tango.MachineStudio.UI.SupervisingController; using Tango.SharedUI; using Tango.SharedUI.Controls; using Tango.MachineStudio.Common; +using System.Threading; +using Tango.Core.Helpers; +using Tango.SharedUI.Helpers; namespace Tango.MachineStudio.UI.Views { @@ -49,16 +52,44 @@ namespace Tango.MachineStudio.UI.Views { TransitionControl.Controls.RemoveAll((x) => x.Tag.ToString() != "Home"); - foreach (var module in _loader.UserModules) + Task.Factory.StartNew(() => { - TransitionControl.Controls.Add(new ContentControl() + var item = ServiceLocator.Current.GetInstance<INotificationProvider>().PushTaskItem("Loading Modules..."); + + var modules = _loader.UserModules.ToList(); + + ThreadsHelper.InvokeUINow(() => + { + _loader.UserModules.Clear(); + }); + + Thread.Sleep(1500); + + foreach (var module in modules) + { + ThreadsHelper.InvokeUI(() => + { + TransitionControl.Controls.Add(new ContentControl() + { + Tag = module.Name, + Content = module.MainView + }); + + _loader.UserModules.Add(module); + }); + + UIHelper.DoEvents(); + + Thread.Sleep(100); + } + + ThreadsHelper.InvokeUI(() => { - Tag = module.Name, - Content = module.MainView + TransitionControl.RefreshControls(); }); - } - TransitionControl.RefreshControls(); + item.Pop(); + }); } } } diff --git a/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs b/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs index 570ef5498..4c4a675a3 100644 --- a/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs +++ b/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs @@ -16,6 +16,7 @@ using Tango.Transport; using Tango.PMR.Integration; using Tango.PMR.Diagnostics; using System.Windows.Forms; +using Google.Protobuf.Collections; namespace Tango.Emulations.Emulators { @@ -25,7 +26,7 @@ namespace Tango.Emulations.Emulators /// <seealso cref="Tango.Emulations.EmulatorBase" /> public class MachineEmulator : EmulatorBase { - private StartDiagnosticsRequest _diagnosticsRequest; + private PushDiagnosticsRequest _diagnosticsRequest; #region Constructors @@ -96,9 +97,9 @@ namespace Tango.Emulations.Emulators Transporter.SendResponse(response); }); break; - case MessageType.StartDiagnosticsRequest: + case MessageType.PushDiagnosticsRequest: - _diagnosticsRequest = MessageFactory.ExtractMessageFromContainer<StartDiagnosticsRequest>(container); + _diagnosticsRequest = MessageFactory.ExtractMessageFromContainer<PushDiagnosticsRequest>(container); int value = 0; Random rnd = new Random(); @@ -107,7 +108,7 @@ namespace Tango.Emulations.Emulators { while (Transporter.State == TransportComponentState.Connected) { - StartDiagnosticsResponse res = new StartDiagnosticsResponse(); + PushDiagnosticsResponse res = new PushDiagnosticsResponse(); if (_diagnosticsRequest.PushSensors) { @@ -121,7 +122,28 @@ namespace Tango.Emulations.Emulators res.Dancer3Angle.Add(Cursor.Position.Y); } - Transporter.SendResponse<StartDiagnosticsResponse>(res, container.Token); + if (_diagnosticsRequest.PushMotors) + { + var dispenserFrequencies = new RepeatedField<DoubleArray>(); + + double cPosition = Cursor.Position.Y; + + for (int i = 0; i < 8; i++) + { + DoubleArray singleDispenser = new DoubleArray(); + + for (int j = 0; j < 10; j++) + { + singleDispenser.Data.Add(cPosition + (i * 50)); + } + + dispenserFrequencies.Add(singleDispenser); + } + + res.DispensersMotorsFrequency.AddRange(dispenserFrequencies); + } + + Transporter.SendResponse<PushDiagnosticsResponse>(res, container.Token); Thread.Sleep(10); } }); diff --git a/Software/Visual_Studio/Tango.Integration/Formulation/LubricantFormulaCalculator.cs b/Software/Visual_Studio/Tango.Integration/Formulation/LubricantFormulaCalculator.cs new file mode 100644 index 000000000..3d75c9748 --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Formulation/LubricantFormulaCalculator.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Tango.Integration.Observables; + +namespace Tango.Integration.Formulation +{ + [Formula(IdsPackFormulas.Lubricant)] + public class LubricantFormulaCalculator : FormulaCalculatorBase + { + + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Formulation/DiluterFormulaCalculator.cs b/Software/Visual_Studio/Tango.Integration/Formulation/TransparentLiquidFormulaCalculator.cs index a888cd8ce..bad40f7f8 100644 --- a/Software/Visual_Studio/Tango.Integration/Formulation/DiluterFormulaCalculator.cs +++ b/Software/Visual_Studio/Tango.Integration/Formulation/TransparentLiquidFormulaCalculator.cs @@ -8,8 +8,8 @@ using Tango.Integration.Printing; namespace Tango.Integration.Formulation { - [Formula(IdsPackFormulas.Diluter)] - public class DiluterFormulaCalculator : FormulaCalculatorBase + [Formula(IdsPackFormulas.TransparentLiquid)] + public class TransparentLiquidFormulaCalculator : FormulaCalculatorBase { public override double CoerceVolume(LiquidVolume liquidVolume) { diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/IdsPackFormulas.cs b/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/IdsPackFormulas.cs index 743f506ee..7d9b36cba 100644 --- a/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/IdsPackFormulas.cs +++ b/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/IdsPackFormulas.cs @@ -10,16 +10,22 @@ namespace Tango.Integration.Observables { /// <summary> + /// (Lubricant Formula) + /// </summary> + [Description("Lubricant Formula")] + Lubricant = 2, + + /// <summary> /// (Standard Color IDS Pack Formula) /// </summary> [Description("Standard Color IDS Pack Formula")] StandardColor = 0, /// <summary> - /// (Diluter) + /// (Diluter Formula) /// </summary> - [Description("Diluter")] - Diluter = 1, + [Description("Diluter Formula")] + TransparentLiquid = 1, } } diff --git a/Software/Visual_Studio/Tango.Integration/Operators/IMachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operators/IMachineOperator.cs index f3642bebe..69400cfe7 100644 --- a/Software/Visual_Studio/Tango.Integration/Operators/IMachineOperator.cs +++ b/Software/Visual_Studio/Tango.Integration/Operators/IMachineOperator.cs @@ -13,7 +13,7 @@ namespace Tango.Integration.Operators /// <summary> /// Occurs when there is new diagnostics data available. /// </summary> - event EventHandler<StartDiagnosticsResponse> DiagnosticsDataAvailable; + event EventHandler<PushDiagnosticsResponse> DiagnosticsDataAvailable; /// <summary> /// Gets or sets a value indicating whether to enable diagnostics messages by requesting diagnostics messages. diff --git a/Software/Visual_Studio/Tango.Integration/Operators/MachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operators/MachineOperator.cs index 68f68d47c..17884b677 100644 --- a/Software/Visual_Studio/Tango.Integration/Operators/MachineOperator.cs +++ b/Software/Visual_Studio/Tango.Integration/Operators/MachineOperator.cs @@ -10,6 +10,7 @@ using Tango.Transport.Transporters; using System.Reactive.Linq; using System.Reactive.Concurrency; using System.Reactive.Threading; +using Tango.PMR.Common; namespace Tango.Integration.Operators { @@ -18,7 +19,7 @@ namespace Tango.Integration.Operators /// <summary> /// Occurs when there is new diagnostics data available. /// </summary> - public event EventHandler<StartDiagnosticsResponse> DiagnosticsDataAvailable; + public event EventHandler<PushDiagnosticsResponse> DiagnosticsDataAvailable; private bool _enableDiagnostics; /// <summary> @@ -46,12 +47,12 @@ namespace Tango.Integration.Operators { if (value && State == TransportComponentState.Connected) { - SendContinuousRequest<StartDiagnosticsRequest, StartDiagnosticsResponse>(new TangoMessage<StartDiagnosticsRequest>(new StartDiagnosticsRequest() + SendContinuousRequest<PushDiagnosticsRequest, PushDiagnosticsResponse>(new TangoMessage<PushDiagnosticsRequest>(new PushDiagnosticsRequest() { PushMotors = true, PushSensors = true, - }, PMR.Common.MessageType.StartDiagnosticsRequest)).ObserveOn(new NewThreadScheduler()).Subscribe( + }, MessageType.PushDiagnosticsRequest)).ObserveOn(new NewThreadScheduler()).Subscribe( (response) => { OnDiagnosticsDataAvailable(response); @@ -71,7 +72,7 @@ namespace Tango.Integration.Operators /// Invokes the <see cref="DiagnosticsDataAvailable"/> event. /// </summary> /// <param name="data">The sensors data.</param> - protected virtual void OnDiagnosticsDataAvailable(StartDiagnosticsResponse data) + protected virtual void OnDiagnosticsDataAvailable(PushDiagnosticsResponse data) { DiagnosticsDataAvailable?.Invoke(this, data); } diff --git a/Software/Visual_Studio/Tango.Integration/Tango.Integration.csproj b/Software/Visual_Studio/Tango.Integration/Tango.Integration.csproj index 42ca836c3..077f66869 100644 --- a/Software/Visual_Studio/Tango.Integration/Tango.Integration.csproj +++ b/Software/Visual_Studio/Tango.Integration/Tango.Integration.csproj @@ -74,12 +74,13 @@ <Link>GlobalVersionInfo.cs</Link> </Compile> <Compile Include="ExtensionMethods\IExternalBridgeClientExtensions.cs" /> - <Compile Include="Formulation\DiluterFormulaCalculator.cs" /> + <Compile Include="Formulation\TransparentLiquidFormulaCalculator.cs" /> <Compile Include="Formulation\FormulaCalculatorBase.cs" /> <Compile Include="Formulation\FormulasCalculationService.cs" /> <Compile Include="Formulation\FormulaResolver.cs" /> <Compile Include="Formulation\FormulaAttribute.cs" /> <Compile Include="Formulation\IFormulaCalculator.cs" /> + <Compile Include="Formulation\LubricantFormulaCalculator.cs" /> <Compile Include="Formulation\StandardColorFormulaCalculator.cs" /> <Compile Include="Observables\Entities\ActionType.cs" /> <Compile Include="Observables\Entities\Address.cs" /> diff --git a/Software/Visual_Studio/Tango.PMR/Common/DoubleArray.cs b/Software/Visual_Studio/Tango.PMR/Common/DoubleArray.cs new file mode 100644 index 000000000..3977e2f86 --- /dev/null +++ b/Software/Visual_Studio/Tango.PMR/Common/DoubleArray.cs @@ -0,0 +1,152 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: DoubleArray.proto +#pragma warning disable 1591, 0612, 3021 +#region Designer generated code + +using pb = global::Google.Protobuf; +using pbc = global::Google.Protobuf.Collections; +using pbr = global::Google.Protobuf.Reflection; +using scg = global::System.Collections.Generic; +namespace Tango.PMR.Common { + + /// <summary>Holder for reflection information generated from DoubleArray.proto</summary> + public static partial class DoubleArrayReflection { + + #region Descriptor + /// <summary>File descriptor for DoubleArray.proto</summary> + public static pbr::FileDescriptor Descriptor { + get { return descriptor; } + } + private static pbr::FileDescriptor descriptor; + + static DoubleArrayReflection() { + byte[] descriptorData = global::System.Convert.FromBase64String( + string.Concat( + "ChFEb3VibGVBcnJheS5wcm90bxIQVGFuZ28uUE1SLkNvbW1vbiIbCgtEb3Vi", + "bGVBcnJheRIMCgREYXRhGAEgAygBQhwKGmNvbS50d2luZS50YW5nby5wbXIu", + "Y29tbW9uYgZwcm90bzM=")); + descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, + new pbr::FileDescriptor[] { }, + new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { + new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Common.DoubleArray), global::Tango.PMR.Common.DoubleArray.Parser, new[]{ "Data" }, null, null, null) + })); + } + #endregion + + } + #region Messages + public sealed partial class DoubleArray : pb::IMessage<DoubleArray> { + private static readonly pb::MessageParser<DoubleArray> _parser = new pb::MessageParser<DoubleArray>(() => new DoubleArray()); + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static pb::MessageParser<DoubleArray> Parser { get { return _parser; } } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static pbr::MessageDescriptor Descriptor { + get { return global::Tango.PMR.Common.DoubleArrayReflection.Descriptor.MessageTypes[0]; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public DoubleArray() { + OnConstruction(); + } + + partial void OnConstruction(); + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public DoubleArray(DoubleArray other) : this() { + data_ = other.data_.Clone(); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public DoubleArray Clone() { + return new DoubleArray(this); + } + + /// <summary>Field number for the "Data" field.</summary> + public const int DataFieldNumber = 1; + private static readonly pb::FieldCodec<double> _repeated_data_codec + = pb::FieldCodec.ForDouble(10); + private readonly pbc::RepeatedField<double> data_ = new pbc::RepeatedField<double>(); + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public pbc::RepeatedField<double> Data { + get { return data_; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override bool Equals(object other) { + return Equals(other as DoubleArray); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public bool Equals(DoubleArray other) { + if (ReferenceEquals(other, null)) { + return false; + } + if (ReferenceEquals(other, this)) { + return true; + } + if(!data_.Equals(other.data_)) return false; + return true; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override int GetHashCode() { + int hash = 1; + hash ^= data_.GetHashCode(); + return hash; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override string ToString() { + return pb::JsonFormatter.ToDiagnosticString(this); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void WriteTo(pb::CodedOutputStream output) { + data_.WriteTo(output, _repeated_data_codec); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public int CalculateSize() { + int size = 0; + size += data_.CalculateSize(_repeated_data_codec); + return size; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void MergeFrom(DoubleArray other) { + if (other == null) { + return; + } + data_.Add(other.data_); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void MergeFrom(pb::CodedInputStream input) { + uint tag; + while ((tag = input.ReadTag()) != 0) { + switch(tag) { + default: + input.SkipLastField(); + break; + case 10: + case 9: { + data_.AddEntriesFrom(input, _repeated_data_codec); + break; + } + } + } + } + + } + + #endregion + +} + +#endregion Designer generated code diff --git a/Software/Visual_Studio/Tango.PMR/Common/KeepAliveRequest.cs b/Software/Visual_Studio/Tango.PMR/Common/KeepAliveRequest.cs index 0066665ae..6a8f43037 100644 --- a/Software/Visual_Studio/Tango.PMR/Common/KeepAliveRequest.cs +++ b/Software/Visual_Studio/Tango.PMR/Common/KeepAliveRequest.cs @@ -22,7 +22,7 @@ namespace Tango.PMR.Common { static KeepAliveRequestReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChZLZWVwQWxpdmVSZXF1ZXN0LnByb3RvEhBUYW5nby5QTVIuY29tbW9uIhIK", + "ChZLZWVwQWxpdmVSZXF1ZXN0LnByb3RvEhBUYW5nby5QTVIuQ29tbW9uIhIK", "EEtlZXBBbGl2ZVJlcXVlc3RCHAoaY29tLnR3aW5lLnRhbmdvLnBtci5jb21t", "b25iBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, diff --git a/Software/Visual_Studio/Tango.PMR/Common/KeepAliveResponse.cs b/Software/Visual_Studio/Tango.PMR/Common/KeepAliveResponse.cs index 47037c03e..97d407540 100644 --- a/Software/Visual_Studio/Tango.PMR/Common/KeepAliveResponse.cs +++ b/Software/Visual_Studio/Tango.PMR/Common/KeepAliveResponse.cs @@ -22,7 +22,7 @@ namespace Tango.PMR.Common { static KeepAliveResponseReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChdLZWVwQWxpdmVSZXNwb25zZS5wcm90bxIQVGFuZ28uUE1SLmNvbW1vbiIT", + "ChdLZWVwQWxpdmVSZXNwb25zZS5wcm90bxIQVGFuZ28uUE1SLkNvbW1vbiIT", "ChFLZWVwQWxpdmVSZXNwb25zZUIcChpjb20udHdpbmUudGFuZ28ucG1yLmNv", "bW1vbmIGcHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, diff --git a/Software/Visual_Studio/Tango.PMR/Common/MessageType.cs b/Software/Visual_Studio/Tango.PMR/Common/MessageType.cs index b813f3e5a..8fa7f48ef 100644 --- a/Software/Visual_Studio/Tango.PMR/Common/MessageType.cs +++ b/Software/Visual_Studio/Tango.PMR/Common/MessageType.cs @@ -22,42 +22,39 @@ namespace Tango.PMR.Common { static MessageTypeReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChFNZXNzYWdlVHlwZS5wcm90bxIQVGFuZ28uUE1SLkNvbW1vbirxCwoLTWVz", - "c2FnZVR5cGUSBwoDUkdCEAASBwoDSm9iEAESCwoHU2VnbWVudBACEhQKEENh", - "bGN1bGF0ZVJlcXVlc3QQAxIVChFDYWxjdWxhdGVSZXNwb25zZRAEEhMKD1By", - "b2dyZXNzUmVxdWVzdBAFEhQKEFByb2dyZXNzUmVzcG9uc2UQBhIcChhTdHVi", - "Q2FydHJpZGdlUmVhZFJlcXVlc3QQBxIdChlTdHViQ2FydHJpZGdlUmVhZFJl", - "c3BvbnNlEAgSHQoZU3R1YkNhcnRyaWRnZVdyaXRlUmVxdWVzdBAJEh4KGlN0", - "dWJDYXJ0cmlkZ2VXcml0ZVJlc3BvbnNlEAoSGAoUU3R1YkRpc3BlbnNlclJl", - "cXVlc3QQCxIZChVTdHViRGlzcGVuc2VyUmVzcG9uc2UQDBIdChlTdHViR1BJ", - "T0lucHV0U2V0dXBSZXF1ZXN0EA0SHgoaU3R1YkdQSU9JbnB1dFNldHVwUmVz", - "cG9uc2UQDhIaChZTdHViR1BJT1JlYWRCaXRSZXF1ZXN0EA8SGwoXU3R1YkdQ", - "SU9SZWFkQml0UmVzcG9uc2UQEBIbChdTdHViR1BJT1JlYWRCeXRlUmVxdWVz", - "dBAREhwKGFN0dWJHUElPUmVhZEJ5dGVSZXNwb25zZRASEhsKF1N0dWJHUElP", - "V3JpdGVCaXRSZXF1ZXN0EBMSHAoYU3R1YkdQSU9Xcml0ZUJpdFJlc3BvbnNl", - "EBQSHAoYU3R1YkdQSU9Xcml0ZUJ5dGVSZXF1ZXN0EBUSHQoZU3R1YkdQSU9X", - "cml0ZUJ5dGVSZXNwb25zZRAWEhUKEVN0dWJIZWF0ZXJSZXF1ZXN0EBcSFgoS", - "U3R1YkhlYXRlclJlc3BvbnNlEBgSGwoXU3R1Yk1vdG9yRW5jb2RlclJlcXVl", - "c3QQGRIcChhTdHViTW90b3JFbmNvZGVyUmVzcG9uc2UQGhIdChlTdHViT3B0", - "TGltaXRTd2l0Y2hSZXF1ZXN0EBsSHgoaU3R1Yk9wdExpbWl0U3dpdGNoUmVz", - "cG9uc2UQHBIaChZTdHViU3RlcGVyTW90b3JSZXF1ZXN0EB0SGwoXU3R1YlN0", - "ZXBlck1vdG9yUmVzcG9uc2UQHhIUChBTdHViVmFsdmVSZXF1ZXN0EB8SFQoR", - "U3R1YlZhbHZlUmVzcG9uc2UQIBIbChdTdHViRXh0Rmxhc2hSZWFkUmVxdWVz", - "dBAhEhwKGFN0dWJFeHRGbGFzaFJlYWRSZXNwb25zZRAiEhwKGFN0dWJFeHRG", - "bGFzaFdyaXRlUmVxdWVzdBAjEh0KGVN0dWJFeHRGbGFzaFdyaXRlUmVzcG9u", - "c2UQJBIOCglEaXNwZW5zZXIQyAESCgoFTW90b3IQyQESDQoIR3JhZGllbnQQ", - "ygESCwoGRGFuY2VyEMsBEhMKDkludGVybmFsV2luZGVyEMwBEg0KCERpc3Bl", - "bnNlEM0BEhQKD1NlZ21lbnRHcmFkaWVudBDOARIlCiBFeHRlcm5hbEJyaWRn", + "ChFNZXNzYWdlVHlwZS5wcm90bxIQVGFuZ28uUE1SLkNvbW1vbiroCgoLTWVz", + "c2FnZVR5cGUSCAoETm9uZRAAEhQKEENhbGN1bGF0ZVJlcXVlc3QQAxIVChFD", + "YWxjdWxhdGVSZXNwb25zZRAEEhMKD1Byb2dyZXNzUmVxdWVzdBAFEhQKEFBy", + "b2dyZXNzUmVzcG9uc2UQBhIcChhTdHViQ2FydHJpZGdlUmVhZFJlcXVlc3QQ", + "BxIdChlTdHViQ2FydHJpZGdlUmVhZFJlc3BvbnNlEAgSHQoZU3R1YkNhcnRy", + "aWRnZVdyaXRlUmVxdWVzdBAJEh4KGlN0dWJDYXJ0cmlkZ2VXcml0ZVJlc3Bv", + "bnNlEAoSGAoUU3R1YkRpc3BlbnNlclJlcXVlc3QQCxIZChVTdHViRGlzcGVu", + "c2VyUmVzcG9uc2UQDBIdChlTdHViR1BJT0lucHV0U2V0dXBSZXF1ZXN0EA0S", + "HgoaU3R1YkdQSU9JbnB1dFNldHVwUmVzcG9uc2UQDhIaChZTdHViR1BJT1Jl", + "YWRCaXRSZXF1ZXN0EA8SGwoXU3R1YkdQSU9SZWFkQml0UmVzcG9uc2UQEBIb", + "ChdTdHViR1BJT1JlYWRCeXRlUmVxdWVzdBAREhwKGFN0dWJHUElPUmVhZEJ5", + "dGVSZXNwb25zZRASEhsKF1N0dWJHUElPV3JpdGVCaXRSZXF1ZXN0EBMSHAoY", + "U3R1YkdQSU9Xcml0ZUJpdFJlc3BvbnNlEBQSHAoYU3R1YkdQSU9Xcml0ZUJ5", + "dGVSZXF1ZXN0EBUSHQoZU3R1YkdQSU9Xcml0ZUJ5dGVSZXNwb25zZRAWEhUK", + "EVN0dWJIZWF0ZXJSZXF1ZXN0EBcSFgoSU3R1YkhlYXRlclJlc3BvbnNlEBgS", + "GwoXU3R1Yk1vdG9yRW5jb2RlclJlcXVlc3QQGRIcChhTdHViTW90b3JFbmNv", + "ZGVyUmVzcG9uc2UQGhIdChlTdHViT3B0TGltaXRTd2l0Y2hSZXF1ZXN0EBsS", + "HgoaU3R1Yk9wdExpbWl0U3dpdGNoUmVzcG9uc2UQHBIaChZTdHViU3RlcGVy", + "TW90b3JSZXF1ZXN0EB0SGwoXU3R1YlN0ZXBlck1vdG9yUmVzcG9uc2UQHhIU", + "ChBTdHViVmFsdmVSZXF1ZXN0EB8SFQoRU3R1YlZhbHZlUmVzcG9uc2UQIBIb", + "ChdTdHViRXh0Rmxhc2hSZWFkUmVxdWVzdBAhEhwKGFN0dWJFeHRGbGFzaFJl", + "YWRSZXNwb25zZRAiEhwKGFN0dWJFeHRGbGFzaFdyaXRlUmVxdWVzdBAjEh0K", + "GVN0dWJFeHRGbGFzaFdyaXRlUmVzcG9uc2UQJBIlCiBFeHRlcm5hbEJyaWRn", "ZVVkcERpc2NvdmVyeVBhY2tldBDoBxIfChpFeHRlcm5hbENsaWVudExvZ2lu", "UmVxdWVzdBDpBxIgChtFeHRlcm5hbENsaWVudExvZ2luUmVzcG9uc2UQ6gcS", "IQocRGlyZWN0U3luY2hyb25pemF0aW9uUmVxdWVzdBDrBxIiCh1EaXJlY3RT", "eW5jaHJvbml6YXRpb25SZXNwb25zZRDsBxIcChdPdmVycmlkZURhdGFCYXNl", "UmVxdWVzdBDtBxIdChhPdmVycmlkZURhdGFCYXNlUmVzcG9uc2UQ7gcSFQoQ", - "S2VlcEFsaXZlUmVxdWVzdBDvBxIWChFLZWVwQWxpdmVSZXNwb25zZRDwBxIc", - "ChdTdGFydERpYWdub3N0aWNzUmVxdWVzdBDQDxIdChhTdGFydERpYWdub3N0", - "aWNzUmVzcG9uc2UQ0Q8SEgoNUmVwb3J0UmVxdWVzdBDSDxITCg5SZXBvcnRS", - "ZXNwb25zZRDTDxITCg5TdGF0dXNSZXNwb25zZRDUD0IcChpjb20udHdpbmUu", - "dGFuZ28ucG1yLmNvbW1vbmIGcHJvdG8z")); + "S2VlcEFsaXZlUmVxdWVzdBDvBxIWChFLZWVwQWxpdmVSZXNwb25zZRDwBxIb", + "ChZQdXNoRGlhZ25vc3RpY3NSZXF1ZXN0ENAPEhwKF1B1c2hEaWFnbm9zdGlj", + "c1Jlc3BvbnNlENEPEhIKDVJlcG9ydFJlcXVlc3QQ0g8SEwoOUmVwb3J0UmVz", + "cG9uc2UQ0w8SEwoOU3RhdHVzUmVzcG9uc2UQ1A9CHAoaY29tLnR3aW5lLnRh", + "bmdvLnBtci5jb21tb25iBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.Common.MessageType), }, null)); @@ -68,17 +65,9 @@ namespace Tango.PMR.Common { #region Enums public enum MessageType { /// <summary> - ///Common + ///The first enum value must be zero so.. /// </summary> - [pbr::OriginalName("RGB")] Rgb = 0, - [pbr::OriginalName("Job")] Job = 1, - /// <summary> - ///Hardware - ///Dispenser; - ///Motor; - ///Gradient; - /// </summary> - [pbr::OriginalName("Segment")] Segment = 2, + [pbr::OriginalName("None")] None = 0, /// <summary> ///Stubs /// </summary> @@ -117,17 +106,6 @@ namespace Tango.PMR.Common { [pbr::OriginalName("StubExtFlashWriteRequest")] StubExtFlashWriteRequest = 35, [pbr::OriginalName("StubExtFlashWriteResponse")] StubExtFlashWriteResponse = 36, /// <summary> - ///work - ///Hardware = 200; - /// </summary> - [pbr::OriginalName("Dispenser")] Dispenser = 200, - [pbr::OriginalName("Motor")] Motor = 201, - [pbr::OriginalName("Gradient")] Gradient = 202, - [pbr::OriginalName("Dancer")] Dancer = 203, - [pbr::OriginalName("InternalWinder")] InternalWinder = 204, - [pbr::OriginalName("Dispense")] Dispense = 205, - [pbr::OriginalName("SegmentGradient")] SegmentGradient = 206, - /// <summary> ///Integration /// </summary> [pbr::OriginalName("ExternalBridgeUdpDiscoveryPacket")] ExternalBridgeUdpDiscoveryPacket = 1000, @@ -142,8 +120,8 @@ namespace Tango.PMR.Common { /// <summary> ///Diagnostics /// </summary> - [pbr::OriginalName("StartDiagnosticsRequest")] StartDiagnosticsRequest = 2000, - [pbr::OriginalName("StartDiagnosticsResponse")] StartDiagnosticsResponse = 2001, + [pbr::OriginalName("PushDiagnosticsRequest")] PushDiagnosticsRequest = 2000, + [pbr::OriginalName("PushDiagnosticsResponse")] PushDiagnosticsResponse = 2001, [pbr::OriginalName("ReportRequest")] ReportRequest = 2002, [pbr::OriginalName("ReportResponse")] ReportResponse = 2003, [pbr::OriginalName("StatusResponse")] StatusResponse = 2004, diff --git a/Software/Visual_Studio/Tango.PMR/Diagnostics/StartDiagnosticsRequest.cs b/Software/Visual_Studio/Tango.PMR/Diagnostics/PushDiagnosticsRequest.cs index 3d5bcc4c3..33a8a3071 100644 --- a/Software/Visual_Studio/Tango.PMR/Diagnostics/StartDiagnosticsRequest.cs +++ b/Software/Visual_Studio/Tango.PMR/Diagnostics/PushDiagnosticsRequest.cs @@ -1,5 +1,5 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: StartDiagnosticsRequest.proto +// source: PushDiagnosticsRequest.proto #pragma warning disable 1591, 0612, 3021 #region Designer generated code @@ -9,42 +9,42 @@ using pbr = global::Google.Protobuf.Reflection; using scg = global::System.Collections.Generic; namespace Tango.PMR.Diagnostics { - /// <summary>Holder for reflection information generated from StartDiagnosticsRequest.proto</summary> - public static partial class StartDiagnosticsRequestReflection { + /// <summary>Holder for reflection information generated from PushDiagnosticsRequest.proto</summary> + public static partial class PushDiagnosticsRequestReflection { #region Descriptor - /// <summary>File descriptor for StartDiagnosticsRequest.proto</summary> + /// <summary>File descriptor for PushDiagnosticsRequest.proto</summary> public static pbr::FileDescriptor Descriptor { get { return descriptor; } } private static pbr::FileDescriptor descriptor; - static StartDiagnosticsRequestReflection() { + static PushDiagnosticsRequestReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "Ch1TdGFydERpYWdub3N0aWNzUmVxdWVzdC5wcm90bxIVVGFuZ28uUE1SLkRp", - "YWdub3N0aWNzIlQKF1N0YXJ0RGlhZ25vc3RpY3NSZXF1ZXN0EhMKC1B1c2hT", - "ZW5zb3JzGAEgASgIEhIKClB1c2hNb3RvcnMYAiABKAgSEAoIUHVzaExvZ3MY", - "AyABKAhCIQofY29tLnR3aW5lLnRhbmdvLnBtci5kaWFnbm9zdGljc2IGcHJv", - "dG8z")); + "ChxQdXNoRGlhZ25vc3RpY3NSZXF1ZXN0LnByb3RvEhVUYW5nby5QTVIuRGlh", + "Z25vc3RpY3MiUwoWUHVzaERpYWdub3N0aWNzUmVxdWVzdBITCgtQdXNoU2Vu", + "c29ycxgBIAEoCBISCgpQdXNoTW90b3JzGAIgASgIEhAKCFB1c2hMb2dzGAMg", + "ASgIQiEKH2NvbS50d2luZS50YW5nby5wbXIuZGlhZ25vc3RpY3NiBnByb3Rv", + "Mw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Diagnostics.StartDiagnosticsRequest), global::Tango.PMR.Diagnostics.StartDiagnosticsRequest.Parser, new[]{ "PushSensors", "PushMotors", "PushLogs" }, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Diagnostics.PushDiagnosticsRequest), global::Tango.PMR.Diagnostics.PushDiagnosticsRequest.Parser, new[]{ "PushSensors", "PushMotors", "PushLogs" }, null, null, null) })); } #endregion } #region Messages - public sealed partial class StartDiagnosticsRequest : pb::IMessage<StartDiagnosticsRequest> { - private static readonly pb::MessageParser<StartDiagnosticsRequest> _parser = new pb::MessageParser<StartDiagnosticsRequest>(() => new StartDiagnosticsRequest()); + public sealed partial class PushDiagnosticsRequest : pb::IMessage<PushDiagnosticsRequest> { + private static readonly pb::MessageParser<PushDiagnosticsRequest> _parser = new pb::MessageParser<PushDiagnosticsRequest>(() => new PushDiagnosticsRequest()); [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public static pb::MessageParser<StartDiagnosticsRequest> Parser { get { return _parser; } } + public static pb::MessageParser<PushDiagnosticsRequest> Parser { get { return _parser; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public static pbr::MessageDescriptor Descriptor { - get { return global::Tango.PMR.Diagnostics.StartDiagnosticsRequestReflection.Descriptor.MessageTypes[0]; } + get { return global::Tango.PMR.Diagnostics.PushDiagnosticsRequestReflection.Descriptor.MessageTypes[0]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -53,22 +53,22 @@ namespace Tango.PMR.Diagnostics { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public StartDiagnosticsRequest() { + public PushDiagnosticsRequest() { OnConstruction(); } partial void OnConstruction(); [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public StartDiagnosticsRequest(StartDiagnosticsRequest other) : this() { + public PushDiagnosticsRequest(PushDiagnosticsRequest other) : this() { pushSensors_ = other.pushSensors_; pushMotors_ = other.pushMotors_; pushLogs_ = other.pushLogs_; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public StartDiagnosticsRequest Clone() { - return new StartDiagnosticsRequest(this); + public PushDiagnosticsRequest Clone() { + return new PushDiagnosticsRequest(this); } /// <summary>Field number for the "PushSensors" field.</summary> @@ -106,11 +106,11 @@ namespace Tango.PMR.Diagnostics { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override bool Equals(object other) { - return Equals(other as StartDiagnosticsRequest); + return Equals(other as PushDiagnosticsRequest); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public bool Equals(StartDiagnosticsRequest other) { + public bool Equals(PushDiagnosticsRequest other) { if (ReferenceEquals(other, null)) { return false; } @@ -169,7 +169,7 @@ namespace Tango.PMR.Diagnostics { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void MergeFrom(StartDiagnosticsRequest other) { + public void MergeFrom(PushDiagnosticsRequest other) { if (other == null) { return; } diff --git a/Software/Visual_Studio/Tango.PMR/Diagnostics/StartDiagnosticsResponse.cs b/Software/Visual_Studio/Tango.PMR/Diagnostics/PushDiagnosticsResponse.cs index c978f8749..5fa343d81 100644 --- a/Software/Visual_Studio/Tango.PMR/Diagnostics/StartDiagnosticsResponse.cs +++ b/Software/Visual_Studio/Tango.PMR/Diagnostics/PushDiagnosticsResponse.cs @@ -1,5 +1,5 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: StartDiagnosticsResponse.proto +// source: PushDiagnosticsResponse.proto #pragma warning disable 1591, 0612, 3021 #region Designer generated code @@ -9,42 +9,44 @@ using pbr = global::Google.Protobuf.Reflection; using scg = global::System.Collections.Generic; namespace Tango.PMR.Diagnostics { - /// <summary>Holder for reflection information generated from StartDiagnosticsResponse.proto</summary> - public static partial class StartDiagnosticsResponseReflection { + /// <summary>Holder for reflection information generated from PushDiagnosticsResponse.proto</summary> + public static partial class PushDiagnosticsResponseReflection { #region Descriptor - /// <summary>File descriptor for StartDiagnosticsResponse.proto</summary> + /// <summary>File descriptor for PushDiagnosticsResponse.proto</summary> public static pbr::FileDescriptor Descriptor { get { return descriptor; } } private static pbr::FileDescriptor descriptor; - static StartDiagnosticsResponseReflection() { + static PushDiagnosticsResponseReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "Ch5TdGFydERpYWdub3N0aWNzUmVzcG9uc2UucHJvdG8SFVRhbmdvLlBNUi5E", - "aWFnbm9zdGljcyJcChhTdGFydERpYWdub3N0aWNzUmVzcG9uc2USFAoMRGFu", - "Y2VyMUFuZ2xlGAEgAygBEhQKDERhbmNlcjJBbmdsZRgCIAMoARIUCgxEYW5j", - "ZXIzQW5nbGUYAyADKAFCIQofY29tLnR3aW5lLnRhbmdvLnBtci5kaWFnbm9z", - "dGljc2IGcHJvdG8z")); + "Ch1QdXNoRGlhZ25vc3RpY3NSZXNwb25zZS5wcm90bxIVVGFuZ28uUE1SLkRp", + "YWdub3N0aWNzGhFEb3VibGVBcnJheS5wcm90byKdAQoXUHVzaERpYWdub3N0", + "aWNzUmVzcG9uc2USFAoMRGFuY2VyMUFuZ2xlGAEgAygBEhQKDERhbmNlcjJB", + "bmdsZRgCIAMoARIUCgxEYW5jZXIzQW5nbGUYAyADKAESQAoZRGlzcGVuc2Vy", + "c01vdG9yc0ZyZXF1ZW5jeRgEIAMoCzIdLlRhbmdvLlBNUi5Db21tb24uRG91", + "YmxlQXJyYXlCIQofY29tLnR3aW5lLnRhbmdvLnBtci5kaWFnbm9zdGljc2IG", + "cHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { }, + new pbr::FileDescriptor[] { global::Tango.PMR.Common.DoubleArrayReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Diagnostics.StartDiagnosticsResponse), global::Tango.PMR.Diagnostics.StartDiagnosticsResponse.Parser, new[]{ "Dancer1Angle", "Dancer2Angle", "Dancer3Angle" }, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Diagnostics.PushDiagnosticsResponse), global::Tango.PMR.Diagnostics.PushDiagnosticsResponse.Parser, new[]{ "Dancer1Angle", "Dancer2Angle", "Dancer3Angle", "DispensersMotorsFrequency" }, null, null, null) })); } #endregion } #region Messages - public sealed partial class StartDiagnosticsResponse : pb::IMessage<StartDiagnosticsResponse> { - private static readonly pb::MessageParser<StartDiagnosticsResponse> _parser = new pb::MessageParser<StartDiagnosticsResponse>(() => new StartDiagnosticsResponse()); + public sealed partial class PushDiagnosticsResponse : pb::IMessage<PushDiagnosticsResponse> { + private static readonly pb::MessageParser<PushDiagnosticsResponse> _parser = new pb::MessageParser<PushDiagnosticsResponse>(() => new PushDiagnosticsResponse()); [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public static pb::MessageParser<StartDiagnosticsResponse> Parser { get { return _parser; } } + public static pb::MessageParser<PushDiagnosticsResponse> Parser { get { return _parser; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public static pbr::MessageDescriptor Descriptor { - get { return global::Tango.PMR.Diagnostics.StartDiagnosticsResponseReflection.Descriptor.MessageTypes[0]; } + get { return global::Tango.PMR.Diagnostics.PushDiagnosticsResponseReflection.Descriptor.MessageTypes[0]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -53,22 +55,23 @@ namespace Tango.PMR.Diagnostics { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public StartDiagnosticsResponse() { + public PushDiagnosticsResponse() { OnConstruction(); } partial void OnConstruction(); [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public StartDiagnosticsResponse(StartDiagnosticsResponse other) : this() { + public PushDiagnosticsResponse(PushDiagnosticsResponse other) : this() { dancer1Angle_ = other.dancer1Angle_.Clone(); dancer2Angle_ = other.dancer2Angle_.Clone(); dancer3Angle_ = other.dancer3Angle_.Clone(); + dispensersMotorsFrequency_ = other.dispensersMotorsFrequency_.Clone(); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public StartDiagnosticsResponse Clone() { - return new StartDiagnosticsResponse(this); + public PushDiagnosticsResponse Clone() { + return new PushDiagnosticsResponse(this); } /// <summary>Field number for the "Dancer1Angle" field.</summary> @@ -101,13 +104,23 @@ namespace Tango.PMR.Diagnostics { get { return dancer3Angle_; } } + /// <summary>Field number for the "DispensersMotorsFrequency" field.</summary> + public const int DispensersMotorsFrequencyFieldNumber = 4; + private static readonly pb::FieldCodec<global::Tango.PMR.Common.DoubleArray> _repeated_dispensersMotorsFrequency_codec + = pb::FieldCodec.ForMessage(34, global::Tango.PMR.Common.DoubleArray.Parser); + private readonly pbc::RepeatedField<global::Tango.PMR.Common.DoubleArray> dispensersMotorsFrequency_ = new pbc::RepeatedField<global::Tango.PMR.Common.DoubleArray>(); + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public pbc::RepeatedField<global::Tango.PMR.Common.DoubleArray> DispensersMotorsFrequency { + get { return dispensersMotorsFrequency_; } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override bool Equals(object other) { - return Equals(other as StartDiagnosticsResponse); + return Equals(other as PushDiagnosticsResponse); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public bool Equals(StartDiagnosticsResponse other) { + public bool Equals(PushDiagnosticsResponse other) { if (ReferenceEquals(other, null)) { return false; } @@ -117,6 +130,7 @@ namespace Tango.PMR.Diagnostics { if(!dancer1Angle_.Equals(other.dancer1Angle_)) return false; if(!dancer2Angle_.Equals(other.dancer2Angle_)) return false; if(!dancer3Angle_.Equals(other.dancer3Angle_)) return false; + if(!dispensersMotorsFrequency_.Equals(other.dispensersMotorsFrequency_)) return false; return true; } @@ -126,6 +140,7 @@ namespace Tango.PMR.Diagnostics { hash ^= dancer1Angle_.GetHashCode(); hash ^= dancer2Angle_.GetHashCode(); hash ^= dancer3Angle_.GetHashCode(); + hash ^= dispensersMotorsFrequency_.GetHashCode(); return hash; } @@ -139,6 +154,7 @@ namespace Tango.PMR.Diagnostics { dancer1Angle_.WriteTo(output, _repeated_dancer1Angle_codec); dancer2Angle_.WriteTo(output, _repeated_dancer2Angle_codec); dancer3Angle_.WriteTo(output, _repeated_dancer3Angle_codec); + dispensersMotorsFrequency_.WriteTo(output, _repeated_dispensersMotorsFrequency_codec); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -147,17 +163,19 @@ namespace Tango.PMR.Diagnostics { size += dancer1Angle_.CalculateSize(_repeated_dancer1Angle_codec); size += dancer2Angle_.CalculateSize(_repeated_dancer2Angle_codec); size += dancer3Angle_.CalculateSize(_repeated_dancer3Angle_codec); + size += dispensersMotorsFrequency_.CalculateSize(_repeated_dispensersMotorsFrequency_codec); return size; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void MergeFrom(StartDiagnosticsResponse other) { + public void MergeFrom(PushDiagnosticsResponse other) { if (other == null) { return; } dancer1Angle_.Add(other.dancer1Angle_); dancer2Angle_.Add(other.dancer2Angle_); dancer3Angle_.Add(other.dancer3Angle_); + dispensersMotorsFrequency_.Add(other.dispensersMotorsFrequency_); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -183,6 +201,10 @@ namespace Tango.PMR.Diagnostics { dancer3Angle_.AddEntriesFrom(input, _repeated_dancer3Angle_codec); break; } + case 34: { + dispensersMotorsFrequency_.AddEntriesFrom(input, _repeated_dispensersMotorsFrequency_codec); + break; + } } } } diff --git a/Software/Visual_Studio/Tango.PMR/Hardware/Dancer.cs b/Software/Visual_Studio/Tango.PMR/Hardware/Dancer.cs deleted file mode 100644 index e7fa596ef..000000000 --- a/Software/Visual_Studio/Tango.PMR/Hardware/Dancer.cs +++ /dev/null @@ -1,253 +0,0 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: Dancer.proto -#pragma warning disable 1591, 0612, 3021 -#region Designer generated code - -using pb = global::Google.Protobuf; -using pbc = global::Google.Protobuf.Collections; -using pbr = global::Google.Protobuf.Reflection; -using scg = global::System.Collections.Generic; -namespace Tango.PMR.Hardware { - - /// <summary>Holder for reflection information generated from Dancer.proto</summary> - public static partial class DancerReflection { - - #region Descriptor - /// <summary>File descriptor for Dancer.proto</summary> - public static pbr::FileDescriptor Descriptor { - get { return descriptor; } - } - private static pbr::FileDescriptor descriptor; - - static DancerReflection() { - byte[] descriptorData = global::System.Convert.FromBase64String( - string.Concat( - "CgxEYW5jZXIucHJvdG8SElRhbmdvLlBNUi5IYXJkd2FyZSJOCgZEYW5jZXIS", - "FAoMRml4T3JHcmFkdWFsGAEgASgIEgkKAUsYAiABKAESCQoBWBgDIAEoARIY", - "ChBQdWxzZVBlck1NU3ByaW5nGAQgASgFQh4KHGNvbS50d2luZS50YW5nby5w", - "bXIuaGFyZHdhcmViBnByb3RvMw==")); - descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { }, - new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Hardware.Dancer), global::Tango.PMR.Hardware.Dancer.Parser, new[]{ "FixOrGradual", "K", "X", "PulsePerMMSpring" }, null, null, null) - })); - } - #endregion - - } - #region Messages - public sealed partial class Dancer : pb::IMessage<Dancer> { - private static readonly pb::MessageParser<Dancer> _parser = new pb::MessageParser<Dancer>(() => new Dancer()); - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public static pb::MessageParser<Dancer> Parser { get { return _parser; } } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public static pbr::MessageDescriptor Descriptor { - get { return global::Tango.PMR.Hardware.DancerReflection.Descriptor.MessageTypes[0]; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - pbr::MessageDescriptor pb::IMessage.Descriptor { - get { return Descriptor; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public Dancer() { - OnConstruction(); - } - - partial void OnConstruction(); - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public Dancer(Dancer other) : this() { - fixOrGradual_ = other.fixOrGradual_; - k_ = other.k_; - x_ = other.x_; - pulsePerMMSpring_ = other.pulsePerMMSpring_; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public Dancer Clone() { - return new Dancer(this); - } - - /// <summary>Field number for the "FixOrGradual" field.</summary> - public const int FixOrGradualFieldNumber = 1; - private bool fixOrGradual_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public bool FixOrGradual { - get { return fixOrGradual_; } - set { - fixOrGradual_ = value; - } - } - - /// <summary>Field number for the "K" field.</summary> - public const int KFieldNumber = 2; - private double k_; - /// <summary> - ///for F=KX spring calculation function - /// </summary> - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public double K { - get { return k_; } - set { - k_ = value; - } - } - - /// <summary>Field number for the "X" field.</summary> - public const int XFieldNumber = 3; - private double x_; - /// <summary> - ///for F=KX spring calculation function - /// </summary> - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public double X { - get { return x_; } - set { - x_ = value; - } - } - - /// <summary>Field number for the "PulsePerMMSpring" field.</summary> - public const int PulsePerMMSpringFieldNumber = 4; - private int pulsePerMMSpring_; - /// <summary> - ///changing explanation - /// </summary> - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int PulsePerMMSpring { - get { return pulsePerMMSpring_; } - set { - pulsePerMMSpring_ = value; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override bool Equals(object other) { - return Equals(other as Dancer); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public bool Equals(Dancer other) { - if (ReferenceEquals(other, null)) { - return false; - } - if (ReferenceEquals(other, this)) { - return true; - } - if (FixOrGradual != other.FixOrGradual) return false; - if (K != other.K) return false; - if (X != other.X) return false; - if (PulsePerMMSpring != other.PulsePerMMSpring) return false; - return true; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override int GetHashCode() { - int hash = 1; - if (FixOrGradual != false) hash ^= FixOrGradual.GetHashCode(); - if (K != 0D) hash ^= K.GetHashCode(); - if (X != 0D) hash ^= X.GetHashCode(); - if (PulsePerMMSpring != 0) hash ^= PulsePerMMSpring.GetHashCode(); - return hash; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override string ToString() { - return pb::JsonFormatter.ToDiagnosticString(this); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void WriteTo(pb::CodedOutputStream output) { - if (FixOrGradual != false) { - output.WriteRawTag(8); - output.WriteBool(FixOrGradual); - } - if (K != 0D) { - output.WriteRawTag(17); - output.WriteDouble(K); - } - if (X != 0D) { - output.WriteRawTag(25); - output.WriteDouble(X); - } - if (PulsePerMMSpring != 0) { - output.WriteRawTag(32); - output.WriteInt32(PulsePerMMSpring); - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int CalculateSize() { - int size = 0; - if (FixOrGradual != false) { - size += 1 + 1; - } - if (K != 0D) { - size += 1 + 8; - } - if (X != 0D) { - size += 1 + 8; - } - if (PulsePerMMSpring != 0) { - size += 1 + pb::CodedOutputStream.ComputeInt32Size(PulsePerMMSpring); - } - return size; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void MergeFrom(Dancer other) { - if (other == null) { - return; - } - if (other.FixOrGradual != false) { - FixOrGradual = other.FixOrGradual; - } - if (other.K != 0D) { - K = other.K; - } - if (other.X != 0D) { - X = other.X; - } - if (other.PulsePerMMSpring != 0) { - PulsePerMMSpring = other.PulsePerMMSpring; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void MergeFrom(pb::CodedInputStream input) { - uint tag; - while ((tag = input.ReadTag()) != 0) { - switch(tag) { - default: - input.SkipLastField(); - break; - case 8: { - FixOrGradual = input.ReadBool(); - break; - } - case 17: { - K = input.ReadDouble(); - break; - } - case 25: { - X = input.ReadDouble(); - break; - } - case 32: { - PulsePerMMSpring = input.ReadInt32(); - break; - } - } - } - } - - } - - #endregion - -} - -#endregion Designer generated code diff --git a/Software/Visual_Studio/Tango.PMR/Hardware/Dispenser.cs b/Software/Visual_Studio/Tango.PMR/Hardware/Dispenser.cs deleted file mode 100644 index 803944892..000000000 --- a/Software/Visual_Studio/Tango.PMR/Hardware/Dispenser.cs +++ /dev/null @@ -1,569 +0,0 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: Dispenser.proto -#pragma warning disable 1591, 0612, 3021 -#region Designer generated code - -using pb = global::Google.Protobuf; -using pbc = global::Google.Protobuf.Collections; -using pbr = global::Google.Protobuf.Reflection; -using scg = global::System.Collections.Generic; -namespace Tango.PMR.Hardware { - - /// <summary>Holder for reflection information generated from Dispenser.proto</summary> - public static partial class DispenserReflection { - - #region Descriptor - /// <summary>File descriptor for Dispenser.proto</summary> - public static pbr::FileDescriptor Descriptor { - get { return descriptor; } - } - private static pbr::FileDescriptor descriptor; - - static DispenserReflection() { - byte[] descriptorData = global::System.Convert.FromBase64String( - string.Concat( - "Cg9EaXNwZW5zZXIucHJvdG8SElRhbmdvLlBNUi5IYXJkd2FyZSLFAgoPRGlz", - "cGVuc2VyQ29uZmlnEhkKEURpc3BlbnNlckNhcGFjaXR5GAEgASgFEhcKD01p", - "ZFRhbmtDYXBhY2l0eRgCIAEoBRIWCg5GbG93UGVyUHVsc2VObBgDIAEoARIP", - "CgdNaW5GcmVxGAQgASgNEg8KB01heEZyZXEYBSABKA0SFAoMTWlubWljcm9T", - "dGVwGAYgASgNEhQKDE1heG1pY3JvU3RlcBgHIAEoDRIWCg5Db3JyZWN0aW9u", - "R2FpbhgIIAEoARIYChBSYXRpbzJEcnllclNwZWVkGAkgASgBEgoKAktwGAog", - "ASgBEgoKAktpGAsgASgBEgoKAktkGAwgASgBEhMKC0NoYW5nZVNsb3BlGA0g", - "ASgBEhYKDkhpZ2hMZW5ndGh1U2VjGA4gASgBEhUKDUNvbnRyb2xUaW1pbmcY", - "DyABKAVCHgocY29tLnR3aW5lLnRhbmdvLnBtci5oYXJkd2FyZWIGcHJvdG8z")); - descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { }, - new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Hardware.DispenserConfig), global::Tango.PMR.Hardware.DispenserConfig.Parser, new[]{ "DispenserCapacity", "MidTankCapacity", "FlowPerPulseNl", "MinFreq", "MaxFreq", "MinmicroStep", "MaxmicroStep", "CorrectionGain", "Ratio2DryerSpeed", "Kp", "Ki", "Kd", "ChangeSlope", "HighLengthuSec", "ControlTiming" }, null, null, null) - })); - } - #endregion - - } - #region Messages - public sealed partial class DispenserConfig : pb::IMessage<DispenserConfig> { - private static readonly pb::MessageParser<DispenserConfig> _parser = new pb::MessageParser<DispenserConfig>(() => new DispenserConfig()); - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public static pb::MessageParser<DispenserConfig> Parser { get { return _parser; } } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public static pbr::MessageDescriptor Descriptor { - get { return global::Tango.PMR.Hardware.DispenserReflection.Descriptor.MessageTypes[0]; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - pbr::MessageDescriptor pb::IMessage.Descriptor { - get { return Descriptor; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public DispenserConfig() { - OnConstruction(); - } - - partial void OnConstruction(); - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public DispenserConfig(DispenserConfig other) : this() { - dispenserCapacity_ = other.dispenserCapacity_; - midTankCapacity_ = other.midTankCapacity_; - flowPerPulseNl_ = other.flowPerPulseNl_; - minFreq_ = other.minFreq_; - maxFreq_ = other.maxFreq_; - minmicroStep_ = other.minmicroStep_; - maxmicroStep_ = other.maxmicroStep_; - correctionGain_ = other.correctionGain_; - ratio2DryerSpeed_ = other.ratio2DryerSpeed_; - kp_ = other.kp_; - ki_ = other.ki_; - kd_ = other.kd_; - changeSlope_ = other.changeSlope_; - highLengthuSec_ = other.highLengthuSec_; - controlTiming_ = other.controlTiming_; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public DispenserConfig Clone() { - return new DispenserConfig(this); - } - - /// <summary>Field number for the "DispenserCapacity" field.</summary> - public const int DispenserCapacityFieldNumber = 1; - private int dispenserCapacity_; - /// <summary> - ///milliliters - /// </summary> - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int DispenserCapacity { - get { return dispenserCapacity_; } - set { - dispenserCapacity_ = value; - } - } - - /// <summary>Field number for the "MidTankCapacity" field.</summary> - public const int MidTankCapacityFieldNumber = 2; - private int midTankCapacity_; - /// <summary> - ///milliliters - /// </summary> - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int MidTankCapacity { - get { return midTankCapacity_; } - set { - midTankCapacity_ = value; - } - } - - /// <summary>Field number for the "FlowPerPulseNl" field.</summary> - public const int FlowPerPulseNlFieldNumber = 3; - private double flowPerPulseNl_; - /// <summary> - ///nanoliter per step , uStep = 1 - /// </summary> - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public double FlowPerPulseNl { - get { return flowPerPulseNl_; } - set { - flowPerPulseNl_ = value; - } - } - - /// <summary>Field number for the "MinFreq" field.</summary> - public const int MinFreqFieldNumber = 4; - private uint minFreq_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public uint MinFreq { - get { return minFreq_; } - set { - minFreq_ = value; - } - } - - /// <summary>Field number for the "MaxFreq" field.</summary> - public const int MaxFreqFieldNumber = 5; - private uint maxFreq_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public uint MaxFreq { - get { return maxFreq_; } - set { - maxFreq_ = value; - } - } - - /// <summary>Field number for the "MinmicroStep" field.</summary> - public const int MinmicroStepFieldNumber = 6; - private uint minmicroStep_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public uint MinmicroStep { - get { return minmicroStep_; } - set { - minmicroStep_ = value; - } - } - - /// <summary>Field number for the "MaxmicroStep" field.</summary> - public const int MaxmicroStepFieldNumber = 7; - private uint maxmicroStep_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public uint MaxmicroStep { - get { return maxmicroStep_; } - set { - maxmicroStep_ = value; - } - } - - /// <summary>Field number for the "CorrectionGain" field.</summary> - public const int CorrectionGainFieldNumber = 8; - private double correctionGain_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public double CorrectionGain { - get { return correctionGain_; } - set { - correctionGain_ = value; - } - } - - /// <summary>Field number for the "Ratio2DryerSpeed" field.</summary> - public const int Ratio2DryerSpeedFieldNumber = 9; - private double ratio2DryerSpeed_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public double Ratio2DryerSpeed { - get { return ratio2DryerSpeed_; } - set { - ratio2DryerSpeed_ = value; - } - } - - /// <summary>Field number for the "Kp" field.</summary> - public const int KpFieldNumber = 10; - private double kp_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public double Kp { - get { return kp_; } - set { - kp_ = value; - } - } - - /// <summary>Field number for the "Ki" field.</summary> - public const int KiFieldNumber = 11; - private double ki_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public double Ki { - get { return ki_; } - set { - ki_ = value; - } - } - - /// <summary>Field number for the "Kd" field.</summary> - public const int KdFieldNumber = 12; - private double kd_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public double Kd { - get { return kd_; } - set { - kd_ = value; - } - } - - /// <summary>Field number for the "ChangeSlope" field.</summary> - public const int ChangeSlopeFieldNumber = 13; - private double changeSlope_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public double ChangeSlope { - get { return changeSlope_; } - set { - changeSlope_ = value; - } - } - - /// <summary>Field number for the "HighLengthuSec" field.</summary> - public const int HighLengthuSecFieldNumber = 14; - private double highLengthuSec_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public double HighLengthuSec { - get { return highLengthuSec_; } - set { - highLengthuSec_ = value; - } - } - - /// <summary>Field number for the "ControlTiming" field.</summary> - public const int ControlTimingFieldNumber = 15; - private int controlTiming_; - /// <summary> - ///10-100-1000 milliseconds - /// </summary> - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int ControlTiming { - get { return controlTiming_; } - set { - controlTiming_ = value; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override bool Equals(object other) { - return Equals(other as DispenserConfig); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public bool Equals(DispenserConfig other) { - if (ReferenceEquals(other, null)) { - return false; - } - if (ReferenceEquals(other, this)) { - return true; - } - if (DispenserCapacity != other.DispenserCapacity) return false; - if (MidTankCapacity != other.MidTankCapacity) return false; - if (FlowPerPulseNl != other.FlowPerPulseNl) return false; - if (MinFreq != other.MinFreq) return false; - if (MaxFreq != other.MaxFreq) return false; - if (MinmicroStep != other.MinmicroStep) return false; - if (MaxmicroStep != other.MaxmicroStep) return false; - if (CorrectionGain != other.CorrectionGain) return false; - if (Ratio2DryerSpeed != other.Ratio2DryerSpeed) return false; - if (Kp != other.Kp) return false; - if (Ki != other.Ki) return false; - if (Kd != other.Kd) return false; - if (ChangeSlope != other.ChangeSlope) return false; - if (HighLengthuSec != other.HighLengthuSec) return false; - if (ControlTiming != other.ControlTiming) return false; - return true; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override int GetHashCode() { - int hash = 1; - if (DispenserCapacity != 0) hash ^= DispenserCapacity.GetHashCode(); - if (MidTankCapacity != 0) hash ^= MidTankCapacity.GetHashCode(); - if (FlowPerPulseNl != 0D) hash ^= FlowPerPulseNl.GetHashCode(); - if (MinFreq != 0) hash ^= MinFreq.GetHashCode(); - if (MaxFreq != 0) hash ^= MaxFreq.GetHashCode(); - if (MinmicroStep != 0) hash ^= MinmicroStep.GetHashCode(); - if (MaxmicroStep != 0) hash ^= MaxmicroStep.GetHashCode(); - if (CorrectionGain != 0D) hash ^= CorrectionGain.GetHashCode(); - if (Ratio2DryerSpeed != 0D) hash ^= Ratio2DryerSpeed.GetHashCode(); - if (Kp != 0D) hash ^= Kp.GetHashCode(); - if (Ki != 0D) hash ^= Ki.GetHashCode(); - if (Kd != 0D) hash ^= Kd.GetHashCode(); - if (ChangeSlope != 0D) hash ^= ChangeSlope.GetHashCode(); - if (HighLengthuSec != 0D) hash ^= HighLengthuSec.GetHashCode(); - if (ControlTiming != 0) hash ^= ControlTiming.GetHashCode(); - return hash; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override string ToString() { - return pb::JsonFormatter.ToDiagnosticString(this); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void WriteTo(pb::CodedOutputStream output) { - if (DispenserCapacity != 0) { - output.WriteRawTag(8); - output.WriteInt32(DispenserCapacity); - } - if (MidTankCapacity != 0) { - output.WriteRawTag(16); - output.WriteInt32(MidTankCapacity); - } - if (FlowPerPulseNl != 0D) { - output.WriteRawTag(25); - output.WriteDouble(FlowPerPulseNl); - } - if (MinFreq != 0) { - output.WriteRawTag(32); - output.WriteUInt32(MinFreq); - } - if (MaxFreq != 0) { - output.WriteRawTag(40); - output.WriteUInt32(MaxFreq); - } - if (MinmicroStep != 0) { - output.WriteRawTag(48); - output.WriteUInt32(MinmicroStep); - } - if (MaxmicroStep != 0) { - output.WriteRawTag(56); - output.WriteUInt32(MaxmicroStep); - } - if (CorrectionGain != 0D) { - output.WriteRawTag(65); - output.WriteDouble(CorrectionGain); - } - if (Ratio2DryerSpeed != 0D) { - output.WriteRawTag(73); - output.WriteDouble(Ratio2DryerSpeed); - } - if (Kp != 0D) { - output.WriteRawTag(81); - output.WriteDouble(Kp); - } - if (Ki != 0D) { - output.WriteRawTag(89); - output.WriteDouble(Ki); - } - if (Kd != 0D) { - output.WriteRawTag(97); - output.WriteDouble(Kd); - } - if (ChangeSlope != 0D) { - output.WriteRawTag(105); - output.WriteDouble(ChangeSlope); - } - if (HighLengthuSec != 0D) { - output.WriteRawTag(113); - output.WriteDouble(HighLengthuSec); - } - if (ControlTiming != 0) { - output.WriteRawTag(120); - output.WriteInt32(ControlTiming); - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int CalculateSize() { - int size = 0; - if (DispenserCapacity != 0) { - size += 1 + pb::CodedOutputStream.ComputeInt32Size(DispenserCapacity); - } - if (MidTankCapacity != 0) { - size += 1 + pb::CodedOutputStream.ComputeInt32Size(MidTankCapacity); - } - if (FlowPerPulseNl != 0D) { - size += 1 + 8; - } - if (MinFreq != 0) { - size += 1 + pb::CodedOutputStream.ComputeUInt32Size(MinFreq); - } - if (MaxFreq != 0) { - size += 1 + pb::CodedOutputStream.ComputeUInt32Size(MaxFreq); - } - if (MinmicroStep != 0) { - size += 1 + pb::CodedOutputStream.ComputeUInt32Size(MinmicroStep); - } - if (MaxmicroStep != 0) { - size += 1 + pb::CodedOutputStream.ComputeUInt32Size(MaxmicroStep); - } - if (CorrectionGain != 0D) { - size += 1 + 8; - } - if (Ratio2DryerSpeed != 0D) { - size += 1 + 8; - } - if (Kp != 0D) { - size += 1 + 8; - } - if (Ki != 0D) { - size += 1 + 8; - } - if (Kd != 0D) { - size += 1 + 8; - } - if (ChangeSlope != 0D) { - size += 1 + 8; - } - if (HighLengthuSec != 0D) { - size += 1 + 8; - } - if (ControlTiming != 0) { - size += 1 + pb::CodedOutputStream.ComputeInt32Size(ControlTiming); - } - return size; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void MergeFrom(DispenserConfig other) { - if (other == null) { - return; - } - if (other.DispenserCapacity != 0) { - DispenserCapacity = other.DispenserCapacity; - } - if (other.MidTankCapacity != 0) { - MidTankCapacity = other.MidTankCapacity; - } - if (other.FlowPerPulseNl != 0D) { - FlowPerPulseNl = other.FlowPerPulseNl; - } - if (other.MinFreq != 0) { - MinFreq = other.MinFreq; - } - if (other.MaxFreq != 0) { - MaxFreq = other.MaxFreq; - } - if (other.MinmicroStep != 0) { - MinmicroStep = other.MinmicroStep; - } - if (other.MaxmicroStep != 0) { - MaxmicroStep = other.MaxmicroStep; - } - if (other.CorrectionGain != 0D) { - CorrectionGain = other.CorrectionGain; - } - if (other.Ratio2DryerSpeed != 0D) { - Ratio2DryerSpeed = other.Ratio2DryerSpeed; - } - if (other.Kp != 0D) { - Kp = other.Kp; - } - if (other.Ki != 0D) { - Ki = other.Ki; - } - if (other.Kd != 0D) { - Kd = other.Kd; - } - if (other.ChangeSlope != 0D) { - ChangeSlope = other.ChangeSlope; - } - if (other.HighLengthuSec != 0D) { - HighLengthuSec = other.HighLengthuSec; - } - if (other.ControlTiming != 0) { - ControlTiming = other.ControlTiming; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void MergeFrom(pb::CodedInputStream input) { - uint tag; - while ((tag = input.ReadTag()) != 0) { - switch(tag) { - default: - input.SkipLastField(); - break; - case 8: { - DispenserCapacity = input.ReadInt32(); - break; - } - case 16: { - MidTankCapacity = input.ReadInt32(); - break; - } - case 25: { - FlowPerPulseNl = input.ReadDouble(); - break; - } - case 32: { - MinFreq = input.ReadUInt32(); - break; - } - case 40: { - MaxFreq = input.ReadUInt32(); - break; - } - case 48: { - MinmicroStep = input.ReadUInt32(); - break; - } - case 56: { - MaxmicroStep = input.ReadUInt32(); - break; - } - case 65: { - CorrectionGain = input.ReadDouble(); - break; - } - case 73: { - Ratio2DryerSpeed = input.ReadDouble(); - break; - } - case 81: { - Kp = input.ReadDouble(); - break; - } - case 89: { - Ki = input.ReadDouble(); - break; - } - case 97: { - Kd = input.ReadDouble(); - break; - } - case 105: { - ChangeSlope = input.ReadDouble(); - break; - } - case 113: { - HighLengthuSec = input.ReadDouble(); - break; - } - case 120: { - ControlTiming = input.ReadInt32(); - break; - } - } - } - } - - } - - #endregion - -} - -#endregion Designer generated code diff --git a/Software/Visual_Studio/Tango.PMR/Hardware/InternalWinder.cs b/Software/Visual_Studio/Tango.PMR/Hardware/InternalWinder.cs deleted file mode 100644 index 6050ed4e4..000000000 --- a/Software/Visual_Studio/Tango.PMR/Hardware/InternalWinder.cs +++ /dev/null @@ -1,245 +0,0 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: InternalWinder.proto -#pragma warning disable 1591, 0612, 3021 -#region Designer generated code - -using pb = global::Google.Protobuf; -using pbc = global::Google.Protobuf.Collections; -using pbr = global::Google.Protobuf.Reflection; -using scg = global::System.Collections.Generic; -namespace Tango.PMR.Hardware { - - /// <summary>Holder for reflection information generated from InternalWinder.proto</summary> - public static partial class InternalWinderReflection { - - #region Descriptor - /// <summary>File descriptor for InternalWinder.proto</summary> - public static pbr::FileDescriptor Descriptor { - get { return descriptor; } - } - private static pbr::FileDescriptor descriptor; - - static InternalWinderReflection() { - byte[] descriptorData = global::System.Convert.FromBase64String( - string.Concat( - "ChRJbnRlcm5hbFdpbmRlci5wcm90bxISVGFuZ28uUE1SLkhhcmR3YXJlIogB", - "ChRJbnRlcm5hbFdpbmRlckNvbmZpZxIZChFTdGFydE9mZnNldFB1bHNlcxgB", - "IAEoDRIYChBTcG9vbEJhY2tpbmdSYXRlGAIgASgNEhsKE1NlZ21lbnRPZmZz", - "ZXRQdWxzZXMYAyABKA0SHgoWTWlsbGltZXRlcnNQZXJSb3RhdGlvbhgEIAEo", - "DUIeChxjb20udHdpbmUudGFuZ28ucG1yLmhhcmR3YXJlYgZwcm90bzM=")); - descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { }, - new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Hardware.InternalWinderConfig), global::Tango.PMR.Hardware.InternalWinderConfig.Parser, new[]{ "StartOffsetPulses", "SpoolBackingRate", "SegmentOffsetPulses", "MillimetersPerRotation" }, null, null, null) - })); - } - #endregion - - } - #region Messages - public sealed partial class InternalWinderConfig : pb::IMessage<InternalWinderConfig> { - private static readonly pb::MessageParser<InternalWinderConfig> _parser = new pb::MessageParser<InternalWinderConfig>(() => new InternalWinderConfig()); - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public static pb::MessageParser<InternalWinderConfig> Parser { get { return _parser; } } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public static pbr::MessageDescriptor Descriptor { - get { return global::Tango.PMR.Hardware.InternalWinderReflection.Descriptor.MessageTypes[0]; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - pbr::MessageDescriptor pb::IMessage.Descriptor { - get { return Descriptor; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public InternalWinderConfig() { - OnConstruction(); - } - - partial void OnConstruction(); - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public InternalWinderConfig(InternalWinderConfig other) : this() { - startOffsetPulses_ = other.startOffsetPulses_; - spoolBackingRate_ = other.spoolBackingRate_; - segmentOffsetPulses_ = other.segmentOffsetPulses_; - millimetersPerRotation_ = other.millimetersPerRotation_; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public InternalWinderConfig Clone() { - return new InternalWinderConfig(this); - } - - /// <summary>Field number for the "StartOffsetPulses" field.</summary> - public const int StartOffsetPulsesFieldNumber = 1; - private uint startOffsetPulses_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public uint StartOffsetPulses { - get { return startOffsetPulses_; } - set { - startOffsetPulses_ = value; - } - } - - /// <summary>Field number for the "SpoolBackingRate" field.</summary> - public const int SpoolBackingRateFieldNumber = 2; - private uint spoolBackingRate_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public uint SpoolBackingRate { - get { return spoolBackingRate_; } - set { - spoolBackingRate_ = value; - } - } - - /// <summary>Field number for the "SegmentOffsetPulses" field.</summary> - public const int SegmentOffsetPulsesFieldNumber = 3; - private uint segmentOffsetPulses_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public uint SegmentOffsetPulses { - get { return segmentOffsetPulses_; } - set { - segmentOffsetPulses_ = value; - } - } - - /// <summary>Field number for the "MillimetersPerRotation" field.</summary> - public const int MillimetersPerRotationFieldNumber = 4; - private uint millimetersPerRotation_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public uint MillimetersPerRotation { - get { return millimetersPerRotation_; } - set { - millimetersPerRotation_ = value; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override bool Equals(object other) { - return Equals(other as InternalWinderConfig); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public bool Equals(InternalWinderConfig other) { - if (ReferenceEquals(other, null)) { - return false; - } - if (ReferenceEquals(other, this)) { - return true; - } - if (StartOffsetPulses != other.StartOffsetPulses) return false; - if (SpoolBackingRate != other.SpoolBackingRate) return false; - if (SegmentOffsetPulses != other.SegmentOffsetPulses) return false; - if (MillimetersPerRotation != other.MillimetersPerRotation) return false; - return true; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override int GetHashCode() { - int hash = 1; - if (StartOffsetPulses != 0) hash ^= StartOffsetPulses.GetHashCode(); - if (SpoolBackingRate != 0) hash ^= SpoolBackingRate.GetHashCode(); - if (SegmentOffsetPulses != 0) hash ^= SegmentOffsetPulses.GetHashCode(); - if (MillimetersPerRotation != 0) hash ^= MillimetersPerRotation.GetHashCode(); - return hash; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override string ToString() { - return pb::JsonFormatter.ToDiagnosticString(this); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void WriteTo(pb::CodedOutputStream output) { - if (StartOffsetPulses != 0) { - output.WriteRawTag(8); - output.WriteUInt32(StartOffsetPulses); - } - if (SpoolBackingRate != 0) { - output.WriteRawTag(16); - output.WriteUInt32(SpoolBackingRate); - } - if (SegmentOffsetPulses != 0) { - output.WriteRawTag(24); - output.WriteUInt32(SegmentOffsetPulses); - } - if (MillimetersPerRotation != 0) { - output.WriteRawTag(32); - output.WriteUInt32(MillimetersPerRotation); - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int CalculateSize() { - int size = 0; - if (StartOffsetPulses != 0) { - size += 1 + pb::CodedOutputStream.ComputeUInt32Size(StartOffsetPulses); - } - if (SpoolBackingRate != 0) { - size += 1 + pb::CodedOutputStream.ComputeUInt32Size(SpoolBackingRate); - } - if (SegmentOffsetPulses != 0) { - size += 1 + pb::CodedOutputStream.ComputeUInt32Size(SegmentOffsetPulses); - } - if (MillimetersPerRotation != 0) { - size += 1 + pb::CodedOutputStream.ComputeUInt32Size(MillimetersPerRotation); - } - return size; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void MergeFrom(InternalWinderConfig other) { - if (other == null) { - return; - } - if (other.StartOffsetPulses != 0) { - StartOffsetPulses = other.StartOffsetPulses; - } - if (other.SpoolBackingRate != 0) { - SpoolBackingRate = other.SpoolBackingRate; - } - if (other.SegmentOffsetPulses != 0) { - SegmentOffsetPulses = other.SegmentOffsetPulses; - } - if (other.MillimetersPerRotation != 0) { - MillimetersPerRotation = other.MillimetersPerRotation; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void MergeFrom(pb::CodedInputStream input) { - uint tag; - while ((tag = input.ReadTag()) != 0) { - switch(tag) { - default: - input.SkipLastField(); - break; - case 8: { - StartOffsetPulses = input.ReadUInt32(); - break; - } - case 16: { - SpoolBackingRate = input.ReadUInt32(); - break; - } - case 24: { - SegmentOffsetPulses = input.ReadUInt32(); - break; - } - case 32: { - MillimetersPerRotation = input.ReadUInt32(); - break; - } - } - } - } - - } - - #endregion - -} - -#endregion Designer generated code diff --git a/Software/Visual_Studio/Tango.PMR/Hardware/Motor.cs b/Software/Visual_Studio/Tango.PMR/Hardware/Motor.cs deleted file mode 100644 index 28659d7af..000000000 --- a/Software/Visual_Studio/Tango.PMR/Hardware/Motor.cs +++ /dev/null @@ -1,572 +0,0 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: Motor.proto -#pragma warning disable 1591, 0612, 3021 -#region Designer generated code - -using pb = global::Google.Protobuf; -using pbc = global::Google.Protobuf.Collections; -using pbr = global::Google.Protobuf.Reflection; -using scg = global::System.Collections.Generic; -namespace Tango.PMR.Hardware { - - /// <summary>Holder for reflection information generated from Motor.proto</summary> - public static partial class MotorReflection { - - #region Descriptor - /// <summary>File descriptor for Motor.proto</summary> - public static pbr::FileDescriptor Descriptor { - get { return descriptor; } - } - private static pbr::FileDescriptor descriptor; - - static MotorReflection() { - byte[] descriptorData = global::System.Convert.FromBase64String( - string.Concat( - "CgtNb3Rvci5wcm90bxISVGFuZ28uUE1SLkhhcmR3YXJlIskCCgtNb3RvckNv", - "bmZpZxInCgJJZBgBIAEoDjIbLlRhbmdvLlBNUi5IYXJkd2FyZS5Nb3Rvcklk", - "Eg8KB01pbkZyZXEYAiABKA0SDwoHTWF4RnJlcRgDIAEoDRIUCgxNaW5taWNy", - "b1N0ZXAYBCABKA0SFAoMTWF4bWljcm9TdGVwGAUgASgNEhMKC0xpbmVhclJh", - "dGlvGAYgASgBEhYKDk1lZGlhblBvc2l0aW9uGAcgASgNEhYKDkNvcnJlY3Rp", - "b25HYWluGAggASgBEhgKEFJhdGlvMkRyeWVyU3BlZWQYCSABKAESCgoCS3AY", - "CiABKAESCgoCS2kYCyABKAESCgoCS2QYDCABKAESEwoLQ2hhbmdlU2xvcGUY", - "DSABKAESFgoOSGlnaExlbmd0aHVTZWMYDiABKAESEwoLU3BlZWRLZWVwZXIY", - "DyABKAgqOAoHTW90b3JJZBIKCgZGZWVkZXIQABIJCgVEcnllchABEgoKBlBv", - "b2xlchACEgoKBldpbmRlchADQh4KHGNvbS50d2luZS50YW5nby5wbXIuaGFy", - "ZHdhcmViBnByb3RvMw==")); - descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { }, - new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.Hardware.MotorId), }, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Hardware.MotorConfig), global::Tango.PMR.Hardware.MotorConfig.Parser, new[]{ "Id", "MinFreq", "MaxFreq", "MinmicroStep", "MaxmicroStep", "LinearRatio", "MedianPosition", "CorrectionGain", "Ratio2DryerSpeed", "Kp", "Ki", "Kd", "ChangeSlope", "HighLengthuSec", "SpeedKeeper" }, null, null, null) - })); - } - #endregion - - } - #region Enums - public enum MotorId { - [pbr::OriginalName("Feeder")] Feeder = 0, - [pbr::OriginalName("Dryer")] Dryer = 1, - [pbr::OriginalName("Pooler")] Pooler = 2, - [pbr::OriginalName("Winder")] Winder = 3, - } - - #endregion - - #region Messages - public sealed partial class MotorConfig : pb::IMessage<MotorConfig> { - private static readonly pb::MessageParser<MotorConfig> _parser = new pb::MessageParser<MotorConfig>(() => new MotorConfig()); - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public static pb::MessageParser<MotorConfig> Parser { get { return _parser; } } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public static pbr::MessageDescriptor Descriptor { - get { return global::Tango.PMR.Hardware.MotorReflection.Descriptor.MessageTypes[0]; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - pbr::MessageDescriptor pb::IMessage.Descriptor { - get { return Descriptor; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public MotorConfig() { - OnConstruction(); - } - - partial void OnConstruction(); - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public MotorConfig(MotorConfig other) : this() { - id_ = other.id_; - minFreq_ = other.minFreq_; - maxFreq_ = other.maxFreq_; - minmicroStep_ = other.minmicroStep_; - maxmicroStep_ = other.maxmicroStep_; - linearRatio_ = other.linearRatio_; - medianPosition_ = other.medianPosition_; - correctionGain_ = other.correctionGain_; - ratio2DryerSpeed_ = other.ratio2DryerSpeed_; - kp_ = other.kp_; - ki_ = other.ki_; - kd_ = other.kd_; - changeSlope_ = other.changeSlope_; - highLengthuSec_ = other.highLengthuSec_; - speedKeeper_ = other.speedKeeper_; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public MotorConfig Clone() { - return new MotorConfig(this); - } - - /// <summary>Field number for the "Id" field.</summary> - public const int IdFieldNumber = 1; - private global::Tango.PMR.Hardware.MotorId id_ = 0; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public global::Tango.PMR.Hardware.MotorId Id { - get { return id_; } - set { - id_ = value; - } - } - - /// <summary>Field number for the "MinFreq" field.</summary> - public const int MinFreqFieldNumber = 2; - private uint minFreq_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public uint MinFreq { - get { return minFreq_; } - set { - minFreq_ = value; - } - } - - /// <summary>Field number for the "MaxFreq" field.</summary> - public const int MaxFreqFieldNumber = 3; - private uint maxFreq_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public uint MaxFreq { - get { return maxFreq_; } - set { - maxFreq_ = value; - } - } - - /// <summary>Field number for the "MinmicroStep" field.</summary> - public const int MinmicroStepFieldNumber = 4; - private uint minmicroStep_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public uint MinmicroStep { - get { return minmicroStep_; } - set { - minmicroStep_ = value; - } - } - - /// <summary>Field number for the "MaxmicroStep" field.</summary> - public const int MaxmicroStepFieldNumber = 5; - private uint maxmicroStep_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public uint MaxmicroStep { - get { return maxmicroStep_; } - set { - maxmicroStep_ = value; - } - } - - /// <summary>Field number for the "LinearRatio" field.</summary> - public const int LinearRatioFieldNumber = 6; - private double linearRatio_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public double LinearRatio { - get { return linearRatio_; } - set { - linearRatio_ = value; - } - } - - /// <summary>Field number for the "MedianPosition" field.</summary> - public const int MedianPositionFieldNumber = 7; - private uint medianPosition_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public uint MedianPosition { - get { return medianPosition_; } - set { - medianPosition_ = value; - } - } - - /// <summary>Field number for the "CorrectionGain" field.</summary> - public const int CorrectionGainFieldNumber = 8; - private double correctionGain_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public double CorrectionGain { - get { return correctionGain_; } - set { - correctionGain_ = value; - } - } - - /// <summary>Field number for the "Ratio2DryerSpeed" field.</summary> - public const int Ratio2DryerSpeedFieldNumber = 9; - private double ratio2DryerSpeed_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public double Ratio2DryerSpeed { - get { return ratio2DryerSpeed_; } - set { - ratio2DryerSpeed_ = value; - } - } - - /// <summary>Field number for the "Kp" field.</summary> - public const int KpFieldNumber = 10; - private double kp_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public double Kp { - get { return kp_; } - set { - kp_ = value; - } - } - - /// <summary>Field number for the "Ki" field.</summary> - public const int KiFieldNumber = 11; - private double ki_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public double Ki { - get { return ki_; } - set { - ki_ = value; - } - } - - /// <summary>Field number for the "Kd" field.</summary> - public const int KdFieldNumber = 12; - private double kd_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public double Kd { - get { return kd_; } - set { - kd_ = value; - } - } - - /// <summary>Field number for the "ChangeSlope" field.</summary> - public const int ChangeSlopeFieldNumber = 13; - private double changeSlope_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public double ChangeSlope { - get { return changeSlope_; } - set { - changeSlope_ = value; - } - } - - /// <summary>Field number for the "HighLengthuSec" field.</summary> - public const int HighLengthuSecFieldNumber = 14; - private double highLengthuSec_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public double HighLengthuSec { - get { return highLengthuSec_; } - set { - highLengthuSec_ = value; - } - } - - /// <summary>Field number for the "SpeedKeeper" field.</summary> - public const int SpeedKeeperFieldNumber = 15; - private bool speedKeeper_; - /// <summary> - ///one motor is setting the speed for the whole system. - /// </summary> - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public bool SpeedKeeper { - get { return speedKeeper_; } - set { - speedKeeper_ = value; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override bool Equals(object other) { - return Equals(other as MotorConfig); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public bool Equals(MotorConfig other) { - if (ReferenceEquals(other, null)) { - return false; - } - if (ReferenceEquals(other, this)) { - return true; - } - if (Id != other.Id) return false; - if (MinFreq != other.MinFreq) return false; - if (MaxFreq != other.MaxFreq) return false; - if (MinmicroStep != other.MinmicroStep) return false; - if (MaxmicroStep != other.MaxmicroStep) return false; - if (LinearRatio != other.LinearRatio) return false; - if (MedianPosition != other.MedianPosition) return false; - if (CorrectionGain != other.CorrectionGain) return false; - if (Ratio2DryerSpeed != other.Ratio2DryerSpeed) return false; - if (Kp != other.Kp) return false; - if (Ki != other.Ki) return false; - if (Kd != other.Kd) return false; - if (ChangeSlope != other.ChangeSlope) return false; - if (HighLengthuSec != other.HighLengthuSec) return false; - if (SpeedKeeper != other.SpeedKeeper) return false; - return true; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override int GetHashCode() { - int hash = 1; - if (Id != 0) hash ^= Id.GetHashCode(); - if (MinFreq != 0) hash ^= MinFreq.GetHashCode(); - if (MaxFreq != 0) hash ^= MaxFreq.GetHashCode(); - if (MinmicroStep != 0) hash ^= MinmicroStep.GetHashCode(); - if (MaxmicroStep != 0) hash ^= MaxmicroStep.GetHashCode(); - if (LinearRatio != 0D) hash ^= LinearRatio.GetHashCode(); - if (MedianPosition != 0) hash ^= MedianPosition.GetHashCode(); - if (CorrectionGain != 0D) hash ^= CorrectionGain.GetHashCode(); - if (Ratio2DryerSpeed != 0D) hash ^= Ratio2DryerSpeed.GetHashCode(); - if (Kp != 0D) hash ^= Kp.GetHashCode(); - if (Ki != 0D) hash ^= Ki.GetHashCode(); - if (Kd != 0D) hash ^= Kd.GetHashCode(); - if (ChangeSlope != 0D) hash ^= ChangeSlope.GetHashCode(); - if (HighLengthuSec != 0D) hash ^= HighLengthuSec.GetHashCode(); - if (SpeedKeeper != false) hash ^= SpeedKeeper.GetHashCode(); - return hash; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override string ToString() { - return pb::JsonFormatter.ToDiagnosticString(this); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void WriteTo(pb::CodedOutputStream output) { - if (Id != 0) { - output.WriteRawTag(8); - output.WriteEnum((int) Id); - } - if (MinFreq != 0) { - output.WriteRawTag(16); - output.WriteUInt32(MinFreq); - } - if (MaxFreq != 0) { - output.WriteRawTag(24); - output.WriteUInt32(MaxFreq); - } - if (MinmicroStep != 0) { - output.WriteRawTag(32); - output.WriteUInt32(MinmicroStep); - } - if (MaxmicroStep != 0) { - output.WriteRawTag(40); - output.WriteUInt32(MaxmicroStep); - } - if (LinearRatio != 0D) { - output.WriteRawTag(49); - output.WriteDouble(LinearRatio); - } - if (MedianPosition != 0) { - output.WriteRawTag(56); - output.WriteUInt32(MedianPosition); - } - if (CorrectionGain != 0D) { - output.WriteRawTag(65); - output.WriteDouble(CorrectionGain); - } - if (Ratio2DryerSpeed != 0D) { - output.WriteRawTag(73); - output.WriteDouble(Ratio2DryerSpeed); - } - if (Kp != 0D) { - output.WriteRawTag(81); - output.WriteDouble(Kp); - } - if (Ki != 0D) { - output.WriteRawTag(89); - output.WriteDouble(Ki); - } - if (Kd != 0D) { - output.WriteRawTag(97); - output.WriteDouble(Kd); - } - if (ChangeSlope != 0D) { - output.WriteRawTag(105); - output.WriteDouble(ChangeSlope); - } - if (HighLengthuSec != 0D) { - output.WriteRawTag(113); - output.WriteDouble(HighLengthuSec); - } - if (SpeedKeeper != false) { - output.WriteRawTag(120); - output.WriteBool(SpeedKeeper); - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int CalculateSize() { - int size = 0; - if (Id != 0) { - size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Id); - } - if (MinFreq != 0) { - size += 1 + pb::CodedOutputStream.ComputeUInt32Size(MinFreq); - } - if (MaxFreq != 0) { - size += 1 + pb::CodedOutputStream.ComputeUInt32Size(MaxFreq); - } - if (MinmicroStep != 0) { - size += 1 + pb::CodedOutputStream.ComputeUInt32Size(MinmicroStep); - } - if (MaxmicroStep != 0) { - size += 1 + pb::CodedOutputStream.ComputeUInt32Size(MaxmicroStep); - } - if (LinearRatio != 0D) { - size += 1 + 8; - } - if (MedianPosition != 0) { - size += 1 + pb::CodedOutputStream.ComputeUInt32Size(MedianPosition); - } - if (CorrectionGain != 0D) { - size += 1 + 8; - } - if (Ratio2DryerSpeed != 0D) { - size += 1 + 8; - } - if (Kp != 0D) { - size += 1 + 8; - } - if (Ki != 0D) { - size += 1 + 8; - } - if (Kd != 0D) { - size += 1 + 8; - } - if (ChangeSlope != 0D) { - size += 1 + 8; - } - if (HighLengthuSec != 0D) { - size += 1 + 8; - } - if (SpeedKeeper != false) { - size += 1 + 1; - } - return size; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void MergeFrom(MotorConfig other) { - if (other == null) { - return; - } - if (other.Id != 0) { - Id = other.Id; - } - if (other.MinFreq != 0) { - MinFreq = other.MinFreq; - } - if (other.MaxFreq != 0) { - MaxFreq = other.MaxFreq; - } - if (other.MinmicroStep != 0) { - MinmicroStep = other.MinmicroStep; - } - if (other.MaxmicroStep != 0) { - MaxmicroStep = other.MaxmicroStep; - } - if (other.LinearRatio != 0D) { - LinearRatio = other.LinearRatio; - } - if (other.MedianPosition != 0) { - MedianPosition = other.MedianPosition; - } - if (other.CorrectionGain != 0D) { - CorrectionGain = other.CorrectionGain; - } - if (other.Ratio2DryerSpeed != 0D) { - Ratio2DryerSpeed = other.Ratio2DryerSpeed; - } - if (other.Kp != 0D) { - Kp = other.Kp; - } - if (other.Ki != 0D) { - Ki = other.Ki; - } - if (other.Kd != 0D) { - Kd = other.Kd; - } - if (other.ChangeSlope != 0D) { - ChangeSlope = other.ChangeSlope; - } - if (other.HighLengthuSec != 0D) { - HighLengthuSec = other.HighLengthuSec; - } - if (other.SpeedKeeper != false) { - SpeedKeeper = other.SpeedKeeper; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void MergeFrom(pb::CodedInputStream input) { - uint tag; - while ((tag = input.ReadTag()) != 0) { - switch(tag) { - default: - input.SkipLastField(); - break; - case 8: { - id_ = (global::Tango.PMR.Hardware.MotorId) input.ReadEnum(); - break; - } - case 16: { - MinFreq = input.ReadUInt32(); - break; - } - case 24: { - MaxFreq = input.ReadUInt32(); - break; - } - case 32: { - MinmicroStep = input.ReadUInt32(); - break; - } - case 40: { - MaxmicroStep = input.ReadUInt32(); - break; - } - case 49: { - LinearRatio = input.ReadDouble(); - break; - } - case 56: { - MedianPosition = input.ReadUInt32(); - break; - } - case 65: { - CorrectionGain = input.ReadDouble(); - break; - } - case 73: { - Ratio2DryerSpeed = input.ReadDouble(); - break; - } - case 81: { - Kp = input.ReadDouble(); - break; - } - case 89: { - Ki = input.ReadDouble(); - break; - } - case 97: { - Kd = input.ReadDouble(); - break; - } - case 105: { - ChangeSlope = input.ReadDouble(); - break; - } - case 113: { - HighLengthuSec = input.ReadDouble(); - break; - } - case 120: { - SpeedKeeper = input.ReadBool(); - break; - } - } - } - } - - } - - #endregion - -} - -#endregion Designer generated code diff --git a/Software/Visual_Studio/Tango.PMR/Hardware/PIDCluster.cs b/Software/Visual_Studio/Tango.PMR/Hardware/PIDCluster.cs deleted file mode 100644 index 3d0c07360..000000000 --- a/Software/Visual_Studio/Tango.PMR/Hardware/PIDCluster.cs +++ /dev/null @@ -1,303 +0,0 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: PIDCluster.proto -#pragma warning disable 1591, 0612, 3021 -#region Designer generated code - -using pb = global::Google.Protobuf; -using pbc = global::Google.Protobuf.Collections; -using pbr = global::Google.Protobuf.Reflection; -using scg = global::System.Collections.Generic; -namespace Tango.PMR.Hardware { - - /// <summary>Holder for reflection information generated from PIDCluster.proto</summary> - public static partial class PIDClusterReflection { - - #region Descriptor - /// <summary>File descriptor for PIDCluster.proto</summary> - public static pbr::FileDescriptor Descriptor { - get { return descriptor; } - } - private static pbr::FileDescriptor descriptor; - - static PIDClusterReflection() { - byte[] descriptorData = global::System.Convert.FromBase64String( - string.Concat( - "ChBQSURDbHVzdGVyLnByb3RvEhJUYW5nby5QTVIuSGFyZHdhcmUaEFBJRENv", - "bnRyb2wucHJvdG8i0AEKClBJRENsdXN0ZXISDAoETmFtZRgBIAEoCRIuCgdN", - "ZW1iZXIxGAIgASgOMh0uVGFuZ28uUE1SLkhhcmR3YXJlLkNvbnRyb2xJZBIu", - "CgdNZW1iZXIyGAMgASgOMh0uVGFuZ28uUE1SLkhhcmR3YXJlLkNvbnRyb2xJ", - "ZBIYChBDbHVzdGVyQ3ljbGVUaW1lGAQgASgCEiMKG01lbWJlcjFQb3dlckxp", - "bWl0UGVyY2VudGFnZRgFIAEoAhIVCg1DbHVzdGVyQWN0aXZlGAYgASgIQh4K", - "HGNvbS50d2luZS50YW5nby5wbXIuaGFyZHdhcmViBnByb3RvMw==")); - descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::Tango.PMR.Hardware.PIDControlReflection.Descriptor, }, - new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Hardware.PIDCluster), global::Tango.PMR.Hardware.PIDCluster.Parser, new[]{ "Name", "Member1", "Member2", "ClusterCycleTime", "Member1PowerLimitPercentage", "ClusterActive" }, null, null, null) - })); - } - #endregion - - } - #region Messages - public sealed partial class PIDCluster : pb::IMessage<PIDCluster> { - private static readonly pb::MessageParser<PIDCluster> _parser = new pb::MessageParser<PIDCluster>(() => new PIDCluster()); - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public static pb::MessageParser<PIDCluster> Parser { get { return _parser; } } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public static pbr::MessageDescriptor Descriptor { - get { return global::Tango.PMR.Hardware.PIDClusterReflection.Descriptor.MessageTypes[0]; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - pbr::MessageDescriptor pb::IMessage.Descriptor { - get { return Descriptor; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public PIDCluster() { - OnConstruction(); - } - - partial void OnConstruction(); - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public PIDCluster(PIDCluster other) : this() { - name_ = other.name_; - member1_ = other.member1_; - member2_ = other.member2_; - clusterCycleTime_ = other.clusterCycleTime_; - member1PowerLimitPercentage_ = other.member1PowerLimitPercentage_; - clusterActive_ = other.clusterActive_; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public PIDCluster Clone() { - return new PIDCluster(this); - } - - /// <summary>Field number for the "Name" field.</summary> - public const int NameFieldNumber = 1; - private string name_ = ""; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public string Name { - get { return name_; } - set { - name_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); - } - } - - /// <summary>Field number for the "Member1" field.</summary> - public const int Member1FieldNumber = 2; - private global::Tango.PMR.Hardware.ControlId member1_ = 0; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public global::Tango.PMR.Hardware.ControlId Member1 { - get { return member1_; } - set { - member1_ = value; - } - } - - /// <summary>Field number for the "Member2" field.</summary> - public const int Member2FieldNumber = 3; - private global::Tango.PMR.Hardware.ControlId member2_ = 0; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public global::Tango.PMR.Hardware.ControlId Member2 { - get { return member2_; } - set { - member2_ = value; - } - } - - /// <summary>Field number for the "ClusterCycleTime" field.</summary> - public const int ClusterCycleTimeFieldNumber = 4; - private float clusterCycleTime_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public float ClusterCycleTime { - get { return clusterCycleTime_; } - set { - clusterCycleTime_ = value; - } - } - - /// <summary>Field number for the "Member1PowerLimitPercentage" field.</summary> - public const int Member1PowerLimitPercentageFieldNumber = 5; - private float member1PowerLimitPercentage_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public float Member1PowerLimitPercentage { - get { return member1PowerLimitPercentage_; } - set { - member1PowerLimitPercentage_ = value; - } - } - - /// <summary>Field number for the "ClusterActive" field.</summary> - public const int ClusterActiveFieldNumber = 6; - private bool clusterActive_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public bool ClusterActive { - get { return clusterActive_; } - set { - clusterActive_ = value; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override bool Equals(object other) { - return Equals(other as PIDCluster); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public bool Equals(PIDCluster other) { - if (ReferenceEquals(other, null)) { - return false; - } - if (ReferenceEquals(other, this)) { - return true; - } - if (Name != other.Name) return false; - if (Member1 != other.Member1) return false; - if (Member2 != other.Member2) return false; - if (ClusterCycleTime != other.ClusterCycleTime) return false; - if (Member1PowerLimitPercentage != other.Member1PowerLimitPercentage) return false; - if (ClusterActive != other.ClusterActive) return false; - return true; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override int GetHashCode() { - int hash = 1; - if (Name.Length != 0) hash ^= Name.GetHashCode(); - if (Member1 != 0) hash ^= Member1.GetHashCode(); - if (Member2 != 0) hash ^= Member2.GetHashCode(); - if (ClusterCycleTime != 0F) hash ^= ClusterCycleTime.GetHashCode(); - if (Member1PowerLimitPercentage != 0F) hash ^= Member1PowerLimitPercentage.GetHashCode(); - if (ClusterActive != false) hash ^= ClusterActive.GetHashCode(); - return hash; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override string ToString() { - return pb::JsonFormatter.ToDiagnosticString(this); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void WriteTo(pb::CodedOutputStream output) { - if (Name.Length != 0) { - output.WriteRawTag(10); - output.WriteString(Name); - } - if (Member1 != 0) { - output.WriteRawTag(16); - output.WriteEnum((int) Member1); - } - if (Member2 != 0) { - output.WriteRawTag(24); - output.WriteEnum((int) Member2); - } - if (ClusterCycleTime != 0F) { - output.WriteRawTag(37); - output.WriteFloat(ClusterCycleTime); - } - if (Member1PowerLimitPercentage != 0F) { - output.WriteRawTag(45); - output.WriteFloat(Member1PowerLimitPercentage); - } - if (ClusterActive != false) { - output.WriteRawTag(48); - output.WriteBool(ClusterActive); - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int CalculateSize() { - int size = 0; - if (Name.Length != 0) { - size += 1 + pb::CodedOutputStream.ComputeStringSize(Name); - } - if (Member1 != 0) { - size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Member1); - } - if (Member2 != 0) { - size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Member2); - } - if (ClusterCycleTime != 0F) { - size += 1 + 4; - } - if (Member1PowerLimitPercentage != 0F) { - size += 1 + 4; - } - if (ClusterActive != false) { - size += 1 + 1; - } - return size; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void MergeFrom(PIDCluster other) { - if (other == null) { - return; - } - if (other.Name.Length != 0) { - Name = other.Name; - } - if (other.Member1 != 0) { - Member1 = other.Member1; - } - if (other.Member2 != 0) { - Member2 = other.Member2; - } - if (other.ClusterCycleTime != 0F) { - ClusterCycleTime = other.ClusterCycleTime; - } - if (other.Member1PowerLimitPercentage != 0F) { - Member1PowerLimitPercentage = other.Member1PowerLimitPercentage; - } - if (other.ClusterActive != false) { - ClusterActive = other.ClusterActive; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void MergeFrom(pb::CodedInputStream input) { - uint tag; - while ((tag = input.ReadTag()) != 0) { - switch(tag) { - default: - input.SkipLastField(); - break; - case 10: { - Name = input.ReadString(); - break; - } - case 16: { - member1_ = (global::Tango.PMR.Hardware.ControlId) input.ReadEnum(); - break; - } - case 24: { - member2_ = (global::Tango.PMR.Hardware.ControlId) input.ReadEnum(); - break; - } - case 37: { - ClusterCycleTime = input.ReadFloat(); - break; - } - case 45: { - Member1PowerLimitPercentage = input.ReadFloat(); - break; - } - case 48: { - ClusterActive = input.ReadBool(); - break; - } - } - } - } - - } - - #endregion - -} - -#endregion Designer generated code diff --git a/Software/Visual_Studio/Tango.PMR/Hardware/PIDControl.cs b/Software/Visual_Studio/Tango.PMR/Hardware/PIDControl.cs deleted file mode 100644 index 053963484..000000000 --- a/Software/Visual_Studio/Tango.PMR/Hardware/PIDControl.cs +++ /dev/null @@ -1,616 +0,0 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: PIDControl.proto -#pragma warning disable 1591, 0612, 3021 -#region Designer generated code - -using pb = global::Google.Protobuf; -using pbc = global::Google.Protobuf.Collections; -using pbr = global::Google.Protobuf.Reflection; -using scg = global::System.Collections.Generic; -namespace Tango.PMR.Hardware { - - /// <summary>Holder for reflection information generated from PIDControl.proto</summary> - public static partial class PIDControlReflection { - - #region Descriptor - /// <summary>File descriptor for PIDControl.proto</summary> - public static pbr::FileDescriptor Descriptor { - get { return descriptor; } - } - private static pbr::FileDescriptor descriptor; - - static PIDControlReflection() { - byte[] descriptorData = global::System.Convert.FromBase64String( - string.Concat( - "ChBQSURDb250cm9sLnByb3RvEhJUYW5nby5QTVIuSGFyZHdhcmUinQQKEFBJ", - "RENvbnRyb2xDb25maWcSKQoCSWQYASABKA4yHS5UYW5nby5QTVIuSGFyZHdh", - "cmUuQ29udHJvbElkEgwKBE5hbWUYAiABKAkSIwobT3V0cHV0UHJvcG9ydGlv", - "bmFsQ3ljbGVUaW1lGAMgASgFEiQKHE91dHB1dFByb3BvcnRpb25hbFBvd2Vy", - "TGltaXQYBCABKAUSHgoWT3V0cHV0UHJvcG9ydGlvbmFsQmFuZBgFIAEoBRIU", - "CgxJbnRlZ3JhbFRpbWUYBiABKAUSFgoORGVyaXZhdGl2ZVRpbWUYByABKAUS", - "IgoaU2Vuc29yQ29ycmVjdGlvbkFkanVzdG1lbnQYCCABKAUSIwobU2Vuc29y", - "VHlwZWFuZFNldHBvaW50TGltaXRzGAkgASgFEicKH1NldHBvaW50UmFtcFJh", - "dGVvclNvZnRTdGFydFJhbXAYCiABKAUSIQoZU2V0cG9pbnRDb250cm9sT3V0", - "cHV0UmF0ZRgLIAEoBRIZChFDb250cm9sT3V0cHV0VHlwZRgMIAEoBRIcChRT", - "U1JDb250cm9sT3V0cHV0VHlwZRgNIAEoBRIjChtPdXRwdXRPTk9GRkh5c3Rl", - "cmVzaXNWYWx1ZXMYDiABKAUSIwobUHJvY2Vzc1ZhcmlhYmxlU2FtcGxpbmdS", - "YXRlGA8gASgFEh8KF1BWSW5wdXRGaWx0ZXJGYWN0b3JNb2RlGBAgASgFKo8C", - "CglDb250cm9sSWQSFAoQRHJ5ZXJIZWF0ZXIxMDAwdxAAEhQKEERyeWVySGVh", - "dGVyMjAwdzEQARIUChBEcnllckhlYXRlcjIwMHcyEAISEAoMSGVhZEhlYXRl", - "cloxEAMSEAoMSGVhZEhlYXRlcloyEAQSEAoMSGVhZEhlYXRlclozEAUSEAoM", - "SGVhZEhlYXRlclo0EAYSDwoLTWl4ZXJIZWF0ZXIQBxIQCgxXYXN0ZUNvbnRy", - "b2wQCBIOCgpNb3RvckRyeWVyEAkSDwoLTW90b3JGZWVkZXIQChIPCgtNb3Rv", - "clBvb2xlchALEg8KC01vdG9yV2luZGVyEAwSEgoORHJ5ZXJIZWF0ZXI0MDAQ", - "DUIeChxjb20udHdpbmUudGFuZ28ucG1yLmhhcmR3YXJlYgZwcm90bzM=")); - descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { }, - new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.Hardware.ControlId), }, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Hardware.PIDControlConfig), global::Tango.PMR.Hardware.PIDControlConfig.Parser, new[]{ "Id", "Name", "OutputProportionalCycleTime", "OutputProportionalPowerLimit", "OutputProportionalBand", "IntegralTime", "DerivativeTime", "SensorCorrectionAdjustment", "SensorTypeandSetpointLimits", "SetpointRampRateorSoftStartRamp", "SetpointControlOutputRate", "ControlOutputType", "SSRControlOutputType", "OutputONOFFHysteresisValues", "ProcessVariableSamplingRate", "PVInputFilterFactorMode" }, null, null, null) - })); - } - #endregion - - } - #region Enums - public enum ControlId { - [pbr::OriginalName("DryerHeater1000w")] DryerHeater1000W = 0, - [pbr::OriginalName("DryerHeater200w1")] DryerHeater200W1 = 1, - [pbr::OriginalName("DryerHeater200w2")] DryerHeater200W2 = 2, - [pbr::OriginalName("HeadHeaterZ1")] HeadHeaterZ1 = 3, - [pbr::OriginalName("HeadHeaterZ2")] HeadHeaterZ2 = 4, - [pbr::OriginalName("HeadHeaterZ3")] HeadHeaterZ3 = 5, - [pbr::OriginalName("HeadHeaterZ4")] HeadHeaterZ4 = 6, - [pbr::OriginalName("MixerHeater")] MixerHeater = 7, - [pbr::OriginalName("WasteControl")] WasteControl = 8, - [pbr::OriginalName("MotorDryer")] MotorDryer = 9, - [pbr::OriginalName("MotorFeeder")] MotorFeeder = 10, - [pbr::OriginalName("MotorPooler")] MotorPooler = 11, - [pbr::OriginalName("MotorWinder")] MotorWinder = 12, - [pbr::OriginalName("DryerHeater400")] DryerHeater400 = 13, - } - - #endregion - - #region Messages - public sealed partial class PIDControlConfig : pb::IMessage<PIDControlConfig> { - private static readonly pb::MessageParser<PIDControlConfig> _parser = new pb::MessageParser<PIDControlConfig>(() => new PIDControlConfig()); - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public static pb::MessageParser<PIDControlConfig> Parser { get { return _parser; } } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public static pbr::MessageDescriptor Descriptor { - get { return global::Tango.PMR.Hardware.PIDControlReflection.Descriptor.MessageTypes[0]; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - pbr::MessageDescriptor pb::IMessage.Descriptor { - get { return Descriptor; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public PIDControlConfig() { - OnConstruction(); - } - - partial void OnConstruction(); - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public PIDControlConfig(PIDControlConfig other) : this() { - id_ = other.id_; - name_ = other.name_; - outputProportionalCycleTime_ = other.outputProportionalCycleTime_; - outputProportionalPowerLimit_ = other.outputProportionalPowerLimit_; - outputProportionalBand_ = other.outputProportionalBand_; - integralTime_ = other.integralTime_; - derivativeTime_ = other.derivativeTime_; - sensorCorrectionAdjustment_ = other.sensorCorrectionAdjustment_; - sensorTypeandSetpointLimits_ = other.sensorTypeandSetpointLimits_; - setpointRampRateorSoftStartRamp_ = other.setpointRampRateorSoftStartRamp_; - setpointControlOutputRate_ = other.setpointControlOutputRate_; - controlOutputType_ = other.controlOutputType_; - sSRControlOutputType_ = other.sSRControlOutputType_; - outputONOFFHysteresisValues_ = other.outputONOFFHysteresisValues_; - processVariableSamplingRate_ = other.processVariableSamplingRate_; - pVInputFilterFactorMode_ = other.pVInputFilterFactorMode_; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public PIDControlConfig Clone() { - return new PIDControlConfig(this); - } - - /// <summary>Field number for the "Id" field.</summary> - public const int IdFieldNumber = 1; - private global::Tango.PMR.Hardware.ControlId id_ = 0; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public global::Tango.PMR.Hardware.ControlId Id { - get { return id_; } - set { - id_ = value; - } - } - - /// <summary>Field number for the "Name" field.</summary> - public const int NameFieldNumber = 2; - private string name_ = ""; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public string Name { - get { return name_; } - set { - name_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); - } - } - - /// <summary>Field number for the "OutputProportionalCycleTime" field.</summary> - public const int OutputProportionalCycleTimeFieldNumber = 3; - private int outputProportionalCycleTime_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int OutputProportionalCycleTime { - get { return outputProportionalCycleTime_; } - set { - outputProportionalCycleTime_ = value; - } - } - - /// <summary>Field number for the "OutputProportionalPowerLimit" field.</summary> - public const int OutputProportionalPowerLimitFieldNumber = 4; - private int outputProportionalPowerLimit_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int OutputProportionalPowerLimit { - get { return outputProportionalPowerLimit_; } - set { - outputProportionalPowerLimit_ = value; - } - } - - /// <summary>Field number for the "OutputProportionalBand" field.</summary> - public const int OutputProportionalBandFieldNumber = 5; - private int outputProportionalBand_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int OutputProportionalBand { - get { return outputProportionalBand_; } - set { - outputProportionalBand_ = value; - } - } - - /// <summary>Field number for the "IntegralTime" field.</summary> - public const int IntegralTimeFieldNumber = 6; - private int integralTime_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int IntegralTime { - get { return integralTime_; } - set { - integralTime_ = value; - } - } - - /// <summary>Field number for the "DerivativeTime" field.</summary> - public const int DerivativeTimeFieldNumber = 7; - private int derivativeTime_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int DerivativeTime { - get { return derivativeTime_; } - set { - derivativeTime_ = value; - } - } - - /// <summary>Field number for the "SensorCorrectionAdjustment" field.</summary> - public const int SensorCorrectionAdjustmentFieldNumber = 8; - private int sensorCorrectionAdjustment_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int SensorCorrectionAdjustment { - get { return sensorCorrectionAdjustment_; } - set { - sensorCorrectionAdjustment_ = value; - } - } - - /// <summary>Field number for the "SensorTypeandSetpointLimits" field.</summary> - public const int SensorTypeandSetpointLimitsFieldNumber = 9; - private int sensorTypeandSetpointLimits_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int SensorTypeandSetpointLimits { - get { return sensorTypeandSetpointLimits_; } - set { - sensorTypeandSetpointLimits_ = value; - } - } - - /// <summary>Field number for the "SetpointRampRateorSoftStartRamp" field.</summary> - public const int SetpointRampRateorSoftStartRampFieldNumber = 10; - private int setpointRampRateorSoftStartRamp_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int SetpointRampRateorSoftStartRamp { - get { return setpointRampRateorSoftStartRamp_; } - set { - setpointRampRateorSoftStartRamp_ = value; - } - } - - /// <summary>Field number for the "SetpointControlOutputRate" field.</summary> - public const int SetpointControlOutputRateFieldNumber = 11; - private int setpointControlOutputRate_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int SetpointControlOutputRate { - get { return setpointControlOutputRate_; } - set { - setpointControlOutputRate_ = value; - } - } - - /// <summary>Field number for the "ControlOutputType" field.</summary> - public const int ControlOutputTypeFieldNumber = 12; - private int controlOutputType_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int ControlOutputType { - get { return controlOutputType_; } - set { - controlOutputType_ = value; - } - } - - /// <summary>Field number for the "SSRControlOutputType" field.</summary> - public const int SSRControlOutputTypeFieldNumber = 13; - private int sSRControlOutputType_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int SSRControlOutputType { - get { return sSRControlOutputType_; } - set { - sSRControlOutputType_ = value; - } - } - - /// <summary>Field number for the "OutputONOFFHysteresisValues" field.</summary> - public const int OutputONOFFHysteresisValuesFieldNumber = 14; - private int outputONOFFHysteresisValues_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int OutputONOFFHysteresisValues { - get { return outputONOFFHysteresisValues_; } - set { - outputONOFFHysteresisValues_ = value; - } - } - - /// <summary>Field number for the "ProcessVariableSamplingRate" field.</summary> - public const int ProcessVariableSamplingRateFieldNumber = 15; - private int processVariableSamplingRate_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int ProcessVariableSamplingRate { - get { return processVariableSamplingRate_; } - set { - processVariableSamplingRate_ = value; - } - } - - /// <summary>Field number for the "PVInputFilterFactorMode" field.</summary> - public const int PVInputFilterFactorModeFieldNumber = 16; - private int pVInputFilterFactorMode_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int PVInputFilterFactorMode { - get { return pVInputFilterFactorMode_; } - set { - pVInputFilterFactorMode_ = value; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override bool Equals(object other) { - return Equals(other as PIDControlConfig); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public bool Equals(PIDControlConfig other) { - if (ReferenceEquals(other, null)) { - return false; - } - if (ReferenceEquals(other, this)) { - return true; - } - if (Id != other.Id) return false; - if (Name != other.Name) return false; - if (OutputProportionalCycleTime != other.OutputProportionalCycleTime) return false; - if (OutputProportionalPowerLimit != other.OutputProportionalPowerLimit) return false; - if (OutputProportionalBand != other.OutputProportionalBand) return false; - if (IntegralTime != other.IntegralTime) return false; - if (DerivativeTime != other.DerivativeTime) return false; - if (SensorCorrectionAdjustment != other.SensorCorrectionAdjustment) return false; - if (SensorTypeandSetpointLimits != other.SensorTypeandSetpointLimits) return false; - if (SetpointRampRateorSoftStartRamp != other.SetpointRampRateorSoftStartRamp) return false; - if (SetpointControlOutputRate != other.SetpointControlOutputRate) return false; - if (ControlOutputType != other.ControlOutputType) return false; - if (SSRControlOutputType != other.SSRControlOutputType) return false; - if (OutputONOFFHysteresisValues != other.OutputONOFFHysteresisValues) return false; - if (ProcessVariableSamplingRate != other.ProcessVariableSamplingRate) return false; - if (PVInputFilterFactorMode != other.PVInputFilterFactorMode) return false; - return true; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override int GetHashCode() { - int hash = 1; - if (Id != 0) hash ^= Id.GetHashCode(); - if (Name.Length != 0) hash ^= Name.GetHashCode(); - if (OutputProportionalCycleTime != 0) hash ^= OutputProportionalCycleTime.GetHashCode(); - if (OutputProportionalPowerLimit != 0) hash ^= OutputProportionalPowerLimit.GetHashCode(); - if (OutputProportionalBand != 0) hash ^= OutputProportionalBand.GetHashCode(); - if (IntegralTime != 0) hash ^= IntegralTime.GetHashCode(); - if (DerivativeTime != 0) hash ^= DerivativeTime.GetHashCode(); - if (SensorCorrectionAdjustment != 0) hash ^= SensorCorrectionAdjustment.GetHashCode(); - if (SensorTypeandSetpointLimits != 0) hash ^= SensorTypeandSetpointLimits.GetHashCode(); - if (SetpointRampRateorSoftStartRamp != 0) hash ^= SetpointRampRateorSoftStartRamp.GetHashCode(); - if (SetpointControlOutputRate != 0) hash ^= SetpointControlOutputRate.GetHashCode(); - if (ControlOutputType != 0) hash ^= ControlOutputType.GetHashCode(); - if (SSRControlOutputType != 0) hash ^= SSRControlOutputType.GetHashCode(); - if (OutputONOFFHysteresisValues != 0) hash ^= OutputONOFFHysteresisValues.GetHashCode(); - if (ProcessVariableSamplingRate != 0) hash ^= ProcessVariableSamplingRate.GetHashCode(); - if (PVInputFilterFactorMode != 0) hash ^= PVInputFilterFactorMode.GetHashCode(); - return hash; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override string ToString() { - return pb::JsonFormatter.ToDiagnosticString(this); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void WriteTo(pb::CodedOutputStream output) { - if (Id != 0) { - output.WriteRawTag(8); - output.WriteEnum((int) Id); - } - if (Name.Length != 0) { - output.WriteRawTag(18); - output.WriteString(Name); - } - if (OutputProportionalCycleTime != 0) { - output.WriteRawTag(24); - output.WriteInt32(OutputProportionalCycleTime); - } - if (OutputProportionalPowerLimit != 0) { - output.WriteRawTag(32); - output.WriteInt32(OutputProportionalPowerLimit); - } - if (OutputProportionalBand != 0) { - output.WriteRawTag(40); - output.WriteInt32(OutputProportionalBand); - } - if (IntegralTime != 0) { - output.WriteRawTag(48); - output.WriteInt32(IntegralTime); - } - if (DerivativeTime != 0) { - output.WriteRawTag(56); - output.WriteInt32(DerivativeTime); - } - if (SensorCorrectionAdjustment != 0) { - output.WriteRawTag(64); - output.WriteInt32(SensorCorrectionAdjustment); - } - if (SensorTypeandSetpointLimits != 0) { - output.WriteRawTag(72); - output.WriteInt32(SensorTypeandSetpointLimits); - } - if (SetpointRampRateorSoftStartRamp != 0) { - output.WriteRawTag(80); - output.WriteInt32(SetpointRampRateorSoftStartRamp); - } - if (SetpointControlOutputRate != 0) { - output.WriteRawTag(88); - output.WriteInt32(SetpointControlOutputRate); - } - if (ControlOutputType != 0) { - output.WriteRawTag(96); - output.WriteInt32(ControlOutputType); - } - if (SSRControlOutputType != 0) { - output.WriteRawTag(104); - output.WriteInt32(SSRControlOutputType); - } - if (OutputONOFFHysteresisValues != 0) { - output.WriteRawTag(112); - output.WriteInt32(OutputONOFFHysteresisValues); - } - if (ProcessVariableSamplingRate != 0) { - output.WriteRawTag(120); - output.WriteInt32(ProcessVariableSamplingRate); - } - if (PVInputFilterFactorMode != 0) { - output.WriteRawTag(128, 1); - output.WriteInt32(PVInputFilterFactorMode); - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int CalculateSize() { - int size = 0; - if (Id != 0) { - size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Id); - } - if (Name.Length != 0) { - size += 1 + pb::CodedOutputStream.ComputeStringSize(Name); - } - if (OutputProportionalCycleTime != 0) { - size += 1 + pb::CodedOutputStream.ComputeInt32Size(OutputProportionalCycleTime); - } - if (OutputProportionalPowerLimit != 0) { - size += 1 + pb::CodedOutputStream.ComputeInt32Size(OutputProportionalPowerLimit); - } - if (OutputProportionalBand != 0) { - size += 1 + pb::CodedOutputStream.ComputeInt32Size(OutputProportionalBand); - } - if (IntegralTime != 0) { - size += 1 + pb::CodedOutputStream.ComputeInt32Size(IntegralTime); - } - if (DerivativeTime != 0) { - size += 1 + pb::CodedOutputStream.ComputeInt32Size(DerivativeTime); - } - if (SensorCorrectionAdjustment != 0) { - size += 1 + pb::CodedOutputStream.ComputeInt32Size(SensorCorrectionAdjustment); - } - if (SensorTypeandSetpointLimits != 0) { - size += 1 + pb::CodedOutputStream.ComputeInt32Size(SensorTypeandSetpointLimits); - } - if (SetpointRampRateorSoftStartRamp != 0) { - size += 1 + pb::CodedOutputStream.ComputeInt32Size(SetpointRampRateorSoftStartRamp); - } - if (SetpointControlOutputRate != 0) { - size += 1 + pb::CodedOutputStream.ComputeInt32Size(SetpointControlOutputRate); - } - if (ControlOutputType != 0) { - size += 1 + pb::CodedOutputStream.ComputeInt32Size(ControlOutputType); - } - if (SSRControlOutputType != 0) { - size += 1 + pb::CodedOutputStream.ComputeInt32Size(SSRControlOutputType); - } - if (OutputONOFFHysteresisValues != 0) { - size += 1 + pb::CodedOutputStream.ComputeInt32Size(OutputONOFFHysteresisValues); - } - if (ProcessVariableSamplingRate != 0) { - size += 1 + pb::CodedOutputStream.ComputeInt32Size(ProcessVariableSamplingRate); - } - if (PVInputFilterFactorMode != 0) { - size += 2 + pb::CodedOutputStream.ComputeInt32Size(PVInputFilterFactorMode); - } - return size; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void MergeFrom(PIDControlConfig other) { - if (other == null) { - return; - } - if (other.Id != 0) { - Id = other.Id; - } - if (other.Name.Length != 0) { - Name = other.Name; - } - if (other.OutputProportionalCycleTime != 0) { - OutputProportionalCycleTime = other.OutputProportionalCycleTime; - } - if (other.OutputProportionalPowerLimit != 0) { - OutputProportionalPowerLimit = other.OutputProportionalPowerLimit; - } - if (other.OutputProportionalBand != 0) { - OutputProportionalBand = other.OutputProportionalBand; - } - if (other.IntegralTime != 0) { - IntegralTime = other.IntegralTime; - } - if (other.DerivativeTime != 0) { - DerivativeTime = other.DerivativeTime; - } - if (other.SensorCorrectionAdjustment != 0) { - SensorCorrectionAdjustment = other.SensorCorrectionAdjustment; - } - if (other.SensorTypeandSetpointLimits != 0) { - SensorTypeandSetpointLimits = other.SensorTypeandSetpointLimits; - } - if (other.SetpointRampRateorSoftStartRamp != 0) { - SetpointRampRateorSoftStartRamp = other.SetpointRampRateorSoftStartRamp; - } - if (other.SetpointControlOutputRate != 0) { - SetpointControlOutputRate = other.SetpointControlOutputRate; - } - if (other.ControlOutputType != 0) { - ControlOutputType = other.ControlOutputType; - } - if (other.SSRControlOutputType != 0) { - SSRControlOutputType = other.SSRControlOutputType; - } - if (other.OutputONOFFHysteresisValues != 0) { - OutputONOFFHysteresisValues = other.OutputONOFFHysteresisValues; - } - if (other.ProcessVariableSamplingRate != 0) { - ProcessVariableSamplingRate = other.ProcessVariableSamplingRate; - } - if (other.PVInputFilterFactorMode != 0) { - PVInputFilterFactorMode = other.PVInputFilterFactorMode; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void MergeFrom(pb::CodedInputStream input) { - uint tag; - while ((tag = input.ReadTag()) != 0) { - switch(tag) { - default: - input.SkipLastField(); - break; - case 8: { - id_ = (global::Tango.PMR.Hardware.ControlId) input.ReadEnum(); - break; - } - case 18: { - Name = input.ReadString(); - break; - } - case 24: { - OutputProportionalCycleTime = input.ReadInt32(); - break; - } - case 32: { - OutputProportionalPowerLimit = input.ReadInt32(); - break; - } - case 40: { - OutputProportionalBand = input.ReadInt32(); - break; - } - case 48: { - IntegralTime = input.ReadInt32(); - break; - } - case 56: { - DerivativeTime = input.ReadInt32(); - break; - } - case 64: { - SensorCorrectionAdjustment = input.ReadInt32(); - break; - } - case 72: { - SensorTypeandSetpointLimits = input.ReadInt32(); - break; - } - case 80: { - SetpointRampRateorSoftStartRamp = input.ReadInt32(); - break; - } - case 88: { - SetpointControlOutputRate = input.ReadInt32(); - break; - } - case 96: { - ControlOutputType = input.ReadInt32(); - break; - } - case 104: { - SSRControlOutputType = input.ReadInt32(); - break; - } - case 112: { - OutputONOFFHysteresisValues = input.ReadInt32(); - break; - } - case 120: { - ProcessVariableSamplingRate = input.ReadInt32(); - break; - } - case 128: { - PVInputFilterFactorMode = input.ReadInt32(); - break; - } - } - } - } - - } - - #endregion - -} - -#endregion Designer generated code diff --git a/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj b/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj index 4cf340cca..cb568288d 100644 --- a/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj +++ b/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj @@ -47,8 +47,9 @@ <Compile Include="..\Versioning\GlobalVersionInfo.cs"> <Link>GlobalVersionInfo.cs</Link> </Compile> - <Compile Include="Diagnostics\StartDiagnosticsRequest.cs" /> - <Compile Include="Diagnostics\StartDiagnosticsResponse.cs" /> + <Compile Include="Common\DoubleArray.cs" /> + <Compile Include="Diagnostics\PushDiagnosticsRequest.cs" /> + <Compile Include="Diagnostics\PushDiagnosticsResponse.cs" /> <Compile Include="ExtensionMethods.cs" /> <Compile Include="Integration\DirectSynchronizationRequest.cs" /> <Compile Include="Integration\DirectSynchronizationResponse.cs" /> |