Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tidy up existing i2c_master implementations #15376

Merged
merged 2 commits into from
Dec 2, 2021
Merged

Tidy up existing i2c_master implementations #15376

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c9cafd
Move chibios defines out of header
zvecr Dec 1, 2021
ed99569
Make some avr defines internal
zvecr Dec 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Make some avr defines internal
  • Loading branch information
@zvecr
zvecr committed Dec 1, 2021
commit ed99569f528716310de5dcb94d9809f861edd15b
7 changes: 5 additions & 2 deletions platforms/avr/drivers/i2c_master.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@
# define I2C_START_RETRY_COUNT 20
#endif // I2C_START_RETRY_COUNT

#define I2C_ACTION_READ 0x01
#define I2C_ACTION_WRITE 0x00

#define TWBR_val (((F_CPU / F_SCL) - 16) / 2)

#define MAX(X, Y) ((X) > (Y) ? (X) : (Y))
Expand Down Expand Up @@ -154,7 +157,7 @@ int16_t i2c_read_nack(uint16_t timeout) {
}

i2c_status_t i2c_transmit(uint8_t address, const uint8_t* data, uint16_t length, uint16_t timeout) {
i2c_status_t status = i2c_start(address | I2C_WRITE, timeout);
i2c_status_t status = i2c_start(address | I2C_ACTION_WRITE, timeout);

for (uint16_t i = 0; i < length && status >= 0; i++) {
status = i2c_write(data[i], timeout);
Expand All @@ -166,7 +169,7 @@ i2c_status_t i2c_transmit(uint8_t address, const uint8_t* data, uint16_t length,
}

i2c_status_t i2c_receive(uint8_t address, uint8_t* data, uint16_t length, uint16_t timeout) {
i2c_status_t status = i2c_start(address | I2C_READ, timeout);
i2c_status_t status = i2c_start(address | I2C_ACTION_READ, timeout);

for (uint16_t i = 0; i < (length - 1) && status >= 0; i++) {
status = i2c_read_ack(timeout);
Expand Down