Mbed: fix detection macro

cujomalainey · cujomalainey · commit e3a1fe83a34e · 2022-08-04T08:25:41.000-07:00
apparently its bad practice to put defined in a #if, so follow what is
recommended on the web.
diff --git a/src/BaseClasses/ANT_BaseFramework.h b/src/BaseClasses/ANT_BaseFramework.h
@@ -1,7 +1,9 @@
 #ifndef ANT_BASEFRAMEWORK_h
 #define ANT_BASEFRAMEWORK_h
 
-#define IS_MBED (defined(__MBED__) && !defined(ARDUINO))
+#if (defined(__MBED__) && !defined(ARDUINO))
+    #define IS_MBED
+#endif
 
 #ifdef UNIT_TEST
 #include "Util/Testing.h"
diff --git a/src/BaseClasses/ANT_BaseSerialAnt.cpp b/src/BaseClasses/ANT_BaseSerialAnt.cpp
@@ -110,6 +110,7 @@ void BaseSerialAnt<T>::send(AntRequest &request) {
 
 #if defined(ARDUINO) || defined(UNIT_TEST)
 template class BaseSerialAnt<Stream>;
-#elif IS_MBED
+#endif
+#ifdef IS_MBED
 template class BaseSerialAnt<UARTSerial>;
 #endif
diff --git a/src/BaseClasses/ANT_BaseSpiAnt.cpp b/src/BaseClasses/ANT_BaseSpiAnt.cpp
@@ -155,6 +155,6 @@ void BaseSpiAnt<S, I, O>::resetRadio() {
     setHostSRdy(1);
 }
 
-#if IS_MBED
+#ifdef IS_MBED
 template class BaseSpiAnt<SPISlave, DigitalIn, DigitalOut>;
 #endif
diff --git a/src/MainClasses/ANT_MbedSerialAnt.cpp b/src/MainClasses/ANT_MbedSerialAnt.cpp
@@ -1,4 +1,4 @@
-#if IS_MBED
+#ifdef IS_MBED
 
 #include <MainClasses/ANT_MbedSerialAnt.h>
 #include <ANT_private_defines.h>
diff --git a/src/MainClasses/ANT_MbedSerialAnt.h b/src/MainClasses/ANT_MbedSerialAnt.h
@@ -3,7 +3,7 @@
 
 #include <BaseClasses/ANT_BaseFramework.h>
 
-#if IS_MBED
+#ifdef IS_MBED
 
 #include <BaseClasses/ANT_BaseSerialAnt.h>
 
diff --git a/src/MainClasses/ANT_MbedSerialAntWithCallbacks.h b/src/MainClasses/ANT_MbedSerialAntWithCallbacks.h
@@ -3,7 +3,7 @@
 
 #include <BaseClasses/ANT_BaseFramework.h>
 
-#if IS_MBED
+#ifdef IS_MBED
 
 #include <BaseClasses/ANT_BaseAntWithCallbacks.h>
 #include <MainClasses/ANT_MbedSerialAnt.h>
diff --git a/src/MainClasses/ANT_MbedSpiAnt.cpp b/src/MainClasses/ANT_MbedSpiAnt.cpp
@@ -1,4 +1,4 @@
-#if IS_MBED
+#ifdef IS_MBED
 
 #include <MainClasses/ANT_MbedSpiAnt.h>
 #include <ANT_private_defines.h>
diff --git a/src/MainClasses/ANT_MbedSpiAnt.h b/src/MainClasses/ANT_MbedSpiAnt.h
@@ -1,7 +1,7 @@
 #ifndef ANT_MBEDSPIANT_h
 #define ANT_MBEDSPIANT_h
 
-#if IS_MBED
+#ifdef IS_MBED
 
 #include <BaseClasses/ANT_BaseSpiAnt.h>
 

Original file line number	Diff line number	Diff line change
`@@ -155,6 +155,6 @@ void BaseSpiAnt<S, I, O>::resetRadio() {`
`155`	`155`	`setHostSRdy(1);`
`156`	`156`	`}`
`157`	`157`
`158`		`-#if IS_MBED`
	`158`	`+#ifdef IS_MBED`
`159`	`159`	`template class BaseSpiAnt<SPISlave, DigitalIn, DigitalOut>;`
`160`	`160`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#if IS_MBED`
	`1`	`+#ifdef IS_MBED`
`2`	`2`
`3`	`3`	`#include <MainClasses/ANT_MbedSerialAnt.h>`
`4`	`4`	`#include <ANT_private_defines.h>`