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

[FL-1489] IRDA: move to FileWorker (#594)

Browse Source 
* [FL-1489] IRDA: move to FileWorker, fixes

* Use FileWorker
* Use file_select to select remotes
* Fix some crashes
* Add RAW parsing restrictions
* Remove excess scene (LearnDoneAfter)
* Move all file system logic to standalone object
This commit is contained in:
Albert Kharisov
2021-07-22 03:07:00 +03:00
committed by GitHub
parent b886ae17b6
commit 769ab2aef2
25 changed files with 591 additions and 391 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
applications/irda/irda-app-brute-force.cpp
View File

@@ -1,4 +1,8 @@
#include "irda-app-brute-force.hpp"
#include "irda/irda-app-file-parser.hpp"
#include "m-string.h"
#include <file-worker-cpp.h>
#include <memory>
void IrdaAppBruteForce::add_record(int index, const char* name) {
records[name].index = index;
@@ -7,43 +11,51 @@ void IrdaAppBruteForce::add_record(int index, const char* name) {
bool IrdaAppBruteForce::calculate_messages() {
bool fs_res = false;
fs_res = file_parser.get_fs_api().file.open(
&file, universal_db_filename, FSAM_READ, FSOM_OPEN_EXISTING);
furi_assert(!file_parser);
file_parser = std::make_unique<IrdaAppFileParser>();
fs_res = file_parser->open_irda_file_read(universal_db_filename);
if(!fs_res) {
file_parser.get_sd_api().show_error(file_parser.get_sd_api().context, "Can't open file");
file_parser.reset(nullptr);
return false;
}
file_parser.reset();
while(1) {
auto message = file_parser.read_signal(&file);
if(!message) break;
auto element = records.find(message->name);
auto file_signal = file_parser->read_signal();
if(!file_signal) break;
auto element = records.find(file_signal->name);
if(element != records.cend()) {
++element->second.amount;
}
}
file_parser.get_fs_api().file.close(&file);
file_parser->close();
file_parser.reset(nullptr);
return true;
}
void IrdaAppBruteForce::stop_bruteforce() {
furi_assert((current_record.size()));
if(current_record.size()) {
file_parser.get_fs_api().file.close(&file);
furi_assert(file_parser);
current_record.clear();
file_parser->close();
file_parser.reset(nullptr);
}
}
// TODO: [FL-1418] replace with timer-chained consequence of messages.
bool IrdaAppBruteForce::send_next_bruteforce(void) {
furi_assert(current_record.size());
furi_assert(file_parser);
std::unique_ptr<IrdaAppFileParser::IrdaFileSignal> file_signal;
do {
file_signal = file_parser.read_signal(&file);
file_signal = file_parser->read_signal();
} while(file_signal && current_record.compare(file_signal->name));
if(file_signal) {
@@ -53,25 +65,26 @@ bool IrdaAppBruteForce::send_next_bruteforce(void) {
}
bool IrdaAppBruteForce::start_bruteforce(int index, int& record_amount) {
file_parser.reset();
bool result = false;
record_amount = 0;
for(const auto& it : records) {
if(it.second.index == index) {
record_amount = it.second.amount;
current_record = it.first;
if(record_amount) {
current_record = it.first;
}
break;
}
}
if(record_amount) {
bool fs_res = file_parser.get_fs_api().file.open(
&file, universal_db_filename, FSAM_READ, FSOM_OPEN_EXISTING);
if(fs_res) {
return true;
} else {
file_parser.get_sd_api().show_error(
file_parser.get_sd_api().context, "Can't open file");
file_parser = std::make_unique<IrdaAppFileParser>();
result = file_parser->open_irda_file_read(universal_db_filename);
if(!result) {
(void)file_parser.reset(nullptr);
}
}
return false;
return result;
}