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

aio: change return from uint16 to unsigned int

Browse Source 
Signed-off-by: Thomas Ingleby <thomas.c.ingleby@intel.com>
This commit is contained in:
Thomas Ingleby
2014-09-22 15:29:02 +01:00
parent 1fcdfde02c
commit e82a76593d
3 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
api/mraa/aio.h
View File

@@ -59,12 +59,13 @@ typedef struct _aio* mraa_aio_context;
mraa_aio_context mraa_aio_init(unsigned int pin);
/**
* Read the input voltage
* Read the input voltage. By default mraa will shift
* the raw value up or down to a 10 bit value.
*
* @param dev The AIO context
* @returns The current input voltage, normalised to a 16-bit value
* @returns The current input voltage.
*/
uint16_t mraa_aio_read(mraa_aio_context dev);
unsigned int mraa_aio_read(mraa_aio_context dev);
/**
* Close the analog input context, this will free the memory for the context

9
api/mraa/aio.hpp
View File

@@ -53,14 +53,13 @@ class Aio {
mraa_aio_close(m_aio);
}
/**
* Read a value from the AIO pin. Note this value can never be outside
* of the bounds of an unsigned short
* Read a value from the AIO pin. By default mraa will shift
* the raw value up or down to a 10 bit value.
*
* @returns The current input voltage, normalised to a 16-bit value
* @returns The current input voltage. By default, a 10bit value
*/
int read() {
// Use basic types to make swig code generation simpler
return (int) mraa_aio_read(m_aio);
return mraa_aio_read(m_aio);
}
/**
* Set the bit value which mraa will shift the raw reading

11
src/aio/aio.c
View File

@@ -112,17 +112,14 @@ mraa_aio_context mraa_aio_init(unsigned int aio_channel)
return dev;
}
/** Read the input voltage, represented as an unsigned short in the range [0x0,
* 0xFFFF]
/** Read the input voltage.
*
* @param pointer to mraa_aio_context structure initialised by
* mraa_aio_init()
*
* @returns
* unsigned 16 bit int representing the current input voltage, normalised to
* a 16-bit value
* @returns The current input voltage. By default, a 10bit value
*/
uint16_t mraa_aio_read(mraa_aio_context dev)
unsigned int mraa_aio_read(mraa_aio_context dev)
{
char buffer[16];
unsigned int shifter_value = 0;
@@ -139,7 +136,7 @@ uint16_t mraa_aio_read(mraa_aio_context dev)
errno = 0;
char *end;
uint16_t analog_value = (uint16_t) strtoul(buffer, &end, 10);
unsigned int analog_value = (unsigned int) strtoul(buffer, &end, 10);
if (end == &buffer[0]) {
fprintf(stderr, "%s is not a decimal number\n", buffer);
}