Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-04-24 03:29:57 -07:00
Code Issues Packages Projects Releases Wiki Activity

fixes for new printf and furistream

Browse Source
This commit is contained in:
MX
2022-10-07 18:32:58 +03:00
parent bdd052937b
commit b4b3c182c5
7 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
applications/main/archive/scenes/archive_scene_info.c
View File

@@ -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),

2
applications/main/subghz/subghz_history.c
View File

@@ -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) {

2
applications/main/subghz/views/subghz_frequency_analyzer.c
View File

@@ -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!

2
lib/subghz/protocols/came_atomo.c
View File

@@ -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,

4
lib/subghz/protocols/faac_slh.c
View File

@@ -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,

8
lib/subghz/protocols/keeloq.c
View File

@@ -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,

2
lib/subghz/subghz_file_encoder_worker.c
View File

@@ -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);
}