merge main

.vscode/arduino.json

@@ -1,6 +1,6 @@
 {
-    "configuration": "CDCOnBoot=default,MSCOnBoot=default,DFUOnBoot=default,PartitionScheme=noota_3gffat,DebugLevel=none",
-    "board": "esp32:esp32:lolin_s2_mini",
+    "configuration": "xtal=80,vt=flash,exception=disabled,stacksmash=disabled,ssl=all,mmu=3232,non32xfer=fast,FlashMode=dout,FlashFreq=40,eesz=4M2M,ip=lm2f,dbg=Disabled,lvl=None____,wipe=none,baud=921600",
+    "board": "esp8266:esp8266:d1_mini_clone",
     "sketch": "src/Wardriver/Wardriver.ino",
-    "port": "/dev/ttyACM0"
+    "port": "/dev/ttyUSB0"
 }

src/Wardriver/Vars.h

@@ -2,11 +2,11 @@
 #include "Arduino.h"
 #include <HardwareSerial.h>
 
-#define VERSION 1.1
-#define VERSION_STR "v1.1"
+#define VERSION 1.2
+#define VERSION_STR "v1.2"
 #define WIGLE_HEADER "MAC,SSID,AuthMode,FirstSeen,Channel,RSSI,CurrentLatitude,CurrentLongitude,AltitudeMeters,AccuracyMeters,Type"
 
-#define SERIAL_BAUD 115200
+#define SERIAL_BAUD 1152007
 #define GPS_BAUD 9600
 #define TIMEZONE_UTC -7
 #define SCAN_INTERVAL 500

src/Wardriver/Wardriver.ino

@@ -4,7 +4,10 @@
 void setup() {
     Serial.begin(115200);
     pinMode(A0, INPUT);
+    ESP.wdtDisable();
+
     Wardriver::init(); 
+    ESP.wdtEnable(0);
 }
 
 void loop() {

src/Wardriver/src/Filesys.cpp

@@ -47,12 +47,17 @@ Filesys::Filesys() {
 void Filesys::init(Filesys::ScreenUpdateCallback callback) {
 
     #if defined (ESP8266)
-        if (!SD.begin(SD_CS)) {
+        bool sdSuccess = SD.begin(SD_CS);
+        if (!sdSuccess) {
             callback("SD Card: NOT FOUND");
-            ESP.wdtDisable();
-            while (!SD.begin(SD_CS)) { delay(0); }
+
+            while (!sdSuccess) {
+                sdSuccess = SD.begin(SD_CS);
+                ESP.wdtFeed();
+            }
         }
         callback("SD Card: FOUND!!");
+
     #elif defined (ESP32)
 
         EspTinyUSB::registerDeviceCallbacks(new Device());
@@ -82,6 +87,28 @@ void Filesys::init(Filesys::ScreenUpdateCallback callback) {
         callback(tmpMsg);
 
     #endif
+
+    Filesys::configure();
+
+}
+
+void Filesys::configure() {
+
+    // create config.txt if it doesn't exist
+    // if (!FS_VAR.exists("config.txt")) { 
+    //     File tmpSettings = FS_VAR.open("config.txt", FILE_WRITE);
+        // tmpSettings.println("# Duplicates recommended");
+        // tmpSettings.println("Duplicates: y");
+        // tmpSettings.println("GPS RX: D4");
+        // tmpSettings.println("GPS RX: D3");
+
+        // tmpSettings.close();
+    // }
+
+    // read settings & write to variables
+    // File tmpSettings = FS_VAR.open("config.txt", FILE_WRITE);
+    // tmpSettings.read()
+
 }
 
 

src/Wardriver/src/Filesys.h

@@ -11,4 +11,7 @@ class Filesys {
 
         static void open();
         static void close();
+
+    private:    
+        static void configure();
 };

src/Wardriver/src/Wardriver.cpp

@@ -104,11 +104,12 @@ void initGPS() {
         sats = gps.satellites.value();
 
         Serial.println(gps.location.isValid());
-        delay(0); smartDelay(500);
+        ESP.wdtFeed(); smartDelay(500);
     }
-    while (! (gps.date.year() == 2000)) {
-        Screen::drawMockup("...","...",sats,totalNets,openNets,clients,bat,speed,"GPS: Waiting for time...");
-        delay(0); smartDelay(500);
+    while ((gps.date.year() == 2000)) {
+        Screen::drawMockup("...","...",sats,totalNets,openNets,clients,bat,speed,"GPS: Validating time...");
+        ESP.wdtFeed(); smartDelay(500);
+        Serial.println(gps.date.year());
     }
     Screen::drawMockup("...","...",sats,totalNets,openNets,clients,bat,speed,"GPS: LOCATION FOUND");
 
@@ -168,8 +169,8 @@ void getBattery() {
 void Wardriver::init() {
     Screen::init();
     Screen::drawSplash(2);
+
     Filesys::init(updateScreen); delay(1000);
-
     getBattery();
     initGPS();