Merge pull request #3 from XertDev/feature/player-indicator-fade

Player indicator fade
XertDev · Feb 27, 2024 · fef5cca · fef5cca
2 parents fa275a8 + 5288ea3
commit fef5cca
Show file tree

Hide file tree

Showing 3 changed files with 95 additions and 1 deletion.
diff --git a/example/led_effects.cpp b/example/led_effects.cpp
@@ -122,6 +122,7 @@ void gradient_touchpad_backlight_demo(Gamepad& gamepad)
 void player_indicator_demo(Gamepad& gamepad)
 {
 	auto& lights = gamepad.lights();
+	lights.enable_player_indicator_fade(false);
 
 	std::this_thread::sleep_for(1s);
 
@@ -171,6 +172,79 @@ void player_indicator_demo(Gamepad& gamepad)
 	gamepad.push_state();
 }
 
+void player_indicator_fade_demo(Gamepad& gamepad)
+{
+	auto& lights = gamepad.lights();
+	lights.enable_player_indicator_fade(true);
+
+	std::this_thread::sleep_for(1s);
+
+	std::cout << "5..";
+	std::flush(std::cout);
+
+	gamepad.lights().set_player_indicator(dual_sense_hid::Gamepad::Lights::PlayerIndicator::PLAYER_FIVE);
+	gamepad.push_state();
+
+	std::this_thread::sleep_for(1s);
+
+	gamepad.lights().set_player_indicator(dual_sense_hid::Gamepad::Lights::PlayerIndicator::DISABLED);
+	gamepad.push_state();
+
+	std::this_thread::sleep_for(1s);
+
+	std::cout << "4..";
+	std::flush(std::cout);
+
+	gamepad.lights().set_player_indicator(dual_sense_hid::Gamepad::Lights::PlayerIndicator::PLAYER_FOUR);
+	gamepad.push_state();
+
+	std::this_thread::sleep_for(1s);
+
+	gamepad.lights().set_player_indicator(dual_sense_hid::Gamepad::Lights::PlayerIndicator::DISABLED);
+	gamepad.push_state();
+
+	std::this_thread::sleep_for(1s);
+
+	std::cout << "3..";
+	std::flush(std::cout);
+
+	gamepad.lights().set_player_indicator(dual_sense_hid::Gamepad::Lights::PlayerIndicator::PLAYER_THREE);
+	gamepad.push_state();
+
+	std::this_thread::sleep_for(2s);
+
+	gamepad.lights().set_player_indicator(dual_sense_hid::Gamepad::Lights::PlayerIndicator::DISABLED);
+	gamepad.push_state();
+
+	std::this_thread::sleep_for(1s);
+
+	std::cout << "2..";
+	std::flush(std::cout);
+
+	gamepad.lights().set_player_indicator(dual_sense_hid::Gamepad::Lights::PlayerIndicator::PLAYER_TWO);
+	gamepad.push_state();
+
+	std::this_thread::sleep_for(2s);
+
+	gamepad.lights().set_player_indicator(dual_sense_hid::Gamepad::Lights::PlayerIndicator::DISABLED);
+	gamepad.push_state();
+
+	std::this_thread::sleep_for(1s);
+
+	std::cout << "1..";
+	std::flush(std::cout);
+
+	gamepad.lights().set_player_indicator(dual_sense_hid::Gamepad::Lights::PlayerIndicator::PLAYER_ONE);
+	gamepad.push_state();
+
+	std::this_thread::sleep_for(2s);
+
+	std::cout << "0" << std::endl;
+
+	gamepad.lights().set_player_indicator(dual_sense_hid::Gamepad::Lights::PlayerIndicator::DISABLED);
+	gamepad.push_state();
+}
+
 void mute_mic_indicator_demo(Gamepad& gamepad)
 {
 	auto& lights = gamepad.lights();
@@ -228,8 +302,12 @@ int main(int argc, char **argv)
 
 	gradient_touchpad_backlight_demo(demo_device);
 
+	std::cout << "Countdown..." << std::endl;
 	player_indicator_demo(demo_device);
 
+	std::cout << "Countdown with fade..." << std::endl;
+	player_indicator_fade_demo(demo_device);
+
 	mute_mic_indicator_demo(demo_device);
 
 	return 0;

diff --git a/include/dual_sense_hid/gamepad.hpp b/include/dual_sense_hid/gamepad.hpp
@@ -96,6 +96,12 @@ namespace dual_sense_hid
 			 */
 			void set_player_indicator_brightness(PlayerIndicatorBrightness brightness);
 
+			/**
+			 * @brief Control player indicator fade (instant changes or smooth fading in)
+			 * @param enabled fade enabled
+			 */
+			 void enable_player_indicator_fade(bool enabled);
+
 			/**
 			 * @brief Set color of touchpad backlight
 			 * @param red brightness level
@@ -108,6 +114,7 @@ namespace dual_sense_hid
 			MuteLightMode mute_light_mode_;
 
 			PlayerIndicator player_indicator_;
+			bool player_indicator_fade_enabled_;
 			PlayerIndicatorBrightness player_indicator_brightness_;
 
 			uint8_t touchpad_light_red_;

diff --git a/src/gamepad.cpp b/src/gamepad.cpp
@@ -114,11 +114,18 @@ namespace dual_sense_hid
 
 	void Gamepad::Lights::set_mute_light_mode(MuteLightMode mute_light_mode)
 	{
-		changed_ |= mute_light_mode_ == mute_light_mode;
+		changed_ |= mute_light_mode_ != mute_light_mode;
 
 		mute_light_mode_ = mute_light_mode;
 	}
 
+	void Gamepad::Lights::enable_player_indicator_fade(bool enabled)
+	{
+		changed_ |= enabled != player_indicator_fade_enabled_;
+
+		player_indicator_fade_enabled_ = enabled;
+	}
+
 	Gamepad::Gamepad(const DeviceInfo &device_info, bool fetch_calibration_data)
 		:connection_type_(device_info.connection_type)
 	{
@@ -367,6 +374,8 @@ namespace dual_sense_hid
 				common_report.player_led.led_5 = true;
 			}
 
+			common_report.player_led.led_fade = !lights_.player_indicator_fade_enabled_;
+
 			common_report.touchpad_led_color.red_led = lights_.touchpad_light_red_;
 			common_report.touchpad_led_color.green_led = lights_.touchpad_light_green_;
 			common_report.touchpad_led_color.blue_led = lights_.touchpad_light_blue_;