0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #4718 from thinkyhead/rc_twibus_patch_20160827

Browse source 
TWIBus patch for proper use of Wire.requestFrom
This commit is contained in:
Scott Lahteine 2016-08-27 20:22:53 -05:00 committed by GitHub
parent d641344d3a 2b226bc5c2
commit fae92e3f3c
2 changed files with 14 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Marlin/twibus.cpp
View file

@ -25,7 +25,6 @@
#if ENABLED(EXPERIMENTAL_I2CBUS)
#include "twibus.h"
#include <Wire.h>
TWIBus::TWIBus() {
@ -121,15 +120,9 @@ bool TWIBus::request(const uint8_t bytes) {
#endif
// requestFrom() is a blocking function
Wire.requestFrom(this->addr, bytes);
// Wait for all bytes to arrive
millis_t t = millis() + this->timeout;
while (Wire.available() < bytes)
if (ELAPSED(millis(), t)) {
if (Wire.requestFrom(this->addr, bytes) == 0) {
#if ENABLED(DEBUG_TWIBUS)
SERIAL_ECHO_START;
SERIAL_ECHOLNPGM("i2c timeout");
debug("request fail", this->addr);
#endif
return false;
}
@ -151,6 +144,11 @@ uint8_t TWIBus::capture(char *dst, const uint8_t bytes) {
uint8_t count = 0;
while (count < bytes && Wire.available())
dst[count++] = Wire.read();
#if ENABLED(DEBUG_TWIBUS)
debug(PSTR("capture"), count);
#endif
return count;
}

14
Marlin/twibus.h
View file

@ -54,14 +54,6 @@ typedef void (*twiRequestFunc_t)();
*/
class TWIBus {
private:
/**
* @brief Timeout value in milliseconds
* @details Maximum amount of time (ms) to wait for a reply.
* Useful if something goes wrong on the bus and the
* SDA/SCL lines are held up by another device.
*/
const int timeout = 5;
/**
* @brief Number of bytes on buffer
* @description Number of bytes in the buffer waiting to be flushed to the bus
@ -165,11 +157,11 @@ class TWIBus {
/**
* @brief Request data from the slave device and wait.
* @details Request a number of bytes from a slave device.
* Wait for the data to arrive until the timeout
* interval expires. Return true on success.
* Wait for the data to arrive, and return true
* on success.
*
* @param bytes the number of bytes to request
* @return status of the request: true=success, false=timeout
* @return status of the request: true=success, false=fail
*/
bool request(const uint8_t bytes);