ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #559 from toyowata/master 

HAL : [LPC824] Fix I2C return value
pull/561/merge
Bogdan Marinescu 2014-10-15 10:03:39 +01:00
parent 5d17b81123 d9479288a7
commit dd973760c1
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC82X/i2c_api.c
View File

@ -228,7 +228,7 @@ int i2c_read(i2c_t *obj, int address, char *data, int length, int stop)
memcpy(data, buf + 1, i2c_result.n_bytes_recd); memcpy(data, buf + 1, i2c_result.n_bytes_recd);
free(buf); free(buf);
if (err == 0) if (err == 0)
return i2c_result.n_bytes_recd; return i2c_result.n_bytes_recd - 1;
else else
return -1; return -1;
} }
@ -248,7 +248,7 @@ int i2c_write(i2c_t *obj, int address, const char *data, int length, int stop)
err = LPC_I2CD_API->i2c_master_transmit_poll(obj->handler, &i2c_param, &i2c_result); err = LPC_I2CD_API->i2c_master_transmit_poll(obj->handler, &i2c_param, &i2c_result);
free(buf); free(buf);
if (err == 0) if (err == 0)
return i2c_result.n_bytes_sent; return i2c_result.n_bytes_sent - 1;
else else
return -1; return -1;
} }
@ -282,7 +282,7 @@ int i2c_byte_write(i2c_t *obj, int data)
#if DEVICE_I2CSLAVE #if DEVICE_I2CSLAVE
void i2c_slave_mode(i2c_t *obj, int enable_slave) void i2c_slave_mode(i2c_t *obj, int enable_slave)
{ {
obj->handler = LPC_I2CD_API->i2c_setup((uint32_t)(obj->i2c), i2c_buffer); obj->handler = LPC_I2CD_API->i2c_setup((uint32_t)(obj->i2c), i2c_buffer);
if (enable_slave != 0) { if (enable_slave != 0) {

3
libraries/tests/mbed/i2c_TMP102/main.cpp
View File

@ -23,7 +23,8 @@ TMP102 temperature(p28, p27, 0x90);
defined(TARGET_NUCLEO_F401RE) || \ defined(TARGET_NUCLEO_F401RE) || \
defined(TARGET_NUCLEO_F411RE) || \ defined(TARGET_NUCLEO_F411RE) || \
defined(TARGET_NUCLEO_L053R8) || \ defined(TARGET_NUCLEO_L053R8) || \
defined(TARGET_NUCLEO_L152RE) defined(TARGET_NUCLEO_L152RE) || \
defined(TARGET_LPC824)
TMP102 temperature(I2C_SDA, I2C_SCL, 0x90); TMP102 temperature(I2C_SDA, I2C_SCL, 0x90);
#else #else

4
libraries/tests/mbed/i2c_mma7660/main.cpp
View File

@ -2,7 +2,11 @@
#include "test_env.h" #include "test_env.h"
#include "MMA7660.h" #include "MMA7660.h"
#if defined(TARGET_FF_ARDUINO)
MMA7660 MMA(I2C_SDA, I2C_SCL);
#else
MMA7660 MMA(p28, p27); MMA7660 MMA(p28, p27);
#endif
int main() { int main() {
if (!MMA.testConnection()) if (!MMA.testConnection())