chore: Remove default Notecarrier support (#81)

Author: zfields

examples/Example2_PeriodicCommunications/Example2_PeriodicCommunications.ino

@@ -46,6 +46,7 @@
 
 // Include the Arduino library for the Notecard
 #include <Notecard.h>
+#include <Notecarrier.h>
 #include <Wire.h>
 
 // Note that both of these definitions are optional; just prefix either line with // to remove it.

examples/Example7_PowerControl/Example7_PowerControl.ino

@@ -60,7 +60,7 @@ void setup()
 	// restarting after having been put to sleep by the Notecard.
 	NotePayloadDesc payload;
 	bool retrieved = NotePayloadRetrieveAfterSleep(&payload);
-	
+
 	// If the payload was successfully retrieved, attempt to restore state from the payload
 	if (retrieved) {
 
@@ -73,7 +73,7 @@ void setup()
 		NotePayloadFree(&payload);
 
 	}
-		
+
 	// If this is our first time through, initialize the Notecard and state
 	if (!retrieved) {
 

src/Notecard.h

@@ -36,10 +36,6 @@
 #include "mock/mock-parameters.hpp"
 #endif
 
-#ifndef REMOVE_NOTECARRIER_SUPPORT
-#include "NotecarrierSupport.h"
-#endif
-
 /**************************************************************************/
 /*!
     @brief  Class that stores state and functions for interacting with the

src/NotecarrierSupport.h renamed to src/Notecarrier.h

@@ -48,7 +48,49 @@
 #define D13 13
 #endif
 
-#if defined(ARDUINO_FEATHER_ESP32)
+#if defined(ARDUINO_APOLLO3_SFE_ARTEMIS_THING_PLUS)
+
+#ifdef B0
+#undef B0
+#endif
+#define B0 2
+
+#ifdef D5
+#undef D5
+#endif
+#define D5 3
+
+#ifdef D6
+#undef D6
+#endif
+#define D6 4
+
+#ifdef D9
+#undef D9
+#endif
+#define D9 5
+
+#ifdef D10
+#undef D10
+#endif
+#define D10 6
+
+#ifdef D11
+#undef D11
+#endif
+#define D11 7
+
+#ifdef D12
+#undef D12
+#endif
+#define D12 8
+
+#ifdef D13
+#undef D13
+#endif
+#define D13 9
+
+#elif defined(ARDUINO_FEATHER_ESP32)
 
 #ifdef B0
 #undef B0
@@ -97,17 +139,12 @@
 #endif
 #define B0 PNUM_NOT_DEFINED
 
-#elif defined(ARDUINO_SWAN_R5)
-
-#ifdef CS
-#undef CS
-#endif
-#define CS PD0
+#elif defined(ARDUINO_FEATHER_M4)
 
 #ifdef B0
 #undef B0
 #endif
-#define B0 CS
+#define B0 4
 
 #elif defined(ARDUINO_NRF52840_FEATHER)
 
@@ -116,54 +153,17 @@
 #endif
 #define B0 0
 
-#elif defined(ARDUINO_FEATHER_M4)
+#elif defined(ARDUINO_SWAN_R5)
 
-#ifdef B0
-#undef B0
+#ifdef CS
+#undef CS
 #endif
-#define B0 4
-
-#elif defined(ARDUINO_APOLLO3_SFE_ARTEMIS_THING_PLUS)
+#define CS PD0
 
 #ifdef B0
 #undef B0
 #endif
-#define B0 2
-
-#ifdef D5
-#undef D5
-#endif
-#define D5 3
-
-#ifdef D6
-#undef D6
-#endif
-#define D6 4
-
-#ifdef D9
-#undef D9
-#endif
-#define D9 5
-
-#ifdef D10
-#undef D10
-#endif
-#define D10 6
-
-#ifdef D11
-#undef D11
-#endif
-#define D11 7
-
-#ifdef D12
-#undef D12
-#endif
-#define D12 8
-
-#ifdef D13
-#undef D13
-#endif
-#define D13 9
+#define B0 CS
 
 #endif