aboutsummaryrefslogtreecommitdiff
path: root/drivers/arm/i2c_master.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/arm/i2c_master.c')
-rw-r--r--drivers/arm/i2c_master.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/arm/i2c_master.c b/drivers/arm/i2c_master.c
index 385bd97cb..1c3da2a1a 100644
--- a/drivers/arm/i2c_master.c
+++ b/drivers/arm/i2c_master.c
@@ -46,13 +46,13 @@ __attribute__ ((weak))
46void i2c_init(void) 46void i2c_init(void)
47{ 47{
48 // Try releasing special pins for a short time 48 // Try releasing special pins for a short time
49 palSetPadMode(GPIOB, 6, PAL_MODE_INPUT); 49 palSetPadMode(I2C1_BANK, I2C1_SCL, PAL_MODE_INPUT);
50 palSetPadMode(GPIOB, 7, PAL_MODE_INPUT); 50 palSetPadMode(I2C1_BANK, I2C1_SDA, PAL_MODE_INPUT);
51 51
52 chThdSleepMilliseconds(10); 52 chThdSleepMilliseconds(10);
53 53
54 palSetPadMode(GPIOB, 6, PAL_MODE_ALTERNATE(4) | PAL_STM32_OTYPE_OPENDRAIN); 54 palSetPadMode(I2C1_BANK, I2C1_SCL, PAL_MODE_ALTERNATE(4) | PAL_STM32_OTYPE_OPENDRAIN);
55 palSetPadMode(GPIOB, 7, PAL_MODE_ALTERNATE(4) | PAL_STM32_OTYPE_OPENDRAIN); 55 palSetPadMode(I2C1_BANK, I2C1_SDA, PAL_MODE_ALTERNATE(4) | PAL_STM32_OTYPE_OPENDRAIN);
56 56
57 //i2cInit(); //This is invoked by halInit() so no need to redo it. 57 //i2cInit(); //This is invoked by halInit() so no need to redo it.
58} 58}
@@ -67,6 +67,7 @@ uint8_t i2c_start(uint8_t address)
67 67
68uint8_t i2c_transmit(uint8_t address, uint8_t* data, uint16_t length, uint16_t timeout) 68uint8_t i2c_transmit(uint8_t address, uint8_t* data, uint16_t length, uint16_t timeout)
69{ 69{
70 // FIXME: Next steps: Add a print here, copy this file to your rgb_matrix firmware. Compare both.
70 i2c_address = address; 71 i2c_address = address;
71 i2cStart(&I2C_DRIVER, &i2cconfig); 72 i2cStart(&I2C_DRIVER, &i2cconfig);
72 return i2cMasterTransmitTimeout(&I2C_DRIVER, (i2c_address >> 1), data, length, 0, 0, MS2ST(timeout)); 73 return i2cMasterTransmitTimeout(&I2C_DRIVER, (i2c_address >> 1), data, length, 0, 0, MS2ST(timeout));