GitMigration
/
oled-display
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update i2c.c

Browse Source
pull/7/head
Sylaina 7 years ago committed by GitHub
parent 441d216ca5
commit a0525ae565
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File

10
i2c.c
Unescape Escape View File

@ -40,7 +40,7 @@ void i2c_init(void){
void i2c_start(uint8_t i2c_addr){ void i2c_start(uint8_t i2c_addr){
// i2c start // i2c start
TWCR = (1 << TWINT)|(1 << TWSTA)|(1 << TWEN); TWCR = (1 << TWINT)|(1 << TWSTA)|(1 << TWEN);
uint8_t timeout = F_CPU/F_I2C*1.25; uint16_t timeout = F_CPU/F_I2C*2.0;
while((TWCR & (1 << TWINT)) == 0 && while((TWCR & (1 << TWINT)) == 0 &&
timeout !=0){ timeout !=0){
timeout--; timeout--;
@ -52,7 +52,7 @@ void i2c_start(uint8_t i2c_addr){
// send adress // send adress
TWDR = i2c_addr; TWDR = i2c_addr;
TWCR = (1 << TWINT)|( 1 << TWEN); TWCR = (1 << TWINT)|( 1 << TWEN);
timeout = F_CPU/F_I2C*1.25; timeout = F_CPU/F_I2C*2.0;
while((TWCR & (1 << TWINT)) == 0 && while((TWCR & (1 << TWINT)) == 0 &&
timeout !=0){ timeout !=0){
timeout--; timeout--;
@ -69,7 +69,7 @@ void i2c_stop(void){
void i2c_byte(uint8_t byte){ void i2c_byte(uint8_t byte){
TWDR = byte; TWDR = byte;
TWCR = (1 << TWINT)|( 1 << TWEN); TWCR = (1 << TWINT)|( 1 << TWEN);
uint8_t timeout = F_CPU/F_I2C*1.25; uint16_t timeout = F_CPU/F_I2C*2.0;
while((TWCR & (1 << TWINT)) == 0 && while((TWCR & (1 << TWINT)) == 0 &&
timeout !=0){ timeout !=0){
timeout--; timeout--;
@ -81,7 +81,7 @@ void i2c_byte(uint8_t byte){
} }
uint8_t i2c_readAck(void){ uint8_t i2c_readAck(void){
TWCR = (1<<TWINT)|(1<<TWEN)|(1<<TWEA); TWCR = (1<<TWINT)|(1<<TWEN)|(1<<TWEA);
uint8_t timeout = F_CPU/F_I2C*1.25; uint16_t timeout = F_CPU/F_I2C*2.0;
while((TWCR & (1 << TWINT)) == 0 && while((TWCR & (1 << TWINT)) == 0 &&
timeout !=0){ timeout !=0){
timeout--; timeout--;
@ -94,7 +94,7 @@ uint8_t i2c_readAck(void){
} }
uint8_t i2c_readNAck(void){ uint8_t i2c_readNAck(void){
TWCR = (1<<TWINT)|(1<<TWEN); TWCR = (1<<TWINT)|(1<<TWEN);
uint8_t timeout = F_CPU/F_I2C*1.25; uint16_t timeout = F_CPU/F_I2C*2.0;
while((TWCR & (1 << TWINT)) == 0 && while((TWCR & (1 << TWINT)) == 0 &&
timeout !=0){ timeout !=0){
timeout--; timeout--;

Write Preview
Loading…
Cancel
Save