fix Wire::pins compatibility (#167)

igrr · igrr · commit 65eeac16e83d · 2015-05-05T13:27:28.000+03:00
diff --git a/libraries/Wire/Wire.cpp b/libraries/Wire/Wire.cpp
@@ -45,6 +45,9 @@ uint8_t TwoWire::transmitting = 0;
 void (*TwoWire::user_onRequest)(void);
 void (*TwoWire::user_onReceive)(int);
 
+static int default_sda_pin = SDA;
+static int default_scl_pin = SCL;
+
 // Constructors ////////////////////////////////////////////////////////////////
 
 TwoWire::TwoWire(){}
@@ -57,11 +60,12 @@ void TwoWire::begin(int sda, int scl){
 }
 
 void TwoWire::pins(int sda, int scl){
-  twi_init(sda, scl);
+  default_sda_pin = sda;
+  default_scl_pin = scl;
 }
 
 void TwoWire::begin(void){
-  begin(SDA, SCL);
+  begin(default_sda_pin, default_scl_pin);
 }
 
 void TwoWire::begin(uint8_t address){

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,9 @@ uint8_t TwoWire::transmitting = 0;`
`45`	`45`	`void (*TwoWire::user_onRequest)(void);`
`46`	`46`	`void (*TwoWire::user_onReceive)(int);`
`47`	`47`
	`48`	`+static int default_sda_pin = SDA;`
	`49`	`+static int default_scl_pin = SCL;`
	`50`	`+`
`48`	`51`	`// Constructors ////////////////////////////////////////////////////////////////`
`49`	`52`
`50`	`53`	`TwoWire::TwoWire(){}`
`@@ -57,11 +60,12 @@ void TwoWire::begin(int sda, int scl){`
`57`	`60`	`}`
`58`	`61`
`59`	`62`	`void TwoWire::pins(int sda, int scl){`
`60`		`- twi_init(sda, scl);`
	`63`	`+ default_sda_pin = sda;`
	`64`	`+ default_scl_pin = scl;`
`61`	`65`	`}`
`62`	`66`
`63`	`67`	`void TwoWire::begin(void){`
`64`		`- begin(SDA, SCL);`
	`68`	`+ begin(default_sda_pin, default_scl_pin);`
`65`	`69`	`}`
`66`	`70`
`67`	`71`	`void TwoWire::begin(uint8_t address){`