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

Merge branch 'develop'

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-02-21 17:10:36 +01:00
parent c7973ca846 42e7e99182
commit feccdc8991
6 changed files with 11494 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CVCncLib/testSam.dll.config
+48
View File
@@ -0,0 +1,48 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="testSam.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
</sectionGroup>
</configSections>
<system.diagnostics>
<sources>
<!-- Questa sezione definisce la configurazione di registrazione per My.Application.Log -->
<source name="DefaultSource" switchName="DefaultSwitch">
<listeners>
<add name="FileLog"/>
<!-- Per scrivere nel log eventi dell'applicazione, rimuovere il commento dalla sezione sottostante -->
<!--<add name="EventLog"/>-->
</listeners>
</source>
</sources>
<switches>
<add name="DefaultSwitch" value="Information"/>
</switches>
<sharedListeners>
<add name="FileLog" type="Microsoft.VisualBasic.Logging.FileLogTraceListener, Microsoft.VisualBasic, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" initializeData="FileLogWriter"/>
<!-- Per scrivere nel log eventi dell'applicazione, rimuovere il commento dalla sezione sottostante e sostituire APPLICATION_NAME con il nome dell'applicazione -->
<!--<add name="EventLog" type="System.Diagnostics.EventLogTraceListener" initializeData="APPLICATION_NAME"/> -->
</sharedListeners>
</system.diagnostics>
<system.serviceModel>
<bindings>
<basicHttpBinding>
<binding name="OPENcontrol"/>
</basicHttpBinding>
</bindings>
<client>
<endpoint address="http://192.168.20.2:8080" binding="basicHttpBinding" bindingConfiguration="OPENcontrol" contract="OpenControl.OPENcontrolPortType" name="OPENcontrol"/>
</client>
</system.serviceModel>
<applicationSettings>
<testSam.My.MySettings>
<setting name="door_pro_WebReference_OPENcontrol" serializeAs="String">
<value>http://192.168.20.2:8080</value>
</setting>
<setting name="d_prod_WebReference_OPENcontrol" serializeAs="String">
<value>http://192.168.20.2:8080</value>
</setting>
</testSam.My.MySettings>
</applicationSettings>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client"/></startup></configuration>
CVCncLib/testSam.xml
+11418
View File
File diff suppressed because it is too large Load Diff
IOB-MAN/IOBManPanel.cs
+10 -3
View File
@@ -184,7 +184,7 @@ namespace IOB_MAN
// ne creo rand (5-15) di default...
for (int i = 0; i < rand.Next(5, 10); i++)
{
ArgsList.Add("127.0.0.1");
ArgsList.Add($"127.0.0.{i + 1}");
}
}
else
@@ -392,6 +392,7 @@ namespace IOB_MAN
/// <param name="e"></param>
private void MainTimer_Tick(object sender, EventArgs e)
{
MainTimer.Stop();
if (!checkRunning)
{
//checkProcessStatusAsync();
@@ -403,6 +404,7 @@ namespace IOB_MAN
catch (Exception exc)
{ }
}
MainTimer.Start();
}
private void forceCheckTimer_Tick(object sender, EventArgs e)
@@ -419,11 +421,18 @@ namespace IOB_MAN
{ }
}
checkWatchdog();
// riavvio i timer x sicurezza...
UI_Timer.Stop();
UI_Timer.Start();
MainTimer.Stop();
MainTimer.Start();
}
private void UI_Timer_Tick(object sender, EventArgs e)
{
UI_Timer.Stop();
Task result = updateProgBarAsync();
result.Wait();
UI_Timer.Start();
}
/// <summary>
/// Controllo periodico dei processi DA RIATTIVARE
@@ -493,8 +502,6 @@ namespace IOB_MAN
// reset variabili appoggio
checkRunning = true;
// eseguo task!
//var taskRes = Task.Run(() => checkRunningchild());
//taskRes.Wait();
await Task.Run(() => checkRunningchild()).ConfigureAwait(false);
updateStatus();
checkRunning = false;
IOB-MAN/iobAdapt.cs
-1
View File
@@ -24,7 +24,6 @@ namespace IOB_MAN
if (scadIobStatus > DateTime.Now && lastIobStatus != null)
{
answ = lastIobStatus;
//answ = lastIobStatus != null ? lastIobStatus : redisMan.iobStatus;
}
else
{
IOB-WIN/IobGeneric.cs
+17 -3
View File
@@ -1423,9 +1423,9 @@ namespace IOB_WIN
private void svuotaCodaContapezzi()
{
// se ho contapezzi OLTRE limite...
while (lastCountCNC > contapezzi + minSendPzCountBlock)
while ((MPOnline) && (lastCountCNC > contapezzi + minSendPzCountBlock))
{
lgInfo("Inizio svuotaCodaContapezzi");
lgInfo($"Inizio svuotaCodaContapezzi --> lastCountCNC: {lastCountCNC} | contapezzi: {contapezzi}");
pzCntReload(true);
// provo invio
trySendPzCountBlock();
@@ -3345,10 +3345,16 @@ namespace IOB_WIN
int.TryParse(resp, out qtyAdded);
if (qtyAdded > 0)
{
lgInfo($"Inviato incremento contapezzi: send {numIncr} | resp {qtyAdded}");
// aggiorno IL MIO contapezzi...
contapezzi += qtyAdded;
lgInfo($"Inviato incremento contapezzi: send: {numIncr} | resp: {qtyAdded} | contapezzi: {contapezzi}");
// invio conferma contapezzi..
string retVal = utils.callUrl($"{urlSetPzCount}{contapezzi}");
}
else
{
lgError($"Richiesto incremento {numIncr} ma NON registrato su server MP-IO");
}
}
currDispData.newUrlCallData = lastUrl;
currDispData.counter = contapezzi;
@@ -3357,6 +3363,14 @@ namespace IOB_WIN
}
}
}
else
{
lgInfo("Impossibile trySendPzCountBlock: IobOnline è false");
}
}
else
{
lgInfo("Impossibile trySendPzCountBlock: MPOnline è false");
}
}
/// <summary>
Jenkinsfile
Vendored
+1 -1
View File
@@ -9,7 +9,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=670']) {
withEnv(['NEXT_BUILD_NUMBER=671']) {
// env.versionNumber = VersionNumber(versionNumberString : '3.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '3.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO-IOB-WIN'