projects
/
hackover2013-badge-firmware.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of gitlab:wintermute/hackover2013-badge-firmware
[hackover2013-badge-firmware.git]
/
drivers
/
sensors
/
tcs3414
/
tcs3414.c
diff --git
a/drivers/sensors/tcs3414/tcs3414.c
b/drivers/sensors/tcs3414/tcs3414.c
index
2a81c71
..
42a5719
100644
(file)
--- a/
drivers/sensors/tcs3414/tcs3414.c
+++ b/
drivers/sensors/tcs3414/tcs3414.c
@@
-53,8
+53,6
@@
extern volatile uint8_t I2CMasterBuffer[I2C_BUFSIZE];
extern volatile uint8_t I2CSlaveBuffer[I2C_BUFSIZE];
extern volatile uint32_t I2CReadLength, I2CWriteLength;
extern volatile uint8_t I2CSlaveBuffer[I2C_BUFSIZE];
extern volatile uint32_t I2CReadLength, I2CWriteLength;
-uint32_t i;
-
static bool _tcs3414Initialised = false;
/**************************************************************************/
static bool _tcs3414Initialised = false;
/**************************************************************************/
@@
-65,6
+63,7
@@
static bool _tcs3414Initialised = false;
tcs3414Error_e tcs3414WriteCmd (uint8_t cmd)
{
// Clear write buffers
tcs3414Error_e tcs3414WriteCmd (uint8_t cmd)
{
// Clear write buffers
+ uint32_t i;
for ( i = 0; i < I2C_BUFSIZE; i++ )
{
I2CMasterBuffer[i] = 0x00;
for ( i = 0; i < I2C_BUFSIZE; i++ )
{
I2CMasterBuffer[i] = 0x00;
@@
-86,6
+85,7
@@
tcs3414Error_e tcs3414WriteCmd (uint8_t cmd)
tcs3414Error_e tcs3414Write8 (uint8_t reg, uint32_t value)
{
// Clear write buffers
tcs3414Error_e tcs3414Write8 (uint8_t reg, uint32_t value)
{
// Clear write buffers
+ uint32_t i;
for ( i = 0; i < I2C_BUFSIZE; i++ )
{
I2CMasterBuffer[i] = 0x00;
for ( i = 0; i < I2C_BUFSIZE; i++ )
{
I2CMasterBuffer[i] = 0x00;
@@
-108,6
+108,7
@@
tcs3414Error_e tcs3414Write8 (uint8_t reg, uint32_t value)
tcs3414Error_e tcs3414Read16(uint8_t reg, uint16_t *value)
{
// Clear write buffers
tcs3414Error_e tcs3414Read16(uint8_t reg, uint16_t *value)
{
// Clear write buffers
+ uint32_t i;
for ( i = 0; i < I2C_BUFSIZE; i++ )
{
I2CMasterBuffer[i] = 0x00;
for ( i = 0; i < I2C_BUFSIZE; i++ )
{
I2CMasterBuffer[i] = 0x00;
This page took
0.020153 seconds
and
4
git commands to generate.