From 082bd9de5e17e125f4e48e71f3ff907f1f1bfa97 Mon Sep 17 00:00:00 2001 From: r3df0xx Date: Fri, 1 Apr 2022 10:06:10 +0300 Subject: [PATCH] fix --- lib/subghz/protocols/nice_flor_s.c | 6 +++--- lib/subghz/subghz_keystore.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/subghz/protocols/nice_flor_s.c b/lib/subghz/protocols/nice_flor_s.c index 2fd78840a..4db2f6f8b 100644 --- a/lib/subghz/protocols/nice_flor_s.c +++ b/lib/subghz/protocols/nice_flor_s.c @@ -132,9 +132,9 @@ static bool FURI_LOG_I(TAG, "counter = %X", instance->generic.cnt); FURI_LOG_I(TAG, "button = %X", btn); uint64_t decrypt = (uint64_t)( (instance->generic.serial << 16) | (instance->generic.cnt) ); - FURI_LOG_I(TAG, "decrypt = %016llX", decrypt); + FURI_LOG_I(TAG, "decrypt = %016X", decrypt); uint64_t enc_part = (uint64_t)subghz_protocol_nice_flor_s_encrypt(decrypt, file_name); - FURI_LOG_I(TAG, "enc_part = %016llX", enc_part); + FURI_LOG_I(TAG, "enc_part = %016X", enc_part); for (int i = 0; i < 16; i++) { @@ -170,7 +170,7 @@ static bool //Button 4 instance->generic.data = ( (btn << 4) | ((0xF ^ btn ^ loops[3][i]) << 44) | (enc_part) ); } - FURI_LOG_I(TAG, "key = %016llX", instance->generic.data); + FURI_LOG_I(TAG, "key = %016X", instance->generic.data); //Send header for(uint8_t i = 35; i > 0; i--) { diff --git a/lib/subghz/subghz_keystore.c b/lib/subghz/subghz_keystore.c index e34b7243a..57eea544f 100644 --- a/lib/subghz/subghz_keystore.c +++ b/lib/subghz/subghz_keystore.c @@ -587,7 +587,7 @@ bool subghz_keystore_raw_get_data(const char* file_name, size_t offset, uint8_t* break; } memcpy(data, (uint8_t*)decrypted_line + (offset - (offset / 16) * 16), len); - FURI_LOG_I(TAG, "decrypted line: %016llX", decrypted_line); + FURI_LOG_I(TAG, "decrypted line: %016X", decrypted_line); } while(0); furi_hal_crypto_store_unload_key(SUBGHZ_KEYSTORE_FILE_ENCRYPTION_KEY_SLOT);