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

update x OSAI da continuare (numIst obj interni errato...

Browse Source
This commit is contained in:
Samuele E. Locatelli
2017-07-24 15:51:34 +02:00
parent 8bb0eb2031
commit 40a3735bfe
7 changed files with 527 additions and 1178 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MTC_Adapter/MTC/baseUtils.cs
+8 -1
View File
@@ -390,7 +390,14 @@ namespace MTC
{
get
{
return lTime.Count;
int answ = 0;
try
{
answ = lTime.Count;
}
catch
{ }
return answ;
}
}
/// <summary>
MTC_Adapter/MTC_Adapter/AdapterGeneric.cs
+1
View File
@@ -1453,6 +1453,7 @@ namespace MTC_Adapter
{
mCounters[idx] = new Event(item.varName);
mAdapter.AddDataItem(mCounters[idx]);
istCounters[idx] = new sampleVect();
idx++;
}
}
MTC_Adapter/MTC_Adapter/App.config
+2 -2
View File
@@ -38,11 +38,11 @@
ipPLC = "192.168.139.1"-->
<!--<add key="ipPLC" value="192.168.157.2"/>-->
<!--OSAI DEV-->
<!--<add key ="ipPLC" value="192.168.157.2" />-->
<add key ="ipPLC" value="192.168.157.2" />
<!--SIEMENS DEV-->
<!--<add key ="ipPLC" value="192.168.214.1" />-->
<!--CMS PROD-->
<add key ="ipPLC" value="192.168.139.1" />
<!--<add key ="ipPLC" value="192.168.139.1" />-->
<add key="recTime" value="true"/>
<add key="verbose" value="true"/>
MTC_Adapter/MTC_Adapter/DATA/CONF/Adapter_ItemList.xml
+6 -146
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>
@@ -36,20 +36,6 @@
<dataRefList />
</element>
</Lubro>
<Counters>
<element>
<ident>Counter_001</ident>
<dataRefList />
</element>
<element>
<ident>Counter_002</ident>
<dataRefList />
</element>
<element>
<ident>Counter_003</ident>
<dataRefList />
</element>
</Counters>
<SlittaMag>
<element>
<ident>SlittaMagazzino_01</ident>
@@ -97,6 +83,10 @@
<ident>Path_01</ident>
<dataRefList />
</element>
<element>
<ident>Path_02</ident>
<dataRefList />
</element>
</Path>
<UnOp>
<element>
@@ -183,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/MTC_Adapter/DATA/CONF/AlarmList.map
+502 -1024
View File
File diff suppressed because it is too large Load Diff
MTC_Adapter/MTC_Adapter/DATA/CONF/AnalogData.map
+6 -3
View File
@@ -1,4 +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)
001|Analog_01 |NUM
002|Analog_02 |NUM
003|Analog_03 |NUM
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/MTC_Adapter/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