Rainbow mode in progress

applications/services/rgb_backlight/rgb_backlight.c

@@ -23,6 +23,7 @@
 #include <furi_hal.h>
 #include <storage/storage.h>
 #include "rgb_backlight.h"
+#include <math.h>
 
 #define COLOR_COUNT (sizeof(colors) / sizeof(RGBBacklightColor))
 
@@ -87,14 +88,22 @@ void rgb_backlight_set_led_static_color(uint8_t led, uint8_t index) {
     // furi_record_close(RECORD_RGB_BACKLIGHT);
 }
 
-// use RECORD for acces to rgb service instance and update current colors by custom
+// use RECORD for acces to rgb service instance and update current colors by custom value
-// void rgb_backlight_set_custom_color(uint8_t red, uint8_t green, uint8_t blue) {
+void rgb_backlight_set_led_custom_color(uint8_t led, uint8_t red, uint8_t green, uint8_t blue) {
-//     RGBBacklightApp* app = furi_record_open(RECORD_RGB_BACKLIGHT);
+    // RGBBacklightApp* app = furi_record_open(RECORD_RGB_BACKLIGHT);
-//     app->current_red = red;
+    // float brightness = app->settings->brightness;
-//     app->current_green = green;
+
-//     app->current_blue = blue;
+    if(led < SK6805_get_led_count()) {
-//     furi_record_close(RECORD_RGB_BACKLIGHT);
+
-// }
+        current_led[led].red = red;
+        current_led[led].green = green;
+        current_led[led].blue = blue;
+
+        SK6805_set_led_color(led, red, green, blue);
+    }
+
+    // furi_record_close(RECORD_RGB_BACKLIGHT);
+}
 
 // use RECORD for acces to rgb service instance, use current_* colors and update backlight
 void rgb_backlight_update(float brightness) {
@@ -132,19 +141,77 @@ void rainbow_timer_starter(RGBBacklightApp* app) {
         }
     }
 }
+
+// HSV to RGB based on
+// https://www.radiokot.ru/forum/viewtopic.php?p=3000181&ysclid=m88wvoz34w244644702
+// https://radiolaba.ru/microcotrollers/tsvetnaya-lampa.html#comment-1790
+// https://alexgyver.ru/lessons/arduino-rgb/?ysclid=m88voflppa24464916
+void hsv_to_rgb(uint8_t red, uint8_t green, uint8_t blue, uint16_t hue ,uint8_t sat ,uint8_t val) {
+    float r = 1.0f;
+    float g = 1.0f;
+    float b = 1.0f;
+
+    float H = hue / 255.0f;
+    float S = sat / 255.0f;
+    float V = val / 255.0f;
+
+    uint8_t i = trunc(H * 6);
+    float f = H * 6 - i;
+    float p = V * (1 - S);
+    float q = V * (1 - f * S);
+    float t = V * (1 - (1 - f) * S);
+
+    switch(i) {
+        case 0:
+            r = V, g = t, b = p;
+            break;
+        case 1:
+            r = q, g = V, b = p;
+            break;
+        case 2:
+            r = p, g = V, b = t;
+            break;
+        case 3:
+            r = p, g = q, b = V;
+            break;
+        case 4:
+            r = t, g = p, b = V;
+            break;
+        case 5:
+            r = V, g = p, b = q;
+            break;
+    }
+    red = r * 255;
+    green = g * 255;
+    blue = b * 255;
+}
+
+
 static void rainbow_timer_callback(void* context) {
     furi_assert(context);
     RGBBacklightApp* app = context;
+    uint8_t r = 0;
+    uint8_t g = 0;
+    uint8_t b = 0;
 
-    if (app->settings->rgb_backlight_installed) {
+    if(app->settings->rgb_backlight_installed) {
         switch(app->settings->rainbow_mode) { 
             case 1:
+                for(uint8_t i = 0; i < SK6805_get_led_count(); i++) {
+                    hsv_to_rgb(r,g,b,app->rainbow_hue, app->settings->rainbow_saturation,app->settings->brightness*255);
+                    FURI_LOG_D(
+                        TAG, "rgb %d,%d,%d", r, g, b);
+                    //rgb_backlight_set_led_custom_color (i,*r,*g,*b);
+                    //SK6805_update();
+                }
+
                 break;
             case 2:
                 break;
             default:
                 break;
         }
+        app->rainbow_hue++;
         rgb_backlight_update(app->settings->brightness);
     }
 
@@ -168,6 +235,8 @@ int32_t rgb_backlight_srv(void* p) {
     app->settings = malloc(sizeof(RGBBacklightSettings));
     rgb_backlight_settings_load(app->settings);
 
+    app->rainbow_hue = 1;
+
     furi_record_create(RECORD_RGB_BACKLIGHT, app);
 
     //if rgb_backlight_installed then start rainbow or set leds colors from saved settings (default index = 0)

applications/services/rgb_backlight/rgb_backlight.h

@@ -28,10 +28,10 @@ extern "C" {
 
 typedef struct {
     FuriTimer* rainbow_timer;
-
+    uint8_t rainbow_hue;
-    // int16_t current_red;
+    uint8_t rainbow_red;
-    // int16_t current_green;
+    uint8_t rainbow_green;
-    // int16_t current_blue;
+    uint8_t rainbow_blue;
 
     RGBBacklightSettings* settings;
 

applications/services/rgb_backlight/rgb_backlight_settings.c

@@ -28,6 +28,7 @@ typedef struct {
     uint32_t rainbow_mode;
     uint32_t rainbow_speed_ms;
     uint16_t rainbow_step;
+    uint8_t rainbow_saturation;
 } RGBBacklightSettingsPrevious;
 
 void rgb_backlight_settings_load(RGBBacklightSettings* settings) {
@@ -82,6 +83,7 @@ void rgb_backlight_settings_load(RGBBacklightSettings* settings) {
         settings->brightness = 1.0f;
         settings->rainbow_speed_ms = 100;
         settings->rainbow_step = 1;
+        settings->rainbow_saturation = 255;
         rgb_backlight_settings_save(settings);
     }
 }

applications/services/rgb_backlight/rgb_backlight_settings.h

@@ -18,6 +18,7 @@ typedef struct {
     uint32_t rainbow_mode;
     uint32_t rainbow_speed_ms;
     uint16_t rainbow_step;
+    uint8_t  rainbow_saturation;
 
 } RGBBacklightSettings;
 

applications/settings/notification_settings/notification_settings_app.c

@@ -262,7 +262,7 @@ static void rgb_backlight_installed_changed(VariableItem* item) {
     if(furi_hal_rtc_is_flag_set(FuriHalRtcFlagDebug)) {
         slide = 1;
     }
-    for(int i = slide; i < (slide + 6); i++) {
+    for(int i = slide; i < (slide + 7); i++) {
         VariableItem* t_item = variable_item_list_get(app->variable_item_list_rgb, i);
         if(index == 0) {
             variable_item_set_locked(t_item, true, "RGB\nOFF!");
@@ -362,9 +362,19 @@ static void rgb_backlight_rainbow_step_changed(VariableItem* item) {
     rgb_backlight_settings_save(app->notification->rgb_srv->settings);
 }
 
+static void rgb_backlight_rainbow_saturation_changed (VariableItem* item) {
+    NotificationAppSettings* app = variable_item_get_context(item);
 
-// open rgb_settings_view if user press OK on first (index=0) menu string and (debug mode or rgb_backlight_installed is true)
+    //saturation must be 1..255, so (0..254)+1
-void variable_item_list_enter_callback(void* context, uint32_t index) {
+    uint8_t index = variable_item_get_current_value_index(item)+1;
+    char valtext[4] = {};
+    snprintf(valtext, sizeof(valtext), "%d", index);
+    variable_item_set_current_value_text(item, valtext);
+    app->notification->rgb_srv->settings->rainbow_saturation = index;
+    rgb_backlight_settings_save(app->notification->rgb_srv->settings);
+}
+    // open rgb_settings_view if user press OK on first (index=0) menu string and (debug mode or rgb_backlight_installed is true)
+    void variable_item_list_enter_callback(void* context, uint32_t index) {
         UNUSED(context);
         NotificationAppSettings* app = context;
 
@@ -373,21 +383,21 @@ void variable_item_list_enter_callback(void* context, uint32_t index) {
            (index == 0)) {
             view_dispatcher_switch_to_view(app->view_dispatcher, RGBViewId);
         }
-}
+    }
 
-// switch to main view on exit from rgb_settings_view
+    // switch to main view on exit from rgb_settings_view
-static uint32_t notification_app_rgb_settings_exit(void* context) {
+    static uint32_t notification_app_rgb_settings_exit(void* context) {
         UNUSED(context);
         return MainViewId;
-}
+    }
-//--- RGB BACKLIGHT END ---
+    //--- RGB BACKLIGHT END ---
 
-static uint32_t notification_app_settings_exit(void* context) {
+    static uint32_t notification_app_settings_exit(void* context) {
         UNUSED(context);
         return VIEW_NONE;
-}
+    }
 
-static NotificationAppSettings* alloc_settings(void) {
+    static NotificationAppSettings* alloc_settings(void) {
         NotificationAppSettings* app = malloc(sizeof(NotificationAppSettings));
         app->notification = furi_record_open(RECORD_NOTIFICATION);
         app->gui = furi_record_open(RECORD_GUI);
@@ -415,8 +425,8 @@ static NotificationAppSettings* alloc_settings(void) {
 
         item = variable_item_list_add(
             app->variable_item_list, "LCD Contrast", CONTRAST_COUNT, contrast_changed, app);
-    value_index =
+        value_index = value_index_int32(
-        value_index_int32(app->notification->settings.contrast, contrast_value, CONTRAST_COUNT);
+            app->notification->settings.contrast, contrast_value, CONTRAST_COUNT);
         variable_item_set_current_value_index(item, value_index);
         variable_item_set_current_value_text(item, contrast_text[value_index]);
 
@@ -590,17 +600,34 @@ static NotificationAppSettings* alloc_settings(void) {
             (app->notification->rgb_srv->settings->rgb_backlight_installed == 0),
             "RGB MOD \nOFF!");
 
+        item = variable_item_list_add(
+            app->variable_item_list_rgb,
+            "Saturation",
+            255,
+            rgb_backlight_rainbow_saturation_changed,
+            app);
+        value_index = app->notification->rgb_srv->settings->rainbow_saturation;
+        variable_item_set_current_value_index(item, value_index);
+        char valtext[4] = {};
+        snprintf(valtext, sizeof(valtext), "%d", value_index);
+        variable_item_set_current_value_text(item, valtext);
+        variable_item_set_locked(
+            item,
+            (app->notification->rgb_srv->settings->rgb_backlight_installed == 0),
+            "RGB MOD \nOFF!");
+
         //--- RGB BACKLIGHT END ---
 
         app->view_dispatcher = view_dispatcher_alloc();
-    view_dispatcher_attach_to_gui(app->view_dispatcher, app->gui, ViewDispatcherTypeFullscreen);
+        view_dispatcher_attach_to_gui(
+            app->view_dispatcher, app->gui, ViewDispatcherTypeFullscreen);
         view_dispatcher_add_view(app->view_dispatcher, MainViewId, view);
         view_dispatcher_add_view(app->view_dispatcher, RGBViewId, view_rgb);
         view_dispatcher_switch_to_view(app->view_dispatcher, MainViewId);
         return app;
-}
+    }
 
-static void free_settings(NotificationAppSettings* app) {
+    static void free_settings(NotificationAppSettings * app) {
         view_dispatcher_remove_view(app->view_dispatcher, MainViewId);
         view_dispatcher_remove_view(app->view_dispatcher, RGBViewId);
         variable_item_list_free(app->variable_item_list);
@@ -610,9 +637,9 @@ static void free_settings(NotificationAppSettings* app) {
         furi_record_close(RECORD_GUI);
         furi_record_close(RECORD_NOTIFICATION);
         free(app);
-}
+    }
 
-int32_t notification_settings_app(void* p) {
+    int32_t notification_settings_app(void* p) {
         UNUSED(p);
         NotificationAppSettings* app = alloc_settings();
         view_dispatcher_run(app->view_dispatcher);
@@ -625,4 +652,4 @@ int32_t notification_settings_app(void* p) {
 
         free_settings(app);
         return 0;
-}
+    }