Merge branch 'master' into development

2018-08-01 12:52:40 +02:00 · 2018-08-01 12:52:40 +02:00 · 3f9b4efc46
commit 3f9b4efc46
parent eedb42c18a 912f9baf37
2 changed files with 2 additions and 1 deletions
--- a/src/antenna.cpp
+++ b/src/antenna.cpp
@ -35,4 +35,4 @@ void antenna_select(const uint8_t _ant) {
  ESP_LOGI(TAG, "Wifi Antenna switched to %s", _ant ? "external" : "internal");
 }

-#endif
+#endif
--- a/src/gps.h
+++ b/src/gps.h
@ -2,6 +2,7 @@
 #define _GPS_H

 #include <TinyGPS++.h>         // library for parsing NMEA data
+#include <TimeLib.h>

 typedef struct {
  uint32_t latitude;