Fix restoring calibration settings (#874)

* Fix #859
awawa-dev · Jul 12, 2024 · 81c67d2 · 81c67d2
1 parent d1264d1
commit 81c67d2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/include/led-strip/ColorSpaceCalibration.h b/include/led-strip/ColorSpaceCalibration.h
@@ -37,6 +37,7 @@ class ColorSpaceCalibration
 	uint8_t getBrightnessCompensation() const;
 	void setBrightnessCompensation(int brightnessCompensation);
 	void getBrightnessComponents(uint8_t& rgb, uint8_t& cmy, uint8_t& w) const;
+	bool isBrightnessCorrectionEnabled() const;
 	void applyGamma(uint8_t& red, uint8_t& green, uint8_t& blue) const;
 	void applyBacklight(uint8_t& red, uint8_t& green, uint8_t& blue) const;
 	void applySaturationLuminance(uint8_t& red, uint8_t& green, uint8_t& blue) const;

diff --git a/sources/led-strip/ColorCalibration.cpp b/sources/led-strip/ColorCalibration.cpp
@@ -104,7 +104,8 @@ void ColorCalibration::calibrate(ColorRgb& color)
 		if (!_blackCalibration->isEnabled() && !_redCalibration->isEnabled() &&
 			!_greenCalibration->isEnabled() && !_blueCalibration->isEnabled() &&
 			!_cyanCalibration->isEnabled() && !_magentaCalibration->isEnabled() &&
-			!_yellowCalibration->isEnabled() && !_whiteCalibration->isEnabled())
+			!_yellowCalibration->isEnabled() && !_whiteCalibration->isEnabled() &&
+			!_colorspaceCalibration->isBrightnessCorrectionEnabled())
 		{
 			if (B_RGB != 255)
 			{

diff --git a/sources/led-strip/ColorSpaceCalibration.cpp b/sources/led-strip/ColorSpaceCalibration.cpp
@@ -276,6 +276,11 @@ void ColorSpaceCalibration::updateBrightnessComponents()
 	}
 }
 
+bool ColorSpaceCalibration::isBrightnessCorrectionEnabled() const
+{
+	return _brightnessCompensation != 0 || _brightness != 100;
+}
+
 void ColorSpaceCalibration::getBrightnessComponents(uint8_t& rgb, uint8_t& cmy, uint8_t& w) const
 {
 	rgb = _brightness_rgb;