From 2dd9aa87b0aaf346975668c54dbf9ccbaf92fb12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Monda?= Date: Mon, 26 Sep 2016 20:33:03 +0200 Subject: [PATCH] Name a couple of I2C related variables more intuitively. --- right/src/i2c.h | 5 +++-- right/src/led_driver.c | 4 ++-- right/src/led_driver.h | 7 +++---- right/src/main.c | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/right/src/i2c.h b/right/src/i2c.h index 9bf7dec..7af204f 100644 --- a/right/src/i2c.h +++ b/right/src/i2c.h @@ -1,9 +1,10 @@ #ifndef __MAIN_H__ #define __MAIN_H__ -#define EXAMPLE_I2C_MASTER_BASEADDR I2C0 +#define I2C_BASEADDR_MAIN_BUS I2C0 +#define I2C_BASEADDR_EEPROM_BUS I2C1 + #define I2C_BAUD_RATE 100000 #define I2C_MASTER_CLK_SRC I2C0_CLK_SRC -#define I2C_DATA_LENGTH 2 #endif diff --git a/right/src/led_driver.c b/right/src/led_driver.c index 39f9cc4..fa0662c 100644 --- a/right/src/led_driver.c +++ b/right/src/led_driver.c @@ -10,9 +10,9 @@ void LedDriver_WriteBuffer(uint8_t txBuffer[], uint8_t size) masterXfer.data = txBuffer; masterXfer.dataSize = size; masterXfer.flags = kI2C_TransferDefaultFlag; - I2C_MasterTransferBlocking(EXAMPLE_I2C_MASTER_BASEADDR, &masterXfer); + I2C_MasterTransferBlocking(I2C_BASEADDR_MAIN_BUS, &masterXfer); masterXfer.slaveAddress = RIGHT_LED_DRIVER_ADDRESS_7BIT; - I2C_MasterTransferBlocking(EXAMPLE_I2C_MASTER_BASEADDR, &masterXfer); + I2C_MasterTransferBlocking(I2C_BASEADDR_MAIN_BUS, &masterXfer); } void LedDriver_WriteRegister(uint8_t reg, uint8_t val) diff --git a/right/src/led_driver.h b/right/src/led_driver.h index fa5cac6..b25fb25 100644 --- a/right/src/led_driver.h +++ b/right/src/led_driver.h @@ -3,14 +3,13 @@ // Includes: -#include "fsl_gpio.h" -#include "fsl_port.h" - + #include "fsl_gpio.h" + #include "fsl_port.h" #include "fsl_i2c.h" #include "i2c.h" #include "i2c_addresses.h" -// Macros: +// Functions: extern void LedDriver_WriteBuffer(uint8_t txBuffer[], uint8_t size); extern void LedDriver_WriteRegister(uint8_t reg, uint8_t val); diff --git a/right/src/main.c b/right/src/main.c index d7dd4fa..d729691 100644 --- a/right/src/main.c +++ b/right/src/main.c @@ -16,7 +16,7 @@ void main() { I2C_MasterGetDefaultConfig(&masterConfig); masterConfig.baudRate_Bps = I2C_BAUD_RATE; sourceClock = CLOCK_GetFreq(I2C_MASTER_CLK_SRC); - I2C_MasterInit(EXAMPLE_I2C_MASTER_BASEADDR, &masterConfig, sourceClock); + I2C_MasterInit(I2C_BASEADDR_MAIN_BUS, &masterConfig, sourceClock); LedDriver_EnableAllLeds(); InitUsb();