fix: items navigation deauth submenus

ElectronicCats · Aug 27, 2024 · cf5f4e4 · cf5f4e4
1 parent 4b4680e
commit cf5f4e4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 18 deletions.
diff --git a/firmware/components/wifi_attacks/wifi_attacks.h b/firmware/components/wifi_attacks/wifi_attacks.h
@@ -31,6 +31,7 @@ typedef enum {
   WIFI_ATTACK_COMBINE,
   WIFI_ATTACK_MULTI_AP,
   WIFI_ATTACK_PASSWORD,
+  WIFI_ATTACKS_NUM
 } wifi_attacks_types_t;
 
 /**

diff --git a/firmware/main/apps/wifi/deauth/deauth_module.c b/firmware/main/apps/wifi/deauth/deauth_module.c
@@ -216,18 +216,12 @@ static void deauth_module_cb_event_select_ap(uint8_t button_name,
   }
   switch (button_name) {
     case BUTTON_UP:
-      deauth_decrement_item();
-      if (current_item < 0) {
-        current_item = ap_records->count;
-      }
+      current_item = current_item-- == 0 ? ap_records->count - 1 : current_item;
       deauth_display_scanned_ap(ap_records->records, ap_records->count,
                                 current_item);
       break;
     case BUTTON_DOWN:
-      deauth_increment_item();
-      if (current_item > ap_records->count) {
-        current_item = 0;
-      }
+      current_item = ++current_item > ap_records->count - 1 ? 0 : current_item;
       deauth_display_scanned_ap(ap_records->records, ap_records->count,
                                 current_item);
       break;
@@ -254,11 +248,11 @@ static void deauth_module_cb_event_attacks(uint8_t button_name,
   }
   switch (button_name) {
     case BUTTON_UP:
-      deauth_decrement_item();
+      current_item = current_item-- == 0 ? ATTACKSCOUNT - 1 : current_item;
       deauth_display_attacks(current_item, menu_stadistics);
       break;
     case BUTTON_DOWN:
-      deauth_increment_item();
+      current_item = ++current_item > ATTACKSCOUNT - 1 ? 0 : current_item;
       deauth_display_attacks(current_item, menu_stadistics);
       break;
     case BUTTON_RIGHT:
@@ -308,17 +302,12 @@ static void deauth_module_cb_event_captive_portal(uint8_t button_name,
   }
   switch (button_name) {
     case BUTTON_UP:
-      deauth_decrement_item();
-      if (current_item < 0) {
-        current_item = CAPTIVEPORTALCOUNT - 1;
-      }
+      current_item =
+          current_item-- == 0 ? CAPTIVEPORTALCOUNT - 1 : current_item;
       deauth_display_captive_portals(current_item, menu_stadistics);
       break;
     case BUTTON_DOWN:
-      deauth_increment_item();
-      if (current_item > CAPTIVEPORTALCOUNT - 1) {
-        current_item = 0;
-      }
+      current_item = ++current_item > CAPTIVEPORTALCOUNT - 1 ? 0 : current_item;
       deauth_display_captive_portals(current_item, menu_stadistics);
       break;
     case BUTTON_LEFT: