Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-firmware into mntm-dev

2026-05-14 01:18:35 -07:00 · 2024-06-04 03:01:51 +01:00
parent 9b748ea792 03196fa110
commit 23da827361
132 changed files with 120 additions and 188 deletions
--- a/applications/services/dolphin/dolphin.c
+++ b/applications/services/dolphin/dolphin.c
@@ -1,7 +1,6 @@
-#include "dolphin/dolphin.h"
-#include "dolphin/helpers/dolphin_state.h"
+#include "dolphin.h"
+#include "helpers/dolphin_state.h"
 #include "dolphin_i.h"
-#include "projdefs.h"
 #include <furi_hal.h>
 #include <stdint.h>
 #include <furi.h>
--- a/applications/services/dolphin/helpers/dolphin_state.c
+++ b/applications/services/dolphin/helpers/dolphin_state.c
@@ -5,7 +5,6 @@
 #include <storage/storage.h>
 #include <furi.h>
 #include <furi_hal.h>
-#include <math.h>
 #include <toolbox/saved_struct.h>

 #define TAG "DolphinState"