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

Merge branch 'develop' into IobMan

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-03-09 17:13:55 +01:00
parent 3d725203e9 b4b4d61a8b
commit 30239aa1b5
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-UT/ToMapo.cs
+8 -8
View File
@@ -29,30 +29,30 @@ namespace IOB_UT
/// </summary>
public string keyProgName { get; set; } = "";
/// <summary>
/// Indica se il ping sia un criterio valido x determinare powerON impianto
/// </summary>
public bool pingAsPowerOn { get; set; } = true;
/// <summary>
/// Nome variabile x RunMode
/// </summary>
public string keyRunMode { get; set; } = "";
/// <summary>
/// Indica se il ping sia un criterio valido x determinare powerON impianto
/// </summary>
public bool pingAsPowerOn { get; set; } = true;
/// <summary>
/// Struttura dati x check condizione PowerOn
/// </summary>
public diCheckCondition condPowerOn { get; set; }
public diCheckCondition condPowerOn { get; set; } = new diCheckCondition();
/// <summary>
/// Struttura dati x check condizione LAVORA / Green
/// </summary>
public List<diCheckCondition> condWork { get; set; }
public List<diCheckCondition> condWork { get; set; } = new List<diCheckCondition>();
/// <summary>
/// Dictionary dei nomi da cercare come "endsWith" a cui applicare la soglia indicata
/// </summary>
public Dictionary<string, int> paramsEndThresh { get; set; }
public Dictionary<string, int> paramsEndThresh { get; set; } = new Dictionary<string, int>();
/// <summary>
/// Array degli elementi di traduzione item
/// </summary>
public Dictionary<string, string> itemTranslation { get; set; }
public Dictionary<string, string> itemTranslation { get; set; } = new Dictionary<string, string>();
}
/// <summary>
/// Classe per rappresentare oggetti chaive/valore target x controlo condizioni multiple
IOB-WIN/DATA/CONF/GT573.json
+2 -2
View File
@@ -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",
IOB-WIN/IobMTC.cs
+1 -1
View File
@@ -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");
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=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'