Commit 7b2f6fc

PaoloP74sandeepmistry

authored and

committed

Fix Wire register

Move TWBR register from Wire.cpp to twi.c file.

1 parent aa710ab commit 7b2f6fcCopy full SHA for 7b2f6fc

File tree

+19

-2

lines changed

+19

-2

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -80,9 +80,9 @@ void TwoWire::end(void)`
`80`	`80`	`twi_disable();`
`81`	`81`	`}`
`82`	`82`
`83`		`-void TwoWire::setClock(uint32_t frequency)`
	`83`	`+void TwoWire::setClock(uint32_t clock)`
`84`	`84`	`{`
`85`		`- TWBR = ((F_CPU / frequency) - 16) / 2;`
	`85`	`+ twi_setFrequency(clock);`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`uint8_t TwoWire::requestFrom(uint8_t address, uint8_t quantity, uint32_t iaddress, uint8_t isize, uint8_t sendStop)`

Lines changed: 16 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -118,6 +118,22 @@ void twi_setAddress(uint8_t address)`
`118`	`118`	`TWAR = address << 1;`
`119`	`119`	`}`
`120`	`120`
	`121`	`+/*`
	`122`	`+ * Function twi_setClock`
	`123`	`+ * Desc sets twi bit rate`
	`124`	`+ * Input Clock Frequency`
	`125`	`+ * Output none`
	`126`	`+ */`
	`127`	`+void twi_setFrequency(uint32_t frequency)`
	`128`	`+{`
	`129`	`+ TWBR = ((F_CPU / frequency) - 16) / 2;`
	`130`	`+`
	`131`	`+ /* twi bit rate formula from atmega128 manual pg 204`
	`132`	`+ SCL Frequency = CPU Clock Frequency / (16 + (2 * TWBR))`
	`133`	`+ note: TWBR should be 10 or higher for master mode`
	`134`	`+ It is 72 for a 16mhz Wiring board with 100kHz TWI */`
	`135`	`+}`
	`136`	`+`
`121`	`137`	`/*`
`122`	`138`	`* Function twi_readFrom`
`123`	`139`	`* Desc attempts to become twi bus master and read a`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@`
`41`	`41`	`void twi_init(void);`
`42`	`42`	`void twi_disable(void);`
`43`	`43`	`void twi_setAddress(uint8_t);`
	`44`	`+ void twi_setFrequency(uint32_t);`
`44`	`45`	`uint8_t twi_readFrom(uint8_t, uint8_t*, uint8_t, uint8_t);`
`45`	`46`	`uint8_t twi_writeTo(uint8_t, uint8_t*, uint8_t, uint8_t, uint8_t);`
`46`	`47`	`uint8_t twi_transmit(const uint8_t*, uint8_t);`

Comments

(0)