liz/flipperzero-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[FL-2274] Inventing streams and moving FFF to them (#981)

Browse Source 
* 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:
SG
2022-02-19 05:53:46 +10:00
committed by GitHub
parent 242241987e
commit 274c12fc56
257 changed files with 4480 additions and 2657 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/irda/cli/irda_cli.cpp
View File

@@ -145,7 +145,7 @@ static void irda_cli_start_ir_tx(Cli* cli, string_t args) {
uint32_t frequency;
float duty_cycle;
uint32_t timings_cnt = MAX_TIMINGS_AMOUNT;
uint32_t* timings = (uint32_t*)furi_alloc(sizeof(uint32_t) * timings_cnt);
uint32_t* timings = (uint32_t*)malloc(sizeof(uint32_t) * timings_cnt);
if(parse_message(str, &message)) {
irda_send(&message, 1);

51
applications/irda/helpers/irda_parser.cpp
View File

@@ -4,37 +4,42 @@
#include "irda/helpers/irda_parser.h"
#include "irda_worker.h"
#include "m-string.h"
#include <flipper_file.h>
#include <flipper_format/flipper_format.h>
#include <memory>
#include <string>
#include <furi_hal_irda.h>
#define TAG "IrdaParser"
bool irda_parser_save_signal(FlipperFile* ff, const IrdaAppSignal& signal, const std::string& name) {
bool irda_parser_save_signal(
FlipperFormat* ff,
const IrdaAppSignal& signal,
const std::string& name) {
furi_assert(ff);
furi_assert(!name.empty());
bool result = false;
do {
if(!flipper_file_write_comment_cstr(ff, "")) break;
if(!flipper_file_write_string_cstr(ff, "name", name.c_str())) break;
if(!flipper_format_write_comment_cstr(ff, "")) break;
if(!flipper_format_write_string_cstr(ff, "name", name.c_str())) break;
if(signal.is_raw()) {
furi_assert(signal.get_raw_signal().timings_cnt <= MAX_TIMINGS_AMOUNT);
auto raw_signal = signal.get_raw_signal();
if(!flipper_file_write_string_cstr(ff, "type", "raw")) break;
if(!flipper_file_write_uint32(ff, "frequency", &raw_signal.frequency, 1)) break;
if(!flipper_file_write_float(ff, "duty_cycle", &raw_signal.duty_cycle, 1)) break;
if(!flipper_file_write_uint32(ff, "data", raw_signal.timings, raw_signal.timings_cnt))
if(!flipper_format_write_string_cstr(ff, "type", "raw")) break;
if(!flipper_format_write_uint32(ff, "frequency", &raw_signal.frequency, 1)) break;
if(!flipper_format_write_float(ff, "duty_cycle", &raw_signal.duty_cycle, 1)) break;
if(!flipper_format_write_uint32(ff, "data", raw_signal.timings, raw_signal.timings_cnt))
break;
} else {
auto parsed_signal = signal.get_message();
const char* protocol_name = irda_get_protocol_name(parsed_signal.protocol);
if(!flipper_file_write_string_cstr(ff, "type", "parsed")) break;
if(!flipper_file_write_string_cstr(ff, "protocol", protocol_name)) break;
if(!flipper_file_write_hex(ff, "address", (uint8_t*)&parsed_signal.address, 4)) break;
if(!flipper_file_write_hex(ff, "command", (uint8_t*)&parsed_signal.command, 4)) break;
if(!flipper_format_write_string_cstr(ff, "type", "parsed")) break;
if(!flipper_format_write_string_cstr(ff, "protocol", protocol_name)) break;
if(!flipper_format_write_hex(ff, "address", (uint8_t*)&parsed_signal.address, 4))
break;
if(!flipper_format_write_hex(ff, "command", (uint8_t*)&parsed_signal.command, 4))
break;
}
result = true;
} while(0);
@@ -42,7 +47,7 @@ bool irda_parser_save_signal(FlipperFile* ff, const IrdaAppSignal& signal, const
return result;
}
bool irda_parser_read_signal(FlipperFile* ff, IrdaAppSignal& signal, std::string& name) {
bool irda_parser_read_signal(FlipperFormat* ff, IrdaAppSignal& signal, std::string& name) {
furi_assert(ff);
bool result = false;
@@ -50,31 +55,31 @@ bool irda_parser_read_signal(FlipperFile* ff, IrdaAppSignal& signal, std::string
string_init(read_string);
do {
if(!flipper_file_read_string(ff, "name", read_string)) break;
if(!flipper_format_read_string(ff, "name", read_string)) break;
name = string_get_cstr(read_string);
if(!flipper_file_read_string(ff, "type", read_string)) break;
if(!flipper_format_read_string(ff, "type", read_string)) break;
if(!string_cmp_str(read_string, "raw")) {
uint32_t* timings = nullptr;
uint32_t timings_cnt = 0;
uint32_t frequency = 0;
float duty_cycle = 0;
if(!flipper_file_read_uint32(ff, "frequency", &frequency, 1)) break;
if(!flipper_file_read_float(ff, "duty_cycle", &duty_cycle, 1)) break;
if(!flipper_file_get_value_count(ff, "data", &timings_cnt)) break;
if(!flipper_format_read_uint32(ff, "frequency", &frequency, 1)) break;
if(!flipper_format_read_float(ff, "duty_cycle", &duty_cycle, 1)) break;
if(!flipper_format_get_value_count(ff, "data", &timings_cnt)) break;
if(timings_cnt > MAX_TIMINGS_AMOUNT) break;
timings = (uint32_t*)furi_alloc(sizeof(uint32_t) * timings_cnt);
if(flipper_file_read_uint32(ff, "data", timings, timings_cnt)) {
timings = (uint32_t*)malloc(sizeof(uint32_t) * timings_cnt);
if(flipper_format_read_uint32(ff, "data", timings, timings_cnt)) {
signal.set_raw_signal(timings, timings_cnt, frequency, duty_cycle);
result = true;
}
free(timings);
} else if(!string_cmp_str(read_string, "parsed")) {
IrdaMessage parsed_signal;
if(!flipper_file_read_string(ff, "protocol", read_string)) break;
if(!flipper_format_read_string(ff, "protocol", read_string)) break;
parsed_signal.protocol = irda_get_protocol_by_name(string_get_cstr(read_string));
if(!flipper_file_read_hex(ff, "address", (uint8_t*)&parsed_signal.address, 4)) break;
if(!flipper_file_read_hex(ff, "command", (uint8_t*)&parsed_signal.command, 4)) break;
if(!flipper_format_read_hex(ff, "address", (uint8_t*)&parsed_signal.address, 4)) break;
if(!flipper_format_read_hex(ff, "command", (uint8_t*)&parsed_signal.command, 4)) break;
if(!irda_parser_is_parsed_signal_valid(&parsed_signal)) break;
signal.set_message(&parsed_signal);
result = true;

9
applications/irda/helpers/irda_parser.h
View File

@@ -1,10 +1,13 @@
#pragma once
#include "../irda_app_signal.h"
#include <flipper_file.h>
#include <flipper_format/flipper_format.h>
#include <string>
bool irda_parser_save_signal(FlipperFile* ff, const IrdaAppSignal& signal, const std::string& name);
bool irda_parser_read_signal(FlipperFile* ff, IrdaAppSignal& signal, std::string& name);
bool irda_parser_save_signal(
FlipperFormat* ff,
const IrdaAppSignal& signal,
const std::string& name);
bool irda_parser_read_signal(FlipperFormat* ff, IrdaAppSignal& signal, std::string& name);
bool irda_parser_is_parsed_signal_valid(const IrdaMessage* signal);
bool irda_parser_is_raw_signal_valid(uint32_t frequency, float duty_cycle, uint32_t timings_cnt);

19
applications/irda/irda_app_brute_force.cpp
View File

@@ -16,15 +16,15 @@ bool IrdaAppBruteForce::calculate_messages() {
bool result = false;
Storage* storage = static_cast<Storage*>(furi_record_open("storage"));
FlipperFile* ff = flipper_file_alloc(storage);
result = flipper_file_open_existing(ff, universal_db_filename);
FlipperFormat* ff = flipper_format_file_alloc(storage);
result = flipper_format_file_open_existing(ff, universal_db_filename);
if(result) {
IrdaAppSignal signal;
string_t signal_name;
string_init(signal_name);
while(flipper_file_read_string(ff, "name", signal_name)) {
while(flipper_format_read_string(ff, "name", signal_name)) {
auto element = records.find(string_get_cstr(signal_name));
if(element != records.cend()) {
++element->second.amount;
@@ -33,8 +33,7 @@ bool IrdaAppBruteForce::calculate_messages() {
string_clear(signal_name);
}
flipper_file_close(ff);
flipper_file_free(ff);
flipper_format_free(ff);
furi_record_close("storage");
return result;
}
@@ -45,8 +44,7 @@ void IrdaAppBruteForce::stop_bruteforce() {
if(current_record.size()) {
furi_assert(ff);
current_record.clear();
flipper_file_close(ff);
flipper_file_free(ff);
flipper_format_free(ff);
furi_record_close("storage");
}
}
@@ -84,11 +82,10 @@ bool IrdaAppBruteForce::start_bruteforce(int index, int& record_amount) {
if(record_amount) {
Storage* storage = static_cast<Storage*>(furi_record_open("storage"));
ff = flipper_file_alloc(storage);
result = flipper_file_open_existing(ff, universal_db_filename);
ff = flipper_format_file_alloc(storage);
result = flipper_format_file_open_existing(ff, universal_db_filename);
if(!result) {
flipper_file_close(ff);
flipper_file_free(ff);
flipper_format_free(ff);
furi_record_close("storage");
}
}

4
applications/irda/irda_app_brute_force.h
View File

@@ -2,12 +2,12 @@
#include <unordered_map>
#include <memory>
#include <flipper_file.h>
#include <flipper_format/flipper_format.h>
class IrdaAppBruteForce {
const char* universal_db_filename;
std::string current_record;
FlipperFile* ff;
FlipperFormat* ff;
typedef struct {
int index;

20
applications/irda/irda_app_remote_manager.cpp
View File

@@ -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;
}

2
applications/irda/view/irda_app_brut_view.c
View File

@@ -76,7 +76,7 @@ void popup_brut_set_progress_max(IrdaAppPopupBrut* popup_brut, uint16_t progress
}
IrdaAppPopupBrut* popup_brut_alloc(void) {
return (IrdaAppPopupBrut*)furi_alloc(sizeof(IrdaAppPopupBrut));
return (IrdaAppPopupBrut*)malloc(sizeof(IrdaAppPopupBrut));
}
void popup_brut_free(IrdaAppPopupBrut* popup_brut) {