diff --git a/lib/subghz/protocols/keeloq.c b/lib/subghz/protocols/keeloq.c index 27a360e00..ab24a8e7f 100644 --- a/lib/subghz/protocols/keeloq.c +++ b/lib/subghz/protocols/keeloq.c @@ -154,7 +154,7 @@ static bool subghz_protocol_keeloq_gen_data(SubGhzProtocolEncoderKeeloq* instanc code_found_reverse = subghz_protocol_blocks_reverse_key( instance->generic.data, instance->generic.data_count_bit); hop = code_found_reverse & 0x00000000ffffffff; - FURI_LOG_I(TAG, "hop = %X", hop); + FURI_LOG_I(TAG, "hop = %08lX", hop); break; } break; @@ -483,7 +483,7 @@ static uint8_t subghz_protocol_keeloq_check_remote_controller_selector( case KEELOQ_LEARNING_SIMPLE: // Simple Learning decrypt = subghz_protocol_keeloq_common_decrypt(hop, manufacture_code->key); - FURI_LOG_I(TAG, "mfkey: %016lX", (uint64_t)manufacture_code->key); + FURI_LOG_I(TAG, "mfkey: %08lX%08lX", manufacture_code->key >> 32, manufacture_code->key); if(subghz_protocol_keeloq_check_decrypt(instance, decrypt, btn, end_serial)) { *manufacture_name = string_get_cstr(manufacture_code->name); return 1; @@ -493,7 +493,7 @@ static uint8_t subghz_protocol_keeloq_check_remote_controller_selector( // Normal Learning // https://phreakerclub.com/forum/showpost.php?p=43557&postcount=37 man = subghz_protocol_keeloq_common_normal_learning(fix, manufacture_code->key); - FURI_LOG_I(TAG, "mfkey: %016lX", (uint64_t)manufacture_code->key); + FURI_LOG_I(TAG, "mfkey: %08lX%08lX", manufacture_code->key >> 32, manufacture_code->key); decrypt = subghz_protocol_keeloq_common_decrypt(hop, man); if(subghz_protocol_keeloq_check_decrypt(instance, decrypt, btn, end_serial)) { *manufacture_name = string_get_cstr(manufacture_code->name); @@ -503,7 +503,7 @@ static uint8_t subghz_protocol_keeloq_check_remote_controller_selector( case KEELOQ_LEARNING_SECURE: man = subghz_protocol_keeloq_common_secure_learning( fix, seed, manufacture_code->key); - FURI_LOG_I(TAG, "mfkey: %016lX", (uint64_t)manufacture_code->key); + FURI_LOG_I(TAG, "mfkey: %08lX%08lX", manufacture_code->key >> 32, manufacture_code->key); decrypt = subghz_protocol_keeloq_common_decrypt(hop, man); if(subghz_protocol_keeloq_check_decrypt(instance, decrypt, btn, end_serial)) { *manufacture_name = string_get_cstr(manufacture_code->name); @@ -513,7 +513,7 @@ static uint8_t subghz_protocol_keeloq_check_remote_controller_selector( case KEELOQ_LEARNING_MAGIC_XOR_TYPE_1: man = subghz_protocol_keeloq_common_magic_xor_type1_learning( fix, manufacture_code->key); - FURI_LOG_I(TAG, "mfkey: %016lX", (uint64_t)manufacture_code->key); + FURI_LOG_I(TAG, "mfkey: %08lX%08lX", manufacture_code->key >> 32, manufacture_code->key); decrypt = subghz_protocol_keeloq_common_decrypt(hop, man); if(subghz_protocol_keeloq_check_decrypt(instance, decrypt, btn, end_serial)) { *manufacture_name = string_get_cstr(manufacture_code->name); @@ -523,7 +523,7 @@ static uint8_t subghz_protocol_keeloq_check_remote_controller_selector( case KEELOQ_LEARNING_UNKNOWN: // Simple Learning decrypt = subghz_protocol_keeloq_common_decrypt(hop, manufacture_code->key); - FURI_LOG_I(TAG, "mfkey: %016lX", (uint64_t)manufacture_code->key); + FURI_LOG_I(TAG, "mfkey: %08lX%08lX", manufacture_code->key >> 32, manufacture_code->key); if(subghz_protocol_keeloq_check_decrypt(instance, decrypt, btn, end_serial)) { *manufacture_name = string_get_cstr(manufacture_code->name); return 1; @@ -544,7 +544,7 @@ static uint8_t subghz_protocol_keeloq_check_remote_controller_selector( // Normal Learning // https://phreakerclub.com/forum/showpost.php?p=43557&postcount=37 man = subghz_protocol_keeloq_common_normal_learning(fix, manufacture_code->key); - FURI_LOG_I(TAG, "mfkey: %016lX", (uint64_t)manufacture_code->key); + FURI_LOG_I(TAG, "mfkey: %08lX%08lX", manufacture_code->key >> 32, manufacture_code->key); decrypt = subghz_protocol_keeloq_common_decrypt(hop, man); if(subghz_protocol_keeloq_check_decrypt(instance, decrypt, btn, end_serial)) { *manufacture_name = string_get_cstr(manufacture_code->name); @@ -562,7 +562,7 @@ static uint8_t subghz_protocol_keeloq_check_remote_controller_selector( // Secure Learning man = subghz_protocol_keeloq_common_secure_learning( fix, seed, manufacture_code->key); - FURI_LOG_I(TAG, "mfkey: %016lX", (uint64_t)manufacture_code->key); + FURI_LOG_I(TAG, "mfkey: %08lX%08lX", manufacture_code->key >> 32, manufacture_code->key); decrypt = subghz_protocol_keeloq_common_decrypt(hop, man); if(subghz_protocol_keeloq_check_decrypt(instance, decrypt, btn, end_serial)) { *manufacture_name = string_get_cstr(manufacture_code->name); @@ -580,7 +580,7 @@ static uint8_t subghz_protocol_keeloq_check_remote_controller_selector( // Magic xor type1 learning man = subghz_protocol_keeloq_common_magic_xor_type1_learning( fix, manufacture_code->key); - FURI_LOG_I(TAG, "mfkey: %016lX", (uint64_t)manufacture_code->key); + FURI_LOG_I(TAG, "mfkey: %08lX%08lX", manufacture_code->key >> 32, manufacture_code->key); decrypt = subghz_protocol_keeloq_common_decrypt(hop, man); if(subghz_protocol_keeloq_check_decrypt(instance, decrypt, btn, end_serial)) { *manufacture_name = string_get_cstr(manufacture_code->name); diff --git a/lib/subghz/protocols/star_line.c b/lib/subghz/protocols/star_line.c index f7f23f973..e3acb120a 100644 --- a/lib/subghz/protocols/star_line.c +++ b/lib/subghz/protocols/star_line.c @@ -153,7 +153,7 @@ static bool subghz_protocol_star_line_gen_data(SubGhzProtocolEncoderStarLine* in code_found_reverse = subghz_protocol_blocks_reverse_key( instance->generic.data, instance->generic.data_count_bit); hop = code_found_reverse & 0x00000000ffffffff; - FURI_LOG_I(TAG, "hop = %X", hop); + FURI_LOG_I(TAG, "hop = %08lX", hop); break; } break; @@ -461,7 +461,7 @@ static uint8_t subghz_protocol_star_line_check_remote_controller_selector( case KEELOQ_LEARNING_SIMPLE: //Simple Learning decrypt = subghz_protocol_keeloq_common_decrypt(hop, manufacture_code->key); - FURI_LOG_I(TAG, "mfkey: %016lX", (uint64_t)manufacture_code->key); + FURI_LOG_I(TAG, "mfkey: %08lX%08lX", manufacture_code->key >> 32, manufacture_code->key); if(subghz_protocol_star_line_check_decrypt(instance, decrypt, btn, end_serial)) { *manufacture_name = string_get_cstr(manufacture_code->name); return 1; @@ -472,7 +472,7 @@ static uint8_t subghz_protocol_star_line_check_remote_controller_selector( // https://phreakerclub.com/forum/showpost.php?p=43557&postcount=37 man_normal_learning = subghz_protocol_keeloq_common_normal_learning(fix, manufacture_code->key); - FURI_LOG_I(TAG, "mfkey: %016lX", (uint64_t)manufacture_code->key); + FURI_LOG_I(TAG, "mfkey: %08lX%08lX", manufacture_code->key >> 32, manufacture_code->key); decrypt = subghz_protocol_keeloq_common_decrypt(hop, man_normal_learning); if(subghz_protocol_star_line_check_decrypt(instance, decrypt, btn, end_serial)) { *manufacture_name = string_get_cstr(manufacture_code->name); @@ -482,7 +482,7 @@ static uint8_t subghz_protocol_star_line_check_remote_controller_selector( case KEELOQ_LEARNING_UNKNOWN: // Simple Learning decrypt = subghz_protocol_keeloq_common_decrypt(hop, manufacture_code->key); - FURI_LOG_I(TAG, "mfkey: %016lX", (uint64_t)manufacture_code->key); + FURI_LOG_I(TAG, "mfkey: %08lX%08lX", manufacture_code->key >> 32, manufacture_code->key); if(subghz_protocol_star_line_check_decrypt(instance, decrypt, btn, end_serial)) { *manufacture_name = string_get_cstr(manufacture_code->name); return 1; @@ -504,7 +504,7 @@ static uint8_t subghz_protocol_star_line_check_remote_controller_selector( // https://phreakerclub.com/forum/showpost.php?p=43557&postcount=37 man_normal_learning = subghz_protocol_keeloq_common_normal_learning(fix, manufacture_code->key); - FURI_LOG_I(TAG, "mfkey: %016lX", (uint64_t)manufacture_code->key); + FURI_LOG_I(TAG, "mfkey: %08lX%08lX", manufacture_code->key >> 32, manufacture_code->key); decrypt = subghz_protocol_keeloq_common_decrypt(hop, man_normal_learning); if(subghz_protocol_star_line_check_decrypt(instance, decrypt, btn, end_serial)) { *manufacture_name = string_get_cstr(manufacture_code->name);