Merge branch 'master' into development

This commit is contained in:
Verkehrsrot 2018-08-01 12:52:40 +02:00 committed by GitHub
commit 3f9b4efc46
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions

View File

@ -35,4 +35,4 @@ void antenna_select(const uint8_t _ant) {
ESP_LOGI(TAG, "Wifi Antenna switched to %s", _ant ? "external" : "internal"); ESP_LOGI(TAG, "Wifi Antenna switched to %s", _ant ? "external" : "internal");
} }
#endif #endif

View File

@ -2,6 +2,7 @@
#define _GPS_H #define _GPS_H
#include <TinyGPS++.h> // library for parsing NMEA data #include <TinyGPS++.h> // library for parsing NMEA data
#include <TimeLib.h>
typedef struct { typedef struct {
uint32_t latitude; uint32_t latitude;