Merge branch 'master' of https://github.com/sparkfun/Arduino_Apollo3

Nathan Seidle · Nathan Seidle · commit f491fa673124 · 2019-06-19T12:55:41.000-06:00
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -0,0 +1,16 @@
+Arduino Apollo3 Core Changelog
+==============================
+
+This is a record of the major changes between versions of the SparkFun Arduino Apollo3 core. Only major changes will be recorded for convenience. The complete detail of changes is found in the commit history of this repo.
+
+Each log entry will use the version number of the release that contains the changes listed. Newest version at the top of the file (just below this line)
+
+0.0.1
+=====
+- Add SparkFun Variable Bootloader
+- Better support for malloc + related functions
+
+
+0.0.0
+=====
+Initial release
diff --git a/variants/SparkFun_Edge/config/variant.h b/variants/SparkFun_Edge/config/variant.h
@@ -34,14 +34,17 @@ class Uart;         // Forward declaration of Uart
 extern Uart Serial;
 
 // Wire defines
-#define WIRE_INTERFACES_COUNT 2
+#define WIRE_INTERFACES_COUNT 3
 
 #define WireQwiic Wire  // Giving Wire an alias of "WireQwiic" in case people want to use it
 #define AP3_Wire_IOM 4  // Secify that Wire uses IOMaster instance 4
 
 #define WireAccel Wire1
 #define AP3_Wire1_IOM 3
 
+#define WireCamera Wire2
+#define AP3_Wire1_IOM 2
+
 // SPI Defines
 #define SPI_INTERFACES_COUNT 1
 
diff --git a/variants/SparkFun_Edge_V2/config/variant.cpp b/variants/SparkFun_Edge_V2/config/variant.cpp
@@ -22,6 +22,7 @@ SOFTWARE.
 
 #include "variant.h"
 
+// Apollo3 pads 30 and 46 are not exposed by Artemis module
 const ap3_gpio_pad_t ap3_variant_pinmap[AP3_VARIANT_NUM_PINS] = {
     AP3_GPIO_PAD_UNUSED,
     AP3_GPIO_PAD_UNUSED,
@@ -39,10 +40,10 @@ const ap3_gpio_pad_t ap3_variant_pinmap[AP3_VARIANT_NUM_PINS] = {
     13,
     14,
     15,
-    AP3_GPIO_PAD_UNUSED,
+    16,
     17,
-    AP3_GPIO_PAD_UNUSED,
-    AP3_GPIO_PAD_UNUSED,
+    18,
+    19,
     20,
     21,
     22,
diff --git a/variants/SparkFun_Edge_V2/config/variant.h b/variants/SparkFun_Edge_V2/config/variant.h
@@ -33,8 +33,6 @@ extern const ap3_gpio_pad_t ap3_variant_pinmap[AP3_VARIANT_NUM_PINS];
 class Uart;         // Forward declaration of Uart
 extern Uart Serial;
 
-
-Todo: determine IOMaster allocation for Edge V2
 // Wire defines
 #define WIRE_INTERFACES_COUNT 3
 
