better strip power management on enable/disable from bento

benkuper · May 6, 2024 · 6816043 · 6816043
1 parent 965ddd7
commit 6816043
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 5 deletions.
diff --git a/Firmware/Bentuino/.vscode/c_cpp_properties.json b/Firmware/Bentuino/.vscode/c_cpp_properties.json
@@ -237,7 +237,7 @@
                 ]
             },
             "defines": [
-                "PLATFORMIO=60114",
+                "PLATFORMIO=60115",
                 "ARDUINO_ESP32_DEV",
                 "USE_SERIAL",
                 "USE_SERVER",

diff --git a/Firmware/Bentuino/src/Component/components/ledstrip/LedStripComponent.cpp b/Firmware/Bentuino/src/Component/components/ledstrip/LedStripComponent.cpp
@@ -112,14 +112,14 @@ void LedStripComponent::clearInternal()
 {
     clearColors();
     showLeds();
+    setStripPower(false);
 
     delete neoPixelStrip;
     neoPixelStrip = NULL;
 
     delete dotStarStrip;
     dotStarStrip = NULL;
 
-    setStripPower(false);
 }
 
 void LedStripComponent::setBrightness(float val)

diff --git a/Modules/juce_organicui b/Modules/juce_organicui
diff --git a/Source/Prop/props/bento/BentoProp.cpp b/Source/Prop/props/bento/BentoProp.cpp
@@ -29,6 +29,8 @@ BentoProp::BentoProp(var params) :
 	brightness = generalCC.addFloatParameter("Brightness", "Brightness of the prop", 1, 0, 1);
 	battery = generalCC.addFloatParameter("Battery", "Battery level of the prop", 1, 0, 1);
 	battery->setControllableFeedbackOnly(true);
+	clearLedsOnRemove = generalCC.addBoolParameter("Clear LEDs on remove", "Clear LEDs when the prop is removed", true);
+	enableLedsOnConnect = generalCC.addBoolParameter("Enable LEDs on connect", "Enable LEDs when the prop is connected", true);
 
 	artnet.inputCC->enabled->setValue(false);
 
@@ -54,6 +56,7 @@ BentoProp::BentoProp(var params) :
 
 	playbackAddress = "/leds/strip1/playbackLayer";
 	streamingAddress = "/leds/strip1/streamLayer";
+	ledEnabledAddress = "/leds/strip1/enabled";
 }
 
 BentoProp::~BentoProp()
@@ -63,7 +66,10 @@ BentoProp::~BentoProp()
 
 void BentoProp::clearItem()
 {
+	if (clearLedsOnRemove->boolValue()) sendMessageToProp(OSCMessage(ledEnabledAddress, 0));
+
 	Prop::clearItem();
+
 	setSerialDevice(nullptr);
 }
 
@@ -91,7 +97,7 @@ void BentoProp::onContainerParameterChangedInternal(Parameter* p)
 
 	if (p == enabled)
 	{
-		sendMessageToProp(OSCMessage("/leds/strip1/enabled", enabled->boolValue() ? 1 : 0));
+		sendMessageToProp(OSCMessage(ledEnabledAddress, enabled->boolValue() ? 1 : 0));
 	}
 }
 
@@ -136,6 +142,13 @@ void BentoProp::onControllableFeedbackUpdateInternal(ControllableContainer* cc,
 	{
 		battery->setValue(batteryRef->floatValue());
 	}
+	else if (c == isConnected)
+	{
+		if (isConnected->boolValue() && enabled->boolValue())
+		{
+			if(enableLedsOnConnect->boolValue()) sendMessageToProp(OSCMessage(ledEnabledAddress, 1));
+		}
+	}
 }
 
 void BentoProp::serialDataReceived(SerialDevice* d, const var& data)
@@ -163,7 +176,7 @@ void BentoProp::sendColorsToPropInternal()
 		int numChannels = jmax(0, jmin(colors.size() - startLed, 170));
 
 		data.fill(0);
-		
+
 		for (int i = 0; i < numChannels; i++)
 		{
 			int channelIndex = i * 3;

diff --git a/Source/Prop/props/bento/BentoProp.h b/Source/Prop/props/bento/BentoProp.h
@@ -22,8 +22,11 @@ class BentoProp :
 	const int remotePort = 9000;
 	OSCSender oscSender;
 
+
 	SerialDeviceParameter* serialParam;
 	SerialDevice* serialDevice;
+	BoolParameter* enableLedsOnConnect;
+	BoolParameter* clearLedsOnRemove;
 
 	DMXArtNetDevice artnet;
 	OwnedArray<DMXUniverse, CriticalSection> universes;
@@ -34,8 +37,10 @@ class BentoProp :
 	IntParameter* resolutionRef;
 	FloatParameter* brightnessRef;
 
+
 	String playbackAddress;
 	String streamingAddress;
+	String ledEnabledAddress;
 
 	virtual void clearItem() override;