diff options
Diffstat (limited to 'applications/irda/helpers/irda_parser.cpp')
| -rw-r--r-- | applications/irda/helpers/irda_parser.cpp | 51 |
1 files changed, 28 insertions, 23 deletions
diff --git a/applications/irda/helpers/irda_parser.cpp b/applications/irda/helpers/irda_parser.cpp index be0b17aa..a23a9b6d 100644 --- a/applications/irda/helpers/irda_parser.cpp +++ b/applications/irda/helpers/irda_parser.cpp @@ -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; |