Merge pull request #18 from leedave/feature/0.85.2

Feature/0.85.2
RogueMaster · Jun 24, 2023 · e62f52d · e62f52d
2 parents 8ccc670 + 87e66a0
commit e62f52d
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/Games/color_guess/views/color_guess_color_set.c b/Games/color_guess/views/color_guess_color_set.c
@@ -148,7 +148,7 @@ void color_guess_color_set_exit(void* context) {
 
 void color_guess_color_set_enter(void* context) {
     furi_assert(context);
-    DOLPHIN_DEED(DolphinDeedPluginStart);
+    dolphin_deed(DolphinDeedPluginStart);
     // ColorGuessColorSet* instance = context;
 }
 

diff --git a/Games/color_guess/views/color_guess_play.c b/Games/color_guess/views/color_guess_play.c
@@ -93,7 +93,7 @@ void color_guess_play_calculate_closeness(void* context, ColorGuessPlayModel* mo
     float percentageBlue = 100 - ((distanceBlue / 255.0) * 100);
     if (percentageRed == 100 && percentageGreen == 100 && percentageBlue == 100) {
         model->success = 1;
-        DOLPHIN_DEED(DolphinDeedPluginGameWin);
+        dolphin_deed(DolphinDeedPluginGameWin);
     }
     float fullPercentage = (percentageRed + percentageGreen + percentageBlue) / 3;
     model->prev_closeness = model->closeness;
@@ -295,7 +295,7 @@ void color_guess_play_exit(void* context) {
 void color_guess_play_enter(void* context) {
     furi_assert(context);
     ColorGuessPlay* instance = (ColorGuessPlay*)context;
-    DOLPHIN_DEED(DolphinDeedPluginGameStart);
+    dolphin_deed(DolphinDeedPluginGameStart);
     with_view_model(
         instance->view,
         ColorGuessPlayModel * model,

diff --git a/Misc/ledpulser/application.fam b/Misc/ledpulser/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="ledpulser",
+    appid="led_pulsator",
     name="LED Pulsator",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="ledpulser_app",
@@ -9,9 +9,10 @@ App(
     ],
     stack_size=2 * 1024,
     order=30,
+    fap_icon_assets="icons",
     fap_icon="ledpulser_10px.png",
-	fap_icon_assets="icons",
     fap_category="Misc",
+    fap_icon_assets_symbol="ledpulser",
     fap_author="Leed",
     fap_weburl="https://github.com/leedave/Leeds-Flipper-Zero-Applications",
 )
diff --git a/Misc/ledpulser/ledpulser.c b/Misc/ledpulser/ledpulser.c
@@ -108,7 +108,7 @@ int32_t ledpulser_app(void* p) {
     }
     plugin_state->direction = 0;
     plugin_state->intensity = 0;
-    DOLPHIN_DEED(DolphinDeedPluginStart);
+    dolphin_deed(DolphinDeedPluginStart);
 
     // Configure view port
     ViewPort* view_port = view_port_alloc();

diff --git a/Misc/orgasmotron/application.fam b/Misc/orgasmotron/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="Orgasmotron",
+    appid="orgasmotron",
     name="Orgasmotron",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="orgasmotron_app",

diff --git a/Tools/xremote/scenes/xremote_scene_transmit.c b/Tools/xremote/scenes/xremote_scene_transmit.c
@@ -48,7 +48,7 @@ void xremote_scene_transmit_stop_ir_signal(XRemote* app) {
 
 void xremote_scene_transmit_send_ir_signal(XRemote* app, CrossRemoteItem* item) {
     InfraredSignal* signal = xremote_remote_item_get_ir_signal(item);
-    DOLPHIN_DEED(DolphinDeedIrSend);
+    dolphin_deed(DolphinDeedIrSend);
     xremote_scene_ir_notification_message(app, InfraredNotificationMessageBlinkStartSend);
     if (xremote_scene_ir_signal_is_raw(signal)) {
         InfraredRawSignal* raw = xremote_ir_signal_get_raw_signal(signal);