diff --git a/MP-ADM/Web.Release.config b/MP-ADM/Web.Release.config index d291a2b0..fb81ed8d 100644 --- a/MP-ADM/Web.Release.config +++ b/MP-ADM/Web.Release.config @@ -3,20 +3,14 @@ - - - - - + \ No newline at end of file diff --git a/MP-IO/Controllers/IOBController.cs b/MP-IO/Controllers/IOBController.cs index 5770e5db..1c08f3fd 100644 --- a/MP-IO/Controllers/IOBController.cs +++ b/MP-IO/Controllers/IOBController.cs @@ -1572,12 +1572,14 @@ namespace MP_IO.Controllers // GET: IOB (è un check alive del server) public string Index() { - if (memLayer.ML.CRB("IOB_RedEnab")) + //if (memLayer.ML.CRB("IOB_RedEnab")) + if (true) { // conto la richiesta nel contatore REDIS long nCall = memLayer.ML.setRCntI(DataLayer.mHash("COUNT:pCall:IOB_INDEX")); //... se == nCall2Log scrivo su log e resetto - long nCall2Log = memLayer.ML.cdvi("nCall2Log"); + long nCall2Log = 100;// memLayer.ML.cdvi("nCall2Log"); + //long nCall2Log = memLayer.ML.cdvi("nCall2Log"); if (nCall >= nCall2Log) { // loggo diff --git a/MP-IO/MP-IO.csproj.user b/MP-IO/MP-IO.csproj.user index 9ee9ffcb..517918d6 100644 --- a/MP-IO/MP-IO.csproj.user +++ b/MP-IO/MP-IO.csproj.user @@ -1,7 +1,7 @@ - + - C:\Users\samuele.steamw\source\MoonPro.net\MP-IO\Properties\PublishProfiles\IIS03.pubxml + C:\Users\samuele.steamw\source\MoonPro.net\MP-IO\Properties\PublishProfiles\IIS01.pubxml true ShowAllFiles diff --git a/MP-IO/Properties/PublishProfiles/IIS01.pubxml.user b/MP-IO/Properties/PublishProfiles/IIS01.pubxml.user index b32207a5..b2e3acdb 100644 --- a/MP-IO/Properties/PublishProfiles/IIS01.pubxml.user +++ b/MP-IO/Properties/PublishProfiles/IIS01.pubxml.user @@ -7,5 +7,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAAH0adXzrANk+QkSQiwkrZoAAAAAACAAAAAAADZgAAwAAAABAAAABHE5oPoHlG6fwYbvPGkksuAAAAAASAAACgAAAAEAAAALhOWzlQAPxJ2VE8lisaR9gYAAAAkDFsctmhzdLpUmOVleVAckCWeuODp7F1FAAAAAxKlaqhbiV+t3IJ+FqzhN+bBKS/ + True|2025-06-04T11:11:35.2130452Z||;True|2025-06-04T13:05:51.8038152+02:00||; + \ No newline at end of file diff --git a/MP-IO/Web.Release.config b/MP-IO/Web.Release.config index 2410afa2..cd6b9a2b 100644 --- a/MP-IO/Web.Release.config +++ b/MP-IO/Web.Release.config @@ -4,11 +4,11 @@ - - - - - + + + + + diff --git a/MP-IO/Web.config b/MP-IO/Web.config index 63becdb7..7743938e 100644 --- a/MP-IO/Web.config +++ b/MP-IO/Web.config @@ -14,11 +14,11 @@ - - + + - - + + diff --git a/MP-MAG/Web.Release.config b/MP-MAG/Web.Release.config index 36ab23ba..102564af 100644 --- a/MP-MAG/Web.Release.config +++ b/MP-MAG/Web.Release.config @@ -3,17 +3,11 @@ - + + + + + - + + + + + - - + + diff --git a/MP-TAB/Web.Release.config b/MP-TAB/Web.Release.config index dcae2e8c..716356dd 100644 --- a/MP-TAB/Web.Release.config +++ b/MP-TAB/Web.Release.config @@ -1,9 +1,12 @@  - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/MapoSDK/Objects.cs b/MapoSDK/Objects.cs index 42e681bf..519e188e 100644 --- a/MapoSDK/Objects.cs +++ b/MapoSDK/Objects.cs @@ -419,12 +419,12 @@ namespace MapoSDK /// /// Valore MASSIMO (SE impostato) /// - public int valMax { get; set; } + public double valMax { get; set; } /// /// Valore minimo (SE impostato) /// - public int valMin { get; set; } + public double valMin { get; set; } /// /// Valore parametro (come stringa, decimali con ",", default VUOTO), sul CNC/PLC diff --git a/MapoSDK/dataConf.cs b/MapoSDK/dataConf.cs index 94551b4a..8bc0f11c 100644 --- a/MapoSDK/dataConf.cs +++ b/MapoSDK/dataConf.cs @@ -2,6 +2,9 @@ using Newtonsoft.Json.Converters; using System.Collections.Generic; +// +// This is here so CodeMaid doesn't reorganize this document +// namespace MapoSDK { /// @@ -11,40 +14,31 @@ namespace MapoSDK { #region Public Properties + /// + /// NOME parametro + /// + public string name { get; set; } = "none"; + /// /// DESCRIZIONE parametro /// public string description { get; set; } = ""; - /// - /// Fattore per eventuale scalatura (es leggo 1234 --> 12,34 con factor=0.01, 123'400 con factor=100) - /// - public double factor { get; set; } = 1; - - /// - /// Indice nell'area di memoria (da valore iniziale = 0) - /// - public int index { get; set; } = 0; - - /// - /// Valore massimo ammesso (ove usato, es simulazione) - /// - public int maxVal { get; set; } = 9999; - /// /// Nome "assoluto" della posizione nell'area di memoria (anche diverso da indice) /// public string memAddr { get; set; } = ""; /// - /// Valore minimo ammesso (ove usato, es simulazione) + /// Tipo di dato /// - public int minVal { get; set; } = 0; + [JsonConverter(typeof(StringEnumConverter))] + public plcDataType tipoMem { get; set; } = plcDataType.Int; /// - /// NOME parametro + /// Indice nell'area di memoria (da valore iniziale = 0) /// - public string name { get; set; } = "none"; + public int index { get; set; } = 0; /// /// Size in byte @@ -52,10 +46,20 @@ namespace MapoSDK public int size { get; set; } = 0; /// - /// Tipo di dato + /// Fattore di MOLTIPLICA per eventuale scalatura + /// es: leggo 1'234 con factor=0.01 --> 12.34, con factor=100 --> 123'400 /// - [JsonConverter(typeof(StringEnumConverter))] - public plcDataType tipoMem { get; set; } = plcDataType.Int; + public double factor { get; set; } = 1; + + /// + /// Valore massimo ammesso (ove usato, es simulazione) + /// + public double maxVal { get; set; } = 9999; + + /// + /// Valore minimo ammesso (ove usato, es simulazione) + /// + public double minVal { get; set; } = 0; /// /// Unità di misura del parametro diff --git a/MapoSDK/dataConfTSVC.cs b/MapoSDK/dataConfTSVC.cs index 70d80d08..94a04c0a 100644 --- a/MapoSDK/dataConfTSVC.cs +++ b/MapoSDK/dataConfTSVC.cs @@ -1,11 +1,13 @@ using Newtonsoft.Json; using Newtonsoft.Json.Converters; -using System.Collections.Generic; +// +// This is here so CodeMaid doesn't reorganize this document +// namespace MapoSDK { /// - /// Struttura conf tipo dati + /// Struttura conf tipo dati con estensione TimeSeries + VarCalc /// public class dataConfTSVC : dataConf { @@ -30,12 +32,12 @@ namespace MapoSDK /// /// Valore della DeadBand per rilevare variazioni in valore assoluto, se nullo non impiegato /// - public double? thresholdAbs { get; set; } = null; + public double? thresholdAbs { get; set; } /// /// Valore della DeadBand per rilevare variazioni in valore percentuale (5% = 0.05), se nullo non impiegato /// - public double? thresholdPerc { get; set; } = null; + public double? thresholdPerc { get; set; } #endregion Public Properties