Fix merge remotes

rolling_flaws/.gitsubtree

@@ -1 +1,2 @@
+https://github.com/xMasterX/all-the-plugins dev base_pack/rolling_flaws
 https://github.com/jamisonderek/flipper-zero-tutorials main subghz/apps/rolling-flaws

rolling_flaws/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023 Derek Jamison
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

rolling_flaws/rolling_flaws_send_keeloq.c

@@ -14,8 +14,6 @@ static SubGhzEnvironment* load_environment() {
     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(

rolling_flaws/rolling_flaws_settings.c

@@ -7,8 +7,8 @@ void rolling_flaws_setting_change(VariableItem *item, char **names, uint8_t *new
     *new_index = index;
 }
 
-uint32_t setting_frequency_values[] = {315000000, 390000000, 433920000};
-char *setting_frequency_names[] = {"315.00", "390.00", "433.92"};
+uint32_t setting_frequency_values[] = {310000000, 315000000, 390000000, 433420000, 433920000, 868350000, 868800000};
+char *setting_frequency_names[] = {"310.00", "315.00", "390.00", "433.42", "433.92", "868.35", "868.80"};
 void rolling_flaws_setting_frequency_change(VariableItem *item)
 {
     RollingFlaws *app = variable_item_get_context(item);
@@ -182,7 +182,7 @@ void rolling_flaw_populate_variable_item_list(RollingFlaws *app)
         COUNT_OF(setting_frequency_names),
         rolling_flaws_setting_frequency_change,
         app);
-    app->model->frequency_index = 2; // 433.92
+    app->model->frequency_index = 4; // 433.92
     variable_item_set_current_value_index(item, app->model->frequency_index);
     variable_item_set_current_value_text(
         item, setting_frequency_names[app->model->frequency_index]);

rolling_flaws/rolling_flaws_subghz_receive.c

@@ -4,8 +4,6 @@ static SubGhzEnvironment* load_environment() {
     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(