Skip to content

Commit 3fc5fb8

Browse files
committed
fix delay datatype uint16_t --> uint32_t
1 parent bc0e699 commit 3fc5fb8

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

libraries/Wire/src/Wire.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ void TwoWire::setClock(uint32_t clock)
8686
twi_setFrequency(clock);
8787
}
8888

89-
void TwoWire::setTimeoutInMicros(uint16_t timeout)
89+
void TwoWire::setTimeoutInMicros(uint32_t timeout)
9090
{
9191
twi_setTimeoutInMicros(timeout);
9292
}

libraries/Wire/src/Wire.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class TwoWire : public Stream
5454
void begin(int);
5555
void end();
5656
void setClock(uint32_t);
57-
void setTimeoutInMicros(uint16_t);
57+
void setTimeoutInMicros(uint32_t);
5858
void beginTransmission(uint8_t);
5959
void beginTransmission(int);
6060
uint8_t endTransmission(void);

libraries/Wire/src/utility/twi.c

+7-7
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ static volatile uint8_t twi_state;
4242
static volatile uint8_t twi_slarw;
4343
static volatile uint8_t twi_sendStop; // should the transaction end with a stop
4444
static volatile uint8_t twi_inRepStart; // in the middle of a repeated start
45-
static volatile uint16_t twi_timeout_us = 0;
45+
static volatile uint32_t twi_timeout_us = 0ul;
4646

4747
static void (*twi_onSlaveTransmit)(void);
4848
static void (*twi_onSlaveReceive)(uint8_t*, int);
@@ -157,7 +157,7 @@ uint8_t twi_readFrom(uint8_t address, uint8_t* data, uint8_t length, uint8_t sen
157157
// wait until twi is ready, become master receiver
158158
uint32_t startMicros = micros();
159159
while(TWI_READY != twi_state){
160-
if((twi_timeout_us > 0) && (micros() - startMicros > twi_timeout_us)) {
160+
if((twi_timeout_us > 0ul) && (micros() - startMicros > twi_timeout_us)) {
161161
twi_handleTimeout();
162162
return 0;
163163
}
@@ -201,7 +201,7 @@ uint8_t twi_readFrom(uint8_t address, uint8_t* data, uint8_t length, uint8_t sen
201201
// wait for read operation to complete
202202
startMicros = micros();
203203
while(TWI_MRX == twi_state){
204-
if((twi_timeout_us > 0) && (micros() - startMicros > twi_timeout_us)) {
204+
if((twi_timeout_us > 0ul) && (micros() - startMicros > twi_timeout_us)) {
205205
twi_handleTimeout();
206206
return 0;
207207
}
@@ -246,7 +246,7 @@ uint8_t twi_writeTo(uint8_t address, uint8_t* data, uint8_t length, uint8_t wait
246246
// wait until twi is ready, become master transmitter
247247
uint32_t startMicros = micros();
248248
while(TWI_READY != twi_state){
249-
if((twi_timeout_us > 0) && (micros() - startMicros > twi_timeout_us)) {
249+
if((twi_timeout_us > 0ul) && (micros() - startMicros > twi_timeout_us)) {
250250
twi_handleTimeout();
251251
return 4;
252252
}
@@ -293,7 +293,7 @@ uint8_t twi_writeTo(uint8_t address, uint8_t* data, uint8_t length, uint8_t wait
293293
// wait for write operation to complete
294294
startMicros = micros();
295295
while(wait && (TWI_MTX == twi_state)){
296-
if((twi_timeout_us > 0) && (micros() - startMicros > twi_timeout_us)) {
296+
if((twi_timeout_us > 0ul) && (micros() - startMicros > twi_timeout_us)) {
297297
twi_handleTimeout();
298298
return 4;
299299
}
@@ -397,7 +397,7 @@ void twi_stop(void)
397397
uint32_t counter = 0;
398398
while(TWCR & _BV(TWSTO)){
399399
counter++;
400-
if((twi_timeout_us > 0) && (counter >= 25000)) {
400+
if((twi_timeout_us > 0ul) && (counter >= 25000)) {
401401
twi_handleTimeout();
402402
return;
403403
}
@@ -430,7 +430,7 @@ void twi_releaseBus(void)
430430
* Input timeout value in microseconds
431431
* Output none
432432
*/
433-
void twi_setTimeoutInMicros(uint16_t timeout)
433+
void twi_setTimeoutInMicros(uint32_t timeout)
434434
{
435435
twi_timeout_us = timeout;
436436
}

libraries/Wire/src/utility/twi.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
void twi_reply(uint8_t);
5151
void twi_stop(void);
5252
void twi_releaseBus(void);
53-
void twi_setTimeoutInMicros(uint16_t);
53+
void twi_setTimeoutInMicros(uint32_t);
5454
void twi_handleTimeout(void);
5555

5656
#endif

0 commit comments

Comments
 (0)