Skip to content

Commit

Permalink
Better text2sam
Browse files Browse the repository at this point in the history
  • Loading branch information
@Willy-JL
Willy-JL committed Jun 17, 2023
1 parent 1d82583 commit e688f81
Showing 1 changed file with 2 additions and 115 deletions.
117 changes: 2 additions & 115 deletions applications/external/text2sam/sam_app.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#include <furi.h>
#include <furi_hal_speaker.h>
// #include <furi_hal.h>
#include <stdlib.h>

#include <input/input.h>
Expand All @@ -11,20 +10,14 @@
#include <gui/view.h>
#include <gui/view_dispatcher.h>
#include <gui/modules/text_input.h>
#include <gui/modules/text_box.h>

#include "stm32_sam.h"

#define TAG "SAM"
#define SAM_SAVE_PATH EXT_PATH("sam.txt")
#define TEXT_BUFFER_SIZE 256
// #define MESSAGES_BUFFER_SIZE 256
STM32SAM voice;

// FuriMutex* g_state_mutex;

// FuriString* message;

typedef enum {
EventTypeTick,
EventTypeKey,
Expand All @@ -36,10 +29,8 @@ typedef struct {
} PluginEvent;

typedef struct {
FuriMutex* mutex;
ViewDispatcher* view_dispatcher;
TextInput* text_input;
TextBox* text_box;
char input[TEXT_BUFFER_SIZE];
} AppState;

Expand All @@ -55,63 +46,40 @@ static void say_something(char* something) {

static void text_input_callback(void* ctx) {
AppState* app_state = (AppState*)ctx;
furi_mutex_acquire(app_state->mutex, FuriWaitForever);
//FURI_LOG_D(TAG, "Input text: %s", app_state->input);

// underscore_to_space(app_state->input);
for(int i = 0; app_state->input[i] != '\0'; i++) {
if(app_state->input[i] == '_') {
app_state->input[i] = ' ';
} else {
app_state->input[i] = app_state->input[i];
}
}

text_box_set_text(app_state->text_box, app_state->input);
view_dispatcher_switch_to_view(app_state->view_dispatcher, 1);

furi_mutex_release(app_state->mutex);
say_something(app_state->input);
}

static bool back_event_callback(void* ctx) {
const AppState* app_state = (AppState*)ctx;
view_dispatcher_stop(app_state->view_dispatcher);
furi_mutex_release(app_state->mutex);
return true;
}

static void sam_state_init(AppState* const app_state) {
app_state->view_dispatcher = view_dispatcher_alloc();
app_state->text_input = text_input_alloc();
app_state->text_box = text_box_alloc();
text_box_set_font(app_state->text_box, TextBoxFontText);
}

static void sam_state_free(AppState* const app_state) {
text_input_free(app_state->text_input);
text_box_free(app_state->text_box);
view_dispatcher_remove_view(app_state->view_dispatcher, 0);
view_dispatcher_remove_view(app_state->view_dispatcher, 1);
view_dispatcher_free(app_state->view_dispatcher);
free(app_state);
}

// static void app_draw_callback(Canvas* canvas, void* ctx) {}

static void app_input_callback(InputEvent* input_event, void* ctx) {
furi_assert(ctx);

FuriMessageQueue* event_queue = ctx;
furi_message_queue_put(event_queue, input_event, FuriWaitForever);
}

static void save_message(FuriString* save_string) {
Storage* storage = (Storage*)furi_record_open(RECORD_STORAGE);
File* file = storage_file_alloc(storage);
// uint16_t bytes_read = 0;
if(storage_file_open(file, SAM_SAVE_PATH, FSAM_WRITE, FSOM_CREATE_ALWAYS)) {
// bytes_read =
// storage_file_write(file, save_string, sizeof(save_string));
storage_file_write(file, save_string, TEXT_BUFFER_SIZE);
}
storage_file_close(file);
Expand All @@ -130,71 +98,15 @@ static bool load_messages() {
storage_file_free(file);
furi_record_close(RECORD_STORAGE);
return bytes_read == TEXT_BUFFER_SIZE;
// FlipperFormat* ff = flipper_format_file_alloc(storage);

// DialogsApp* dialogs = (DialogsApp*)furi_record_open(RECORD_DIALOGS);
// DialogsFileBrowserOptions browser_options;
// dialog_file_browser_set_basic_options(&browser_options, ".txt", NULL);
// FuriString* map_file = (FuriString*)"/ext/sam"; //furi_string_alloc();
// // furi_string_set(map_file, "/ext/sam");
// if(!storage_file_exists(storage, ANY_PATH("sam"))) {
// storage_common_mkdir(storage, ANY_PATH("sam")); //Make Folder If dir not exist
// }

// bool res = dialog_file_browser_show(dialogs, map_file, map_file, &browser_options);

// furi_record_close(RECORD_DIALOGS);

// // if user didn't choose anything, free everything and exit
// if(!res) {
// FURI_LOG_I(TAG, "exit");
// flipper_format_free(ff);
// furi_record_close(RECORD_STORAGE);

// furi_string_free(message);

// view_port_enabled_set(view_port, false);
// gui_remove_view_port(gui, view_port);
// view_port_free(view_port);
// free(g_state_mutex);
// furi_message_queue_free(event_queue);

// furi_record_close(RECORD_GUI);
// return;
// }
}

extern "C" int32_t sam_app(void* p) {
UNUSED(p);
app_state = (AppState*)malloc(sizeof(AppState));

// g_state_mutex = furi_mutex_alloc(FuriMutexTypeRecursive);

FURI_LOG_D(TAG, "Running sam_state_init");
sam_state_init(app_state);

app_state->mutex = furi_mutex_alloc(FuriMutexTypeNormal);
if(!app_state->mutex) {
FURI_LOG_E(TAG, "cannot create mutex\r\n");
free(app_state);
return 255;
}

// message = furi_string_alloc();

// Configure view port
ViewPort* view_port = view_port_alloc();
FuriMessageQueue* event_queue = furi_message_queue_alloc(8, sizeof(PluginEvent));
// view_port_draw_callback_set(view_port, app_draw_callback, g_state_mutex);
view_port_input_callback_set(view_port, app_input_callback, event_queue);

// // Register view port in GUI
// Gui* gui = (Gui*)furi_record_open(RECORD_GUI);
// gui_add_view_port(gui, view_port, GuiLayerFullscreen);

// InputEvent event;

//TODO: get message from file
FURI_LOG_D(TAG, "Assigning text input callback");

load_messages();
Expand All @@ -204,22 +116,16 @@ extern "C" int32_t sam_app(void* p) {
app_state,
app_state->input,
TEXT_BUFFER_SIZE,
//clear default text
false);
false); //clear default text
text_input_set_header_text(app_state->text_input, "Input");

// Open GUI and register view_port
Gui* gui = (Gui*)furi_record_open(RECORD_GUI);
//gui_add_view_port(gui, view_port, GuiLayerFullscreen);

FURI_LOG_D(TAG, "Enabling view dispatcher queue");
view_dispatcher_enable_queue(app_state->view_dispatcher);

FURI_LOG_D(TAG, "Adding text input view to dispatcher");
view_dispatcher_add_view(
app_state->view_dispatcher, 0, text_input_get_view(app_state->text_input));
view_dispatcher_add_view(
app_state->view_dispatcher, 1, text_box_get_view(app_state->text_box));

FURI_LOG_D(TAG, "Attaching view dispatcher to GUI");
view_dispatcher_attach_to_gui(app_state->view_dispatcher, gui, ViewDispatcherTypeFullscreen);
Expand All @@ -229,28 +135,9 @@ extern "C" int32_t sam_app(void* p) {
view_dispatcher_switch_to_view(app_state->view_dispatcher, 0);
view_dispatcher_run(app_state->view_dispatcher);

// for(bool running = true; running;) {
// PluginEvent event;
// FuriMessageQueue* event_queue = furi_message_queue_alloc(8, sizeof(PluginEvent));
// FuriStatus event_status = furi_message_queue_get(event_queue, &event, FuriWaitForever);
// if(event_status == FuriStatusOk) {
// if(event.input.key == InputKeyOk) {
say_something(app_state->input);
save_message((FuriString*)app_state->input);
FURI_LOG_D(TAG, "Spoken text: %s", app_state->input);
// }
// if(event.input.key == InputKeyBack) {
// running = false;
// }
// }
// }

view_port_enabled_set(view_port, false);
gui_remove_view_port(gui, view_port);
furi_record_close(RECORD_GUI);
view_port_free(view_port);
furi_mutex_free(app_state->mutex);
// furi_mutex_free(g_state_mutex);
sam_state_free(app_state);

return 0;
Expand Down

0 comments on commit e688f81

Please sign in to comment.