mirror of
https://github.com/Next-Flip/Momentum-Firmware.git
synced 2026-05-21 05:04:46 -07:00
[FL-2274] Inventing streams and moving FFF to them (#981)
* Streams: string stream * String stream: updated insert/delete api * Streams: generic stream interface and string stream implementation * Streams: helpers for insert and delete_and_insert * FFF: now compatible with streams * MinUnit: introduced tests with arguments * FFF: stream access violation * Streams: copy data between streams * Streams: file stream * FFF: documentation * FFStream: documentation * FFF: alloc as file * MinUnit: support for nested tests * Streams: changed delete_and_insert, now it returns success flag. Added ability dump stream inner parameters and data to cout. * FFF: simplified file open function * Streams: unit tests * FFF: tests * Streams: declare cache_size constant as define, to allow variable modified arrays * FFF: lib moved to a separate folder * iButton: new FFF * RFID: new FFF * Animations: new FFF * IR: new FFF * NFC: new FFF * Flipper file format: delete lib * U2F: new FFF * Subghz: new FFF and streams * Streams: read line * Streams: split * FuriCore: implement memset with extra asserts * FuriCore: implement extra heap asserts without inventing memset * Scene manager: protected access to the scene id stack with a size check * NFC worker: dirty fix for issue where hal_nfc was busy on app start * Furi: update allocator to erase memory on allocation. Replace furi_alloc with malloc. * FuriCore: cleanup memmgr code. * Furi HAL: furi_hal_init is split into critical and non-critical parts. The critical part is currently clock and console. * Memmgr: added ability to track allocations and deallocations through console. * FFStream: some speedup * Streams, FF: minor fixes * Tests: restore * File stream: a slightly more thread-safe version of file_stream_delete_and_insert Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
#include <file_worker_cpp.h>
|
||||
#include <flipper_file.h>
|
||||
#include <flipper_format/flipper_format.h>
|
||||
#include "irda_app_remote_manager.h"
|
||||
#include "irda/helpers/irda_parser.h"
|
||||
#include "irda/irda_app_signal.h"
|
||||
@@ -169,12 +169,12 @@ bool IrdaAppRemoteManager::store(void) {
|
||||
if(!file_worker.mkdir(IrdaApp::irda_directory)) return false;
|
||||
|
||||
Storage* storage = static_cast<Storage*>(furi_record_open("storage"));
|
||||
FlipperFile* ff = flipper_file_alloc(storage);
|
||||
FlipperFormat* ff = flipper_format_file_alloc(storage);
|
||||
|
||||
FURI_LOG_I("RemoteManager", "store file: \'%s\'", make_full_name(remote->name).c_str());
|
||||
result = flipper_file_open_always(ff, make_full_name(remote->name).c_str());
|
||||
result = flipper_format_file_open_always(ff, make_full_name(remote->name).c_str());
|
||||
if(result) {
|
||||
result = flipper_file_write_header_cstr(ff, "IR signals file", 1);
|
||||
result = flipper_format_write_header_cstr(ff, "IR signals file", 1);
|
||||
}
|
||||
if(result) {
|
||||
for(const auto& button : remote->buttons) {
|
||||
@@ -185,8 +185,7 @@ bool IrdaAppRemoteManager::store(void) {
|
||||
}
|
||||
}
|
||||
|
||||
flipper_file_close(ff);
|
||||
flipper_file_free(ff);
|
||||
flipper_format_free(ff);
|
||||
furi_record_close("storage");
|
||||
return result;
|
||||
}
|
||||
@@ -194,15 +193,15 @@ bool IrdaAppRemoteManager::store(void) {
|
||||
bool IrdaAppRemoteManager::load(const std::string& remote_name) {
|
||||
bool result = false;
|
||||
Storage* storage = static_cast<Storage*>(furi_record_open("storage"));
|
||||
FlipperFile* ff = flipper_file_alloc(storage);
|
||||
FlipperFormat* ff = flipper_format_file_alloc(storage);
|
||||
|
||||
FURI_LOG_I("RemoteManager", "load file: \'%s\'", make_full_name(remote_name).c_str());
|
||||
result = flipper_file_open_existing(ff, make_full_name(remote_name).c_str());
|
||||
result = flipper_format_file_open_existing(ff, make_full_name(remote_name).c_str());
|
||||
if(result) {
|
||||
string_t header;
|
||||
string_init(header);
|
||||
uint32_t version;
|
||||
result = flipper_file_read_header(ff, header, &version);
|
||||
result = flipper_format_read_header(ff, header, &version);
|
||||
if(result) {
|
||||
result = !string_cmp_str(header, "IR signals file") && (version == 1);
|
||||
}
|
||||
@@ -217,8 +216,7 @@ bool IrdaAppRemoteManager::load(const std::string& remote_name) {
|
||||
}
|
||||
}
|
||||
|
||||
flipper_file_close(ff);
|
||||
flipper_file_free(ff);
|
||||
flipper_format_free(ff);
|
||||
furi_record_close("storage");
|
||||
return result;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user