Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-04-24 03:29:57 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix most build errors

Browse Source
This commit is contained in:
Willy-JL
2024-08-10 05:31:06 +02:00
parent 6acfd65697
commit de940394c9
9 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/services/bt/bt_cli.c
View File

@@ -4,8 +4,8 @@
#include <lib/toolbox/args.h>
#include <ble/ble.h>
#include "bt_settings.h"
#include "bt_service/bt.h"
#include "bt_service/bt_settings_api_i.h"
#include <profiles/serial_profile.h>
static void bt_cli_command_hci_info(Cli* cli, FuriString* args, void* context) {

1
applications/services/desktop/animations/animation_manager.c
View File

@@ -6,7 +6,6 @@
#include <power/power_service/power.h>
#include <storage/storage.h>
#include <assets_icons.h>
#include <assets_dolphin_internal.h>
#include "views/bubble_animation_view.h"
#include "views/one_shot_animation_view.h"

2
applications/services/desktop/desktop.c
View File

@@ -235,8 +235,6 @@ static void desktop_apply_settings(Desktop* desktop) {
desktop_clock_reconfigure(desktop);
view_port_enabled_set(desktop->dummy_mode_icon_viewport, desktop->settings.dummy_mode);
if(!desktop->app_running && !desktop->locked) {
desktop_auto_lock_arm(desktop);
}

10
applications/services/desktop/desktop_keybinds.c
View File

@@ -107,7 +107,7 @@ static FuriString*
void desktop_keybinds_load(Desktop* desktop, DesktopKeybinds* keybinds) {
for(DesktopKeybindType type = 0; type < DesktopKeybindTypeMAX; type++) {
for(DesktopKeybindKey key = 0; key < DesktopKeybindKeyMAX; key++) {
keybinds[type][key] = furi_string_alloc_set(desktop_keybinds_defaults[type][key]);
*keybinds[type][key] = furi_string_alloc_set(desktop_keybinds_defaults[type][key]);
}
}
@@ -120,8 +120,8 @@ void desktop_keybinds_load(Desktop* desktop, DesktopKeybinds* keybinds) {
furi_string_printf(
keybind_name, "%s%s", desktop_keybind_types[type], desktop_keybind_keys[type]);
if(!flipper_format_read_string(
file, furi_string_get_cstr(keybind_name), keybinds[type][key])) {
furi_string_set(keybinds[type][key], desktop_keybinds_defaults[type][key]);
file, furi_string_get_cstr(keybind_name), *keybinds[type][key])) {
furi_string_set(*keybinds[type][key], desktop_keybinds_defaults[type][key]);
goto fail;
}
}
@@ -147,7 +147,7 @@ void desktop_keybinds_save(Desktop* desktop, const DesktopKeybinds* keybinds) {
if(!flipper_format_write_string_cstr(
file,
furi_string_get_cstr(keybind_name),
furi_string_get_cstr(keybinds[type][key]))) {
furi_string_get_cstr(*keybinds[type][key]))) {
goto fail;
}
}
@@ -164,7 +164,7 @@ void desktop_keybinds_save(Desktop* desktop, const DesktopKeybinds* keybinds) {
void desktop_keybinds_free(DesktopKeybinds* keybinds) {
for(DesktopKeybindType type = 0; type < DesktopKeybindTypeMAX; type++) {
for(DesktopKeybindKey key = 0; key < DesktopKeybindKeyMAX; key++) {
furi_string_free(keybinds[type][key]);
furi_string_free(*keybinds[type][key]);
}
}
}

2
applications/services/desktop/desktop_settings.h
View File

@@ -4,7 +4,7 @@
typedef struct {
uint32_t auto_lock_delay_ms;
bool auto_lock_with_pin;
uint8_t auto_lock_with_pin;
uint8_t display_clock;
} DesktopSettings;

2
applications/services/desktop/scenes/desktop_scene_locked.c
View File

@@ -13,6 +13,8 @@
#include "desktop_scene.h"
#include "desktop_scene_locked.h"
#include <momentum/settings.h>
#define WRONG_PIN_HEADER_TIMEOUT 3000
#define INPUT_PIN_VIEW_TIMEOUT 15000

2
applications/services/dolphin/dolphin.c
View File

@@ -207,7 +207,7 @@ static void dolphin_reset_butthurt_timer(Dolphin* dolphin) {
if(period_ticks > 0) {
furi_event_loop_timer_start(dolphin->butthurt_timer, period_ticks);
} else {
furi_eventloop_timer_stop(dolphin->butthurt_timer);
furi_event_loop_timer_stop(dolphin->butthurt_timer);
}
}

1
applications/services/dolphin/helpers/dolphin_state.h
View File

@@ -2,6 +2,7 @@
#include <stdbool.h>
#include <stdint.h>
#include <stddef.h>
#include "dolphin_deed.h"

2
applications/services/power/power_settings.h
View File

@@ -3,7 +3,7 @@
#define POWER_SETTINGS_VER (1)
#define POWER_SETTINGS_PATH CFG_PATH("power.settings")
#define POWER_SETTINGS_PATH INT_PATH(".power.settings")
#define POWER_SETTINGS_MAGIC (0x21)
#ifdef __cplusplus