Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Marauder: clear text buffer before displaying list #34

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
+10 −2
Open

Marauder: clear text buffer before displaying list #34

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e4813e
clear text buffer before displaying network list to prevent crash (#283)
jaylikesbunda Nov 17, 2024
b0c2f24
move buffer clear BEFORE send
jaylikesbunda Nov 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions wifi_marauder_companion/scenes/wifi_marauder_scene_console_output.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,19 +44,27 @@ void wifi_marauder_console_output_handle_rx_data_cb(uint8_t* buf, size_t len, vo
furi_assert(context);
WifiMarauderApp* app = context;

// Always save to log if enabled
if(app->is_writing_log) {
app->has_saved_logs_this_session = true;
storage_file_write(app->log_file, buf, len);
}

// If text box store gets too big, then truncate it
// Clear display buffer for new command responses
if(app->is_command && app->selected_tx_string &&
(strncmp("list", app->selected_tx_string, strlen("list")) == 0 ||
strncmp("get", app->selected_tx_string, strlen("get")) == 0)) {
furi_string_reset(app->text_box_store);
app->text_box_store_strlen = 0;
}

// Regular buffer management
app->text_box_store_strlen += len;
if(app->text_box_store_strlen >= WIFI_MARAUDER_TEXT_BOX_STORE_SIZE - 1) {
furi_string_right(app->text_box_store, app->text_box_store_strlen / 2);
app->text_box_store_strlen = furi_string_size(app->text_box_store) + len;
}

// Null-terminate buf and append to text box store
buf[len] = '\0';
furi_string_cat_printf(app->text_box_store, "%s", buf);
view_dispatcher_send_custom_event(app->view_dispatcher, WifiMarauderEventRefreshConsoleOutput);
Expand Down