Merge remote-tracking branch 'refs/remotes/rogerclarkmelbourne/master'

stevstrong · stevstrong · commit 979fc8790c1f · 2017-07-26T22:52:40.000+02:00
diff --git a/STM32F1/libraries/Wire/WireBase.cpp b/STM32F1/libraries/Wire/WireBase.cpp
@@ -59,7 +59,7 @@ void WireBase::beginTransmission(int slave_address) {
     beginTransmission((uint8)slave_address);
 }
 
-uint8 WireBase::endTransmission(uint8 stop) {
+uint8 WireBase::endTransmission(bool stop) {
     uint8 retVal;
     if (tx_buf_overflow) {
         return EDATA;
diff --git a/STM32F1/libraries/Wire/WireBase.h b/STM32F1/libraries/Wire/WireBase.h
@@ -91,7 +91,7 @@ class WireBase { // Abstraction is awesome!
      * Call the process function to process the message if the TX
      * buffer has not overflowed.
      */
-    uint8 endTransmission(uint8);
+    uint8 endTransmission(bool);
     uint8 endTransmission(void);
 
     /*

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ void WireBase::beginTransmission(int slave_address) {`
`59`	`59`	`beginTransmission((uint8)slave_address);`
`60`	`60`	`}`
`61`	`61`
`62`		`-uint8 WireBase::endTransmission(uint8 stop) {`
	`62`	`+uint8 WireBase::endTransmission(bool stop) {`
`63`	`63`	`uint8 retVal;`
`64`	`64`	`if (tx_buf_overflow) {`
`65`	`65`	`return EDATA;`