Egalware/cms_thermo_active
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/Osai_ToolTable' into develop

Browse Source 
# Conflicts:
#	Libs/CMS_CORE_Library.dll
#	Step.Core/ThreadsFunctions.cs
#	Step.Core/ThreadsHandler.cs
#	Step.Database/DatabaseContext.cs
#	Step.Database/Migrations/201806220920193_InitMigration.Designer.cs
#	Step.Database/Migrations/201806220920193_InitMigration.cs
#	Step.Database/Migrations/201807120908403_InitMigration.Designer.cs
#	Step.Database/Migrations/201807120908403_InitMigration.cs
#	Step.Database/Migrations/201807120908403_InitMigration.resx
#	Step.Database/Migrations/201807251330036_InitMigration.Designer.cs
#	Step.Database/Migrations/201807251330036_InitMigration.cs
#	Step.Database/Step.Database.csproj
#	Step.Model/Constants.cs
#	Step.NC/NcHandler.cs
#	Step/Listeners/ListenersHandler.cs
#	Step/Step.csproj
This commit is contained in:
Lucio Maranta
2018-08-03 12:59:14 +02:00
parent 15f8e0e834 10610c481a
commit bbd4535dbf
46 changed files with 3431 additions and 787 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Step.Config/Config/serverConfig.xml
+1 -1
View File
@@ -3,7 +3,7 @@
<ncConfig>
<ncVendor>DEMO</ncVendor> <!-- NO_NC/DEMO/FANUC/SIEMENS/OSAI -->
<showNcHMI>true</showNcHMI>
<ncIpAddress>127.0.0.1</ncIpAddress>
<ncIpAddress>localhost</ncIpAddress>
<ncPort>8080</ncPort>
<machineModel>Ares 37 OF</machineModel>
</ncConfig>
Step.Config/Config/toolManagerConfig.xml
+15
View File
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8" ?>
<toolManagerConfig>
<familyOptIsActive>true</familyOptIsActive>
<shankOptIsActive>false</shankOptIsActive>
<magPositionOptIsActive>true</magPositionOptIsActive>
<offsetOptIsActive>true</offsetOptIsActive>
<reviveOptIsActive>true</reviveOptIsActive>
<gammaOptIsActive>true</gammaOptIsActive>
<lifeOptIsActive>true</lifeOptIsActive>
<tcpOptIsActive>true</tcpOptIsActive>
<coolingOptIsActive>true</coolingOptIsActive>
<multidimensionalShankOptIsActive>true</multidimensionalShankOptIsActive>
<selfAdaptivePathOptIsActive>true</selfAdaptivePathOptIsActive>
<dynamicCompensationOptIsActive>true</dynamicCompensationOptIsActive>
</toolManagerConfig>
Step.Config/Config/toolManagerConfigValidator.xsd
+21
View File
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:element name="toolManagerConfig">
<xs:complexType>
<xs:all>
<xs:element name="familyOptIsActive" type="xs:boolean" minOccurs='1' maxOccurs='1'/>
<xs:element name="shankOptIsActive" type="xs:boolean" minOccurs="1" maxOccurs="1"/>
<xs:element name="magPositionOptIsActive" type="xs:boolean" minOccurs='1' maxOccurs='1'/>
<xs:element name="offsetOptIsActive" type="xs:boolean" minOccurs='1' maxOccurs='1'/>
<xs:element name="reviveOptIsActive" type="xs:boolean" minOccurs='1' maxOccurs='1'/>
<xs:element name="gammaOptIsActive" type="xs:boolean" minOccurs='1' maxOccurs='1'/>
<xs:element name="lifeOptIsActive" type="xs:boolean" minOccurs='1' maxOccurs='1'/>
<xs:element name="tcpOptIsActive" type="xs:boolean" minOccurs='1' maxOccurs='1'/>
<xs:element name="coolingOptIsActive" type="xs:boolean" minOccurs='1' maxOccurs='1'/>
<xs:element name="multidimensionalShankOptIsActive" type="xs:boolean" minOccurs='1' maxOccurs='1'/>
<xs:element name="selfAdaptivePathOptIsActive" type="xs:boolean" minOccurs='1' maxOccurs='1'/>
<xs:element name="dynamicCompensationOptIsActive" type="xs:boolean" minOccurs='1' maxOccurs='1'/>
</xs:all>
</xs:complexType>
</xs:element>
</xs:schema>
Step.Config/ServerConfig.cs
+1
View File
@@ -23,6 +23,7 @@ namespace Step.Config
public static List<NcSoftKeysModel> NcSoftKeysConfig;
public static List<AlarmsConfigModel> InitialAlarmsConfig;
public static List<HeadsConfigModel> HeadsConfig;
public static ToolManagerConfigModel ToolManagerConfig;
public static AreasConfigModel ProductionConfig;
public static AreasConfigModel ToolingConfig;
Step.Config/ServerConfigController.cs
+26
View File
@@ -24,6 +24,7 @@ namespace Step.Config
ReadUserSoftKeysConfig();
ReadAlarmsConfig();
ReadHeadsConfig();
ReadToolManagerConfig();
}
catch (System.Xml.XmlException ex)
{
@@ -308,6 +309,31 @@ namespace Step.Config
.ToList();
}
private static void ReadToolManagerConfig()
{
XDocument xmlConfigFile = GetXmlHandlerWithValidator(TOOL_MANAGER_CONFIG_SCHEMA_PATH, TOOL_MANAGER_CONFIG_PATH);
// Read config from XML file
ToolManagerConfig = xmlConfigFile
.Elements()
.Select(x => new ToolManagerConfigModel()
{
FamilyOptIsActive = Convert.ToBoolean(x.Element("familyOptIsActive").Value),
ShankOptIsActive = Convert.ToBoolean(x.Element("shankOptIsActive").Value),
MagPositionIsActive = Convert.ToBoolean(x.Element("magPositionOptIsActive").Value),
OffsetOptIsActive = Convert.ToBoolean(x.Element("offsetOptIsActive").Value),
ReviveOptIsActive = Convert.ToBoolean(x.Element("reviveOptIsActive").Value),
GammaOptIsActive = Convert.ToBoolean(x.Element("gammaOptIsActive").Value),
LifeOptIsActive = Convert.ToBoolean(x.Element("lifeOptIsActive").Value),
TcpOptIsActive = Convert.ToBoolean(x.Element("tcpOptIsActive").Value),
CoolingOptIsActive = Convert.ToBoolean(x.Element("coolingOptIsActive").Value),
MultidimensionalShankOptIsActive = Convert.ToBoolean(x.Element("multidimensionalShankOptIsActive").Value),
SelfAdaptivePathOptIsActive = Convert.ToBoolean(x.Element("selfAdaptivePathOptIsActive").Value),
DynamicCompensationOptIsActive = Convert.ToBoolean(x.Element("dynamicCompensationOptIsActive").Value),
})
.FirstOrDefault();
}
#endregion Read config from file from configuration
}
}
Step.Config/Step.Config.csproj
+7
View File
@@ -47,6 +47,9 @@
<Compile Include="ServerConfigController.cs" />
</ItemGroup>
<ItemGroup>
<Content Include="Config\toolManagerConfig.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<EmbeddedResource Include="Config\userSoftKeyConfig.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<SubType>Designer</SubType>
@@ -93,6 +96,10 @@
<SubType>Designer</SubType>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</EmbeddedResource>
<Content Include="Config\toolManagerConfigValidator.xsd">
<SubType>Designer</SubType>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Step.Model\Step.Model.csproj">