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

aio.hpp: Add C++ wrapper around Aio

Browse Source 
* maa_aio_context becomes an opaque pointer
* C++ wrapper class Aio created
* examples/c++ with a sample for Aio created
* swig now uses C++ wrapper Aio to generate an API
* python generated code is now C++

Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
This commit is contained in:
Brendan Le Foll
2014-05-15 22:47:38 +01:00
parent e84406d697
commit 554505b640
11 changed files with 125 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
api/aio.h
View File

@@ -43,10 +43,10 @@ extern "C" {
#define ADC_RAW_RESOLUTION_BITS (12)
#define ADC_SUPPORTED_RESOLUTION_BITS (10)
typedef struct {
unsigned int channel;
int adc_in_fp;
} maa_aio_context;
/**
* Opaque pointer definition to the internal struct _aio
*/
typedef struct _aio* maa_aio_context;
/** Initialise an Analog input device, connected to the specified pin
*
@@ -55,7 +55,7 @@ typedef struct {
* @returns pointer to maa_aio_context structure after initialisation of Analog
* input pin successfully, else returns null.
*/
maa_aio_context* maa_aio_init(unsigned int aio_channel);
maa_aio_context maa_aio_init(unsigned int aio_channel);
/** Read the input voltage, represented as an unsigned short in the range [0x0,
* 0xFFFF]
@@ -66,7 +66,7 @@ maa_aio_context* maa_aio_init(unsigned int aio_channel);
* @returns 16-bit unsigned integer representing the current input voltage,
* normalised to a 16-bit value
*/
uint16_t maa_aio_read(maa_aio_context* dev);
uint16_t maa_aio_read(maa_aio_context dev);
/** Close the analog input context
* - Will free the memory for the context.
@@ -76,7 +76,7 @@ uint16_t maa_aio_read(maa_aio_context* dev);
*
* @return maa_result_t - result type.
*/
maa_result_t maa_aio_close(maa_aio_context* dev);
maa_result_t maa_aio_close(maa_aio_context dev);
#ifdef __cplusplus
}

51
api/aio.hpp Normal file
View File

@@ -0,0 +1,51 @@
/*
* Author: Brendan Le Foll <brendan.le.foll@intel.com>
* Copyright (c) 2014 Intel Corporation.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, sublicense, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
*
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
* LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#pragma once
/** @file
*
* This file defines the aio C++ interface for libmaa
*
*/
#include "aio.h"
namespace maa {
class Aio {
public:
Aio(unsigned int pin) {
m_aio = maa_aio_init(pin);
}
~Aio() {
maa_aio_close(m_aio);
}
uint16_t read() {
return maa_aio_read(m_aio);
}
private:
maa_aio_context m_aio;
};
}