Merge pull request #33 from dj1ch/development

additional parasite mode fixes
dj1ch · Jun 23, 2024 · 7f8e1b9 · 7f8e1b9
2 parents 257b358 + afff02d
commit 7f8e1b9
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/minigotchi-ESP32/frame.cpp b/minigotchi-ESP32/frame.cpp
@@ -229,7 +229,8 @@ void Frame::advertise() {
     Serial.println("(>-<) Starting advertisment...");
     Serial.println(" ");
     Display::updateDisplay("(>-<)", "Starting advertisment...");
-    delay(250);
+    Parasite::sendAdvertising();
+    delay(Config::shortDelay);
     for (int i = 0; i < 150; ++i) {
       if (Frame::send()) {
         packets++;

diff --git a/minigotchi-ESP32/minigotchi.cpp b/minigotchi-ESP32/minigotchi.cpp
@@ -43,6 +43,7 @@ int Minigotchi::addEpoch() {
 
 void Minigotchi::epoch() {
   Minigotchi::addEpoch();
+  Parasite::readData();
   Serial.print("('-') Current Epoch: ");
   Serial.println(Minigotchi::currentEpoch);
   Serial.println(" ");
@@ -72,6 +73,7 @@ void Minigotchi::boot() {
   Deauth::list();
   Channel::init(Config::channel);
   Minigotchi::info();
+  Parasite::sendName();
   Minigotchi::finish();
 }
 
@@ -176,13 +178,25 @@ void Minigotchi::monStop() {
  */
 
 // channel cycling
-void Minigotchi::cycle() { Channel::cycle(); }
+void Minigotchi::cycle() {
+  Parasite::readData();
+  Channel::cycle();
+}
 
 // pwnagotchi detection
-void Minigotchi::detect() { Pwnagotchi::detect(); }
+void Minigotchi::detect() {
+  Parasite::readData();
+  Pwnagotchi::detect(); 
+}
 
 // deauthing
-void Minigotchi::deauth() { Deauth::deauth(); }
+void Minigotchi::deauth() {
+  Parasite::readData();
+  Deauth::deauth();
+}
 
 // advertising
-void Minigotchi::advertise() { Frame::advertise(); }
+void Minigotchi::advertise() {
+  Parasite::readData();
+  Frame::advertise();
+}
diff --git a/minigotchi-ESP32/pwnagotchi.cpp b/minigotchi-ESP32/pwnagotchi.cpp
@@ -82,14 +82,17 @@ void Pwnagotchi::detect() {
     Serial.println("(;-;) No Pwnagotchi found");
     Display::updateDisplay("(;-;)", "No Pwnagotchi found.");
     Serial.println(" ");
+    Parasite::sendPwnagotchiStatus(NO_FRIEND_FOUND);
   } else if (pwnagotchiDetected) {
     Minigotchi::monStop();
     Pwnagotchi::stopCallback();
+    Parasite::sendPwnagotchiStatus(FRIEND_SCAN_ERROR);
   } else {
     Minigotchi::monStop();
     Pwnagotchi::stopCallback();
     Serial.println("(X-X) How did this happen?");
     Display::updateDisplay("(X-X)", "How did this happen?");
+    Parasite::sendPwnagotchiStatus(FRIEND_FOUND, name.c_str());
   }
 }