Egalware/CMS-MTConn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

prima sistemazione FIXME... maxOverride

Browse Source
This commit is contained in:
Samuele E. Locatelli
2019-07-19 19:19:01 +02:00
parent b647d93243
commit 3f6baafd36
6 changed files with 524 additions and 1162 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MTC_Adapter/SCMA/AdapterGeneric.cs
+10 -2
View File
@@ -2846,8 +2846,16 @@ namespace SCMA
// SE il processo è quello corrente...
string processo = string.Format("P{0}", currIdx + 1);
// FIXME verificare proc selezionato
if (currGateway.getItemNode("PROC_SEL").ToString() == processo || true)
bool doProc = false;
if (currGateway.protocollo != gwProtocol.SOURS)
{
doProc = currGateway.getItemNode("PROC_SEL").ToString() == processo;
}
else
{
doProc = (((DataItemRed)currGateway.getItemNode("PROC_SEL")).Value.ToString() == processo);
}
if (doProc)
{
// se da conf richeisto salvo override globale come max tra i 4 letti...
if (utils.CRB("getMaxSpOver"))
MTC_Adapter/SCMA/DATA/CONF/Adapter_ItemList.xml
+2 -132
View File
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<AdapterConf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Version>1</Version>
<NomeAdapt>ADAPTER_SIEMENS</NomeAdapt>
<TipoAdapt>SIEMENS</TipoAdapt>
<NomeAdapt>ADAPTER_OSAI</NomeAdapt>
<TipoAdapt>OSAI</TipoAdapt>
<ContOreMaccOn>0</ContOreMaccOn>
<ContOreMaccLav>0</ContOreMaccLav>
<ContSlittaTast>0</ContSlittaTast>
@@ -173,135 +173,5 @@
</dataRef>
</dataRefList>
</element>
<element>
<ident>Axis_07</ident>
<dataRefList>
<dataRef>
<Key>Axis_07_Type</Key>
<Value>LINEAR</Value>
</dataRef>
<dataRef>
<Key>Axis_07_Grp</Key>
<Value>00</Value>
</dataRef>
</dataRefList>
</element>
<element>
<ident>Axis_08</ident>
<dataRefList>
<dataRef>
<Key>Axis_08_Type</Key>
<Value>LINEAR</Value>
</dataRef>
<dataRef>
<Key>Axis_08_Grp</Key>
<Value>00</Value>
</dataRef>
</dataRefList>
</element>
<element>
<ident>Axis_09</ident>
<dataRefList>
<dataRef>
<Key>Axis_09_Type</Key>
<Value>LINEAR</Value>
</dataRef>
<dataRef>
<Key>Axis_09_Grp</Key>
<Value>00</Value>
</dataRef>
</dataRefList>
</element>
<element>
<ident>Axis_10</ident>
<dataRefList>
<dataRef>
<Key>Axis_10_Type</Key>
<Value>LINEAR</Value>
</dataRef>
<dataRef>
<Key>Axis_10_Grp</Key>
<Value>00</Value>
</dataRef>
</dataRefList>
</element>
<element>
<ident>Axis_11</ident>
<dataRefList>
<dataRef>
<Key>Axis_11_Type</Key>
<Value>LINEAR</Value>
</dataRef>
<dataRef>
<Key>Axis_11_Grp</Key>
<Value>00</Value>
</dataRef>
</dataRefList>
</element>
<element>
<ident>Axis_12</ident>
<dataRefList>
<dataRef>
<Key>Axis_12_Type</Key>
<Value>LINEAR</Value>
</dataRef>
<dataRef>
<Key>Axis_12_Grp</Key>
<Value>00</Value>
</dataRef>
</dataRefList>
</element>
<element>
<ident>Axis_13</ident>
<dataRefList>
<dataRef>
<Key>Axis_13_Type</Key>
<Value>ROTARY</Value>
</dataRef>
<dataRef>
<Key>Axis_13_Grp</Key>
<Value>00</Value>
</dataRef>
</dataRefList>
</element>
<element>
<ident>Axis_14</ident>
<dataRefList>
<dataRef>
<Key>Axis_14_Type</Key>
<Value>ROTARY</Value>
</dataRef>
<dataRef>
<Key>Axis_14_Grp</Key>
<Value>00</Value>
</dataRef>
</dataRefList>
</element>
<element>
<ident>Axis_15</ident>
<dataRefList>
<dataRef>
<Key>Axis_15_Type</Key>
<Value>LINEAR</Value>
</dataRef>
<dataRef>
<Key>Axis_15_Grp</Key>
<Value>00</Value>
</dataRef>
</dataRefList>
</element>
<element>
<ident>Axis_16</ident>
<dataRefList>
<dataRef>
<Key>Axis_16_Type</Key>
<Value>LINEAR</Value>
</dataRef>
<dataRef>
<Key>Axis_16_Grp</Key>
<Value>00</Value>
</dataRef>
</dataRefList>
</element>
</Axis>
</AdapterConf>
MTC_Adapter/SCMA/DATA/CONF/AlarmList.map
+502 -1024
View File
File diff suppressed because it is too large Load Diff
MTC_Adapter/SCMA/DATA/CONF/AnalogData.map
+7 -1
View File
@@ -1 +1,7 @@
# Commenti con cancelletto, struttura un variabile per riga, tipo chiave|valore (occhio che il separatore è configurato da .cofig come "testCharSep"); spazi e tabulazioni dovrei trimmarli in acquisizione (qui inseriti per comodità di lettura)
# Commenti con cancelletto, struttura un variabile per riga, tipo chiave|valore (occhio che il separatore è configurato da .cofig come "testCharSep"); spazi e tabulazioni dovrei trimmarli in acquisizione (qui inseriti per comodità di lettura)
001|Axis_01_Load |NUM
002|Axis_02_Load |NUM
003|Axis_03_Load |NUM
004|Axis_04_Load |NUM
005|Axis_05_Load |NUM
006|Axis_06_Load |NUM
MTC_Adapter/SCMA/DATA/CONF/CounterList.map
+2 -2
View File
@@ -21,8 +21,8 @@
020|VacAct_02_Count |COUNT
021|Lubro_01_Num |COUNT
022|SlittaTastatore_Count |COUNT
023|SlittaMagazzino_01_Count |COUNT
024|ProtMagazzino_01_Count |COUNT
023|ProtMagazzino_01_Count |COUNT
024|ProtMagazzino_02_Count |COUNT
025|UnOp_01_NumCambiUT |COUNT
026|Axis_01_AccTime |COUNT
027|Axis_02_AccTime |COUNT
MTC_Adapter/SCMA/DATA/CONF/DataModel.xml
+1 -1
View File
@@ -14,7 +14,7 @@
<Variable SymbolicName="ActiveWorkingTime" BrowseName="ActiveTime" DataType="ua:Float" ValueRank="Scalar" Units="h" CmsDataType="CounterList" CmsDataIndex="002" CmsDataOpt="HOURS" />
<Component Name="Cnc">
<Property SymbolicName="Name" BrowseName="Name" DataType="ua:String" ValueRank="Scalar" Value="SIEMENS" />
<Property SymbolicName="Name" BrowseName="Name" DataType="ua:String" ValueRank="Scalar" Value="OSAI" />
<Property SymbolicName="Version" BrowseName="Version" DataType="ua:String" ValueRank="Scalar" Value="2019" />
<Condition SymbolicName="Condition" BrowseName="Condition" DataType="ua:String" ValueRank="Scalar" Type="OffNormalAlarmState" Units="" />
<Component Name="CncProcesses">