diff --git a/applications/main/archive/scenes/archive_scene_info.c b/applications/main/archive/scenes/archive_scene_info.c index 6b9e1c1af..e1a963d33 100644 --- a/applications/main/archive/scenes/archive_scene_info.c +++ b/applications/main/archive/scenes/archive_scene_info.c @@ -48,7 +48,7 @@ void archive_scene_info_on_enter(void* context) { FileInfo fileinfo; storage_common_stat(fs_api, furi_string_get_cstr(current->path), &fileinfo); if(fileinfo.size <= 1024) { - furi_string_printf(str_size, "%d", fileinfo.size); + furi_string_printf(str_size, "%lld", fileinfo.size); snprintf( file_info_message, sizeof(file_info_message), @@ -56,7 +56,7 @@ void archive_scene_info_on_enter(void* context) { furi_string_get_cstr(str_size), furi_string_get_cstr(dirname)); } else { - furi_string_printf(str_size, "%d", fileinfo.size / 1024); + furi_string_printf(str_size, "%lld", fileinfo.size / 1024); snprintf( file_info_message, sizeof(file_info_message), diff --git a/applications/main/subghz/subghz_history.c b/applications/main/subghz/subghz_history.c index b09002853..d7c30eeca 100644 --- a/applications/main/subghz/subghz_history.c +++ b/applications/main/subghz/subghz_history.c @@ -52,7 +52,7 @@ struct SubGhzHistory { FuriString* subghz_history_generate_temp_filename(uint32_t index) { FuriHalRtcDateTime datetime = {0}; furi_hal_rtc_get_datetime(&datetime); - return furi_string_alloc_printf("%03d%s", index, SUBGHZ_HISTORY_TMP_EXTENSION); + return furi_string_alloc_printf("%03ld%s", index, SUBGHZ_HISTORY_TMP_EXTENSION); } bool subghz_history_is_tmp_dir_exists(SubGhzHistory* instance) { diff --git a/applications/main/subghz/views/subghz_frequency_analyzer.c b/applications/main/subghz/views/subghz_frequency_analyzer.c index c0508576d..62825ba8e 100644 --- a/applications/main/subghz/views/subghz_frequency_analyzer.c +++ b/applications/main/subghz/views/subghz_frequency_analyzer.c @@ -376,7 +376,7 @@ void subghz_frequency_analyzer_pair_callback(void* context, uint32_t frequency, if((rssi != 0.f) && (frequency != 0)) { // Threre is some signal - FURI_LOG_I(TAG, "rssi = %.2f, frequency = %d Hz", (double)rssi, frequency); + FURI_LOG_I(TAG, "rssi = %.2f, frequency = %ld Hz", (double)rssi, frequency); frequency = round_int(frequency, 3); // Round 299999990Hz to 300000000Hz if(!instance->locked) { // Triggered! diff --git a/lib/subghz/protocols/came_atomo.c b/lib/subghz/protocols/came_atomo.c index bc8106145..575124df6 100644 --- a/lib/subghz/protocols/came_atomo.c +++ b/lib/subghz/protocols/came_atomo.c @@ -580,7 +580,7 @@ void subghz_protocol_decoder_came_atomo_get_string(void* context, FuriString* ou "%s %db\r\n" "Key:0x%08lX%08lX\r\n" "Sn:0x%08lX Btn:0x%01X\r\n" - "Pcl_Cnt:0x%04X\r\n" + "Pcl_Cnt:0x%04lX\r\n" "Btn_Cnt:0x%02X", instance->generic.protocol_name, diff --git a/lib/subghz/protocols/faac_slh.c b/lib/subghz/protocols/faac_slh.c index 09fb60e26..117ab60d5 100644 --- a/lib/subghz/protocols/faac_slh.c +++ b/lib/subghz/protocols/faac_slh.c @@ -494,8 +494,8 @@ void subghz_protocol_decoder_faac_slh_get_string(void* context, FuriString* outp output, "%s %dbit\r\n" "Key:%lX%08lX\r\n" - "Fix:%08lX Cnt:%05X\r\n" - "Hop:%08lX Btn:%lX\r\n" + "Fix:%08lX Cnt:%05lX\r\n" + "Hop:%08lX Btn:%X\r\n" "Sn:%07lX Sd:%08lX", instance->generic.protocol_name, instance->generic.data_count_bit, diff --git a/lib/subghz/protocols/keeloq.c b/lib/subghz/protocols/keeloq.c index 1ce4af3fa..b43a60e4d 100644 --- a/lib/subghz/protocols/keeloq.c +++ b/lib/subghz/protocols/keeloq.c @@ -985,8 +985,8 @@ void subghz_protocol_decoder_keeloq_get_string(void* context, FuriString* output output, "%s %dbit\r\n" "Key:%08lX%08lX\r\n" - "Fix:0x%08lX Cnt:%04X\r\n" - "Hop:0x%08lX Btn:%01lX\r\n" + "Fix:0x%08lX Cnt:%04lX\r\n" + "Hop:0x%08lX Btn:%01X\r\n" "MF:%s Sd:%08lX", instance->generic.protocol_name, instance->generic.data_count_bit, @@ -1003,8 +1003,8 @@ void subghz_protocol_decoder_keeloq_get_string(void* context, FuriString* output output, "%s %dbit\r\n" "Key:%08lX%08lX\r\n" - "Fix:0x%08lX Cnt:%04X\r\n" - "Hop:0x%08lX Btn:%01lX\r\n" + "Fix:0x%08lX Cnt:%04lX\r\n" + "Hop:0x%08lX Btn:%01X\r\n" "MF:%s", instance->generic.protocol_name, instance->generic.data_count_bit, diff --git a/lib/subghz/subghz_file_encoder_worker.c b/lib/subghz/subghz_file_encoder_worker.c index 905fe4ad5..c37b17f91 100644 --- a/lib/subghz/subghz_file_encoder_worker.c +++ b/lib/subghz/subghz_file_encoder_worker.c @@ -85,7 +85,7 @@ void subghz_file_encoder_worker_get_text_progress( Stream* stream = flipper_format_get_raw_stream(instance->flipper_format); size_t total_size = stream_size(stream); size_t current_offset = stream_tell(stream); - size_t buffer_avail = xStreamBufferBytesAvailable(instance->stream); + size_t buffer_avail = furi_stream_buffer_bytes_available(instance->stream); furi_string_printf(output, "%03u%%", 100 * (current_offset - buffer_avail) / total_size); }