Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
MX 2022-11-15 04:43:01 +03:00
commit 337c5b5a8b
No known key found for this signature in database
GPG key ID: 6C4C311DFD4B4AB5
2 changed files with 8 additions and 4 deletions

View file

@ -1,3 +1,5 @@
//** Includes sniffbt and sniffskim for compatible ESP32-WROOM hardware.
//wifi_marauder_app_i.h also changed **//
#include "../wifi_marauder_app_i.h"
// For each command, define whether additional arguments are needed
@ -10,7 +12,7 @@ typedef enum { FOCUS_CONSOLE_END = 0, FOCUS_CONSOLE_START, FOCUS_CONSOLE_TOGGLE
#define SHOW_STOPSCAN_TIP (true)
#define NO_TIP (false)
#define MAX_OPTIONS (7)
#define MAX_OPTIONS (9)
typedef struct {
const char* item_string;
const char* options_menu[MAX_OPTIONS];
@ -56,9 +58,9 @@ const WifiMarauderItem items[NUM_MENU_ITEMS] = {
FOCUS_CONSOLE_END,
SHOW_STOPSCAN_TIP},
{"Sniff",
{"beacon", "deauth", "esp", "pmkid", "probe", "pwn", "raw"},
7,
{"sniffbeacon", "sniffdeauth", "sniffesp", "sniffpmkid", "sniffprobe", "sniffpwn", "sniffraw"},
{"beacon", "deauth", "esp", "pmkid", "probe", "pwn", "raw", "bt", "skim"},
9,
{"sniffbeacon", "sniffdeauth", "sniffesp", "sniffpmkid", "sniffprobe", "sniffpwn", "sniffraw", "sniffbt", "sniffskim"},
NO_ARGS,
FOCUS_CONSOLE_END,
SHOW_STOPSCAN_TIP},

View file

@ -1,3 +1,5 @@
//** Includes sniffbt and sniffskim for compatible ESP32-WROOM hardware.
// wifi_marauder_scene_start.c also changed **//
#pragma once
#include "wifi_marauder_app.h"