From 3a3f6f2261e53d0c43910afd8a461d4c909d6a74 Mon Sep 17 00:00:00 2001
From: elueckel <30531515+elueckel@users.noreply.github.com>
Date: Sat, 8 Jun 2024 22:00:25 +0200
Subject: [PATCH 01/34] Update module.php

Added number of connected devices
---
 UniFi Endpoint Monitor/module.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/UniFi Endpoint Monitor/module.php b/UniFi Endpoint Monitor/module.php
index 37b84d1..0e0383a 100644
--- a/UniFi Endpoint Monitor/module.php	
+++ b/UniFi Endpoint Monitor/module.php	
@@ -76,6 +76,7 @@ public function ApplyChanges()
 		$this->MaintainVariable("RSSI", $this->Translate("RSSI"), vtInteger, "", $vpos++, $this->ReadPropertyBoolean("DataPointConnection") == 1 && $this->ReadPropertyInteger("ConnectionType") == 0);
 		$this->MaintainVariable("Noise", $this->Translate("Noise"), vtInteger, "", $vpos++, $this->ReadPropertyBoolean("DataPointConnection") == 1 && $this->ReadPropertyInteger("ConnectionType") == 0);
 		$this->MaintainVariable("SignalStrength", $this->Translate("Signal Strength"), vtInteger, "", $vpos++, $this->ReadPropertyBoolean("DataPointConnection") == 1 && $this->ReadPropertyInteger("ConnectionType") == 0);
+		$this->MaintainVariable("ConnectedDevices", $this->Translate("Connected Devices"), vtInteger, "", $vpos++, $this->ReadPropertyBoolean("DataPointConnection") == 1 && $this->ReadPropertyInteger("ConnectionType") == 0);
 
 		//Transfer Data
 		$vpos = 300;
@@ -253,6 +254,9 @@ public function EndpointMonitor()
 						$SignalStrength = $JSONData["data"][0]["signal"];
 						SetValue($this->GetIDForIdent("SignalStrength"), $SignalStrength);
 						$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Connection Data SignalStrength ").$SignalStrength, 0);
+						$ConnectedDevices = $JSONData["data"][0]["num_sta"];
+						SetValue($this->GetIDForIdent("ConnectedDevices"), ConnectedDevices);
+						$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Connected Devices ").$ConnectedDevices, 0);
 					}
 					if ($this->ReadPropertyBoolean("DataPointTransfer") == 1 && $this->ReadPropertyInteger("ConnectionType") == 0 && $ConnectionConfigError == false)
 					{

From f2a15c9ac51c4c89868f6a26914195b6ea2d3126 Mon Sep 17 00:00:00 2001
From: elueckel <30531515+elueckel@users.noreply.github.com>
Date: Sun, 9 Jun 2024 14:11:18 +0200
Subject: [PATCH 02/34] Update module.php

---
 UniFi Endpoint Monitor/module.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/UniFi Endpoint Monitor/module.php b/UniFi Endpoint Monitor/module.php
index 0e0383a..7cd364d 100644
--- a/UniFi Endpoint Monitor/module.php	
+++ b/UniFi Endpoint Monitor/module.php	
@@ -76,8 +76,7 @@ public function ApplyChanges()
 		$this->MaintainVariable("RSSI", $this->Translate("RSSI"), vtInteger, "", $vpos++, $this->ReadPropertyBoolean("DataPointConnection") == 1 && $this->ReadPropertyInteger("ConnectionType") == 0);
 		$this->MaintainVariable("Noise", $this->Translate("Noise"), vtInteger, "", $vpos++, $this->ReadPropertyBoolean("DataPointConnection") == 1 && $this->ReadPropertyInteger("ConnectionType") == 0);
 		$this->MaintainVariable("SignalStrength", $this->Translate("Signal Strength"), vtInteger, "", $vpos++, $this->ReadPropertyBoolean("DataPointConnection") == 1 && $this->ReadPropertyInteger("ConnectionType") == 0);
-		$this->MaintainVariable("ConnectedDevices", $this->Translate("Connected Devices"), vtInteger, "", $vpos++, $this->ReadPropertyBoolean("DataPointConnection") == 1 && $this->ReadPropertyInteger("ConnectionType") == 0);
-
+		
 		//Transfer Data
 		$vpos = 300;
 		$this->MaintainVariable("TXBytes", $this->Translate("TX Megabytes"), vtInteger, "", $vpos++, $this->ReadPropertyBoolean("DataPointTransfer") == 1 && $this->ReadPropertyInteger("ConnectionType") == 0);
@@ -254,9 +253,6 @@ public function EndpointMonitor()
 						$SignalStrength = $JSONData["data"][0]["signal"];
 						SetValue($this->GetIDForIdent("SignalStrength"), $SignalStrength);
 						$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Connection Data SignalStrength ").$SignalStrength, 0);
-						$ConnectedDevices = $JSONData["data"][0]["num_sta"];
-						SetValue($this->GetIDForIdent("ConnectedDevices"), ConnectedDevices);
-						$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Connected Devices ").$ConnectedDevices, 0);
 					}
 					if ($this->ReadPropertyBoolean("DataPointTransfer") == 1 && $this->ReadPropertyInteger("ConnectionType") == 0 && $ConnectionConfigError == false)
 					{

From 596791fc84d084ab228ec6e995e2b5575f89387b Mon Sep 17 00:00:00 2001
From: elueckel <30531515+elueckel@users.noreply.github.com>
Date: Sun, 9 Jun 2024 14:15:26 +0200
Subject: [PATCH 03/34] Update module.php

---
 UniFi Device Monitor/module.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/UniFi Device Monitor/module.php b/UniFi Device Monitor/module.php
index f781133..119c3c5 100644
--- a/UniFi Device Monitor/module.php	
+++ b/UniFi Device Monitor/module.php	
@@ -65,6 +65,7 @@ public function ApplyChanges()
 		$vpos = 200;
 		$this->MaintainVariable("CPULoad", $this->Translate("CPU Load"), vtFloat, "", $vpos++, $this->ReadPropertyBoolean("DataPointHardware") == 1);
 		$this->MaintainVariable("MemoryLoad", $this->Translate("Memory Load"), vtFloat, "", $vpos++, $this->ReadPropertyBoolean("DataPointHardware") == 1);
+		$this->MaintainVariable("ConnectedDevices", $this->Translate("Connected Devices"), vtInteger, "", $vpos++, $this->ReadPropertyBoolean("DataPointHardware") == 1);
 
 
 		//Device Specific Data Connection Data UDM/USG
@@ -182,6 +183,9 @@ public function DeviceMonitor()
 					$MemoryLoad = $JSONData["data"][0]["system-stats"]["mem"];
 					SetValue($this->GetIDForIdent("MemoryLoad"), $MemoryLoad);
 					$this->SendDebug($this->Translate("Device Monitor"), $this->Translate("Memory Load ").$MemoryLoad, 0);
+					$ConnectedDevices = $JSONData["data"][0]["num_sta"];
+					SetValue($this->GetIDForIdent("ConnectedDevices"), ConnectedDevices);
+					$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Connected Devices ").$ConnectedDevices, 0);
 				}
 				if ($this->ReadPropertyBoolean("DataPointSpecific") == 1 && $this->ReadPropertyInteger("DeviceType") == 0 && $DeviceConfigError == false)
 				{

From 92750e432d0269ae0c4eaae7ef6c124e333d29f9 Mon Sep 17 00:00:00 2001
From: elueckel <30531515+elueckel@users.noreply.github.com>
Date: Sun, 9 Jun 2024 14:19:57 +0200
Subject: [PATCH 04/34] Update module.php

---
 UniFi Device Monitor/module.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UniFi Device Monitor/module.php b/UniFi Device Monitor/module.php
index 119c3c5..41ba81b 100644
--- a/UniFi Device Monitor/module.php	
+++ b/UniFi Device Monitor/module.php	
@@ -183,7 +183,7 @@ public function DeviceMonitor()
 					$MemoryLoad = $JSONData["data"][0]["system-stats"]["mem"];
 					SetValue($this->GetIDForIdent("MemoryLoad"), $MemoryLoad);
 					$this->SendDebug($this->Translate("Device Monitor"), $this->Translate("Memory Load ").$MemoryLoad, 0);
-					$ConnectedDevices = $JSONData["data"][0]["num_sta"];
+					$ConnectedDevices = $JSONData["data"]["num_sta"];
 					SetValue($this->GetIDForIdent("ConnectedDevices"), ConnectedDevices);
 					$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Connected Devices ").$ConnectedDevices, 0);
 				}

From 7b9100c87935093a877aa06422a93010a838ff4d Mon Sep 17 00:00:00 2001
From: elueckel <30531515+elueckel@users.noreply.github.com>
Date: Sun, 9 Jun 2024 14:35:59 +0200
Subject: [PATCH 05/34] 1.51

---
 UniFi Device Monitor/README.md    | 5 ++++-
 UniFi Device Monitor/README_en.md | 5 ++++-
 UniFi Device Monitor/locale.json  | 1 +
 UniFi Device Monitor/module.php   | 4 ++--
 library.json                      | 2 +-
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/UniFi Device Monitor/README.md b/UniFi Device Monitor/README.md
index 8334f9c..6e41ae1 100644
--- a/UniFi Device Monitor/README.md	
+++ b/UniFi Device Monitor/README.md	
@@ -95,4 +95,7 @@ Version 1.3 - 03-01-2022
 * Neu - Unifi API Zugriff in eigene Funktion ausgelagert (bessere Wartbarkeit)
 
 Version 1.5 - 03-12-2023
-* Neu - UI Aufgeräumt
\ No newline at end of file
+* Neu - UI Aufgeräumt
+
+Version 1.51 - 09-06-2024
+* Neu - Anzahl der verbundenen Geräte wird angezeigt
\ No newline at end of file
diff --git a/UniFi Device Monitor/README_en.md b/UniFi Device Monitor/README_en.md
index 79b9fd5..c12ac47 100644
--- a/UniFi Device Monitor/README_en.md	
+++ b/UniFi Device Monitor/README_en.md	
@@ -77,4 +77,7 @@ Version 1.3 - 03-01-2022
 * New - Unifi API access moved to its own function (better maintainability)
 
 Version 1.5 - 03-12-2023
-* New - UI tidied up
\ No newline at end of file
+* New - UI tidied up
+
+Version 1.51 - 09-06-2024
+* New - Number of connected devices are shown
\ No newline at end of file
diff --git a/UniFi Device Monitor/locale.json b/UniFi Device Monitor/locale.json
index d46e084..b25bef3 100644
--- a/UniFi Device Monitor/locale.json	
+++ b/UniFi Device Monitor/locale.json	
@@ -36,6 +36,7 @@
             "Device Model": "Geräte Typ",
             "Device Name": "Geräte Name",
             "CPU Load": "CPU Auslastung",
+            "Connected Devices": "Verbundene Geräte",
             "Memory Load": "Speicher Auslastung",
             "WAN 1 TX Packets": "WAN 1 TX Pakete",
             "WAN 1 RX Packets": "WAN 1 RX Pakete",
diff --git a/UniFi Device Monitor/module.php b/UniFi Device Monitor/module.php
index 41ba81b..d63dafa 100644
--- a/UniFi Device Monitor/module.php	
+++ b/UniFi Device Monitor/module.php	
@@ -183,8 +183,8 @@ public function DeviceMonitor()
 					$MemoryLoad = $JSONData["data"][0]["system-stats"]["mem"];
 					SetValue($this->GetIDForIdent("MemoryLoad"), $MemoryLoad);
 					$this->SendDebug($this->Translate("Device Monitor"), $this->Translate("Memory Load ").$MemoryLoad, 0);
-					$ConnectedDevices = $JSONData["data"]["num_sta"];
-					SetValue($this->GetIDForIdent("ConnectedDevices"), ConnectedDevices);
+					$ConnectedDevices = $JSONData["data"][0]["num_sta"];
+					SetValue($this->GetIDForIdent("ConnectedDevices"), $ConnectedDevices);
 					$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Connected Devices ").$ConnectedDevices, 0);
 				}
 				if ($this->ReadPropertyBoolean("DataPointSpecific") == 1 && $this->ReadPropertyInteger("DeviceType") == 0 && $DeviceConfigError == false)
diff --git a/library.json b/library.json
index 2f671ce..adc05e7 100644
--- a/library.json
+++ b/library.json
@@ -6,7 +6,7 @@
     "compatibility": {
         "version": "5.5"
     },
-    "version": "1.5",
+    "version": "1.51",
     "build": 0,
     "date": 0
 }

From 89831310af3becf64acc3b9f47da99840852e56f Mon Sep 17 00:00:00 2001
From: elueckel <30531515+elueckel@users.noreply.github.com>
Date: Sun, 9 Jun 2024 14:41:08 +0200
Subject: [PATCH 06/34] 1.51


From a42b72e8a2adaf607c6495fbcd62c92fc5cf6f12 Mon Sep 17 00:00:00 2001
From: elueckel <30531515+elueckel@users.noreply.github.com>
Date: Sun, 9 Jun 2024 14:41:38 +0200
Subject: [PATCH 07/34] 1.51

---
 UniFi Device Monitor/locale.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/UniFi Device Monitor/locale.json b/UniFi Device Monitor/locale.json
index b25bef3..d1b7868 100644
--- a/UniFi Device Monitor/locale.json	
+++ b/UniFi Device Monitor/locale.json	
@@ -38,6 +38,7 @@
             "CPU Load": "CPU Auslastung",
             "Connected Devices": "Verbundene Geräte",
             "Memory Load": "Speicher Auslastung",
+            "Connected Devices": "Verbunde Geräte",
             "WAN 1 TX Packets": "WAN 1 TX Pakete",
             "WAN 1 RX Packets": "WAN 1 RX Pakete",
             "WAN 1 TX Errors": "WAN 1 TX Fehler",

From 1d8fbc8ebb41e71e29810ddc9bcfd3d074a97432 Mon Sep 17 00:00:00 2001
From: elueckel <30531515+elueckel@users.noreply.github.com>
Date: Sun, 25 Aug 2024 17:18:17 +0200
Subject: [PATCH 08/34] 1.6

---
 .DS_Store                                 | Bin 10244 -> 14340 bytes
 UniFi Device Monitor/README.md            |   2 +-
 UniFi Device Monitor/README_en.md         |   2 +-
 UniFi Endpoint Blocker/README.md          |   3 +
 UniFi Endpoint Blocker/README_en.md       |   5 +-
 UniFi Multi Endpoint Monitor/README.md    |  10 +++-
 UniFi Multi Endpoint Monitor/README_en.md |  13 +++-
 UniFi Multi Endpoint Monitor/form.json    |   2 +-
 UniFi Multi Endpoint Monitor/module.php   |  70 ++++++++++++----------
 library.json                              |   2 +-
 tests/.DS_Store                           | Bin 0 -> 6148 bytes
 11 files changed, 71 insertions(+), 38 deletions(-)
 create mode 100644 tests/.DS_Store

diff --git a/.DS_Store b/.DS_Store
index 8794b78f0ff8c6ef333ea0755063ab23a1d03486..4284437f780c58647f0aa77ae1b377be7d88ec2a 100644
GIT binary patch
literal 14340
zcmeHO&2Jk;6o1<|&4yBusx1Okq!pFmKtvr%OA$gcu0zEkQiTgeZBgott;FhP*Ya*^
zp(w%}DkKmR;=&d27a&eOB0ldN;J^imGyDMviT>W~hvzv??cER%W+s|_>zR4;-u&iy
zX5RCJh^*>XbBU--L^d+hg$MC?kH}%FC9dbZE6t$9Lard=eSxS=uOK_LOg_rSr9)`I
z{3Yav>2>hv{7vdmfD)e~^tgg|u8%;w-uhB~E!gbD0(Opb`DW0pxnAI+%>LoAH!pqs
z(swVbzMr9WuJ3GUJV!r@S<TZRU=T0}7z7Lg|33tH??tkY#MC?u0tNwtK!yOX4-PWZ
zN<#ZFRZ9mRe1zwEKEkVnclZIS%t>e^q5YUDR`4iR(3sUqTnsB_N4dkzK`ROE$24Xq
zD`qDvk!&R%ilwB3&r!|Es>IYh4FU#%-3UC6qFlcBW>Cxg?00^@n)=x}`xyA@Mf(u`
zJblh1%caBZde`>?e;s_hq&zC(53j1ILyNkgEfs&bsNxS1N&@omhq`9C=D9)OvFHNq
zGKlfnx5awVr{mo}%e5rzQ9vI(fU>`y<kbAa_?!~(uFw`Bj1ZQILq+!q^|-yTlZ18d
zx*e|_M&<I4)}fiw?BO|k&OTzlRo@7D^{5eTh1Ev)I)A!?NpaKnhWkdl)mvRSaWU|t
zM%!<76+^q(LX#U;+kP|XRf8?R87kg-Tw%}K^Q#MwY;T{vP+oMNJ9mC((b<0CS$;oz
zerIRiK6(1gi?6NT@;3e8eI6jJDA}3lX#6>Qet@^a<JXO>a3|8#?)<hNg>-}a{?t-x
zaD{c#&F=5$Pa2<E7Yge(v_>2gMtm77!7>b3tPE3Pt`m$jHB7ep37Sh2ygoM>mu_r#
zs+qA(AWt`|e4NsN`cQO|@eP@Z+=?z^+h|dU?9&>a9L{dwy@Aj)Hj*hZnp|U+_HgZ2
zpqz_ew~UR|%rbKJF*t@4?PG+s<kDftZrIvPG6)z13<3rLgTR3!@B}23DEW<CY|0OO
z_=R4lZ@8m=U)K*@qw2**8UOx1m&&CLIE1c{PBT47A8MiN@W)?gQr}}&tHHLucPpU}
zPGm@jp-%|6^lkR<r8W-#Mk4BUUA}%ObG(Pz3^duRjnt#edXyl)O)iB}ho`UTb-Mhg
zPG|BnUVT1B)l0b*mOG2F^D#9Vl05tKC0VP>KHjW+^GSTyLgUw^k8UC4+h4N$6T-i$
zL6_UWAw4i__dllOz&!DIr5%LN=fO&!tHqzPc-_RZ^_eWfFXov(%{9+MhhurL<~v3*
za8$+jCV;)%np&r7%$TK}cwYhRT$t&$^5orYP088EV9hJqhqRfAV!LAQbJ~r#TQ((Y
z%eXlcV@_i^w67Sa6gej5Ax+iz|M;qMB+Vp)fI+|@U=T0}95@2Av4k@Fw#$3p|37d&
zi~xgxLEzs*z$(@1wJPNAbpqwPb`J7Q<TRnJYK{k2^9OYm4<Gm{-i5SXQddc6Kc<Qm
iJc<?cAG!qi-@7;>ohsx15B|UGKCvI;|BsFPtlR^ZGXWd`

delta 453
zcmZoEXbF&DU|?W$DortDU{C-uIe-{M3-C-V6q~3gIoZI3MHI+qkOE>xpg2QLx?yl~
zer~~LLB?-vlNA^@Zf56T;b4@S%%dP#&v~#LsE&m}k0G5Qlc6Lx-^C><CqD@&#<8?w
zd#!8lQAZ$~m7#<om7y3&7Q;*fiUP&6=cCFZ>tB<3r5sa#Zhi{fhBcWg*pw7xKpYIV
zg2RDf@&RR?$p@4^Y+j*az_|H=nkD1J2?mojMENHR3))ZKE^G;uJU*FO#B#EL2Iu50
z!d^@jd6Psu*d-rirn>YVo$N2-31`n2@n%}UFiFH_vxcZQ<K|#-po!g*+-!o(VA~iJ
yxPi1QC^&(^^__V#zlk9$FccXYCOeuaacY1R0l5Z~GfXB<-m7$qR9k_rZUzAROLi{+

diff --git a/UniFi Device Monitor/README.md b/UniFi Device Monitor/README.md
index 6e41ae1..1782182 100644
--- a/UniFi Device Monitor/README.md	
+++ b/UniFi Device Monitor/README.md	
@@ -97,5 +97,5 @@ Version 1.3 - 03-01-2022
 Version 1.5 - 03-12-2023
 * Neu - UI Aufgeräumt
 
-Version 1.51 - 09-06-2024
+Version 1.6 - 25-08-2024
 * Neu - Anzahl der verbundenen Geräte wird angezeigt
\ No newline at end of file
diff --git a/UniFi Device Monitor/README_en.md b/UniFi Device Monitor/README_en.md
index c12ac47..0f31085 100644
--- a/UniFi Device Monitor/README_en.md	
+++ b/UniFi Device Monitor/README_en.md	
@@ -79,5 +79,5 @@ Version 1.3 - 03-01-2022
 Version 1.5 - 03-12-2023
 * New - UI tidied up
 
-Version 1.51 - 09-06-2024
+Version 1.6 - 25-08-2024
 * New - Number of connected devices are shown
\ No newline at end of file
diff --git a/UniFi Endpoint Blocker/README.md b/UniFi Endpoint Blocker/README.md
index 0c94772..46ed3f2 100644
--- a/UniFi Endpoint Blocker/README.md	
+++ b/UniFi Endpoint Blocker/README.md	
@@ -127,3 +127,6 @@ Version 1.3 - 03-01-2022
 
 Version 1.5 - 03-12-2023
 * Neu - UI Aufgeräumt
+
+Version 1.6 - 25-08-2024 
+* Keine Änderungen
\ No newline at end of file
diff --git a/UniFi Endpoint Blocker/README_en.md b/UniFi Endpoint Blocker/README_en.md
index 1b0a55e..2f14b3f 100644
--- a/UniFi Endpoint Blocker/README_en.md	
+++ b/UniFi Endpoint Blocker/README_en.md	
@@ -109,4 +109,7 @@ Version 1.3 - 03-01-2022
 * New - Device Blocker is now called Endpoint Blocker
 
 Version 1.5 - 03-12-2023
-* New - UI tidied up
\ No newline at end of file
+* New - UI tidied up
+
+Version 1.6 - 25-08-2024 
+* No changes
\ No newline at end of file
diff --git a/UniFi Multi Endpoint Monitor/README.md b/UniFi Multi Endpoint Monitor/README.md
index 75f45a6..2f05832 100644
--- a/UniFi Multi Endpoint Monitor/README.md	
+++ b/UniFi Multi Endpoint Monitor/README.md	
@@ -88,4 +88,12 @@ Das Modul gibt diverse Informationen im Debug Bereich aus.
 ## 5. Versionsinformation
 
 Version 1.5 - 02-12-2023
-* Neu - Modul verfügbar
\ No newline at end of file
+* Neu - Modul verfügbar
+
+Version 1.6 - 25-08-2024 (Credit M70 - Danke)
+* Fix - Connection wurde nicht gesetzt
+* Fix - Satisfaction wurde nicht aktualisiert
+* Fix - IP wurde nicht gesetzt
+* Fix - LastSeen wird auf Zeit von Symcon korrigiert
+* Fix - Modul zieht jetzt nicht mehr die Werte für WLAN Geräte bei LAN Komponenten
+* Change - SetValue durch $this->SetValue ersetzt
\ No newline at end of file
diff --git a/UniFi Multi Endpoint Monitor/README_en.md b/UniFi Multi Endpoint Monitor/README_en.md
index a9da138..b84ce11 100644
--- a/UniFi Multi Endpoint Monitor/README_en.md	
+++ b/UniFi Multi Endpoint Monitor/README_en.md	
@@ -71,4 +71,15 @@ The module outputs various information in the debug area.
 
 ## 5. version information
 Version 1.5 - 02-12-2023
-* New - Module available
\ No newline at end of file
+* New - Module available
+
+Version 1.6 - 02-12-2023
+* Neu - Modul verfügbar
+
+Version 1.6 - 25-08-2024 (Credit M70 - Danke)
+* Fix - Connection was not set
+* Fix - Satisfaction was not set
+* Fix - IP was not set
+* Fix - LastSeen is set to Symcon Server time
+* Fix - Module is no longer pulling WLAN data from LAN devices
+* Change - SetValue replaced by $this->SetValue ersetzt
\ No newline at end of file
diff --git a/UniFi Multi Endpoint Monitor/form.json b/UniFi Multi Endpoint Monitor/form.json
index 61e38d3..df3be03 100644
--- a/UniFi Multi Endpoint Monitor/form.json	
+++ b/UniFi Multi Endpoint Monitor/form.json	
@@ -194,7 +194,7 @@
                 {
                     "type": "Button",
                     "label": "Get Device Data",
-                    "onClick": "UMEM_EndpointMonitor($id);"
+                    "onClick": "UMEM_MultiEndpointMonitor($id);"
                 },
                 {
                     "type": "Button",
diff --git a/UniFi Multi Endpoint Monitor/module.php b/UniFi Multi Endpoint Monitor/module.php
index 8cd9968..f9cc589 100644
--- a/UniFi Multi Endpoint Monitor/module.php	
+++ b/UniFi Multi Endpoint Monitor/module.php	
@@ -39,7 +39,7 @@ public function Create()
 		$this->RegisterPropertyBoolean("DataPointConnection", 0);
 		$this->RegisterPropertyBoolean("DataPointTransfer", 0);
 
-		$this->RegisterTimer("UniFi Multi Endpoint Monitor", 0, MODUL_PREFIX."_EndpointMonitor(\$_IPS['TARGET']);");
+		$this->RegisterTimer("UniFi Multi Endpoint Monitor", 0, MODUL_PREFIX."_MultiEndpointMonitor(\$_IPS['TARGET']);");
 	}
 
 	public function Destroy()
@@ -152,7 +152,7 @@ public function AuthenticateAndGetData(string $UnifiAPI = "")
 		}
 	}
 
-	public function EndpointMonitor()
+	public function MultiEndpointMonitor()
 	{
 		$ControllerType = $this->ReadPropertyInteger("ControllerType");
 		$ServerAddress = $this->ReadPropertyString("ServerAddress");
@@ -196,6 +196,7 @@ public function EndpointMonitor()
 					$DeviceMac = $this->removeInvalidChars($Device["varDeviceMAC"], true);
 					$DeviceName = $Device["varDeviceName"];
 					$ConnectionType = $Device["varDeviceConnectionType"];
+					$Connected = false;
 
 					//Itterate through all device and check if one of them matches the list in the config form.
 					foreach ($ActiveDevices["data"] as $Index => $DeviceFromController)
@@ -205,8 +206,10 @@ public function EndpointMonitor()
 						if ($DeviceMac == $DeviceFromControllerClean)
 						{
 							$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Device with Name was found: ").$DeviceName, 0);
-					
+							$Connected = true;				
 							$ConnectionMethod = $DeviceFromController["is_wired"];
+							$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Setze Wert"), 0);
+						$this->SetValue($this->GetIDForIdent($DeviceMac."_Connected"), $Connected);
 
 							if ($ConnectionMethod == true && $ConnectionType == 0)
 							{
@@ -219,77 +222,80 @@ public function EndpointMonitor()
 							}
 
 							if ($this->ReadPropertyBoolean("DataPointNetwork") == 1)
-							{
-								$IPAddress = $DeviceFromController["ip"];
-								SetValue($this->GetIDForIdent($DeviceMac."IPAddress"), $IPAddress);
-								$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Network Data IP ").$IPAddress, 0);
-
+							{	
+								if (isset($DeviceFromController["ip"])) {
+									$IPAddress = $DeviceFromController["ip"];
+									$this->SetValue($this->GetIDForIdent($DeviceMac."IPAddress"), $IPAddress);
+									$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Network Data IP ").$IPAddress, 0);
+								}
 								if ("" != $DeviceFromController["hostname"])
 								{
 									$Hostname = $DeviceFromController["hostname"];
 								}
-								elseif ("" != $DeviceFromController["name"])
-								{
-									$Hostname = $DeviceFromController["name"];
-								}
 								else
 								{
 									$Hostname = "";
 								}
-								SetValue($this->GetIDForIdent($DeviceMac."Hostname"), $Hostname);
+								$this->SetValue($this->GetIDForIdent($DeviceMac."Hostname"), $Hostname);
 								$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Network Data Hostname ").$Hostname, 0);
+								$Connected = true;	
 							}
+
 							if ($this->ReadPropertyBoolean("DataPointConnection") == 1)
 							{
 								if (isset($DeviceFromController["satisfaction"])) {
-									$Satisfaction = isset($DeviceMac["satisfaction"]);
-									SetValue($this->GetIDForIdent($DeviceMac."Satisfaction"), $Satisfaction);
+									$Satisfaction = $DeviceFromController["satisfaction"];
+									//$Satisfaction = isset($DeviceMac["satisfaction"]);
+									$this->SetValue($this->GetIDForIdent($DeviceMac."Satisfaction"), $Satisfaction);
+									$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Connection Data Satisfaction ").$Satisfaction, 0);
 								}
-								$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Connection Data Satisfaction ").$Satisfaction, 0);
+								//$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Connection Data Satisfaction ").$Satisfaction, 0);
 								$SLastSeen = $DeviceFromController["last_seen"];
-								SetValue($this->GetIDForIdent($DeviceMac."LastSeen"), gmdate("Y-m-d H:i:s", $SLastSeen));
+								$SLastSeen = $SLastSeen + date("Z");
+								$this->SetValue($this->GetIDForIdent($DeviceMac."LastSeen"), gmdate("Y-m-d H:i:s", $SLastSeen));
 								$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Connection Data Last Seen ").gmdate("Y-m-d H:i:s", $SLastSeen), 0);
 								$Uptime = $DeviceFromController["uptime"];
-								SetValue($this->GetIDForIdent($DeviceMac."Uptime"), round($Uptime / 3600, 0));
+								$this->SetValue($this->GetIDForIdent($DeviceMac."Uptime"), round($Uptime / 3600, 0));
 								$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Connection Data Uptime in hours ").round($Uptime / 3600, 0), 0);
 							}
-							if ($this->ReadPropertyBoolean("DataPointConnection") == 1 && $ConnectionType == 0 && $ConnectionConfigError == false)
+
+							if ($this->ReadPropertyBoolean("DataPointConnection") == 1 AND $ConnectionType == 0 AND $ConnectionConfigError == false);
 							{
 								$Accesspoint = $DeviceFromController["ap_mac"];
-								SetValue($this->GetIDForIdent($DeviceMac."Accesspoint"), $Accesspoint);
+								$this->SetValue($this->GetIDForIdent($DeviceMac."Accesspoint"), $Accesspoint);
 								$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Connection Data Accesspoint ").$Accesspoint, 0);
 								$Channel = $DeviceFromController["channel"];
-								SetValue($this->GetIDForIdent($DeviceMac."Channel"), $Channel);
+								$this->SetValue($this->GetIDForIdent($DeviceMac."Channel"), $Channel);
 								$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Connection Data Channel ").$Channel, 0);
 								$Radio = $DeviceFromController["radio"];
-								SetValue($this->GetIDForIdent($DeviceMac."Radio"), $Radio);
+								$this->SetValue($this->GetIDForIdent($DeviceMac."Radio"), $Radio);
 								$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Connection Data Radio ").$Radio, 0);
 								$ESSID = $DeviceFromController["essid"];
-								SetValue($this->GetIDForIdent($DeviceMac."ESSID"), $ESSID);
+								$this->SetValue($this->GetIDForIdent($DeviceMac."ESSID"), $ESSID);
 								$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Connection Data ESSID ").$ESSID, 0);
 								$RSSI = $DeviceFromController["rssi"];
-								SetValue($this->GetIDForIdent($DeviceMac."RSSI"), $RSSI);
+								$this->SetValue($this->GetIDForIdent($DeviceMac."RSSI"), $RSSI);
 								$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Connection Data RSSI ").$RSSI, 0);
 								$Noise = $DeviceFromController["noise"];
-								SetValue($this->GetIDForIdent($DeviceMac."Noise"), $Noise);
+								$this->SetValue($this->GetIDForIdent($DeviceMac."Noise"), $Noise);
 								$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Connection Data Noise ").$Noise, 0);
 								$SignalStrength = $DeviceFromController["signal"];
-								SetValue($this->GetIDForIdent($DeviceMac."SignalStrength"), $SignalStrength);
+								$this->SetValue($this->GetIDForIdent($DeviceMac."SignalStrength"), $SignalStrength);
 								$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Connection Data SignalStrength ").$SignalStrength, 0);
 							}
-							if ($this->ReadPropertyBoolean("DataPointTransfer") == 1 && $ConnectionType == 0 && $ConnectionConfigError == false)
+							if ($this->ReadPropertyBoolean("DataPointTransfer") == 1 AND $ConnectionType == 0 AND $ConnectionConfigError == false)
 							{
 								$TXBytes = $DeviceFromController["tx_bytes"];
-								SetValue($this->GetIDForIdent($DeviceMac."TXBytes"), $TXBytes / 1000000);
+								$this->SetValue($this->GetIDForIdent($DeviceMac."TXBytes"), $TXBytes / 1000000);
 								$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Transfer Data TXBytes ").$TXBytes / 1000000, 0);
 								$RXBytes = $DeviceFromController["rx_bytes"];
-								SetValue($this->GetIDForIdent($DeviceMac."RXBytes"), $RXBytes / 1000000);
+								$this->SetValue($this->GetIDForIdent($DeviceMac."RXBytes"), $RXBytes / 1000000);
 								$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Transfer Data RXBytes ").$RXBytes / 1000000, 0);
 								$TXPackets = $DeviceFromController["tx_packets"];
-								SetValue($this->GetIDForIdent($DeviceMac."TXPackets"), $TXPackets);
+								$this->SetValue($this->GetIDForIdent($DeviceMac."TXPackets"), $TXPackets);
 								$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Transfer Data TXPackets ").$TXPackets, 0);
 								$RXPackets = $DeviceFromController["rx_packets"];
-								SetValue($this->GetIDForIdent($DeviceMac."RXPackets"), $RXPackets);
+								$this->SetValue($this->GetIDForIdent($DeviceMac."RXPackets"), $RXPackets);
 								$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Transfer Data RXPackets ").$RXPackets, 0);
 							}
 
@@ -298,6 +304,8 @@ public function EndpointMonitor()
 						{
 							//$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("NOT found - Device: ").$DeviceName, 0);
 						}
+						$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Setze Wert"), 0);
+						$this->SetValue($this->GetIDForIdent($DeviceMac."_Connected"), $Connected);
 					}
 				}
 			}
diff --git a/library.json b/library.json
index adc05e7..fd501e0 100644
--- a/library.json
+++ b/library.json
@@ -6,7 +6,7 @@
     "compatibility": {
         "version": "5.5"
     },
-    "version": "1.51",
+    "version": "1.6",
     "build": 0,
     "date": 0
 }
diff --git a/tests/.DS_Store b/tests/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..a2944cfb99b7052f63fdea0a87009563ce378972
GIT binary patch
literal 6148
zcmeHK%}T^T49?UF6%iJ^c<e#E?^%Sp)+Z?5rFQ*+u3hZzy}p7+-@=#h>_hk<ewoB|
z$11KD6-i3wn`V;E%-5l5h{%oR)sSdFL<y8J+CcMx@HlHvBDL_K^UrAOi(zrrOr||w
zGyF{k_}#5jOEa2NN#Xm8cK5^4Nt5Sg-ITB<?ZbV3ckp=l-lO`$V|uxCLSlbVw&{ef
z>59&wN7SG{qZ?q2Ym8nYs|(Inbi0R{SBzX<_ttauy6%;u-}dzV=wQFm6Bcb^3>X8(
zz^^laoXwJK3R-In7z4(@f&u<Mq)^68u@m&44m7?50LCzTL7!_0j!6|W#ZC|-5GSEP
z33XaxI0=V6RliKJ6O?drT6{R2*=dF1{Oovs>fOm@g4P-X#z4rxn%oXJ{~v!||A#?#
zXABqv|B3+@=S4okmNd8aHpjU(g`PrL*sl{@grMV7F?=}{??Ao4o^l76DRzReK<r1r
M(_oD;@S_a80C%llU;qFB

literal 0
HcmV?d00001


From 6c0b6e8af7b61a9fd87a36b0b85868cac7f1c4f1 Mon Sep 17 00:00:00 2001
From: elueckel <30531515+elueckel@users.noreply.github.com>
Date: Sun, 25 Aug 2024 17:48:32 +0200
Subject: [PATCH 09/34] Update library.json


From 8b6a8a177b02316e3a2de1674f1c4ecf533a8f8c Mon Sep 17 00:00:00 2001
From: elueckel <30531515+elueckel@users.noreply.github.com>
Date: Sun, 25 Aug 2024 17:53:58 +0200
Subject: [PATCH 10/34] Update module.php

---
 UniFi Multi Endpoint Monitor/module.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/UniFi Multi Endpoint Monitor/module.php b/UniFi Multi Endpoint Monitor/module.php
index f9cc589..cb4829f 100644
--- a/UniFi Multi Endpoint Monitor/module.php	
+++ b/UniFi Multi Endpoint Monitor/module.php	
@@ -39,7 +39,7 @@ public function Create()
 		$this->RegisterPropertyBoolean("DataPointConnection", 0);
 		$this->RegisterPropertyBoolean("DataPointTransfer", 0);
 
-		$this->RegisterTimer("UniFi Multi Endpoint Monitor", 0, MODUL_PREFIX."_MultiEndpointMonitor(\$_IPS['TARGET']);");
+		$this->RegisterTimer("UniFi Multi Endpoint Monitor", 0, MODUL_PREFIX."_EndpointMonitor(\$_IPS['TARGET']);");
 	}
 
 	public function Destroy()
@@ -152,7 +152,7 @@ public function AuthenticateAndGetData(string $UnifiAPI = "")
 		}
 	}
 
-	public function MultiEndpointMonitor()
+	public function EndpointMonitor()
 	{
 		$ControllerType = $this->ReadPropertyInteger("ControllerType");
 		$ServerAddress = $this->ReadPropertyString("ServerAddress");

From 27203254db913beb5f90f021021a461007bb7886 Mon Sep 17 00:00:00 2001
From: elueckel <30531515+elueckel@users.noreply.github.com>
Date: Sun, 25 Aug 2024 17:54:20 +0200
Subject: [PATCH 11/34] Update form.json

---
 UniFi Multi Endpoint Monitor/form.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UniFi Multi Endpoint Monitor/form.json b/UniFi Multi Endpoint Monitor/form.json
index df3be03..61e38d3 100644
--- a/UniFi Multi Endpoint Monitor/form.json	
+++ b/UniFi Multi Endpoint Monitor/form.json	
@@ -194,7 +194,7 @@
                 {
                     "type": "Button",
                     "label": "Get Device Data",
-                    "onClick": "UMEM_MultiEndpointMonitor($id);"
+                    "onClick": "UMEM_EndpointMonitor($id);"
                 },
                 {
                     "type": "Button",

From 9cfd3f4be7ccc7730f8bd64552ae4dbdb7de1e0d Mon Sep 17 00:00:00 2001
From: elueckel <30531515+elueckel@users.noreply.github.com>
Date: Sun, 25 Aug 2024 17:56:22 +0200
Subject: [PATCH 12/34] Update module.php

---
 UniFi Multi Endpoint Monitor/module.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UniFi Multi Endpoint Monitor/module.php b/UniFi Multi Endpoint Monitor/module.php
index cb4829f..b6c98f1 100644
--- a/UniFi Multi Endpoint Monitor/module.php	
+++ b/UniFi Multi Endpoint Monitor/module.php	
@@ -304,7 +304,7 @@ public function EndpointMonitor()
 						{
 							//$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("NOT found - Device: ").$DeviceName, 0);
 						}
-						$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Setze Wert"), 0);
+						$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Setze Wert").$Connected, 0);
 						$this->SetValue($this->GetIDForIdent($DeviceMac."_Connected"), $Connected);
 					}
 				}

From b1f47fc277e0fdb0a84ab7a442031cc5f4763a21 Mon Sep 17 00:00:00 2001
From: elueckel <30531515+elueckel@users.noreply.github.com>
Date: Sun, 25 Aug 2024 17:57:59 +0200
Subject: [PATCH 13/34] Update module.php

---
 UniFi Multi Endpoint Monitor/module.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/UniFi Multi Endpoint Monitor/module.php b/UniFi Multi Endpoint Monitor/module.php
index b6c98f1..c9f6cc0 100644
--- a/UniFi Multi Endpoint Monitor/module.php	
+++ b/UniFi Multi Endpoint Monitor/module.php	
@@ -259,7 +259,7 @@ public function EndpointMonitor()
 								$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Connection Data Uptime in hours ").round($Uptime / 3600, 0), 0);
 							}
 
-							if ($this->ReadPropertyBoolean("DataPointConnection") == 1 AND $ConnectionType == 0 AND $ConnectionConfigError == false);
+							if ($this->ReadPropertyBoolean("DataPointConnection") == 1 && $ConnectionType == 0 && $ConnectionConfigError == false);
 							{
 								$Accesspoint = $DeviceFromController["ap_mac"];
 								$this->SetValue($this->GetIDForIdent($DeviceMac."Accesspoint"), $Accesspoint);
@@ -283,7 +283,7 @@ public function EndpointMonitor()
 								$this->SetValue($this->GetIDForIdent($DeviceMac."SignalStrength"), $SignalStrength);
 								$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Connection Data SignalStrength ").$SignalStrength, 0);
 							}
-							if ($this->ReadPropertyBoolean("DataPointTransfer") == 1 AND $ConnectionType == 0 AND $ConnectionConfigError == false)
+							if ($this->ReadPropertyBoolean("DataPointTransfer") == 1 && $ConnectionType == 0 && $ConnectionConfigError == false)
 							{
 								$TXBytes = $DeviceFromController["tx_bytes"];
 								$this->SetValue($this->GetIDForIdent($DeviceMac."TXBytes"), $TXBytes / 1000000);

From 0440d8e715e0886908903750a38270612dc30415 Mon Sep 17 00:00:00 2001
From: elueckel <30531515+elueckel@users.noreply.github.com>
Date: Sun, 25 Aug 2024 18:01:08 +0200
Subject: [PATCH 14/34] Update module.php

---
 UniFi Multi Endpoint Monitor/module.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UniFi Multi Endpoint Monitor/module.php b/UniFi Multi Endpoint Monitor/module.php
index c9f6cc0..d6012e4 100644
--- a/UniFi Multi Endpoint Monitor/module.php	
+++ b/UniFi Multi Endpoint Monitor/module.php	
@@ -305,7 +305,7 @@ public function EndpointMonitor()
 							//$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("NOT found - Device: ").$DeviceName, 0);
 						}
 						$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Setze Wert").$Connected, 0);
-						$this->SetValue($this->GetIDForIdent($DeviceMac."_Connected"), $Connected);
+						$SetValue($this->GetIDForIdent($DeviceMac."_Connected"), $Connected);
 					}
 				}
 			}

From c80303dccc7fcaffdc6aa6d32eda144a837df12f Mon Sep 17 00:00:00 2001
From: elueckel <30531515+elueckel@users.noreply.github.com>
Date: Sun, 25 Aug 2024 18:02:52 +0200
Subject: [PATCH 15/34] Update module.php

---
 UniFi Multi Endpoint Monitor/module.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UniFi Multi Endpoint Monitor/module.php b/UniFi Multi Endpoint Monitor/module.php
index d6012e4..8044354 100644
--- a/UniFi Multi Endpoint Monitor/module.php	
+++ b/UniFi Multi Endpoint Monitor/module.php	
@@ -305,7 +305,7 @@ public function EndpointMonitor()
 							//$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("NOT found - Device: ").$DeviceName, 0);
 						}
 						$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Setze Wert").$Connected, 0);
-						$SetValue($this->GetIDForIdent($DeviceMac."_Connected"), $Connected);
+						$SetValueBoolean($this->GetIDForIdent($DeviceMac."_Connected"), $Connected);
 					}
 				}
 			}

From e93258891ed86b5e92d54047fb339ed0f5b6c987 Mon Sep 17 00:00:00 2001
From: elueckel <30531515+elueckel@users.noreply.github.com>
Date: Sun, 25 Aug 2024 18:03:20 +0200
Subject: [PATCH 16/34] Update module.php

---
 UniFi Multi Endpoint Monitor/module.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UniFi Multi Endpoint Monitor/module.php b/UniFi Multi Endpoint Monitor/module.php
index 8044354..ef1743f 100644
--- a/UniFi Multi Endpoint Monitor/module.php	
+++ b/UniFi Multi Endpoint Monitor/module.php	
@@ -305,7 +305,7 @@ public function EndpointMonitor()
 							//$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("NOT found - Device: ").$DeviceName, 0);
 						}
 						$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Setze Wert").$Connected, 0);
-						$SetValueBoolean($this->GetIDForIdent($DeviceMac."_Connected"), $Connected);
+						SetValueBoolean($this->GetIDForIdent($DeviceMac."_Connected"), $Connected);
 					}
 				}
 			}

From 6d793e858e1d1684ce0c4cd7418fa7c03eb35c90 Mon Sep 17 00:00:00 2001
From: elueckel <30531515+elueckel@users.noreply.github.com>
Date: Sun, 25 Aug 2024 18:04:56 +0200
Subject: [PATCH 17/34] Update module.php

---
 UniFi Multi Endpoint Monitor/module.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/UniFi Multi Endpoint Monitor/module.php b/UniFi Multi Endpoint Monitor/module.php
index ef1743f..0cb959e 100644
--- a/UniFi Multi Endpoint Monitor/module.php	
+++ b/UniFi Multi Endpoint Monitor/module.php	
@@ -259,7 +259,7 @@ public function EndpointMonitor()
 								$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Connection Data Uptime in hours ").round($Uptime / 3600, 0), 0);
 							}
 
-							if ($this->ReadPropertyBoolean("DataPointConnection") == 1 && $ConnectionType == 0 && $ConnectionConfigError == false);
+							if ($this->ReadPropertyBoolean("DataPointConnection") == 1 AND $ConnectionType == 0 AND $ConnectionConfigError == false);
 							{
 								$Accesspoint = $DeviceFromController["ap_mac"];
 								$this->SetValue($this->GetIDForIdent($DeviceMac."Accesspoint"), $Accesspoint);
@@ -283,7 +283,7 @@ public function EndpointMonitor()
 								$this->SetValue($this->GetIDForIdent($DeviceMac."SignalStrength"), $SignalStrength);
 								$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Connection Data SignalStrength ").$SignalStrength, 0);
 							}
-							if ($this->ReadPropertyBoolean("DataPointTransfer") == 1 && $ConnectionType == 0 && $ConnectionConfigError == false)
+							if ($this->ReadPropertyBoolean("DataPointTransfer") == 1 AND $ConnectionType == 0 AND $ConnectionConfigError == false)
 							{
 								$TXBytes = $DeviceFromController["tx_bytes"];
 								$this->SetValue($this->GetIDForIdent($DeviceMac."TXBytes"), $TXBytes / 1000000);

From 473bf70d029ea48780dda4d5cef4cd22a400a693 Mon Sep 17 00:00:00 2001
From: elueckel <30531515+elueckel@users.noreply.github.com>
Date: Sun, 25 Aug 2024 18:07:17 +0200
Subject: [PATCH 18/34] Update module.php

---
 UniFi Multi Endpoint Monitor/module.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/UniFi Multi Endpoint Monitor/module.php b/UniFi Multi Endpoint Monitor/module.php
index 0cb959e..3872c17 100644
--- a/UniFi Multi Endpoint Monitor/module.php	
+++ b/UniFi Multi Endpoint Monitor/module.php	
@@ -209,7 +209,6 @@ public function EndpointMonitor()
 							$Connected = true;				
 							$ConnectionMethod = $DeviceFromController["is_wired"];
 							$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Setze Wert"), 0);
-						$this->SetValue($this->GetIDForIdent($DeviceMac."_Connected"), $Connected);
 
 							if ($ConnectionMethod == true && $ConnectionType == 0)
 							{

From 3cc9bfd0cad362121bee24ca064b3406b6934a3e Mon Sep 17 00:00:00 2001
From: elueckel <30531515+elueckel@users.noreply.github.com>
Date: Sun, 25 Aug 2024 18:14:37 +0200
Subject: [PATCH 19/34] Update module.php

---
 UniFi Multi Endpoint Monitor/module.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UniFi Multi Endpoint Monitor/module.php b/UniFi Multi Endpoint Monitor/module.php
index 3872c17..e5445dd 100644
--- a/UniFi Multi Endpoint Monitor/module.php	
+++ b/UniFi Multi Endpoint Monitor/module.php	
@@ -258,7 +258,7 @@ public function EndpointMonitor()
 								$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Connection Data Uptime in hours ").round($Uptime / 3600, 0), 0);
 							}
 
-							if ($this->ReadPropertyBoolean("DataPointConnection") == 1 AND $ConnectionType == 0 AND $ConnectionConfigError == false);
+							if ($this->ReadPropertyBoolean("DataPointConnection") == 1 AND $ConnectionType == 0 AND $ConnectionConfigError == false)
 							{
 								$Accesspoint = $DeviceFromController["ap_mac"];
 								$this->SetValue($this->GetIDForIdent($DeviceMac."Accesspoint"), $Accesspoint);

From 7b2ecb61a4b405097af8bb1ceb865a120fe25fe6 Mon Sep 17 00:00:00 2001
From: elueckel <30531515+elueckel@users.noreply.github.com>
Date: Sun, 25 Aug 2024 18:17:10 +0200
Subject: [PATCH 20/34] Update module.php

---
 UniFi Multi Endpoint Monitor/module.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/UniFi Multi Endpoint Monitor/module.php b/UniFi Multi Endpoint Monitor/module.php
index e5445dd..3d3cd8d 100644
--- a/UniFi Multi Endpoint Monitor/module.php	
+++ b/UniFi Multi Endpoint Monitor/module.php	
@@ -303,8 +303,7 @@ public function EndpointMonitor()
 						{
 							//$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("NOT found - Device: ").$DeviceName, 0);
 						}
-						$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Setze Wert").$Connected, 0);
-						SetValueBoolean($this->GetIDForIdent($DeviceMac."_Connected"), $Connected);
+						$this->SetValueBoolean($this->GetIDForIdent($DeviceMac."_Connected"), $Connected);
 					}
 				}
 			}

From c6202fb52316c77775fec7be9c7a5b2aa596ca96 Mon Sep 17 00:00:00 2001
From: elueckel <30531515+elueckel@users.noreply.github.com>
Date: Sun, 25 Aug 2024 18:18:11 +0200
Subject: [PATCH 21/34] Update module.php

---
 UniFi Multi Endpoint Monitor/module.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UniFi Multi Endpoint Monitor/module.php b/UniFi Multi Endpoint Monitor/module.php
index 3d3cd8d..6a35445 100644
--- a/UniFi Multi Endpoint Monitor/module.php	
+++ b/UniFi Multi Endpoint Monitor/module.php	
@@ -303,7 +303,7 @@ public function EndpointMonitor()
 						{
 							//$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("NOT found - Device: ").$DeviceName, 0);
 						}
-						$this->SetValueBoolean($this->GetIDForIdent($DeviceMac."_Connected"), $Connected);
+						$this->SetValue($this->GetIDForIdent($DeviceMac."_Connected"), $Connected);
 					}
 				}
 			}

From 8b84d3515da8c1a4f71e06a48ce4bc9e070d5624 Mon Sep 17 00:00:00 2001
From: elueckel <30531515+elueckel@users.noreply.github.com>
Date: Sun, 25 Aug 2024 18:19:19 +0200
Subject: [PATCH 22/34] Update module.php

---
 UniFi Multi Endpoint Monitor/module.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UniFi Multi Endpoint Monitor/module.php b/UniFi Multi Endpoint Monitor/module.php
index 6a35445..0e57579 100644
--- a/UniFi Multi Endpoint Monitor/module.php	
+++ b/UniFi Multi Endpoint Monitor/module.php	
@@ -303,7 +303,7 @@ public function EndpointMonitor()
 						{
 							//$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("NOT found - Device: ").$DeviceName, 0);
 						}
-						$this->SetValue($this->GetIDForIdent($DeviceMac."_Connected"), $Connected);
+						SetValue($this->GetIDForIdent($DeviceMac."_Connected"), $Connected);
 					}
 				}
 			}

From 95bd45c80e0586c38878be522cd45b24bf6b6d8e Mon Sep 17 00:00:00 2001
From: elueckel <30531515+elueckel@users.noreply.github.com>
Date: Sun, 25 Aug 2024 18:22:38 +0200
Subject: [PATCH 23/34] Update module.php

---
 UniFi Multi Endpoint Monitor/module.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UniFi Multi Endpoint Monitor/module.php b/UniFi Multi Endpoint Monitor/module.php
index 0e57579..9bdc4e1 100644
--- a/UniFi Multi Endpoint Monitor/module.php	
+++ b/UniFi Multi Endpoint Monitor/module.php	
@@ -303,7 +303,7 @@ public function EndpointMonitor()
 						{
 							//$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("NOT found - Device: ").$DeviceName, 0);
 						}
-						SetValue($this->GetIDForIdent($DeviceMac."_Connected"), $Connected);
+						this->$SetValue($DeviceMac."_Connected"), $Connected);
 					}
 				}
 			}

From 1b7b2d137e04b9cfedd6cb54dd23791e1a99b439 Mon Sep 17 00:00:00 2001
From: elueckel <30531515+elueckel@users.noreply.github.com>
Date: Sun, 25 Aug 2024 18:23:47 +0200
Subject: [PATCH 24/34] Update module.php

---
 UniFi Multi Endpoint Monitor/module.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UniFi Multi Endpoint Monitor/module.php b/UniFi Multi Endpoint Monitor/module.php
index 9bdc4e1..e421edf 100644
--- a/UniFi Multi Endpoint Monitor/module.php	
+++ b/UniFi Multi Endpoint Monitor/module.php	
@@ -303,7 +303,7 @@ public function EndpointMonitor()
 						{
 							//$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("NOT found - Device: ").$DeviceName, 0);
 						}
-						this->$SetValue($DeviceMac."_Connected"), $Connected);
+						this->$SetValue($DeviceMac."_Connected", $Connected);
 					}
 				}
 			}

From f8d9c8a0aef17c72ced10f158cd0bbf833967fbf Mon Sep 17 00:00:00 2001
From: elueckel <30531515+elueckel@users.noreply.github.com>
Date: Sun, 25 Aug 2024 18:24:27 +0200
Subject: [PATCH 25/34] Update module.php

---
 UniFi Multi Endpoint Monitor/module.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UniFi Multi Endpoint Monitor/module.php b/UniFi Multi Endpoint Monitor/module.php
index e421edf..0652c94 100644
--- a/UniFi Multi Endpoint Monitor/module.php	
+++ b/UniFi Multi Endpoint Monitor/module.php	
@@ -303,7 +303,7 @@ public function EndpointMonitor()
 						{
 							//$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("NOT found - Device: ").$DeviceName, 0);
 						}
-						this->$SetValue($DeviceMac."_Connected", $Connected);
+						$this->SetValue($DeviceMac."_Connected", $Connected);
 					}
 				}
 			}

From 0ad6905f4f18949c4393c89251553ae5a75a6991 Mon Sep 17 00:00:00 2001
From: elueckel <30531515+elueckel@users.noreply.github.com>
Date: Sun, 25 Aug 2024 18:29:00 +0200
Subject: [PATCH 26/34] Update module.php

---
 UniFi Multi Endpoint Monitor/module.php | 32 ++++++++++++-------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/UniFi Multi Endpoint Monitor/module.php b/UniFi Multi Endpoint Monitor/module.php
index 0652c94..6e397f7 100644
--- a/UniFi Multi Endpoint Monitor/module.php	
+++ b/UniFi Multi Endpoint Monitor/module.php	
@@ -224,7 +224,7 @@ public function EndpointMonitor()
 							{	
 								if (isset($DeviceFromController["ip"])) {
 									$IPAddress = $DeviceFromController["ip"];
-									$this->SetValue($this->GetIDForIdent($DeviceMac."IPAddress"), $IPAddress);
+									$this->SetValue($DeviceMac."IPAddress", $IPAddress);
 									$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Network Data IP ").$IPAddress, 0);
 								}
 								if ("" != $DeviceFromController["hostname"])
@@ -235,7 +235,7 @@ public function EndpointMonitor()
 								{
 									$Hostname = "";
 								}
-								$this->SetValue($this->GetIDForIdent($DeviceMac."Hostname"), $Hostname);
+								$this->SetValue($DeviceMac."Hostname", $Hostname);
 								$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Network Data Hostname ").$Hostname, 0);
 								$Connected = true;	
 							}
@@ -245,56 +245,56 @@ public function EndpointMonitor()
 								if (isset($DeviceFromController["satisfaction"])) {
 									$Satisfaction = $DeviceFromController["satisfaction"];
 									//$Satisfaction = isset($DeviceMac["satisfaction"]);
-									$this->SetValue($this->GetIDForIdent($DeviceMac."Satisfaction"), $Satisfaction);
+									$this->SetValue($DeviceMac."Satisfaction", $Satisfaction);
 									$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Connection Data Satisfaction ").$Satisfaction, 0);
 								}
 								//$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Connection Data Satisfaction ").$Satisfaction, 0);
 								$SLastSeen = $DeviceFromController["last_seen"];
 								$SLastSeen = $SLastSeen + date("Z");
-								$this->SetValue($this->GetIDForIdent($DeviceMac."LastSeen"), gmdate("Y-m-d H:i:s", $SLastSeen));
+								$this->SetValue($DeviceMac."LastSeen", gmdate("Y-m-d H:i:s", $SLastSeen));
 								$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Connection Data Last Seen ").gmdate("Y-m-d H:i:s", $SLastSeen), 0);
 								$Uptime = $DeviceFromController["uptime"];
-								$this->SetValue($this->GetIDForIdent($DeviceMac."Uptime"), round($Uptime / 3600, 0));
+								$this->SetValue($DeviceMac."Uptime", round($Uptime / 3600, 0));
 								$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Connection Data Uptime in hours ").round($Uptime / 3600, 0), 0);
 							}
 
 							if ($this->ReadPropertyBoolean("DataPointConnection") == 1 AND $ConnectionType == 0 AND $ConnectionConfigError == false)
 							{
 								$Accesspoint = $DeviceFromController["ap_mac"];
-								$this->SetValue($this->GetIDForIdent($DeviceMac."Accesspoint"), $Accesspoint);
+								$this->SetValue($DeviceMac."Accesspoint", $Accesspoint);
 								$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Connection Data Accesspoint ").$Accesspoint, 0);
 								$Channel = $DeviceFromController["channel"];
-								$this->SetValue($this->GetIDForIdent($DeviceMac."Channel"), $Channel);
+								$this->SetValue($DeviceMac."Channel", $Channel);
 								$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Connection Data Channel ").$Channel, 0);
 								$Radio = $DeviceFromController["radio"];
-								$this->SetValue($this->GetIDForIdent($DeviceMac."Radio"), $Radio);
+								$this->SetValue($DeviceMac."Radio") $Radio);
 								$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Connection Data Radio ").$Radio, 0);
 								$ESSID = $DeviceFromController["essid"];
-								$this->SetValue($this->GetIDForIdent($DeviceMac."ESSID"), $ESSID);
+								$this->SetValue($DeviceMac."ESSID", $ESSID);
 								$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Connection Data ESSID ").$ESSID, 0);
 								$RSSI = $DeviceFromController["rssi"];
-								$this->SetValue($this->GetIDForIdent($DeviceMac."RSSI"), $RSSI);
+								$this->SetValue($DeviceMac."RSSI", $RSSI);
 								$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Connection Data RSSI ").$RSSI, 0);
 								$Noise = $DeviceFromController["noise"];
-								$this->SetValue($this->GetIDForIdent($DeviceMac."Noise"), $Noise);
+								$this->SetValue($DeviceMac."Noise", $Noise);
 								$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Connection Data Noise ").$Noise, 0);
 								$SignalStrength = $DeviceFromController["signal"];
-								$this->SetValue($this->GetIDForIdent($DeviceMac."SignalStrength"), $SignalStrength);
+								$this->SetValue($DeviceMac."SignalStrength", $SignalStrength);
 								$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Connection Data SignalStrength ").$SignalStrength, 0);
 							}
 							if ($this->ReadPropertyBoolean("DataPointTransfer") == 1 AND $ConnectionType == 0 AND $ConnectionConfigError == false)
 							{
 								$TXBytes = $DeviceFromController["tx_bytes"];
-								$this->SetValue($this->GetIDForIdent($DeviceMac."TXBytes"), $TXBytes / 1000000);
+								$this->SetValue($DeviceMac."TXBytes", $TXBytes / 1000000);
 								$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Transfer Data TXBytes ").$TXBytes / 1000000, 0);
 								$RXBytes = $DeviceFromController["rx_bytes"];
-								$this->SetValue($this->GetIDForIdent($DeviceMac."RXBytes"), $RXBytes / 1000000);
+								$this->SetValue($DeviceMac."RXBytes", $RXBytes / 1000000);
 								$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Transfer Data RXBytes ").$RXBytes / 1000000, 0);
 								$TXPackets = $DeviceFromController["tx_packets"];
-								$this->SetValue($this->GetIDForIdent($DeviceMac."TXPackets"), $TXPackets);
+								$this->SetValue($DeviceMac."TXPackets", $TXPackets);
 								$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Transfer Data TXPackets ").$TXPackets, 0);
 								$RXPackets = $DeviceFromController["rx_packets"];
-								$this->SetValue($this->GetIDForIdent($DeviceMac."RXPackets"), $RXPackets);
+								$this->SetValue($DeviceMac."RXPackets", $RXPackets);
 								$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Transfer Data RXPackets ").$RXPackets, 0);
 							}
 

From f306fd2af02552d3519ce311a6291705d6d2ad23 Mon Sep 17 00:00:00 2001
From: elueckel <30531515+elueckel@users.noreply.github.com>
Date: Sun, 25 Aug 2024 18:30:43 +0200
Subject: [PATCH 27/34] Update module.php

---
 UniFi Multi Endpoint Monitor/module.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UniFi Multi Endpoint Monitor/module.php b/UniFi Multi Endpoint Monitor/module.php
index 6e397f7..4337369 100644
--- a/UniFi Multi Endpoint Monitor/module.php	
+++ b/UniFi Multi Endpoint Monitor/module.php	
@@ -267,7 +267,7 @@ public function EndpointMonitor()
 								$this->SetValue($DeviceMac."Channel", $Channel);
 								$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Connection Data Channel ").$Channel, 0);
 								$Radio = $DeviceFromController["radio"];
-								$this->SetValue($DeviceMac."Radio") $Radio);
+								$this->SetValue($DeviceMac."Radio", $Radio);
 								$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Connection Data Radio ").$Radio, 0);
 								$ESSID = $DeviceFromController["essid"];
 								$this->SetValue($DeviceMac."ESSID", $ESSID);

From 9d5bbafa65c44e0d3858783e4345bedc7df2b7f3 Mon Sep 17 00:00:00 2001
From: elueckel <30531515+elueckel@users.noreply.github.com>
Date: Sun, 1 Sep 2024 09:40:45 +0200
Subject: [PATCH 28/34] add isset

---
 UniFi Multi Endpoint Monitor/module.php | 56 +++++++++++++++----------
 1 file changed, 35 insertions(+), 21 deletions(-)

diff --git a/UniFi Multi Endpoint Monitor/module.php b/UniFi Multi Endpoint Monitor/module.php
index 4337369..b581b44 100644
--- a/UniFi Multi Endpoint Monitor/module.php	
+++ b/UniFi Multi Endpoint Monitor/module.php	
@@ -260,27 +260,41 @@ public function EndpointMonitor()
 
 							if ($this->ReadPropertyBoolean("DataPointConnection") == 1 AND $ConnectionType == 0 AND $ConnectionConfigError == false)
 							{
-								$Accesspoint = $DeviceFromController["ap_mac"];
-								$this->SetValue($DeviceMac."Accesspoint", $Accesspoint);
-								$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Connection Data Accesspoint ").$Accesspoint, 0);
-								$Channel = $DeviceFromController["channel"];
-								$this->SetValue($DeviceMac."Channel", $Channel);
-								$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Connection Data Channel ").$Channel, 0);
-								$Radio = $DeviceFromController["radio"];
-								$this->SetValue($DeviceMac."Radio", $Radio);
-								$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Connection Data Radio ").$Radio, 0);
-								$ESSID = $DeviceFromController["essid"];
-								$this->SetValue($DeviceMac."ESSID", $ESSID);
-								$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Connection Data ESSID ").$ESSID, 0);
-								$RSSI = $DeviceFromController["rssi"];
-								$this->SetValue($DeviceMac."RSSI", $RSSI);
-								$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Connection Data RSSI ").$RSSI, 0);
-								$Noise = $DeviceFromController["noise"];
-								$this->SetValue($DeviceMac."Noise", $Noise);
-								$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Connection Data Noise ").$Noise, 0);
-								$SignalStrength = $DeviceFromController["signal"];
-								$this->SetValue($DeviceMac."SignalStrength", $SignalStrength);
-								$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Connection Data SignalStrength ").$SignalStrength, 0);
+								if(isset($DeviceFromController["ap_mac"])) {
+									$Accesspoint = $DeviceFromController["ap_mac"];
+									$this->SetValue($DeviceMac."Accesspoint", $Accesspoint);
+									$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Connection Data Accesspoint ").$Accesspoint, 0);
+								}
+								if(isset($DeviceFromController["channel"])) {
+									$Channel = $DeviceFromController["channel"];
+									$this->SetValue($DeviceMac."Channel", $Channel);
+									$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Connection Data Channel ").$Channel, 0);
+								}
+								if(isset($DeviceFromController["radio"])) {
+									$Radio = $DeviceFromController["radio"];
+									$this->SetValue($DeviceMac."Radio", $Radio);
+									$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Connection Data Radio ").$Radio, 0);
+								}
+								if(isset($DeviceFromController["essid"])) {
+									$ESSID = $DeviceFromController["essid"];
+									$this->SetValue($DeviceMac."ESSID", $ESSID);
+									$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Connection Data ESSID ").$ESSID, 0);
+								}
+								if(isset($DeviceFromController["rssi"])) {
+									$RSSI = $DeviceFromController["rssi"];
+									$this->SetValue($DeviceMac."RSSI", $RSSI);
+									$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Connection Data RSSI ").$RSSI, 0);
+								}
+								if(isset($DeviceFromController["noise"])) {
+									$Noise = $DeviceFromController["noise"];
+									$this->SetValue($DeviceMac."Noise", $Noise);
+									$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Connection Data Noise ").$Noise, 0);
+								}
+								if(isset($DeviceFromController["signal"])) {
+									$SignalStrength = $DeviceFromController["signal"];
+									$this->SetValue($DeviceMac."SignalStrength", $SignalStrength);
+									$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Connection Data SignalStrength ").$SignalStrength, 0);
+								}
 							}
 							if ($this->ReadPropertyBoolean("DataPointTransfer") == 1 AND $ConnectionType == 0 AND $ConnectionConfigError == false)
 							{

From 465dcc3999be77616c80c811b765f5a82276434b Mon Sep 17 00:00:00 2001
From: elueckel <30531515+elueckel@users.noreply.github.com>
Date: Sun, 1 Sep 2024 10:54:51 +0200
Subject: [PATCH 29/34] this->setvalue & last uplink

---
 .DS_Store                                 | Bin 14340 -> 12292 bytes
 UniFi Device Monitor/README_en.md         |   5 +--
 UniFi Device Monitor/module.php           |  30 +++++++++---------
 UniFi Endpoint Blocker/module.php         |   2 +-
 UniFi Endpoint Monitor/module.php         |  36 +++++++++++-----------
 UniFi Internet Controller/module.php      |   6 ++--
 UniFi Multi Endpoint Monitor/README.md    |   3 +-
 UniFi Multi Endpoint Monitor/README_en.md |   1 +
 UniFi Multi Endpoint Monitor/locale.json  |   1 +
 UniFi Multi Endpoint Monitor/module.php   |   6 ++++
 UniFi PoE Control/module.php              |   4 +--
 UniFi Presence Manager/module.php         |   8 ++---
 tests/.DS_Store                           | Bin 6148 -> 6148 bytes
 13 files changed, 56 insertions(+), 46 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index 4284437f780c58647f0aa77ae1b377be7d88ec2a..1b99c0725db13bd9bea8d5e5302309aaaa636b7b 100644
GIT binary patch
literal 12292
zcmeHNO^6&t6n?!ko9$&IS#i}B6dU{t7&p7d1Vx0|*;ysvO2|Y7qi&{mhTSne-NSTm
zhOjKmMMQ%~y(;3}<mS<XdJxRT9|B$k33$+hNAaLvRrmDN>zUE+UJ;yBLG|mYdhgYH
zuU@~ZdNo93ly~bZL`R9pL=|xUFdlCaS#y9&5&fbLl>%A})aOz0K2Ox7XHhL$CwB;Y
zxM2!Sg1(4)7rh7?mA+1G^3dW^0FGsH@N0`MQiD3}ot5gA*J_6>uZnSlmRGOXj%TCI
z{N*wGgGb6=u1elZv@QA>%@N3|i?)EafVP0PfVRM`X#uhJqL_*GK5W%bZ2@h8TiOC5
zK3J#%mLk{-p$r{(h%LP67h8B)@Gke(fR<<gEJd&vLbRY5At_);YD7m2BP2(=72%a4
z*b8AuPKF#Ae4>$!=!9ZKJA1>D=wy^asGr&b+5*ECco<EY&fb@*9oO;PZP1BN@t<fn
zaB3Il`T($V+VQrcGdey~<9E<6{V5CHGV-#!emmmzsoi#(ez3g!y)jiNP9K^vXUsYC
zwd#)7tp>GV*Du#P=f$scp6A&8_nQ4uv(eq0Us&_ppw@I79ZArvH-Pf$%T2fLb<5ta
zTlXbxHS92F&DqWQ#l5`~Pc9#`o;Z1G|CqJ+)Z^m)#Hs!LS@X^Zjz4{N^P<yoy?3Nm
zWJDp0ZVP|M&nsDVuKQb#4IKoBOon&1)r86Z9a-sHUL{VhJortmpIpf#gPNep%Y!9x
z=xSy=B%JpimUKETQ%y)O0XAgPX-ztBfEEwwCr6~7xC>8-&p>tI930h2%|Xtm_M<N#
zP!2BY1h14||Mlx<WcDl<r$HX>V4V15|0pK=UN&JHw2Mgz5M9EIBhMKAP2`#S4!qQ9
z%guK}qEK%ARp-skguC$DHxDw=sv}=J5~qQ4%ce%He}f-)Y8k<D%a({{x3iDq3}V(g
zJ`5Jac=Rf)B|d``945r!Q)t?EZLxZ%K<7?;ekL82>aO3u8OPle<Ef6Bjgq@y4}zxA
zFX3!_=|6)dvOzwoi#wVI+-`$vc(38^WoXeXT*HWJ^v%R;LL4xY&fK?N`3d&RM6Y_;
z3m?Z`mXXI`UC+y7gy&_FA>o6<b9K=c&=$yVfrmg^r09;E#hJN<yVX85hK#yjSJ$Ia
z{p{Nh@84(o<I)ax@-`ct3SEqzz))qlaeVR0_3)H3gf)m%<FS}LSg=qIK^`CHiOb@s
z$EA_~iD3PzEZ6;5mITf~l5sd(j%6XoVT|7-8*6F}^)jS-19Bmc!nbe5`+=*jqs55M
z=XkU_4v*{j=sDoUJXHODdoR{c=^yAes-Nps0&D1X7F*I)s$h2@wx(jYutY7Yb9syJ
z0$0^*meGx(_#;6vjad}?k${r6_+&gLv&Qrf&jC~6quOKj=L`K52*VgyWHbh|iTN1@
zpar&RuR!WcnEU=7YJBeOKG3Q*O3i0N_D`wxWwT2D$t*Tk=lrYp<Fr@mvDKKEho1Qh
zeF)Lh`%7Z4#P?a^|5-d+!v0^yzehvlDOF#~#A`zQEtAgN=UR)fUnY9h?{0n``&~vJ
zgJ{&};V2UenWj-uj*9#L_3{7zlSulZEubwhnHDgLm1?C7-Hb8%iMw_S^#W?Y09T^p
xA+O>A<yAbOyov{un^}R6_fiCVAw&zxfBz={z5b86Ez#@$!R~39{r(T@|6dR;h8X|=

delta 865
zcmZokXem%&U|?W$DortDU@!nOIe-{M3-ADmb_NCoo{0+jj1Ch6k|&=N<DJ|u#%Ee9
z%#g`YlAE96l9ZF51k!U!D#Cq|?J-9nn}tD-Asr-NkYN~{oS$0&6k}lEov>Mu@f+J@
z1xCKj>>Ml{jIxs%g=|>s--WwRn#?F8GFetYXtJERB$`N`xWeQ!Liv+>g(tE${xNWw
zG&xtqa&n9a51iLJ`H%AP$&17+CwqwnGqt{*JYUR%?YNAg%Ou;$Z^gV|Ok43io2@0H
z897>=KvKsXC;yjF6G8R@vc%+nl0}>MNI5XFX2b)P1084&XBls<keST9S%FcPnNevn
zkAh?zSMMfdf9K}A;0+gKONj`#$;}FmtiS&21D)|+L3Hvx1s*srk@YY?C`>{X<)N%f
zMYYNQ6%AF@m4V{0_{agqMiN6Yvb|vW$)QS0lev{mHH1?fj!cKBW@RX0NM$Gnk|^pS
zDkf(r`v8OcKco5N3(7i^Z;SD8=v)UzASgIN0@~te0@dPtleej6ZO&0+Vr0rWH2I*Q
z@??Dh-pLEpd05qUfSeAAdU-))$DznfJRmsvl#mion<qG?y9LcA`w4nao+~9kd4seM
zJX)|skS4PvD>(5n7;pn=SL8GeOpWiEC-dw0@-RV?yah<*<P4pOlN;6EQq8T300v9?
ArvLx|

diff --git a/UniFi Device Monitor/README_en.md b/UniFi Device Monitor/README_en.md
index 0f31085..0d3b5aa 100644
--- a/UniFi Device Monitor/README_en.md	
+++ b/UniFi Device Monitor/README_en.md	
@@ -79,5 +79,6 @@ Version 1.3 - 03-01-2022
 Version 1.5 - 03-12-2023
 * New - UI tidied up
 
-Version 1.6 - 25-08-2024
-* New - Number of connected devices are shown
\ No newline at end of file
+Version 1.6 - 01-09-2024
+* New - Number of connected devices are shown
+* Change - SetValue replaced by $this->SetValue 
\ No newline at end of file
diff --git a/UniFi Device Monitor/module.php b/UniFi Device Monitor/module.php
index d63dafa..94643a4 100644
--- a/UniFi Device Monitor/module.php	
+++ b/UniFi Device Monitor/module.php	
@@ -154,62 +154,62 @@ public function DeviceMonitor()
 				if ($this->ReadPropertyBoolean("DataPointBasic") == 1)
 				{
 					$DeviceModel = $JSONData["data"][0]["model"];
-					SetValue($this->GetIDForIdent("DeviceModel"), $DeviceModel);
+					$this->SetValue("DeviceModel", $DeviceModel);
 					$this->SendDebug($this->Translate("Device Monitor"), $this->Translate("Device Model ").$DeviceModel, 0);
 					$SoftwareVersion = $JSONData["data"][0]["version"];
-					SetValue($this->GetIDForIdent("SoftwareVersion"), $SoftwareVersion);
+					$this->SetValue("SoftwareVersion", $SoftwareVersion);
 					$this->SendDebug($this->Translate("Device Monitor"), $this->Translate("Software Version ").$SoftwareVersion, 0);
 					//$Satisfaction = $JSONData["data"][0]["satisfaction"];
 					//SetValue($this->GetIDForIdent("Satisfaction"),$Satisfaction);
 					//$this->SendDebug($this->Translate("Device Monitor"),$this->Translate("Device Satisfaction ").$Satisfaction,0);
 					$SLastSeen = $JSONData["data"][0]["last_seen"];
-					SetValue($this->GetIDForIdent("LastSeen"), gmdate("Y-m-d H:i:s", $SLastSeen));
+					$this->SetValue("LastSeen", gmdate("Y-m-d H:i:s", $SLastSeen));
 					$this->SendDebug($this->Translate("Device Monitor"), $this->Translate("Connection Data Last Seen ").gmdate("Y-m-d H:i:s", $SLastSeen), 0);
 					$Uptime = $JSONData["data"][0]["uptime"];
-					SetValue($this->GetIDForIdent("Uptime"), round($Uptime / 3600, 0));
+					$this->SetValue("Uptime", round($Uptime / 3600, 0));
 					$this->SendDebug($this->Translate("Device Monitor"), $this->Translate("Connection Data Uptime in hours ").round($Uptime / 3600, 0), 0);
 					if (isset($JSONData["data"][0]["name"]))
 					{
 						$Name = $JSONData["data"][0]["name"];
-						SetValue($this->GetIDForIdent("Name"), $Name);
+						$this->SetValue("Name", $Name);
 						$this->SendDebug($this->Translate("Device Monitor"), $this->Translate("Devicename ").$Name, 0);
 					}
 				}
 				if ($this->ReadPropertyBoolean("DataPointHardware") == 1)
 				{
 					$CPULoad = $JSONData["data"][0]["system-stats"]["cpu"];
-					SetValue($this->GetIDForIdent("CPULoad"), $CPULoad);
+					$this->SetValue("CPULoad", $CPULoad);
 					$this->SendDebug($this->Translate("Device Monitor"), $this->Translate("CPU Load ").$CPULoad, 0);
 					$MemoryLoad = $JSONData["data"][0]["system-stats"]["mem"];
-					SetValue($this->GetIDForIdent("MemoryLoad"), $MemoryLoad);
+					$this->SetValue("MemoryLoad", $MemoryLoad);
 					$this->SendDebug($this->Translate("Device Monitor"), $this->Translate("Memory Load ").$MemoryLoad, 0);
 					$ConnectedDevices = $JSONData["data"][0]["num_sta"];
-					SetValue($this->GetIDForIdent("ConnectedDevices"), $ConnectedDevices);
+					$this->SetValue("ConnectedDevices", $ConnectedDevices);
 					$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Connected Devices ").$ConnectedDevices, 0);
 				}
 				if ($this->ReadPropertyBoolean("DataPointSpecific") == 1 && $this->ReadPropertyInteger("DeviceType") == 0 && $DeviceConfigError == false)
 				{
 					$WAN1IP = $JSONData["data"][0]["wan1"]["ip"];
-					SetValue($this->GetIDForIdent("WAN1IP"), $WAN1IP);
+					$this->SetValue("WAN1IP", $WAN1IP);
 					$this->SendDebug($this->Translate("Device Monitor"), $this->Translate("Connection Data WAN 1 IP ").$WAN1IP, 0);
 
 					$WAN1TXBytes = $JSONData["data"][0]["wan1"]["tx_bytes"];
-					SetValue($this->GetIDForIdent("WAN1TXBytes"), $WAN1TXBytes / 1000000);
+					$this->SetValue("WAN1TXBytes", $WAN1TXBytes / 1000000);
 					$this->SendDebug($this->Translate("Device Monitor"), $this->Translate("Transfer Data WAN 1 TX Bytes ").$WAN1TXBytes, 0);
 					$WAN1RXBytes = $JSONData["data"][0]["wan1"]["rx_bytes"];
-					SetValue($this->GetIDForIdent("WAN1RXBytes"), $WAN1RXBytes / 1000000);
+					$this->SetValue("WAN1RXBytes", $WAN1RXBytes / 1000000);
 					$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Transfer Data WAN 1 RX Bytes ").$WAN1RXBytes, 0);
 					$WAN1TXPackets = $JSONData["data"][0]["wan1"]["tx_packets"];
-					SetValue($this->GetIDForIdent("WAN1TXPackets"), $WAN1TXPackets);
+					$this->SetValue("WAN1TXPackets", $WAN1TXPackets);
 					$this->SendDebug($this->Translate("Device Monitor"), $this->Translate("Transfer Data WAN 1 TX Packets ").$WAN1TXPackets, 0);
 					$WAN1RXPackets = $JSONData["data"][0]["wan1"]["tx_packets"];
-					SetValue($this->GetIDForIdent("WAN1RXPackets"), $WAN1RXPackets);
+					$this->SetValue("WAN1RXPackets", $WAN1RXPackets);
 					$this->SendDebug($this->Translate("Device Monitor"), $this->Translate("Transfer Data WAN 1 RXPackets ").$WAN1RXPackets, 0);
 					$WAN1TXErrors = $JSONData["data"][0]["wan1"]["tx_errors"];
-					SetValue($this->GetIDForIdent("WAN1TXErrors"), $WAN1TXErrors);
+					$this->SetValue("WAN1TXErrors", $WAN1TXErrors);
 					$this->SendDebug($this->Translate("Device Monitor"), $this->Translate("Transfer Data WAN 1 TX Errors ").$WAN1TXErrors, 0);
 					$WAN1RXErrors = $JSONData["data"][0]["wan1"]["rx_errors"];
-					SetValue($this->GetIDForIdent("WAN1RXErrors"), $WAN1RXErrors);
+					$this->SetValue("WAN1RXErrors", $WAN1RXErrors);
 					$this->SendDebug($this->Translate("Device Monitor"), $this->Translate("Transfer Data WAN 1 RX Errors ").$WAN1RXErrors, 0);
 				}
 			}
diff --git a/UniFi Endpoint Blocker/module.php b/UniFi Endpoint Blocker/module.php
index 2a14184..15cd5bd 100644
--- a/UniFi Endpoint Blocker/module.php	
+++ b/UniFi Endpoint Blocker/module.php	
@@ -64,7 +64,7 @@ public function ApplyChanges()
 					$this->RegisterVariableBoolean($DeviceMacClean, $DeviceName, "~Switch");
 					$DeviceMacCleanID = @IPS_GetObjectIDByIdent($DeviceMacClean, $this->InstanceID);
 
-					SetValue($DeviceMacCleanID, true);
+					$this->SetValue($DeviceMacCleanID, true);
 					IPS_Sleep(1000);
 					$this->EnableAction($DeviceMacClean);
 					$this->RegisterMessage($DeviceMacCleanID, VM_UPDATE);
diff --git a/UniFi Endpoint Monitor/module.php b/UniFi Endpoint Monitor/module.php
index 7cd364d..5d42bf6 100644
--- a/UniFi Endpoint Monitor/module.php	
+++ b/UniFi Endpoint Monitor/module.php	
@@ -175,7 +175,7 @@ public function EndpointMonitor()
 						//after a device gets reconnected, wait until the controller has rebuilt the data set
 						$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Device was disconnected and is now connected again. Module waits for Controller to collect data."), 0);
 						IPS_Sleep(10000);
-						SetValue($this->GetIDForIdent("Connected"), true);
+						$this->SetValue("Connected", true);
 						$RawData = $this->getRawData($Cookie, $ServerAddress, $ServerPort, $UnifiAPI, $ControllerType);
 						$JSONData = json_decode($RawData, true);
 					}
@@ -195,7 +195,7 @@ public function EndpointMonitor()
 					if ($this->ReadPropertyBoolean("DataPointNetwork") == 1)
 					{
 						$IPAddress = $JSONData["data"][0]["ip"];
-						SetValue($this->GetIDForIdent("IPAddress"), $IPAddress);
+						$this->SetValue("IPAddress", $IPAddress);
 						$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Network Data IP ").$IPAddress, 0);
 
 						if ("" != $JSONData["data"][0]["hostname"])
@@ -210,7 +210,7 @@ public function EndpointMonitor()
 						{
 							$Hostname = "";
 						}
-						SetValue($this->GetIDForIdent("Hostname"), $Hostname);
+						$this->SetValue("Hostname", $Hostname);
 						$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Network Data Hostname ").$Hostname, 0);
 						//$Name = $JSONData["data"][0]["name"];
 						//SetValue($this->GetIDForIdent("Name"),$Name);
@@ -220,60 +220,60 @@ public function EndpointMonitor()
 					{
 						if (isset($JSONData["data"][0]["satisfaction"])) {
 							$Satisfaction = isset($JSONData["data"][0]["satisfaction"]);
-							SetValue($this->GetIDForIdent("Satisfaction"), $Satisfaction);
+							$this->SetValue("Satisfaction", $Satisfaction);
 						}
 						$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Connection Data Satisfaction ").$Satisfaction, 0);
 						$SLastSeen = $JSONData["data"][0]["last_seen"];
-						SetValue($this->GetIDForIdent("LastSeen"), gmdate("Y-m-d H:i:s", $SLastSeen));
+						$this->SetValue("LastSeen", gmdate("Y-m-d H:i:s", $SLastSeen));
 						$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Connection Data Last Seen ").gmdate("Y-m-d H:i:s", $SLastSeen), 0);
 						$Uptime = $JSONData["data"][0]["uptime"];
-						SetValue($this->GetIDForIdent("Uptime"), round($Uptime / 3600, 0));
+						$this->SetValue("Uptime", round($Uptime / 3600, 0));
 						$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Connection Data Uptime in hours ").round($Uptime / 3600, 0), 0);
 					}
 					if ($this->ReadPropertyBoolean("DataPointConnection") == 1 && $this->ReadPropertyInteger("ConnectionType") == 0 && $ConnectionConfigError == false)
 					{
 						$Accesspoint = $JSONData["data"][0]["ap_mac"];
-						SetValue($this->GetIDForIdent("Accesspoint"), $Accesspoint);
+						$this->SetValue("Accesspoint", $Accesspoint);
 						$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Connection Data Accesspoint ").$Accesspoint, 0);
 						$Channel = $JSONData["data"][0]["channel"];
-						SetValue($this->GetIDForIdent("Channel"), $Channel);
+						$this->SetValue("Channel", $Channel);
 						$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Connection Data Channel ").$Channel, 0);
 						$Radio = $JSONData["data"][0]["radio"];
-						SetValue($this->GetIDForIdent("Radio"), $Radio);
+						$this->SetValue("Radio", $Radio);
 						$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Connection Data Radio ").$Radio, 0);
 						$ESSID = $JSONData["data"][0]["essid"];
-						SetValue($this->GetIDForIdent("ESSID"), $ESSID);
+						$this->SetValue("ESSID", $ESSID);
 						$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Connection Data ESSID ").$ESSID, 0);
 						$RSSI = $JSONData["data"][0]["rssi"];
-						SetValue($this->GetIDForIdent("RSSI"), $RSSI);
+						$this->SetValue("RSSI", $RSSI);
 						$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Connection Data RSSI ").$RSSI, 0);
 						$Noise = $JSONData["data"][0]["noise"];
-						SetValue($this->GetIDForIdent("Noise"), $Noise);
+						$this->SetValue("Noise", $Noise);
 						$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Connection Data Noise ").$Noise, 0);
 						$SignalStrength = $JSONData["data"][0]["signal"];
-						SetValue($this->GetIDForIdent("SignalStrength"), $SignalStrength);
+						$this->SetValue("SignalStrength", $SignalStrength);
 						$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Connection Data SignalStrength ").$SignalStrength, 0);
 					}
 					if ($this->ReadPropertyBoolean("DataPointTransfer") == 1 && $this->ReadPropertyInteger("ConnectionType") == 0 && $ConnectionConfigError == false)
 					{
 						$TXBytes = $JSONData["data"][0]["tx_bytes"];
-						SetValue($this->GetIDForIdent("TXBytes"), $TXBytes / 1000000);
+						$this->SetValue("TXBytes", $TXBytes / 1000000);
 						$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Transfer Data TXBytes ").$TXBytes / 1000000, 0);
 						$RXBytes = $JSONData["data"][0]["rx_bytes"];
-						SetValue($this->GetIDForIdent("RXBytes"), $RXBytes / 1000000);
+						$this->SetValue("RXBytes", $RXBytes / 1000000);
 						$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Transfer Data RXBytes ").$RXBytes / 1000000, 0);
 						$TXPackets = $JSONData["data"][0]["tx_packets"];
-						SetValue($this->GetIDForIdent("TXPackets"), $TXPackets);
+						$this->SetValue("TXPackets", $TXPackets);
 						$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Transfer Data TXPackets ").$TXPackets, 0);
 						$RXPackets = $JSONData["data"][0]["rx_packets"];
-						SetValue($this->GetIDForIdent("RXPackets"), $RXPackets);
+						$this->SetValue("RXPackets", $RXPackets);
 						$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Transfer Data RXPackets ").$RXPackets, 0);
 					}
 				}
 				elseif ($DeviceAvailable == "error")
 				{
 					$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Device to be monitored is not available / Disconnected"), 0);
-					SetValue($this->GetIDForIdent("Connected"), false);
+					$this->SetValue("Connected", false);
 				}
 			}
 			else
diff --git a/UniFi Internet Controller/module.php b/UniFi Internet Controller/module.php
index 24aa8a0..f58e1d0 100644
--- a/UniFi Internet Controller/module.php	
+++ b/UniFi Internet Controller/module.php	
@@ -198,7 +198,7 @@ public function GetInternetData()
 								if ($value != GetValue($this->GetIDForIdent($variable['ident'])))
 								{
 									$this->SendDebug($this->Translate($variable['localeName']), $this->Translate("updated to ").$value, 0);
-									SetValue($this->GetIDForIdent($variable['ident']), $value);
+									$this->SetValue($variable['ident'], $value);
 								}
 								else
 								{
@@ -243,7 +243,7 @@ public function GetInternetData()
 								if ($value != GetValue($this->GetIDForIdent($variable['ident'])))
 								{
 									$this->SendDebug($this->Translate($variable['localeName']), $this->Translate("updated to ").$value, 0);
-									SetValue($this->GetIDForIdent($variable['ident']), $value);
+									$this->SetValue($variable['ident'], $value);
 								}
 								else
 								{
@@ -322,7 +322,7 @@ public function GetInternetData()
 										if ($value != GetValue($this->GetIDForIdent($variable['ident'])))
 										{
 											$this->SendDebug($this->Translate($variable['localeName']), $this->Translate("updated to ").$value, 0);
-											SetValue($this->GetIDForIdent($variable['ident']), $value);
+											$this->SetValue($variable['ident'], $value);
 										}
 										else
 										{
diff --git a/UniFi Multi Endpoint Monitor/README.md b/UniFi Multi Endpoint Monitor/README.md
index 2f05832..2b01ecc 100644
--- a/UniFi Multi Endpoint Monitor/README.md	
+++ b/UniFi Multi Endpoint Monitor/README.md	
@@ -90,7 +90,8 @@ Das Modul gibt diverse Informationen im Debug Bereich aus.
 Version 1.5 - 02-12-2023
 * Neu - Modul verfügbar
 
-Version 1.6 - 25-08-2024 (Credit M70 - Danke)
+Version 1.6 - 01-09-2024 (Credit M70 - Danke)
+* Neu - WLAN Geräte melden wo sie zuletzt angemeldet waren
 * Fix - Connection wurde nicht gesetzt
 * Fix - Satisfaction wurde nicht aktualisiert
 * Fix - IP wurde nicht gesetzt
diff --git a/UniFi Multi Endpoint Monitor/README_en.md b/UniFi Multi Endpoint Monitor/README_en.md
index b84ce11..00faef9 100644
--- a/UniFi Multi Endpoint Monitor/README_en.md	
+++ b/UniFi Multi Endpoint Monitor/README_en.md	
@@ -77,6 +77,7 @@ Version 1.6 - 02-12-2023
 * Neu - Modul verfügbar
 
 Version 1.6 - 25-08-2024 (Credit M70 - Danke)
+* New - WLAN Devices report where they have been logged in last
 * Fix - Connection was not set
 * Fix - Satisfaction was not set
 * Fix - IP was not set
diff --git a/UniFi Multi Endpoint Monitor/locale.json b/UniFi Multi Endpoint Monitor/locale.json
index c8c8528..0cf19ac 100644
--- a/UniFi Multi Endpoint Monitor/locale.json	
+++ b/UniFi Multi Endpoint Monitor/locale.json	
@@ -42,6 +42,7 @@
             "Radio": "Funktechnologie",
             "Noise": "Störung",
             "Signal Strength": "Signal Stärke",
+            "Last Uplink Name": "Letzte Verbindung (Access Point)",
             "TX Packets": "TX Pakete",
             "RX Packets": "RX Pakete",
             "Check site name": "Name der Site prüfen",
diff --git a/UniFi Multi Endpoint Monitor/module.php b/UniFi Multi Endpoint Monitor/module.php
index b581b44..8c5e4dc 100644
--- a/UniFi Multi Endpoint Monitor/module.php	
+++ b/UniFi Multi Endpoint Monitor/module.php	
@@ -93,6 +93,7 @@ public function ApplyChanges()
 				$this->MaintainVariable($DeviceMac."RSSI", $DeviceName.$this->Translate(" RSSI"), vtInteger, "", $vpos++, $this->ReadPropertyBoolean("DataPointConnection") == 1 && $ConnectionType == 0);
 				$this->MaintainVariable($DeviceMac."Noise", $DeviceName.$this->Translate(" Noise"), vtInteger, "", $vpos++, $this->ReadPropertyBoolean("DataPointConnection") == 1 && $ConnectionType == 0);
 				$this->MaintainVariable($DeviceMac."SignalStrength", $DeviceName.$this->Translate(" Signal Strength"), vtInteger, "", $vpos++, $this->ReadPropertyBoolean("DataPointConnection") == 1 && $ConnectionType == 0);
+				$this->MaintainVariable($DeviceMac."LastUplinkName", $DeviceName.$this->Translate(" Last Uplink Name"), vtString, "", $vpos++, $this->ReadPropertyBoolean("DataPointConnection") == 1 && $ConnectionType == 0);
 
 				//Transfer Data
 				$vpos = 600;
@@ -295,6 +296,11 @@ public function EndpointMonitor()
 									$this->SetValue($DeviceMac."SignalStrength", $SignalStrength);
 									$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Connection Data SignalStrength ").$SignalStrength, 0);
 								}
+								if(isset($DeviceFromController["last_uplink_name"])) {
+									$LastUplinkName = $DeviceFromController["last_uplink_name"];
+									$this->SetValue($DeviceMac."LastUplinkName", $LastUplinkName);
+									$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Last Uplink Name ").$LastUplinkName, 0);
+								}
 							}
 							if ($this->ReadPropertyBoolean("DataPointTransfer") == 1 AND $ConnectionType == 0 AND $ConnectionConfigError == false)
 							{
diff --git a/UniFi PoE Control/module.php b/UniFi PoE Control/module.php
index b91c060..2d40219 100644
--- a/UniFi PoE Control/module.php	
+++ b/UniFi PoE Control/module.php	
@@ -63,7 +63,7 @@ public function ApplyChanges()
 						$this->RegisterVariableBoolean($DeviceMacClean . $i, $DeviceName . " Port: " . $i, "~Switch");
 						$DeviceMacCleanID = @IPS_GetObjectIDByIdent($DeviceMacClean .$i, $this->InstanceID);
 	
-						SetValue($DeviceMacCleanID, false);
+						$this->SetValue($DeviceMacCleanID, false);
 						IPS_Sleep(1000);
 						$this->EnableAction($DeviceMacClean . $i);
 						$this->RegisterMessage($DeviceMacCleanID, VM_UPDATE);
@@ -218,7 +218,7 @@ public function AuthenticateAndProcessRequest(string $UnifiAPI = "")
 				if ($ControllerFeedbackOK == "ok")
 				{
 					// reset variable
-					SetValue($SenderID, false);
+					$this->SetValue($SenderID, false);
 					//WFC_SendPopup(12345, "Test", "Eine nette <br> Meldung");
 				}
 				elseif ($ControllerFeedbackOK == "error")
diff --git a/UniFi Presence Manager/module.php b/UniFi Presence Manager/module.php
index 78f0051..3059597 100644
--- a/UniFi Presence Manager/module.php	
+++ b/UniFi Presence Manager/module.php	
@@ -144,10 +144,10 @@ public function CheckPresence()
 						{
 							if ($OldPresenceValue == 0)
 							{ //check if new value is different and only than trigger a replacement
-								SetValue($this->GetIDForIdent($DeviceMac), 1);
+								$this->SetValue($DeviceMac, 1);
 								if ($this->ReadPropertyBoolean("GeneralPresenceUpdatedVariable") == 1)
 								{
-									SetValue($this->GetIDForIdent("GeneralPresenceUpdatedVariable"), 1);
+									$this->SetValue("GeneralPresenceUpdatedVariable", 1);
 								}
 								$this->SendDebug($this->Translate("Presence Manager"), $this->Translate("Device ACTIVE with MAC: ".$DeviceMac), 0);
 							}
@@ -159,10 +159,10 @@ public function CheckPresence()
 							{
 								if ($OldPresenceValue == 1)
 								{
-									SetValue($this->GetIDForIdent($DeviceMac), 0);
+									$this->SetValue($DeviceMac, 0);
 									if ($this->ReadPropertyBoolean("GeneralPresenceUpdatedVariable") == 1)
 									{
-										SetValue($this->GetIDForIdent("GeneralPresenceUpdatedVariable"), 1);
+										$this->SetValue("GeneralPresenceUpdatedVariable", 1);
 									}
 									$this->SendDebug($this->Translate("Presence Manager"), $this->Translate("Device NOT active with MAC: ".$DeviceMac), 0);
 								}
diff --git a/tests/.DS_Store b/tests/.DS_Store
index a2944cfb99b7052f63fdea0a87009563ce378972..a7dcb5ecdb6b1651d623812e7936bea62a153774 100644
GIT binary patch
delta 52
ucmZoMXffE}!o+IzP`3NrWKSkpC@Y(3B5T)LX`mP*vn8CRyE%t>h6n)qZxY!6

delta 52
ucmZoMXffE}!o*s<ahA)Z$(~HIP*yh6L{{D>DL^qsW=l9rcXJN&3=shAM-kru


From d6d0479af6f8fff58d9f3d9ec8322ec93cb535bc Mon Sep 17 00:00:00 2001
From: elueckel <30531515+elueckel@users.noreply.github.com>
Date: Thu, 5 Sep 2024 20:35:41 +0200
Subject: [PATCH 30/34] Added Temperatur Checkbox

---
 UniFi Device Monitor/form.json | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/UniFi Device Monitor/form.json b/UniFi Device Monitor/form.json
index 4420c3f..8fa8a19 100644
--- a/UniFi Device Monitor/form.json	
+++ b/UniFi Device Monitor/form.json	
@@ -137,6 +137,11 @@
             "name": "DataPointHardware",
             "caption": "Hardware Data"
         },
+        {
+            "type": "CheckBox",
+            "name": "DataPointTemperature",
+            "caption": "Temperature Data"
+        },
         {
             "type": "CheckBox",
             "name": "DataPointSpecific",

From b6f2fe1b2fd28ef94ea008a3479fdf4a8f28c5f0 Mon Sep 17 00:00:00 2001
From: elueckel <30531515+elueckel@users.noreply.github.com>
Date: Thu, 5 Sep 2024 20:42:51 +0200
Subject: [PATCH 31/34] Temp & Power added

---
 UniFi Device Monitor/module.php | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/UniFi Device Monitor/module.php b/UniFi Device Monitor/module.php
index 94643a4..e6546f2 100644
--- a/UniFi Device Monitor/module.php	
+++ b/UniFi Device Monitor/module.php	
@@ -34,6 +34,8 @@ public function Create()
 
 		$this->RegisterPropertyBoolean("DataPointBasic", 1);
 		$this->RegisterPropertyBoolean("DataPointHardware", 0);
+		$this->RegisterPropertyBoolean("DataPointTemperature", 0);
+		$this->RegisterPropertyBoolean("DataPointPower", 0);
 		$this->RegisterPropertyBoolean("DataPointSpecific", 0);
 
 
@@ -67,6 +69,12 @@ public function ApplyChanges()
 		$this->MaintainVariable("MemoryLoad", $this->Translate("Memory Load"), vtFloat, "", $vpos++, $this->ReadPropertyBoolean("DataPointHardware") == 1);
 		$this->MaintainVariable("ConnectedDevices", $this->Translate("Connected Devices"), vtInteger, "", $vpos++, $this->ReadPropertyBoolean("DataPointHardware") == 1);
 
+		//Temperature Data
+		$vpos = 230;
+		$this->MaintainVariable("TotalUsedPower", $this->Translate("Total Used Power (POE)"), vtFloat, "", $vpos++, $this->ReadPropertyBoolean("DataPointPower") == 1);
+		$this->MaintainVariable("FanLevel", $this->Translate("Fan Level"), vtInteger, "", $vpos++, $this->ReadPropertyBoolean("DataPointTemperature") == 1);
+		$this->MaintainVariable("DeviceTemperature", $this->Translate("Device Temperature"), vtInteger, "", $vpos++, $this->ReadPropertyBoolean("DataPointTemperature") == 1);
+
 
 		//Device Specific Data Connection Data UDM/USG
 		$vpos = 300;
@@ -187,6 +195,30 @@ public function DeviceMonitor()
 					$this->SetValue("ConnectedDevices", $ConnectedDevices);
 					$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Connected Devices ").$ConnectedDevices, 0);
 				}
+				if ($this->ReadPropertyBoolean("DataPointHardware") == 1)
+				{
+					if (isset($JSONData["data"][0]["fan_level"]))
+					{
+						$FanLevel = $JSONData["data"][0]["fan_level"];
+						$this->SetValue("FanLevel", $FanLevel);
+						$this->SendDebug($this->Translate("Device Monitor"), $this->Translate("Fan Level ").$FanLevel, 0);
+					}
+					if (isset($JSONData["data"][0]["general_temperature"]))
+					{
+						$DeviceTemp = $JSONData["data"][0]["general_temperature"];
+						$this->SetValue("DeviceTemperature", $DeviceTemp);
+						$this->SendDebug($this->Translate("Device Monitor"), $this->Translate("Device Temperature ").$DeviceTemp, 0);
+					}
+				}
+				if ($this->ReadPropertyBoolean("DataPointPower") == 1)
+				{
+					if (isset($JSONData["data"][0]["total_used_power"]))
+					{
+						$POETotalPower = $JSONData["data"][0]["total_used_power"];
+						$this->SetValue("TotalUsedPower", $POETotalPower);
+						$this->SendDebug($this->Translate("Device Monitor"), $this->Translate("Total used Power ").$POETotalPower, 0);
+					}
+				}
 				if ($this->ReadPropertyBoolean("DataPointSpecific") == 1 && $this->ReadPropertyInteger("DeviceType") == 0 && $DeviceConfigError == false)
 				{
 					$WAN1IP = $JSONData["data"][0]["wan1"]["ip"];

From de7e891fb6b11bfa10c01ef5a6e84020a3891fc8 Mon Sep 17 00:00:00 2001
From: elueckel <30531515+elueckel@users.noreply.github.com>
Date: Thu, 5 Sep 2024 20:43:57 +0200
Subject: [PATCH 32/34] Added power and Temperature

---
 UniFi Device Monitor/form.json | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/UniFi Device Monitor/form.json b/UniFi Device Monitor/form.json
index 8fa8a19..485f9c4 100644
--- a/UniFi Device Monitor/form.json	
+++ b/UniFi Device Monitor/form.json	
@@ -142,6 +142,11 @@
             "name": "DataPointTemperature",
             "caption": "Temperature Data"
         },
+        {
+            "type": "CheckBox",
+            "name": "DataPointPower",
+            "caption": "Power Data"
+        }, 
         {
             "type": "CheckBox",
             "name": "DataPointSpecific",

From c80da9d6e6379ea73ad4f16e55594dea868033e4 Mon Sep 17 00:00:00 2001
From: elueckel <30531515+elueckel@users.noreply.github.com>
Date: Thu, 5 Sep 2024 20:45:52 +0200
Subject: [PATCH 33/34] Temperature & Power Translation added

---
 UniFi Device Monitor/locale.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/UniFi Device Monitor/locale.json b/UniFi Device Monitor/locale.json
index d1b7868..40f6a4f 100644
--- a/UniFi Device Monitor/locale.json	
+++ b/UniFi Device Monitor/locale.json	
@@ -25,6 +25,8 @@
             "Wired": "Kabel",
             "Basic Data": "Basisdaten",
             "Hardware Data": "Hardwaredaten",
+            "Temperature Data": "Temperatur Daten",
+            "Power Data": "PoE Energie",
             "Device Type": "Geräte Typ",
             "Config error - device monitored is a wired device. Please select wired in the module configuration.": "Konfigurationsfehler - das überwachte Gerät ist verkabelt. Bitte dies in der Modulkonfiguration einstellen.",
             "Network Data": "Netzwerkdaten",

From 237d8b11189e0c4c066e1a7cdb404675d74909c7 Mon Sep 17 00:00:00 2001
From: elueckel <30531515+elueckel@users.noreply.github.com>
Date: Sun, 8 Sep 2024 15:12:32 +0200
Subject: [PATCH 34/34] =?UTF-8?q?Verbundene=20Ger=C3=A4te?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 UniFi Device Monitor/locale.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/UniFi Device Monitor/locale.json b/UniFi Device Monitor/locale.json
index 40f6a4f..98b61ab 100644
--- a/UniFi Device Monitor/locale.json	
+++ b/UniFi Device Monitor/locale.json	
@@ -40,7 +40,6 @@
             "CPU Load": "CPU Auslastung",
             "Connected Devices": "Verbundene Geräte",
             "Memory Load": "Speicher Auslastung",
-            "Connected Devices": "Verbunde Geräte",
             "WAN 1 TX Packets": "WAN 1 TX Pakete",
             "WAN 1 RX Packets": "WAN 1 RX Pakete",
             "WAN 1 TX Errors": "WAN 1 TX Fehler",