adjust led service

Author: mkuettner97

include/openearable_common.h

@@ -24,6 +24,8 @@ extern const struct device *const ls_1_8;
 extern const struct device *const ls_3_3;
 extern const struct device *const ls_sd;
 
+typedef uint8_t RGBColor[3];
+
 struct boot_state {
 	bool timer_reset;
 	uint64_t device_id;
@@ -43,15 +45,15 @@ enum charging_state {
 	FAULT,
 };
 
-enum led_state {
+enum led_mode {
 	STATE_INDICATION,
 	CUSTOM,
 };
 
 struct earable_state {
 	enum pairing_state pairing_state;
 	enum charging_state charging_state;
-	enum led_state led_state;
+	enum led_mode led_mode;
 };	 
 
 enum sensor_id {

src/bluetooth/gatt_services/led_service.cpp

@@ -24,7 +24,9 @@ static ssize_t write_led(struct bt_conn *conn,
 	}
 
     //earable_led.set_color((uint8_t*)buf);
-	led_controller.setColor((uint8_t*)buf);
+	//led_controller.setColor((uint8_t*)buf);
+
+	state_indicator.set_custom_color((uint8_t *) buf);
 
 	return len;
 }
@@ -47,7 +49,7 @@ static ssize_t write_state(struct bt_conn *conn,
 		return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
 	}
 
-	state_indicator.set_led_state((led_state) *((uint8_t*)buf));
+	state_indicator.set_indication_mode((led_mode) *((uint8_t*)buf));
 
 	return len;
 }

src/drivers/LED_Controller/KTD2026.h

@@ -5,7 +5,7 @@
 #include <math.h>
 #include <Wire.h>
 
-typedef uint8_t RGBColor[3];
+#include "openearable_common.h"
 
 class KTD2026 {
 public:

src/utils/StateIndicator.cpp

@@ -90,8 +90,13 @@ void StateIndicator::init(struct earable_state state) {
     set_state(state);
 }
 
-void StateIndicator::set_led_state(enum led_state state) {
-    _state.led_state = state;
+void StateIndicator::set_custom_color(RGBColor color) {
+    memcpy(&this->color, color, sizeof(RGBColor));
+    if (_state.led_mode == CUSTOM) led_controller.setColor(color);
+}
+
+void StateIndicator::set_indication_mode(enum led_mode state) {
+    _state.led_mode = state;
     set_state(_state);
 }
 
@@ -109,7 +114,10 @@ void StateIndicator::set_state(struct earable_state state) {
     _state = state;
 
     // do not update the state if set to custom color
-    if (_state.led_state == CUSTOM) return;
+    if (_state.led_mode == CUSTOM) {
+        led_controller.setColor(color);
+        return;
+    }
 
     RGBColor color = {0,0,0};
     switch (_state.charging_state) {

src/utils/StateIndicator.h

@@ -11,10 +11,12 @@ class StateIndicator {
 
     void set_charging_state(enum charging_state state);
     void set_pairing_state(enum pairing_state state);
-    void set_led_state(enum led_state state);
+    void set_indication_mode(enum led_mode state);
+    void set_custom_color(RGBColor color);
 
 private:
     earable_state _state;
+    RGBColor color;
 };
 
 extern StateIndicator state_indicator;