diff --git a/IOB-UT/ToMapo.cs b/IOB-UT/ToMapo.cs
index faca44df..7711303a 100644
--- a/IOB-UT/ToMapo.cs
+++ b/IOB-UT/ToMapo.cs
@@ -29,30 +29,30 @@ namespace IOB_UT
///
public string keyProgName { get; set; } = "";
///
- /// Indica se il ping sia un criterio valido x determinare powerON impianto
- ///
- public bool pingAsPowerOn { get; set; } = true;
- ///
/// Nome variabile x RunMode
///
public string keyRunMode { get; set; } = "";
///
+ /// Indica se il ping sia un criterio valido x determinare powerON impianto
+ ///
+ public bool pingAsPowerOn { get; set; } = true;
+ ///
/// Struttura dati x check condizione PowerOn
///
- public diCheckCondition condPowerOn { get; set; }
+ public diCheckCondition condPowerOn { get; set; } = new diCheckCondition();
///
/// Struttura dati x check condizione LAVORA / Green
///
- public List condWork { get; set; }
+ public List condWork { get; set; } = new List();
///
/// Dictionary dei nomi da cercare come "endsWith" a cui applicare la soglia indicata
///
- public Dictionary paramsEndThresh { get; set; }
+ public Dictionary paramsEndThresh { get; set; } = new Dictionary();
///
/// Array degli elementi di traduzione item
///
- public Dictionary itemTranslation { get; set; }
+ public Dictionary itemTranslation { get; set; } = new Dictionary();
}
///
/// Classe per rappresentare oggetti chaive/valore target x controlo condizioni multiple
diff --git a/IOB-WIN/DATA/CONF/GT573.json b/IOB-WIN/DATA/CONF/GT573.json
index fe4d1e05..c735cd8c 100644
--- a/IOB-WIN/DATA/CONF/GT573.json
+++ b/IOB-WIN/DATA/CONF/GT573.json
@@ -5,12 +5,12 @@
"keyProgName": "GD179N_p1_52",
"keyRunMode": "GD179N_p1_49",
"pingAsPowerOn": false,
- "condPowerOn": [
+ "condPowerOn":
{
"keyName": "GD179N_dtop_2",
"targetValue": "AVAILABLE"
}
- ],
+ ,
"condWork": [
{
"keyName": "GD179N_p1_48",
diff --git a/IOB-WIN/IobMTC.cs b/IOB-WIN/IobMTC.cs
index 167ea5ee..5f20bc02 100644
--- a/IOB-WIN/IobMTC.cs
+++ b/IOB-WIN/IobMTC.cs
@@ -115,7 +115,7 @@ namespace IOB_WIN
string jsonFullPath = $"{Application.StartupPath}/DATA/CONF/{fileName}";
lgInfo($"Apertura file {jsonFullPath}");
StreamReader reader = new StreamReader(jsonFullPath);
- string jsonData = reader.ReadToEnd();
+ string jsonData = reader.ReadToEnd().Replace("\n", "").Replace("\r", "");
if (!string.IsNullOrEmpty(jsonData))
{
lgInfo($"File json composto da {jsonData.Length} caratteri");
diff --git a/Jenkinsfile b/Jenkinsfile
index b46e9e24..5de0f5ab 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -9,7 +9,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
- withEnv(['NEXT_BUILD_NUMBER=689']) {
+ withEnv(['NEXT_BUILD_NUMBER=690']) {
// 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'