diff options
| author | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2018-08-04 14:35:57 +0300 |
|---|---|---|
| committer | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2018-08-04 14:35:57 +0300 |
| commit | db9119d86fa9e2efd2c3dfab8ac2c49c2ee4da70 (patch) | |
| tree | 6edfb51c6fde983291a415b8b19a972b2aa78548 /Software/Visual_Studio | |
| parent | 76d311ad4690b9f88ae71ff097c6592190b65012 (diff) | |
| download | Tango-db9119d86fa9e2efd2c3dfab8ac2c49c2ee4da70.tar.gz Tango-db9119d86fa9e2efd2c3dfab8ac2c49c2ee4da70.zip | |
Added DB, Observables, PMR Hardware Break Sensors & Break Sensors.
Diffstat (limited to 'Software/Visual_Studio')
30 files changed, 2008 insertions, 84 deletions
diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareBlower.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareBlower.cs new file mode 100644 index 000000000..afef2c3d7 --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareBlower.cs @@ -0,0 +1,168 @@ +//------------------------------------------------------------------------------ +// <auto-generated> +// This code was generated by a tool. +// Tango Observables Generator +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. Do not modify! +// </auto-generated> +//------------------------------------------------------------------------------ + +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; +using System.Linq; +using Tango.DAL.Remote.DB; + +namespace Tango.BL.Entities +{ + [Table("HARDWARE_BLOWERS")] + public partial class HardwareBlower : ObservableEntity<HardwareBlower> + { + + protected String _hardwareblowertypeguid; + + /// <summary> + /// Gets or sets the hardwareblower hardware blower type guid. + /// </summary> + + [Column("HARDWARE_BLOWER_TYPE_GUID")] + [ForeignKey("HardwareBlowerType")] + + public String HardwareBlowerTypeGuid + { + get + { + return _hardwareblowertypeguid; + } + + set + { + _hardwareblowertypeguid = value; RaisePropertyChanged(nameof(HardwareBlowerTypeGuid)); + } + + } + + protected String _hardwareversionguid; + + /// <summary> + /// Gets or sets the hardwareblower hardware version guid. + /// </summary> + + [Column("HARDWARE_VERSION_GUID")] + [ForeignKey("HardwareVersion")] + + public String HardwareVersionGuid + { + get + { + return _hardwareversionguid; + } + + set + { + _hardwareversionguid = value; RaisePropertyChanged(nameof(HardwareVersionGuid)); + } + + } + + protected Boolean _enabled; + + /// <summary> + /// Gets or sets the hardwareblower enabled. + /// </summary> + + [Column("ENABLED")] + + public Boolean Enabled + { + get + { + return _enabled; + } + + set + { + _enabled = value; RaisePropertyChanged(nameof(Enabled)); + } + + } + + protected Double _voltage; + + /// <summary> + /// Gets or sets the hardwareblower voltage. + /// </summary> + + [Column("VOLTAGE")] + + public Double Voltage + { + get + { + return _voltage; + } + + set + { + _voltage = value; RaisePropertyChanged(nameof(Voltage)); + } + + } + + protected HardwareBlowerType _hardwareblowertype; + + /// <summary> + /// Gets or sets the hardwareblower hardware blower types. + /// </summary> + + [XmlIgnore] + [JsonIgnore] + public virtual HardwareBlowerType HardwareBlowerType + { + get + { + return _hardwareblowertype; + } + + set + { + _hardwareblowertype = value; RaisePropertyChanged(nameof(HardwareBlowerType)); + } + + } + + protected HardwareVersion _hardwareversion; + + /// <summary> + /// Gets or sets the hardwareblower hardware versions. + /// </summary> + + [XmlIgnore] + [JsonIgnore] + public virtual HardwareVersion HardwareVersion + { + get + { + return _hardwareversion; + } + + set + { + _hardwareversion = value; RaisePropertyChanged(nameof(HardwareVersion)); + } + + } + + /// <summary> + /// Initializes a new instance of the <see cref="HardwareBlower" /> class. + /// </summary> + public HardwareBlower() : base() + { + } + } +} diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareBlowerType.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareBlowerType.cs new file mode 100644 index 000000000..5bfdf6515 --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareBlowerType.cs @@ -0,0 +1,123 @@ +//------------------------------------------------------------------------------ +// <auto-generated> +// This code was generated by a tool. +// Tango Observables Generator +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. Do not modify! +// </auto-generated> +//------------------------------------------------------------------------------ + +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; +using System.Linq; +using Tango.DAL.Remote.DB; + +namespace Tango.BL.Entities +{ + [Table("HARDWARE_BLOWER_TYPES")] + public partial class HardwareBlowerType : ObservableEntity<HardwareBlowerType> + { + + protected Int32 _code; + + /// <summary> + /// Gets or sets the hardwareblowertype code. + /// </summary> + + [Column("CODE")] + + public Int32 Code + { + get + { + return _code; + } + + set + { + _code = value; RaisePropertyChanged(nameof(Code)); + } + + } + + protected String _name; + + /// <summary> + /// Gets or sets the hardwareblowertype name. + /// </summary> + + [Column("NAME")] + + public String Name + { + get + { + return _name; + } + + set + { + _name = value; RaisePropertyChanged(nameof(Name)); + } + + } + + protected String _description; + + /// <summary> + /// Gets or sets the hardwareblowertype description. + /// </summary> + + [Column("DESCRIPTION")] + + public String Description + { + get + { + return _description; + } + + set + { + _description = value; RaisePropertyChanged(nameof(Description)); + } + + } + + protected ObservableCollection<HardwareBlower> _hardwareblowers; + + /// <summary> + /// Gets or sets the hardwareblowertype hardware blowers. + /// </summary> + + public virtual ObservableCollection<HardwareBlower> HardwareBlowers + { + get + { + return _hardwareblowers; + } + + set + { + _hardwareblowers = value; RaisePropertyChanged(nameof(HardwareBlowers)); + } + + } + + /// <summary> + /// Initializes a new instance of the <see cref="HardwareBlowerType" /> class. + /// </summary> + public HardwareBlowerType() : base() + { + + HardwareBlowers = new ObservableCollection<HardwareBlower>(); + + } + } +} diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareBreakSensor.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareBreakSensor.cs new file mode 100644 index 000000000..f2bdf4f89 --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareBreakSensor.cs @@ -0,0 +1,168 @@ +//------------------------------------------------------------------------------ +// <auto-generated> +// This code was generated by a tool. +// Tango Observables Generator +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. Do not modify! +// </auto-generated> +//------------------------------------------------------------------------------ + +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; +using System.Linq; +using Tango.DAL.Remote.DB; + +namespace Tango.BL.Entities +{ + [Table("HARDWARE_BREAK_SENSORS")] + public partial class HardwareBreakSensor : ObservableEntity<HardwareBreakSensor> + { + + protected String _hardwarebreaksensortypeguid; + + /// <summary> + /// Gets or sets the hardwarebreaksensor hardware break sensor type guid. + /// </summary> + + [Column("HARDWARE_BREAK_SENSOR_TYPE_GUID")] + [ForeignKey("HardwareBreakSensorType")] + + public String HardwareBreakSensorTypeGuid + { + get + { + return _hardwarebreaksensortypeguid; + } + + set + { + _hardwarebreaksensortypeguid = value; RaisePropertyChanged(nameof(HardwareBreakSensorTypeGuid)); + } + + } + + protected String _hardwareversionguid; + + /// <summary> + /// Gets or sets the hardwarebreaksensor hardware version guid. + /// </summary> + + [Column("HARDWARE_VERSION_GUID")] + [ForeignKey("HardwareVersion")] + + public String HardwareVersionGuid + { + get + { + return _hardwareversionguid; + } + + set + { + _hardwareversionguid = value; RaisePropertyChanged(nameof(HardwareVersionGuid)); + } + + } + + protected Boolean _enabled; + + /// <summary> + /// Gets or sets the hardwarebreaksensor enabled. + /// </summary> + + [Column("ENABLED")] + + public Boolean Enabled + { + get + { + return _enabled; + } + + set + { + _enabled = value; RaisePropertyChanged(nameof(Enabled)); + } + + } + + protected Int32 _debouncetimemilli; + + /// <summary> + /// Gets or sets the hardwarebreaksensor de bounce time milli. + /// </summary> + + [Column("DE_BOUNCE_TIME_MILLI")] + + public Int32 DeBounceTimeMilli + { + get + { + return _debouncetimemilli; + } + + set + { + _debouncetimemilli = value; RaisePropertyChanged(nameof(DeBounceTimeMilli)); + } + + } + + protected HardwareBreakSensorType _hardwarebreaksensortype; + + /// <summary> + /// Gets or sets the hardwarebreaksensor hardware break sensor types. + /// </summary> + + [XmlIgnore] + [JsonIgnore] + public virtual HardwareBreakSensorType HardwareBreakSensorType + { + get + { + return _hardwarebreaksensortype; + } + + set + { + _hardwarebreaksensortype = value; RaisePropertyChanged(nameof(HardwareBreakSensorType)); + } + + } + + protected HardwareVersion _hardwareversion; + + /// <summary> + /// Gets or sets the hardwarebreaksensor hardware versions. + /// </summary> + + [XmlIgnore] + [JsonIgnore] + public virtual HardwareVersion HardwareVersion + { + get + { + return _hardwareversion; + } + + set + { + _hardwareversion = value; RaisePropertyChanged(nameof(HardwareVersion)); + } + + } + + /// <summary> + /// Initializes a new instance of the <see cref="HardwareBreakSensor" /> class. + /// </summary> + public HardwareBreakSensor() : base() + { + } + } +} diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareBreakSensorType.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareBreakSensorType.cs new file mode 100644 index 000000000..c1d306e5b --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareBreakSensorType.cs @@ -0,0 +1,123 @@ +//------------------------------------------------------------------------------ +// <auto-generated> +// This code was generated by a tool. +// Tango Observables Generator +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. Do not modify! +// </auto-generated> +//------------------------------------------------------------------------------ + +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; +using System.Linq; +using Tango.DAL.Remote.DB; + +namespace Tango.BL.Entities +{ + [Table("HARDWARE_BREAK_SENSOR_TYPES")] + public partial class HardwareBreakSensorType : ObservableEntity<HardwareBreakSensorType> + { + + protected Int32 _code; + + /// <summary> + /// Gets or sets the hardwarebreaksensortype code. + /// </summary> + + [Column("CODE")] + + public Int32 Code + { + get + { + return _code; + } + + set + { + _code = value; RaisePropertyChanged(nameof(Code)); + } + + } + + protected String _name; + + /// <summary> + /// Gets or sets the hardwarebreaksensortype name. + /// </summary> + + [Column("NAME")] + + public String Name + { + get + { + return _name; + } + + set + { + _name = value; RaisePropertyChanged(nameof(Name)); + } + + } + + protected String _description; + + /// <summary> + /// Gets or sets the hardwarebreaksensortype description. + /// </summary> + + [Column("DESCRIPTION")] + + public String Description + { + get + { + return _description; + } + + set + { + _description = value; RaisePropertyChanged(nameof(Description)); + } + + } + + protected ObservableCollection<HardwareBreakSensor> _hardwarebreaksensors; + + /// <summary> + /// Gets or sets the hardwarebreaksensortype hardware break sensors. + /// </summary> + + public virtual ObservableCollection<HardwareBreakSensor> HardwareBreakSensors + { + get + { + return _hardwarebreaksensors; + } + + set + { + _hardwarebreaksensors = value; RaisePropertyChanged(nameof(HardwareBreakSensors)); + } + + } + + /// <summary> + /// Initializes a new instance of the <see cref="HardwareBreakSensorType" /> class. + /// </summary> + public HardwareBreakSensorType() : base() + { + + HardwareBreakSensors = new ObservableCollection<HardwareBreakSensor>(); + + } + } +} diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareVersion.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareVersion.cs index 4d06de0e1..9641896d9 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/HardwareVersion.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareVersion.cs @@ -88,6 +88,46 @@ namespace Tango.BL.Entities } + protected ObservableCollection<HardwareBlower> _hardwareblowers; + + /// <summary> + /// Gets or sets the hardwareversion hardware blowers. + /// </summary> + + public virtual ObservableCollection<HardwareBlower> HardwareBlowers + { + get + { + return _hardwareblowers; + } + + set + { + _hardwareblowers = value; RaisePropertyChanged(nameof(HardwareBlowers)); + } + + } + + protected ObservableCollection<HardwareBreakSensor> _hardwarebreaksensors; + + /// <summary> + /// Gets or sets the hardwareversion hardware break sensors. + /// </summary> + + public virtual ObservableCollection<HardwareBreakSensor> HardwareBreakSensors + { + get + { + return _hardwarebreaksensors; + } + + set + { + _hardwarebreaksensors = value; RaisePropertyChanged(nameof(HardwareBreakSensors)); + } + + } + protected ObservableCollection<HardwareDancer> _hardwaredancers; /// <summary> @@ -196,6 +236,10 @@ namespace Tango.BL.Entities Configurations = new ObservableCollection<Configuration>(); + HardwareBlowers = new ObservableCollection<HardwareBlower>(); + + HardwareBreakSensors = new ObservableCollection<HardwareBreakSensor>(); + HardwareDancers = new ObservableCollection<HardwareDancer>(); HardwareMotors = new ObservableCollection<HardwareMotor>(); diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/HardwareBlowerTypes.cs b/Software/Visual_Studio/Tango.BL/Enumerations/HardwareBlowerTypes.cs new file mode 100644 index 000000000..0f8b447fd --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/Enumerations/HardwareBlowerTypes.cs @@ -0,0 +1,22 @@ +//------------------------------------------------------------------------------ +// <auto-generated> +// This code was generated by a tool. +// Tango Observables Generator +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. Do not modify! +// </auto-generated> +//------------------------------------------------------------------------------ + +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.ComponentModel; + +namespace Tango.BL.Enumerations +{ + public enum HardwareBlowerTypes + { + } +} diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/HardwareBreakSensorTypes.cs b/Software/Visual_Studio/Tango.BL/Enumerations/HardwareBreakSensorTypes.cs new file mode 100644 index 000000000..a43869bf5 --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/Enumerations/HardwareBreakSensorTypes.cs @@ -0,0 +1,22 @@ +//------------------------------------------------------------------------------ +// <auto-generated> +// This code was generated by a tool. +// Tango Observables Generator +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. Do not modify! +// </auto-generated> +//------------------------------------------------------------------------------ + +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.ComponentModel; + +namespace Tango.BL.Enumerations +{ + public enum HardwareBreakSensorTypes + { + } +} diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/TechMonitors.cs b/Software/Visual_Studio/Tango.BL/Enumerations/TechMonitors.cs index c73105b9f..79e578f43 100644 --- a/Software/Visual_Studio/Tango.BL/Enumerations/TechMonitors.cs +++ b/Software/Visual_Studio/Tango.BL/Enumerations/TechMonitors.cs @@ -26,21 +26,21 @@ namespace Tango.BL.Enumerations ChillerTemperature = 27, /// <summary> - /// (Dancer 1) + /// (Left Dancer) /// </summary> - [Description("Dancer 1")] + [Description("Left Dancer")] Dancer1Angle = 0, /// <summary> - /// (Dancer 2) + /// (Middle Dancer) /// </summary> - [Description("Dancer 2")] + [Description("Middle Dancer")] Dancer2Angle = 1, /// <summary> - /// (Dancer 3) + /// (Right Dancer) /// </summary> - [Description("Dancer 3")] + [Description("Right Dancer")] Dancer3Angle = 2, /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/ObservablesContext.cs b/Software/Visual_Studio/Tango.BL/ObservablesContext.cs index 48e0e0151..5c20899e9 100644 --- a/Software/Visual_Studio/Tango.BL/ObservablesContext.cs +++ b/Software/Visual_Studio/Tango.BL/ObservablesContext.cs @@ -223,6 +223,38 @@ namespace Tango.BL } /// <summary> + /// Gets or sets the HardwareBlowerTypes. + /// </summary> + public DbSet<HardwareBlowerType> HardwareBlowerTypes + { + get; set; + } + + /// <summary> + /// Gets or sets the HardwareBlowers. + /// </summary> + public DbSet<HardwareBlower> HardwareBlowers + { + get; set; + } + + /// <summary> + /// Gets or sets the HardwareBreakSensorTypes. + /// </summary> + public DbSet<HardwareBreakSensorType> HardwareBreakSensorTypes + { + get; set; + } + + /// <summary> + /// Gets or sets the HardwareBreakSensors. + /// </summary> + public DbSet<HardwareBreakSensor> HardwareBreakSensors + { + get; set; + } + + /// <summary> /// Gets or sets the HardwareDancerTypes. /// </summary> public DbSet<HardwareDancerType> HardwareDancerTypes diff --git a/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapter.cs b/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapter.cs index b8736f856..bc939259d 100644 --- a/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapter.cs +++ b/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapter.cs @@ -304,6 +304,14 @@ namespace Tango.BL HardwareSpeedSensors = Context.HardwareSpeedSensors.ToObservableCollection(); + HardwareBlowerTypes = Context.HardwareBlowerTypes.ToObservableCollection(); + + HardwareBlowers = Context.HardwareBlowers.ToObservableCollection(); + + HardwareBreakSensorTypes = Context.HardwareBreakSensorTypes.ToObservableCollection(); + + HardwareBreakSensors = Context.HardwareBreakSensors.ToObservableCollection(); + HtmlPages = Context.HtmlPages.ToObservableCollection(); Customers = Context.Customers.ToObservableCollection(); diff --git a/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs b/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs index ceaa4c77c..df7b44539 100644 --- a/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs +++ b/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs @@ -917,6 +917,150 @@ namespace Tango.BL } + private ObservableCollection<HardwareBlowerType> _hardwareblowertypes; + /// <summary> + /// Gets or sets the HardwareBlowerTypes. + /// </summary> + public ObservableCollection<HardwareBlowerType> HardwareBlowerTypes + { + get + { + return _hardwareblowertypes; + } + + set + { + _hardwareblowertypes = value; RaisePropertyChanged(nameof(HardwareBlowerTypes)); + } + + } + + private ICollectionView _hardwareblowertypesViewSource; + /// <summary> + /// Gets or sets the HardwareBlowerTypes View Source. + ///</summary> + public ICollectionView HardwareBlowerTypesViewSource + { + get + { + return _hardwareblowertypesViewSource; + } + + set + { + _hardwareblowertypesViewSource = value; RaisePropertyChanged(nameof(HardwareBlowerTypesViewSource)); + } + + } + + private ObservableCollection<HardwareBlower> _hardwareblowers; + /// <summary> + /// Gets or sets the HardwareBlowers. + /// </summary> + public ObservableCollection<HardwareBlower> HardwareBlowers + { + get + { + return _hardwareblowers; + } + + set + { + _hardwareblowers = value; RaisePropertyChanged(nameof(HardwareBlowers)); + } + + } + + private ICollectionView _hardwareblowersViewSource; + /// <summary> + /// Gets or sets the HardwareBlowers View Source. + ///</summary> + public ICollectionView HardwareBlowersViewSource + { + get + { + return _hardwareblowersViewSource; + } + + set + { + _hardwareblowersViewSource = value; RaisePropertyChanged(nameof(HardwareBlowersViewSource)); + } + + } + + private ObservableCollection<HardwareBreakSensorType> _hardwarebreaksensortypes; + /// <summary> + /// Gets or sets the HardwareBreakSensorTypes. + /// </summary> + public ObservableCollection<HardwareBreakSensorType> HardwareBreakSensorTypes + { + get + { + return _hardwarebreaksensortypes; + } + + set + { + _hardwarebreaksensortypes = value; RaisePropertyChanged(nameof(HardwareBreakSensorTypes)); + } + + } + + private ICollectionView _hardwarebreaksensortypesViewSource; + /// <summary> + /// Gets or sets the HardwareBreakSensorTypes View Source. + ///</summary> + public ICollectionView HardwareBreakSensorTypesViewSource + { + get + { + return _hardwarebreaksensortypesViewSource; + } + + set + { + _hardwarebreaksensortypesViewSource = value; RaisePropertyChanged(nameof(HardwareBreakSensorTypesViewSource)); + } + + } + + private ObservableCollection<HardwareBreakSensor> _hardwarebreaksensors; + /// <summary> + /// Gets or sets the HardwareBreakSensors. + /// </summary> + public ObservableCollection<HardwareBreakSensor> HardwareBreakSensors + { + get + { + return _hardwarebreaksensors; + } + + set + { + _hardwarebreaksensors = value; RaisePropertyChanged(nameof(HardwareBreakSensors)); + } + + } + + private ICollectionView _hardwarebreaksensorsViewSource; + /// <summary> + /// Gets or sets the HardwareBreakSensors View Source. + ///</summary> + public ICollectionView HardwareBreakSensorsViewSource + { + get + { + return _hardwarebreaksensorsViewSource; + } + + set + { + _hardwarebreaksensorsViewSource = value; RaisePropertyChanged(nameof(HardwareBreakSensorsViewSource)); + } + + } + private ObservableCollection<HardwareDancerType> _hardwaredancertypes; /// <summary> /// Gets or sets the HardwareDancerTypes. @@ -2665,6 +2809,14 @@ namespace Tango.BL FiberSynthsViewSource = CreateCollectionView(FiberSynths); + HardwareBlowerTypesViewSource = CreateCollectionView(HardwareBlowerTypes); + + HardwareBlowersViewSource = CreateCollectionView(HardwareBlowers); + + HardwareBreakSensorTypesViewSource = CreateCollectionView(HardwareBreakSensorTypes); + + HardwareBreakSensorsViewSource = CreateCollectionView(HardwareBreakSensors); + HardwareDancerTypesViewSource = CreateCollectionView(HardwareDancerTypes); HardwareDancersViewSource = CreateCollectionView(HardwareDancers); diff --git a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj index 58767ea88..dccfd8bcd 100644 --- a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj +++ b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj @@ -102,6 +102,10 @@ <Compile Include="Entities\Customer.cs" /> <Compile Include="Entities\EventTypesCategory.cs" /> <Compile Include="Entities\EventTypesGroup.cs" /> + <Compile Include="Entities\HardwareBlower.cs" /> + <Compile Include="Entities\HardwareBlowerType.cs" /> + <Compile Include="Entities\HardwareBreakSensor.cs" /> + <Compile Include="Entities\HardwareBreakSensorType.cs" /> <Compile Include="Entities\HardwareSpeedSensor.cs" /> <Compile Include="Entities\HardwareSpeedSensorType.cs" /> <Compile Include="Entities\HtmlPage.cs" /> @@ -119,6 +123,8 @@ <Compile Include="Enumerations\FiberSynths.cs" /> <Compile Include="Enumerations\FineTuningStatuses.cs" /> <Compile Include="Enumerations\Graphs.cs" /> + <Compile Include="Enumerations\HardwareBlowerTypes.cs" /> + <Compile Include="Enumerations\HardwareBreakSensorTypes.cs" /> <Compile Include="Enumerations\HardwareDancerTypes.cs" /> <Compile Include="Enumerations\HardwareMotorTypes.cs" /> <Compile Include="Enumerations\HardwarePidControlTypes.cs" /> @@ -316,7 +322,7 @@ </Target> <ProjectExtensions> <VisualStudio> - <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" /> + <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" /> </VisualStudio> </ProjectExtensions> </Project>
\ No newline at end of file diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/HARDWARE_BLOWERS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/HARDWARE_BLOWERS.cs new file mode 100644 index 000000000..8507177fd --- /dev/null +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/HARDWARE_BLOWERS.cs @@ -0,0 +1,28 @@ +//------------------------------------------------------------------------------ +// <auto-generated> +// This code was generated from a template. +// +// Manual changes to this file may cause unexpected behavior in your application. +// Manual changes to this file will be overwritten if the code is regenerated. +// </auto-generated> +//------------------------------------------------------------------------------ + +namespace Tango.DAL.Remote.DB +{ + using System; + using System.Collections.Generic; + + public partial class HARDWARE_BLOWERS + { + public int ID { get; set; } + public string GUID { get; set; } + public System.DateTime LAST_UPDATED { get; set; } + public string HARDWARE_BLOWER_TYPE_GUID { get; set; } + public string HARDWARE_VERSION_GUID { get; set; } + public bool ENABLED { get; set; } + public double VOLTAGE { get; set; } + + public virtual HARDWARE_BLOWER_TYPES HARDWARE_BLOWER_TYPES { get; set; } + public virtual HARDWARE_VERSIONS HARDWARE_VERSIONS { get; set; } + } +} diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/HARDWARE_BLOWER_TYPES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/HARDWARE_BLOWER_TYPES.cs new file mode 100644 index 000000000..8fe5bae81 --- /dev/null +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/HARDWARE_BLOWER_TYPES.cs @@ -0,0 +1,33 @@ +//------------------------------------------------------------------------------ +// <auto-generated> +// This code was generated from a template. +// +// Manual changes to this file may cause unexpected behavior in your application. +// Manual changes to this file will be overwritten if the code is regenerated. +// </auto-generated> +//------------------------------------------------------------------------------ + +namespace Tango.DAL.Remote.DB +{ + using System; + using System.Collections.Generic; + + public partial class HARDWARE_BLOWER_TYPES + { + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + public HARDWARE_BLOWER_TYPES() + { + this.HARDWARE_BLOWERS = new HashSet<HARDWARE_BLOWERS>(); + } + + public int ID { get; set; } + public string GUID { get; set; } + public System.DateTime LAST_UPDATED { get; set; } + public int CODE { get; set; } + public string NAME { get; set; } + public string DESCRIPTION { get; set; } + + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection<HARDWARE_BLOWERS> HARDWARE_BLOWERS { get; set; } + } +} diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/HARDWARE_BREAK_SENSORS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/HARDWARE_BREAK_SENSORS.cs new file mode 100644 index 000000000..d907bbc69 --- /dev/null +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/HARDWARE_BREAK_SENSORS.cs @@ -0,0 +1,28 @@ +//------------------------------------------------------------------------------ +// <auto-generated> +// This code was generated from a template. +// +// Manual changes to this file may cause unexpected behavior in your application. +// Manual changes to this file will be overwritten if the code is regenerated. +// </auto-generated> +//------------------------------------------------------------------------------ + +namespace Tango.DAL.Remote.DB +{ + using System; + using System.Collections.Generic; + + public partial class HARDWARE_BREAK_SENSORS + { + public int ID { get; set; } + public string GUID { get; set; } + public System.DateTime LAST_UPDATED { get; set; } + public string HARDWARE_BREAK_SENSOR_TYPE_GUID { get; set; } + public string HARDWARE_VERSION_GUID { get; set; } + public bool ENABLED { get; set; } + public int DE_BOUNCE_TIME_MILLI { get; set; } + + public virtual HARDWARE_BREAK_SENSOR_TYPES HARDWARE_BREAK_SENSOR_TYPES { get; set; } + public virtual HARDWARE_VERSIONS HARDWARE_VERSIONS { get; set; } + } +} diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/HARDWARE_BREAK_SENSOR_TYPES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/HARDWARE_BREAK_SENSOR_TYPES.cs new file mode 100644 index 000000000..addcc2bf9 --- /dev/null +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/HARDWARE_BREAK_SENSOR_TYPES.cs @@ -0,0 +1,33 @@ +//------------------------------------------------------------------------------ +// <auto-generated> +// This code was generated from a template. +// +// Manual changes to this file may cause unexpected behavior in your application. +// Manual changes to this file will be overwritten if the code is regenerated. +// </auto-generated> +//------------------------------------------------------------------------------ + +namespace Tango.DAL.Remote.DB +{ + using System; + using System.Collections.Generic; + + public partial class HARDWARE_BREAK_SENSOR_TYPES + { + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + public HARDWARE_BREAK_SENSOR_TYPES() + { + this.HARDWARE_BREAK_SENSORS = new HashSet<HARDWARE_BREAK_SENSORS>(); + } + + public int ID { get; set; } + public string GUID { get; set; } + public System.DateTime LAST_UPDATED { get; set; } + public int CODE { get; set; } + public string NAME { get; set; } + public string DESCRIPTION { get; set; } + + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection<HARDWARE_BREAK_SENSORS> HARDWARE_BREAK_SENSORS { get; set; } + } +} diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/HARDWARE_VERSIONS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/HARDWARE_VERSIONS.cs index 8948e6e17..190ed45e6 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/HARDWARE_VERSIONS.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/HARDWARE_VERSIONS.cs @@ -18,6 +18,8 @@ namespace Tango.DAL.Remote.DB public HARDWARE_VERSIONS() { this.CONFIGURATIONS = new HashSet<CONFIGURATION>(); + this.HARDWARE_BLOWERS = new HashSet<HARDWARE_BLOWERS>(); + this.HARDWARE_BREAK_SENSORS = new HashSet<HARDWARE_BREAK_SENSORS>(); this.HARDWARE_DANCERS = new HashSet<HARDWARE_DANCERS>(); this.HARDWARE_MOTORS = new HashSet<HARDWARE_MOTORS>(); this.HARDWARE_PID_CONTROLS = new HashSet<HARDWARE_PID_CONTROLS>(); @@ -34,6 +36,10 @@ namespace Tango.DAL.Remote.DB [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection<CONFIGURATION> CONFIGURATIONS { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection<HARDWARE_BLOWERS> HARDWARE_BLOWERS { get; set; } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection<HARDWARE_BREAK_SENSORS> HARDWARE_BREAK_SENSORS { get; set; } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection<HARDWARE_DANCERS> HARDWARE_DANCERS { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection<HARDWARE_MOTORS> HARDWARE_MOTORS { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs index 3bfc66745..7a6efadb4 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs @@ -50,6 +50,10 @@ namespace Tango.DAL.Remote.DB public virtual DbSet<EVENT_TYPES_GROUPS> EVENT_TYPES_GROUPS { get; set; } public virtual DbSet<FIBER_SHAPES> FIBER_SHAPES { get; set; } public virtual DbSet<FIBER_SYNTHS> FIBER_SYNTHS { get; set; } + public virtual DbSet<HARDWARE_BLOWER_TYPES> HARDWARE_BLOWER_TYPES { get; set; } + public virtual DbSet<HARDWARE_BLOWERS> HARDWARE_BLOWERS { get; set; } + public virtual DbSet<HARDWARE_BREAK_SENSOR_TYPES> HARDWARE_BREAK_SENSOR_TYPES { get; set; } + public virtual DbSet<HARDWARE_BREAK_SENSORS> HARDWARE_BREAK_SENSORS { get; set; } public virtual DbSet<HARDWARE_DANCER_TYPES> HARDWARE_DANCER_TYPES { get; set; } public virtual DbSet<HARDWARE_DANCERS> HARDWARE_DANCERS { get; set; } public virtual DbSet<HARDWARE_MOTOR_TYPES> HARDWARE_MOTOR_TYPES { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Designer.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Designer.cs index 17bc2683d..d26e67908 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Designer.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Designer.cs @@ -1,4 +1,4 @@ -// T4 code generation is enabled for model 'D:\Development\Tango\Software\Visual_Studio\Tango.DAL.Remote\DB\RemoteADO.edmx'. +// T4 code generation is enabled for model 'C:\DATA\Development\Tango\Software\Visual_Studio\Tango.DAL.Remote\DB\RemoteADO.edmx'. // To enable legacy code generation, change the value of the 'Code Generation Strategy' designer // property to 'Legacy ObjectContext'. This property is available in the Properties Window when the model // is open in the designer. diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx index b71c4e211..1dbcca618 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx @@ -327,6 +327,52 @@ <Property Name="NAME" Type="nvarchar" MaxLength="50" Nullable="false" /> <Property Name="CODE" Type="int" Nullable="false" /> </EntityType> + <EntityType Name="HARDWARE_BLOWER_TYPES"> + <Key> + <PropertyRef Name="GUID" /> + </Key> + <Property Name="ID" Type="int" StoreGeneratedPattern="Identity" Nullable="false" /> + <Property Name="GUID" Type="varchar" MaxLength="36" Nullable="false" /> + <Property Name="LAST_UPDATED" Type="datetime2" Precision="3" Nullable="false" /> + <Property Name="CODE" Type="int" Nullable="false" /> + <Property Name="NAME" Type="varchar" MaxLength="50" Nullable="false" /> + <Property Name="DESCRIPTION" Type="varchar" MaxLength="100" Nullable="false" /> + </EntityType> + <EntityType Name="HARDWARE_BLOWERS"> + <Key> + <PropertyRef Name="GUID" /> + </Key> + <Property Name="ID" Type="int" StoreGeneratedPattern="Identity" Nullable="false" /> + <Property Name="GUID" Type="varchar" MaxLength="36" Nullable="false" /> + <Property Name="LAST_UPDATED" Type="datetime2" Precision="3" Nullable="false" /> + <Property Name="HARDWARE_BLOWER_TYPE_GUID" Type="varchar" MaxLength="36" Nullable="false" /> + <Property Name="HARDWARE_VERSION_GUID" Type="varchar" MaxLength="36" Nullable="false" /> + <Property Name="ENABLED" Type="bit" Nullable="false" /> + <Property Name="VOLTAGE" Type="float" Nullable="false" /> + </EntityType> + <EntityType Name="HARDWARE_BREAK_SENSOR_TYPES"> + <Key> + <PropertyRef Name="GUID" /> + </Key> + <Property Name="ID" Type="int" StoreGeneratedPattern="Identity" Nullable="false" /> + <Property Name="GUID" Type="varchar" MaxLength="36" Nullable="false" /> + <Property Name="LAST_UPDATED" Type="datetime2" Precision="3" Nullable="false" /> + <Property Name="CODE" Type="int" Nullable="false" /> + <Property Name="NAME" Type="varchar" MaxLength="50" Nullable="false" /> + <Property Name="DESCRIPTION" Type="varchar" MaxLength="100" Nullable="false" /> + </EntityType> + <EntityType Name="HARDWARE_BREAK_SENSORS"> + <Key> + <PropertyRef Name="GUID" /> + </Key> + <Property Name="ID" Type="int" StoreGeneratedPattern="Identity" Nullable="false" /> + <Property Name="GUID" Type="varchar" MaxLength="36" Nullable="false" /> + <Property Name="LAST_UPDATED" Type="datetime2" Precision="3" Nullable="false" /> + <Property Name="HARDWARE_BREAK_SENSOR_TYPE_GUID" Type="varchar" MaxLength="36" Nullable="false" /> + <Property Name="HARDWARE_VERSION_GUID" Type="varchar" MaxLength="36" Nullable="false" /> + <Property Name="ENABLED" Type="bit" Nullable="false" /> + <Property Name="DE_BOUNCE_TIME_MILLI" Type="int" Nullable="false" /> + </EntityType> <EntityType Name="HARDWARE_DANCER_TYPES"> <Key> <PropertyRef Name="GUID" /> @@ -1294,6 +1340,62 @@ </Dependent> </ReferentialConstraint> </Association> + <Association Name="FK_HARDWARE_BLOWERS_HARDWARE_BLOWER_TYPES"> + <End Role="HARDWARE_BLOWER_TYPES" Type="Self.HARDWARE_BLOWER_TYPES" Multiplicity="1"> + <OnDelete Action="Cascade" /> + </End> + <End Role="HARDWARE_BLOWERS" Type="Self.HARDWARE_BLOWERS" Multiplicity="*" /> + <ReferentialConstraint> + <Principal Role="HARDWARE_BLOWER_TYPES"> + <PropertyRef Name="GUID" /> + </Principal> + <Dependent Role="HARDWARE_BLOWERS"> + <PropertyRef Name="HARDWARE_BLOWER_TYPE_GUID" /> + </Dependent> + </ReferentialConstraint> + </Association> + <Association Name="FK_HARDWARE_BLOWERS_HARDWARE_VERSIONS"> + <End Role="HARDWARE_VERSIONS" Type="Self.HARDWARE_VERSIONS" Multiplicity="1"> + <OnDelete Action="Cascade" /> + </End> + <End Role="HARDWARE_BLOWERS" Type="Self.HARDWARE_BLOWERS" Multiplicity="*" /> + <ReferentialConstraint> + <Principal Role="HARDWARE_VERSIONS"> + <PropertyRef Name="GUID" /> + </Principal> + <Dependent Role="HARDWARE_BLOWERS"> + <PropertyRef Name="HARDWARE_VERSION_GUID" /> + </Dependent> + </ReferentialConstraint> + </Association> + <Association Name="FK_HARDWARE_BREAK_SENSORS_HARDWARE_BREAK_SENSOR_TYPES"> + <End Role="HARDWARE_BREAK_SENSOR_TYPES" Type="Self.HARDWARE_BREAK_SENSOR_TYPES" Multiplicity="1"> + <OnDelete Action="Cascade" /> + </End> + <End Role="HARDWARE_BREAK_SENSORS" Type="Self.HARDWARE_BREAK_SENSORS" Multiplicity="*" /> + <ReferentialConstraint> + <Principal Role="HARDWARE_BREAK_SENSOR_TYPES"> + <PropertyRef Name="GUID" /> + </Principal> + <Dependent Role="HARDWARE_BREAK_SENSORS"> + <PropertyRef Name="HARDWARE_BREAK_SENSOR_TYPE_GUID" /> + </Dependent> + </ReferentialConstraint> + </Association> + <Association Name="FK_HARDWARE_BREAK_SENSORS_HARDWARE_VERSIONS"> + <End Role="HARDWARE_VERSIONS" Type="Self.HARDWARE_VERSIONS" Multiplicity="1"> + <OnDelete Action="Cascade" /> + </End> + <End Role="HARDWARE_BREAK_SENSORS" Type="Self.HARDWARE_BREAK_SENSORS" Multiplicity="*" /> + <ReferentialConstraint> + <Principal Role="HARDWARE_VERSIONS"> + <PropertyRef Name="GUID" /> + </Principal> + <Dependent Role="HARDWARE_BREAK_SENSORS"> + <PropertyRef Name="HARDWARE_VERSION_GUID" /> + </Dependent> + </ReferentialConstraint> + </Association> <Association Name="FK_HARDWARE_DANCERS_HARDWARE_DANCER_TYPES"> <End Role="HARDWARE_DANCER_TYPES" Type="Self.HARDWARE_DANCER_TYPES" Multiplicity="1" /> <End Role="HARDWARE_DANCERS" Type="Self.HARDWARE_DANCERS" Multiplicity="*" /> @@ -2055,6 +2157,10 @@ <EntitySet Name="EVENT_TYPES_GROUPS" EntityType="Self.EVENT_TYPES_GROUPS" Schema="dbo" store:Type="Tables" /> <EntitySet Name="FIBER_SHAPES" EntityType="Self.FIBER_SHAPES" Schema="dbo" store:Type="Tables" /> <EntitySet Name="FIBER_SYNTHS" EntityType="Self.FIBER_SYNTHS" Schema="dbo" store:Type="Tables" /> + <EntitySet Name="HARDWARE_BLOWER_TYPES" EntityType="Self.HARDWARE_BLOWER_TYPES" Schema="dbo" store:Type="Tables" /> + <EntitySet Name="HARDWARE_BLOWERS" EntityType="Self.HARDWARE_BLOWERS" Schema="dbo" store:Type="Tables" /> + <EntitySet Name="HARDWARE_BREAK_SENSOR_TYPES" EntityType="Self.HARDWARE_BREAK_SENSOR_TYPES" Schema="dbo" store:Type="Tables" /> + <EntitySet Name="HARDWARE_BREAK_SENSORS" EntityType="Self.HARDWARE_BREAK_SENSORS" Schema="dbo" store:Type="Tables" /> <EntitySet Name="HARDWARE_DANCER_TYPES" EntityType="Self.HARDWARE_DANCER_TYPES" Schema="dbo" store:Type="Tables" /> <EntitySet Name="HARDWARE_DANCERS" EntityType="Self.HARDWARE_DANCERS" Schema="dbo" store:Type="Tables" /> <EntitySet Name="HARDWARE_MOTOR_TYPES" EntityType="Self.HARDWARE_MOTOR_TYPES" Schema="dbo" store:Type="Tables" /> @@ -2191,6 +2297,22 @@ <End Role="EVENT_TYPES" EntitySet="EVENT_TYPES" /> <End Role="EVENT_TYPES_ACTIONS" EntitySet="EVENT_TYPES_ACTIONS" /> </AssociationSet> + <AssociationSet Name="FK_HARDWARE_BLOWERS_HARDWARE_BLOWER_TYPES" Association="Self.FK_HARDWARE_BLOWERS_HARDWARE_BLOWER_TYPES"> + <End Role="HARDWARE_BLOWER_TYPES" EntitySet="HARDWARE_BLOWER_TYPES" /> + <End Role="HARDWARE_BLOWERS" EntitySet="HARDWARE_BLOWERS" /> + </AssociationSet> + <AssociationSet Name="FK_HARDWARE_BLOWERS_HARDWARE_VERSIONS" Association="Self.FK_HARDWARE_BLOWERS_HARDWARE_VERSIONS"> + <End Role="HARDWARE_VERSIONS" EntitySet="HARDWARE_VERSIONS" /> + <End Role="HARDWARE_BLOWERS" EntitySet="HARDWARE_BLOWERS" /> + </AssociationSet> + <AssociationSet Name="FK_HARDWARE_BREAK_SENSORS_HARDWARE_BREAK_SENSOR_TYPES" Association="Self.FK_HARDWARE_BREAK_SENSORS_HARDWARE_BREAK_SENSOR_TYPES"> + <End Role="HARDWARE_BREAK_SENSOR_TYPES" EntitySet="HARDWARE_BREAK_SENSOR_TYPES" /> + <End Role="HARDWARE_BREAK_SENSORS" EntitySet="HARDWARE_BREAK_SENSORS" /> + </AssociationSet> + <AssociationSet Name="FK_HARDWARE_BREAK_SENSORS_HARDWARE_VERSIONS" Association="Self.FK_HARDWARE_BREAK_SENSORS_HARDWARE_VERSIONS"> + <End Role="HARDWARE_VERSIONS" EntitySet="HARDWARE_VERSIONS" /> + <End Role="HARDWARE_BREAK_SENSORS" EntitySet="HARDWARE_BREAK_SENSORS" /> + </AssociationSet> <AssociationSet Name="FK_HARDWARE_DANCERS_HARDWARE_DANCER_TYPES" Association="Self.FK_HARDWARE_DANCERS_HARDWARE_DANCER_TYPES"> <End Role="HARDWARE_DANCER_TYPES" EntitySet="HARDWARE_DANCER_TYPES" /> <End Role="HARDWARE_DANCERS" EntitySet="HARDWARE_DANCERS" /> @@ -2450,6 +2572,10 @@ <EntitySet Name="EVENT_TYPES_GROUPS" EntityType="RemoteModel.EVENT_TYPES_GROUPS" /> <EntitySet Name="FIBER_SHAPES" EntityType="RemoteModel.FIBER_SHAPES" /> <EntitySet Name="FIBER_SYNTHS" EntityType="RemoteModel.FIBER_SYNTHS" /> + <EntitySet Name="HARDWARE_BLOWER_TYPES" EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" /> + <EntitySet Name="HARDWARE_BLOWERS" EntityType="RemoteModel.HARDWARE_BLOWERS" /> + <EntitySet Name="HARDWARE_BREAK_SENSOR_TYPES" EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" /> + <EntitySet Name="HARDWARE_BREAK_SENSORS" EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" /> <EntitySet Name="HARDWARE_DANCER_TYPES" EntityType="RemoteModel.HARDWARE_DANCER_TYPES" /> <EntitySet Name="HARDWARE_DANCERS" EntityType="RemoteModel.HARDWARE_DANCERS" /> <EntitySet Name="HARDWARE_MOTOR_TYPES" EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" /> @@ -2645,6 +2771,22 @@ <End Role="FIBER_SYNTHS" EntitySet="FIBER_SYNTHS" /> <End Role="RML" EntitySet="RMLS" /> </AssociationSet> + <AssociationSet Name="FK_HARDWARE_BLOWERS_HARDWARE_BLOWER_TYPES" Association="RemoteModel.FK_HARDWARE_BLOWERS_HARDWARE_BLOWER_TYPES"> + <End Role="HARDWARE_BLOWER_TYPES" EntitySet="HARDWARE_BLOWER_TYPES" /> + <End Role="HARDWARE_BLOWERS" EntitySet="HARDWARE_BLOWERS" /> + </AssociationSet> + <AssociationSet Name="FK_HARDWARE_BLOWERS_HARDWARE_VERSIONS" Association="RemoteModel.FK_HARDWARE_BLOWERS_HARDWARE_VERSIONS"> + <End Role="HARDWARE_VERSIONS" EntitySet="HARDWARE_VERSIONS" /> + <End Role="HARDWARE_BLOWERS" EntitySet="HARDWARE_BLOWERS" /> + </AssociationSet> + <AssociationSet Name="FK_HARDWARE_BREAK_SENSORS_HARDWARE_BREAK_SENSOR_TYPES" Association="RemoteModel.FK_HARDWARE_BREAK_SENSORS_HARDWARE_BREAK_SENSOR_TYPES"> + <End Role="HARDWARE_BREAK_SENSOR_TYPES" EntitySet="HARDWARE_BREAK_SENSOR_TYPES" /> + <End Role="HARDWARE_BREAK_SENSORS" EntitySet="HARDWARE_BREAK_SENSORS" /> + </AssociationSet> + <AssociationSet Name="FK_HARDWARE_BREAK_SENSORS_HARDWARE_VERSIONS" Association="RemoteModel.FK_HARDWARE_BREAK_SENSORS_HARDWARE_VERSIONS"> + <End Role="HARDWARE_VERSIONS" EntitySet="HARDWARE_VERSIONS" /> + <End Role="HARDWARE_BREAK_SENSORS" EntitySet="HARDWARE_BREAK_SENSORS" /> + </AssociationSet> <AssociationSet Name="FK_HARDWARE_DANCERS_HARDWARE_DANCER_TYPES" Association="RemoteModel.FK_HARDWARE_DANCERS_HARDWARE_DANCER_TYPES"> <End Role="HARDWARE_DANCER_TYPES" EntitySet="HARDWARE_DANCER_TYPES" /> <End Role="HARDWARE_DANCERS" EntitySet="HARDWARE_DANCERS" /> @@ -3194,6 +3336,58 @@ <Property Name="CODE" Type="Int32" Nullable="false" /> <NavigationProperty Name="RMLS" Relationship="RemoteModel.FK_RML_FIBER_SYNTHESIS" FromRole="FIBER_SYNTHS" ToRole="RML" /> </EntityType> + <EntityType Name="HARDWARE_BLOWER_TYPES"> + <Key> + <PropertyRef Name="GUID" /> + </Key> + <Property Name="ID" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" /> + <Property Name="GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> + <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" Precision="3" /> + <Property Name="CODE" Type="Int32" Nullable="false" /> + <Property Name="NAME" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="false" /> + <Property Name="DESCRIPTION" Type="String" Nullable="false" MaxLength="100" FixedLength="false" Unicode="false" /> + <NavigationProperty Name="HARDWARE_BLOWERS" Relationship="RemoteModel.FK_HARDWARE_BLOWERS_HARDWARE_BLOWER_TYPES" FromRole="HARDWARE_BLOWER_TYPES" ToRole="HARDWARE_BLOWERS" /> + </EntityType> + <EntityType Name="HARDWARE_BLOWERS"> + <Key> + <PropertyRef Name="GUID" /> + </Key> + <Property Name="ID" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" /> + <Property Name="GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> + <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" Precision="3" /> + <Property Name="HARDWARE_BLOWER_TYPE_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> + <Property Name="HARDWARE_VERSION_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> + <Property Name="ENABLED" Type="Boolean" Nullable="false" /> + <Property Name="VOLTAGE" Type="Double" Nullable="false" /> + <NavigationProperty Name="HARDWARE_BLOWER_TYPES" Relationship="RemoteModel.FK_HARDWARE_BLOWERS_HARDWARE_BLOWER_TYPES" FromRole="HARDWARE_BLOWERS" ToRole="HARDWARE_BLOWER_TYPES" /> + <NavigationProperty Name="HARDWARE_VERSIONS" Relationship="RemoteModel.FK_HARDWARE_BLOWERS_HARDWARE_VERSIONS" FromRole="HARDWARE_BLOWERS" ToRole="HARDWARE_VERSIONS" /> + </EntityType> + <EntityType Name="HARDWARE_BREAK_SENSOR_TYPES"> + <Key> + <PropertyRef Name="GUID" /> + </Key> + <Property Name="ID" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" /> + <Property Name="GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> + <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" Precision="3" /> + <Property Name="CODE" Type="Int32" Nullable="false" /> + <Property Name="NAME" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="false" /> + <Property Name="DESCRIPTION" Type="String" Nullable="false" MaxLength="100" FixedLength="false" Unicode="false" /> + <NavigationProperty Name="HARDWARE_BREAK_SENSORS" Relationship="RemoteModel.FK_HARDWARE_BREAK_SENSORS_HARDWARE_BREAK_SENSOR_TYPES" FromRole="HARDWARE_BREAK_SENSOR_TYPES" ToRole="HARDWARE_BREAK_SENSORS" /> + </EntityType> + <EntityType Name="HARDWARE_BREAK_SENSORS"> + <Key> + <PropertyRef Name="GUID" /> + </Key> + <Property Name="ID" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" /> + <Property Name="GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> + <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" Precision="3" /> + <Property Name="HARDWARE_BREAK_SENSOR_TYPE_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> + <Property Name="HARDWARE_VERSION_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> + <Property Name="ENABLED" Type="Boolean" Nullable="false" /> + <Property Name="DE_BOUNCE_TIME_MILLI" Type="Int32" Nullable="false" /> + <NavigationProperty Name="HARDWARE_BREAK_SENSOR_TYPES" Relationship="RemoteModel.FK_HARDWARE_BREAK_SENSORS_HARDWARE_BREAK_SENSOR_TYPES" FromRole="HARDWARE_BREAK_SENSORS" ToRole="HARDWARE_BREAK_SENSOR_TYPES" /> + <NavigationProperty Name="HARDWARE_VERSIONS" Relationship="RemoteModel.FK_HARDWARE_BREAK_SENSORS_HARDWARE_VERSIONS" FromRole="HARDWARE_BREAK_SENSORS" ToRole="HARDWARE_VERSIONS" /> + </EntityType> <EntityType Name="HARDWARE_DANCER_TYPES"> <Key> <PropertyRef Name="GUID" /> @@ -3354,6 +3548,8 @@ <Property Name="VERSION" Type="Double" Nullable="false" /> <Property Name="NAME" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" /> <NavigationProperty Name="CONFIGURATIONS" Relationship="RemoteModel.FK_CONFIGURATIONS_HARDWARE_VERSIONS" FromRole="HARDWARE_VERSIONS" ToRole="CONFIGURATION" /> + <NavigationProperty Name="HARDWARE_BLOWERS" Relationship="RemoteModel.FK_HARDWARE_BLOWERS_HARDWARE_VERSIONS" FromRole="HARDWARE_VERSIONS" ToRole="HARDWARE_BLOWERS" /> + <NavigationProperty Name="HARDWARE_BREAK_SENSORS" Relationship="RemoteModel.FK_HARDWARE_BREAK_SENSORS_HARDWARE_VERSIONS" FromRole="HARDWARE_VERSIONS" ToRole="HARDWARE_BREAK_SENSORS" /> <NavigationProperty Name="HARDWARE_DANCERS" Relationship="RemoteModel.FK_HARDWARE_DANCERS_HARDWARE_VERSIONS" FromRole="HARDWARE_VERSIONS" ToRole="HARDWARE_DANCERS" /> <NavigationProperty Name="HARDWARE_MOTORS" Relationship="RemoteModel.FK_HARDWARE_MOTORS_HARDWARE_VERSIONS" FromRole="HARDWARE_VERSIONS" ToRole="HARDWARE_MOTORS" /> <NavigationProperty Name="HARDWARE_PID_CONTROLS" Relationship="RemoteModel.FK_HARDWARE_PID_CONTROLS_HARDWARE_VERSIONS" FromRole="HARDWARE_VERSIONS" ToRole="HARDWARE_PID_CONTROLS" /> @@ -4455,6 +4651,62 @@ </Dependent> </ReferentialConstraint> </Association> + <Association Name="FK_HARDWARE_BLOWERS_HARDWARE_BLOWER_TYPES"> + <End Type="RemoteModel.HARDWARE_BLOWER_TYPES" Role="HARDWARE_BLOWER_TYPES" Multiplicity="1"> + <OnDelete Action="Cascade" /> + </End> + <End Type="RemoteModel.HARDWARE_BLOWERS" Role="HARDWARE_BLOWERS" Multiplicity="*" /> + <ReferentialConstraint> + <Principal Role="HARDWARE_BLOWER_TYPES"> + <PropertyRef Name="GUID" /> + </Principal> + <Dependent Role="HARDWARE_BLOWERS"> + <PropertyRef Name="HARDWARE_BLOWER_TYPE_GUID" /> + </Dependent> + </ReferentialConstraint> + </Association> + <Association Name="FK_HARDWARE_BLOWERS_HARDWARE_VERSIONS"> + <End Type="RemoteModel.HARDWARE_VERSIONS" Role="HARDWARE_VERSIONS" Multiplicity="1"> + <OnDelete Action="Cascade" /> + </End> + <End Type="RemoteModel.HARDWARE_BLOWERS" Role="HARDWARE_BLOWERS" Multiplicity="*" /> + <ReferentialConstraint> + <Principal Role="HARDWARE_VERSIONS"> + <PropertyRef Name="GUID" /> + </Principal> + <Dependent Role="HARDWARE_BLOWERS"> + <PropertyRef Name="HARDWARE_VERSION_GUID" /> + </Dependent> + </ReferentialConstraint> + </Association> + <Association Name="FK_HARDWARE_BREAK_SENSORS_HARDWARE_BREAK_SENSOR_TYPES"> + <End Type="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Role="HARDWARE_BREAK_SENSOR_TYPES" Multiplicity="1"> + <OnDelete Action="Cascade" /> + </End> + <End Type="RemoteModel.HARDWARE_BREAK_SENSORS" Role="HARDWARE_BREAK_SENSORS" Multiplicity="*" /> + <ReferentialConstraint> + <Principal Role="HARDWARE_BREAK_SENSOR_TYPES"> + <PropertyRef Name="GUID" /> + </Principal> + <Dependent Role="HARDWARE_BREAK_SENSORS"> + <PropertyRef Name="HARDWARE_BREAK_SENSOR_TYPE_GUID" /> + </Dependent> + </ReferentialConstraint> + </Association> + <Association Name="FK_HARDWARE_BREAK_SENSORS_HARDWARE_VERSIONS"> + <End Type="RemoteModel.HARDWARE_VERSIONS" Role="HARDWARE_VERSIONS" Multiplicity="1"> + <OnDelete Action="Cascade" /> + </End> + <End Type="RemoteModel.HARDWARE_BREAK_SENSORS" Role="HARDWARE_BREAK_SENSORS" Multiplicity="*" /> + <ReferentialConstraint> + <Principal Role="HARDWARE_VERSIONS"> + <PropertyRef Name="GUID" /> + </Principal> + <Dependent Role="HARDWARE_BREAK_SENSORS"> + <PropertyRef Name="HARDWARE_VERSION_GUID" /> + </Dependent> + </ReferentialConstraint> + </Association> <Association Name="FK_HARDWARE_DANCERS_HARDWARE_DANCER_TYPES"> <End Type="RemoteModel.HARDWARE_DANCER_TYPES" Role="HARDWARE_DANCER_TYPES" Multiplicity="1" /> <End Type="RemoteModel.HARDWARE_DANCERS" Role="HARDWARE_DANCERS" Multiplicity="*" /> @@ -5358,6 +5610,56 @@ </MappingFragment> </EntityTypeMapping> </EntitySetMapping> + <EntitySetMapping Name="HARDWARE_BLOWER_TYPES"> + <EntityTypeMapping TypeName="RemoteModel.HARDWARE_BLOWER_TYPES"> + <MappingFragment StoreEntitySet="HARDWARE_BLOWER_TYPES"> + <ScalarProperty Name="DESCRIPTION" ColumnName="DESCRIPTION" /> + <ScalarProperty Name="NAME" ColumnName="NAME" /> + <ScalarProperty Name="CODE" ColumnName="CODE" /> + <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" /> + <ScalarProperty Name="GUID" ColumnName="GUID" /> + <ScalarProperty Name="ID" ColumnName="ID" /> + </MappingFragment> + </EntityTypeMapping> + </EntitySetMapping> + <EntitySetMapping Name="HARDWARE_BLOWERS"> + <EntityTypeMapping TypeName="RemoteModel.HARDWARE_BLOWERS"> + <MappingFragment StoreEntitySet="HARDWARE_BLOWERS"> + <ScalarProperty Name="VOLTAGE" ColumnName="VOLTAGE" /> + <ScalarProperty Name="ENABLED" ColumnName="ENABLED" /> + <ScalarProperty Name="HARDWARE_VERSION_GUID" ColumnName="HARDWARE_VERSION_GUID" /> + <ScalarProperty Name="HARDWARE_BLOWER_TYPE_GUID" ColumnName="HARDWARE_BLOWER_TYPE_GUID" /> + <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" /> + <ScalarProperty Name="GUID" ColumnName="GUID" /> + <ScalarProperty Name="ID" ColumnName="ID" /> + </MappingFragment> + </EntityTypeMapping> + </EntitySetMapping> + <EntitySetMapping Name="HARDWARE_BREAK_SENSOR_TYPES"> + <EntityTypeMapping TypeName="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES"> + <MappingFragment StoreEntitySet="HARDWARE_BREAK_SENSOR_TYPES"> + <ScalarProperty Name="DESCRIPTION" ColumnName="DESCRIPTION" /> + <ScalarProperty Name="NAME" ColumnName="NAME" /> + <ScalarProperty Name="CODE" ColumnName="CODE" /> + <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" /> + <ScalarProperty Name="GUID" ColumnName="GUID" /> + <ScalarProperty Name="ID" ColumnName="ID" /> + </MappingFragment> + </EntityTypeMapping> + </EntitySetMapping> + <EntitySetMapping Name="HARDWARE_BREAK_SENSORS"> + <EntityTypeMapping TypeName="RemoteModel.HARDWARE_BREAK_SENSORS"> + <MappingFragment StoreEntitySet="HARDWARE_BREAK_SENSORS"> + <ScalarProperty Name="DE_BOUNCE_TIME_MILLI" ColumnName="DE_BOUNCE_TIME_MILLI" /> + <ScalarProperty Name="ENABLED" ColumnName="ENABLED" /> + <ScalarProperty Name="HARDWARE_VERSION_GUID" ColumnName="HARDWARE_VERSION_GUID" /> + <ScalarProperty Name="HARDWARE_BREAK_SENSOR_TYPE_GUID" ColumnName="HARDWARE_BREAK_SENSOR_TYPE_GUID" /> + <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" /> + <ScalarProperty Name="GUID" ColumnName="GUID" /> + <ScalarProperty Name="ID" ColumnName="ID" /> + </MappingFragment> + </EntityTypeMapping> + </EntitySetMapping> <EntitySetMapping Name="HARDWARE_DANCER_TYPES"> <EntityTypeMapping TypeName="RemoteModel.HARDWARE_DANCER_TYPES"> <MappingFragment StoreEntitySet="HARDWARE_DANCER_TYPES"> 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 0a7f820e5..e85538862 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram @@ -5,77 +5,81 @@ <!-- Diagram content (shape and connector positions) --> <edmx:Diagrams> <Diagram DiagramId="f9ae01d708754bbd997add25a4bacc79" Name="Diagram1"> - <EntityTypeShape EntityType="RemoteModel.ACTION_TYPES" Width="1.5" PointX="5.25" PointY="0.75" /> - <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="0.75" PointY="39.875" /> - <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="0.75" PointY="57.5" /> - <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="47.75" /> - <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="0.75" PointY="63.25" /> - <EntityTypeShape EntityType="RemoteModel.APPLICATION_VERSIONS" Width="1.5" PointX="0.75" PointY="60.375" /> - <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="15" PointY="16" /> - <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="3" PointY="70.25" /> - <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="5.25" PointY="18.875" /> - <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="5.25" PointY="39.875" /> - <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="12.75" PointY="22.375" /> - <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="3" PointY="32.125" /> - <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="3" PointY="52.375" /> - <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="0.75" PointY="35.75" /> - <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="8.25" PointY="23.125" /> - <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="3" PointY="76.25" /> - <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="44.75" /> - <EntityTypeShape EntityType="RemoteModel.EMBEDDED_SOFTWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="54.5" /> - <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="5.25" PointY="3.875" /> - <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES_ACTIONS" Width="1.5" PointX="7.5" PointY="2.75" /> - <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES_CATEGORIES" Width="1.5" PointX="3" PointY="8" /> - <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES_GROUPS" Width="1.5" PointX="3" PointY="4.875" /> - <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="11.875" /> - <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="19.375" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="0.75" PointY="67" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="3" PointY="47.125" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="6.75" PointY="61.875" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="9" PointY="50.75" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="3.75" PointY="63" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="6" PointY="51.375" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="7.75" PointY="40" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="10" PointY="46.875" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="50.625" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="3.75" PointY="80" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="6" PointY="57.875" /> - <EntityTypeShape EntityType="RemoteModel.HTML_PAGES" Width="1.5" PointX="3" PointY="1.5" /> - <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="3" PointY="67" /> - <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="5.25" PointY="32.625" /> - <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="12.75" PointY="14.875" /> - <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="10.5" PointY="13.125" /> - <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="31.875" /> - <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="3" PointY="12" /> - <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="8.25" PointY="19.125" /> - <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="7.5" PointY="29.875" /> - <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="3" PointY="59.25" /> - <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="5.25" PointY="11.375" /> - <EntityTypeShape EntityType="RemoteModel.MACHINES_CONFIGURATIONS" Width="1.5" PointX="7.5" PointY="9.25" /> - <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="7.5" PointY="12.75" /> - <EntityTypeShape EntityType="RemoteModel.MEDIA_COLORS" Width="1.5" PointX="0.75" PointY="22.75" /> - <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="26" /> - <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="14.75" /> - <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="29" /> - <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="3" PointY="73.25" /> - <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="3" PointY="38" /> - <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="8.25" PointY="6" /> - <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="44" /> - <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="45.5" /> - <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="16.5" /> - <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="8.25" PointY="34" /> - <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="10.5" PointY="34" /> - <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="12.75" PointY="18.125" /> - <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="3" PointY="26.125" /> - <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="9.75" PointY="1" /> - <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="10.75" PointY="4" /> - <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="9.75" PointY="10" /> - <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="11.75" PointY="8" /> - <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="12.75" PointY="1" /> - <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="13.75" PointY="6" /> - <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="5.25" PointY="23.125" /> - <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="10.5" PointY="24" /> - <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="8.25" PointY="26.25" /> + <EntityTypeShape EntityType="RemoteModel.ACTION_TYPES" Width="1.5" PointX="14.25" PointY="2.125" /> + <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="6.75" PointY="73" /> + <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="6.75" PointY="51.25" /> + <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="6.75" PointY="65.875" /> + <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="6.75" PointY="57" /> + <EntityTypeShape EntityType="RemoteModel.APPLICATION_VERSIONS" Width="1.5" PointX="6.75" PointY="54.125" /> + <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="13.75" PointY="23.375" /> + <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="11.25" PointY="40.75" /> + <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="13.5" PointY="18.625" /> + <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="5.25" PointY="15.25" /> + <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="11.5" PointY="32.75" /> + <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="9" PointY="36.5" /> + <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="9" PointY="59" /> + <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="6.75" PointY="77.25" /> + <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="6" PointY="29.125" /> + <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="11.25" PointY="47" /> + <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="6.75" PointY="60" /> + <EntityTypeShape EntityType="RemoteModel.EMBEDDED_SOFTWARE_VERSIONS" Width="1.5" PointX="6.75" PointY="62.875" /> + <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="14.25" PointY="5.25" /> + <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES_ACTIONS" Width="1.5" PointX="16.5" PointY="6.125" /> + <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES_CATEGORIES" Width="1.5" PointX="12" PointY="2.875" /> + <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES_GROUPS" Width="1.5" PointX="12" PointY="6" /> + <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="19.125" /> + <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="25.875" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="9.75" PointY="83.375" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="12" PointY="74.125" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="12.75" PointY="78.375" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="15" PointY="69.125" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="9.75" PointY="79.375" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="12" PointY="68.375" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="6.75" PointY="82.25" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="9" PointY="67" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="12.75" PointY="82.375" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="15" PointY="72.75" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="12.75" PointY="60.375" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="15" PointY="65.125" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="6.75" PointY="68.75" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="9.75" PointY="55.375" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="12" PointY="64.25" /> + <EntityTypeShape EntityType="RemoteModel.HTML_PAGES" Width="1.5" PointX="12" PointY="9.125" /> + <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="11.25" PointY="43.625" /> + <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="13.5" PointY="44.5" /> + <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="10.5" PointY="13.25" /> + <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="8.25" PointY="15.5" /> + <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="22.875" /> + <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="11.25" PointY="29" /> + <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="5.25" PointY="20" /> + <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="8.25" PointY="11.875" /> + <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="9" PointY="28.5" /> + <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="11.25" PointY="17.125" /> + <EntityTypeShape EntityType="RemoteModel.MACHINES_CONFIGURATIONS" Width="1.5" PointX="13.5" PointY="15.125" /> + <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="16.5" PointY="18.625" /> + <EntityTypeShape EntityType="RemoteModel.MEDIA_COLORS" Width="1.5" PointX="0.75" PointY="11.625" /> + <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="31.625" /> + <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="28.75" /> + <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="15" /> + <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="11.25" PointY="50.25" /> + <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="9" PointY="75.25" /> + <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="12" PointY="86.125" /> + <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="43.75" /> + <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="45.25" /> + <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="16.25" /> + <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="12" PointY="54" /> + <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="14.25" PointY="54.125" /> + <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="10.5" PointY="24.5" /> + <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="9" PointY="31.875" /> + <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="0.75" PointY="0.75" /> + <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="2.75" PointY="0.75" /> + <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="4.75" PointY="0.75" /> + <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="0.75" PointY="4.75" /> + <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="2.75" PointY="4.75" /> + <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="4.75" PointY="3.75" /> + <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="6" PointY="24.125" /> + <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="14.25" PointY="32" /> + <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="6" PointY="12" /> <AssociationConnector Association="RemoteModel.FK_EVENTS_ACTIONS_ACTIONS" /> <AssociationConnector Association="RemoteModel.FK_ORGANIZATIONS_ADDRESSES" /> <AssociationConnector Association="RemoteModel.FK_USERS_ADDRESSES" /> @@ -113,6 +117,10 @@ <AssociationConnector Association="RemoteModel.FK_MACHINES_EVENTS_EVENTS" /> <AssociationConnector Association="RemoteModel.FK_RML_FIBER_SHAPES" /> <AssociationConnector Association="RemoteModel.FK_RML_FIBER_SYNTHESIS" /> + <AssociationConnector Association="RemoteModel.FK_HARDWARE_BLOWERS_HARDWARE_BLOWER_TYPES" /> + <AssociationConnector Association="RemoteModel.FK_HARDWARE_BLOWERS_HARDWARE_VERSIONS" /> + <AssociationConnector Association="RemoteModel.FK_HARDWARE_BREAK_SENSORS_HARDWARE_BREAK_SENSOR_TYPES" /> + <AssociationConnector Association="RemoteModel.FK_HARDWARE_BREAK_SENSORS_HARDWARE_VERSIONS" /> <AssociationConnector Association="RemoteModel.FK_HARDWARE_DANCERS_HARDWARE_DANCER_TYPES" /> <AssociationConnector Association="RemoteModel.FK_HARDWARE_DANCERS_HARDWARE_VERSIONS" /> <AssociationConnector Association="RemoteModel.FK_HARDWARE_MOTORS_HARDWARE_MOTOR_TYPES" /> diff --git a/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj b/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj index 84b9332c5..d57025a7c 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj +++ b/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj @@ -138,6 +138,18 @@ <Compile Include="DB\FIBER_SYNTHS.cs"> <DependentUpon>RemoteADO.tt</DependentUpon> </Compile> + <Compile Include="DB\HARDWARE_BLOWERS.cs"> + <DependentUpon>RemoteADO.tt</DependentUpon> + </Compile> + <Compile Include="DB\HARDWARE_BLOWER_TYPES.cs"> + <DependentUpon>RemoteADO.tt</DependentUpon> + </Compile> + <Compile Include="DB\HARDWARE_BREAK_SENSORS.cs"> + <DependentUpon>RemoteADO.tt</DependentUpon> + </Compile> + <Compile Include="DB\HARDWARE_BREAK_SENSOR_TYPES.cs"> + <DependentUpon>RemoteADO.tt</DependentUpon> + </Compile> <Compile Include="DB\HARDWARE_DANCERS.cs"> <DependentUpon>RemoteADO.tt</DependentUpon> </Compile> @@ -347,7 +359,7 @@ </Target> <ProjectExtensions> <VisualStudio> - <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" /> + <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" /> </VisualStudio> </ProjectExtensions> </Project>
\ No newline at end of file diff --git a/Software/Visual_Studio/Tango.PMR/Diagnostics/DiagnosticsMonitors.cs b/Software/Visual_Studio/Tango.PMR/Diagnostics/DiagnosticsMonitors.cs index e14e338b8..a9ce72407 100644 --- a/Software/Visual_Studio/Tango.PMR/Diagnostics/DiagnosticsMonitors.cs +++ b/Software/Visual_Studio/Tango.PMR/Diagnostics/DiagnosticsMonitors.cs @@ -139,7 +139,7 @@ namespace Tango.PMR.Diagnostics { = pb::FieldCodec.ForDouble(10); private readonly pbc::RepeatedField<double> dancer1Angle_ = new pbc::RepeatedField<double>(); /// <summary> - ///Dancer 1 (Min = 0, Max = 16384, PPF = 100) + ///Left Dancer (Min = 0, Max = 16384, PPF = 100) /// </summary> [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public pbc::RepeatedField<double> Dancer1Angle { @@ -152,7 +152,7 @@ namespace Tango.PMR.Diagnostics { = pb::FieldCodec.ForDouble(18); private readonly pbc::RepeatedField<double> dancer2Angle_ = new pbc::RepeatedField<double>(); /// <summary> - ///Dancer 2 (Min = 0, Max = 16384, PPF = 100) + ///Middle Dancer (Min = 0, Max = 16384, PPF = 100) /// </summary> [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public pbc::RepeatedField<double> Dancer2Angle { @@ -165,7 +165,7 @@ namespace Tango.PMR.Diagnostics { = pb::FieldCodec.ForDouble(26); private readonly pbc::RepeatedField<double> dancer3Angle_ = new pbc::RepeatedField<double>(); /// <summary> - ///Dancer 3 (Min = 0, Max = 16384, PPF = 100) + ///Right Dancer (Min = 0, Max = 16384, PPF = 100) /// </summary> [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public pbc::RepeatedField<double> Dancer3Angle { diff --git a/Software/Visual_Studio/Tango.PMR/Hardware/HardwareBlower.cs b/Software/Visual_Studio/Tango.PMR/Hardware/HardwareBlower.cs new file mode 100644 index 000000000..785e57ce4 --- /dev/null +++ b/Software/Visual_Studio/Tango.PMR/Hardware/HardwareBlower.cs @@ -0,0 +1,189 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: HardwareBlower.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 HardwareBlower.proto</summary> + public static partial class HardwareBlowerReflection { + + #region Descriptor + /// <summary>File descriptor for HardwareBlower.proto</summary> + public static pbr::FileDescriptor Descriptor { + get { return descriptor; } + } + private static pbr::FileDescriptor descriptor; + + static HardwareBlowerReflection() { + byte[] descriptorData = global::System.Convert.FromBase64String( + string.Concat( + "ChRIYXJkd2FyZUJsb3dlci5wcm90bxISVGFuZ28uUE1SLkhhcmR3YXJlGhhI", + "YXJkd2FyZUJsb3dlclR5cGUucHJvdG8iYgoOSGFyZHdhcmVCbG93ZXISQgoS", + "SGFyZHdhcmVCbG93ZXJUeXBlGAEgASgOMiYuVGFuZ28uUE1SLkhhcmR3YXJl", + "LkhhcmR3YXJlQmxvd2VyVHlwZRIMCgRDb2RlGAIgASgFQh4KHGNvbS50d2lu", + "ZS50YW5nby5wbXIuaGFyZHdhcmViBnByb3RvMw==")); + descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, + new pbr::FileDescriptor[] { global::Tango.PMR.Hardware.HardwareBlowerTypeReflection.Descriptor, }, + new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { + new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Hardware.HardwareBlower), global::Tango.PMR.Hardware.HardwareBlower.Parser, new[]{ "HardwareBlowerType", "Code" }, null, null, null) + })); + } + #endregion + + } + #region Messages + public sealed partial class HardwareBlower : pb::IMessage<HardwareBlower> { + private static readonly pb::MessageParser<HardwareBlower> _parser = new pb::MessageParser<HardwareBlower>(() => new HardwareBlower()); + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static pb::MessageParser<HardwareBlower> Parser { get { return _parser; } } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static pbr::MessageDescriptor Descriptor { + get { return global::Tango.PMR.Hardware.HardwareBlowerReflection.Descriptor.MessageTypes[0]; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public HardwareBlower() { + OnConstruction(); + } + + partial void OnConstruction(); + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public HardwareBlower(HardwareBlower other) : this() { + hardwareBlowerType_ = other.hardwareBlowerType_; + code_ = other.code_; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public HardwareBlower Clone() { + return new HardwareBlower(this); + } + + /// <summary>Field number for the "HardwareBlowerType" field.</summary> + public const int HardwareBlowerTypeFieldNumber = 1; + private global::Tango.PMR.Hardware.HardwareBlowerType hardwareBlowerType_ = 0; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public global::Tango.PMR.Hardware.HardwareBlowerType HardwareBlowerType { + get { return hardwareBlowerType_; } + set { + hardwareBlowerType_ = value; + } + } + + /// <summary>Field number for the "Code" field.</summary> + public const int CodeFieldNumber = 2; + private int code_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public int Code { + get { return code_; } + set { + code_ = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override bool Equals(object other) { + return Equals(other as HardwareBlower); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public bool Equals(HardwareBlower other) { + if (ReferenceEquals(other, null)) { + return false; + } + if (ReferenceEquals(other, this)) { + return true; + } + if (HardwareBlowerType != other.HardwareBlowerType) return false; + if (Code != other.Code) return false; + return true; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override int GetHashCode() { + int hash = 1; + if (HardwareBlowerType != 0) hash ^= HardwareBlowerType.GetHashCode(); + if (Code != 0) hash ^= Code.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 (HardwareBlowerType != 0) { + output.WriteRawTag(8); + output.WriteEnum((int) HardwareBlowerType); + } + if (Code != 0) { + output.WriteRawTag(16); + output.WriteInt32(Code); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public int CalculateSize() { + int size = 0; + if (HardwareBlowerType != 0) { + size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) HardwareBlowerType); + } + if (Code != 0) { + size += 1 + pb::CodedOutputStream.ComputeInt32Size(Code); + } + return size; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void MergeFrom(HardwareBlower other) { + if (other == null) { + return; + } + if (other.HardwareBlowerType != 0) { + HardwareBlowerType = other.HardwareBlowerType; + } + if (other.Code != 0) { + Code = other.Code; + } + } + + [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: { + hardwareBlowerType_ = (global::Tango.PMR.Hardware.HardwareBlowerType) input.ReadEnum(); + break; + } + case 16: { + Code = input.ReadInt32(); + break; + } + } + } + } + + } + + #endregion + +} + +#endregion Designer generated code diff --git a/Software/Visual_Studio/Tango.PMR/Hardware/HardwareBlowerType.cs b/Software/Visual_Studio/Tango.PMR/Hardware/HardwareBlowerType.cs new file mode 100644 index 000000000..24e1e612e --- /dev/null +++ b/Software/Visual_Studio/Tango.PMR/Hardware/HardwareBlowerType.cs @@ -0,0 +1,47 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: HardwareBlowerType.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 HardwareBlowerType.proto</summary> + public static partial class HardwareBlowerTypeReflection { + + #region Descriptor + /// <summary>File descriptor for HardwareBlowerType.proto</summary> + public static pbr::FileDescriptor Descriptor { + get { return descriptor; } + } + private static pbr::FileDescriptor descriptor; + + static HardwareBlowerTypeReflection() { + byte[] descriptorData = global::System.Convert.FromBase64String( + string.Concat( + "ChhIYXJkd2FyZUJsb3dlclR5cGUucHJvdG8SElRhbmdvLlBNUi5IYXJkd2Fy", + "ZSooChJIYXJkd2FyZUJsb3dlclR5cGUSEgoOU3RhbmRhcmRCbG93ZXIQAEIe", + "Chxjb20udHdpbmUudGFuZ28ucG1yLmhhcmR3YXJlYgZwcm90bzM=")); + descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, + new pbr::FileDescriptor[] { }, + new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.Hardware.HardwareBlowerType), }, null)); + } + #endregion + + } + #region Enums + public enum HardwareBlowerType { + /// <summary> + ///Standard Blower + /// </summary> + [pbr::OriginalName("StandardBlower")] StandardBlower = 0, + } + + #endregion + +} + +#endregion Designer generated code diff --git a/Software/Visual_Studio/Tango.PMR/Hardware/HardwareBreakSensor.cs b/Software/Visual_Studio/Tango.PMR/Hardware/HardwareBreakSensor.cs new file mode 100644 index 000000000..09958498a --- /dev/null +++ b/Software/Visual_Studio/Tango.PMR/Hardware/HardwareBreakSensor.cs @@ -0,0 +1,218 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: HardwareBreakSensor.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 HardwareBreakSensor.proto</summary> + public static partial class HardwareBreakSensorReflection { + + #region Descriptor + /// <summary>File descriptor for HardwareBreakSensor.proto</summary> + public static pbr::FileDescriptor Descriptor { + get { return descriptor; } + } + private static pbr::FileDescriptor descriptor; + + static HardwareBreakSensorReflection() { + byte[] descriptorData = global::System.Convert.FromBase64String( + string.Concat( + "ChlIYXJkd2FyZUJyZWFrU2Vuc29yLnByb3RvEhJUYW5nby5QTVIuSGFyZHdh", + "cmUaHUhhcmR3YXJlQnJlYWtTZW5zb3JUeXBlLnByb3RvIo8BChNIYXJkd2Fy", + "ZUJyZWFrU2Vuc29yEkwKF0hhcmR3YXJlQnJlYWtTZW5zb3JUeXBlGAEgASgO", + "MisuVGFuZ28uUE1SLkhhcmR3YXJlLkhhcmR3YXJlQnJlYWtTZW5zb3JUeXBl", + "Eg8KB0VuYWJsZWQYAiABKAgSGQoRRGVCb3VuY2VUaW1lTWlsbGkYAyABKAVC", + "HgocY29tLnR3aW5lLnRhbmdvLnBtci5oYXJkd2FyZWIGcHJvdG8z")); + descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, + new pbr::FileDescriptor[] { global::Tango.PMR.Hardware.HardwareBreakSensorTypeReflection.Descriptor, }, + new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { + new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Hardware.HardwareBreakSensor), global::Tango.PMR.Hardware.HardwareBreakSensor.Parser, new[]{ "HardwareBreakSensorType", "Enabled", "DeBounceTimeMilli" }, null, null, null) + })); + } + #endregion + + } + #region Messages + public sealed partial class HardwareBreakSensor : pb::IMessage<HardwareBreakSensor> { + private static readonly pb::MessageParser<HardwareBreakSensor> _parser = new pb::MessageParser<HardwareBreakSensor>(() => new HardwareBreakSensor()); + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static pb::MessageParser<HardwareBreakSensor> Parser { get { return _parser; } } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static pbr::MessageDescriptor Descriptor { + get { return global::Tango.PMR.Hardware.HardwareBreakSensorReflection.Descriptor.MessageTypes[0]; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public HardwareBreakSensor() { + OnConstruction(); + } + + partial void OnConstruction(); + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public HardwareBreakSensor(HardwareBreakSensor other) : this() { + hardwareBreakSensorType_ = other.hardwareBreakSensorType_; + enabled_ = other.enabled_; + deBounceTimeMilli_ = other.deBounceTimeMilli_; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public HardwareBreakSensor Clone() { + return new HardwareBreakSensor(this); + } + + /// <summary>Field number for the "HardwareBreakSensorType" field.</summary> + public const int HardwareBreakSensorTypeFieldNumber = 1; + private global::Tango.PMR.Hardware.HardwareBreakSensorType hardwareBreakSensorType_ = 0; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public global::Tango.PMR.Hardware.HardwareBreakSensorType HardwareBreakSensorType { + get { return hardwareBreakSensorType_; } + set { + hardwareBreakSensorType_ = value; + } + } + + /// <summary>Field number for the "Enabled" field.</summary> + public const int EnabledFieldNumber = 2; + private bool enabled_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public bool Enabled { + get { return enabled_; } + set { + enabled_ = value; + } + } + + /// <summary>Field number for the "DeBounceTimeMilli" field.</summary> + public const int DeBounceTimeMilliFieldNumber = 3; + private int deBounceTimeMilli_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public int DeBounceTimeMilli { + get { return deBounceTimeMilli_; } + set { + deBounceTimeMilli_ = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override bool Equals(object other) { + return Equals(other as HardwareBreakSensor); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public bool Equals(HardwareBreakSensor other) { + if (ReferenceEquals(other, null)) { + return false; + } + if (ReferenceEquals(other, this)) { + return true; + } + if (HardwareBreakSensorType != other.HardwareBreakSensorType) return false; + if (Enabled != other.Enabled) return false; + if (DeBounceTimeMilli != other.DeBounceTimeMilli) return false; + return true; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override int GetHashCode() { + int hash = 1; + if (HardwareBreakSensorType != 0) hash ^= HardwareBreakSensorType.GetHashCode(); + if (Enabled != false) hash ^= Enabled.GetHashCode(); + if (DeBounceTimeMilli != 0) hash ^= DeBounceTimeMilli.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 (HardwareBreakSensorType != 0) { + output.WriteRawTag(8); + output.WriteEnum((int) HardwareBreakSensorType); + } + if (Enabled != false) { + output.WriteRawTag(16); + output.WriteBool(Enabled); + } + if (DeBounceTimeMilli != 0) { + output.WriteRawTag(24); + output.WriteInt32(DeBounceTimeMilli); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public int CalculateSize() { + int size = 0; + if (HardwareBreakSensorType != 0) { + size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) HardwareBreakSensorType); + } + if (Enabled != false) { + size += 1 + 1; + } + if (DeBounceTimeMilli != 0) { + size += 1 + pb::CodedOutputStream.ComputeInt32Size(DeBounceTimeMilli); + } + return size; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void MergeFrom(HardwareBreakSensor other) { + if (other == null) { + return; + } + if (other.HardwareBreakSensorType != 0) { + HardwareBreakSensorType = other.HardwareBreakSensorType; + } + if (other.Enabled != false) { + Enabled = other.Enabled; + } + if (other.DeBounceTimeMilli != 0) { + DeBounceTimeMilli = other.DeBounceTimeMilli; + } + } + + [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: { + hardwareBreakSensorType_ = (global::Tango.PMR.Hardware.HardwareBreakSensorType) input.ReadEnum(); + break; + } + case 16: { + Enabled = input.ReadBool(); + break; + } + case 24: { + DeBounceTimeMilli = input.ReadInt32(); + break; + } + } + } + } + + } + + #endregion + +} + +#endregion Designer generated code diff --git a/Software/Visual_Studio/Tango.PMR/Hardware/HardwareBreakSensorType.cs b/Software/Visual_Studio/Tango.PMR/Hardware/HardwareBreakSensorType.cs new file mode 100644 index 000000000..b831b5e19 --- /dev/null +++ b/Software/Visual_Studio/Tango.PMR/Hardware/HardwareBreakSensorType.cs @@ -0,0 +1,48 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: HardwareBreakSensorType.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 HardwareBreakSensorType.proto</summary> + public static partial class HardwareBreakSensorTypeReflection { + + #region Descriptor + /// <summary>File descriptor for HardwareBreakSensorType.proto</summary> + public static pbr::FileDescriptor Descriptor { + get { return descriptor; } + } + private static pbr::FileDescriptor descriptor; + + static HardwareBreakSensorTypeReflection() { + byte[] descriptorData = global::System.Convert.FromBase64String( + string.Concat( + "Ch1IYXJkd2FyZUJyZWFrU2Vuc29yVHlwZS5wcm90bxISVGFuZ28uUE1SLkhh", + "cmR3YXJlKjIKF0hhcmR3YXJlQnJlYWtTZW5zb3JUeXBlEhcKE1N0YW5kYXJk", + "QnJlYWtTZW5zb3IQAEIeChxjb20udHdpbmUudGFuZ28ucG1yLmhhcmR3YXJl", + "YgZwcm90bzM=")); + descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, + new pbr::FileDescriptor[] { }, + new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.Hardware.HardwareBreakSensorType), }, null)); + } + #endregion + + } + #region Enums + public enum HardwareBreakSensorType { + /// <summary> + ///Standard Break Sensor + /// </summary> + [pbr::OriginalName("StandardBreakSensor")] StandardBreakSensor = 0, + } + + #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 ddc715932..09ae2b64c 100644 --- a/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj +++ b/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj @@ -121,6 +121,10 @@ <Compile Include="Embroidery\StitchColor.cs" /> <Compile Include="Embroidery\StitchFlag.cs" /> <Compile Include="ExtensionMethods.cs" /> + <Compile Include="Hardware\HardwareBlower.cs" /> + <Compile Include="Hardware\HardwareBlowerType.cs" /> + <Compile Include="Hardware\HardwareBreakSensor.cs" /> + <Compile Include="Hardware\HardwareBreakSensorType.cs" /> <Compile Include="Hardware\HardwareConfiguration.cs" /> <Compile Include="Hardware\HardwareDancer.cs" /> <Compile Include="Hardware\HardwareDancerType.cs" /> @@ -200,7 +204,7 @@ </PropertyGroup> <ProjectExtensions> <VisualStudio> - <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" /> + <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" /> </VisualStudio> </ProjectExtensions> </Project>
\ No newline at end of file diff --git a/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Program.cs b/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Program.cs index 274a381a6..c96b94dad 100644 --- a/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Program.cs +++ b/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Program.cs @@ -41,6 +41,8 @@ namespace Tango.PMRGenerator.CLI GenerateHardwareDispensers(db, pmrFolder); GenerateHardwareWinders(db, pmrFolder); GenerateHardwareSpeedSensors(db, pmrFolder); + GenerateHardwareBlowers(db, pmrFolder); + GenerateHardwareBreakSensors(db, pmrFolder); GenerateLiquidTypes(db, pmrFolder); GenerateWindingMethods(db, pmrFolder); GenerateSpoolTypes(db, pmrFolder); @@ -291,6 +293,82 @@ namespace Tango.PMRGenerator.CLI File.WriteAllText(Path.Combine(pmrFolder, "Hardware", messageFile.Name + ".proto"), messageString); } + private static void GenerateHardwareBlowers(ObservablesContext db, String pmrFolder) + { + Console.WriteLine("Generating Hardware Blower Types..."); + + ProtoEnumFile enumFile = new ProtoEnumFile(); + enumFile.Name = "HardwareBlowerType"; + enumFile.Package = "Tango.PMR.Hardware"; + + foreach (var field in db.HardwareBlowerTypes.ToList().OrderBy(x => x.Code)) + { + enumFile.Fields.Add(new EnumerationField() + { + Name = field.Name.Replace(" ", ""), + Value = field.Code, + Description = field.Description, + }); + } + + Console.WriteLine("Generating Hardware Blowers..."); + ProtoMessageFile messageFile = new ProtoMessageFile(); + messageFile.Name = "HardwareBlower"; + messageFile.Package = "Tango.PMR.Hardware"; + messageFile.Imports.Add("HardwareBlowerType.proto"); + + messageFile.Properties.Add(new ProtoProperty("HardwareBlowerType", "HardwareBlowerType")); + + foreach (var prop in typeof(HardwareBlowerType).GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly).Where(x => x.PropertyType.IsPrimitive)) + { + messageFile.Properties.Add(new ProtoProperty(prop.Name, CoercePropertyType(prop.PropertyType), GetDbDescription<HardwareBlowerType>(prop))); + } + + String enumString = enumFile.GenerateCode(); + String messageString = messageFile.GenerateCode(); + + File.WriteAllText(Path.Combine(pmrFolder, "Hardware", enumFile.Name + ".proto"), enumString); + File.WriteAllText(Path.Combine(pmrFolder, "Hardware", messageFile.Name + ".proto"), messageString); + } + + private static void GenerateHardwareBreakSensors(ObservablesContext db, String pmrFolder) + { + Console.WriteLine("Generating Hardware Break Sensor Types..."); + + ProtoEnumFile enumFile = new ProtoEnumFile(); + enumFile.Name = "HardwareBreakSensorType"; + enumFile.Package = "Tango.PMR.Hardware"; + + foreach (var field in db.HardwareBreakSensorTypes.ToList().OrderBy(x => x.Code)) + { + enumFile.Fields.Add(new EnumerationField() + { + Name = field.Name.Replace(" ", ""), + Value = field.Code, + Description = field.Description, + }); + } + + Console.WriteLine("Generating Hardware Break Sensor..."); + ProtoMessageFile messageFile = new ProtoMessageFile(); + messageFile.Name = "HardwareBreakSensor"; + messageFile.Package = "Tango.PMR.Hardware"; + messageFile.Imports.Add("HardwareBreakSensorType.proto"); + + messageFile.Properties.Add(new ProtoProperty("HardwareBreakSensorType", "HardwareBreakSensorType")); + + foreach (var prop in typeof(HardwareBreakSensor).GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly).Where(x => x.PropertyType.IsPrimitive)) + { + messageFile.Properties.Add(new ProtoProperty(prop.Name, CoercePropertyType(prop.PropertyType), GetDbDescription<HardwareBreakSensor>(prop))); + } + + String enumString = enumFile.GenerateCode(); + String messageString = messageFile.GenerateCode(); + + File.WriteAllText(Path.Combine(pmrFolder, "Hardware", enumFile.Name + ".proto"), enumString); + File.WriteAllText(Path.Combine(pmrFolder, "Hardware", messageFile.Name + ".proto"), messageString); + } + private static void GenerateLiquidTypes(ObservablesContext db, String pmrFolder) { Console.WriteLine("Generating Dispenser Liquid Types..."); diff --git a/Software/Visual_Studio/Utilities/Tango.Protobuf.CLI/Program.cs b/Software/Visual_Studio/Utilities/Tango.Protobuf.CLI/Program.cs index 621a6d10f..d0c4ba1fe 100644 --- a/Software/Visual_Studio/Utilities/Tango.Protobuf.CLI/Program.cs +++ b/Software/Visual_Studio/Utilities/Tango.Protobuf.CLI/Program.cs @@ -15,6 +15,20 @@ namespace Tango.Protobuf.CLI { Console.Title = "Tango Protobuf Compiler"; +#if DEBUG + + if (args.Length == 0) + { + args = new string[] + { + "-i ..\\..\\..\\PMR\\Messages", + "-o ..\\..\\Tango.PMR", + "-l CSharp", + }; + } + +#endif + if (args.Length == 0) { return ExitHelp(); @@ -24,6 +38,10 @@ namespace Tango.Protobuf.CLI if (CommandLine.Parser.Default.ParseArguments(args, options)) { + options.SourceFolder = options.SourceFolder.Trim(); + options.OutputFolder = options.OutputFolder.Trim(); + options.Language = options.Language.Trim(); + if (!Directory.Exists(options.SourceFolder)) { return ExitError("Could not locate source folder \"" + Path.GetFullPath(options.SourceFolder) + "\""); |