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

Fix init con tipo NON trovato (prosegue con ND senza chiudersi...)

Browse Source
This commit is contained in:
Samuele E. Locatelli
2019-09-18 21:28:58 +02:00
parent 9b5e0e9ef7
commit 4f7fa036ed
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-WIN/AdapterForm.cs
+9 -1
View File
@@ -466,7 +466,15 @@ namespace IOB_WIN
curVendor = fIni.ReadString("MACHINE", "VENDOR", "ACME");
curModel = fIni.ReadString("MACHINE", "MODEL", "NONE");
// verifico tipo adapter
tipoScelto = (tipoAdapter)Enum.Parse(typeof(tipoAdapter), fIni.ReadString("IOB", "CNCTYPE", "DEMO"));
try
{
tipoScelto = (tipoAdapter)Enum.Parse(typeof(tipoAdapter), fIni.ReadString("IOB", "CNCTYPE", "DEMO"));
}
catch(Exception exc)
{
lg.Error(exc, "Eccezione in conversione tipo adapter: richiesto un tipo non codificato...");
tipoScelto = tipoAdapter.ND;
}
// carivo vettore parametri opzionai
Dictionary<string, string> optParRead = new Dictionary<string, string>();
string[] optParRows = fIni.ReadSection("OPTPAR");
IOB-WIN/App.config
+1 -2
View File
@@ -43,8 +43,7 @@
<add key="SendAxPos" value="false"/>
<add key="SendFeedSpeed" value="false"/>
<!--Definizione avvio Adapter-->
<add key="autoLoadConf" value="false"/>
<!--<add key="autoLoadConf" value="true"/>-->
<add key="autoLoadConf" value="true"/>
<add key="autoStartOnLoad" value="true"/>
<add key="startMinimized" value="false"/>
<add key="windowCanMax" value="true"/>
Jenkinsfile
Vendored
+1 -1
View File
@@ -16,7 +16,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=434']) {
withEnv(['NEXT_BUILD_NUMBER=435']) {
// env.versionNumber = VersionNumber(versionNumberString : '2.3.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '2.3.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO-IOB-WIN'