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

aio: Change mraa_aio_read to use int and return -1

Browse Source 
This commit changes also the _replace function and adds exceptions to the C++
API for errors in AIO read

Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
This commit is contained in:
Brendan Le Foll
2016-04-22 11:57:18 +01:00
parent e961558fd2
commit 0b74aa68ab
5 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/aio/aio.c
View File

@@ -152,7 +152,7 @@ mraa_aio_init(unsigned int aio)
return dev;
}
unsigned int
int
mraa_aio_read(mraa_aio_context dev)
{
if (IS_FUNC_DEFINED(dev, aio_read_replace)) {
@@ -165,7 +165,7 @@ mraa_aio_read(mraa_aio_context dev)
if (dev->adc_in_fp == -1) {
if (aio_get_valid_fp(dev) != MRAA_SUCCESS) {
syslog(LOG_ERR, "aio: Failed to get to the device");
return 0;
return -1;
}
}
@@ -182,8 +182,10 @@ mraa_aio_read(mraa_aio_context dev)
unsigned int analog_value = (unsigned int) strtoul(buffer, &end, 10);
if (end == &buffer[0]) {
syslog(LOG_ERR, "aio: Value is not a decimal number");
return -1;
} else if (errno != 0) {
syslog(LOG_ERR, "aio: Errno was set");
return -1;
}
if (dev->value_bit != raw_bits) {
@@ -205,7 +207,7 @@ mraa_aio_read_float(mraa_aio_context dev)
{
if (dev == NULL) {
syslog(LOG_ERR, "aio: Device not valid");
return 0.0;
return -1.0;
}
float max_analog_value = (1 << dev->value_bit) - 1;

4
src/firmata/firmata_mraa.c
View File

@@ -340,12 +340,12 @@ mraa_firmata_i2c_stop(mraa_i2c_context dev)
return MRAA_SUCCESS;
}
static unsigned int
static int
mraa_firmata_aio_read(mraa_aio_context dev)
{
// careful, whilst you need to enable '0' for A0 you then need to read 14
// in t_firmata because well that makes sense doesn't it...
return (unsigned int) firmata_dev->pins[dev->channel].value;
return (int) firmata_dev->pins[dev->channel].value;
}
static mraa_result_t