Merge branch 'i2c_scan_fix' of https://github.com/facchinm/ArduinoCore-samd into HEAD

cmaglie · cmaglie · commit 0f4b0d81180b · 2015-09-29T14:47:53.000+02:00
diff --git a/libraries/Wire/Wire.cpp b/libraries/Wire/Wire.cpp
@@ -111,12 +111,6 @@ uint8_t TwoWire::endTransmission(bool stopBit)
 {
   transmissionBegun = false ;
 
-  // Check if there are data to send
-  if ( txBuffer.available() == 0)
-  {
-    return 4 ;
-  }
-
   // Start I2C transmission
   if ( !sercom->startTransmissionWIRE( txAddress, WIRE_WRITE_FLAG ) )
   {

Original file line number	Diff line number	Diff line change
`@@ -111,12 +111,6 @@ uint8_t TwoWire::endTransmission(bool stopBit)`
`111`	`111`	`{`
`112`	`112`	`transmissionBegun = false ;`
`113`	`113`
`114`		`- // Check if there are data to send`
`115`		`- if ( txBuffer.available() == 0)`
`116`		`- {`
`117`		`- return 4 ;`
`118`		`- }`
`119`		`-`
`120`	`114`	`// Start I2C transmission`
`121`	`115`	`if ( !sercom->startTransmissionWIRE( txAddress, WIRE_WRITE_FLAG ) )`
`122`	`116`	`{`