Merge branch 'master' of https://github.com/SamuelBrucksch/Arduino_STM32

rogerclarkmelbourne · rogerclarkmelbourne · commit 4021c32fdb80 · 2016-08-14T12:01:07.000+10:00
diff --git a/STM32F1/libraries/Wire/Wire.cpp b/STM32F1/libraries/Wire/Wire.cpp
@@ -190,5 +190,5 @@ TwoWire::~TwoWire() {
 }
 
 // Declare the instance that the users of the library can use
-//TwoWire Wire(SCL, SDA, SOFT_STANDARD);
-TwoWire Wire(PB6, PB7, SOFT_STANDARD);
+TwoWire Wire(SCL, SDA, SOFT_STANDARD);
+//TwoWire Wire(PB6, PB7, SOFT_STANDARD);
diff --git a/STM32F1/libraries/Wire/Wire.h b/STM32F1/libraries/Wire/Wire.h
@@ -47,8 +47,8 @@
  * On the Maple, let the default pins be in the same location as the Arduino
  * pins
  */
-#define SDA 19
-#define SCL 20
+#define SDA PB7
+#define SCL PB6
 
 #define SOFT_STANDARD 27
 #define SOFT_FAST 0

Original file line number	Diff line number	Diff line change
`@@ -190,5 +190,5 @@ TwoWire::~TwoWire() {`
`190`	`190`	`}`
`191`	`191`
`192`	`192`	`// Declare the instance that the users of the library can use`
`193`		`-//TwoWire Wire(SCL, SDA, SOFT_STANDARD);`
`194`		`-TwoWire Wire(PB6, PB7, SOFT_STANDARD);`
	`193`	`+TwoWire Wire(SCL, SDA, SOFT_STANDARD);`
	`194`	`+//TwoWire Wire(PB6, PB7, SOFT_STANDARD);`