Merge pull request #2 from Pwnagotchi-Unofficial/development

library switching
dj1ch · Apr 9, 2024 · a7e0f91 · a7e0f91
2 parents dc5f1a2 + 424ec68
commit a7e0f91
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 13 deletions.
diff --git a/minigotchi/channel.cpp b/minigotchi/channel.cpp
@@ -26,7 +26,7 @@ void Channel::init(int initChannel) {
 
     // switch channel
     Minigotchi::monStop();
-    wifi_set_channel(initChannel);
+    esp_wifi_set_channel(initChannel, WIFI_SECOND_CHAN_NONE);
     Minigotchi::monStart();
 
     if (initChannel == getChannel()) {
@@ -61,7 +61,7 @@ void Channel::switchC(int newChannel) {
 
     // monitor this one channel
     Minigotchi::monStop();
-    wifi_set_channel(newChannel);
+    esp_wifi_set_channel(newChannel, WIFI_SECOND_CHAN_NONE);   
     Minigotchi::monStart();
 
     // switched channel
@@ -72,7 +72,13 @@ void Channel::switchC(int newChannel) {
 }
 
 int Channel::getChannel() {
-    return wifi_get_channel();
+    wifi_country_t country;
+    memset(&country, 0, sizeof(country));
+    esp_wifi_get_country(&country);
+
+    wifi_promiscuous_channel_info_t info;
+    esp_wifi_get_channel(&info);
+    return info.primary;
 }
 
 int Channel::list() {

diff --git a/minigotchi/channel.h b/minigotchi/channel.h
@@ -7,7 +7,8 @@
 
 #include "minigotchi.h"
 #include "config.h"
-#include <ESP8266WiFi.h>
+#include <WiFi.h>
+#include <esp_wifi.h>
 
 class Channel {
 public:

diff --git a/minigotchi/deauth.cpp b/minigotchi/deauth.cpp
@@ -124,7 +124,7 @@ void Deauth::start() {
 
     // send the deauth 150 times(ur cooked if they find out)
     for (int i = 0; i < 150; ++i) {
-        wifi_send_pkt_freedom(const_cast<uint8_t*>(deauthFrame), frameSize, 0);
+        WiFi.rawPacket(deauthFrame, sizeof(deauthFrame));
         Serial.println("(>-<) Sent Deauth Frame!");
         delay(100);
     }

diff --git a/minigotchi/deauth.h b/minigotchi/deauth.h
@@ -11,7 +11,8 @@
 #include <vector>
 #include <string>
 #include <sstream>
-#include <ESP8266WiFi.h>
+#include <WiFi.h>
+#include <esp_wifi.h>
 
 class Deauth {
 public:

diff --git a/minigotchi/frame.cpp b/minigotchi/frame.cpp
@@ -228,7 +228,7 @@ void Frame::send() {
 
     // send full frame
     // we dont use raw80211 since it sends a header(which we don't need), although we do use it for monitoring, etc.
-    wifi_send_pkt_freedom(beaconFrame.data(), frameSize, 0);
+    WiFi.rawPacket(beaconFrame.data(), frameSize);
 }
 
 

diff --git a/minigotchi/frame.h b/minigotchi/frame.h
@@ -9,8 +9,8 @@
 #include <sstream>
 #include <vector>
 #include <string>
-#include <user_interface.h>
-#include <ESP8266WiFi.h>
+#include <WiFi.h>
+#include <esp_wifi.h>
 
 class Frame {
 public:

diff --git a/minigotchi/minigotchi.cpp b/minigotchi/minigotchi.cpp
@@ -82,11 +82,11 @@ void Minigotchi::cpu() {
 */
 
 void Minigotchi::monStart() {
-    wifi_promiscuous_enable(1);
+    esp_wifi_set_promiscuous(true);
 }
 
 void Minigotchi::monStop() {
-    wifi_promiscuous_enable(0);
+    esp_wifi_set_promiscuous(false);
 }
 
 /** developer note:

diff --git a/minigotchi/minigotchi.h b/minigotchi/minigotchi.h
@@ -11,7 +11,8 @@
 #include "channel.h"
 #include "config.h"
 #include <Arduino.h>
-#include <ESP8266WiFi.h>
+#include <WiFi.h>
+#include <esp_wifi.h>
 
 class Minigotchi {
 public: 

diff --git a/minigotchi/pwnagotchi.h b/minigotchi/pwnagotchi.h
@@ -7,7 +7,8 @@
 
 #include "frame.h"
 #include <ArduinoJson.h>
-#include <ESP8266WiFi.h>
+#include <WiFi.h>
+#include <esp_wifi.h>
 #include <Arduino.h>
 #include <stdint.h>
 #include <string>