josh
/
Teacup_Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

I2C: join these two send commands. 

Splitting them is no longer neccessary.
This commit is contained in:
Markus Hitter 2016-04-03 22:24:55 +02:00
parent 61ab29e6b6
commit e71eab04d0
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
i2c.c
View File

@ -128,17 +128,8 @@ void i2c_init(uint8_t address) {
#endif #endif
} }
static void i2c_send_handler(void) {
i2c_state = I2C_MODE_SAWP; // Just send.
// Start transmission.
TWCR = (1<<TWINT)|(0<<TWEA)|(1<<TWSTA)|(0<<TWSTO)|(1<<TWEN)|(1<<TWIE);
i2c_state |= I2C_MODE_BUSY;
}
/** /**
Function sends a data block to slave device. Send a data block to a slave device.
*/ */
void i2c_send(uint8_t address, uint8_t* block, uint8_t tx_len) { void i2c_send(uint8_t address, uint8_t* block, uint8_t tx_len) {
@ -147,7 +138,12 @@ void i2c_send(uint8_t address, uint8_t* block, uint8_t tx_len) {
i2c_index = 0; i2c_index = 0;
i2c_byte_count = tx_len; i2c_byte_count = tx_len;
i2c_send_handler(); // Just send.
i2c_state = I2C_MODE_SAWP;
// Start transmission.
TWCR = (1<<TWINT)|(0<<TWEA)|(1<<TWSTA)|(0<<TWSTO)|(1<<TWEN)|(1<<TWIE);
i2c_state |= I2C_MODE_BUSY;
} }
/** /**