Merge branch 'fz-dev' into dev

This commit is contained in:
MX
2023-02-13 19:30:36 +03:00
12 changed files with 76 additions and 58 deletions
+2 -4
View File
@@ -237,10 +237,8 @@ void ibutton_worker_emulate_timer_cb(void* context) {
const LevelDuration level_duration =
protocol_dict_encoder_yield(worker->protocols, worker->protocol_to_encode);
const bool level = level_duration_get_level(level_duration);
furi_hal_ibutton_emulate_set_next(level);
furi_hal_ibutton_pin_write(level);
furi_hal_ibutton_emulate_set_next(level_duration_get_duration(level_duration));
furi_hal_ibutton_pin_write(level_duration_get_level(level_duration));
}
void ibutton_worker_emulate_timer_start(iButtonWorker* worker) {
+1
View File
@@ -106,6 +106,7 @@ void tar_archive_set_file_callback(TarArchive* archive, tar_unpack_file_cb callb
static int tar_archive_entry_counter(mtar_t* tar, const mtar_header_t* header, void* param) {
UNUSED(tar);
UNUSED(header);
furi_assert(param);
int32_t* counter = param;
(*counter)++;
return 0;