Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-06-15 20:01:54 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'DarkFlippers:dev' into 420

Browse Source
This commit is contained in:
RogueMaster
2022-11-15 01:11:19 -05:00
committed by GitHub
parent ec8134e97c 337c5b5a8b
commit 51d941a23f
4 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applications/plugins/flipfrid/scene/flipfrid_scene_run_attack.c
+5 -2
View File
@@ -118,6 +118,7 @@ void flipfrid_scene_run_attack_on_tick(FlipFridState* context) {
lfrfid_worker_stop(context->worker);
lfrfid_worker_stop_thread(context->worker);
context->workr_rund = false;
furi_delay_ms(200);
}
switch(context->attack) {
case FlipFridAttackDefaultValues:
@@ -517,7 +518,7 @@ void flipfrid_scene_run_attack_on_event(FlipFridEvent event, FlipFridState* cont
break;
case InputKeyLeft:
if(!context->is_attacking) {
if(context->time_between_cards > 0) {
if(context->time_between_cards > 5) {
context->time_between_cards--;
}
}
@@ -564,7 +565,9 @@ void flipfrid_scene_run_attack_on_event(FlipFridEvent event, FlipFridState* cont
case InputKeyLeft:
if(!context->is_attacking) {
if(context->time_between_cards > 0) {
context->time_between_cards -= 10;
if((context->time_between_cards - 10) > 5) {
context->time_between_cards -= 10;
}
}
}
break;
applications/plugins/ibtn_fuzzer/scene/ibtnfuzzer_scene_run_attack.c
+6 -3
View File
@@ -108,6 +108,7 @@ void ibtnfuzzer_scene_run_attack_on_tick(iBtnFuzzerState* context) {
ibutton_worker_stop(context->worker);
ibutton_worker_stop_thread(context->worker);
context->workr_rund = false;
furi_delay_ms(500);
}
switch(context->attack) {
case iBtnFuzzerAttackDefaultValues:
@@ -361,7 +362,7 @@ void ibtnfuzzer_scene_run_attack_on_event(iBtnFuzzerEvent event, iBtnFuzzerState
break;
case InputKeyLeft:
if(!context->is_attacking) {
if(context->time_between_cards > 0) {
if(context->time_between_cards > 8) {
context->time_between_cards--;
}
}
@@ -407,8 +408,10 @@ void ibtnfuzzer_scene_run_attack_on_event(iBtnFuzzerEvent event, iBtnFuzzerState
switch(event.key) {
case InputKeyLeft:
if(!context->is_attacking) {
if(context->time_between_cards > 0) {
context->time_between_cards -= 10;
if(context->time_between_cards > 8) {
if((context->time_between_cards - 10) > 8) {
context->time_between_cards -= 10;
}
}
}
break;
applications/plugins/wifi_marauder_companion/scenes/wifi_marauder_scene_start.c
+6 -4
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},
applications/plugins/wifi_marauder_companion/wifi_marauder_app_i.h
+2
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"