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

Merge branch 'release/FixLascoDynData01'

Browse Source
This commit is contained in:
Samuele Locatelli
2024-10-08 13:54:21 +02:00
parent c7aa0810e1 999e4625f4
commit adfcbc3d0e
7 changed files with 121 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-WIN-NEXT/DATA/CONF/FTP_SONATEST.ini
+71
View File
@@ -0,0 +1,71 @@
;Configurazione IOB-WIN
[IOB]
;Macchina TEST FTP simile a ultrasuoni Sonatest x IMI Remosa
CNCTYPE=FTP
PING_MS_TIMEOUT=500
[MACHINE]
VENDOR=TEST_FTP
MODEL=SONATEST_VEO
[CNC]
IP=10.74.82.204
PING_IP=10.74.82.204
GETPRGNAME=false
[SERVER]
MPIP=http://10.74.82.218
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
[BLINK]
;MAX_COUNTER_BLINK = 30
MAX_COUNTER_BLINK = 30
BLINK_FILT=0
[OPTPAR]
PZCOUNT_MODE=NONE
; gestione contapezzi
DISABLE_PZCOUNT=TRUE
ENABLE_SEND_PZC_BLOCK=FALSE
MIN_SEND_PZC_BLOCK=0
MAX_SEND_PZC_BLOCK=100
; gestione DynData
ENABLE_DYN_DATA=TRUE
FORCE_DYN_DATA=TRUE
DISABLE_DYN_DATA=TRUE
DISABLE_SEND_WDST=TRUE
; gestioni PING
MAX_TRY_PING=3
VETO_QUEUE_IN=5
VETO_PING_SEC=5
MAX_ELAPSED_TIME_SEC=60
;VETO_SEND_SNAPSHOT=3
POWEROFF_TIMEOUT_SEC=60
; conf parametri memoria READ/WRITE
FTP_PARAM=FTP_SONATEST.json
[BRANCH]
NAME=master
; Tags manuali
[TAGS]
Customer=IMI-Remosa
HostOS=WIN
HostName=MAPO-SRV-60
HostAddr=192.168.0.12
IOB-WIN-NEXT/DATA/CONF/FTP_SONATEST.json
+27
View File
@@ -0,0 +1,27 @@
{
"ListTask": [
{
"ActionId": "FtpDownload",
"ServerAddr": "egw-tscale-04",
"ServerPort": 21,
"ConnUser": "testftpuser",
"ConnPasswd": "we4reFromB3rghem!",
"RawCert": "",
"SkipCert": true,
"ReExecVeto": 90,
"Note": "Sync periodico completo",
"StepsList": [
{
"Id": "01",
"Description": "Mirror Remote 2 Local Directory",
"Action": "mirrorDirR2L",
"ParamList": {
"RemoteDir": "ftpdata/syncfolder",
"LocalDir": "c:\\Steamware\\FTP\\SONATEST"
}
}
]
}
]
}
IOB-WIN-NEXT/DATA/CONF/IMI_SONATEST.ini
+4 -7
View File
@@ -9,15 +9,12 @@ VENDOR=SONATEST
MODEL=VEO
[CNC]
IP=10.74.82.204
PING_IP=10.74.82.204
;IP=192.168.10.234
;PING_IP=192.168.10.234
IP=172.28.30.208
PING_IP=172.28.30.208
GETPRGNAME=false
[SERVER]
MPIP=http://10.74.82.218
;MPIP=http://192.168.0.110
MPIP=http://192.168.0.110
MPURL=/MP/IO
CMDBASE=/IOB/input/
CMDFLOG=/IOB/flog/
@@ -71,4 +68,4 @@ NAME=master
Customer=IMI-Remosa
HostOS=WIN
HostName=MAPO-SRV-60
HostAddr=192.168.60.15
HostAddr=192.168.0.12
IOB-WIN-NEXT/DATA/CONF/IMI_SONATEST.json
+5 -5
View File
@@ -2,10 +2,10 @@
"ListTask": [
{
"ActionId": "FtpDownload",
"ServerAddr": "egw-tscale-04",
"ServerAddr": "172.28.30.208",
"ServerPort": 21,
"ConnUser": "testftpuser",
"ConnPasswd": "we4reFromB3rghem!",
"ConnUser": "ftpuser",
"ConnPasswd": "SOnaTEst",
"RawCert": "",
"SkipCert": true,
"ReExecVeto": 90,
@@ -16,8 +16,8 @@
"Description": "Mirror Remote 2 Local Directory",
"Action": "mirrorDirR2L",
"ParamList": {
"RemoteDir": "ftpdata/syncfolder",
"LocalDir": "c:\\Steamware\\FTP\\SONATEST"
"RemoteDir": "internal/MES",
"LocalDir": "\\\\308file\\shares\\QUAL\\Sonatest_Reports\\MES"
}
}
IOB-WIN-NEXT/DATA/CONF/MAIN.ini
+1 -1
View File
@@ -45,6 +45,6 @@ CLI_INST=SteamWareSim
;STARTLIST=SIM_DP_01
;NB: mettere copy always ai file di conf x fare test...
STARTLIST=IMI_SONATEST
STARTLIST=FTP_SONATEST
MAXCNC=10
IOB-WIN-NEXT/Iob/Generic.cs
+1 -1
View File
@@ -2723,7 +2723,7 @@ namespace IOB_WIN_NEXT.Iob
bool enableByApp = utils.CRB("enableDynData");
bool enableByIob = (getOptPar("ENABLE_DYN_DATA") == "TRUE");
bool forceSendByIob = (getOptPar("FORCE_DYN_DATA") == "TRUE");
bool disableDynData = (getOptPar("DISABLE_DYN_DATA") == "FALSE");
bool disableDynData = (getOptPar("DISABLE_DYN_DATA") == "TRUE");
Dictionary<string, string> currDynData = new Dictionary<string, string>();
if (enableByApp || enableByIob)
IOB-WIN-NEXT/IobSiemens/SiemensLasco.cs
+12 -3
View File
@@ -352,6 +352,7 @@ namespace IOB_WIN_NEXT.IobSiemens
/// <returns></returns>
public override Dictionary<string, string> getDynData()
{
bool disableDynData = (getOptPar("DISABLE_DYN_DATA") == "TRUE");
Dictionary<string, string> outVal = new Dictionary<string, string>();
// processing
try
@@ -417,7 +418,7 @@ namespace IOB_WIN_NEXT.IobSiemens
PressCounterforceGas = getVal_TSVC_int("PressCounterforceGas", scaduti[13]);
ForcePressureActual = getVal_TSVC_int("ForcePressureActual", scaduti[14]);
ForceOnBushing = getVal_TSVC_int("ForceOnBushing", scaduti[15]);
//outVal.Add("DYNDATA", $"RamPosition {RamPosition:N2} | TempMainMotorV {TempMainMotorV:N2} | TempOilCirculation {TempOilCirculation:N2} | PressCounterforceGas {PressCounterforceGas}");
outVal.Add("RamPosition", $"{RamPosition:N1}");
outVal.Add("LowerEjectorPosition", $"{LowerEjectorPosition:N1}");
outVal.Add("UpperTool", $"{UpperTool:N1}");
@@ -455,12 +456,20 @@ namespace IOB_WIN_NEXT.IobSiemens
}
else
{
outVal.Add("DYNDATA", $"RamPosition {LastTSVC["RamPosition"]:N1} | ForcePressureActual {LastTSVC["ForcePressureActual"]} | ForceOnBushing {LastTSVC["ForceOnBushing"]}");
// se i dynData non sono disabilitati...
if (!disableDynData)
{
outVal.Add("DYNDATA", $"RamPosition {LastTSVC["RamPosition"]:N1} | ForcePressureActual {LastTSVC["ForcePressureActual"]} | ForceOnBushing {LastTSVC["ForceOnBushing"]}");
}
}
}
else
{
outVal.Add("DYNDATA", $"RamPosition {LastTSVC["RamPosition"]:N1} | ForcePressureActual {LastTSVC["ForcePressureActual"]} | ForceOnBushing {LastTSVC["ForceOnBushing"]}");
// se i dynData non sono disabilitati...
if (!disableDynData)
{
outVal.Add("DYNDATA", $"RamPosition {LastTSVC["RamPosition"]:N1} | ForcePressureActual {LastTSVC["ForcePressureActual"]} | ForceOnBushing {LastTSVC["ForceOnBushing"]}");
}
}
}
catch (Exception exc)