From b9b453d36696a39d4c21067bbae4da0e89bc2d0a Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 20 Feb 2025 19:59:54 +0100 Subject: [PATCH] Shelly: - aggiunti metodi x deduplica FLog da KVP (da testare...) --- IOB-WIN-FORM/Iob/Generic.cs | 3 ++- IOB-WIN-SHELLY/DATA/CONF/SHELLY_01.json | 4 ++-- IOB-WIN-SHELLY/Iob/ShellyClient.cs | 22 +++++++++++++--------- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/IOB-WIN-FORM/Iob/Generic.cs b/IOB-WIN-FORM/Iob/Generic.cs index 4fb262cf..f67ef847 100644 --- a/IOB-WIN-FORM/Iob/Generic.cs +++ b/IOB-WIN-FORM/Iob/Generic.cs @@ -3644,7 +3644,8 @@ namespace IOB_WIN_FORM.Iob if (scaduto) { // limite a 3 digit x valore float - outVal.Add(chiave, $"{valore:N3}"); + outVal.Add(chiave, valore.ToString("F3", CultureInfo.InvariantCulture)); + //outVal.Add(chiave, $"{valore:N3}"); } LastTSVC[chiave] = valore; } diff --git a/IOB-WIN-SHELLY/DATA/CONF/SHELLY_01.json b/IOB-WIN-SHELLY/DATA/CONF/SHELLY_01.json index 02bd0365..5a977277 100644 --- a/IOB-WIN-SHELLY/DATA/CONF/SHELLY_01.json +++ b/IOB-WIN-SHELLY/DATA/CONF/SHELLY_01.json @@ -30,7 +30,7 @@ "optKVP": { "shelly_tout": 5, "fluxLogReduce": true, - "fluxLogRedDeadBand": 1.5, - "fluxLogResendPeriod": 15 + "fluxLogRedDeadBand": 2, + "fluxLogResendPeriod": 60 } } \ No newline at end of file diff --git a/IOB-WIN-SHELLY/Iob/ShellyClient.cs b/IOB-WIN-SHELLY/Iob/ShellyClient.cs index 9b7bf8f1..9f86ea1c 100644 --- a/IOB-WIN-SHELLY/Iob/ShellyClient.cs +++ b/IOB-WIN-SHELLY/Iob/ShellyClient.cs @@ -90,33 +90,37 @@ namespace IOB_WIN_SHELLY.Iob // recupero da conf memMap e ciclo foreach (var item in IOBConfFull.SpecialConf.MemMap.mMapRead) { - string outVal = ""; + //string outVal = ""; + double outValDbl = 0; // se trovo includo in dynData... switch (item.Value.memAddr) { case "ActEnergy": - outVal = lastShellyResp.Value.ActEnergy.Total.ToString("F3", CultureInfo.InvariantCulture); + outValDbl=lastShellyResp.Value.ActEnergy.Total; + //outVal = lastShellyResp.Value.ActEnergy.Total.ToString("F3", CultureInfo.InvariantCulture); break; case "Current": - outVal = lastShellyResp.Value.Current.ToString("F3", CultureInfo.InvariantCulture); - //outVal = $"{lastShellyResp.Value.Current:N3}"; + outValDbl = lastShellyResp.Value.Current; + //outVal = lastShellyResp.Value.Current.ToString("F3", CultureInfo.InvariantCulture); break; case "Power": - outVal = lastShellyResp.Value.Power.ToString("F3", CultureInfo.InvariantCulture); - //outVal = $"{lastShellyResp.Value.Power:N3}"; + outValDbl = lastShellyResp.Value.Power; + //outVal = lastShellyResp.Value.Power.ToString("F3", CultureInfo.InvariantCulture); break; case "Voltage": - outVal = lastShellyResp.Value.Voltage.ToString("F3", CultureInfo.InvariantCulture); - //outVal = $"{lastShellyResp.Value.Voltage:N3}"; + outValDbl = lastShellyResp.Value.Voltage; + //outVal = lastShellyResp.Value.Voltage.ToString("F3", CultureInfo.InvariantCulture); break; default: break; } - outData.Add(item.Key, outVal); + // modalità saveValue x reduce fLog + saveValue(ref outData, item.Key, outValDbl); + //outData.Add(item.Key, outValDbl.ToString("F3", CultureInfo.InvariantCulture)); } } }