grove: Small changes to build grove library

* Removed relay and rotary from grove library
    * Removed relay and rotary from grove SWIG interfaces
    * Fixed warning for o2 printf %
    * Fixed return value warning for _get_normalized method used by
      my analog sensors.

Signed-off-by: Noel Eck <noel.eck@intel.com>
This commit is contained in:
Noel Eck 2016-09-12 11:45:16 -07:00
parent f2211b9578
commit 1b9b142b2e
14 changed files with 10 additions and 35 deletions

View File

@ -24,7 +24,7 @@
#include <unistd.h>
#include <iostream>
#include "grove.hpp"
#include "relay.hpp"
int
main(int argc, char **argv)

View File

@ -25,7 +25,7 @@
#include <unistd.h>
#include <iostream>
#include <iomanip>
#include "grove.hpp"
#include "rotary.hpp"
using namespace std;

View File

@ -59,7 +59,7 @@ int main()
o2_get_raw_volts(sensor, &raw_volts);
o2_get_value(sensor, &o2_percent);
printf("O2 raw volts: %0.03f v, o2: %0.03f %\n",
printf("O2 raw volts: %0.03f v, o2: %0.03f %%\n",
raw_volts, o2_percent);
usleep(500000);

View File

@ -94,6 +94,7 @@ upm_result_t emg_get_normalized(const emg_context dev, float *value)
*value = mraa_aio_read_float(dev->aio);
if (*value < 0)
return UPM_ERROR_OPERATION_FAILED;
return UPM_SUCCESS;
}
upm_result_t emg_get_raw_volts(const emg_context dev, float *value)

View File

@ -94,6 +94,7 @@ upm_result_t flex_get_normalized(const flex_context dev, float *value)
*value = mraa_aio_read_float(dev->aio);
if (*value < 0)
return UPM_ERROR_OPERATION_FAILED;
return UPM_SUCCESS;
}
upm_result_t flex_get_raw_volts(const flex_context dev, float *value)

View File

@ -94,6 +94,7 @@ upm_result_t mqx_get_normalized(const mqx_context dev, float *value)
*value = mraa_aio_read_float(dev->aio);
if (*value < 0)
return UPM_ERROR_OPERATION_FAILED;
return UPM_SUCCESS;
}
upm_result_t mqx_get_raw_volts(const mqx_context dev, float *value)

View File

@ -27,6 +27,4 @@
#include <grovebutton.hpp>
#include <groveled.hpp>
#include <relay.hpp>
#include <rotary.hpp>
#include <grovetemp.hpp>

View File

@ -24,16 +24,6 @@
#include "groveled.hpp"
%}
%include "relay.hpp"
%{
#include "relay.hpp"
%}
%include "rotary.hpp"
%{
#include "rotary.hpp"
%}
%include "grovetemp.hpp"
%{
#include "grovetemp.hpp"

View File

@ -21,16 +21,6 @@
#include "groveled.hpp"
%}
%include "relay.hpp"
%{
#include "relay.hpp"
%}
%include "rotary.hpp"
%{
#include "rotary.hpp"
%}
%include "grovetemp.hpp"
%{
#include "grovetemp.hpp"

View File

@ -25,16 +25,6 @@
#include "groveled.hpp"
%}
%include "relay.hpp"
%{
#include "relay.hpp"
%}
%include "rotary.hpp"
%{
#include "rotary.hpp"
%}
%include "grovetemp.hpp"
%{
#include "grovetemp.hpp"

View File

@ -94,6 +94,7 @@ upm_result_t gsr_get_normalized(const gsr_context dev, float *value)
*value = mraa_aio_read_float(dev->aio);
if (*value < 0)
return UPM_ERROR_OPERATION_FAILED;
return UPM_SUCCESS;
}
upm_result_t gsr_get_raw_volts(const gsr_context dev, float *value)

View File

@ -94,6 +94,7 @@ upm_result_t ldt0028_get_normalized(const ldt0028_context dev, float *value)
*value = mraa_aio_read_float(dev->aio);
if (*value < 0)
return UPM_ERROR_OPERATION_FAILED;
return UPM_SUCCESS;
}
upm_result_t ldt0028_get_raw_volts(const ldt0028_context dev, float *value)

View File

@ -95,6 +95,7 @@ upm_result_t light_get_normalized(const light_context dev, float *value)
*value = mraa_aio_read_float(dev->aio);
if (*value < 0)
return UPM_ERROR_OPERATION_FAILED;
return UPM_SUCCESS;
}
upm_result_t light_get_raw_volts(const light_context dev, float *value)

View File

@ -94,6 +94,7 @@ upm_result_t slide_get_normalized(const slide_context dev, float *value)
*value = mraa_aio_read_float(dev->aio);
if (*value < 0)
return UPM_ERROR_OPERATION_FAILED;
return UPM_SUCCESS;
}
upm_result_t slide_get_raw_volts(const slide_context dev, float *value)