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

pdate x nuova compilazione FANUC e MITSUBISHI con reboot inviato subito

Browse Source
This commit is contained in:
Samuele Locatelli
2025-02-11 17:39:25 +01:00
parent 0deb9ecc61
commit bf0fae0adb
6 changed files with 10 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-WIN-FANUC/DATA/CONF/MAIN.ini
+2 -2
View File
@@ -19,8 +19,8 @@ CLI_INST=SteamWareSim
;STARTLIST=SIMUL_01,SIMUL_02,SIMUL_03,SIMUL_04
;STARTLIST=SIMUL_01
;STARTLIST=3025,3027,3028
;STARTLIST=VL27
STARTLIST=3025
;STARTLIST=3025
STARTLIST=VL27
MAXCNC=10
IOB-WIN-FANUC/ILLink/ILLink.Descriptors.LibraryBuild.xml
-8
View File
@@ -1,8 +0,0 @@
<linker>
<assembly fullname="System.Diagnostics.DiagnosticSource">
<type fullname="System.Diagnostics.Metrics.MetricsEventSource">
<!-- Used by System.Private.CoreLib via reflection to init the EventSource -->
<method name="GetInstance" />
</type>
</assembly>
</linker>
IOB-WIN-FANUC/IOB-WIN-FANUC.csproj
+5 -16
View File
@@ -125,7 +125,6 @@
<Compile Include="memAreaFanuc.cs" />
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Content Include="ILLink\ILLink.Descriptors.LibraryBuild.xml" />
<Content Include="Resources\STEAM-IOB-WIN.xml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
@@ -160,18 +159,10 @@
<None Include="DATA\CONF\3012.ini" />
<None Include="DATA\CONF\3015.ini" />
<None Include="DATA\CONF\3021.ini" />
<None Include="DATA\CONF\3025.ini">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\3027.ini">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\3028.ini">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\3028.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\3025.ini" />
<None Include="DATA\CONF\3027.ini" />
<None Include="DATA\CONF\3028.ini" />
<None Include="DATA\CONF\3028.json" />
<None Include="DATA\CONF\FOV002.ini" />
<None Include="DATA\CONF\FOV005.ini" />
<None Include="DATA\CONF\FOV006.ini" />
@@ -204,9 +195,7 @@
</None>
<None Include="packages.config" />
<None Include="postBuildTgt.bat" />
<None Include="DATA\CONF\IOB.ini">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\IOB.ini" />
<None Include="DATA\CONF\MAIN.ini">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
IOB-WIN-FORM/AdapterForm.cs
+1 -1
View File
@@ -138,7 +138,7 @@ namespace IOB_WIN_FORM
{
needSend = true;
// attendo meno di 1 min x il prox...
int ttlSec = rndGen.Next(30, 45);
int ttlSec = rndGen.Next(20, 30);
redisMan.setRSV(redKey, $"{DateTime.Now}", ttlSec);
}
try
IOB-WIN-MITSUBISHI/DATA/CONF/MAIN.ini
+1
View File
@@ -17,6 +17,7 @@ CLI_INST=SteamWareSim
;--- TEST sul campo
; SIMULAZIONE verso server ufficio
;STARTLIST=SIMUL_01,SIMUL_02,SIMUL_03,SIMUL_04
;STARTLIST=VL28
STARTLIST=VL28
IOB-WIN-MITSUBISHI/Iob/Mitsubishi.cs
+1 -89
View File
@@ -472,6 +472,7 @@ namespace IOB_WIN_MITSUBISHI.Iob
outVal.Add(item.Key, $"{DictVar[iVar]}");
}
//upsertKey(item.Key, $"{DictVar[iVar]}");
upsertKeyLP(item.Key, $"{DictVar[iVar]}");
}
}
}
@@ -1965,95 +1966,6 @@ namespace IOB_WIN_MITSUBISHI.Iob
}
}
#if false
/// <summary>
/// Scrive valore richiesto nella memoria richiesta
/// </summary>
/// <param name="memName"></param>
/// <param name="memAddr"></param>
/// <param name="valReq"></param>
/// <returns></returns>
private bool writeMitsubMem(string memName, string memAddr, int valReq)
{
bool answ = false;
lgTrace($"INIT {memName} | memAddr: {memAddr}");
// contapezzi ATTUALE
if (!string.IsNullOrEmpty(memAddr))
{
if (memAddr.StartsWith("STD"))
{
// inizio verifica area memoria/parametro levando prima parte codice
memAddr = memAddr.Replace("STD.", "");
}
// var di appoggio
int cntAddr = 0;
// verifico se si tratta di tipo VAR... formato tipo VAR.501
if (memAddr.StartsWith("VAR."))
{
// recupero parametro...
int.TryParse(memAddr.Replace("VAR.", ""), out cntAddr);
lgTrace($"VAR | {memName} Write 01 | memAddr: {memAddr} | idx: {cntAddr}");
// processo SET valore
sw.Restart();
if (cntAddr > 0)
{
double vTransf = (double)valReq;
// scrivo valore
int iRet = oEZNcAutCom.CommonVariable_Write2(cntAddr, vTransf, 1);
// trimmo se necessario memName...
if (memName.Length > maxVarStrLen)
{
memName = memName.Substring(0, maxVarStrLen);
}
// scrivo label
iRet = oEZNcAutCom.CommonVariable_SetName(cntAddr, memName);
lgTrace($"VAR | {memName} Write 02 | memAddr: {memAddr} | valReq: {valReq} | vTransf: {vTransf}");
if (utils.CRB("recTime"))
{
TimingData.addResult(cIobConf.codIOB, "VAR-W", sw.ElapsedTicks);
}
answ = iRet == 0;
// se successo --> rileggo!
if (answ)
{
ReadMitsubVars();
}
}
sw.Stop();
}
else if (memAddr.StartsWith("PAR."))
{
// recupero parametro...
int.TryParse(memAddr.Replace("PAR.", ""), out cntAddr);
lgTrace($"PAR | {memName} Write 01 | memAddr: {memAddr} | idx: {cntAddr}");
// processo SET valore
sw.Restart();
if (cntAddr > 0)
{
// scrivo pz req come PAR...
int lAxis = 0;
string[] sValue = new string[1];
sValue[0] = $"{valReq}";
int iRet = oEZNcAutCom.Parameter_SetData3(0, cntAddr, lAxis, (object)sValue);
lgTrace($"PAR | {memName} Write 02 | memAddr: {memAddr} | valReq: {valReq}");
if (utils.CRB("recTime"))
{
TimingData.addResult(cIobConf.codIOB, "PAR-W", sw.ElapsedTicks);
}
answ = iRet == 0;
// se successo --> rileggo!
if (answ)
{
ReadMitsubParams();
}
}
sw.Stop();
}
}
return answ;
}
#endif
/// <summary>
/// Scrive valore richiesto nella memoria richiesta
/// </summary>