Merge pull request #88 from dj1ch/development

patches

README.md

@@ -78,4 +78,6 @@ See the [wiki](https://github.com/Pwnagotchi-Unofficial/minigotchi/wiki/Communic
 
 - [arduino-ESP32](https://github.com/espressif/arduino-esp32), the core Arduino libraries for the.
 
+- I'd also like to thank [PiSugar](https://www.pisugar.com/) for the partnership with Pwnagotchi-Unofficial! Your batteries are amazing and have contributed heavily in the creation of this project.
+
 **Made with ❤️ by [@dj1ch](https://github.com/dj1ch) and the rest of the Pwnagotchi-Unofficial team!**

SECURITY.md

@@ -2,14 +2,15 @@
 
 ## Supported Versions
 
-When it comes to installing any version of the project, I highly recommend you install the latest version available. Anything version under or equal to `1.1.1-beta` is going to have some sort of issue whether it be compile errors or not functioning as expected. Keep in mind configuration is different between x.0.0 releases! 
+When it comes to installing any version of the project, I highly recommend you install the latest version available. Anything version under or equal to `1.1.1-beta` is going to have some sort of issue whether it be compile errors or not functioning as expected. Keep in mind configuration is different between x.0.0 releases!
 
-| Version | Supported          |
-| ------- | ------------------ |
-| < 2.0.0-beta   | :white_check_mark: Works |
-| 1.3.0-beta   | :white_check_mark: Not recommended! |
-| 1.2.0-beta   | :white_check_mark: Not recommended!              |
-| =< 1.1.1-beta   | :x: Broken...               |
+| Version       | Supported                              |
+| ------------- | -------------------------------------- |
+| > 3.2.2       | :white_check_mark: Highly recommended! |
+| > 2.0.0-beta  | :white_check_mark: Works.              |
+| 1.3.0-beta    | :white_check_mark: Not recommended!    |
+| 1.2.0-beta    | :white_check_mark: Not recommended!    |
+| =< 1.1.1-beta | :x: Broken...                          |
 
 ## Reporting a Vulnerability
 
@@ -19,4 +20,4 @@ Whenever you find one, please make an issue **ASAP!!!**
 2. Click `New Issue`
 3. From there, select `Report a security vulnerability`. If this returns a 404, select `Open a blank issue` near the bottom of the page.
 4. Fill out the required information about the vulnerability, how it can be fixed, etc. Please add the `security-vuln` label so we know this is a security issue and will prioritize it accordingly.
-5. Submit the issue by clicking `Submit new issue`.  
+5. Submit the issue by clicking `Submit new issue`.

minigotchi-ESP32/config.cpp

@@ -48,8 +48,8 @@ int Config::longDelay = 5000;
 bool Config::parasite = false;
 
 // screen configuration
-bool Config::display = true;
-std::string Config::screen = "T_DISPLAY_S3";
+bool Config::display = false;
+std::string Config::screen = "";
 
 // define baud rate
 int Config::baud = 115200;

minigotchi-ESP32/minigotchi-ESP32.ino

@@ -39,20 +39,24 @@ void setup() {
 */
 
 void loop() {
+    // current epoch
+    minigotchi.epoch();
+    delay(config.shortDelay);
+
     // cycle channels at start of loop
     minigotchi.cycle();
-    delay(250);
+    delay(config.shortDelay);
 
     // the longer we are on this channel, the more likely we're gonna see a pwnagotchi on this channel
     // get local payload from local pwnagotchi, send raw frame if one is found
     minigotchi.detect();
-    delay(250);
+    delay(config.shortDelay);
 
     // advertise our presence with the help of pwngrid compatible beacon frames (probably the most confusing part lmao)
     minigotchi.advertise();
-    delay(250);
+    delay(config.shortDelay);
 
     // deauth random access point
     minigotchi.deauth();
-    delay(250);
+    delay(config.shortDelay);
 }

minigotchi-ESP32/minigotchi.cpp

@@ -107,11 +107,11 @@ void Minigotchi::boot() {
 
   // StickC Plus 1.1 and 2 power management, to keep turned On after unplug USB
   // cable
-  if (Config::screen == "M5StickCP") {
+  if (Config::screen == "M5STICKCP") {
     AXP192 axp192;
     axp192.begin();           // Use the instance of AXP192
     axp192.ScreenBreath(100); // Use the instance of AXP192
-  } else if (Config::screen == "M5StickCP2") {
+  } else if (Config::screen == "M5STICKCP2") {
     pinMode(4, OUTPUT);
     digitalWrite(4, HIGH);
   }

minigotchi-ESP32/webui.cpp

@@ -1,3 +1,21 @@
+/*
+ * Minigotchi: An even smaller Pwnagotchi
+ * Copyright (C) 2024 dj1ch
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 /**
  * webui.cpp: handles creation of network and webUI
  */
@@ -211,11 +229,4 @@ void WebUI::updateWhitelist(String newWhitelist) {
 
   // add last element after last comma
   Config::whitelist.push_back(newWhitelist.substring(start).c_str());
-
-  /*
-  Serial.println(mood.getNeutral() + " Updated whitelist:");
-  for (const auto &entry : Config::whitelist) {
-    Serial.println(entry.c_str());
-  }
-  */
 }

minigotchi-ESP32/webui.h

@@ -1,3 +1,21 @@
+/*
+ * Minigotchi: An even smaller Pwnagotchi
+ * Copyright (C) 2024 dj1ch
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 /**
  * webui.h: header files for webui.cpp
  */