Merge remote-tracking branch 'flipperdevices/dev' into dev

This commit is contained in:
Eng1n33r
2022-07-17 16:57:09 +03:00
3 changed files with 57 additions and 41 deletions

View File

@@ -246,6 +246,7 @@ void subghz_cli_command_rx(Cli* cli, string_t args, void* context) {
SubGhzEnvironment* environment = subghz_environment_alloc();
subghz_environment_load_keystore(environment, "/ext/subghz/assets/keeloq_mfcodes");
subghz_environment_load_keystore(environment, "/ext/subghz/assets/keeloq_mfcodes_user");
subghz_environment_set_came_atomo_rainbow_table_file_name(
environment, "/ext/subghz/assets/came_atomo");
subghz_environment_set_nice_flor_s_rainbow_table_file_name(
@@ -353,9 +354,16 @@ void subghz_cli_command_decode_raw(Cli* cli, string_t args, void* context) {
SubGhzEnvironment* environment = subghz_environment_alloc();
if(subghz_environment_load_keystore(environment, "/ext/subghz/assets/keeloq_mfcodes")) {
printf("SubGhz test: Load_keystore \033[0;32mOK\033[0m\r\n");
printf("SubGhz decode_raw: Load_keystore keeloq_mfcodes \033[0;32mOK\033[0m\r\n");
} else {
printf("SubGhz test: Load_keystore \033[0;31mERROR\033[0m\r\n");
printf("SubGhz decode_raw: Load_keystore keeloq_mfcodes \033[0;31mERROR\033[0m\r\n");
}
if(subghz_environment_load_keystore(
environment, "/ext/subghz/assets/keeloq_mfcodes_user")) {
printf("SubGhz decode_raw: Load_keystore keeloq_mfcodes_user \033[0;32mOK\033[0m\r\n");
} else {
printf(
"SubGhz decode_raw: Load_keystore keeloq_mfcodes_user \033[0;31mERROR\033[0m\r\n");
}
subghz_environment_set_came_atomo_rainbow_table_file_name(
environment, "/ext/subghz/assets/came_atomo");