Raspberries/mraa
Private
Public Access
2
0
Fork 0
Code Activity

firmata_mraa.c: Fix reg read to not use firmata contiuous mode

Browse Source 
Firmata's i2c continuous mode is it's own thing and is currently not supported
in mraa

Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
This commit is contained in:
Brendan Le Foll
2016-03-22 15:02:17 +00:00
parent 30322f8ac5
commit 2fb577d348
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/firmata/firmata_mraa.c
View File

@@ -146,7 +146,7 @@ mraa_firmata_send_i2c_read_req(mraa_i2c_context dev, int length)
} }
static mraa_result_t static mraa_result_t
mraa_firmata_send_i2c_read_cont_req(mraa_i2c_context dev, uint8_t command, int length) mraa_firmata_send_i2c_read_reg_req(mraa_i2c_context dev, uint8_t command, int length)
{ {
uint8_t* buffer = calloc(9, 0); uint8_t* buffer = calloc(9, 0);
if (buffer == NULL) { if (buffer == NULL) {
@@ -155,7 +155,7 @@ mraa_firmata_send_i2c_read_cont_req(mraa_i2c_context dev, uint8_t command, int l
buffer[0] = FIRMATA_START_SYSEX; buffer[0] = FIRMATA_START_SYSEX;
buffer[1] = FIRMATA_I2C_REQUEST; buffer[1] = FIRMATA_I2C_REQUEST;
buffer[2] = dev->addr; buffer[2] = dev->addr;
buffer[3] = I2C_CONTINUOUSREAD << 3; buffer[3] = I2C_MODE_READ << 3;
// register to read from // register to read from
buffer[4] = command & 0x7f; buffer[4] = command & 0x7f;
@@ -204,7 +204,7 @@ mraa_firmata_i2c_read_byte(mraa_i2c_context dev)
static uint16_t static uint16_t
mraa_firmata_i2c_read_word_data(mraa_i2c_context dev, uint8_t command) mraa_firmata_i2c_read_word_data(mraa_i2c_context dev, uint8_t command)
{ {
if (mraa_firmata_send_i2c_read_cont_req(dev, command, 2) == MRAA_SUCCESS) { if (mraa_firmata_send_i2c_read_reg_req(dev, command, 2) == MRAA_SUCCESS) {
if (mraa_firmata_i2c_wait(dev->addr, command) == MRAA_SUCCESS) { if (mraa_firmata_i2c_wait(dev->addr, command) == MRAA_SUCCESS) {
uint8_t rawdata[2]; uint8_t rawdata[2];
rawdata[0] = firmata_dev->i2cmsg[dev->addr][command]; rawdata[0] = firmata_dev->i2cmsg[dev->addr][command];
@@ -223,7 +223,7 @@ mraa_firmata_i2c_read_word_data(mraa_i2c_context dev, uint8_t command)
static int static int
mraa_firmata_i2c_read_bytes_data(mraa_i2c_context dev, uint8_t command, uint8_t* data, int length) mraa_firmata_i2c_read_bytes_data(mraa_i2c_context dev, uint8_t command, uint8_t* data, int length)
{ {
if (mraa_firmata_send_i2c_read_cont_req(dev, command, length) == MRAA_SUCCESS) { if (mraa_firmata_send_i2c_read_reg_req(dev, command, length) == MRAA_SUCCESS) {
if (mraa_firmata_i2c_wait(dev->addr, command) == MRAA_SUCCESS) { if (mraa_firmata_i2c_wait(dev->addr, command) == MRAA_SUCCESS) {
memcpy(data, &firmata_dev->i2cmsg[dev->addr][command], sizeof(int)*length); memcpy(data, &firmata_dev->i2cmsg[dev->addr][command], sizeof(int)*length);
return length; return length;
@@ -251,7 +251,7 @@ mraa_firmata_i2c_read(mraa_i2c_context dev, uint8_t* data, int length)
static uint8_t static uint8_t
mraa_firmata_i2c_read_byte_data(mraa_i2c_context dev, uint8_t command) mraa_firmata_i2c_read_byte_data(mraa_i2c_context dev, uint8_t command)
{ {
if (mraa_firmata_send_i2c_read_cont_req(dev, command, 1) == MRAA_SUCCESS) { if (mraa_firmata_send_i2c_read_reg_req(dev, command, 1) == MRAA_SUCCESS) {
if (mraa_firmata_i2c_wait(dev->addr, command) == MRAA_SUCCESS) { if (mraa_firmata_i2c_wait(dev->addr, command) == MRAA_SUCCESS) {
return firmata_dev->i2cmsg[dev->addr][command]; return firmata_dev->i2cmsg[dev->addr][command];
} }