Merge branch 'master' into core-ble

oclyke · oclyke · commit 161e2af29349 · 2019-08-28T10:04:39.000-06:00
diff --git a/platform.txt b/platform.txt
@@ -1,8 +1,6 @@
 # The MIT License (MIT)
 
 # Copyright (c) 2019 SparkFun Electronics
-# Contributors:
-#   Owen Lyke
 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/variants/SparkFun_Edge/config/variant.h b/variants/SparkFun_Edge/config/variant.h
@@ -43,7 +43,7 @@ extern Uart Serial;
 #define AP3_Wire1_IOM 3
 
 #define WireCamera Wire2
-#define AP3_Wire1_IOM 2
+#define AP3_Wire2_IOM 2
 
 // SPI Defines
 #define SPI_INTERFACES_COUNT 1
