Egalware/Mapo-IOB-WIN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into IOB-NET

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-11-23 17:58:34 +01:00
parent 883db17aa9 93536fd126
commit 6359e89573
6 changed files with 868 additions and 636 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-UT/ToMapo.cs
+85 -57
View File
@@ -7,65 +7,93 @@ using System.Text;
namespace IOB_UT
{
/// <summary>
/// Classe gestione configurazione paraemtri MTC
/// </summary>
public class MtcParamConf
{
/// <summary>
/// Nome variabile x pezzi FATTI
/// Classe per rappresentare oggetti chaive/valore target x controlo condizioni multiple
/// </summary>
public string keyPartCount { get; set; } = "";
/// <summary>
/// Nome variabile x pezzi RICHIESTI
/// </summary>
public string keyPartReq { get; set; } = "";
/// <summary>
/// Nome variabile x Codice Articolo
/// </summary>
public string keyPartId { get; set; } = "";
/// <summary>
/// Nome variabile x NOME PROGRAMMA
/// </summary>
public string keyProgName { get; set; } = "";
/// <summary>
/// Nome variabile x RunMode
/// </summary>
public string keyRunMode { get; set; } = "";
/// <summary>
/// Indica se il ping sia un criterio valido x determinare powerON impianto
/// </summary>
public bool pingAsPowerOn { get; set; } = true;
/// <summary>
/// Struttura dati x check condizione PowerOn
/// </summary>
public diCheckCondition condPowerOn { get; set; } = new diCheckCondition();
/// <summary>
/// Struttura dati x check condizione LAVORA / Green
/// </summary>
public List<diCheckCondition> condWork { get; set; } = new List<diCheckCondition>();
public class diCheckCondition
{
#region Public Properties
/// <summary>
/// nome variabile
/// </summary>
public string keyName { get; set; } = "";
/// <summary>
/// valore target per esito richeisto
/// </summary>
public string targetValue { get; set; } = "";
#endregion Public Properties
}
/// <summary>
/// Dictionary dei nomi da cercare come "endsWith" a cui applicare la soglia indicata
/// Classe gestione configurazione paraemtri MTC
/// </summary>
public Dictionary<string, int> paramsEndThresh { get; set; } = new Dictionary<string, int>();
/// <summary>
/// Array degli elementi di traduzione item
/// </summary>
public Dictionary<string, string> itemTranslation { get; set; } = new Dictionary<string, string>();
}
/// <summary>
/// Classe per rappresentare oggetti chaive/valore target x controlo condizioni multiple
/// </summary>
public class diCheckCondition
{
/// <summary>
/// nome variabile
/// </summary>
public string keyName { get; set; } = "";
/// <summary>
/// valore target per esito richeisto
/// </summary>
public string targetValue { get; set; } = "";
}
}
public class MtcParamConf
{
#region Public Properties
/// <summary>
/// Struttura dati x check condizione PowerOn
/// </summary>
public diCheckCondition condPowerOn { get; set; } = new diCheckCondition();
/// <summary>
/// Struttura dati x check condizione LAVORA / Green
/// </summary>
public List<diCheckCondition> condWork { get; set; } = new List<diCheckCondition>();
/// <summary>
/// Elenco items sottoposti a campionamento periodico e inviati come dynData
/// </summary>
public List<string> dynDataItems { get; set; } = new List<string>();
/// <summary>
/// Array degli elementi di traduzione item
/// </summary>
public Dictionary<string, string> itemTranslation { get; set; } = new Dictionary<string, string>();
/// <summary>
/// Nome variabile x EmergencyStop
/// </summary>
public string keyEStop { get; set; } = "";
/// <summary>
/// Nome variabile x pezzi FATTI
/// </summary>
public string keyPartCount { get; set; } = "";
/// <summary>
/// Nome variabile x Codice Articolo
/// </summary>
public string keyPartId { get; set; } = "";
/// <summary>
/// Nome variabile x pezzi RICHIESTI
/// </summary>
public string keyPartReq { get; set; } = "";
/// <summary>
/// Nome variabile x NOME PROGRAMMA
/// </summary>
public string keyProgName { get; set; } = "";
/// <summary>
/// Nome variabile x RunMode
/// </summary>
public string keyRunMode { get; set; } = "";
/// <summary>
/// Dictionary dei nomi da cercare come "endsWith" a cui applicare la soglia indicata
/// </summary>
public Dictionary<string, int> paramsEndThresh { get; set; } = new Dictionary<string, int>();
/// <summary>
/// Indica se il ping sia un criterio valido x determinare powerON impianto
/// </summary>
public bool pingAsPowerOn { get; set; } = true;
#endregion Public Properties
}
}
IOB-WIN/DATA/CONF/GT576.ini
+67
View File
@@ -0,0 +1,67 @@
;Configurazione IOB-WIN
[IOB]
;Centro di lavoro Okuma MTConnect
CNCTYPE=MTConnect
PING_MS_TIMEOUT=500
[MACHINE]
VENDOR=Okuma
MODEL=Lathe 2SP-35HG
[CNC]
IP=192.168.2.82
PORT=5000
GETPRGNAME=true
[SERVER]
MPIP=http://192.168.1.64
MPURL=/MP/IO
CMDBASE=/IOB/input/
CMDFLOG=/IOB/flog/
CMDALIVE=/IOB
CMDENABLED=/IOB/enabled/
CMDADV1=?valore=
CMDREBO=/sendReboot.aspx?idxMacchina=
[MEMORY]
ADDR_READ=DB9999.DBB0
ADDR_WRITE=DB9999.DBB0
SIZE_READ=0
SIZE_WRITE=0
;BIT0=CONN
;BIT1=DB60.DBB1
;BIT2=PZCOUNT.STD.DB700.DBW22
;BIT3=DB60.DBB3
;BIT4=DB60.DBB4
[BLINK]
;MAX_COUNTER_BLINK = 30
MAX_COUNTER_BLINK = 15
;bit0 = 0
;bit1 = 0
;bit2 = 1
;bit3 = 1
;bit4 = 1
;bit5 = 0
;bit6 = 0
;bit7 = 0
BLINK_FILT=0
;BLINK_FILT=28
[OPTPAR]
PZCOUNT_MODE=MTC
DISABLE_PZCOUNT=FALSE
ENABLE_SEND_PZC_BLOCK=TRUE
MIN_SEND_PZC_BLOCK=0
MAX_SEND_PZC_BLOCK=100
ENABLE_DYN_DATA=FALSE
FORCE_DYN_DATA=TRUE
ENABLE_DATA_FILTER=TRUE
ENABLE_MTC_RESTART=TRUE
; conf parametri memoria READ/WRITE
MTC_PARAM_CONF=GT576.json
[BRANCH]
NAME=master
IOB-WIN/DATA/CONF/GT576.json
+52
View File
@@ -0,0 +1,52 @@
{
"keyEStop": "L2estop",
"keyPartCount": "L2p2partcount",
"keyPartReq": "",
"keyPartId": "",
"keyProgName": "L2p2program",
"keyRunMode": "L2p2mode",
"pingAsPowerOn": true,
"condPowerOn": {
"keyName": "L2avail",
"targetValue": "AVAILABLE"
},
"condWork": [
{
"keyName": "L2p2execution",
"targetValue": "ACTIVE"
}
],
"dynDataItems": [
"L2S1speed",
"L2S1load",
"L2S1ovr",
"L2S2speed",
"L2S2load",
"L2S2ovr",
"L2p1OperatingTime",
"L2p1RunningTime"
],
"itemTranslation": {
"L2avail": "Machine Available",
"L2p2execution": "Execution Mode",
"L2p2mode": "Controller Mode",
"L2p2program": "Program Name",
"L2p2partcount": "Contapezzi",
"L2estop": "Emergenza",
"p2Fovr": "PATH FEED OVERRIDE",
"rovrd": "PATH RAPID OVERRIDE",
"L2S1speed": "Spindle C1 Actual SPEED",
"L2S1load": "Spindle C1 LOAD",
"L2S1ovr": "Spindle C1 OVERRIDE",
"L2S2speed": "Spindle C2 Actual SPEED",
"L2S2load": "Spindle C2 LOAD",
"L2S2ovr": "Spindle C2 OVERRIDE",
"L2p1OperatingTime": "OPERATING TIME",
"L2p1RunningTime": "RUNNING TIME"
},
"paramsEndThresh": {
"PosAct": 50,
"PosTgt": 50,
"InvDDone": 50
}
}
IOB-WIN/IOB-WIN.csproj
+6
View File
@@ -256,6 +256,12 @@
<None Include="DATA\CONF\3015.ini">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\GT576.ini">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\GT576.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\GT577.ini">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
IOB-WIN/IobMTC.cs
+655 -576
View File
File diff suppressed because it is too large Load Diff
Jenkinsfile
Vendored
+3 -3
View File
@@ -9,9 +9,9 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=747']) {
// env.versionNumber = VersionNumber(versionNumberString : '3.3.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '3.3.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
withEnv(['NEXT_BUILD_NUMBER=748']) {
// env.versionNumber = VersionNumber(versionNumberString : '3.4.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '3.4.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO-IOB-WIN'
}
}