Merge branch 'UNLEASHED' into 420

This commit is contained in:
RogueMaster
2022-10-06 12:58:47 -04:00
448 changed files with 7087 additions and 4979 deletions

View File

@@ -2,7 +2,6 @@
#include <stdlib.h>
#include <m-dict.h>
#include <m-string.h>
#include <flipper_format/flipper_format.h>
#include "infrared_signal.h"
@@ -14,15 +13,15 @@ typedef struct {
DICT_DEF2(
InfraredBruteForceRecordDict,
string_t,
STRING_OPLIST,
FuriString*,
FURI_STRING_OPLIST,
InfraredBruteForceRecord,
M_POD_OPLIST);
struct InfraredBruteForce {
FlipperFormat* ff;
const char* db_filename;
string_t current_record_name;
FuriString* current_record_name;
InfraredSignal* current_signal;
InfraredBruteForceRecordDict_t records;
bool is_started;
@@ -34,7 +33,7 @@ InfraredBruteForce* infrared_brute_force_alloc() {
brute_force->db_filename = NULL;
brute_force->current_signal = NULL;
brute_force->is_started = false;
string_init(brute_force->current_record_name);
brute_force->current_record_name = furi_string_alloc();
InfraredBruteForceRecordDict_init(brute_force->records);
return brute_force;
}
@@ -47,7 +46,7 @@ void infrared_brute_force_clear_records(InfraredBruteForce* brute_force) {
void infrared_brute_force_free(InfraredBruteForce* brute_force) {
furi_assert(!brute_force->is_started);
InfraredBruteForceRecordDict_clear(brute_force->records);
string_clear(brute_force->current_record_name);
furi_string_free(brute_force->current_record_name);
free(brute_force);
}
@@ -66,8 +65,8 @@ bool infrared_brute_force_calculate_messages(InfraredBruteForce* brute_force) {
success = flipper_format_buffered_file_open_existing(ff, brute_force->db_filename);
if(success) {
string_t signal_name;
string_init(signal_name);
FuriString* signal_name;
signal_name = furi_string_alloc();
while(flipper_format_read_string(ff, "name", signal_name)) {
InfraredBruteForceRecord* record =
InfraredBruteForceRecordDict_get(brute_force->records, signal_name);
@@ -75,7 +74,7 @@ bool infrared_brute_force_calculate_messages(InfraredBruteForce* brute_force) {
++(record->count);
}
}
string_clear(signal_name);
furi_string_free(signal_name);
}
flipper_format_free(ff);
@@ -99,7 +98,7 @@ bool infrared_brute_force_start(
if(record->value.index == index) {
*record_count = record->value.count;
if(*record_count) {
string_set(brute_force->current_record_name, record->key);
furi_string_set(brute_force->current_record_name, record->key);
}
break;
}
@@ -123,7 +122,7 @@ bool infrared_brute_force_is_started(InfraredBruteForce* brute_force) {
void infrared_brute_force_stop(InfraredBruteForce* brute_force) {
furi_assert(brute_force->is_started);
string_reset(brute_force->current_record_name);
furi_string_reset(brute_force->current_record_name);
infrared_signal_free(brute_force->current_signal);
flipper_format_free(brute_force->ff);
brute_force->current_signal = NULL;
@@ -147,10 +146,10 @@ void infrared_brute_force_add_record(
uint32_t index,
const char* name) {
InfraredBruteForceRecord value = {.index = index, .count = 0};
string_t key;
string_init_set_str(key, name);
FuriString* key;
key = furi_string_alloc_set(name);
InfraredBruteForceRecordDict_set_at(brute_force->records, key, value);
string_clear(key);
furi_string_free(key);
}
void infrared_brute_force_reset(InfraredBruteForce* brute_force) {