usb_comm: Support full control on RGB underglow

xingrz · Feb 7, 2023 · 8892ecd · 8892ecd
1 parent f524a7f
commit 8892ecd
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 3 deletions.
diff --git a/config/app/usb_comm/handler/handler.h b/config/app/usb_comm/handler/handler.h
@@ -24,6 +24,8 @@ bool handle_rgb_control(const usb_comm_MessageH2D *h2d, usb_comm_MessageD2H *d2h
 			uint32_t bytes_len);
 bool handle_rgb_get_state(const usb_comm_MessageH2D *h2d, usb_comm_MessageD2H *d2h,
 			  const void *bytes, uint32_t bytes_len);
+bool handle_rgb_set_state(const usb_comm_MessageH2D *h2d, usb_comm_MessageD2H *d2h,
+			  const void *bytes, uint32_t bytes_len);
 
 bool handle_eink_set_image(const usb_comm_MessageH2D *h2d, usb_comm_MessageD2H *d2h,
 			   const void *bytes, uint32_t bytes_len);
diff --git a/config/app/usb_comm/handler/handler_rgb.c b/config/app/usb_comm/handler/handler_rgb.c
@@ -60,12 +60,44 @@ bool handle_rgb_get_state(const usb_comm_MessageH2D *h2d, usb_comm_MessageD2H *d
 {
 	usb_comm_RgbState *res = &d2h->payload.rgb_state;
 
-	bool on;
-	if (zmk_rgb_underglow_get_state(&on) != 0) {
+	if (zmk_rgb_underglow_get_state(&res->on) != 0) {
 		return false;
 	}
 
-	res->on = on;
+	struct zmk_led_hsb color = zmk_rgb_underglow_calc_hue(0);
+	res->color.h = color.h;
+	res->color.s = color.s;
+	res->color.b = color.b;
+	res->has_color = true;
+
+	res->effect = zmk_rgb_underglow_calc_effect(0);
+	res->has_effect = true;
 
 	return true;
 }
+
+bool handle_rgb_set_state(const usb_comm_MessageH2D *h2d, usb_comm_MessageD2H *d2h,
+			  const void *bytes, uint32_t bytes_len)
+{
+	const usb_comm_RgbState *req = &h2d->payload.rgb_state;
+
+	if (req->on) {
+		zmk_rgb_underglow_on();
+	} else {
+		zmk_rgb_underglow_off();
+	}
+
+	if (req->has_color) {
+		zmk_rgb_underglow_set_hsb((struct zmk_led_hsb){
+			.h = req->color.h,
+			.s = req->color.s,
+			.b = req->color.b,
+		});
+	}
+
+	if (req->has_effect) {
+		zmk_rgb_underglow_select_effect((int)req->effect);
+	}
+
+	return handle_rgb_get_state(h2d, d2h, bytes, bytes_len);
+}
diff --git a/config/app/usb_comm/handler/handler_version.c b/config/app/usb_comm/handler/handler_version.c
@@ -50,6 +50,7 @@ bool handle_version(const usb_comm_MessageH2D *h2d, usb_comm_MessageD2H *d2h, co
 
 #ifdef CONFIG_HW75_USB_COMM_FEATURE_RGB
 	res->features.has_rgb = res->features.rgb = true;
+	res->features.has_rgb_full_control = res->features.rgb_full_control = true;
 #endif // CONFIG_HW75_USB_COMM_FEATURE_RGB
 
 #ifdef CONFIG_HW75_USB_COMM_FEATURE_EINK

diff --git a/config/app/usb_comm/usb_comm_proto.c b/config/app/usb_comm/usb_comm_proto.c
@@ -50,6 +50,7 @@ static struct {
 #ifdef CONFIG_HW75_USB_COMM_FEATURE_RGB
 	{ usb_comm_Action_RGB_CONTROL, usb_comm_MessageD2H_rgb_state_tag, handle_rgb_control },
 	{ usb_comm_Action_RGB_GET_STATE, usb_comm_MessageD2H_rgb_state_tag, handle_rgb_get_state },
+	{ usb_comm_Action_RGB_SET_STATE, usb_comm_MessageD2H_rgb_state_tag, handle_rgb_set_state },
 #endif // CONFIG_HW75_USB_COMM_FEATURE_RGB
 
 #ifdef CONFIG_HW75_USB_COMM_FEATURE_EINK

diff --git a/config/proto/usb_comm.proto b/config/proto/usb_comm.proto
@@ -17,6 +17,7 @@ enum Action {
 	KNOB_SET_CONFIG = 4;
 	RGB_CONTROL = 5;
 	RGB_GET_STATE = 6;
+	RGB_SET_STATE = 8;
 	EINK_SET_IMAGE = 7;
 }
 
@@ -30,6 +31,7 @@ message MessageH2D
 		Nop nop = 2;
 		KnobConfig knob_config = 3;
 		RgbControl rgb_control = 4;
+		RgbState rgb_state = 7;
 		EinkImage eink_image = 5;
 	}
 }
@@ -62,6 +64,7 @@ message Version
 	message Features
 	{
 		optional bool rgb = 1;
+		optional bool rgb_full_control = 5;
 		optional bool eink = 2;
 		optional bool knob = 3;
 	}
@@ -123,6 +126,23 @@ message RgbControl
 message RgbState
 {
 	required bool on = 1;
+	optional HSB color = 2;
+	optional Effect effect = 3;
+	optional uint32 speed = 4;
+
+	message HSB
+	{
+		required uint32 h = 1;
+		required uint32 s = 2;
+		required uint32 b = 3;
+	}
+
+	enum Effect {
+		SOLID = 0;
+		BREATHE = 1;
+		SPECTRUM = 2;
+		SWIRL = 3;
+	}
 }
 
 message EinkImage