gitea-mirror/ESP32Marauder
1
0
Fork 0
mirror of https://github.com/justcallmekoko/ESP32Marauder.git synced 2025-12-12 15:50:36 -08:00
Code Issues Packages Projects Releases Wiki Activity

Add GPS for flipper wifi dev board

Browse Source
This commit is contained in:
Just Call Me Koko
2023-09-05 18:42:07 -04:00
parent e92476fb26
commit d39f3fc2da
3 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
esp32_marauder/GpsInterface.cpp
View File

@@ -6,7 +6,7 @@ char nmeaBuffer[100];
MicroNMEA nmea(nmeaBuffer, sizeof(nmeaBuffer));
HardwareSerial Serial2(2);
HardwareSerial Serial2(GPS_SERIAL_INDEX);
void GpsInterface::begin() {

20
esp32_marauder/WiFiScan.cpp
View File

@@ -795,8 +795,8 @@ void WiFiScan::RunGenerateSSIDs(int count) {
void WiFiScan::RunGPSInfo() {
#ifdef HAS_GPS
#ifdef HAS_SCREEN
Serial.println("Refreshing GPS Data on screen...");
#ifdef HAS_SCREEN
// Get screen position ready
display_obj.tft.setTextWrap(false);
@@ -810,30 +810,32 @@ void WiFiScan::RunGPSInfo() {
display_obj.tft.fillRect(0, (SCREEN_HEIGHT / 3) - 6, SCREEN_WIDTH, SCREEN_HEIGHT - ((SCREEN_HEIGHT / 3) - 6), TFT_BLACK);
// Print the GPS data: 3
Serial.println("==== GPS Data ====");
display_obj.tft.setCursor(0, SCREEN_HEIGHT / 3);
if (gps_obj.getFixStatus()) {
if (gps_obj.getFixStatus())
display_obj.tft.println(" Good Fix: Yes");
Serial.println(" Good Fix: Yes");
}
else {
else
display_obj.tft.println(" Good Fix: No");
Serial.println(" Good Fix: No");
}
display_obj.tft.println("Satellites: " + gps_obj.getNumSatsString());
display_obj.tft.println(" Latitude: " + gps_obj.getLat());
display_obj.tft.println(" Longitude: " + gps_obj.getLon());
display_obj.tft.println(" Altitude: " + (String)gps_obj.getAlt());
display_obj.tft.println(" Datetime: " + gps_obj.getDatetime());
#endif
// Display to serial
Serial.println("==== GPS Data ====");
if (gps_obj.getFixStatus())
Serial.println(" Good Fix: Yes");
else
Serial.println(" Good Fix: No");
Serial.println("Satellites: " + gps_obj.getNumSatsString());
Serial.println(" Latitude: " + gps_obj.getLat());
Serial.println(" Longitude: " + gps_obj.getLon());
Serial.println(" Altitude: " + (String)gps_obj.getAlt());
Serial.println(" Datetime: " + gps_obj.getDatetime());
#endif
#endif
}
void WiFiScan::RunInfo()

9
esp32_marauder/configs.h
View File

@@ -114,7 +114,7 @@
//#define HAS_NEOPIXEL_LED
//#define HAS_PWR_MGMT
//#define HAS_SCREEN
//#define HAS_GPS
#define HAS_GPS
#ifndef WRITE_PACKETS_SERIAL
#define HAS_SD
#define USE_SD
@@ -764,14 +764,21 @@
//// GPS STUFF
#ifdef HAS_GPS
#ifdef MARAUDER_V6
#define GPS_SERIAL_INDEX 2
#define GPS_TX 4
#define GPS_RX 13
#elif defined(MARAUDER_V4)
#define GPS_SERIAL_INDEX 2
#define GPS_TX 4
#define GPS_RX 13
#elif defined(MARAUDER_KIT)
#define GPS_SERIAL_INDEX 2
#define GPS_TX 4
#define GPS_RX 13
#elif defined(MARAUDER_FLIPPER)
#define GPS_SERIAL_INDEX 1
#define GPS_TX 9
#define GPS_RX 21
#endif
#endif
//// END GPS STUFF