Settings changes

- Changes the name of the settings on the main menu
- Made it so you no longer need to specify how many settings there are to make it easier to adjust them
- Adjusts available settings

nfc_playlist.h

@@ -27,7 +27,7 @@ typedef struct {
    uint8_t emulate_delay;
 } NfcPlaylist;
 
-static const int options_emulate_timeout[] = { 1000, 2000, 3000, 4000, 5000, 6000, 7000, 8000, 9000, 10000 };
+static const int options_emulate_timeout[] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 };
 static const int default_emulate_timeout = 4;
-static const int options_emulate_delay[] = { 0, 1000, 2000, 3000, 4000, 5000 };
+static const int options_emulate_delay[] = { 0, 1, 2, 3, 4, 5, 6 };
 static const int default_emulate_delay = 0;

scences/emulation.c

@@ -21,7 +21,7 @@ void nfc_playlist_emulation_scene_on_enter(void* context) {
         while(stream_read_line(stream, line)) {
             if (options_emulate_delay[nfc_playlist->emulate_delay] > 0) {
                 if (file_position > 0) {
-                    int time_counter_delay_ms = options_emulate_delay[nfc_playlist->emulate_delay];
+                    int time_counter_delay_ms = (options_emulate_delay[nfc_playlist->emulate_delay] * 1000);
                     do {
                         char display_text[30];
                         snprintf(display_text, 30, "%s\n\n%ds", "Delaying...", (time_counter_delay_ms/1000));
@@ -36,7 +36,7 @@ void nfc_playlist_emulation_scene_on_enter(void* context) {
 
             char* file_path = (char*)furi_string_get_cstr(line);
             char* file_name = &strrchr(file_path, '/')[1];
-            int time_counter_ms = options_emulate_timeout[nfc_playlist->emulate_timeout];
+            int time_counter_ms = (options_emulate_timeout[nfc_playlist->emulate_timeout] * 1000);
 
             if (storage_file_exists(storage, file_path) == false) {
                 char const* popup_text_unformatted = strcat(file_name, "\nnot found");

scences/main_menu.c

@@ -29,18 +29,20 @@ static void nfc_playlist_settings_change_callback(VariableItem* item) {
     uint8_t option_value_index = variable_item_get_current_value_index(item);
 
     switch(current_option) {
-        case NfcPlaylistSettings_Timeout: ;
+        case NfcPlaylistSettings_Timeout: {
             nfc_playlist->emulate_timeout = option_value_index;
             char emulate_timeout_text[10];
-            snprintf(emulate_timeout_text, 10, "%ds", (options_emulate_timeout[option_value_index]/1000));
+            snprintf(emulate_timeout_text, 10, "%ds", options_emulate_timeout[option_value_index]);
             variable_item_set_current_value_text(item, (char*)emulate_timeout_text);
             break;
-        case NfcPlaylistSettings_Delay: ;
+        }
+        case NfcPlaylistSettings_Delay: {
             nfc_playlist->emulate_delay = option_value_index;
             char emulate_delay_text[10];
-            snprintf(emulate_delay_text, 10, "%ds", (options_emulate_delay[option_value_index]/1000));
+            snprintf(emulate_delay_text, 10, "%ds", options_emulate_delay[option_value_index]);
             variable_item_set_current_value_text(item, (char*)emulate_delay_text);
             break;
+        }
         default:
             break;
    }
@@ -52,24 +54,24 @@ void nfc_playlist_main_menu_scene_on_enter(void* context) {
 
     VariableItem* emulation_timeout_settings = variable_item_list_add(
         nfc_playlist->variable_item_list,
-        "Timeout",
-        10,
+        "Emulate time",
+        (sizeof(options_emulate_timeout)/sizeof(options_emulate_timeout[0])),
         nfc_playlist_settings_change_callback,
         nfc_playlist);
     variable_item_set_current_value_index(emulation_timeout_settings, nfc_playlist->emulate_timeout);
     char emulation_timeout_settings_text[10];
-    snprintf(emulation_timeout_settings_text, 10, "%ds", (options_emulate_timeout[nfc_playlist->emulate_timeout]/1000));
+    snprintf(emulation_timeout_settings_text, 10, "%ds", options_emulate_timeout[nfc_playlist->emulate_timeout]);
     variable_item_set_current_value_text(emulation_timeout_settings, (char*)emulation_timeout_settings_text);
 
     VariableItem* emulation_delay_settings = variable_item_list_add(
         nfc_playlist->variable_item_list,
-        "Delay",
-        6,
+        "Delay time",
+        (sizeof(options_emulate_delay)/sizeof(options_emulate_delay[0])),
         nfc_playlist_settings_change_callback,
         nfc_playlist);
     variable_item_set_current_value_index(emulation_delay_settings, nfc_playlist->emulate_delay);
     char emulation_delay_settings_text[10];
-    snprintf(emulation_delay_settings_text, 10, "%ds", (options_emulate_delay[nfc_playlist->emulate_delay]/1000));
+    snprintf(emulation_delay_settings_text, 10, "%ds", options_emulate_delay[nfc_playlist->emulate_delay]);
     variable_item_set_current_value_text(emulation_delay_settings, (char*)emulation_delay_settings_text);
 
     variable_item_list_add(nfc_playlist->variable_item_list, "Start", 0, NULL, NULL);