added ability to DisableMonitoring by default for certain controllers

xLightsSequencer · Dec 13, 2024 · 0b35e7b · 0b35e7b
1 parent 09a6a9b
commit 0b35e7b
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 16 deletions.
diff --git a/controllers/experience.xcontroller b/controllers/experience.xcontroller
@@ -36,6 +36,7 @@
 		<SmartRemoteTypes>
 			<Type>falcon_v2</Type>
 		</SmartRemoteTypes>
+		<DisableMonitoring/>
 		<ConfigDriver>Experience</ConfigDriver>
 	</AbstractVariant>
 	<Controller Name="Genius Pixel 8">

diff --git a/controllers/hinkspix.xcontroller b/controllers/hinkspix.xcontroller
@@ -18,6 +18,7 @@
 			<SupportsAutoLayout/>
 			<SupportsFullxLightsControl/>
 			<SupportsDefaultBrightness/>
+			<DisableMonitoring/>
 			<PixelProtocols>
 				<Protocol>ws2811</Protocol>
 				<Protocol>ws2801</Protocol>
@@ -56,6 +57,7 @@
 			<SupportsAutoLayout/>
 			<SupportsFullxLightsControl/>
 			<SupportsDefaultBrightness/>
+			<DisableMonitoring/>
 			<PixelProtocols>
 				<Protocol>ws2811</Protocol>
 				<Protocol>ws2801</Protocol>
@@ -102,6 +104,7 @@
 			<SupportsAutoLayout/>
 			<SupportsFullxLightsControl/>
 			<SupportsDefaultBrightness/>
+			<DisableMonitoring/>
 			<PixelProtocols>
 				<Protocol>ws2811</Protocol>
 				<Protocol>ws2801</Protocol>

diff --git a/controllers/holidaycoro.xcontroller b/controllers/holidaycoro.xcontroller
@@ -14,6 +14,7 @@
 			<AllInputUniversesMustBeSameSize/>
             <NeedsFullUniverseForSerial/>
 			<SupportsAutoLayout/>
+			<DisableMonitoring/>
 			<PixelProtocols>
 				<Protocol>ws2811</Protocol>
 				<Protocol>tm18xx</Protocol>
@@ -46,6 +47,7 @@
 			<AllInputUniversesMustBeSameSize/>
 			<SupportsAutoLayout/>
             <NeedsFullUniverseForSerial/>
+			<DisableMonitoring/>
 			<PixelProtocols>
 				<Protocol>ws2811</Protocol>
 				<Protocol>tm18xx</Protocol>
@@ -77,6 +79,7 @@
 			<MaxPixelPortChannels>1020</MaxPixelPortChannels>
 			<AllInputUniversesMustBeSameSize/>
 			<SupportsAutoLayout/>
+			<DisableMonitoring/>
 			<PixelProtocols>
 				<Protocol>ws2811</Protocol>
 				<Protocol>tm18xx</Protocol>

diff --git a/xLights/controllers/ControllerCaps.cpp b/xLights/controllers/ControllerCaps.cpp
@@ -727,6 +727,9 @@ std::string ControllerCaps::GetConfigDriver() const
     return GetXmlNodeContent(_config, "ConfigDriver", "");
 }
 
+bool ControllerCaps::DisableMonitoring() const {
+    return DoesXmlNodeExist(_config, "DisableMonitoring");
+}
 
 std::vector<std::string> ControllerCaps::GetSmartRemoteTypes() const {
     if (!SupportsSmartRemotes()) {

diff --git a/xLights/controllers/ControllerCaps.h b/xLights/controllers/ControllerCaps.h
@@ -145,6 +145,7 @@ class ControllerCaps
 
 
     std::string GetConfigDriver() const;
+    bool DisableMonitoring() const;
 
     void Dump() const;
 

diff --git a/xLights/outputs/ControllerEthernet.cpp b/xLights/outputs/ControllerEthernet.cpp
@@ -696,23 +696,29 @@ void ControllerEthernet::VMVChanged(wxPropertyGrid *grid)
     auto c = ControllerCaps::GetControllerConfig(_vendor, _model, _variant);
     if (c != nullptr) {
         auto const& prefer = c->GetPreferredInputProtocol();
-        bool autoLayout = IsAutoLayout();
-        if (!prefer.empty() && autoLayout) {
-            #ifndef EXCLUDENETWORKUI
-            if (grid && GetProtocol() != prefer) {
-                if (_outputs.size() > 0) {
-                    _outputs.front()->RemoveProperties(grid);
-                }
-                SetProtocol(prefer);
-                if (_outputs.size() > 0) {
-                    std::list<wxPGProperty *> expandProperties;
-                    auto before = grid->GetProperty("Managed");
-                    _outputs.front()->AddProperties(grid, before, this, AllSameSize(), expandProperties);
+        bool const autoLayout = IsAutoLayout();
+        auto const& disable_monitor = c->DisableMonitoring();
+        if (disable_monitor) {
+            SetMonitoring(false);
+        }
+        if (autoLayout) {
+            if (!prefer.empty()) {
+#ifndef EXCLUDENETWORKUI
+                if (grid && GetProtocol() != prefer) {
+                    if (_outputs.size() > 0) {
+                        _outputs.front()->RemoveProperties(grid);
+                    }
+                    SetProtocol(prefer);
+                    if (_outputs.size() > 0) {
+                        std::list<wxPGProperty*> expandProperties;
+                        auto before = grid->GetProperty("Managed");
+                        _outputs.front()->AddProperties(grid, before, this, AllSameSize(), expandProperties);
+                    }
+                } else
+#endif
+                {
+                    SetProtocol(prefer);
                 }
-            } else 
-            #endif
-            {
-                SetProtocol(prefer);
             }
         }
     }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -145,6 +145,7 @@ class ControllerCaps


		std::string GetConfigDriver() const;
		bool DisableMonitoring() const;

		void Dump() const;

Expand Down