From b48e00928a9593ed16f89d1c84472d1d5679cbcb Mon Sep 17 00:00:00 2001 From: MX <10697207+xMasterX@users.noreply.github.com> Date: Sun, 16 Mar 2025 05:24:20 +0300 Subject: [PATCH] remove overkill service --- applications/services/application.fam | 1 - .../services/rgb_backlight/application.fam | 10 ---- .../services/rgb_backlight/rgb_backlight.c | 16 ++++-- .../rgb_backlight/rgb_backlight_on_boot.c | 56 ------------------- 4 files changed, 12 insertions(+), 71 deletions(-) delete mode 100644 applications/services/rgb_backlight/rgb_backlight_on_boot.c diff --git a/applications/services/application.fam b/applications/services/application.fam index f23b905e5..8cfb22cdb 100644 --- a/applications/services/application.fam +++ b/applications/services/application.fam @@ -12,6 +12,5 @@ App( "power", "namechanger_srv", "rgb_backlight", - "rgb_backlight_startup", ], ) diff --git a/applications/services/rgb_backlight/application.fam b/applications/services/rgb_backlight/application.fam index 95da20f61..631ca01d5 100644 --- a/applications/services/rgb_backlight/application.fam +++ b/applications/services/rgb_backlight/application.fam @@ -8,13 +8,3 @@ App( order=95, sdk_headers=["rgb_backlight.h"], ) - -App( - appid="rgb_backlight_startup", - name="RgbBackLightBootSrv", - apptype=FlipperAppType.STARTUP, - targets=["f7"], - entry_point="rgb_backlight_on_system_start", - cdefines=["SRV_RGB_BACKLIGHT"], - order=270, -) diff --git a/applications/services/rgb_backlight/rgb_backlight.c b/applications/services/rgb_backlight/rgb_backlight.c index d74c54a02..03f8f9af0 100644 --- a/applications/services/rgb_backlight/rgb_backlight.c +++ b/applications/services/rgb_backlight/rgb_backlight.c @@ -208,10 +208,18 @@ int32_t rgb_backlight_srv(void* p) { rgb_backlight_update(app->settings->brightness); } // if rgb mod not installed - set default static orange color (index=0) - } //else { - // rgb_backlight_set_static_color(0); - // rgb_backlight_update(app->settings->brightness); - //} + } else { + //rgb_backlight_set_static_color(0); + //rgb_backlight_update(app->settings->brightness); + rgb_backlight_set_static_color(0); + for(uint8_t i = 0; i < SK6805_get_led_count(); i++) { + uint8_t r = app->current_red * (1.0f / 1.0f); + uint8_t g = app->current_green * (1.0f / 1.0f); + uint8_t b = app->current_blue * (1.0f / 1.0f); + SK6805_set_led_color(i, r, g, b); + } + SK6805_update(); + } while(1) { // place for message queue and other future options diff --git a/applications/services/rgb_backlight/rgb_backlight_on_boot.c b/applications/services/rgb_backlight/rgb_backlight_on_boot.c deleted file mode 100644 index 8a55426ca..000000000 --- a/applications/services/rgb_backlight/rgb_backlight_on_boot.c +++ /dev/null @@ -1,56 +0,0 @@ - -#include -#include -#include "applications/services/rgb_backlight/rgb_backlight.h" - -static int32_t boot_rgb_backlight_update(void* context) { - UNUSED(context); - RGBBacklightApp* app = furi_record_open(RECORD_RGB_BACKLIGHT); - if(!app->settings->rgb_mod_installed) { - rgb_backlight_set_static_color(0); - for(uint8_t i = 0; i < SK6805_get_led_count(); i++) { - uint8_t r = app->current_red * (1.0f / 1.0f); - uint8_t g = app->current_green * (1.0f / 1.0f); - uint8_t b = app->current_blue * (1.0f / 1.0f); - SK6805_set_led_color(i, r, g, b); - } - SK6805_update(); - } - furi_record_close(RECORD_RGB_BACKLIGHT); - return 0; -} - -static void - rgb_boot_loader_release_callback(FuriThread* thread, FuriThreadState state, void* context) { - UNUSED(context); - - if(state == FuriThreadStateStopped) { - furi_thread_free(thread); - } -} - -static void rgb_boot_storage_callback(const void* message, void* context) { - UNUSED(context); - const StorageEvent* event = message; - - if(event->type == StorageEventTypeCardMount) { - FuriThread* loader = furi_thread_alloc_ex(NULL, 2048, boot_rgb_backlight_update, NULL); - furi_thread_set_state_callback(loader, rgb_boot_loader_release_callback); - furi_thread_start(loader); - } -} - -int32_t rgb_backlight_on_system_start(void* p) { - UNUSED(p); - - Storage* storage = furi_record_open(RECORD_STORAGE); - furi_pubsub_subscribe(storage_get_pubsub(storage), rgb_boot_storage_callback, NULL); - - if(storage_sd_status(storage) != FSE_OK) { - FURI_LOG_D("RGB_Boot_Init", "SD Card not ready, skipping rgb backlight init"); - return 0; - } - - boot_rgb_backlight_update(NULL); - return 0; -}