fixes for new printf and furistream

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
+1 -1
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,
+2 -2
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,
+4 -4
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,
+1 -1
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);
}