Commit c0f158f

authored

Merge pull request #196 from delta-G/DG_WireMillis

fixing millis rollover bug x2

2 parents 684cafc + d7e4606 commit c0f158fCopy full SHA for c0f158f

File tree

-4

lines changed

-4

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -477,8 +477,8 @@ uint8_t TwoWire::read_from(uint8_t address, uint8_t* data, uint8_t length, unsig`
`477`	`477`	`err = m_read(&m_i2c_ctrl,data,length,!sendStop);`
`478`	`478`	`}`
`479`	`479`	`}`
`480`		`- timeout_ms = millis() + timeout_ms;`
`481`		`- while(millis() < timeout_ms && bus_status == WIRE_STATUS_UNSET && err == FSP_SUCCESS) {`
	`480`	`+ uint32_tconst start = millis();`
	`481`	`+ while(((millis() - start) < timeout_ms) && bus_status == WIRE_STATUS_UNSET && err == FSP_SUCCESS) {`
`482`	`482`
`483`	`483`	`}`
`484`	`484`	`}`
`@@ -505,8 +505,8 @@ uint8_t TwoWire::write_to(uint8_t address, uint8_t* data, uint8_t length, unsign`
`505`	`505`	`err = m_write(&m_i2c_ctrl,data,length,!sendStop);`
`506`	`506`	`}`
`507`	`507`	`}`
`508`		`- timeout_ms = millis() + timeout_ms;`
`509`		`- while(millis() < timeout_ms && bus_status == WIRE_STATUS_UNSET && err == FSP_SUCCESS) {`
	`508`	`+ uint32_tconst start = millis();`
	`509`	`+ while(((millis() - start) < timeout_ms) && bus_status == WIRE_STATUS_UNSET && err == FSP_SUCCESS) {`
`510`	`510`
`511`	`511`	`}`
`512`	`512`

Comments

(0)