Add compile guards to getMacAddress

nseidle · nseidle · commit c2c8a8736ff1 · 2022-08-25T11:27:15.000-06:00
diff --git a/Firmware/RTK_Surveyor/Display.ino b/Firmware/RTK_Surveyor/Display.ino
@@ -2544,13 +2544,17 @@ void paintEspNowPaired()
   displayMessage("ESP-Now Paired", 2000);
 }
 
-const uint8_t * getMacAddress ()
+const uint8_t * getMacAddress()
 {
   static const uint8_t zero[6] = {0, 0, 0, 0, 0, 0};
 
+#ifdef  COMPILE_BT
   if (bluetoothState != BT_OFF)
     return btMACAddress;
+#ifdef COMPILE_WIFI
   else if (wifiState != WIFI_OFF)
     return wifiMACAddress;
+#endif
+#endif
   return zero;
 }

Original file line number	Diff line number	Diff line change
`@@ -2544,13 +2544,17 @@ void paintEspNowPaired()`
`2544`	`2544`	`displayMessage("ESP-Now Paired", 2000);`
`2545`	`2545`	`}`
`2546`	`2546`
`2547`		`-const uint8_t * getMacAddress ()`
	`2547`	`+const uint8_t * getMacAddress()`
`2548`	`2548`	`{`
`2549`	`2549`	`static const uint8_t zero[6] = {0, 0, 0, 0, 0, 0};`
`2550`	`2550`
	`2551`	`+#ifdef COMPILE_BT`
`2551`	`2552`	`if (bluetoothState != BT_OFF)`
`2552`	`2553`	`return btMACAddress;`
	`2554`	`+#ifdef COMPILE_WIFI`
`2553`	`2555`	`else if (wifiState != WIFI_OFF)`
`2554`	`2556`	`return wifiMACAddress;`
	`2557`	`+#endif`
	`2558`	`+#endif`
`2555`	`2559`	`return zero;`
`2556`	`2560`	`}`