From a12dc9df1274bfb81ec0d636934f2ee493eab67b Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Thu, 5 Dec 2019 19:12:08 +0100 Subject: [PATCH] Update varie regole + rules a tempo... --- Seriate/items/steamware.items | 73 +++++++--- Seriate/persistence/rrd4j.persist | 3 +- Seriate/rules/demo.rules_old | 164 +++++++++++++++++++++ Seriate/rules/steamware.rules | 225 +++++++++++++++++++++++++++++ Seriate/scripts/steamware.script | 3 + Seriate/services/dashboard.cfg | 1 + Seriate/services/influxdb.cfg | 5 + Seriate/services/network.cfg | 4 + Seriate/sitemaps/steamware.sitemap | 193 +++++++++++++++++-------- Seriate/things/steamware.things | 4 + 10 files changed, 592 insertions(+), 83 deletions(-) create mode 100644 Seriate/rules/demo.rules_old create mode 100644 Seriate/rules/steamware.rules create mode 100644 Seriate/scripts/steamware.script create mode 100644 Seriate/services/network.cfg diff --git a/Seriate/items/steamware.items b/Seriate/items/steamware.items index 71f8af3..f593001 100644 --- a/Seriate/items/steamware.items +++ b/Seriate/items/steamware.items @@ -2,28 +2,23 @@ // Group gC "Cellar" ["Basement"] // Group Garden "Garden" ["Garden"] // Group Weather "Weather" - -Group gEN "Energia" ["Energia"] Group Status Group Shutters Group Lights -/* Gruppi Attivi per calcolo */ +/* Gruppi Attivi per calcolo */ +// Group:Switch:OR(ON, OFF) Lights "All Lights [(%d)]" +// Group:Contact:OR(OPEN, CLOSED) Windows "Open windows [(%d)]" + +/*---------------------- Elementi Clima, Daikin via MODBUS ----------------------*/ Group:Switch:OR(ON, OFF) GU120_CL_Switch "Clima Attivi [(%d)]" Group:Number:AVG GU120_CL_Temp "Temp. Rilevata [%.1f °C]" Group:Number:AVG GU120_CL_Set "Temp. Impostata [%.1f °C]" Group:Switch:OR(ON, OFF) GU100_CL_Switch "Clima Attivi [(%d)]" Group:Number:AVG GU100_CL_Temp "Temp. Rilevata [%.1f °C]" -Group GU100_CL_Set "Temp. Impostata [%.1f °C]" - -// Group:Switch:OR(ON, OFF) Lights "All Lights [(%d)]" -// Group:Contact:OR(OPEN, CLOSED) Windows "Open windows [(%d)]" - -Group gNet_print "Printers" (gNet) ["Printers"] -Group gNet_mobile "Presenze" (gNet) ["Presenze"] - -/*---------------------- Elementi Clima Daikin via MODBUS ----------------------*/ +Group GU100_CL_Set "Temp. Impostata [%.1f °C]" +Number GU120_CL_TempInt Switch Heating_GU120_CL_C1_Switch "Ingresso" (GU120_CL_Switch) {channel="modbus:data:c5a162cd:switch"} Number Heating_GU120_CL_C1_Temp "Temp Ingresso [%.1f °C]" (GU120_CL_Temp) {channel="modbus:data:b81128ff:number"} Number Heating_GU120_CL_C1_Set "Set Temp [%.1f °C]" (GU120_CL_Set) {channel="modbus:data:b2c00004:number"} @@ -40,18 +35,35 @@ Switch Heating_GU120_CL_C4_Switch "Ufficio" (GU Number Heating_GU120_CL_C4_Temp "Temp Ufficio [%.1f °C]" (GU120_CL_Temp) {channel="modbus:data:3a7f6582:number"} Number Heating_GU120_CL_C4_Set "Set Temp [%.1f °C]" (GU120_CL_Set) {channel="modbus:data:f86b3601:number"} -Switch Heating_GU120_CL_C5_Switch "Sala" (GU120_CL_Switch) {channel="modbus:data:02e9ec27:switch"} -Number Heating_GU120_CL_C5_Temp "Temp Sala [%.1f °C]" (GU120_CL_Temp) {channel="modbus:data:f0f9e4a4:number"} -Number Heating_GU120_CL_C5_Set "Set Temp [%.1f °C]" (GU120_CL_Set) {channel="modbus:data:a775a678:number"} +Switch Heating_GU120_CL_C5_Switch "Sala Riunioni" (GU120_CL_Switch) {channel="modbus:data:02e9ec27:switch"} +Number Heating_GU120_CL_C5_Temp "Temp Sala Riunioni [%.1f °C]" (GU120_CL_Temp) {channel="modbus:data:f0f9e4a4:number"} +Number Heating_GU120_CL_C5_Set "Set Temp Riunioni [%.1f °C]" (GU120_CL_Set) {channel="modbus:data:a775a678:number"} /*----------------------------------------------------------------------------*/ -/*---------------------- Elementi Impianto Fotovoltaico Fronius ----------------------*/ +/*---------------------- Elementi Netatmo ----------------------*/ +Group GT_Netatmo "Temp Media [%.1f °C]" +Number GT_NetatmoInt +Number GN_NET_ExtUff_Temp "Temp Esterno Ufficio [%.1f °C]" (GT_Netatmo) {channel="netatmo:NAModule1:eb8cc662:02000012bbe0:Temperature"} +Number GN_NET_Server_Temp "Temp Sala Server [%.1f °C]" (GT_Netatmo) {channel="netatmo:NAModule4:eb8cc662:03000002537a:Temperature"} +Number GN_NET_U120_Temp "Temp Ufficio 120 [%.1f °C]" (GT_Netatmo) {channel="netatmo:NAMain:eb8cc662:70ee5012923e:Temperature"} +Number GN_NET_U100_Temp "Temp Ufficio 100 [%.1f °C]" (GT_Netatmo) {channel="netatmo:NAModule4:eb8cc662:030000079324:Temperature"} +/*----------------------------------------------------------------------------*/ + + + +/*---------------------- Elementi Impianto Fotovoltaico Fronius ----------------------*/ +Number FronPacInt +Number FronDayEnInt +Number FronYearEnInt +Number FronTotEnInt + +// Group gEN "Energia" ["Energia"] // Number gEN_RTime "Istantanea [%.0f W]" (gEN) {channel="fronius:powerinverter:6c4376a1:inverterdatachannelpac"} -Number gEN_Day "Giornaliera" (gEN) {channel="fronius:powerinverter:6c4376a1:inverterdatachanneldayenergy"} -Number gEN_YearProd "Prod. Anno" (gEN) {channel="fronius:powerinverter:6c4376a1:inverterdatachannelyear"} -Number gEN_TotProd "Prod. Totale" (gEN) {channel="fronius:powerinverter:6c4376a1:inverterdatachanneltotal"} +// Number gEN_Day "Giornaliera" (gEN) {channel="fronius:powerinverter:6c4376a1:inverterdatachanneldayenergy"} +// Number gEN_YearProd "Prod. Anno" (gEN) {channel="fronius:powerinverter:6c4376a1:inverterdatachannelyear"} +// Number gEN_TotProd "Prod. Totale" (gEN) {channel="fronius:powerinverter:6c4376a1:inverterdatachanneltotal"} // Group gEN_Realtime "Realtime" (gEN) ["Realtime"] // Group gEN_Day "Giorno" (gEN) ["Giorno"] @@ -61,6 +73,29 @@ Number gEN_TotProd "Prod. Totale" (gEN) {channel=" /*----------------------------------------------------------------------------*/ +/*---------------------- Elementi Networking ----------------------*/ +// Group gNet +// Group gNet_print "Printers" (gNet) ["Printers"] +Number gNet_mobileChartSel + +Group:Switch:OR(ON, OFF) gNet_mobile "Presenze [(%d)]" + +// Group:Switch:OR(ON, OFF) GU120_CL_Switch "Clima Attivi [(%d)]" +Number gNet_Mobile_Sam "Mobile Sam" (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]"