From e7c80217c2f5bdd49eb1687aa2e727051b284281 Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Wed, 28 Sep 2016 17:33:57 -0600 Subject: [PATCH] C examples: move mraa_init() calls out of C examples and into C drivers. Signed-off-by: Jon Trulson --- examples/c/a110x.c | 7 ------- examples/c/bh1750.c | 7 ------- examples/c/collision.c | 7 ------- examples/c/dfrec.c | 7 ------- examples/c/dfrorp.c | 7 ------- examples/c/dfrph.c | 7 ------- examples/c/ds18b20.c | 7 ------- examples/c/emg.c | 7 ------- examples/c/flex.c | 7 ------- examples/c/gp2y0a.c | 7 ------- examples/c/grovemoisture.c | 7 ------- examples/c/gsr.c | 7 ------- examples/c/hka5.c | 7 ------- examples/c/joystick12.c | 8 -------- examples/c/ldt0028.c | 7 ------- examples/c/led.c | 7 ------- examples/c/light.c | 7 ------- examples/c/loudness.c | 7 ------- examples/c/m24lr64e.c | 7 ------- examples/c/mma7361.c | 7 ------- examples/c/moisture.c | 7 ------- examples/c/mpr121.c | 7 ------- examples/c/mq303a.c | 8 -------- examples/c/mqx.c | 7 ------- examples/c/nmea_gps.c | 7 ------- examples/c/nmea_gps_i2c.c | 7 ------- examples/c/o2.c | 7 ------- examples/c/servo.c | 7 ------- examples/c/sht1x.c | 7 ------- examples/c/slide.c | 7 ------- examples/c/tsl2561.c | 7 ------- examples/c/ttp223.c | 7 ------- examples/c/urm37-uart.c | 7 ------- examples/c/urm37.c | 7 ------- examples/c/vdiv.c | 7 ------- src/a110x/a110x.c | 10 +++++++++- src/bh1750/bh1750.c | 8 ++++++++ src/collision/collision.c | 10 +++++++++- src/dfrec/dfrec.c | 8 ++++++++ src/dfrorp/dfrorp.c | 8 ++++++++ src/dfrph/dfrph.c | 8 ++++++++ src/ds18b20/ds18b20.c | 8 ++++++++ src/emg/emg.c | 8 ++++++++ src/flex/flex.c | 8 ++++++++ src/gas/mqx.c | 8 ++++++++ src/gp2y0a/gp2y0a.c | 8 ++++++++ src/gsr/gsr.c | 8 ++++++++ src/hka5/hka5.c | 8 ++++++++ src/joystick12/joystick12.c | 8 ++++++++ src/ldt0028/ldt0028.c | 8 ++++++++ src/led/led.c | 8 ++++++++ src/light/light.c | 8 ++++++++ src/loudness/loudness.c | 8 ++++++++ src/m24lr64e/m24lr64e.c | 8 ++++++++ src/mma7361/mma7361.c | 8 ++++++++ src/moisture/moisture.c | 8 ++++++++ src/mpr121/mpr121.c | 10 +++++++++- src/mq303a/mq303a.c | 10 +++++++++- src/nmea_gps/nmea_gps.c | 11 ++++++++++- src/o2/o2.c | 8 ++++++++ src/servo/es08a.c | 12 ++++++++++-- src/servo/es9257.c | 11 ++++++++++- src/sht1x/sht1x.c | 8 ++++++++ src/slide/slide.c | 8 ++++++++ src/tsl2561/tsl2561.c | 8 ++++++++ src/ttp223/ttp223.c | 10 +++++++++- src/urm37/urm37.c | 7 +++++++ src/vdiv/vdiv.c | 8 ++++++++ 68 files changed, 274 insertions(+), 256 deletions(-) diff --git a/examples/c/a110x.c b/examples/c/a110x.c index 441b7271..bdddfd70 100644 --- a/examples/c/a110x.c +++ b/examples/c/a110x.c @@ -8,16 +8,9 @@ #include "a110x.h" #include "upm_utilities.h" -#include "mraa.h" int main() { - if (mraa_init() != MRAA_SUCCESS) - { - perror("Failed to initialize mraa\n"); - return -1; - } - a110x_context dev = a110x_init(2); bool abc = 0; while(1){ diff --git a/examples/c/bh1750.c b/examples/c/bh1750.c index 5af44f70..a049dc9c 100644 --- a/examples/c/bh1750.c +++ b/examples/c/bh1750.c @@ -27,7 +27,6 @@ #include "bh1750.h" #include "upm_utilities.h" -#include "mraa.h" bool shouldRun = true; @@ -39,12 +38,6 @@ void sig_handler(int signo) int main() { - if (mraa_init() != MRAA_SUCCESS) - { - perror("Failed to initialize mraa\n"); - return -1; - } - signal(SIGINT, sig_handler); //! [Interesting] diff --git a/examples/c/collision.c b/examples/c/collision.c index bbd8862f..1438da9d 100644 --- a/examples/c/collision.c +++ b/examples/c/collision.c @@ -8,16 +8,9 @@ #include "collision.h" #include "upm_utilities.h" -#include "mraa.h" int main() { - if (mraa_init() != MRAA_SUCCESS) - { - perror("Failed to initialize mraa\n"); - return -1; - } - collision_context dev = collision_init(2); bool abc = 0; while(1){ diff --git a/examples/c/dfrec.c b/examples/c/dfrec.c index 31af6c83..d555a5f7 100644 --- a/examples/c/dfrec.c +++ b/examples/c/dfrec.c @@ -27,7 +27,6 @@ #include "dfrec.h" #include "upm_utilities.h" -#include "mraa.h" bool shouldRun = true; @@ -39,12 +38,6 @@ void sig_handler(int signo) int main() { - if (mraa_init() != MRAA_SUCCESS) - { - printf("Failed to initialize mraa\n"); - return -1; - } - signal(SIGINT, sig_handler); //! [Interesting] diff --git a/examples/c/dfrorp.c b/examples/c/dfrorp.c index 46de2b74..7a933182 100644 --- a/examples/c/dfrorp.c +++ b/examples/c/dfrorp.c @@ -27,7 +27,6 @@ #include "dfrorp.h" #include "upm_utilities.h" -#include "mraa.h" bool shouldRun = true; @@ -39,12 +38,6 @@ void sig_handler(int signo) int main() { - if (mraa_init() != MRAA_SUCCESS) - { - perror("Failed to initialize mraa\n"); - return -1; - } - signal(SIGINT, sig_handler); //! [Interesting] diff --git a/examples/c/dfrph.c b/examples/c/dfrph.c index 4508c747..218fd24e 100644 --- a/examples/c/dfrph.c +++ b/examples/c/dfrph.c @@ -27,7 +27,6 @@ #include "dfrph.h" #include "upm_utilities.h" -#include "mraa.h" bool shouldRun = true; @@ -39,12 +38,6 @@ void sig_handler(int signo) int main() { - if (mraa_init() != MRAA_SUCCESS) - { - perror("Failed to initialize mraa\n"); - return -1; - } - signal(SIGINT, sig_handler); //! [Interesting] diff --git a/examples/c/ds18b20.c b/examples/c/ds18b20.c index 6bfcd6f6..492f3fee 100644 --- a/examples/c/ds18b20.c +++ b/examples/c/ds18b20.c @@ -28,7 +28,6 @@ #include "ds18b20.h" #include "upm_utilities.h" -#include "mraa.h" bool shouldRun = true; @@ -40,12 +39,6 @@ void sig_handler(int signo) int main(int argc, char **argv) { - if (mraa_init() != MRAA_SUCCESS) - { - perror("Failed to initialize mraa\n"); - return -1; - } - signal(SIGINT, sig_handler); //! [Interesting] diff --git a/examples/c/emg.c b/examples/c/emg.c index 5e6a632e..8692e1cd 100644 --- a/examples/c/emg.c +++ b/examples/c/emg.c @@ -27,7 +27,6 @@ #include "emg.h" #include "upm_utilities.h" -#include "mraa.h" bool shouldRun = true; @@ -39,12 +38,6 @@ void sig_handler(int signo) int main() { - if (mraa_init() != MRAA_SUCCESS) - { - perror("Failed to initialize mraa\n"); - return -1; - } - signal(SIGINT, sig_handler); //! [Interesting] diff --git a/examples/c/flex.c b/examples/c/flex.c index 97d70600..80144e0a 100644 --- a/examples/c/flex.c +++ b/examples/c/flex.c @@ -27,7 +27,6 @@ #include "flex.h" #include "upm_utilities.h" -#include "mraa.h" bool shouldRun = true; @@ -39,12 +38,6 @@ void sig_handler(int signo) int main() { - if (mraa_init() != MRAA_SUCCESS) - { - perror("Failed to initialize mraa\n"); - return -1; - } - signal(SIGINT, sig_handler); //! [Interesting] diff --git a/examples/c/gp2y0a.c b/examples/c/gp2y0a.c index 92e68c13..453fb8aa 100644 --- a/examples/c/gp2y0a.c +++ b/examples/c/gp2y0a.c @@ -8,16 +8,9 @@ #include "gp2y0a.h" #include "upm_utilities.h" -#include "mraa.h" int main() { - if (mraa_init() != MRAA_SUCCESS) - { - perror("Failed to initialize mraa\n"); - return -1; - } - gp2y0a_context dev = gp2y0a_init(14, 5.0); float val; while(1){ diff --git a/examples/c/grovemoisture.c b/examples/c/grovemoisture.c index d787cecf..6bd5333c 100644 --- a/examples/c/grovemoisture.c +++ b/examples/c/grovemoisture.c @@ -8,16 +8,9 @@ #include "grovemoisture.h" #include "upm_utilities.h" -#include "mraa.h" int main() { - if (mraa_init() != MRAA_SUCCESS) - { - perror("Failed to initialize mraa\n"); - return -1; - } - grovemoisture_context dev = grovemoisture_init(14); int val; while(1){ diff --git a/examples/c/gsr.c b/examples/c/gsr.c index 047d74ed..e11f4fe0 100644 --- a/examples/c/gsr.c +++ b/examples/c/gsr.c @@ -27,7 +27,6 @@ #include "gsr.h" #include "upm_utilities.h" -#include "mraa.h" bool shouldRun = true; @@ -39,12 +38,6 @@ void sig_handler(int signo) int main() { - if (mraa_init() != MRAA_SUCCESS) - { - perror("Failed to initialize mraa\n"); - return -1; - } - signal(SIGINT, sig_handler); //! [Interesting] diff --git a/examples/c/hka5.c b/examples/c/hka5.c index 34f61a37..380618d8 100644 --- a/examples/c/hka5.c +++ b/examples/c/hka5.c @@ -27,7 +27,6 @@ #include "hka5.h" #include "upm_utilities.h" -#include "mraa.h" bool shouldRun = true; @@ -39,12 +38,6 @@ void sig_handler(int signo) int main() { - if (mraa_init() != MRAA_SUCCESS) - { - perror("Failed to initialize mraa\n"); - return -1; - } - signal(SIGINT, sig_handler); //! [Interesting] diff --git a/examples/c/joystick12.c b/examples/c/joystick12.c index 6350dd3d..aed71f15 100644 --- a/examples/c/joystick12.c +++ b/examples/c/joystick12.c @@ -27,8 +27,6 @@ #include "joystick12.h" #include "upm_utilities.h" -#include "mraa.h" - bool shouldRun = true; @@ -40,12 +38,6 @@ void sig_handler(int signo) int main() { - if (mraa_init() != MRAA_SUCCESS) - { - perror("Failed to initialize mraa\n"); - return -1; - } - signal(SIGINT, sig_handler); //! [Interesting] diff --git a/examples/c/ldt0028.c b/examples/c/ldt0028.c index c3c20d23..1e96e658 100644 --- a/examples/c/ldt0028.c +++ b/examples/c/ldt0028.c @@ -27,7 +27,6 @@ #include "ldt0028.h" #include "upm_utilities.h" -#include "mraa.h" bool shouldRun = true; @@ -39,12 +38,6 @@ void sig_handler(int signo) int main() { - if (mraa_init() != MRAA_SUCCESS) - { - perror("Failed to initialize mraa\n"); - return -1; - } - signal(SIGINT, sig_handler); //! [Interesting] diff --git a/examples/c/led.c b/examples/c/led.c index b35ee0c9..45f05a9b 100644 --- a/examples/c/led.c +++ b/examples/c/led.c @@ -8,16 +8,9 @@ #include "led.h" #include "upm_utilities.h" -#include "mraa.h" int main(void) { - if (mraa_init() != MRAA_SUCCESS) - { - perror("Failed to initialize mraa\n"); - return -1; - } - led_context dev = led_init(2); while(1){ if(led_on(dev) != UPM_SUCCESS){ diff --git a/examples/c/light.c b/examples/c/light.c index 1296649d..0070fd24 100644 --- a/examples/c/light.c +++ b/examples/c/light.c @@ -27,7 +27,6 @@ #include "light.h" #include "upm_utilities.h" -#include "mraa.h" bool shouldRun = true; @@ -39,12 +38,6 @@ void sig_handler(int signo) int main() { - if (mraa_init() != MRAA_SUCCESS) - { - perror("Failed to initialize mraa\n"); - return -1; - } - signal(SIGINT, sig_handler); //! [Interesting] diff --git a/examples/c/loudness.c b/examples/c/loudness.c index 9e94a7b3..c032672b 100644 --- a/examples/c/loudness.c +++ b/examples/c/loudness.c @@ -8,16 +8,9 @@ #include "loudness.h" #include "upm_utilities.h" -#include "mraa.h" int main() { - if (mraa_init() != MRAA_SUCCESS) - { - perror("Failed to initialize mraa\n"); - return -1; - } - loudness_context dev = loudness_init(14); int val; while(1){ diff --git a/examples/c/m24lr64e.c b/examples/c/m24lr64e.c index f2087b30..b94254f4 100644 --- a/examples/c/m24lr64e.c +++ b/examples/c/m24lr64e.c @@ -6,16 +6,9 @@ #include "m24lr64e.h" #include "upm_utilities.h" -#include "mraa.h" int main() { - if (mraa_init() != MRAA_SUCCESS) - { - perror("Failed to initialize mraa\n"); - return -1; - } - m24lr64e_context dev = m24lr64e_init(0, M24LR64E_USER_MODE); int addr = M24LR64E_EEPROM_I2C_LENGTH-1; printf("address being accessed: %d\n", addr); diff --git a/examples/c/mma7361.c b/examples/c/mma7361.c index 0d84f179..a5f06253 100644 --- a/examples/c/mma7361.c +++ b/examples/c/mma7361.c @@ -27,7 +27,6 @@ #include "mma7361.h" #include "upm_utilities.h" -#include "mraa.h" bool shouldRun = true; @@ -39,12 +38,6 @@ void sig_handler(int signo) int main() { - if (mraa_init() != MRAA_SUCCESS) - { - perror("Failed to initialize mraa\n"); - return -1; - } - signal(SIGINT, sig_handler); //! [Interesting] diff --git a/examples/c/moisture.c b/examples/c/moisture.c index 6f17b57d..0315498c 100644 --- a/examples/c/moisture.c +++ b/examples/c/moisture.c @@ -8,16 +8,9 @@ #include "moisture.h" #include "upm_utilities.h" -#include "mraa.h" int main() { - if (mraa_init() != MRAA_SUCCESS) - { - perror("Failed to initialize mraa\n"); - return -1; - } - moisture_context dev = moisture_init(14); int val; while(1){ diff --git a/examples/c/mpr121.c b/examples/c/mpr121.c index 129a2600..d0773c4e 100644 --- a/examples/c/mpr121.c +++ b/examples/c/mpr121.c @@ -8,16 +8,9 @@ #include "mpr121.h" #include "upm_utilities.h" -#include "mraa.h" int main() { - if (mraa_init() != MRAA_SUCCESS) - { - perror("Failed to initialize mraa\n"); - return -1; - } - mpr121_context dev = mpr121_init(MPR121_I2C_BUS, MPR121_DEFAULT_I2C_ADDR); if(mpr121_config_an3944(dev) != UPM_SUCCESS){ diff --git a/examples/c/mq303a.c b/examples/c/mq303a.c index 07bfca4d..87bedf50 100644 --- a/examples/c/mq303a.c +++ b/examples/c/mq303a.c @@ -8,16 +8,8 @@ #include "mq303a.h" #include "upm_utilities.h" -#include "mraa.h" int main() { - if (mraa_init() != MRAA_SUCCESS) - { - perror("Failed to initialize mraa\n"); - return -1; - } - - /* --------- MQ303A EXAMPLE -------- */ mq303a_context dev = mq303a_init(0, 15); printf("init done for mq303a\n"); diff --git a/examples/c/mqx.c b/examples/c/mqx.c index 3b3f1cdc..40669537 100644 --- a/examples/c/mqx.c +++ b/examples/c/mqx.c @@ -27,7 +27,6 @@ #include "mqx.h" #include "upm_utilities.h" -#include "mraa.h" bool shouldRun = true; @@ -39,12 +38,6 @@ void sig_handler(int signo) int main() { - if (mraa_init() != MRAA_SUCCESS) - { - perror("Failed to initialize mraa\n"); - return -1; - } - signal(SIGINT, sig_handler); //! [Interesting] diff --git a/examples/c/nmea_gps.c b/examples/c/nmea_gps.c index 01e24d27..30c1773e 100644 --- a/examples/c/nmea_gps.c +++ b/examples/c/nmea_gps.c @@ -27,7 +27,6 @@ #include "nmea_gps.h" #include "upm_utilities.h" -#include "mraa.h" bool shouldRun = true; @@ -41,12 +40,6 @@ void sig_handler(int signo) int main() { - if (mraa_init() != MRAA_SUCCESS) - { - perror("Failed to initialize mraa\n"); - return -1; - } - signal(SIGINT, sig_handler); //! [Interesting] diff --git a/examples/c/nmea_gps_i2c.c b/examples/c/nmea_gps_i2c.c index 20b43dff..a8191efb 100644 --- a/examples/c/nmea_gps_i2c.c +++ b/examples/c/nmea_gps_i2c.c @@ -27,7 +27,6 @@ #include "nmea_gps.h" #include "upm_utilities.h" -#include "mraa.h" bool shouldRun = true; @@ -41,12 +40,6 @@ void sig_handler(int signo) int main() { - if (mraa_init() != MRAA_SUCCESS) - { - perror("Failed to initialize mraa\n"); - return -1; - } - signal(SIGINT, sig_handler); //! [Interesting] diff --git a/examples/c/o2.c b/examples/c/o2.c index 2a12c9ab..2102498c 100644 --- a/examples/c/o2.c +++ b/examples/c/o2.c @@ -27,7 +27,6 @@ #include "o2.h" #include "upm_utilities.h" -#include "mraa.h" bool shouldRun = true; @@ -39,12 +38,6 @@ void sig_handler(int signo) int main() { - if (mraa_init() != MRAA_SUCCESS) - { - perror("Failed to initialize mraa\n"); - return -1; - } - signal(SIGINT, sig_handler); //! [Interesting] diff --git a/examples/c/servo.c b/examples/c/servo.c index ed9ff31a..68a4a68c 100644 --- a/examples/c/servo.c +++ b/examples/c/servo.c @@ -8,16 +8,9 @@ #include "es08a.h" #include "upm_utilities.h" -#include "mraa.h" int main() { - if (mraa_init() != MRAA_SUCCESS) - { - perror("Failed to initialize mraa\n"); - return -1; - } - es08a_context dev = es08a_init(3, ES08A_MIN_PULSE_WIDTH, ES08A_MAX_PULSE_WIDTH); if(dev == NULL){ printf("unable to initialize the servo context\n"); diff --git a/examples/c/sht1x.c b/examples/c/sht1x.c index bf8ca5de..5c97ad92 100644 --- a/examples/c/sht1x.c +++ b/examples/c/sht1x.c @@ -27,7 +27,6 @@ #include "sht1x.h" #include "upm_utilities.h" -#include "mraa.h" bool shouldRun = true; @@ -39,12 +38,6 @@ void sig_handler(int signo) int main() { - if (mraa_init() != MRAA_SUCCESS) - { - perror("Failed to initialize mraa\n"); - return -1; - } - signal(SIGINT, sig_handler); //! [Interesting] diff --git a/examples/c/slide.c b/examples/c/slide.c index 83382fc3..ab8a32ce 100644 --- a/examples/c/slide.c +++ b/examples/c/slide.c @@ -27,7 +27,6 @@ #include "slide.h" #include "upm_utilities.h" -#include "mraa.h" bool shouldRun = true; @@ -39,12 +38,6 @@ void sig_handler(int signo) int main() { - if (mraa_init() != MRAA_SUCCESS) - { - perror("Failed to initialize mraa\n"); - return -1; - } - signal(SIGINT, sig_handler); //! [Interesting] diff --git a/examples/c/tsl2561.c b/examples/c/tsl2561.c index af4337d3..64743d1c 100644 --- a/examples/c/tsl2561.c +++ b/examples/c/tsl2561.c @@ -8,16 +8,9 @@ #include "tsl2561.h" #include "upm_utilities.h" -#include "mraa.h" int main() { - if (mraa_init() != MRAA_SUCCESS) - { - perror("Failed to initialize mraa\n"); - return -1; - } - tsl2561_context dev = tsl2561_init(0, TSL2561_Address, GAIN_0X, INTEGRATION_TIME1_101MS); float abc = 0; if(tsl2561_get_lux(dev, &abc) != UPM_SUCCESS){ diff --git a/examples/c/ttp223.c b/examples/c/ttp223.c index 07b828ee..077e2cf4 100644 --- a/examples/c/ttp223.c +++ b/examples/c/ttp223.c @@ -8,16 +8,9 @@ #include "ttp223.h" #include "upm_utilities.h" -#include "mraa.h" int main() { - if (mraa_init() != MRAA_SUCCESS) - { - perror("Failed to initialize mraa\n"); - return -1; - } - ttp223_context dev = ttp223_init(2); bool abc = 0; while(1){ diff --git a/examples/c/urm37-uart.c b/examples/c/urm37-uart.c index a1dbec6c..b76e9934 100644 --- a/examples/c/urm37-uart.c +++ b/examples/c/urm37-uart.c @@ -27,7 +27,6 @@ #include "urm37.h" #include "upm_utilities.h" -#include "mraa.h" bool shouldRun = true; @@ -39,12 +38,6 @@ void sig_handler(int signo) int main() { - if (mraa_init() != MRAA_SUCCESS) - { - perror("Failed to initialize mraa\n"); - return -1; - } - signal(SIGINT, sig_handler); //! [Interesting] diff --git a/examples/c/urm37.c b/examples/c/urm37.c index 1a26619a..a78e7fd3 100644 --- a/examples/c/urm37.c +++ b/examples/c/urm37.c @@ -27,7 +27,6 @@ #include "urm37.h" #include "upm_utilities.h" -#include "mraa.h" bool shouldRun = true; @@ -39,12 +38,6 @@ void sig_handler(int signo) int main() { - if (mraa_init() != MRAA_SUCCESS) - { - perror("Failed to initialize mraa\n"); - return -1; - } - signal(SIGINT, sig_handler); //! [Interesting] diff --git a/examples/c/vdiv.c b/examples/c/vdiv.c index e3bf02f6..757cbd46 100644 --- a/examples/c/vdiv.c +++ b/examples/c/vdiv.c @@ -27,7 +27,6 @@ #include "vdiv.h" #include "upm_utilities.h" -#include "mraa.h" bool shouldRun = true; @@ -39,12 +38,6 @@ void sig_handler(int signo) int main() { - if (mraa_init() != MRAA_SUCCESS) - { - perror("Failed to initialize mraa\n"); - return -1; - } - signal(SIGINT, sig_handler); //! [Interesting] diff --git a/src/a110x/a110x.c b/src/a110x/a110x.c index 9f492b64..e2281532 100644 --- a/src/a110x/a110x.c +++ b/src/a110x/a110x.c @@ -24,7 +24,15 @@ */ #include "a110x.h" -a110x_context a110x_init(uint8_t pin){ +a110x_context a110x_init(uint8_t pin) { + // make sure MRAA is initialized + int mraa_rv; + if ((mraa_rv = mraa_init()) != MRAA_SUCCESS) + { + printf("%s: mraa_init() failed (%d).\n", __FUNCTION__, mraa_rv); + return NULL; + } + a110x_context dev = (a110x_context) malloc(sizeof(struct _a110x_context)); diff --git a/src/bh1750/bh1750.c b/src/bh1750/bh1750.c index 70eee2b0..5e1d0a6b 100644 --- a/src/bh1750/bh1750.c +++ b/src/bh1750/bh1750.c @@ -29,6 +29,14 @@ bh1750_context bh1750_init(int bus, uint8_t addr, BH1750_OPMODES_T mode) { + // make sure MRAA is initialized + int mraa_rv; + if ((mraa_rv = mraa_init()) != MRAA_SUCCESS) + { + printf("%s: mraa_init() failed (%d).\n", __FUNCTION__, mraa_rv); + return NULL; + } + bh1750_context dev = (bh1750_context)malloc(sizeof(struct _bh1750_context)); diff --git a/src/collision/collision.c b/src/collision/collision.c index e517e9da..fe79175e 100644 --- a/src/collision/collision.c +++ b/src/collision/collision.c @@ -24,7 +24,15 @@ */ #include "collision.h" -collision_context collision_init(int pin){ +collision_context collision_init(int pin) { + // make sure MRAA is initialized + int mraa_rv; + if ((mraa_rv = mraa_init()) != MRAA_SUCCESS) + { + printf("%s: mraa_init() failed (%d).\n", __FUNCTION__, mraa_rv); + return NULL; + } + collision_context dev = (collision_context)malloc(sizeof(struct _collision_context)); diff --git a/src/dfrec/dfrec.c b/src/dfrec/dfrec.c index ff487614..fd73e33c 100644 --- a/src/dfrec/dfrec.c +++ b/src/dfrec/dfrec.c @@ -60,6 +60,14 @@ static float average(const dfrec_context dev, int samples) dfrec_context dfrec_init(unsigned int apin, unsigned int uart_ow, unsigned int device_idx, float a_ref) { + // make sure MRAA is initialized + int mraa_rv; + if ((mraa_rv = mraa_init()) != MRAA_SUCCESS) + { + printf("%s: mraa_init() failed (%d).\n", __FUNCTION__, mraa_rv); + return NULL; + } + dfrec_context dev = (dfrec_context)malloc(sizeof(struct _dfrec_context)); diff --git a/src/dfrorp/dfrorp.c b/src/dfrorp/dfrorp.c index ba2b2359..0939efeb 100644 --- a/src/dfrorp/dfrorp.c +++ b/src/dfrorp/dfrorp.c @@ -60,6 +60,14 @@ static float average(const dfrorp_context dev, int samples) dfrorp_context dfrorp_init(unsigned int apin, float a_ref) { + // make sure MRAA is initialized + int mraa_rv; + if ((mraa_rv = mraa_init()) != MRAA_SUCCESS) + { + printf("%s: mraa_init() failed (%d).\n", __FUNCTION__, mraa_rv); + return NULL; + } + dfrorp_context dev = (dfrorp_context)malloc(sizeof(struct _dfrorp_context)); diff --git a/src/dfrph/dfrph.c b/src/dfrph/dfrph.c index 1cde8ce1..6aac1ecd 100644 --- a/src/dfrph/dfrph.c +++ b/src/dfrph/dfrph.c @@ -29,6 +29,14 @@ dfrph_context dfrph_init(int16_t pin) { + // make sure MRAA is initialized + int mraa_rv; + if ((mraa_rv = mraa_init()) != MRAA_SUCCESS) + { + printf("%s: mraa_init() failed (%d).\n", __FUNCTION__, mraa_rv); + return NULL; + } + dfrph_context dev = (dfrph_context) malloc(sizeof(struct _dfrph_context)); diff --git a/src/ds18b20/ds18b20.c b/src/ds18b20/ds18b20.c index fc7a006d..9ae9332d 100644 --- a/src/ds18b20/ds18b20.c +++ b/src/ds18b20/ds18b20.c @@ -49,6 +49,14 @@ static float readSingleTemp(const ds18b20_context dev, unsigned int index); ds18b20_context ds18b20_init(unsigned int uart) { + // make sure MRAA is initialized + int mraa_rv; + if ((mraa_rv = mraa_init()) != MRAA_SUCCESS) + { + printf("%s: mraa_init() failed (%d).\n", __FUNCTION__, mraa_rv); + return NULL; + } + ds18b20_context dev = (ds18b20_context)malloc(sizeof(struct _ds18b20_context)); diff --git a/src/emg/emg.c b/src/emg/emg.c index 68ef29b1..87315d86 100644 --- a/src/emg/emg.c +++ b/src/emg/emg.c @@ -29,6 +29,14 @@ emg_context emg_init(int16_t pin) { + // make sure MRAA is initialized + int mraa_rv; + if ((mraa_rv = mraa_init()) != MRAA_SUCCESS) + { + printf("%s: mraa_init() failed (%d).\n", __FUNCTION__, mraa_rv); + return NULL; + } + emg_context dev = (emg_context) malloc(sizeof(struct _emg_context)); if (dev == NULL) diff --git a/src/flex/flex.c b/src/flex/flex.c index 4cfe6b92..3195114e 100644 --- a/src/flex/flex.c +++ b/src/flex/flex.c @@ -29,6 +29,14 @@ flex_context flex_init(int16_t pin) { + // make sure MRAA is initialized + int mraa_rv; + if ((mraa_rv = mraa_init()) != MRAA_SUCCESS) + { + printf("%s: mraa_init() failed (%d).\n", __FUNCTION__, mraa_rv); + return NULL; + } + flex_context dev = (flex_context) malloc(sizeof(struct _flex_context)); if (dev == NULL) diff --git a/src/gas/mqx.c b/src/gas/mqx.c index 8f8443f5..bca09be5 100644 --- a/src/gas/mqx.c +++ b/src/gas/mqx.c @@ -29,6 +29,14 @@ mqx_context mqx_init(int16_t pin) { + // make sure MRAA is initialized + int mraa_rv; + if ((mraa_rv = mraa_init()) != MRAA_SUCCESS) + { + printf("%s: mraa_init() failed (%d).\n", __FUNCTION__, mraa_rv); + return NULL; + } + mqx_context dev = (mqx_context) malloc(sizeof(struct _mqx_context)); if (dev == NULL) diff --git a/src/gp2y0a/gp2y0a.c b/src/gp2y0a/gp2y0a.c index cdca66ed..0ab080fb 100644 --- a/src/gp2y0a/gp2y0a.c +++ b/src/gp2y0a/gp2y0a.c @@ -25,6 +25,14 @@ #include "gp2y0a.h" gp2y0a_context gp2y0a_init(uint8_t pin, float a_ref){ + // make sure MRAA is initialized + int mraa_rv; + if ((mraa_rv = mraa_init()) != MRAA_SUCCESS) + { + printf("%s: mraa_init() failed (%d).\n", __FUNCTION__, mraa_rv); + return NULL; + } + gp2y0a_context dev = (gp2y0a_context) malloc(sizeof(struct _gp2y0a_context)); dev->pin = pin; diff --git a/src/gsr/gsr.c b/src/gsr/gsr.c index 3cfebd51..20a406b0 100644 --- a/src/gsr/gsr.c +++ b/src/gsr/gsr.c @@ -29,6 +29,14 @@ gsr_context gsr_init(int16_t pin) { + // make sure MRAA is initialized + int mraa_rv; + if ((mraa_rv = mraa_init()) != MRAA_SUCCESS) + { + printf("%s: mraa_init() failed (%d).\n", __FUNCTION__, mraa_rv); + return NULL; + } + gsr_context dev = (gsr_context) malloc(sizeof(struct _gsr_context)); if (dev == NULL) diff --git a/src/hka5/hka5.c b/src/hka5/hka5.c index 0f041705..8d3d2a67 100644 --- a/src/hka5/hka5.c +++ b/src/hka5/hka5.c @@ -50,6 +50,14 @@ static bool verify_cksum(uint8_t *pkt) hka5_context hka5_init(unsigned int uart, int set_pin, int reset_pin) { + // make sure MRAA is initialized + int mraa_rv; + if ((mraa_rv = mraa_init()) != MRAA_SUCCESS) + { + printf("%s: mraa_init() failed (%d).\n", __FUNCTION__, mraa_rv); + return NULL; + } + hka5_context dev = (hka5_context)malloc(sizeof(struct _hka5_context)); diff --git a/src/joystick12/joystick12.c b/src/joystick12/joystick12.c index ec3a1fa6..08009eee 100644 --- a/src/joystick12/joystick12.c +++ b/src/joystick12/joystick12.c @@ -29,6 +29,14 @@ joystick12_context joystick12_init(int16_t apin_x, int16_t apin_y) { + // make sure MRAA is initialized + int mraa_rv; + if ((mraa_rv = mraa_init()) != MRAA_SUCCESS) + { + printf("%s: mraa_init() failed (%d).\n", __FUNCTION__, mraa_rv); + return NULL; + } + joystick12_context dev = (joystick12_context) malloc(sizeof(struct _joystick12_context)); diff --git a/src/ldt0028/ldt0028.c b/src/ldt0028/ldt0028.c index c8999d10..8757d0b9 100644 --- a/src/ldt0028/ldt0028.c +++ b/src/ldt0028/ldt0028.c @@ -29,6 +29,14 @@ ldt0028_context ldt0028_init(int16_t pin) { + // make sure MRAA is initialized + int mraa_rv; + if ((mraa_rv = mraa_init()) != MRAA_SUCCESS) + { + printf("%s: mraa_init() failed (%d).\n", __FUNCTION__, mraa_rv); + return NULL; + } + ldt0028_context dev = (ldt0028_context) malloc(sizeof(struct _ldt0028_context)); if (dev == NULL) diff --git a/src/led/led.c b/src/led/led.c index c9649c71..438a2bda 100644 --- a/src/led/led.c +++ b/src/led/led.c @@ -28,6 +28,14 @@ #include "upm_types.h" led_context led_init(uint8_t pin){ + // make sure MRAA is initialized + int mraa_rv; + if ((mraa_rv = mraa_init()) != MRAA_SUCCESS) + { + printf("%s: mraa_init() failed (%d).\n", __FUNCTION__, mraa_rv); + return NULL; + } + led_context dev = (led_context)malloc(sizeof(struct _led_context)); diff --git a/src/light/light.c b/src/light/light.c index c9450234..fe78278b 100644 --- a/src/light/light.c +++ b/src/light/light.c @@ -30,6 +30,14 @@ light_context light_init(int16_t pin) { + // make sure MRAA is initialized + int mraa_rv; + if ((mraa_rv = mraa_init()) != MRAA_SUCCESS) + { + printf("%s: mraa_init() failed (%d).\n", __FUNCTION__, mraa_rv); + return NULL; + } + light_context dev = (light_context) malloc(sizeof(struct _light_context)); if (dev == NULL) diff --git a/src/loudness/loudness.c b/src/loudness/loudness.c index 99a2c52c..4220c062 100644 --- a/src/loudness/loudness.c +++ b/src/loudness/loudness.c @@ -25,6 +25,14 @@ #include "loudness.h" loudness_context loudness_init(int pin) { + // make sure MRAA is initialized + int mraa_rv; + if ((mraa_rv = mraa_init()) != MRAA_SUCCESS) + { + printf("%s: mraa_init() failed (%d).\n", __FUNCTION__, mraa_rv); + return NULL; + } + loudness_context dev = (loudness_context) malloc(sizeof(struct _loudness_context)); diff --git a/src/m24lr64e/m24lr64e.c b/src/m24lr64e/m24lr64e.c index 925bfeb5..f464e8a0 100644 --- a/src/m24lr64e/m24lr64e.c +++ b/src/m24lr64e/m24lr64e.c @@ -48,6 +48,14 @@ upm_result_t m24lr64e_eeprom_write_bytes(m24lr64e_context dev, uint8_t* data, int len); m24lr64e_context m24lr64e_init(int bus, m24lr64e_access_mode mode){ + // make sure MRAA is initialized + int mraa_rv; + if ((mraa_rv = mraa_init()) != MRAA_SUCCESS) + { + printf("%s: mraa_init() failed (%d).\n", __FUNCTION__, mraa_rv); + return NULL; + } + m24lr64e_context dev = (m24lr64e_context)malloc(sizeof(struct _m24lr64e_context)); diff --git a/src/mma7361/mma7361.c b/src/mma7361/mma7361.c index caf170da..79023d1a 100644 --- a/src/mma7361/mma7361.c +++ b/src/mma7361/mma7361.c @@ -53,6 +53,14 @@ mma7361_context mma7361_init(int x_pin, int y_pin, int z_pin, return NULL; } + // make sure MRAA is initialized + int mraa_rv; + if ((mraa_rv = mraa_init()) != MRAA_SUCCESS) + { + printf("%s: mraa_init() failed (%d).\n", __FUNCTION__, mraa_rv); + return NULL; + } + mma7361_context dev = (mma7361_context)malloc(sizeof(struct _mma7361_context)); diff --git a/src/moisture/moisture.c b/src/moisture/moisture.c index b56c734b..c401aed8 100644 --- a/src/moisture/moisture.c +++ b/src/moisture/moisture.c @@ -26,6 +26,14 @@ #include "moisture.h" moisture_context moisture_init(int pin) { + // make sure MRAA is initialized + int mraa_rv; + if ((mraa_rv = mraa_init()) != MRAA_SUCCESS) + { + printf("%s: mraa_init() failed (%d).\n", __FUNCTION__, mraa_rv); + return NULL; + } + moisture_context dev = (moisture_context) malloc(sizeof(struct _moisture_context)); diff --git a/src/mpr121/mpr121.c b/src/mpr121/mpr121.c index 1e0e6a77..726aa61a 100644 --- a/src/mpr121/mpr121.c +++ b/src/mpr121/mpr121.c @@ -25,7 +25,15 @@ #include "mpr121.h" -mpr121_context mpr121_init(int bus, uint8_t address){ +mpr121_context mpr121_init(int bus, uint8_t address) { + // make sure MRAA is initialized + int mraa_rv; + if ((mraa_rv = mraa_init()) != MRAA_SUCCESS) + { + printf("%s: mraa_init() failed (%d).\n", __FUNCTION__, mraa_rv); + return NULL; + } + mpr121_context dev = (mpr121_context)malloc(sizeof(struct _mpr121_context)); if (!dev) diff --git a/src/mq303a/mq303a.c b/src/mq303a/mq303a.c index 512db2b9..604b1cda 100644 --- a/src/mq303a/mq303a.c +++ b/src/mq303a/mq303a.c @@ -25,7 +25,15 @@ #include "mq303a.h" -mq303a_context mq303a_init(int pin, int heater_pin){ +mq303a_context mq303a_init(int pin, int heater_pin) { + // make sure MRAA is initialized + int mraa_rv; + if ((mraa_rv = mraa_init()) != MRAA_SUCCESS) + { + printf("%s: mraa_init() failed (%d).\n", __FUNCTION__, mraa_rv); + return NULL; + } + mq303a_context dev = (mq303a_context)malloc(sizeof(struct _mq303a_context)); diff --git a/src/nmea_gps/nmea_gps.c b/src/nmea_gps/nmea_gps.c index 03a8b2c6..53840884 100644 --- a/src/nmea_gps/nmea_gps.c +++ b/src/nmea_gps/nmea_gps.c @@ -71,6 +71,14 @@ static int readRegs(const nmea_gps_context dev, uint8_t reg, nmea_gps_context nmea_gps_init(unsigned int uart, unsigned int baudrate, int enable_pin) { + // make sure MRAA is initialized + int mraa_rv; + if ((mraa_rv = mraa_init()) != MRAA_SUCCESS) + { + printf("%s: mraa_init() failed (%d).\n", __FUNCTION__, mraa_rv); + return NULL; + } + nmea_gps_context dev = (nmea_gps_context)malloc(sizeof(struct _nmea_gps_context)); @@ -207,7 +215,8 @@ int nmea_gps_read(const nmea_gps_context dev, char *buffer, size_t len) if (dev->i2c) { int rv; - if ((rv = readRegs(dev, UBLOX6_I2C_BYTE_STREAM, buffer, len)) < 0) + if ((rv = readRegs(dev, UBLOX6_I2C_BYTE_STREAM, (uint8_t *)buffer, + len)) < 0) return rv; // now we need to go through the bytes returned, and stop diff --git a/src/o2/o2.c b/src/o2/o2.c index 06c53977..9cb80365 100644 --- a/src/o2/o2.c +++ b/src/o2/o2.c @@ -28,6 +28,14 @@ #include "o2.h" o2_context o2_init(int16_t pin) { + // make sure MRAA is initialized + int mraa_rv; + if ((mraa_rv = mraa_init()) != MRAA_SUCCESS) + { + printf("%s: mraa_init() failed (%d).\n", __FUNCTION__, mraa_rv); + return NULL; + } + o2_context dev = (o2_context)malloc(sizeof(struct _o2_context)); if(dev == NULL) return NULL; diff --git a/src/servo/es08a.c b/src/servo/es08a.c index aa7256fc..f62fbdca 100644 --- a/src/servo/es08a.c +++ b/src/servo/es08a.c @@ -25,7 +25,15 @@ #include "es08a.h" es08a_context es08a_init(int32_t pin, int32_t min_pulse_width, - int32_t max_pulse_width){ + int32_t max_pulse_width) { + // make sure MRAA is initialized + int mraa_rv; + if ((mraa_rv = mraa_init()) != MRAA_SUCCESS) + { + printf("%s: mraa_init() failed (%d).\n", __FUNCTION__, mraa_rv); + return NULL; + } + es08a_context dev = (es08a_context) malloc(sizeof(struct _es08a_context)); if(dev == NULL){ @@ -104,4 +112,4 @@ int es08a_get_min_pulse_width (es08a_context dev){ int es08a_get_max_pulse_width (es08a_context dev){ return dev->max_pulse_width; -} \ No newline at end of file +} diff --git a/src/servo/es9257.c b/src/servo/es9257.c index d5fe0d7a..ca59c3be 100644 --- a/src/servo/es9257.c +++ b/src/servo/es9257.c @@ -25,7 +25,16 @@ #include "es9257.h" es9257_context es9257_init(int32_t pin, int32_t min_pulse_width, - int32_t max_pulse_width){ + int32_t max_pulse_width) { + + // make sure MRAA is initialized + int mraa_rv; + if ((mraa_rv = mraa_init()) != MRAA_SUCCESS) + { + printf("%s: mraa_init() failed (%d).\n", __FUNCTION__, mraa_rv); + return NULL; + } + es9257_context dev = (es9257_context) malloc(sizeof(struct _es9257_context)); if(dev == NULL){ diff --git a/src/sht1x/sht1x.c b/src/sht1x/sht1x.c index 83ebb45a..945e9902 100644 --- a/src/sht1x/sht1x.c +++ b/src/sht1x/sht1x.c @@ -30,6 +30,14 @@ sht1x_context sht1x_init(unsigned int clk_pin, unsigned int data_pin) { + // make sure MRAA is initialized + int mraa_rv; + if ((mraa_rv = mraa_init()) != MRAA_SUCCESS) + { + printf("%s: mraa_init() failed (%d).\n", __FUNCTION__, mraa_rv); + return NULL; + } + sht1x_context dev = (sht1x_context)malloc(sizeof(struct _sht1x_context)); diff --git a/src/slide/slide.c b/src/slide/slide.c index 9536f3d5..332acd55 100644 --- a/src/slide/slide.c +++ b/src/slide/slide.c @@ -29,6 +29,14 @@ slide_context slide_init(int16_t pin) { + // make sure MRAA is initialized + int mraa_rv; + if ((mraa_rv = mraa_init()) != MRAA_SUCCESS) + { + printf("%s: mraa_init() failed (%d).\n", __FUNCTION__, mraa_rv); + return NULL; + } + slide_context dev = (slide_context) malloc(sizeof(struct _slide_context)); if (dev == NULL) diff --git a/src/tsl2561/tsl2561.c b/src/tsl2561/tsl2561.c index 75e48494..f596122f 100644 --- a/src/tsl2561/tsl2561.c +++ b/src/tsl2561/tsl2561.c @@ -34,6 +34,14 @@ upm_result_t tsl2561_compute_lux(const tsl2561_context dev, int *int_data); tsl2561_context tsl2561_init(int bus, uint8_t dev_address, uint8_t gain, uint8_t integration_time){ + // make sure MRAA is initialized + int mraa_rv; + if ((mraa_rv = mraa_init()) != MRAA_SUCCESS) + { + printf("%s: mraa_init() failed (%d).\n", __FUNCTION__, mraa_rv); + return NULL; + } + tsl2561_context dev = (tsl2561_context)malloc(sizeof(struct _tsl2561_context)); diff --git a/src/ttp223/ttp223.c b/src/ttp223/ttp223.c index b724fa08..bc59b196 100644 --- a/src/ttp223/ttp223.c +++ b/src/ttp223/ttp223.c @@ -25,7 +25,15 @@ #include "ttp223.h" -ttp223_context ttp223_init(int pin){ +ttp223_context ttp223_init(int pin) { + // make sure MRAA is initialized + int mraa_rv; + if ((mraa_rv = mraa_init()) != MRAA_SUCCESS) + { + printf("%s: mraa_init() failed (%d).\n", __FUNCTION__, mraa_rv); + return NULL; + } + ttp223_context dev = (ttp223_context) malloc(sizeof(struct _ttp223_context)); diff --git a/src/urm37/urm37.c b/src/urm37/urm37.c index f468d0c2..48dd05fa 100644 --- a/src/urm37/urm37.c +++ b/src/urm37/urm37.c @@ -40,6 +40,13 @@ urm37_context urm37_init(uint8_t a_pin, uint8_t reset_pin, uint8_t trigger_pin, float a_ref, uint8_t uart_bus, bool analog_mode) { + // make sure MRAA is initialized + int mraa_rv; + if ((mraa_rv = mraa_init()) != MRAA_SUCCESS) + { + printf("%s: mraa_init() failed (%d).\n", __FUNCTION__, mraa_rv); + return NULL; + } urm37_context dev = (urm37_context)malloc(sizeof(struct _urm37_context)); diff --git a/src/vdiv/vdiv.c b/src/vdiv/vdiv.c index fe05cc77..c929eafd 100644 --- a/src/vdiv/vdiv.c +++ b/src/vdiv/vdiv.c @@ -29,6 +29,14 @@ vdiv_context vdiv_init(int16_t pin, float voltage_ref) { + // make sure MRAA is initialized + int mraa_rv; + if ((mraa_rv = mraa_init()) != MRAA_SUCCESS) + { + printf("%s: mraa_init() failed (%d).\n", __FUNCTION__, mraa_rv); + return NULL; + } + vdiv_context dev = (vdiv_context)malloc(sizeof(struct _vdiv_context)); if (dev == NULL) return NULL;