Move rgb backlight from useless service to lib

applications/main/xtreme_app/xtreme_app.h

@@ -20,7 +20,7 @@
 #include <lib/subghz/subghz_setting.h>
 #include <applications/main/fap_loader/fap_loader_app.h>
 #include <notification/notification_app.h>
-#include <rgb_backlight/rgb_backlight.h>
+#include <rgb_backlight.h>
 #include <m-array.h>
 #include <namespoof.h>
 #include <xtreme.h>

applications/services/application.fam

@@ -9,6 +9,5 @@ App(
         "desktop",
         "loader",
         "power",
-        "rgb_backlight",
     ],
 )

applications/services/rgb_backlight/application.fam

@@ -1,10 +0,0 @@
-App(
-    appid="rgb_backlight",
-    name="RGB Backlight",
-    apptype=FlipperAppType.SERVICE,
-    entry_point="rgb_backlight_srv",
-    order=10,
-    sdk_headers=[
-        "rgb_backlight.h",
-    ],
-)

applications/services/storage/application.fam

@@ -7,7 +7,7 @@ App(
     requires=["storage_settings"],
     provides=["storage_start"],
     stack_size=3 * 1024,
-    order=0,
+    order=10,
     sdk_headers=["storage.h"],
 )
 

applications/system/updater/application.fam

@@ -6,7 +6,6 @@ App(
     requires=[
         "gui",
         "storage",
-        "rgb_backlight",
         "archive",
     ],
     conflicts=["desktop"],

firmware/targets/f7/api_symbols.csv

@@ -37,7 +37,6 @@ Header,+,applications/services/locale/locale.h,,
 Header,+,applications/services/notification/notification.h,,
 Header,+,applications/services/notification/notification_messages.h,,
 Header,+,applications/services/power/power_service/power.h,,
-Header,+,applications/services/rgb_backlight/rgb_backlight.h,,
 Header,+,applications/services/rpc/rpc_app.h,,
 Header,+,applications/services/storage/storage.h,,
 Header,+,firmware/targets/f7/furi_hal/furi_hal_clock.h,,
@@ -117,6 +116,7 @@ Header,+,lib/STM32CubeWB/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_utils.h,,
 Header,+,lib/STM32CubeWB/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_wwdg.h,,
 Header,-,lib/STM32CubeWB/Middlewares/Third_Party/FreeRTOS/Source/include/FreeRTOS.h,,
 Header,+,lib/STM32CubeWB/Middlewares/Third_Party/FreeRTOS/Source/include/stream_buffer.h,,
+Header,+,lib/drivers/rgb_backlight.h,,
 Header,+,lib/flipper_application/api_hashtable/api_hashtable.h,,
 Header,+,lib/flipper_application/api_hashtable/compilesort.hpp,,
 Header,+,lib/flipper_application/flipper_application.h,,

firmware/targets/f7/furi_hal/furi_hal_light.c

@@ -4,7 +4,7 @@
 #include <lp5562.h>
 #include <stdint.h>
 #include <xtreme.h>
-#include <rgb_backlight/rgb_backlight.h>
+#include <rgb_backlight.h>
 
 #define LED_CURRENT_RED 50
 #define LED_CURRENT_GREEN 50

lib/drivers/SConscript

@@ -4,6 +4,9 @@ env.Append(
     CPPPATH=[
         "#/lib/drivers",
     ],
+    SDK_HEADERS=[
+        File("rgb_backlight.h"),
+    ],
 )
 
 

lib/drivers/rgb_backlight.c

@@ -172,8 +172,3 @@ void rgb_backlight_update(uint8_t brightness) {
 
     SK6805_update();
 }
-
-int32_t rgb_backlight_srv(void* p) {
-    UNUSED(p);
-    return 0;
-}