From 776f3832e351e79c31286b18fa6fbcfdde77ebdb Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Sat, 14 Dec 2019 08:40:25 +0100
Subject: [PATCH] Update seriate

---
 Seriate/items/steamware.items      | 144 +++++++-----
 Seriate/persistence/rrd4j.persist  |   2 +-
 Seriate/rules/steamware.rules      | 126 ++++++++---
 Seriate/services/rrd4j.cfg         |   2 +-
 Seriate/sitemaps/steamware.sitemap | 352 ++++++++++++++++++++---------
 Seriate/things/steamware.things    |   4 +
 Seriate/transform/it.map           |   7 +
 7 files changed, 435 insertions(+), 202 deletions(-)
 create mode 100644 Seriate/transform/it.map

diff --git a/Seriate/items/steamware.items b/Seriate/items/steamware.items
index f593001..0a39ba1 100644
--- a/Seriate/items/steamware.items
+++ b/Seriate/items/steamware.items
@@ -2,62 +2,89 @@
 // Group gC            "Cellar"        <cellar>        ["Basement"]
 // Group Garden        "Garden"        <garden>        ["Garden"]
 // Group Weather       "Weather"       <sun>
-Group Status
-Group Shutters
-Group Lights
+Group											Status																																																						
+Group											Shutters																																																					
+Group											Lights																																																						
 
+/*---------------------- Elementi Astronomici ----------------------*/																		
+String Stagione  { channel="astro:sun:home:season#name" }
+/*----------------------------------------------------------------------------*/
 
 /* Gruppi Attivi per calcolo */   
 // Group:Switch:OR(ON, OFF)        Lights      "All Lights [(%d)]"
 // Group:Contact:OR(OPEN, CLOSED)  Windows     "Open windows [(%d)]"               <contact>
 
-/*---------------------- Elementi Clima, Daikin via MODBUS ----------------------*/
-Group:Switch:OR(ON, OFF)        GU120_CL_Switch    "Clima Attivi [(%d)]"       <switch>
-Group:Number:AVG                GU120_CL_Temp      "Temp. Rilevata [%.1f °C]"  <temperature>
-Group:Number:AVG                GU120_CL_Set       "Temp. Impostata [%.1f °C]"  <heating>    
-Group:Switch:OR(ON, OFF)        GU100_CL_Switch    "Clima Attivi [(%d)]"       <switch>
-Group:Number:AVG                GU100_CL_Temp      "Temp. Rilevata [%.1f °C]"  <temperature>
-Group                           GU100_CL_Set       "Temp. Impostata [%.1f °C]"  <heating> 
-Number GU120_CL_TempInt
-Switch Heating_GU120_CL_C1_Switch  "Ingresso"                  <heating>     (GU120_CL_Switch) {channel="modbus:data:c5a162cd:switch"}
-Number Heating_GU120_CL_C1_Temp    "Temp Ingresso [%.1f °C]"   <temperature> (GU120_CL_Temp) {channel="modbus:data:b81128ff:number"}
-Number Heating_GU120_CL_C1_Set     "Set Temp [%.1f °C]"        <heating>     (GU120_CL_Set) {channel="modbus:data:b2c00004:number"} 
-
-Switch Heating_GU120_CL_C2_Switch  "Corridoio"                 <heating>     (GU120_CL_Switch) {channel="modbus:data:60b8a462:switch"}
-Number Heating_GU120_CL_C2_Temp    "Temp Corridoio [%.1f °C]"  <temperature> (GU120_CL_Temp) {channel="modbus:data:818496a3:number"}
-Number Heating_GU120_CL_C2_Set     "Set Temp [%.1f °C]"        <heating>     (GU120_CL_Set) {channel="modbus:data:a48ffb78:number"}
-
-Switch Heating_GU120_CL_C3_Switch  "Finestra"                  <heating>     (GU120_CL_Switch) {channel="modbus:data:66347e21:switch"}
-Number Heating_GU120_CL_C3_Temp    "Temp Finestra [%.1f °C]"   <temperature> (GU120_CL_Temp) {channel="modbus:data:8a30c540:number"}
-Number Heating_GU120_CL_C3_Set     "Set Temp [%.1f °C]"        <heating>     (GU120_CL_Set) {channel="modbus:data:7061ed82:number"}
-
-Switch Heating_GU120_CL_C4_Switch  "Ufficio"                   <heating>     (GU120_CL_Switch) {channel="modbus:data:c56dbfa4:switch"}
-Number Heating_GU120_CL_C4_Temp    "Temp Ufficio [%.1f °C]"    <temperature> (GU120_CL_Temp) {channel="modbus:data:3a7f6582:number"}
-Number Heating_GU120_CL_C4_Set     "Set Temp [%.1f °C]"        <heating>     (GU120_CL_Set) {channel="modbus:data:f86b3601:number"}
-
-Switch Heating_GU120_CL_C5_Switch  "Sala Riunioni"                      <heating>     (GU120_CL_Switch) {channel="modbus:data:02e9ec27:switch"}
-Number Heating_GU120_CL_C5_Temp    "Temp Sala Riunioni [%.1f °C]"       <temperature> (GU120_CL_Temp) {channel="modbus:data:f0f9e4a4:number"}
-Number Heating_GU120_CL_C5_Set     "Set Temp Riunioni [%.1f °C]"        <heating>     (GU120_CL_Set) {channel="modbus:data:a775a678:number"}
+/*---------------------- Elementi Clima, Daikin via MODBUS ----------------------*/																												
+Number										GU120_CL                    "Clima Ufficio 120"																																				
+Group:Switch:OR(ON, OFF)	GU120_CL_Switch							"Clima Attivi [(%d)]"							<switch>																			
+Group:Number:AVG					GU120_CL_Temp								"Temp. Rilevata [%.1f °C]"				<temperature>
+Group:Number:AVG					GU120_CL_Set								"Temp. Impostata [%.1f °C]"				<heating>																			
+Group											GU120_CL_Fan								"Fan Speed"												<fan>																					
+Group:Switch:OR(ON, OFF)	GU100_CL_Switch							"Clima Attivi [(%d)]"							<switch>																			
+Group:Number:AVG					GU100_CL_Temp								"Temp. Rilevata [%.1f °C]"				<temperature>																	
+Group											GU100_CL_Set								"Temp. Impostata [%.1f °C]"				<heating>																			
+Group											GU100_CL_Fan								"Fan Speed"												<fan>																					
+Number										GU120_CL_TempInt																																														
+Switch										Heating_GU120_CL_C1_Switch	"Ingresso"												<heating>			(GU120_CL_Switch)							{channel="modbus:data:c5a162cd:switch"}	
+Number										Heating_GU120_CL_C1_Temp		"Temp Ingresso [%.1f °C]"					<temperature>	(GU120_CL_Temp)								{channel="modbus:data:b81128ff:number"}	
+Number										Heating_GU120_CL_C1_Set			"Set Temp [%.1f °C]"							<heating>			(GU120_CL_Set)								{channel="modbus:data:b2c00004:number"}	
+Number										Heating_GU120_CL_C1_Fan			"Fan Speed"												<fan>					(GU120_CL_Fan)								{channel="modbus:data:991e39e0:number"}	
+Switch										Heating_GU120_CL_C2_Switch	"Corridoio"												<heating>			(GU120_CL_Switch)							{channel="modbus:data:60b8a462:switch"}	
+Number										Heating_GU120_CL_C2_Temp		"Temp Corridoio [%.1f °C]"				<temperature>	(GU120_CL_Temp)								{channel="modbus:data:818496a3:number"}	
+Number										Heating_GU120_CL_C2_Set			"Set Temp [%.1f °C]"							<heating>			(GU120_CL_Set)								{channel="modbus:data:a48ffb78:number"}	
+Number										Heating_GU120_CL_C2_Fan			"Fan Speed"												<fan>					(GU120_CL_Fan)								{channel="modbus:data:8a2997db:number"}	
+Switch										Heating_GU120_CL_C3_Switch	"Finestra"												<heating>			(GU120_CL_Switch)							{channel="modbus:data:66347e21:switch"}	
+Number										Heating_GU120_CL_C3_Temp		"Temp Finestra [%.1f °C]"					<temperature>	(GU120_CL_Temp)								{channel="modbus:data:8a30c540:number"}	
+Number										Heating_GU120_CL_C3_Set			"Set Temp [%.1f °C]"							<heating>			(GU120_CL_Set)								{channel="modbus:data:7061ed82:number"}	
+Number										Heating_GU120_CL_C3_Fan			"Fan Speed"												<fan>					(GU120_CL_Fan)								{channel="modbus:data:918756c9:number"}	
+Switch										Heating_GU120_CL_C4_Switch	"Ufficio"													<heating>			(GU120_CL_Switch)							{channel="modbus:data:c56dbfa4:switch"}	
+Number										Heating_GU120_CL_C4_Temp		"Temp Ufficio [%.1f °C]"					<temperature>	(GU120_CL_Temp)								{channel="modbus:data:3a7f6582:number"}	
+Number										Heating_GU120_CL_C4_Set			"Set Temp [%.1f °C]"							<heating>			(GU120_CL_Set)								{channel="modbus:data:f86b3601:number"}	
+Number										Heating_GU120_CL_C4_Fan			"Fan Speed"												<fan>					(GU120_CL_Fan)								{channel="modbus:data:c7e4e1e3:number"}	
+Switch										Heating_GU120_CL_C5_Switch	"Sala Riunioni"										<heating>			(GU120_CL_Switch)							{channel="modbus:data:02e9ec27:switch"}	
+Number										Heating_GU120_CL_C5_Temp		"Temp Sala Riunioni [%.1f °C]"		<temperature>	(GU120_CL_Temp)								{channel="modbus:data:f0f9e4a4:number"}	
+Number										Heating_GU120_CL_C5_Set			"Set Temp Riunioni [%.1f °C]"			<heating>			(GU120_CL_Set)								{channel="modbus:data:a775a678:number"}	
+Number										Heating_GU120_CL_C5_Fan			"Fan Speed"												<fan>					(GU120_CL_Fan)								{channel="modbus:data:9ad22980:number"}	
+Number										GU120_CL_Start              "Ora accensione"                  <time>				(GU120_CL)								
+Number										GU120_CL_Stop               "Ora spegnimento"                 <time>				(GU120_CL)											
 /*----------------------------------------------------------------------------*/
 
 
 /*---------------------- Elementi Netatmo ----------------------*/
-Group   GT_Netatmo          "Temp Media [%.1f °C]"      <temperature>
-Number  GT_NetatmoInt
-Number  GN_NET_ExtUff_Temp  "Temp Esterno Ufficio [%.1f °C]"      <temperature> (GT_Netatmo) {channel="netatmo:NAModule1:eb8cc662:02000012bbe0:Temperature"}
-Number  GN_NET_Server_Temp  "Temp Sala Server [%.1f °C]"          <temperature> (GT_Netatmo) {channel="netatmo:NAModule4:eb8cc662:03000002537a:Temperature"}
-Number  GN_NET_U120_Temp    "Temp Ufficio 120 [%.1f °C]"          <temperature> (GT_Netatmo) {channel="netatmo:NAMain:eb8cc662:70ee5012923e:Temperature"}
-Number  GN_NET_U100_Temp    "Temp Ufficio 100 [%.1f °C]"          <temperature> (GT_Netatmo) {channel="netatmo:NAModule4:eb8cc662:030000079324:Temperature"}
+Group											GT_Netatmo						"Temp Media [%.1f °C]"						<temperature>																							
+Group											GT_Netatmo_temp				"Temp Media [%.1f °C]"						<temperature>																							
+Group											GT_Netatmo_Co2				"CO2 Media"												<smoke>																										
+Group											GT_Netatmo_Noise			"Rumore Medio"										<soundvolume>																							
+Group											GT_Netatmo_Press			"Pressione Media"									<pressure>																								
+Group											GT_Netatmo_Hum				"Umidità Media"										<humidity>																								
+Number										GT_NetatmoInt																																																			
+Number										GN_NET_ExtUff_Temp		"Temp Esterno Ufficio [%.1f °C]"	<temperature>	(GT_Netatmo,GT_Netatmo_temp)							{channel="netatmo:NAModule1:eb8cc662:02000012bbe0:Temperature"}	
+Number										GN_NET_Server_Temp		"Temp Sala Server [%.1f °C]"			<temperature>	(GT_Netatmo,GT_Netatmo_temp)							{channel="netatmo:NAModule4:eb8cc662:03000002537a:Temperature"}	
+Number										GN_NET_U120_Temp			"Temp Ufficio 120 [%.1f °C]"			<temperature>	(GT_Netatmo,GT_Netatmo_temp)							{channel="netatmo:NAMain:eb8cc662:70ee5012923e:Temperature"}	
+Number										GN_NET_U100_Temp			"Temp Ufficio 100 [%.1f °C]"			<temperature>	(GT_Netatmo,GT_Netatmo_temp)							{channel="netatmo:NAModule4:eb8cc662:030000079324:Temperature"}	
+Number										GN_NET_SS_Co2					"Sala Server CO2"									<smoke>				(GT_Netatmo,GT_Netatmo_Co2)								{channel="netatmo:NAModule4:eb8cc662:03000002537a:Co2"}	
+Number										GN_NET_U120_Co2				"Ufficio 120 CO2"									<smoke>				(GT_Netatmo,GT_Netatmo_Co2)								{channel="netatmo:NAMain:eb8cc662:70ee5012923e:Co2"}	
+Number										GN_NET_U100_Co2				"Ufficio 100 CO2"									<smoke>				(GT_Netatmo,GT_Netatmo_Co2)								{channel="netatmo:NAModule4:eb8cc662:030000079324:Co2"}	
+Number										GN_NET_SS_Hum					"Sala Server Umidità"							<humidity>		(GT_Netatmo,GT_Netatmo_Hum)								{channel="netatmo:NAModule4:eb8cc662:03000002537a:Humidity"}	
+Number										GN_NET_U120_Hum				"Ufficio 120 Umidità"							<humidity>		(GT_Netatmo,GT_Netatmo_Hum)								{channel="netatmo:NAMain:eb8cc662:70ee5012923e:Humidity"}	
+Number										GN_NET_U100_Hum				"Ufficio 100 Umidità"							<humidity>		(GT_Netatmo,GT_Netatmo_Hum)								{channel="netatmo:NAModule4:eb8cc662:030000079324:Humidity"}	
+Number										GN_NET_SS_Noise				"Sala Server Rumore"							<soundvolume>	(GT_Netatmo,GT_Netatmo_Noise)							{channel="netatmo:NAModule4:eb8cc662:03000002537a:Noise"}	
+Number										GN_NET_U120_Noise			"Ufficio 120 Rumore"							<soundvolume>	(GT_Netatmo,GT_Netatmo_Noise)							{channel="netatmo:NAMain:eb8cc662:70ee5012923e:Noise"}	
+Number										GN_NET_U100_Noise			"Ufficio 100 Rumore"							<soundvolume>	(GT_Netatmo,GT_Netatmo_Noise)							{channel="netatmo:NAModule4:eb8cc662:030000079324:Noise"}	
+Number										GN_NET_SS_Press				"Sala Server Pressione"						<pressure>		(GT_Netatmo,GT_Netatmo_Press)							{channel="netatmo:NAModule4:eb8cc662:03000002537a:Pressure"}	
+Number										GN_NET_U120_Press			"Ufficio 120 Pressione"						<pressure>		(GT_Netatmo,GT_Netatmo_Press)							{channel="netatmo:NAMain:eb8cc662:70ee5012923e:Pressure"}	
+Number										GN_NET_U100_Press			"Ufficio 100 Pressione"						<pressure>		(GT_Netatmo,GT_Netatmo_Press)							{channel="netatmo:NAModule4:eb8cc662:030000079324:Pressure"}	
+
 /*----------------------------------------------------------------------------*/
 
 
 
 
 /*---------------------- Elementi Impianto Fotovoltaico Fronius ----------------------*/
-Number FronPacInt
-Number FronDayEnInt
-Number FronYearEnInt
-Number FronTotEnInt
+Number										FronPacInt																																																				
+Number										FronDayEnInt																																																			
+Number										FronYearEnInt																																																			
+Number										FronTotEnInt																																																			
 
 // Group gEN               "Energia"       <solarpanel>    ["Energia"]
 // Number gEN_RTime                   "Istantanea [%.0f W]"     (gEN)    {channel="fronius:powerinverter:6c4376a1:inverterdatachannelpac"}
@@ -76,24 +103,29 @@ Number FronTotEnInt
 /*---------------------- Elementi Networking ----------------------*/
 // Group gNet
 // Group gNet_print       "Printers"    <network>     (gNet)   ["Printers"]
-Number gNet_mobileChartSel
-
-Group:Switch:OR(ON, OFF)  gNet_mobile       "Presenze [(%d)]"    <network>  
+Number										gNet_mobileChartSel																																																
+Group:Switch:OR(ON, OFF)	gNet_mobile						"Presenze [(%d)]"									<network>																									
 
 // Group:Switch:OR(ON, OFF)  GU120_CL_Switch    "Clima Attivi [(%d)]"       <switch>
-Number                    gNet_Mobile_Sam  "Mobile Sam"  <network>     (gNet_mobile)   ["Mobile"] {channel="network:pingdevice:9f536b87:online"}
-
-Switch HV04 { channel="network:pingdevice:hv04:online" }
-Number:Time HV04ResponseTime { channel="network:pingdevice:hv04:latency" }
-Switch HV03 { channel="network:pingdevice:hv03:online" }
-Number:Time HV03ResponseTime { channel="network:pingdevice:hv03:latency" }
-
-String Speedtest_Running "Test running ... [%s]" {channel="network:speedtest:local:isRunning"}
-Number:Dimensionless Speedtest_Progress "Test progress [%d %unit%]"  {channel="network:speedtest:local:progress"}
-Number:DataTransferRate Speedtest_ResultDown "Downlink [%.2f %unit%]"  {channel="network:speedtest:local:rateDown"}
-Number:DataTransferRate Speedtest_ResultUp "Uplink [%.2f %unit%]" {channel="network:speedtest:local:rateUp"}
-DateTime Speedtest_Start "Test Start [%1$tH:%1$tM]" <time> {channel="network:speedtest:local:testStart"}
-DateTime Speedtest_LUD "Timestamp [%1$tH:%1$tM]" <time> {channel="network:speedtest:local:testEnd"}
+Number										gNet_Mobile_Sam				"Mobile Sam"											<network>			(gNet_mobile)									["Mobile"]	{channel="network:pingdevice:9f536b87:online"}	
+Switch										GW																																																							{ channel="network:pingdevice:gw:online" }	
+Number:Time								GWResponseTime																																																	{ channel="network:pingdevice:gw:latency" }	
+Switch										SW10G																																																						{ channel="network:pingdevice:sw10g:online" }	
+Number:Time								SW10GResponseTime																																																{ channel="network:pingdevice:sw10g:latency" }	
+Switch										Modem																																																						{ channel="network:pingdevice:modem:online" }	
+Number:Time								ModemResponseTime																																																{ channel="network:pingdevice:modem:latency" }	
+Switch										GDns																																																						{ channel="network:pingdevice:gdns:online" }	
+Number:Time								GDnsResponseTime																																																{ channel="network:pingdevice:gdns:latency" }	
+Switch										HV04																																																						{ channel="network:pingdevice:hv04:online" }	
+Number:Time								HV04ResponseTime																																																{ channel="network:pingdevice:hv04:latency" }	
+Switch										HV03																																																						{ channel="network:pingdevice:hv03:online" }	
+Number:Time								HV03ResponseTime																																																{ channel="network:pingdevice:hv03:latency" }	
+String										Speedtest_Running			"Test running ... [%s]"																																		{channel="network:speedtest:local:isRunning"}	
+Number:Dimensionless			Speedtest_Progress		"Test progress [%d %unit%]"																																{channel="network:speedtest:local:progress"}	
+Number:DataTransferRate		Speedtest_ResultDown	"Downlink [%.2f %unit%]"																																	{channel="network:speedtest:local:rateDown"}	
+Number:DataTransferRate		Speedtest_ResultUp		"Uplink [%.2f %unit%]"																																		{channel="network:speedtest:local:rateUp"}	
+DateTime									Speedtest_Start				"Test Start [%1$tH:%1$tM]"				<time>																									{channel="network:speedtest:local:testStart"}	
+DateTime									Speedtest_LUD					"Timestamp [%1$tH:%1$tM]"					<time>																									{channel="network:speedtest:local:testEnd"}	
 
 /*----------------------------------------------------------------------------*/
 
diff --git a/Seriate/persistence/rrd4j.persist b/Seriate/persistence/rrd4j.persist
index b33e761..e2c957b 100644
--- a/Seriate/persistence/rrd4j.persist
+++ b/Seriate/persistence/rrd4j.persist
@@ -20,7 +20,7 @@ Items {
     // gEN_YearProd  : strategy = everyDay, restoreOnStartup
     
     // persist items on every change and every minute
-    *: strategy = everyChange, everyMinute
+    *: strategy = everyChange, everyMinute, restoreOnStartup
 }
 
 // vim: syntax=Xtend
\ No newline at end of file
diff --git a/Seriate/rules/steamware.rules b/Seriate/rules/steamware.rules
index 56069a0..4b8e4a9 100644
--- a/Seriate/rules/steamware.rules
+++ b/Seriate/rules/steamware.rules
@@ -6,9 +6,36 @@ val Random random = new Random()
 // val urlList = newArrayList("https://www.fillmurray.com", "https://www.fillmurray.com/g",
 //                  "https://www.placecage.com", "https://www.placecage.com/c", "https://www.placecage.com/g")
 
-/***********************************
- * Rules x automazione CLIMA
- ***********************************/
+/**********************************************************************
+ * Rules x automazione CLIMA ALWAYS
+ **********************************************************************/
+rule "Spegnimento Clima sabato-domenica pomeriggio 14:00"
+when
+  Time  cron "0 0 14 * * SAT,SUN"
+then
+  Heating_GU120_CL_C1_Switch.sendCommand(OFF)
+  Heating_GU120_CL_C2_Switch.sendCommand(OFF)
+  Heating_GU120_CL_C3_Switch.sendCommand(OFF)
+  Heating_GU120_CL_C4_Switch.sendCommand(OFF)
+  Heating_GU120_CL_C5_Switch.sendCommand(OFF)
+end
+
+rule "Spegnimento Clima OGNI sera 20:00"
+when
+  Time  cron "0 0 20 * * ?"
+then
+  Heating_GU120_CL_C1_Switch.sendCommand(OFF)
+  Heating_GU120_CL_C2_Switch.sendCommand(OFF)
+  Heating_GU120_CL_C3_Switch.sendCommand(OFF)
+  Heating_GU120_CL_C4_Switch.sendCommand(OFF)
+  Heating_GU120_CL_C5_Switch.sendCommand(OFF)
+end
+/**********************************************************************/
+
+
+/**********************************************************************
+ * Rules x automazione CLIMA INVERNO
+ **********************************************************************/
 rule "Accensione Riscaldamento mattino 8:00 SE < 19°"
 when
   Time  cron "0 0 8 * JAN,FEB,NOV,DEC ?"
@@ -23,27 +50,73 @@ then
   }
 end
 
-rule "Spegnimento Riscaldamento sabato-domenica pomeriggio 14:00"
+rule "Accensione Riscaldamento mattino ingresso SAM in inverno"
 when
-  Time  cron "0 0 14 * JAN,FEB,NOV,DEC SAT,SUN"
+  Item gNet_Mobile_Sam changed to ON 
+  //and
+  //Time  cron "* * * * JAN,FEB,NOV,DEC ?"
 then
-  Heating_GU120_CL_C1_Switch.sendCommand(OFF)
-  Heating_GU120_CL_C2_Switch.sendCommand(OFF)
-  Heating_GU120_CL_C3_Switch.sendCommand(OFF)
-  Heating_GU120_CL_C4_Switch.sendCommand(OFF)
-  Heating_GU120_CL_C5_Switch.sendCommand(OFF)
+  // if (GU120_CL_Temp.state < 19)
+  // {
+    Heating_GU120_CL_C1_Switch.sendCommand(ON)
+    Heating_GU120_CL_C2_Switch.sendCommand(ON)
+    Heating_GU120_CL_C3_Switch.sendCommand(ON)
+    Heating_GU120_CL_C4_Switch.sendCommand(ON)
+    // Heating_GU120_CL_C5_Switch.sendCommand(ON)
+  // }
 end
 
-rule "Spegnimento Riscaldamento OGNI sera 19:30"
-when
-  Time  cron "0 30 19 * JAN,FEB,NOV,DEC ?"
-then
-  Heating_GU120_CL_C1_Switch.sendCommand(OFF)
-  Heating_GU120_CL_C2_Switch.sendCommand(OFF)
-  Heating_GU120_CL_C3_Switch.sendCommand(OFF)
-  Heating_GU120_CL_C4_Switch.sendCommand(OFF)
-  Heating_GU120_CL_C5_Switch.sendCommand(OFF)
-end
+
+// rule "Accendo tutti se accendo 1 con meno di 21°"
+// when
+//   Item Heating_GU120_CL_C1_Switch received command ON
+// then
+//     // if (GU120_CL_Temp.state < 21)
+//     // {
+//     // if (GU120_CL_Switch.state == ON)
+//     // {
+//         Heating_GU120_CL_C1_Switch.sendCommand(OFF)
+//         Heating_GU120_CL_C2_Switch.sendCommand(OFF)
+//         Heating_GU120_CL_C3_Switch.sendCommand(OFF)
+//         Heating_GU120_CL_C4_Switch.sendCommand(OFF)
+//         Heating_GU120_CL_C5_Switch.sendCommand(OFF)
+//     // }
+//     // }
+// end
+/**********************************************************************/
+
+
+/**********************************************************************
+ * Rules x automazione CLIMA ESTATE
+ **********************************************************************/
+// rule "Accensione Riscaldamento mattino 8:00 SE > 22°"
+// when
+//   Time  cron "0 0 8 * MAY,JUN,JUL,AUG ?"
+// then
+//   if (GU120_CL_Temp.state > 22)
+//   {
+//     Heating_GU120_CL_C1_Switch.sendCommand(ON)
+//     Heating_GU120_CL_C2_Switch.sendCommand(ON)
+//     Heating_GU120_CL_C3_Switch.sendCommand(ON)
+//     Heating_GU120_CL_C4_Switch.sendCommand(ON)
+//     Heating_GU120_CL_C5_Switch.sendCommand(ON)
+//   }
+// end
+
+// rule "Accendo tutti se accendo 1 con oltre 23°"
+// when
+//   Item GU120_CL_Switch received command ON
+// then
+//     if (GU120_CL_Temp.state > 23)
+//     {
+//         Heating_GU120_CL_C1_Switch.sendCommand(ON)
+//         Heating_GU120_CL_C2_Switch.sendCommand(ON)
+//         Heating_GU120_CL_C3_Switch.sendCommand(ON)
+//         Heating_GU120_CL_C4_Switch.sendCommand(ON)
+//         Heating_GU120_CL_C5_Switch.sendCommand(ON)
+//     }
+// end
+/**********************************************************************/
 
 // rule "Test cron Riscaldamento ufficio"
 // when
@@ -52,19 +125,6 @@ end
 //   Heating_GU120_CL_C4_Switch.sendCommand(ON)
 // end
 
-rule "Accendo 2-3 se accendo 1 con meno di 21°"
-when
-  Item Heating_GU120_CL_C1_Switch received command ON
-then
-    if (GU120_CL_Temp.state < 21)
-    {
-        // Heating_GU120_CL_C1_Switch.sendCommand(ON)
-        Heating_GU120_CL_C2_Switch.sendCommand(ON)
-        Heating_GU120_CL_C3_Switch.sendCommand(ON)
-        // Heating_GU120_CL_C4_Switch.sendCommand(ON)
-        // Heating_GU120_CL_C5_Switch.sendCommand(ON)
-    }
-end
 
 
 /**
diff --git a/Seriate/services/rrd4j.cfg b/Seriate/services/rrd4j.cfg
index 0a599be..cb936ff 100644
--- a/Seriate/services/rrd4j.cfg
+++ b/Seriate/services/rrd4j.cfg
@@ -24,7 +24,7 @@
 
 defaultNumeric.def=GAUGE,60,U,U,60
 defaultNumeric.archives=AVERAGE,0.5,1,480:AVERAGE,0.5,4,360:AVERAGE,0.5,14,644:AVERAGE,0.5,60,720:AVERAGE,0.5,720,730:AVERAGE,0.5,10080,520
-defaultNumeric.items=netatmo*,modbus*,fronius*,Heating*,gEN*,GU*,,network*
+defaultNumeric.items=netatmo*,modbus*,fronius*,Heating*,gEN*,GU*,network*,GT*,GN_NET*,Speedtest*,*
 # defaultNumeric.items=*Temperatura,Ufficio*,*Esterno,gEN_RTime
 
 # val24h.def=GAUGE,900,0,U,60
diff --git a/Seriate/sitemaps/steamware.sitemap b/Seriate/sitemaps/steamware.sitemap
index 906c923..3f91a75 100644
--- a/Seriate/sitemaps/steamware.sitemap
+++ b/Seriate/sitemaps/steamware.sitemap
@@ -1,125 +1,159 @@
 sitemap Steamware label="Steamware"
 {
-  Frame label="Climatizzazione Ufficio 120" {
-    Group item=GU120_CL_Temp label="Temp. Media"
+  Frame label="Climatizzazione Ufficio 120" 
+  {  
+    Group item=GU120_CL_Temp label="Temperatura (Media)"
+    {
+      Group item=GU120_CL_Temp label="Temperatura (Media)"
+      Text label="Andamento" icon="line"
+      { 
+        Frame label="Temperature Rilevate"
+        {
+          Switch item=GU120_CL_TempInt label="Periodo" icon="line" mappings=[0="24h", 1="7g", 2="1M", 3="1Y"]         
+          Chart item=GU120_CL_Temp legend=true visibility=[GU120_CL_TempInt==0,GU120_CL_TempInt=="Uninitialized"] period=D refresh=30000
+          Chart item=GU120_CL_Temp legend=true visibility=[GU120_CL_TempInt==1] period=W refresh=600000
+          Chart item=GU120_CL_Temp legend=true visibility=[GU120_CL_TempInt==2] period=M refresh=6000000
+          Chart item=GU120_CL_Temp legend=true visibility=[GU120_CL_TempInt==3] period=Y refresh=6000000
+        }
+      }
+    }
+    Group item=GU120_CL_Switch label="Unità Attive"
+    {
+      Switch item=GU120_CL_Switch label="Generale"
+      Switch item=Heating_GU120_CL_C1_Switch
+      Switch item=Heating_GU120_CL_C2_Switch
+      Switch item=Heating_GU120_CL_C3_Switch
+      Switch item=Heating_GU120_CL_C4_Switch
+      Switch item=Heating_GU120_CL_C5_Switch
+    }
     
-    Group item=GU120_CL_Switch
-    Group item=GU120_CL_Set
+    Text label="Impostazioni" icon="humidity"
     {
-      Setpoint item=Heating_GU120_CL_C1_Set  minValue=18 maxValue=26 step=1 label="Impostazione Ingresso"
-      Setpoint item=Heating_GU120_CL_C2_Set  minValue=18 maxValue=26 step=1 label="Impostazione Corridoio"
-      Setpoint item=Heating_GU120_CL_C3_Set  minValue=18 maxValue=26 step=1 label="Impostazione Finestra"
-      Setpoint item=Heating_GU120_CL_C4_Set  minValue=18 maxValue=26 step=1 label="Impostazione Ufficio"
-      Setpoint item=Heating_GU120_CL_C5_Set  minValue=18 maxValue=26 step=1 label="Impostazione Sala"
+      Group item=GU120_CL_Set label="Set Temperature"
+      {
+        Setpoint item=Heating_GU120_CL_C1_Set  minValue=18 maxValue=26 step=1 label="Impostazione Ingresso"
+        Setpoint item=Heating_GU120_CL_C2_Set  minValue=18 maxValue=26 step=1 label="Impostazione Corridoio"
+        Setpoint item=Heating_GU120_CL_C3_Set  minValue=18 maxValue=26 step=1 label="Impostazione Finestra"
+        Setpoint item=Heating_GU120_CL_C4_Set  minValue=18 maxValue=26 step=1 label="Impostazione Ufficio"
+        Setpoint item=Heating_GU120_CL_C5_Set  minValue=18 maxValue=26 step=1 label="Impostazione Sala"
+      }
+      Group item=GU120_CL_Fan label="Set Velocità"
+      {
+        Setpoint item=Heating_GU120_CL_C1_Fan  minValue=1 maxValue=3 step=1 label="Fan Ingresso"
+        Setpoint item=Heating_GU120_CL_C2_Fan  minValue=1 maxValue=3 step=1 label="Fan Corridoio"
+        Setpoint item=Heating_GU120_CL_C3_Fan  minValue=1 maxValue=3 step=1 label="Fan Finestra"
+        Setpoint item=Heating_GU120_CL_C4_Fan  minValue=1 maxValue=3 step=1 label="Fan Ufficio"
+        Setpoint item=Heating_GU120_CL_C5_Fan  minValue=1 maxValue=3 step=1 label="Fan Sala"
+      }
+      // Text label="Controllo Singolo" icon="heating"
+      // {
+        Text item=Heating_GU120_CL_C1_Switch label="Clima Ingresso"
+        {
+          Switch    item=Heating_GU120_CL_C1_Switch
+          Text      item=Heating_GU120_CL_C1_Temp
+          {
+            Switch item=GU120_CL_TempInt label="Periodo" icon="line" mappings=[0="24h", 1="7g", 2="1M", 3="1Y"]   
+            Chart item=Heating_GU120_CL_C1_Temp legend=true visibility=[GU120_CL_TempInt==0,GU120_CL_TempInt=="Uninitialized"] period=D refresh=30000
+            Chart item=Heating_GU120_CL_C1_Temp legend=true visibility=[GU120_CL_TempInt==1] period=W refresh=600000
+            Chart item=Heating_GU120_CL_C1_Temp legend=true visibility=[GU120_CL_TempInt==2] period=M refresh=6000000
+            Chart item=Heating_GU120_CL_C1_Temp legend=true visibility=[GU120_CL_TempInt==3] period=Y refresh=6000000
+          }
+          Setpoint  item=Heating_GU120_CL_C1_Set  minValue=18 maxValue=26 step=1 label="Impostazione Ingresso"
+        }
+        Text item=Heating_GU120_CL_C1_Switch label="Clima Corridoio"
+        {
+          Switch    item=Heating_GU120_CL_C2_Switch
+          Text      item=Heating_GU120_CL_C2_Temp
+          {
+            Switch item=GU120_CL_TempInt label="Periodo" icon="line" mappings=[0="24h", 1="7g", 2="1M", 3="1Y"]   
+            Chart item=Heating_GU120_CL_C2_Temp legend=true visibility=[GU120_CL_TempInt==0,GU120_CL_TempInt=="Uninitialized"] period=D refresh=30000
+            Chart item=Heating_GU120_CL_C2_Temp legend=true visibility=[GU120_CL_TempInt==1] period=W refresh=600000
+            Chart item=Heating_GU120_CL_C2_Temp legend=true visibility=[GU120_CL_TempInt==2] period=M refresh=6000000
+            Chart item=Heating_GU120_CL_C2_Temp legend=true visibility=[GU120_CL_TempInt==3] period=Y refresh=6000000
+          }
+          Setpoint  item=Heating_GU120_CL_C2_Set  minValue=18 maxValue=26 step=1 label="Impostazione Corridoio"
+        }
+        Text item=Heating_GU120_CL_C1_Switch label="Clima Finestra"
+        {
+          Switch    item=Heating_GU120_CL_C3_Switch
+          Text      item=Heating_GU120_CL_C3_Temp
+          {
+            Switch item=GU120_CL_TempInt label="Periodo" icon="line" mappings=[0="24h", 1="7g", 2="1M", 3="1Y"]   
+            Chart item=Heating_GU120_CL_C3_Temp legend=true visibility=[GU120_CL_TempInt==0,GU120_CL_TempInt=="Uninitialized"] period=D refresh=30000
+            Chart item=Heating_GU120_CL_C3_Temp legend=true visibility=[GU120_CL_TempInt==1] period=W refresh=600000
+            Chart item=Heating_GU120_CL_C3_Temp legend=true visibility=[GU120_CL_TempInt==2] period=M refresh=6000000
+            Chart item=Heating_GU120_CL_C3_Temp legend=true visibility=[GU120_CL_TempInt==3] period=Y refresh=6000000
+          }
+          Setpoint  item=Heating_GU120_CL_C3_Set  minValue=18 maxValue=26 step=1 label="Impostazione Finestra"
+        }
+        Text item=Heating_GU120_CL_C1_Switch label="Clima Ufficio"
+        {
+          Switch    item=Heating_GU120_CL_C4_Switch
+          Text      item=Heating_GU120_CL_C4_Temp
+          {
+            Switch item=GU120_CL_TempInt label="Periodo" icon="line" mappings=[0="24h", 1="7g", 2="1M", 3="1Y"]   
+            Chart item=Heating_GU120_CL_C4_Temp legend=true visibility=[GU120_CL_TempInt==0,GU120_CL_TempInt=="Uninitialized"] period=D refresh=30000
+            Chart item=Heating_GU120_CL_C4_Temp legend=true visibility=[GU120_CL_TempInt==1] period=W refresh=600000
+            Chart item=Heating_GU120_CL_C4_Temp legend=true visibility=[GU120_CL_TempInt==2] period=M refresh=6000000
+            Chart item=Heating_GU120_CL_C4_Temp legend=true visibility=[GU120_CL_TempInt==3] period=Y refresh=6000000
+          }
+          Setpoint  item=Heating_GU120_CL_C4_Set  minValue=18 maxValue=26 step=1 label="Impostazione Ufficio"
+        }
+        Text item=Heating_GU120_CL_C1_Switch label="Clima Sala"
+        {
+          Switch    item=Heating_GU120_CL_C5_Switch
+          Text      item=Heating_GU120_CL_C5_Temp
+          {
+            Switch item=GU120_CL_TempInt label="Periodo" icon="line" mappings=[0="24h", 1="7g", 2="1M", 3="1Y"]   
+            Chart item=Heating_GU120_CL_C5_Temp legend=true visibility=[GU120_CL_TempInt==0,GU120_CL_TempInt=="Uninitialized"] period=D refresh=30000
+            Chart item=Heating_GU120_CL_C5_Temp legend=true visibility=[GU120_CL_TempInt==1] period=W refresh=600000
+            Chart item=Heating_GU120_CL_C5_Temp legend=true visibility=[GU120_CL_TempInt==2] period=M refresh=6000000
+            Chart item=Heating_GU120_CL_C5_Temp legend=true visibility=[GU120_CL_TempInt==3] period=Y refresh=6000000
+          }
+          Setpoint  item=Heating_GU120_CL_C5_Set  minValue=18 maxValue=26 step=1 label="Impostazione Sala"
+        }
+      // }
     }
-    Text label="Controllo Unità" icon="heating"
+    Text label="Ricambio Aria" icon="flow"
     {
-      Text item=Heating_GU120_CL_C1_Switch label="Clima Ingresso"
-      {
-        Switch    item=Heating_GU120_CL_C1_Switch
-        Text      item=Heating_GU120_CL_C1_Temp
-        {
-          Text label="24h" icon="line"
-          Chart item=Heating_GU120_CL_C1_Temp legend=true period=D refresh=30000
-          Text label="7gg" icon="line"
-          Chart item=Heating_GU120_CL_C1_Temp legend=true period=W refresh=600000
-          Text label="30gg" icon="line"
-          Chart item=Heating_GU120_CL_C1_Temp legend=true period=M refresh=6000000
-        }
-        Setpoint  item=Heating_GU120_CL_C1_Set  minValue=18 maxValue=26 step=1 label="Impostazione Ingresso"
-      }
-      Text item=Heating_GU120_CL_C1_Switch label="Clima Corridoio"
-      {
-        Switch    item=Heating_GU120_CL_C2_Switch
-        Text      item=Heating_GU120_CL_C2_Temp
-        {
-          Text label="24h" icon="line"
-          Chart item=Heating_GU120_CL_C2_Temp legend=true period=D refresh=30000
-          Text label="7gg" icon="line"
-          Chart item=Heating_GU120_CL_C2_Temp legend=true period=W refresh=600000
-          Text label="30gg" icon="line"
-          Chart item=Heating_GU120_CL_C2_Temp legend=true period=M refresh=6000000
-        }
-        Setpoint  item=Heating_GU120_CL_C2_Set  minValue=18 maxValue=26 step=1 label="Impostazione Corridoio"
-      }
-      Text item=Heating_GU120_CL_C1_Switch label="Clima Finestra"
-      {
-        Switch    item=Heating_GU120_CL_C3_Switch
-        Text      item=Heating_GU120_CL_C3_Temp
-        {
-          Text label="24h" icon="line"
-          Chart item=Heating_GU120_CL_C3_Temp legend=true period=D refresh=30000
-          Text label="7gg" icon="line"
-          Chart item=Heating_GU120_CL_C3_Temp legend=true period=W refresh=600000
-          Text label="30gg" icon="line"
-          Chart item=Heating_GU120_CL_C3_Temp legend=true period=M refresh=6000000
-        }
-        Setpoint  item=Heating_GU120_CL_C3_Set  minValue=18 maxValue=26 step=1 label="Impostazione Finestra"
-      }
-      Text item=Heating_GU120_CL_C1_Switch label="Clima Ufficio"
-      {
-        Switch    item=Heating_GU120_CL_C4_Switch
-        Text      item=Heating_GU120_CL_C4_Temp
-        {
-          Text label="24h" icon="line"
-          Chart item=Heating_GU120_CL_C4_Temp legend=true period=D refresh=30000
-          Text label="7gg" icon="line"
-          Chart item=Heating_GU120_CL_C4_Temp legend=true period=W refresh=600000
-          Text label="30gg" icon="line"
-          Chart item=Heating_GU120_CL_C4_Temp legend=true period=M refresh=6000000
-        }
-        Setpoint  item=Heating_GU120_CL_C4_Set  minValue=18 maxValue=26 step=1 label="Impostazione Ufficio"
-      }
-      Text item=Heating_GU120_CL_C1_Switch label="Clima Sala"
-      {
-        Switch    item=Heating_GU120_CL_C5_Switch
-        Text      item=Heating_GU120_CL_C5_Temp
-        {
-          Text label="24h" icon="line"
-          Chart item=Heating_GU120_CL_C5_Temp legend=true period=D refresh=30000
-          Text label="7gg" icon="line"
-          Chart item=Heating_GU120_CL_C5_Temp legend=true period=W refresh=600000
-          Text label="30gg" icon="line"
-          Chart item=Heating_GU120_CL_C5_Temp legend=true period=M refresh=6000000
-        }
-        Setpoint  item=Heating_GU120_CL_C5_Set  minValue=18 maxValue=26 step=1 label="Impostazione Sala"
-      }
+      Text label="Da integrare con sonoff/MQTT"  icon="flow"
     }
-    Text label="Andamento" icon="line"
+    Text label="Grafici" icon="line"
     { 
-      Frame label="Temperature Rilevate"
+      Text label="Andamento" icon="line"
+      { 
+        Frame label="Temperature Rilevate"
+        {
+          Switch item=GU120_CL_TempInt label="Periodo" icon="line" mappings=[0="24h", 1="7g", 2="1M", 3="1Y"]         
+          Chart item=GU120_CL_Temp legend=true visibility=[GU120_CL_TempInt==0,GU120_CL_TempInt=="Uninitialized"] period=D refresh=30000
+          Chart item=GU120_CL_Temp legend=true visibility=[GU120_CL_TempInt==1] period=W refresh=600000
+          Chart item=GU120_CL_Temp legend=true visibility=[GU120_CL_TempInt==2] period=M refresh=6000000
+          Chart item=GU120_CL_Temp legend=true visibility=[GU120_CL_TempInt==3] period=Y refresh=6000000
+        }
+      }
+      Text label="Unità Attive" icon="switch"
+      { 
+        Frame label="Unità Attive" icon="switch"
+        {
+          Switch item=GU120_CL_TempInt label="Periodo" icon="line" mappings=[0="12h", 1="24h", 2="7g", 3="1M"]         
+          Chart item=GU120_CL_Switch legend=true visibility=[GU120_CL_TempInt==0,GU120_CL_TempInt=="Uninitialized"] period=12h refresh=30000
+          Chart item=GU120_CL_Switch legend=true visibility=[GU120_CL_TempInt==1] period=D refresh=30000
+          Chart item=GU120_CL_Switch legend=true visibility=[GU120_CL_TempInt==2] period=W refresh=600000
+          Chart item=GU120_CL_Switch legend=true visibility=[GU120_CL_TempInt==3] period=M refresh=6000000
+        }
+      }
+
+      
+      Text label="Ricambio Aria Attivo" icon="flow"
       {
-        Switch item=GU120_CL_TempInt label="Periodo" icon="line" mappings=[0="24h", 1="7g", 2="1M", 3="1Y"]         
-        Chart item=GU120_CL_Temp legend=true visibility=[GU120_CL_TempInt==0,GU120_CL_TempInt=="Uninitialized"] period=D refresh=30000
-        Chart item=GU120_CL_Temp legend=true visibility=[GU120_CL_TempInt==1] period=W refresh=600000
-        Chart item=GU120_CL_Temp legend=true visibility=[GU120_CL_TempInt==2] period=M refresh=6000000
-        Chart item=GU120_CL_Temp legend=true visibility=[GU120_CL_TempInt==3] period=Y refresh=6000000
+        Text label="Da integrare con sonoff/MQTT"  icon="flow"
       }
     }
-
     // Switch item=Lights icon="light"
     // Text item=LR_Multimedia_Summary label="Multimedia [%s]" icon="video" {
     //     Selection item=LR_TV_Channel mappings=[0="off", 1="DasErste", 2="BBC One", 3="Cartoon Network"]
     //     Slider item=LR_TV_Volume
     // }
-  }
-  Frame label="Netatmo" 
-  {
-    Group item=GT_Netatmo label="Temperature Rilevate []"
-    Text label="Andamento" icon="line"
-    { 
-      Frame label="Temperature Rilevate"
-      {
-        Switch item=GT_NetatmoInt label="Periodo" icon="line" mappings=[0="12h", 1="24h", 2="48h", 3="7g", 4="1M"]         
-        // Switch item=GT_NetatmoInt label="Periodo" icon="line" mappings=[0="12h", 1="24h", 2="48h", 3="7g", 4="1M", 5="1Y"]    
-        Chart item=GT_Netatmo legend=true visibility=[GT_NetatmoInt==0,GT_NetatmoInt=="Uninitialized"] period=12h refresh=30000
-        Chart item=GT_Netatmo legend=true visibility=[GT_NetatmoInt==1] period=D refresh=30000
-        Chart item=GT_Netatmo legend=true visibility=[GT_NetatmoInt==2] period=2D refresh=30000
-        Chart item=GT_Netatmo legend=true visibility=[GT_NetatmoInt==3] period=W refresh=600000
-        Chart item=GT_Netatmo legend=true visibility=[GT_NetatmoInt==4] period=M refresh=6000000
-        // Chart item=GT_Netatmo legend=true visibility=[GT_NetatmoInt==5] period=Y refresh=6000000
-      }
-    }
   }
 	Frame label="Energia" 
 	{
@@ -165,7 +199,7 @@ sitemap Steamware label="Steamware"
         {
           Frame label="Produzione Annuale"
           {
-            Switch  item=FronYearEnInt label="Periodo" icon="line" mappings=[0="7g", 1="1M", 2="2M", 3="1Y"]
+            Switch  item=FronTotEnInt label="Periodo" icon="line" mappings=[0="7g", 1="1M", 2="2M", 3="1Y"]
             Chart item=fronius_powerinverter_6c4376a1_inverterdatachanneltotal visibility=[FronTotEnInt==0, FronTotEnInt=="Uninitialized"] legend=true period=W refresh=1000
             Chart item=fronius_powerinverter_6c4376a1_inverterdatachanneltotal visibility=[FronTotEnInt==1] legend=true period=M refresh=10000
             Chart item=fronius_powerinverter_6c4376a1_inverterdatachanneltotal visibility=[FronTotEnInt==2] legend=true period=2M refresh=10000
@@ -177,13 +211,98 @@ sitemap Steamware label="Steamware"
       }
     Text item=Lights label="Luci" icon="lightbulb"
     {
-  		Group item=Lights               label="Luci" icon="light"
+  		// Group item=Lights               label="Luci" icon="light"
+      Text label="Da integrare con sonoff/MQTT"  icon="light"
     }
     Text item=Shutters label="Tende" icon="blinds"
     {
-  		Group item=Shutters             label="Tende" icon="blinds"
+  		// Group item=Shutters             label="Tende" icon="blinds"
+      Text label="Da integrare con ikea / zigbee"  icon="blinds"
     }
 	}
+  Frame label="Meteo" 
+  {
+    Text item=Stagione icon="time"
+    Text item=openweathermap_weather_and_forecast_48a7dcf6_local_current_condition label="Meteo Attuale"
+    {
+        Frame label="Meteo Attuale"
+        {
+          Text item=openweathermap_weather_and_forecast_48a7dcf6_local_current_condition
+          Text item=openweathermap_weather_and_forecast_48a7dcf6_local_current_temperature 
+          Text item=openweathermap_weather_and_forecast_48a7dcf6_local_current_humidity 
+          Text item=openweathermap_weather_and_forecast_48a7dcf6_local_current_pressure
+          Text item=openweathermap_weather_and_forecast_48a7dcf6_local_current_wind_direction
+          Text item=openweathermap_weather_and_forecast_48a7dcf6_local_current_wind_speed
+          Text item=openweathermap_weather_and_forecast_48a7dcf6_local_current_rain
+          Text item=openweathermap_weather_and_forecast_48a7dcf6_local_current_snow
+        }
+    }
+    Text item=openweathermap_weather_and_forecast_48a7dcf6_local_forecastHours03_condition label="Previsioni 3h" 
+    {
+        Frame label="Previsioni 3h"
+        {
+          Text item=openweathermap_weather_and_forecast_48a7dcf6_local_forecastHours03_condition
+          Text item=openweathermap_weather_and_forecast_48a7dcf6_local_forecastHours03_temperature 
+          Text item=openweathermap_weather_and_forecast_48a7dcf6_local_forecastHours03_humidity 
+          Text item=openweathermap_weather_and_forecast_48a7dcf6_local_forecastHours03_pressure
+          Text item=openweathermap_weather_and_forecast_48a7dcf6_local_forecastHours03_wind_direction
+          Text item=openweathermap_weather_and_forecast_48a7dcf6_local_forecastHours03_wind_speed
+          Text item=openweathermap_weather_and_forecast_48a7dcf6_local_forecastHours03_rain
+          Text item=openweathermap_weather_and_forecast_48a7dcf6_local_forecastHours03_snow
+        }
+      //    Setpoint item=GU120_CL_Start   minValue=0 maxValue=23 step=1 label="Ora Avvio"
+      //    Setpoint item=GU120_CL_Stop    minValue=0 maxValue=23 step=1 label="Ora Spegnimento"
+    }
+    Group item=GT_Netatmo label="Rilievi Netatmo"
+    Text label="Andamento Netatmo" icon="line"
+    { 
+      Frame label="Temperature Rilevate"
+      {
+        Switch item=GT_NetatmoInt label="Periodo" icon="line" mappings=[0="12h", 1="24h", 2="2g", 3="7g", 4="1M"]        
+        Chart item=GT_Netatmo_temp legend=true visibility=[GT_NetatmoInt==0,GT_NetatmoInt=="Uninitialized"] period=12h refresh=30000
+        Chart item=GT_Netatmo_temp legend=true visibility=[GT_NetatmoInt==1] period=D refresh=30000
+        Chart item=GT_Netatmo_temp legend=true visibility=[GT_NetatmoInt==2] period=2D refresh=30000
+        Chart item=GT_Netatmo_temp legend=true visibility=[GT_NetatmoInt==3] period=W refresh=600000
+        Chart item=GT_Netatmo_temp legend=true visibility=[GT_NetatmoInt==4] period=M refresh=6000000
+      }
+      Frame label="CO2 Rilevata"
+      {
+        // Switch item=GT_NetatmoInt label="Periodo" icon="line" mappings=[0="12h", 1="24h", 2="2g", 3="7g", 4="1M"]        
+        Chart item=GT_Netatmo_Co2 legend=true visibility=[GT_NetatmoInt==0,GT_NetatmoInt=="Uninitialized"] period=12h refresh=30000
+        Chart item=GT_Netatmo_Co2 legend=true visibility=[GT_NetatmoInt==1] period=D refresh=30000
+        Chart item=GT_Netatmo_Co2 legend=true visibility=[GT_NetatmoInt==2] period=2D refresh=30000
+        Chart item=GT_Netatmo_Co2 legend=true visibility=[GT_NetatmoInt==3] period=W refresh=600000
+        Chart item=GT_Netatmo_Co2 legend=true visibility=[GT_NetatmoInt==4] period=M refresh=6000000
+      }
+      Frame label="Rumore Rilevato"
+      {
+        // Switch item=GT_NetatmoInt label="Periodo" icon="line" mappings=[0="12h", 1="24h", 2="2g", 3="7g", 4="1M"]        
+        Chart item=GT_Netatmo_Noise legend=true visibility=[GT_NetatmoInt==0,GT_NetatmoInt=="Uninitialized"] period=12h refresh=30000
+        Chart item=GT_Netatmo_Noise legend=true visibility=[GT_NetatmoInt==1] period=D refresh=30000
+        Chart item=GT_Netatmo_Noise legend=true visibility=[GT_NetatmoInt==2] period=2D refresh=30000
+        Chart item=GT_Netatmo_Noise legend=true visibility=[GT_NetatmoInt==3] period=W refresh=600000
+        Chart item=GT_Netatmo_Noise legend=true visibility=[GT_NetatmoInt==4] period=M refresh=6000000
+      }
+      Frame label="Pressione Rilevata"
+      {
+        // Switch item=GT_NetatmoInt label="Periodo" icon="line" mappings=[0="12h", 1="24h", 2="2g", 3="7g", 4="1M"]        
+        Chart item=GT_Netatmo_Press legend=true visibility=[GT_NetatmoInt==0,GT_NetatmoInt=="Uninitialized"] period=12h refresh=30000
+        Chart item=GT_Netatmo_Press legend=true visibility=[GT_NetatmoInt==1] period=D refresh=30000
+        Chart item=GT_Netatmo_Press legend=true visibility=[GT_NetatmoInt==2] period=2D refresh=30000
+        Chart item=GT_Netatmo_Press legend=true visibility=[GT_NetatmoInt==3] period=W refresh=600000
+        Chart item=GT_Netatmo_Press legend=true visibility=[GT_NetatmoInt==4] period=M refresh=6000000
+      }
+      Frame label="Umidità Rilevata"
+      {
+        // Switch item=GT_NetatmoInt label="Periodo" icon="line" mappings=[0="12h", 1="24h", 2="2g", 3="7g", 4="1M"]        
+        Chart item=GT_Netatmo_Hum legend=true visibility=[GT_NetatmoInt==0,GT_NetatmoInt=="Uninitialized"] period=12h refresh=30000
+        Chart item=GT_Netatmo_Hum legend=true visibility=[GT_NetatmoInt==1] period=D refresh=30000
+        Chart item=GT_Netatmo_Hum legend=true visibility=[GT_NetatmoInt==2] period=2D refresh=30000
+        Chart item=GT_Netatmo_Hum legend=true visibility=[GT_NetatmoInt==3] period=W refresh=600000
+        Chart item=GT_Netatmo_Hum legend=true visibility=[GT_NetatmoInt==4] period=M refresh=6000000
+      }
+    }
+  }
 	Frame label="Network" 
 	{
 		// Group item=gNet_Mobile label="Presenze [(%d)]" icon="network"
@@ -201,9 +320,20 @@ sitemap Steamware label="Steamware"
         Chart item=gNet_Mobile_Sam visibility=[gNet_mobileChartSel==3] legend=true period=2M refresh=600000
       }
     } 
-    Text label="Servers"
+    Text label="Rete e Servers"
     {
-      Frame
+      Frame label="Apparati"
+      {
+        Text item=SW10G label="SW10G [%s]"
+        Text item=SW10GResponseTime label="SW10G ping Response Time [%s]"
+        Text item=GW label="GW [%s]"
+        Text item=GWResponseTime label="GW ping Response Time [%s]"
+        Text item=Modem label="Modem [%s]"
+        Text item=ModemResponseTime label="Modem ping Response Time [%s]"
+        Text item=GDns label="GDns [%s]"
+        Text item=GDnsResponseTime label="GDns ping Response Time [%s]"
+      }
+      Frame label="Servers"
       {
         Text item=HV03 label="HV03 [%s]"
         Text item=HV03ResponseTime label="HV03 ping Response Time [%s]"
diff --git a/Seriate/things/steamware.things b/Seriate/things/steamware.things
index bb478c2..19a6029 100644
--- a/Seriate/things/steamware.things
+++ b/Seriate/things/steamware.things
@@ -5,6 +5,10 @@
 
 // ntp:ntp:demo    [ hostname="it.pool.ntp.org", refreshInterval=60, refreshNtp=30 ]
 
+Thing network:pingdevice:sw10g [ hostname="10.74.82.10" ]
+Thing network:pingdevice:gw [ hostname="10.74.82.253" ]
+Thing network:pingdevice:modem [ hostname="192.168.0.254" ]
+Thing network:pingdevice:gdns [ hostname="8.8.8.8" ]
 Thing network:pingdevice:hv03 [ hostname="10.74.82.243" ]
 Thing network:pingdevice:hv04 [ hostname="10.74.82.244" ]
 Thing network:speedtest:local "SpeedTest 50Mo" @ "Internet" [url="https://bouygues.testdebit.info/", fileName="50M.iso"]
diff --git a/Seriate/transform/it.map b/Seriate/transform/it.map
new file mode 100644
index 0000000..51cc4f7
--- /dev/null
+++ b/Seriate/transform/it.map
@@ -0,0 +1,7 @@
+CLOSED=chiuso
+OPEN=aperto
+NULL=nullo
+AUTUMN=AUTUNNO
+WINTER=INVERNO
+SPRING=PRIMAVERA
+SUMMER=ESTATE