diff --git a/Jenkinsfile b/Jenkinsfile
index a6cb55d8..317152f3 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -18,7 +18,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
- withEnv(['NEXT_BUILD_NUMBER=1253']) {
+ withEnv(['NEXT_BUILD_NUMBER=1254']) {
// env.versionNumber = VersionNumber(versionNumberString : '6.8.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '6.8.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO'
diff --git a/MP-TAB/WebUserControls/mod_sendParameters.ascx b/MP-TAB/WebUserControls/mod_sendParameters.ascx
index 6dcb0647..c698d98e 100644
--- a/MP-TAB/WebUserControls/mod_sendParameters.ascx
+++ b/MP-TAB/WebUserControls/mod_sendParameters.ascx
@@ -7,20 +7,16 @@
-
Elenco parametri di configurazione ammessi
-
- Nessun parametro configurabile sull'impianto, funzione non autorizzata
-
-
-
- <%--
+
Elenco parametri di configurazione ammessi per l'impianto
+
+ Nessun parametro configurabile
+
+
+
+
+
+
+ <%--
@@ -31,8 +27,6 @@
--%>
-
-
<%----%>
diff --git a/MP-TAB/WebUserControls/mod_sendParameters.ascx.cs b/MP-TAB/WebUserControls/mod_sendParameters.ascx.cs
index e0910ab7..e6cd8b0d 100644
--- a/MP-TAB/WebUserControls/mod_sendParameters.ascx.cs
+++ b/MP-TAB/WebUserControls/mod_sendParameters.ascx.cs
@@ -1,4 +1,6 @@
-using System;
+using MapoSDK;
+using System;
+using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Web;
@@ -11,7 +13,31 @@ namespace MoonProTablet.WebUserControls
{
protected void Page_Load(object sender, EventArgs e)
{
+ }
+ public static ICollection GetParameters()
+ {
+ //!!!FIXME !!!FARE recuperare VERI DATI da memoria REDIS dell'IOB...
+
+ ArrayList al = new ArrayList();
+ plcMemMap memoria = new plcMemMap();
+
+ for (int i = 0; i < 10; i++)
+ {
+
+ dataConf currConf = new dataConf()
+ {
+ name = $"Par_{i}",
+ description = $"Parametro {i}",
+ value = $"{i}"
+ };
+ memoria.mMapWrite.Add($"Parametro {i}", currConf);
+ }
+ foreach (var item in memoria.mMapWrite)
+ {
+ al.Add(item.Value);
+ }
+ return al;// memoria.mMapWrite;
}
}
}
\ No newline at end of file
diff --git a/MP-TAB/WebUserControls/mod_sendParameters.ascx.designer.cs b/MP-TAB/WebUserControls/mod_sendParameters.ascx.designer.cs
index d5f8ffdd..18615f7e 100644
--- a/MP-TAB/WebUserControls/mod_sendParameters.ascx.designer.cs
+++ b/MP-TAB/WebUserControls/mod_sendParameters.ascx.designer.cs
@@ -14,24 +14,6 @@ namespace MoonProTablet.WebUserControls
public partial class mod_sendParameters
{
- ///