diff --git a/evil_portal_app.c b/evil_portal_app.c index 47e072ebb94..85bf9ddeb7b 100644 --- a/evil_portal_app.c +++ b/evil_portal_app.c @@ -1,5 +1,4 @@ #include "evil_portal_app_i.h" -#include "helpers/evil_portal_speaker.h" #include "helpers/evil_portal_storage.h" #include diff --git a/helpers/evil_portal_speaker.c b/helpers/evil_portal_speaker.c deleted file mode 100644 index b0fc9e87d3e..00000000000 --- a/helpers/evil_portal_speaker.c +++ /dev/null @@ -1,19 +0,0 @@ -#include "evil_portal_speaker.h" -#include "../evil_portal_app_i.h" - -#define NOTE_INPUT 587.33f - -void evil_portal_play_input_sound() { - float volume = 1.0f; - if(furi_hal_speaker_is_mine() || furi_hal_speaker_acquire(30)) { - furi_hal_speaker_start(NOTE_INPUT, volume); - } - -} - -void evil_portal_stop_all_sound() { - if(furi_hal_speaker_is_mine()) { - furi_hal_speaker_stop(); - furi_hal_speaker_release(); - } -} diff --git a/helpers/evil_portal_speaker.h b/helpers/evil_portal_speaker.h deleted file mode 100644 index 842a484b024..00000000000 --- a/helpers/evil_portal_speaker.h +++ /dev/null @@ -1,4 +0,0 @@ -#define NOTE_INPUT 587.33f - -void evil_portal_play_input_sound(); -void evil_portal_stop_all_sound(); diff --git a/helpers/evil_portal_storage.h b/helpers/evil_portal_storage.h index 07439b23b87..e50b7d20b29 100644 --- a/helpers/evil_portal_storage.h +++ b/helpers/evil_portal_storage.h @@ -5,27 +5,11 @@ #include #include -#define EVIL_PORTAL_SETTINGS_FILE_VERSION 1 #define PORTAL_FILE_DIRECTORY_PATH EXT_PATH("apps_data/evil_portal") -#define EVIL_PORTAL_SETTINGS_SAVE_PATH \ - PORTAL_FILE_DIRECTORY_PATH "/evil_portal.conf" -#define EVIL_PORTAL_SETTINGS_SAVE_PATH_TMP EVIL_PORTAL_SETTINGS_SAVE_PATH ".tmp" #define EVIL_PORTAL_INDEX_SAVE_PATH PORTAL_FILE_DIRECTORY_PATH "/index.html" -#define EVIL_PORTAL_INDEX_SAVE_PATH_TMP EVIL_PORTAL_INDEX_SAVE_PATH ".tmp" #define EVIL_PORTAL_AP_SAVE_PATH PORTAL_FILE_DIRECTORY_PATH "/ap.txt" -#define EVIL_PORTAL_AP_SAVE_PATH_TMP EVIL_PORTAL_AP_SAVE_PATH ".tmp" #define EVIL_PORTAL_LOG_SAVE_PATH PORTAL_FILE_DIRECTORY_PATH "/logs" -#define EVIL_PORTAL_LOG_SAVE_PATH_TMP EVIL_PORTAL_LOG_SAVE_PATH ".tmp" -#define EVIL_PORTAL_SETTINGS_HEADER "EvilPortal Config File" -#define EVIL_PORTAL_SETTINGS_KEY_PORTAL "PORTAL" -#define EVIL_PORTAL_SETTINGS_KEY_HAPTIC "Haptic" -#define EVIL_PORTAL_SETTINGS_KEY_LED "Led" -#define EVIL_PORTAL_SETTINGS_KEY_SPEAKER "Speaker" -#define EVIL_PORTAL_SETTINGS_KEY_SAVE_SETTINGS "SaveSettings" -#define EVIL_PORTAL_BUF_SIZE 4092 -// void captive_portal_save_settings(void* context); -// void captive_portal_read_settings(void* context); void evil_portal_read_index_html(void *context); void evil_portal_read_ap_name(void *context); void write_logs(char* portal_logs); diff --git a/scenes/evil_portal_scene_start.c b/scenes/evil_portal_scene_start.c index e6c582ee5a0..fa5e55d0d6b 100644 --- a/scenes/evil_portal_scene_start.c +++ b/scenes/evil_portal_scene_start.c @@ -1,5 +1,4 @@ #include "../evil_portal_app_i.h" -#include "../helpers/evil_portal_speaker.h" // For each command, define whether additional arguments are needed // (enabling text input to fill them out), and whether the console