Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-07-11 23:38:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fz-dev' into dev

Browse Source
This commit is contained in:
Eng1n33r
2022-07-20 16:28:48 +03:00
parent 8e7246ae8c ec57dd310a
commit ad970c6c6d
265 changed files with 2576 additions and 3884 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/toolbox/stream/stream.c
+2 -2
View File
@@ -1,8 +1,8 @@
#include "stream.h"
#include "stream_i.h"
#include "file_stream.h"
#include <furi/check.h>
#include <furi/common_defines.h>
#include <core/check.h>
#include <core/common_defines.h>
void stream_free(Stream* stream) {
furi_assert(stream);
lib/toolbox/stream/string_stream.c
+1 -1
View File
@@ -1,7 +1,7 @@
#include "stream.h"
#include "stream_i.h"
#include "string_stream.h"
#include <furi/common_defines.h>
#include <core/common_defines.h>
typedef struct {
Stream stream_base;
lib/toolbox/tar/tar_archive.c
+2 -2
View File
@@ -213,7 +213,7 @@ static int archive_extract_foreach_cb(mtar_t* tar, const mtar_header_t* header,
}
FURI_LOG_W(TAG, "Failed to open '%s', reties: %d", string_get_cstr(fname), n_tries);
storage_file_close(out_file);
osDelay(FILE_OPEN_RETRY_DELAY);
furi_delay_ms(FILE_OPEN_RETRY_DELAY);
}
if(!storage_file_is_open(out_file)) {
@@ -265,7 +265,7 @@ bool tar_archive_add_file(
}
FURI_LOG_W(TAG, "Failed to open '%s', reties: %d", fs_file_path, n_tries);
storage_file_close(src_file);
osDelay(FILE_OPEN_RETRY_DELAY);
furi_delay_ms(FILE_OPEN_RETRY_DELAY);
}
if(!storage_file_is_open(src_file) ||