aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2018-04-08 10:03:22 +0300
committerRoy Ben-Shabat <Roy@Twine-s.com>2018-04-08 10:03:22 +0300
commit2cc6a13cfefcc03ff5197f55f12a9eae64979dbf (patch)
treec609124303872d8f06ea81196e20cbf6ad9e8bce
parentba7426fcfe4f760651b50ae5ce4027393b984e4a (diff)
downloadTango-2cc6a13cfefcc03ff5197f55f12a9eae64979dbf.tar.gz
Tango-2cc6a13cfefcc03ff5197f55f12a9eae64979dbf.zip
Updated PMR to latest shlomo changes.
-rw-r--r--Software/DB/Tango.mdfbin75497472 -> 75497472 bytes
-rw-r--r--Software/DB/Tango_log.ldfbin1572864 -> 1572864 bytes
-rw-r--r--Software/PMR/Messages/Hardware/HardwareWinder.proto2
-rw-r--r--Software/PMR/Messages/Printing/JobSpool.proto14
-rw-r--r--Software/Visual_Studio/Tango.BL/Entities/SpoolType.cs40
-rw-r--r--Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx6
-rw-r--r--Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram134
-rw-r--r--Software/Visual_Studio/Tango.DAL.Remote/DB/SPOOL_TYPES.cs2
-rw-r--r--Software/Visual_Studio/Tango.PMR/Common/MessageType.cs9
-rw-r--r--Software/Visual_Studio/Tango.PMR/ExtensionMethods.cs2
-rw-r--r--Software/Visual_Studio/Tango.PMR/Hardware/SystemResetRequest.cs131
-rw-r--r--Software/Visual_Studio/Tango.PMR/Hardware/SystemResetResponse.cs131
-rw-r--r--Software/Visual_Studio/Tango.PMR/Printing/JobSpool.cs65
-rw-r--r--Software/Visual_Studio/Tango.PMR/Stubs/StubHeatingTestPollResponse.cs36
-rw-r--r--Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj2
15 files changed, 487 insertions, 87 deletions
diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf
index 11950495c..7632ba39a 100644
--- a/Software/DB/Tango.mdf
+++ b/Software/DB/Tango.mdf
Binary files differ
diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf
index cfa3fdbbd..690e08a82 100644
--- a/Software/DB/Tango_log.ldf
+++ b/Software/DB/Tango_log.ldf
Binary files differ
diff --git a/Software/PMR/Messages/Hardware/HardwareWinder.proto b/Software/PMR/Messages/Hardware/HardwareWinder.proto
index aad8510a7..c00b56c83 100644
--- a/Software/PMR/Messages/Hardware/HardwareWinder.proto
+++ b/Software/PMR/Messages/Hardware/HardwareWinder.proto
@@ -20,6 +20,6 @@ message HardwareWinder
HardwareWinderType HardwareWinderType = 1;
- int32 MillimeterPerRotation = 2; // cart progress in mm after one full rotation
+ int32 MillimeterPerRotation = 2;
}
diff --git a/Software/PMR/Messages/Printing/JobSpool.proto b/Software/PMR/Messages/Printing/JobSpool.proto
index 03958c894..ba140aaaa 100644
--- a/Software/PMR/Messages/Printing/JobSpool.proto
+++ b/Software/PMR/Messages/Printing/JobSpool.proto
@@ -20,20 +20,20 @@ message JobSpool
JobSpoolType JobSpoolType = 1;
- double Length = 2; // the spool winding initial length in mm
+ double Length = 2;
double Weight = 3;
- double Diameter = 4; // in mm initial data required for speed calculation
+ double Diameter = 4;
- int32 StartOffsetPulses = 5; // distance between the limit switch and the initial spool home position
+ int32 StartOffsetPulses = 5;
- int32 BackingRate = 6; // the angle of the top of the spool
+ int32 BackingRate = 6;
- int32 SegmentOffsetPulses = 7; // the spool winding initial length in mm
+ int32 SegmentOffsetPulses = 7;
- int32 SpoolBottomBackingRate = 8;// the angle of the bottom of the spool
+ int32 BottomBackingRate = 8;
- double NumberOfRotationPerPassage = 9; // how many rotations per spool passage
+ double RotationsPerPassage = 9;
}
diff --git a/Software/Visual_Studio/Tango.BL/Entities/SpoolType.cs b/Software/Visual_Studio/Tango.BL/Entities/SpoolType.cs
index b4e9bd555..f17e2846c 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/SpoolType.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/SpoolType.cs
@@ -174,6 +174,46 @@ namespace Tango.BL.Entities
}
+ protected Int32 _bottombackingrate;
+ /// <summary>
+ /// Gets or sets the spooltype bottom backing rate.
+ /// </summary>
+ [Column("BOTTOM_BACKING_RATE")]
+
+ public Int32 BottomBackingRate
+ {
+ get
+ {
+ return _bottombackingrate;
+ }
+
+ set
+ {
+ _bottombackingrate = value; RaisePropertyChanged(nameof(BottomBackingRate));
+ }
+
+ }
+
+ protected Double _rotationsperpassage;
+ /// <summary>
+ /// Gets or sets the spooltype rotations per passage.
+ /// </summary>
+ [Column("ROTATIONS_PER_PASSAGE")]
+
+ public Double RotationsPerPassage
+ {
+ get
+ {
+ return _rotationsperpassage;
+ }
+
+ set
+ {
+ _rotationsperpassage = value; RaisePropertyChanged(nameof(RotationsPerPassage));
+ }
+
+ }
+
protected ObservableCollection<Job> _jobs;
/// <summary>
/// Gets or sets the spooltype jobs.
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
index fd83b6486..058977e64 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
@@ -804,6 +804,8 @@
<Property Name="START_OFFSET_PULSES" Type="int" Nullable="false" />
<Property Name="BACKING_RATE" Type="int" Nullable="false" />
<Property Name="SEGMENT_OFFSET_PULSES" Type="int" Nullable="false" />
+ <Property Name="BOTTOM_BACKING_RATE" Type="int" Nullable="false" />
+ <Property Name="ROTATIONS_PER_PASSAGE" Type="float" Nullable="false" />
</EntityType>
<EntityType Name="SYNC_CONFIGURATIONS">
<Key>
@@ -3466,6 +3468,8 @@
<Property Name="START_OFFSET_PULSES" Type="Int32" Nullable="false" />
<Property Name="BACKING_RATE" Type="Int32" Nullable="false" />
<Property Name="SEGMENT_OFFSET_PULSES" Type="Int32" Nullable="false" />
+ <Property Name="BOTTOM_BACKING_RATE" Type="Int32" Nullable="false" />
+ <Property Name="ROTATIONS_PER_PASSAGE" Type="Double" Nullable="false" />
<NavigationProperty Name="JOBS" Relationship="RemoteModel.FK_JOBS_SPOOL_TYPES" FromRole="SPOOL_TYPES" ToRole="JOB" />
</EntityType>
<EntityType Name="SYNC_CONFIGURATIONS">
@@ -5357,6 +5361,8 @@
<EntitySetMapping Name="SPOOL_TYPES">
<EntityTypeMapping TypeName="RemoteModel.SPOOL_TYPES">
<MappingFragment StoreEntitySet="SPOOL_TYPES">
+ <ScalarProperty Name="ROTATIONS_PER_PASSAGE" ColumnName="ROTATIONS_PER_PASSAGE" />
+ <ScalarProperty Name="BOTTOM_BACKING_RATE" ColumnName="BOTTOM_BACKING_RATE" />
<ScalarProperty Name="SEGMENT_OFFSET_PULSES" ColumnName="SEGMENT_OFFSET_PULSES" />
<ScalarProperty Name="BACKING_RATE" ColumnName="BACKING_RATE" />
<ScalarProperty Name="START_OFFSET_PULSES" ColumnName="START_OFFSET_PULSES" />
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
index 305f164a4..cc3421bd6 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
@@ -5,74 +5,74 @@
<!-- Diagram content (shape and connector positions) -->
<edmx:Diagrams>
<Diagram DiagramId="f9ae01d708754bbd997add25a4bacc79" Name="Diagram1">
- <EntityTypeShape EntityType="RemoteModel.ACTION_TYPES" Width="1.5" PointX="3" PointY="8" />
- <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="1.5" PointY="52" />
- <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="1.5" PointY="76.875" />
- <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="56.375" />
- <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="1.5" PointY="79.75" />
- <EntityTypeShape EntityType="RemoteModel.APPLICATION_VERSIONS" Width="1.5" PointX="1.5" PointY="82.75" />
- <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="10.75" PointY="18.75" />
- <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="8" PointY="45.875" />
- <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="8.25" PointY="16" />
- <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="5.25" PointY="20" />
- <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="8.5" PointY="38.125" />
- <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="6.25" PointY="39.875" />
- <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="0.75" PointY="63.875" />
- <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="1.5" PointY="42.375" />
- <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="8" PointY="65" />
- <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="73.875" />
- <EntityTypeShape EntityType="RemoteModel.EMBEDDED_SOFTWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="71" />
- <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="3" PointY="3.25" />
+ <EntityTypeShape EntityType="RemoteModel.ACTION_TYPES" Width="1.5" PointX="3" PointY="94.875" />
+ <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="1.5" PointY="40.25" />
+ <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="1.5" PointY="70.75" />
+ <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="76.625" />
+ <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="1.5" PointY="57" />
+ <EntityTypeShape EntityType="RemoteModel.APPLICATION_VERSIONS" Width="1.5" PointX="1.5" PointY="79.625" />
+ <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="10.75" PointY="10.875" />
+ <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="6" PointY="42.375" />
+ <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="8.25" PointY="17" />
+ <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="5.25" PointY="28.25" />
+ <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="8.5" PointY="2.25" />
+ <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="6.25" PointY="4" />
+ <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="0.75" PointY="64.5" />
+ <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="1.5" PointY="52.625" />
+ <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="6" PointY="45.375" />
+ <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="73.75" />
+ <EntityTypeShape EntityType="RemoteModel.EMBEDDED_SOFTWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="59.875" />
+ <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="3" PointY="4.25" />
<EntityTypeShape EntityType="RemoteModel.EVENT_TYPES_ACTIONS" Width="1.5" PointX="5.25" PointY="0.75" />
- <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES_CATEGORIES" Width="1.5" PointX="0.75" PointY="1.125" />
- <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES_GROUPS" Width="1.5" PointX="0.75" PointY="5" />
- <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="26" />
- <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="11.875" />
- <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="4.5" PointY="52.625" />
- <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="6.75" PointY="59.25" />
- <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="1.5" PointY="86.625" />
- <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="3.75" PointY="57.25" />
- <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="7.5" PointY="52.625" />
- <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="9.75" PointY="58.125" />
- <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="59.375" />
- <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="3.5" PointY="90.625" />
- <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="5.75" PointY="63.5" />
- <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="8" PointY="27.625" />
- <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="10.25" PointY="32.5" />
- <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="7.5" PointY="8.5" />
- <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="5.25" PointY="12.375" />
- <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="23.125" />
- <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="6" PointY="4" />
- <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="8.25" PointY="12.25" />
- <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="5.25" PointY="28.625" />
- <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="0.75" PointY="32.75" />
- <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="3" PointY="46.625" />
- <EntityTypeShape EntityType="RemoteModel.MACHINES_CONFIGURATIONS" Width="1.5" PointX="6.25" PointY="55.75" />
- <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="5.25" PointY="43.25" />
- <EntityTypeShape EntityType="RemoteModel.MEDIA_COLORS" Width="1.5" PointX="0.75" PointY="19.75" />
- <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="16.375" />
- <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="8.875" />
- <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="28.875" />
- <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="8" PointY="48.875" />
- <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="0.75" PointY="38.375" />
- <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="9" PointY="0.75" />
- <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="31.25" />
- <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="32.5" />
- <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="13.625" />
- <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="9" PointY="4.625" />
- <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="11.25" PointY="4.75" />
- <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="7.5" PointY="20.75" />
- <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="3" PointY="63.625" />
- <EntityTypeShape EntityType="RemoteModel.SYNC_CONFIGURATIONS" Width="1.5" PointX="9.75" PointY="8.375" />
- <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="10.75" PointY="11.375" />
- <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="11.75" PointY="8.375" />
- <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="12.75" PointY="11.375" />
- <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="13.75" PointY="2.375" />
- <EntityTypeShape EntityType="RemoteModel.TECH_MOTORS" Width="1.5" PointX="13.75" PointY="7.375" />
- <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="10.75" PointY="15.375" />
- <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="3" PointY="36.875" />
- <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="11.25" PointY="37.625" />
- <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="3" PointY="67.75" />
+ <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES_CATEGORIES" Width="1.5" PointX="0.75" PointY="6" />
+ <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES_GROUPS" Width="1.5" PointX="0.75" PointY="2.125" />
+ <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="17.5" />
+ <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="20.875" />
+ <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="4.5" PointY="77.75" />
+ <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="6.75" PointY="78.375" />
+ <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="4.5" PointY="91.75" />
+ <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="6.75" PointY="86.375" />
+ <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="1.5" PointY="86.75" />
+ <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="3.75" PointY="81.25" />
+ <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="82.5" />
+ <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="4.5" PointY="87.75" />
+ <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="6.75" PointY="82.625" />
+ <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="6" PointY="51" />
+ <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="8.25" PointY="43.375" />
+ <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="7.5" PointY="9.5" />
+ <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="5.25" PointY="9.375" />
+ <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="26.625" />
+ <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="6" PointY="21.125" />
+ <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="5.25" PointY="17.25" />
+ <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="5.25" PointY="65.125" />
+ <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="0.75" PointY="44.625" />
+ <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="3" PointY="47.125" />
+ <EntityTypeShape EntityType="RemoteModel.MACHINES_CONFIGURATIONS" Width="1.5" PointX="5.25" PointY="57.375" />
+ <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="5.25" PointY="38.25" />
+ <EntityTypeShape EntityType="RemoteModel.MEDIA_COLORS" Width="1.5" PointX="0.75" PointY="29.625" />
+ <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="10" />
+ <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="23.75" />
+ <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="12.875" />
+ <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="6" PointY="61.25" />
+ <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="0.75" PointY="35.625" />
+ <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="6" PointY="73.25" />
+ <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="32.375" />
+ <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="33.625" />
+ <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="14.75" />
+ <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="6" PointY="69.125" />
+ <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="8.25" PointY="69.25" />
+ <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="7.5" PointY="12.875" />
+ <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="3" PointY="23.75" />
+ <EntityTypeShape EntityType="RemoteModel.SYNC_CONFIGURATIONS" Width="1.5" PointX="10.75" PointY="3.5" />
+ <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="10.75" PointY="6.5" />
+ <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="12.75" PointY="3.5" />
+ <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="12.75" PointY="6.5" />
+ <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="12.75" PointY="10.5" />
+ <EntityTypeShape EntityType="RemoteModel.TECH_MOTORS" Width="1.5" PointX="12.75" PointY="15.5" />
+ <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="14.75" PointY="3.5" />
+ <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="3" PointY="28.25" />
+ <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="8.25" PointY="28.125" />
+ <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="3" PointY="10.625" />
<AssociationConnector Association="RemoteModel.FK_EVENTS_ACTIONS_ACTIONS" />
<AssociationConnector Association="RemoteModel.FK_ORGANIZATIONS_ADDRESSES" />
<AssociationConnector Association="RemoteModel.FK_USERS_ADDRESSES" />
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/SPOOL_TYPES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/SPOOL_TYPES.cs
index 258e4ef89..e96684109 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/SPOOL_TYPES.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/SPOOL_TYPES.cs
@@ -31,6 +31,8 @@ namespace Tango.DAL.Remote.DB
public int START_OFFSET_PULSES { get; set; }
public int BACKING_RATE { get; set; }
public int SEGMENT_OFFSET_PULSES { get; set; }
+ public int BOTTOM_BACKING_RATE { get; set; }
+ public double ROTATIONS_PER_PASSAGE { get; set; }
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
public virtual ICollection<JOB> JOBS { get; set; }
diff --git a/Software/Visual_Studio/Tango.PMR/Common/MessageType.cs b/Software/Visual_Studio/Tango.PMR/Common/MessageType.cs
index 0c46ea0d9..f81964aad 100644
--- a/Software/Visual_Studio/Tango.PMR/Common/MessageType.cs
+++ b/Software/Visual_Studio/Tango.PMR/Common/MessageType.cs
@@ -22,7 +22,7 @@ namespace Tango.PMR.Common {
static MessageTypeReflection() {
byte[] descriptorData = global::System.Convert.FromBase64String(
string.Concat(
- "ChFNZXNzYWdlVHlwZS5wcm90bxIQVGFuZ28uUE1SLkNvbW1vbirqGAoLTWVz",
+ "ChFNZXNzYWdlVHlwZS5wcm90bxIQVGFuZ28uUE1SLkNvbW1vbiqdGQoLTWVz",
"c2FnZVR5cGUSCAoETm9uZRAAEhQKEENhbGN1bGF0ZVJlcXVlc3QQAxIVChFD",
"YWxjdWxhdGVSZXNwb25zZRAEEhMKD1Byb2dyZXNzUmVxdWVzdBAFEhQKEFBy",
"b2dyZXNzUmVzcG9uc2UQBhIcChhTdHViQ2FydHJpZGdlUmVhZFJlcXVlc3QQ",
@@ -93,8 +93,9 @@ namespace Tango.PMR.Common {
"YWRQcm9jZXNzUGFyYW1ldGVyc1Jlc3BvbnNlEL0XEhQKD0RlYnVnTG9nUmVx",
"dWVzdBCgHxIVChBEZWJ1Z0xvZ1Jlc3BvbnNlEKEfEicKIlVwbG9hZEhhcmR3",
"YXJlQ29uZmlndXJhdGlvblJlcXVlc3QQiCcSKAojVXBsb2FkSGFyZHdhcmVD",
- "b25maWd1cmF0aW9uUmVzcG9uc2UQiSdCHAoaY29tLnR3aW5lLnRhbmdvLnBt",
- "ci5jb21tb25iBnByb3RvMw=="));
+ "b25maWd1cmF0aW9uUmVzcG9uc2UQiScSFwoSU3lzdGVtUmVzZXRSZXF1ZXN0",
+ "EIonEhgKE1N5c3RlbVJlc2V0UmVzcG9uc2UQiydCHAoaY29tLnR3aW5lLnRh",
+ "bmdvLnBtci5jb21tb25iBnByb3RvMw=="));
descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
new pbr::FileDescriptor[] { },
new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.Common.MessageType), }, null));
@@ -235,6 +236,8 @@ namespace Tango.PMR.Common {
/// </summary>
[pbr::OriginalName("UploadHardwareConfigurationRequest")] UploadHardwareConfigurationRequest = 5000,
[pbr::OriginalName("UploadHardwareConfigurationResponse")] UploadHardwareConfigurationResponse = 5001,
+ [pbr::OriginalName("SystemResetRequest")] SystemResetRequest = 5002,
+ [pbr::OriginalName("SystemResetResponse")] SystemResetResponse = 5003,
}
#endregion
diff --git a/Software/Visual_Studio/Tango.PMR/ExtensionMethods.cs b/Software/Visual_Studio/Tango.PMR/ExtensionMethods.cs
index f1adb193b..f20298826 100644
--- a/Software/Visual_Studio/Tango.PMR/ExtensionMethods.cs
+++ b/Software/Visual_Studio/Tango.PMR/ExtensionMethods.cs
@@ -13,7 +13,7 @@ namespace Tango.PMR
/// <summary>
/// Contains PMR extension methods.
/// </summary>
- public static class ExtensionMethods
+ public static class ExtensionMethods
{
/// <summary>
/// Gets the protobuf <see cref="OriginalNameAttribute"/> attribute value from the message type.
diff --git a/Software/Visual_Studio/Tango.PMR/Hardware/SystemResetRequest.cs b/Software/Visual_Studio/Tango.PMR/Hardware/SystemResetRequest.cs
new file mode 100644
index 000000000..0e8dddeb9
--- /dev/null
+++ b/Software/Visual_Studio/Tango.PMR/Hardware/SystemResetRequest.cs
@@ -0,0 +1,131 @@
+// Generated by the protocol buffer compiler. DO NOT EDIT!
+// source: SystemResetRequest.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 SystemResetRequest.proto</summary>
+ public static partial class SystemResetRequestReflection {
+
+ #region Descriptor
+ /// <summary>File descriptor for SystemResetRequest.proto</summary>
+ public static pbr::FileDescriptor Descriptor {
+ get { return descriptor; }
+ }
+ private static pbr::FileDescriptor descriptor;
+
+ static SystemResetRequestReflection() {
+ byte[] descriptorData = global::System.Convert.FromBase64String(
+ string.Concat(
+ "ChhTeXN0ZW1SZXNldFJlcXVlc3QucHJvdG8SElRhbmdvLlBNUi5IYXJkd2Fy",
+ "ZSIUChJTeXN0ZW1SZXNldFJlcXVlc3RCHgocY29tLnR3aW5lLnRhbmdvLnBt",
+ "ci5oYXJkd2FyZWIGcHJvdG8z"));
+ descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
+ new pbr::FileDescriptor[] { },
+ new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
+ new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Hardware.SystemResetRequest), global::Tango.PMR.Hardware.SystemResetRequest.Parser, null, null, null, null)
+ }));
+ }
+ #endregion
+
+ }
+ #region Messages
+ public sealed partial class SystemResetRequest : pb::IMessage<SystemResetRequest> {
+ private static readonly pb::MessageParser<SystemResetRequest> _parser = new pb::MessageParser<SystemResetRequest>(() => new SystemResetRequest());
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public static pb::MessageParser<SystemResetRequest> Parser { get { return _parser; } }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public static pbr::MessageDescriptor Descriptor {
+ get { return global::Tango.PMR.Hardware.SystemResetRequestReflection.Descriptor.MessageTypes[0]; }
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ pbr::MessageDescriptor pb::IMessage.Descriptor {
+ get { return Descriptor; }
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public SystemResetRequest() {
+ OnConstruction();
+ }
+
+ partial void OnConstruction();
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public SystemResetRequest(SystemResetRequest other) : this() {
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public SystemResetRequest Clone() {
+ return new SystemResetRequest(this);
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public override bool Equals(object other) {
+ return Equals(other as SystemResetRequest);
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public bool Equals(SystemResetRequest other) {
+ if (ReferenceEquals(other, null)) {
+ return false;
+ }
+ if (ReferenceEquals(other, this)) {
+ return true;
+ }
+ return true;
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public override int GetHashCode() {
+ int hash = 1;
+ 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) {
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public int CalculateSize() {
+ int size = 0;
+ return size;
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public void MergeFrom(SystemResetRequest other) {
+ if (other == null) {
+ return;
+ }
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public void MergeFrom(pb::CodedInputStream input) {
+ uint tag;
+ while ((tag = input.ReadTag()) != 0) {
+ switch(tag) {
+ default:
+ input.SkipLastField();
+ break;
+ }
+ }
+ }
+
+ }
+
+ #endregion
+
+}
+
+#endregion Designer generated code
diff --git a/Software/Visual_Studio/Tango.PMR/Hardware/SystemResetResponse.cs b/Software/Visual_Studio/Tango.PMR/Hardware/SystemResetResponse.cs
new file mode 100644
index 000000000..cf300a5d8
--- /dev/null
+++ b/Software/Visual_Studio/Tango.PMR/Hardware/SystemResetResponse.cs
@@ -0,0 +1,131 @@
+// Generated by the protocol buffer compiler. DO NOT EDIT!
+// source: SystemResetResponse.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 SystemResetResponse.proto</summary>
+ public static partial class SystemResetResponseReflection {
+
+ #region Descriptor
+ /// <summary>File descriptor for SystemResetResponse.proto</summary>
+ public static pbr::FileDescriptor Descriptor {
+ get { return descriptor; }
+ }
+ private static pbr::FileDescriptor descriptor;
+
+ static SystemResetResponseReflection() {
+ byte[] descriptorData = global::System.Convert.FromBase64String(
+ string.Concat(
+ "ChlTeXN0ZW1SZXNldFJlc3BvbnNlLnByb3RvEhJUYW5nby5QTVIuSGFyZHdh",
+ "cmUiFQoTU3lzdGVtUmVzZXRSZXNwb25zZUIeChxjb20udHdpbmUudGFuZ28u",
+ "cG1yLmhhcmR3YXJlYgZwcm90bzM="));
+ descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
+ new pbr::FileDescriptor[] { },
+ new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
+ new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Hardware.SystemResetResponse), global::Tango.PMR.Hardware.SystemResetResponse.Parser, null, null, null, null)
+ }));
+ }
+ #endregion
+
+ }
+ #region Messages
+ public sealed partial class SystemResetResponse : pb::IMessage<SystemResetResponse> {
+ private static readonly pb::MessageParser<SystemResetResponse> _parser = new pb::MessageParser<SystemResetResponse>(() => new SystemResetResponse());
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public static pb::MessageParser<SystemResetResponse> Parser { get { return _parser; } }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public static pbr::MessageDescriptor Descriptor {
+ get { return global::Tango.PMR.Hardware.SystemResetResponseReflection.Descriptor.MessageTypes[0]; }
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ pbr::MessageDescriptor pb::IMessage.Descriptor {
+ get { return Descriptor; }
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public SystemResetResponse() {
+ OnConstruction();
+ }
+
+ partial void OnConstruction();
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public SystemResetResponse(SystemResetResponse other) : this() {
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public SystemResetResponse Clone() {
+ return new SystemResetResponse(this);
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public override bool Equals(object other) {
+ return Equals(other as SystemResetResponse);
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public bool Equals(SystemResetResponse other) {
+ if (ReferenceEquals(other, null)) {
+ return false;
+ }
+ if (ReferenceEquals(other, this)) {
+ return true;
+ }
+ return true;
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public override int GetHashCode() {
+ int hash = 1;
+ 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) {
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public int CalculateSize() {
+ int size = 0;
+ return size;
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public void MergeFrom(SystemResetResponse other) {
+ if (other == null) {
+ return;
+ }
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public void MergeFrom(pb::CodedInputStream input) {
+ uint tag;
+ while ((tag = input.ReadTag()) != 0) {
+ switch(tag) {
+ default:
+ input.SkipLastField();
+ break;
+ }
+ }
+ }
+
+ }
+
+ #endregion
+
+}
+
+#endregion Designer generated code
diff --git a/Software/Visual_Studio/Tango.PMR/Printing/JobSpool.cs b/Software/Visual_Studio/Tango.PMR/Printing/JobSpool.cs
index 6525e691f..afe846303 100644
--- a/Software/Visual_Studio/Tango.PMR/Printing/JobSpool.cs
+++ b/Software/Visual_Studio/Tango.PMR/Printing/JobSpool.cs
@@ -23,16 +23,17 @@ namespace Tango.PMR.Printing {
byte[] descriptorData = global::System.Convert.FromBase64String(
string.Concat(
"Cg5Kb2JTcG9vbC5wcm90bxISVGFuZ28uUE1SLlByaW50aW5nGhJKb2JTcG9v",
- "bFR5cGUucHJvdG8iwQEKCEpvYlNwb29sEjYKDEpvYlNwb29sVHlwZRgBIAEo",
+ "bFR5cGUucHJvdG8i+QEKCEpvYlNwb29sEjYKDEpvYlNwb29sVHlwZRgBIAEo",
"DjIgLlRhbmdvLlBNUi5QcmludGluZy5Kb2JTcG9vbFR5cGUSDgoGTGVuZ3Ro",
"GAIgASgBEg4KBldlaWdodBgDIAEoARIQCghEaWFtZXRlchgEIAEoARIZChFT",
"dGFydE9mZnNldFB1bHNlcxgFIAEoBRITCgtCYWNraW5nUmF0ZRgGIAEoBRIb",
- "ChNTZWdtZW50T2Zmc2V0UHVsc2VzGAcgASgFQh4KHGNvbS50d2luZS50YW5n",
- "by5wbXIucHJpbnRpbmdiBnByb3RvMw=="));
+ "ChNTZWdtZW50T2Zmc2V0UHVsc2VzGAcgASgFEhkKEUJvdHRvbUJhY2tpbmdS",
+ "YXRlGAggASgFEhsKE1JvdGF0aW9uc1BlclBhc3NhZ2UYCSABKAFCHgocY29t",
+ "LnR3aW5lLnRhbmdvLnBtci5wcmludGluZ2IGcHJvdG8z"));
descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
new pbr::FileDescriptor[] { global::Tango.PMR.Printing.JobSpoolTypeReflection.Descriptor, },
new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
- new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Printing.JobSpool), global::Tango.PMR.Printing.JobSpool.Parser, new[]{ "JobSpoolType", "Length", "Weight", "Diameter", "StartOffsetPulses", "BackingRate", "SegmentOffsetPulses" }, null, null, null)
+ new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Printing.JobSpool), global::Tango.PMR.Printing.JobSpool.Parser, new[]{ "JobSpoolType", "Length", "Weight", "Diameter", "StartOffsetPulses", "BackingRate", "SegmentOffsetPulses", "BottomBackingRate", "RotationsPerPassage" }, null, null, null)
}));
}
#endregion
@@ -70,6 +71,8 @@ namespace Tango.PMR.Printing {
startOffsetPulses_ = other.startOffsetPulses_;
backingRate_ = other.backingRate_;
segmentOffsetPulses_ = other.segmentOffsetPulses_;
+ bottomBackingRate_ = other.bottomBackingRate_;
+ rotationsPerPassage_ = other.rotationsPerPassage_;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -154,6 +157,28 @@ namespace Tango.PMR.Printing {
}
}
+ /// <summary>Field number for the "BottomBackingRate" field.</summary>
+ public const int BottomBackingRateFieldNumber = 8;
+ private int bottomBackingRate_;
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public int BottomBackingRate {
+ get { return bottomBackingRate_; }
+ set {
+ bottomBackingRate_ = value;
+ }
+ }
+
+ /// <summary>Field number for the "RotationsPerPassage" field.</summary>
+ public const int RotationsPerPassageFieldNumber = 9;
+ private double rotationsPerPassage_;
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public double RotationsPerPassage {
+ get { return rotationsPerPassage_; }
+ set {
+ rotationsPerPassage_ = value;
+ }
+ }
+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public override bool Equals(object other) {
return Equals(other as JobSpool);
@@ -174,6 +199,8 @@ namespace Tango.PMR.Printing {
if (StartOffsetPulses != other.StartOffsetPulses) return false;
if (BackingRate != other.BackingRate) return false;
if (SegmentOffsetPulses != other.SegmentOffsetPulses) return false;
+ if (BottomBackingRate != other.BottomBackingRate) return false;
+ if (RotationsPerPassage != other.RotationsPerPassage) return false;
return true;
}
@@ -187,6 +214,8 @@ namespace Tango.PMR.Printing {
if (StartOffsetPulses != 0) hash ^= StartOffsetPulses.GetHashCode();
if (BackingRate != 0) hash ^= BackingRate.GetHashCode();
if (SegmentOffsetPulses != 0) hash ^= SegmentOffsetPulses.GetHashCode();
+ if (BottomBackingRate != 0) hash ^= BottomBackingRate.GetHashCode();
+ if (RotationsPerPassage != 0D) hash ^= RotationsPerPassage.GetHashCode();
return hash;
}
@@ -225,6 +254,14 @@ namespace Tango.PMR.Printing {
output.WriteRawTag(56);
output.WriteInt32(SegmentOffsetPulses);
}
+ if (BottomBackingRate != 0) {
+ output.WriteRawTag(64);
+ output.WriteInt32(BottomBackingRate);
+ }
+ if (RotationsPerPassage != 0D) {
+ output.WriteRawTag(73);
+ output.WriteDouble(RotationsPerPassage);
+ }
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -251,6 +288,12 @@ namespace Tango.PMR.Printing {
if (SegmentOffsetPulses != 0) {
size += 1 + pb::CodedOutputStream.ComputeInt32Size(SegmentOffsetPulses);
}
+ if (BottomBackingRate != 0) {
+ size += 1 + pb::CodedOutputStream.ComputeInt32Size(BottomBackingRate);
+ }
+ if (RotationsPerPassage != 0D) {
+ size += 1 + 8;
+ }
return size;
}
@@ -280,6 +323,12 @@ namespace Tango.PMR.Printing {
if (other.SegmentOffsetPulses != 0) {
SegmentOffsetPulses = other.SegmentOffsetPulses;
}
+ if (other.BottomBackingRate != 0) {
+ BottomBackingRate = other.BottomBackingRate;
+ }
+ if (other.RotationsPerPassage != 0D) {
+ RotationsPerPassage = other.RotationsPerPassage;
+ }
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -318,6 +367,14 @@ namespace Tango.PMR.Printing {
SegmentOffsetPulses = input.ReadInt32();
break;
}
+ case 64: {
+ BottomBackingRate = input.ReadInt32();
+ break;
+ }
+ case 73: {
+ RotationsPerPassage = input.ReadDouble();
+ break;
+ }
}
}
}
diff --git a/Software/Visual_Studio/Tango.PMR/Stubs/StubHeatingTestPollResponse.cs b/Software/Visual_Studio/Tango.PMR/Stubs/StubHeatingTestPollResponse.cs
index 33b500c98..8aef8b020 100644
--- a/Software/Visual_Studio/Tango.PMR/Stubs/StubHeatingTestPollResponse.cs
+++ b/Software/Visual_Studio/Tango.PMR/Stubs/StubHeatingTestPollResponse.cs
@@ -23,16 +23,16 @@ namespace Tango.PMR.Stubs {
byte[] descriptorData = global::System.Convert.FromBase64String(
string.Concat(
"CiFTdHViSGVhdGluZ1Rlc3RQb2xsUmVzcG9uc2UucHJvdG8SD1RhbmdvLlBN",
- "Ui5TdHVicyK+AQobU3R1YkhlYXRpbmdUZXN0UG9sbFJlc3BvbnNlEhUKDUhl",
+ "Ui5TdHVicyLTAQobU3R1YkhlYXRpbmdUZXN0UG9sbFJlc3BvbnNlEhUKDUhl",
"YXRlckdyb3VwSWQYASABKA0SEQoJWm9uZTFUZW1wGAIgASgNEhEKCVpvbmUy",
"VGVtcBgDIAEoDRIVCg1IZWF0ZXIxQWN0aXZlGAQgASgIEhUKDUhlYXRlcjJB",
"Y3RpdmUYBSABKAgSGQoRSGVhdGVyMVBlcmNlbnRhZ2UYBiABKA0SGQoRSGVh",
- "dGVyMlBlcmNlbnRhZ2UYByABKA1CGwoZY29tLnR3aW5lLnRhbmdvLnBtci5z",
- "dHVic2IGcHJvdG8z"));
+ "dGVyMlBlcmNlbnRhZ2UYByABKA0SEwoLSW5mb01lc3NhZ2UYCCABKAlCGwoZ",
+ "Y29tLnR3aW5lLnRhbmdvLnBtci5zdHVic2IGcHJvdG8z"));
descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
new pbr::FileDescriptor[] { },
new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
- new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Stubs.StubHeatingTestPollResponse), global::Tango.PMR.Stubs.StubHeatingTestPollResponse.Parser, new[]{ "HeaterGroupId", "Zone1Temp", "Zone2Temp", "Heater1Active", "Heater2Active", "Heater1Percentage", "Heater2Percentage" }, null, null, null)
+ new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Stubs.StubHeatingTestPollResponse), global::Tango.PMR.Stubs.StubHeatingTestPollResponse.Parser, new[]{ "HeaterGroupId", "Zone1Temp", "Zone2Temp", "Heater1Active", "Heater2Active", "Heater1Percentage", "Heater2Percentage", "InfoMessage" }, null, null, null)
}));
}
#endregion
@@ -70,6 +70,7 @@ namespace Tango.PMR.Stubs {
heater2Active_ = other.heater2Active_;
heater1Percentage_ = other.heater1Percentage_;
heater2Percentage_ = other.heater2Percentage_;
+ infoMessage_ = other.infoMessage_;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -157,6 +158,17 @@ namespace Tango.PMR.Stubs {
}
}
+ /// <summary>Field number for the "InfoMessage" field.</summary>
+ public const int InfoMessageFieldNumber = 8;
+ private string infoMessage_ = "";
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public string InfoMessage {
+ get { return infoMessage_; }
+ set {
+ infoMessage_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
+ }
+ }
+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public override bool Equals(object other) {
return Equals(other as StubHeatingTestPollResponse);
@@ -177,6 +189,7 @@ namespace Tango.PMR.Stubs {
if (Heater2Active != other.Heater2Active) return false;
if (Heater1Percentage != other.Heater1Percentage) return false;
if (Heater2Percentage != other.Heater2Percentage) return false;
+ if (InfoMessage != other.InfoMessage) return false;
return true;
}
@@ -190,6 +203,7 @@ namespace Tango.PMR.Stubs {
if (Heater2Active != false) hash ^= Heater2Active.GetHashCode();
if (Heater1Percentage != 0) hash ^= Heater1Percentage.GetHashCode();
if (Heater2Percentage != 0) hash ^= Heater2Percentage.GetHashCode();
+ if (InfoMessage.Length != 0) hash ^= InfoMessage.GetHashCode();
return hash;
}
@@ -228,6 +242,10 @@ namespace Tango.PMR.Stubs {
output.WriteRawTag(56);
output.WriteUInt32(Heater2Percentage);
}
+ if (InfoMessage.Length != 0) {
+ output.WriteRawTag(66);
+ output.WriteString(InfoMessage);
+ }
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -254,6 +272,9 @@ namespace Tango.PMR.Stubs {
if (Heater2Percentage != 0) {
size += 1 + pb::CodedOutputStream.ComputeUInt32Size(Heater2Percentage);
}
+ if (InfoMessage.Length != 0) {
+ size += 1 + pb::CodedOutputStream.ComputeStringSize(InfoMessage);
+ }
return size;
}
@@ -283,6 +304,9 @@ namespace Tango.PMR.Stubs {
if (other.Heater2Percentage != 0) {
Heater2Percentage = other.Heater2Percentage;
}
+ if (other.InfoMessage.Length != 0) {
+ InfoMessage = other.InfoMessage;
+ }
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -321,6 +345,10 @@ namespace Tango.PMR.Stubs {
Heater2Percentage = input.ReadUInt32();
break;
}
+ case 66: {
+ InfoMessage = input.ReadString();
+ break;
+ }
}
}
}
diff --git a/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj b/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj
index d3299baa1..930fd8819 100644
--- a/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj
+++ b/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj
@@ -116,6 +116,8 @@
<Compile Include="Hardware\HardwarePidControlType.cs" />
<Compile Include="Hardware\HardwareWinder.cs" />
<Compile Include="Hardware\HardwareWinderType.cs" />
+ <Compile Include="Hardware\SystemResetRequest.cs" />
+ <Compile Include="Hardware\SystemResetResponse.cs" />
<Compile Include="Hardware\UploadHardwareConfigurationRequest.cs" />
<Compile Include="Hardware\UploadHardwareConfigurationResponse.cs" />
<Compile Include="Integration\DirectSynchronizationRequest.cs" />