diff --git a/applications/debug/unit_tests/subghz/subghz_test.c b/applications/debug/unit_tests/subghz/subghz_test.c index 1900f2045..80a1c1040 100644 --- a/applications/debug/unit_tests/subghz/subghz_test.c +++ b/applications/debug/unit_tests/subghz/subghz_test.c @@ -42,8 +42,6 @@ static void subghz_test_rx_callback( static void subghz_test_init(void) { environment_handler = subghz_environment_alloc(); - subghz_environment_set_came_atomo_rainbow_table_file_name( - environment_handler, CAME_ATOMO_DIR_NAME); subghz_environment_set_nice_flor_s_rainbow_table_file_name( environment_handler, NICE_FLOR_S_DIR_NAME); subghz_environment_set_alutech_at_4n_rainbow_table_file_name( diff --git a/applications/main/subghz/helpers/subghz_txrx.c b/applications/main/subghz/helpers/subghz_txrx.c index 0f8a8da32..c3f8ad445 100644 --- a/applications/main/subghz/helpers/subghz_txrx.c +++ b/applications/main/subghz/helpers/subghz_txrx.c @@ -46,8 +46,6 @@ SubGhzTxRx* subghz_txrx_alloc() { instance->is_database_loaded = subghz_environment_load_keystore(instance->environment, SUBGHZ_KEYSTORE_DIR_NAME); subghz_environment_load_keystore(instance->environment, SUBGHZ_KEYSTORE_DIR_USER_NAME); - subghz_environment_set_came_atomo_rainbow_table_file_name( - instance->environment, SUBGHZ_CAME_ATOMO_DIR_NAME); subghz_environment_set_alutech_at_4n_rainbow_table_file_name( instance->environment, SUBGHZ_ALUTECH_AT_4N_DIR_NAME); subghz_environment_set_nice_flor_s_rainbow_table_file_name( diff --git a/applications/main/subghz/subghz_cli.c b/applications/main/subghz/subghz_cli.c index b11359413..177dad1ac 100644 --- a/applications/main/subghz/subghz_cli.c +++ b/applications/main/subghz/subghz_cli.c @@ -326,8 +326,6 @@ void subghz_cli_command_rx(Cli* cli, FuriString* args, void* context) { SubGhzEnvironment* environment = subghz_environment_alloc(); subghz_environment_load_keystore(environment, SUBGHZ_KEYSTORE_DIR_NAME); subghz_environment_load_keystore(environment, SUBGHZ_KEYSTORE_DIR_USER_NAME); - subghz_environment_set_came_atomo_rainbow_table_file_name( - environment, SUBGHZ_CAME_ATOMO_DIR_NAME); subghz_environment_set_alutech_at_4n_rainbow_table_file_name( environment, SUBGHZ_ALUTECH_AT_4N_DIR_NAME); subghz_environment_set_nice_flor_s_rainbow_table_file_name( @@ -526,8 +524,6 @@ void subghz_cli_command_decode_raw(Cli* cli, FuriString* args, void* context) { 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, SUBGHZ_CAME_ATOMO_DIR_NAME); subghz_environment_set_alutech_at_4n_rainbow_table_file_name( environment, SUBGHZ_ALUTECH_AT_4N_DIR_NAME); subghz_environment_set_nice_flor_s_rainbow_table_file_name( diff --git a/applications/main/subghz_remote b/applications/main/subghz_remote index 208134409..a905d701e 160000 --- a/applications/main/subghz_remote +++ b/applications/main/subghz_remote @@ -1 +1 @@ -Subproject commit 2081344093ee4d1f72d2de6335884cc5e2d5952a +Subproject commit a905d701ee357f9d019ea496222626f102604be3 diff --git a/assets/resources/subghz/assets/came_atomo b/assets/resources/subghz/assets/came_atomo deleted file mode 100644 index 0952f3f20..000000000 --- a/assets/resources/subghz/assets/came_atomo +++ /dev/null @@ -1,6 +0,0 @@ -Filetype: Flipper SubGhz Keystore RAW File -Version: 0 -Encryption: 1 -IV: 47 69 6D 6D 65 20 74 68 65 63 6F 6F 6B 69 65 73 -Encrypt_data: RAW -E0BDF15D68F29AE787E7FCEE6C3611C90A92305D677B8FFFBE225196F5DC04CAEAE1102B4AB830E76C9C14DBA7FA5BD1F30864ABAF51387222FDCC0BA87E4FF709812D5C59DD953859AFD698A0EA2ECEFA0DC49652861EF4CF1864843F135DB8680E0C5C9EEC3BC548E2EB696DC8CA1B0F627347D2C476B410CF03A0F4D1EFB36DFB0574FE8F48FB61910CA539EC04583CA170A51822225A1D3E86C07219FE92E5DE9F557A45E611D74028BAF56E7F2C53DBA8DC53DA89B642FAC0A9A0BAC1756BDA0833ACB09F56E0FA3080CBE9E6A04B235F3AC82BB955FBFD779C59725E6D1875E04E0E84ABD0C3C1C8FAB247EC2755ACEC9961244E0D79AE710E4C7D33E9 \ No newline at end of file diff --git a/lib/subghz/environment.c b/lib/subghz/environment.c index b69494e66..33a78cfdd 100644 --- a/lib/subghz/environment.c +++ b/lib/subghz/environment.c @@ -4,7 +4,6 @@ struct SubGhzEnvironment { SubGhzKeystore* keystore; const SubGhzProtocolRegistry* protocol_registry; - const char* came_atomo_rainbow_table_file_name; const char* nice_flor_s_rainbow_table_file_name; const char* alutech_at_4n_rainbow_table_file_name; const char* mfname; @@ -16,7 +15,6 @@ SubGhzEnvironment* subghz_environment_alloc() { instance->keystore = subghz_keystore_alloc(); instance->protocol_registry = NULL; - instance->came_atomo_rainbow_table_file_name = NULL; instance->nice_flor_s_rainbow_table_file_name = NULL; instance->alutech_at_4n_rainbow_table_file_name = NULL; instance->mfname = ""; @@ -29,7 +27,6 @@ void subghz_environment_free(SubGhzEnvironment* instance) { furi_assert(instance); instance->protocol_registry = NULL; - instance->came_atomo_rainbow_table_file_name = NULL; instance->nice_flor_s_rainbow_table_file_name = NULL; instance->alutech_at_4n_rainbow_table_file_name = NULL; subghz_keystore_free(instance->keystore); @@ -53,15 +50,15 @@ void subghz_environment_set_came_atomo_rainbow_table_file_name( SubGhzEnvironment* instance, const char* filename) { furi_assert(instance); - - instance->came_atomo_rainbow_table_file_name = filename; + // Do nothing :) + return; } const char* subghz_environment_get_came_atomo_rainbow_table_file_name(SubGhzEnvironment* instance) { furi_assert(instance); - - return instance->came_atomo_rainbow_table_file_name; + // No table, sorry + return ""; } void subghz_environment_set_alutech_at_4n_rainbow_table_file_name(