Fixed double define compile warning

Signed-off-by: simonmicro <simon@simonmicro.de>
Open-Smartwatch · Aug 11, 2024 · 77f24a1 · 77f24a1
1 parent b88d2f8
commit 77f24a1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/include/osw_pins.h b/include/osw_pins.h
@@ -11,17 +11,19 @@
 #define GPS_FON 26
 #define GPS_3D_FIX 36
 #define GPS_GEO_FENCE 39
-#define RX1 27
-#define TX1 14
 
 #if defined(GPS_EDITION)
 #define BTN_1 0
 #define BTN_2 13
 #define BTN_3 33
+#define GPS_RX1 27
+#define GPS_TX1 14
 #elif defined(GPS_EDITION_ROTATED)
 #define BTN_1 13
 #define BTN_2 33
 #define BTN_3 0
+#define GPS_RX1 27
+#define GPS_TX1 14
 #else
 #define BTN_1 0
 #define BTN_2 13

diff --git a/src/hal/gps.cpp b/src/hal/gps.cpp
@@ -18,7 +18,7 @@ NMEAGPS* OswHal::gps(void) {
 void OswHal::setupGps(void) {
     pinMode(GPS_FON, OUTPUT);
     digitalWrite(GPS_FON, HIGH);
-    SerialGPS.begin(9600, SERIAL_8N1, RX1, TX1);
+    SerialGPS.begin(9600, SERIAL_8N1, GPS_RX1, GPS_TX1);
 }
 bool OswHal::hasGPS(void) {
     return _hasGPS;