diff --git a/docs/max31855.md b/docs/max31855.md index 7405989e..7a6a22b4 100644 --- a/docs/max31855.md +++ b/docs/max31855.md @@ -13,7 +13,7 @@ This is a spi module so we will use the mraa spi functions to build our module. First thing to do is to create a tree structure like this in upm/src/max31855: * max31855.cxx -* max31855.h +* max31855.hpp * jsupm_max31855.i * pyupm_max31855.i * CMakeLists.txt @@ -36,11 +36,11 @@ used swig wrappers for UPM sensors, it's not obligatory but recommended. ### API -Then we create the header (max31855.h) , a very simple header in our case we +Then we create the header (max31855.hpp) , a very simple header in our case we will have only a very basic api. We provide a getTemp() function which will return the same type as in the arduino library, a double. -@snippet max31855.h Interesting +@snippet max31855.hpp Interesting Note that the header contains both the io that we will use, the gpio is in this case used as the chip select pin. diff --git a/examples/c++/a110x-intr.cxx b/examples/c++/a110x-intr.cxx index 187c2edb..93b2a492 100644 --- a/examples/c++/a110x-intr.cxx +++ b/examples/c++/a110x-intr.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "a110x.h" +#include "a110x.hpp" using namespace std; diff --git a/examples/c++/a110x.cxx b/examples/c++/a110x.cxx index 30c355d1..0344ac36 100644 --- a/examples/c++/a110x.cxx +++ b/examples/c++/a110x.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "a110x.h" +#include "a110x.hpp" using namespace std; diff --git a/examples/c++/ad8232.cxx b/examples/c++/ad8232.cxx index 5d035275..c07094bd 100644 --- a/examples/c++/ad8232.cxx +++ b/examples/c++/ad8232.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "ad8232.h" +#include "ad8232.hpp" using namespace std; diff --git a/examples/c++/adafruitms1438-stepper.cxx b/examples/c++/adafruitms1438-stepper.cxx index 1bcf75b0..41a5f88a 100644 --- a/examples/c++/adafruitms1438-stepper.cxx +++ b/examples/c++/adafruitms1438-stepper.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "adafruitms1438.h" +#include "adafruitms1438.hpp" using namespace std; using namespace upm; diff --git a/examples/c++/adafruitms1438.cxx b/examples/c++/adafruitms1438.cxx index 8ca184cb..1a94e17f 100644 --- a/examples/c++/adafruitms1438.cxx +++ b/examples/c++/adafruitms1438.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "adafruitms1438.h" +#include "adafruitms1438.hpp" using namespace std; using namespace upm; diff --git a/examples/c++/adafruitss.cxx b/examples/c++/adafruitss.cxx index f2a7ebf6..7e9f68d4 100644 --- a/examples/c++/adafruitss.cxx +++ b/examples/c++/adafruitss.cxx @@ -33,7 +33,7 @@ */ #include -#include "adafruitss.h" +#include "adafruitss.hpp" #include using namespace std; diff --git a/examples/c++/adc-sensor.cxx b/examples/c++/adc-sensor.cxx index 1ebe7cb1..b367086c 100644 --- a/examples/c++/adc-sensor.cxx +++ b/examples/c++/adc-sensor.cxx @@ -24,7 +24,7 @@ #include #include -#include "ads1015.h" +#include "ads1015.hpp" #include "mraa/gpio.hpp" #define EDISON_I2C_BUS 1 diff --git a/examples/c++/adc121c021.cxx b/examples/c++/adc121c021.cxx index 18288adf..7a86c18d 100644 --- a/examples/c++/adc121c021.cxx +++ b/examples/c++/adc121c021.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "adc121c021.h" +#include "adc121c021.hpp" using namespace std; diff --git a/examples/c++/ads1x15.cxx b/examples/c++/ads1x15.cxx index e951d525..d4196cde 100644 --- a/examples/c++/ads1x15.cxx +++ b/examples/c++/ads1x15.cxx @@ -26,8 +26,8 @@ #include #include -#include "ads1015.h" -#include "ads1115.h" +#include "ads1015.hpp" +#include "ads1115.hpp" diff --git a/examples/c++/adxl335.cxx b/examples/c++/adxl335.cxx index 471695d6..8152012a 100644 --- a/examples/c++/adxl335.cxx +++ b/examples/c++/adxl335.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "adxl335.h" +#include "adxl335.hpp" using namespace std; diff --git a/examples/c++/adxl345.cxx b/examples/c++/adxl345.cxx index a5bc2cc5..851bc770 100644 --- a/examples/c++/adxl345.cxx +++ b/examples/c++/adxl345.cxx @@ -23,7 +23,7 @@ */ #include -#include "adxl345.h" +#include "adxl345.hpp" int main(int argc, char **argv) diff --git a/examples/c++/adxrs610.cxx b/examples/c++/adxrs610.cxx index 4ec53eff..f24ccd5d 100644 --- a/examples/c++/adxrs610.cxx +++ b/examples/c++/adxrs610.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "adxrs610.h" +#include "adxrs610.hpp" using namespace std; diff --git a/examples/c++/ak8975.cxx b/examples/c++/ak8975.cxx index 1b95eadf..c2f8607f 100644 --- a/examples/c++/ak8975.cxx +++ b/examples/c++/ak8975.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "mpu9150.h" +#include "mpu9150.hpp" using namespace std; diff --git a/examples/c++/am2315.cxx b/examples/c++/am2315.cxx index 4b95e1c7..56f27ccc 100644 --- a/examples/c++/am2315.cxx +++ b/examples/c++/am2315.cxx @@ -26,7 +26,7 @@ #include #include -#include "am2315.h" +#include "am2315.hpp" volatile int doWork = 0; diff --git a/examples/c++/apds9002.cxx b/examples/c++/apds9002.cxx index 87b50709..345f53ab 100644 --- a/examples/c++/apds9002.cxx +++ b/examples/c++/apds9002.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "apds9002.h" +#include "apds9002.hpp" using namespace std; diff --git a/examples/c++/apds9930.cxx b/examples/c++/apds9930.cxx index 8d461c90..6da24a96 100644 --- a/examples/c++/apds9930.cxx +++ b/examples/c++/apds9930.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "apds9930.h" +#include "apds9930.hpp" using namespace std; diff --git a/examples/c++/at42qt1070.cxx b/examples/c++/at42qt1070.cxx index c22a9980..b1986491 100644 --- a/examples/c++/at42qt1070.cxx +++ b/examples/c++/at42qt1070.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "at42qt1070.h" +#include "at42qt1070.hpp" using namespace std; diff --git a/examples/c++/biss0001.cxx b/examples/c++/biss0001.cxx index 1574c2fd..2468804b 100644 --- a/examples/c++/biss0001.cxx +++ b/examples/c++/biss0001.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "biss0001.h" +#include "biss0001.hpp" using namespace std; diff --git a/examples/c++/bma220.cxx b/examples/c++/bma220.cxx index a41b81ad..9701510b 100644 --- a/examples/c++/bma220.cxx +++ b/examples/c++/bma220.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "bma220.h" +#include "bma220.hpp" using namespace std; diff --git a/examples/c++/bme280.cxx b/examples/c++/bme280.cxx index 1767527c..e28915bb 100644 --- a/examples/c++/bme280.cxx +++ b/examples/c++/bme280.cxx @@ -24,7 +24,7 @@ #include #include -#include "bme280.h" +#include "bme280.hpp" #define FT4222_I2C_BUS 0 diff --git a/examples/c++/bmi160.cxx b/examples/c++/bmi160.cxx index 10e707c4..6f98556c 100644 --- a/examples/c++/bmi160.cxx +++ b/examples/c++/bmi160.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "bmi160.h" +#include "bmi160.hpp" using namespace std; diff --git a/examples/c++/bmpx8x.cxx b/examples/c++/bmpx8x.cxx index 28e5be88..f4ebf7de 100644 --- a/examples/c++/bmpx8x.cxx +++ b/examples/c++/bmpx8x.cxx @@ -24,7 +24,7 @@ #include #include -#include "bmpx8x.h" +#include "bmpx8x.hpp" #include int doWork = 0; diff --git a/examples/c++/buzzer-sound.cxx b/examples/c++/buzzer-sound.cxx index 1d377bac..604904a6 100644 --- a/examples/c++/buzzer-sound.cxx +++ b/examples/c++/buzzer-sound.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "buzzer.h" +#include "buzzer.hpp" int diff --git a/examples/c++/cjq4435.cxx b/examples/c++/cjq4435.cxx index f9d84d43..79d34951 100644 --- a/examples/c++/cjq4435.cxx +++ b/examples/c++/cjq4435.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "cjq4435.h" +#include "cjq4435.hpp" using namespace std; diff --git a/examples/c++/co2-sensor.cxx b/examples/c++/co2-sensor.cxx index 978e6c00..da978ad7 100644 --- a/examples/c++/co2-sensor.cxx +++ b/examples/c++/co2-sensor.cxx @@ -24,7 +24,7 @@ #include #include -#include "t6713.h" +#include "t6713.hpp" #define EDISON_I2C_BUS 1 #define FT4222_I2C_BUS 0 diff --git a/examples/c++/cwlsxxa.cxx b/examples/c++/cwlsxxa.cxx index 0315f0b9..b96c85e9 100644 --- a/examples/c++/cwlsxxa.cxx +++ b/examples/c++/cwlsxxa.cxx @@ -26,7 +26,7 @@ #include #include -#include "cwlsxxa.h" +#include "cwlsxxa.hpp" using namespace std; diff --git a/examples/c++/dfrph.cxx b/examples/c++/dfrph.cxx index 601fdbf6..22d3db51 100644 --- a/examples/c++/dfrph.cxx +++ b/examples/c++/dfrph.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "dfrph.h" +#include "dfrph.hpp" using namespace std; diff --git a/examples/c++/ds1307.cxx b/examples/c++/ds1307.cxx index 44a0b089..0cb0793e 100644 --- a/examples/c++/ds1307.cxx +++ b/examples/c++/ds1307.cxx @@ -24,7 +24,7 @@ #include #include -#include "ds1307.h" +#include "ds1307.hpp" using namespace std; diff --git a/examples/c++/ds1808lc.cxx b/examples/c++/ds1808lc.cxx index d2267ff8..7326cea1 100644 --- a/examples/c++/ds1808lc.cxx +++ b/examples/c++/ds1808lc.cxx @@ -3,7 +3,7 @@ #include #include #include -#include "ds1808lc.h" +#include "ds1808lc.hpp" #define EDISON_I2C_BUS 1 // Edison I2C-1 #define DS1808_GPIO_PWR 15 // Edison GP165 diff --git a/examples/c++/e50hx.cxx b/examples/c++/e50hx.cxx index b2034f89..b682fb48 100644 --- a/examples/c++/e50hx.cxx +++ b/examples/c++/e50hx.cxx @@ -26,7 +26,7 @@ #include #include -#include "e50hx.h" +#include "e50hx.hpp" using namespace std; using namespace upm; diff --git a/examples/c++/eboled.cxx b/examples/c++/eboled.cxx index c1c281ca..08325373 100644 --- a/examples/c++/eboled.cxx +++ b/examples/c++/eboled.cxx @@ -23,7 +23,7 @@ */ #include -#include "eboled.h" +#include "eboled.hpp" using namespace std; diff --git a/examples/c++/ecs1030.cxx b/examples/c++/ecs1030.cxx index 40a7dc5e..ff87279a 100644 --- a/examples/c++/ecs1030.cxx +++ b/examples/c++/ecs1030.cxx @@ -26,7 +26,7 @@ #include #include #include -#include "ecs1030.h" +#include "ecs1030.hpp" int is_running = 0; upm::ECS1030 *sensor = NULL; diff --git a/examples/c++/enc03r.cxx b/examples/c++/enc03r.cxx index da0db9b7..298d7cd8 100644 --- a/examples/c++/enc03r.cxx +++ b/examples/c++/enc03r.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "enc03r.h" +#include "enc03r.hpp" using namespace std; diff --git a/examples/c++/es08a.cxx b/examples/c++/es08a.cxx index 3f7e5c46..c4800128 100644 --- a/examples/c++/es08a.cxx +++ b/examples/c++/es08a.cxx @@ -24,7 +24,7 @@ #include #include -#include "es08a.h" +#include "es08a.hpp" #include #include diff --git a/examples/c++/flex.cxx b/examples/c++/flex.cxx index 54773389..26cdcdd2 100644 --- a/examples/c++/flex.cxx +++ b/examples/c++/flex.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "flex.h" +#include "flex.hpp" using namespace std; diff --git a/examples/c++/gp2y0a.cxx b/examples/c++/gp2y0a.cxx index 0111b179..1a6114b9 100644 --- a/examples/c++/gp2y0a.cxx +++ b/examples/c++/gp2y0a.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "gp2y0a.h" +#include "gp2y0a.hpp" using namespace std; diff --git a/examples/c++/grovebutton.cxx b/examples/c++/grovebutton.cxx index 7d2d69a9..3534d16f 100644 --- a/examples/c++/grovebutton.cxx +++ b/examples/c++/grovebutton.cxx @@ -24,7 +24,7 @@ #include #include -#include "grove.h" +#include "grove.hpp" int main(int argc, char **argv) diff --git a/examples/c++/grovecircularled.cxx b/examples/c++/grovecircularled.cxx index 066e017b..54af0cf8 100644 --- a/examples/c++/grovecircularled.cxx +++ b/examples/c++/grovecircularled.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "grovecircularled.h" +#include "grovecircularled.hpp" using namespace std; diff --git a/examples/c++/grovecollision.cxx b/examples/c++/grovecollision.cxx index 2de76096..e7ad0f8d 100644 --- a/examples/c++/grovecollision.cxx +++ b/examples/c++/grovecollision.cxx @@ -24,7 +24,7 @@ #include #include #include -#include "grovecollision.h" +#include "grovecollision.hpp" using namespace std; diff --git a/examples/c++/groveehr.cxx b/examples/c++/groveehr.cxx index b056a156..73775606 100644 --- a/examples/c++/groveehr.cxx +++ b/examples/c++/groveehr.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "groveehr.h" +#include "groveehr.hpp" using namespace std; diff --git a/examples/c++/groveeldriver.cxx b/examples/c++/groveeldriver.cxx index 126eaaf2..9c1d561d 100644 --- a/examples/c++/groveeldriver.cxx +++ b/examples/c++/groveeldriver.cxx @@ -24,7 +24,7 @@ #include #include #include -#include "groveeldriver.h" +#include "groveeldriver.hpp" using namespace std; diff --git a/examples/c++/groveelectromagnet.cxx b/examples/c++/groveelectromagnet.cxx index 386f4def..bbd4d33e 100644 --- a/examples/c++/groveelectromagnet.cxx +++ b/examples/c++/groveelectromagnet.cxx @@ -24,7 +24,7 @@ #include #include #include -#include "groveelectromagnet.h" +#include "groveelectromagnet.hpp" using namespace std; diff --git a/examples/c++/groveemg.cxx b/examples/c++/groveemg.cxx index d06295a9..3a049dd3 100644 --- a/examples/c++/groveemg.cxx +++ b/examples/c++/groveemg.cxx @@ -24,7 +24,7 @@ #include #include #include -#include "groveemg.h" +#include "groveemg.hpp" using namespace std; diff --git a/examples/c++/grovegprs.cxx b/examples/c++/grovegprs.cxx index bc0e3d9f..f882cba7 100644 --- a/examples/c++/grovegprs.cxx +++ b/examples/c++/grovegprs.cxx @@ -26,7 +26,7 @@ #include #include #include -#include "grovegprs.h" +#include "grovegprs.hpp" using namespace std; using namespace upm; diff --git a/examples/c++/grovegsr.cxx b/examples/c++/grovegsr.cxx index 549e7758..6068e791 100644 --- a/examples/c++/grovegsr.cxx +++ b/examples/c++/grovegsr.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "grovegsr.h" +#include "grovegsr.hpp" using namespace std; diff --git a/examples/c++/groveled-multi.cxx b/examples/c++/groveled-multi.cxx index 16a6eba1..1a6f8eb7 100644 --- a/examples/c++/groveled-multi.cxx +++ b/examples/c++/groveled-multi.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "grove.h" +#include "grove.hpp" using namespace std; diff --git a/examples/c++/groveled.cxx b/examples/c++/groveled.cxx index 52d5e849..8f7e752d 100644 --- a/examples/c++/groveled.cxx +++ b/examples/c++/groveled.cxx @@ -25,7 +25,7 @@ #include #include -#include "grove.h" +#include "grove.hpp" int main(int argc, char **argv) diff --git a/examples/c++/groveledbar.cxx b/examples/c++/groveledbar.cxx index d86110c5..bc511838 100644 --- a/examples/c++/groveledbar.cxx +++ b/examples/c++/groveledbar.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "groveledbar.h" +#include "groveledbar.hpp" using namespace std; diff --git a/examples/c++/grovelight.cxx b/examples/c++/grovelight.cxx index 64760c97..18f8f6c0 100644 --- a/examples/c++/grovelight.cxx +++ b/examples/c++/grovelight.cxx @@ -25,7 +25,7 @@ #include #include -#include "grove.h" +#include "grove.hpp" int main(int argc, char **argv) diff --git a/examples/c++/grovelinefinder.cxx b/examples/c++/grovelinefinder.cxx index a8290c53..53b1e6e2 100644 --- a/examples/c++/grovelinefinder.cxx +++ b/examples/c++/grovelinefinder.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "grovelinefinder.h" +#include "grovelinefinder.hpp" using namespace std; diff --git a/examples/c++/grovemd-stepper.cxx b/examples/c++/grovemd-stepper.cxx index f65c5e42..ce189d2a 100644 --- a/examples/c++/grovemd-stepper.cxx +++ b/examples/c++/grovemd-stepper.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "grovemd.h" +#include "grovemd.hpp" using namespace std; diff --git a/examples/c++/grovemd.cxx b/examples/c++/grovemd.cxx index a5c1015e..87c3616c 100644 --- a/examples/c++/grovemd.cxx +++ b/examples/c++/grovemd.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "grovemd.h" +#include "grovemd.hpp" using namespace std; diff --git a/examples/c++/grovemoisture.cxx b/examples/c++/grovemoisture.cxx index 1fee54cf..f63a088d 100644 --- a/examples/c++/grovemoisture.cxx +++ b/examples/c++/grovemoisture.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "grovemoisture.h" +#include "grovemoisture.hpp" using namespace std; diff --git a/examples/c++/groveo2.cxx b/examples/c++/groveo2.cxx index cc1b2402..79741b52 100644 --- a/examples/c++/groveo2.cxx +++ b/examples/c++/groveo2.cxx @@ -24,7 +24,7 @@ #include #include #include -#include "groveo2.h" +#include "groveo2.hpp" using namespace std; diff --git a/examples/c++/groverelay.cxx b/examples/c++/groverelay.cxx index 4366dd66..92971399 100644 --- a/examples/c++/groverelay.cxx +++ b/examples/c++/groverelay.cxx @@ -24,7 +24,7 @@ #include #include -#include "grove.h" +#include "grove.hpp" int main(int argc, char **argv) diff --git a/examples/c++/groverotary.cxx b/examples/c++/groverotary.cxx index 41392426..aa2ee57f 100644 --- a/examples/c++/groverotary.cxx +++ b/examples/c++/groverotary.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "grove.h" +#include "grove.hpp" using namespace std; diff --git a/examples/c++/grovescam.cxx b/examples/c++/grovescam.cxx index 6edd85d7..6592b33e 100644 --- a/examples/c++/grovescam.cxx +++ b/examples/c++/grovescam.cxx @@ -26,7 +26,7 @@ #include #include #include -#include "grovescam.h" +#include "grovescam.hpp" using namespace std; using namespace upm; diff --git a/examples/c++/groveslide.cxx b/examples/c++/groveslide.cxx index 42e975a9..04b8bb4e 100644 --- a/examples/c++/groveslide.cxx +++ b/examples/c++/groveslide.cxx @@ -26,7 +26,7 @@ #include #include #include -#include "grove.h" +#include "grove.hpp" using namespace std; diff --git a/examples/c++/grovespeaker.cxx b/examples/c++/grovespeaker.cxx index 97d65183..4e139e5b 100644 --- a/examples/c++/grovespeaker.cxx +++ b/examples/c++/grovespeaker.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "grovespeaker.h" +#include "grovespeaker.hpp" using namespace std; diff --git a/examples/c++/grovetemp.cxx b/examples/c++/grovetemp.cxx index 73de9c7f..2a21bc15 100644 --- a/examples/c++/grovetemp.cxx +++ b/examples/c++/grovetemp.cxx @@ -26,7 +26,7 @@ #include #include #include -#include "grove.h" +#include "grove.hpp" int main(int argc, char **argv) diff --git a/examples/c++/grovevdiv.cxx b/examples/c++/grovevdiv.cxx index 40be66c0..0f903338 100644 --- a/examples/c++/grovevdiv.cxx +++ b/examples/c++/grovevdiv.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "grovevdiv.h" +#include "grovevdiv.hpp" using namespace std; diff --git a/examples/c++/grovewater.cxx b/examples/c++/grovewater.cxx index 51bfacbf..e13f8e7d 100644 --- a/examples/c++/grovewater.cxx +++ b/examples/c++/grovewater.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "grovewater.h" +#include "grovewater.hpp" using namespace std; diff --git a/examples/c++/grovewfs.cxx b/examples/c++/grovewfs.cxx index ea819ae7..b92ff17f 100644 --- a/examples/c++/grovewfs.cxx +++ b/examples/c++/grovewfs.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "grovewfs.h" +#include "grovewfs.hpp" using namespace std; diff --git a/examples/c++/guvas12d.cxx b/examples/c++/guvas12d.cxx index 3351741c..a0aa7403 100644 --- a/examples/c++/guvas12d.cxx +++ b/examples/c++/guvas12d.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "guvas12d.h" +#include "guvas12d.hpp" using namespace std; diff --git a/examples/c++/h3lis331dl.cxx b/examples/c++/h3lis331dl.cxx index d4a04ca0..714d29b4 100644 --- a/examples/c++/h3lis331dl.cxx +++ b/examples/c++/h3lis331dl.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "h3lis331dl.h" +#include "h3lis331dl.hpp" using namespace std; using namespace upm; diff --git a/examples/c++/h803x.cxx b/examples/c++/h803x.cxx index cd935012..4416439e 100644 --- a/examples/c++/h803x.cxx +++ b/examples/c++/h803x.cxx @@ -26,7 +26,7 @@ #include #include -#include "h803x.h" +#include "h803x.hpp" using namespace std; diff --git a/examples/c++/hcsr04.cxx b/examples/c++/hcsr04.cxx index c0a27254..472c293f 100644 --- a/examples/c++/hcsr04.cxx +++ b/examples/c++/hcsr04.cxx @@ -24,7 +24,7 @@ #include #include -#include "hcsr04.h" +#include "hcsr04.hpp" #include #include #include diff --git a/examples/c++/hdxxvxta.cxx b/examples/c++/hdxxvxta.cxx index 2a555f3d..c2583556 100644 --- a/examples/c++/hdxxvxta.cxx +++ b/examples/c++/hdxxvxta.cxx @@ -26,7 +26,7 @@ #include #include -#include "hdxxvxta.h" +#include "hdxxvxta.hpp" using namespace std; diff --git a/examples/c++/hlg150h.cxx b/examples/c++/hlg150h.cxx index 1e281945..43b123cb 100644 --- a/examples/c++/hlg150h.cxx +++ b/examples/c++/hlg150h.cxx @@ -3,7 +3,7 @@ #include #include #include -#include "hlg150h.h" +#include "hlg150h.hpp" #define HLG150H_GPIO_RELAY 21 #define HLG150H_GPIO_PWM 22 diff --git a/examples/c++/hm11.cxx b/examples/c++/hm11.cxx index e7598047..61b25e5b 100644 --- a/examples/c++/hm11.cxx +++ b/examples/c++/hm11.cxx @@ -26,7 +26,7 @@ #include #include #include -#include "hm11.h" +#include "hm11.hpp" using namespace std; using namespace upm; diff --git a/examples/c++/hmc5883l.cxx b/examples/c++/hmc5883l.cxx index dec08ce4..7dbf700b 100644 --- a/examples/c++/hmc5883l.cxx +++ b/examples/c++/hmc5883l.cxx @@ -24,7 +24,7 @@ */ #include -#include "hmc5883l.h" +#include "hmc5883l.hpp" int main(int argc, char **argv) diff --git a/examples/c++/hmtrp.cxx b/examples/c++/hmtrp.cxx index 3de0671d..f711dd53 100644 --- a/examples/c++/hmtrp.cxx +++ b/examples/c++/hmtrp.cxx @@ -26,7 +26,7 @@ #include #include #include -#include "hmtrp.h" +#include "hmtrp.hpp" using namespace std; diff --git a/examples/c++/hp20x.cxx b/examples/c++/hp20x.cxx index 119a449d..ff7dd275 100644 --- a/examples/c++/hp20x.cxx +++ b/examples/c++/hp20x.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "hp20x.h" +#include "hp20x.hpp" using namespace std; using namespace upm; diff --git a/examples/c++/ht9170.cxx b/examples/c++/ht9170.cxx index 1be72b63..299c82ce 100644 --- a/examples/c++/ht9170.cxx +++ b/examples/c++/ht9170.cxx @@ -26,7 +26,7 @@ #include #include -#include "ht9170.h" +#include "ht9170.hpp" using namespace std; diff --git a/examples/c++/htu21d.cxx b/examples/c++/htu21d.cxx index 63d6fdf6..31cec0f9 100644 --- a/examples/c++/htu21d.cxx +++ b/examples/c++/htu21d.cxx @@ -26,7 +26,7 @@ #include #include -#include "htu21d.h" +#include "htu21d.hpp" volatile int doWork = 0; diff --git a/examples/c++/humidity-sensor.cxx b/examples/c++/humidity-sensor.cxx index 241901d8..f3e1613a 100644 --- a/examples/c++/humidity-sensor.cxx +++ b/examples/c++/humidity-sensor.cxx @@ -24,8 +24,8 @@ #include #include -#include "si7005.h" -#include "bme280.h" +#include "si7005.hpp" +#include "bme280.hpp" #define EDISON_I2C_BUS 1 #define FT4222_I2C_BUS 0 diff --git a/examples/c++/hwxpxx.cxx b/examples/c++/hwxpxx.cxx index 1cfdf543..c9d92bf2 100644 --- a/examples/c++/hwxpxx.cxx +++ b/examples/c++/hwxpxx.cxx @@ -26,7 +26,7 @@ #include #include -#include "hwxpxx.h" +#include "hwxpxx.hpp" using namespace std; diff --git a/examples/c++/hx711.cxx b/examples/c++/hx711.cxx index 531734b2..e894ad83 100644 --- a/examples/c++/hx711.cxx +++ b/examples/c++/hx711.cxx @@ -26,7 +26,7 @@ #include //! [Interesting] -#include "hx711.h" +#include "hx711.hpp" int main(int argc, char **argv) diff --git a/examples/c++/ina132.cxx b/examples/c++/ina132.cxx index 0c78630e..7bc6457e 100644 --- a/examples/c++/ina132.cxx +++ b/examples/c++/ina132.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "ina132.h" +#include "ina132.hpp" using namespace std; diff --git a/examples/c++/isd1820.cxx b/examples/c++/isd1820.cxx index 3246808a..75d77989 100644 --- a/examples/c++/isd1820.cxx +++ b/examples/c++/isd1820.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "isd1820.h" +#include "isd1820.hpp" using namespace std; diff --git a/examples/c++/itg3200.cxx b/examples/c++/itg3200.cxx index a1bf8aff..a313cb64 100644 --- a/examples/c++/itg3200.cxx +++ b/examples/c++/itg3200.cxx @@ -23,7 +23,7 @@ */ #include -#include "itg3200.h" +#include "itg3200.hpp" int main(int argc, char **argv) diff --git a/examples/c++/jhd1313m1-lcd.cxx b/examples/c++/jhd1313m1-lcd.cxx index ca2f1558..8e7ea037 100644 --- a/examples/c++/jhd1313m1-lcd.cxx +++ b/examples/c++/jhd1313m1-lcd.cxx @@ -22,7 +22,7 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "jhd1313m1.h" +#include "jhd1313m1.hpp" int main(int argc, char **argv) diff --git a/examples/c++/joystick12.cxx b/examples/c++/joystick12.cxx index 408ca2ad..9e9013bc 100644 --- a/examples/c++/joystick12.cxx +++ b/examples/c++/joystick12.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "joystick12.h" +#include "joystick12.hpp" #include #include diff --git a/examples/c++/kxcjk1013.cxx b/examples/c++/kxcjk1013.cxx index 3732dbde..cdc0d7d5 100644 --- a/examples/c++/kxcjk1013.cxx +++ b/examples/c++/kxcjk1013.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "kxcjk1013.h" +#include "kxcjk1013.hpp" using namespace std; diff --git a/examples/c++/l298-stepper.cxx b/examples/c++/l298-stepper.cxx index 8fe2b91d..84361752 100644 --- a/examples/c++/l298-stepper.cxx +++ b/examples/c++/l298-stepper.cxx @@ -24,7 +24,7 @@ #include #include -#include "l298.h" +#include "l298.hpp" using namespace std; diff --git a/examples/c++/l298.cxx b/examples/c++/l298.cxx index 8e360b23..ff972ee4 100644 --- a/examples/c++/l298.cxx +++ b/examples/c++/l298.cxx @@ -24,7 +24,7 @@ #include #include -#include "l298.h" +#include "l298.hpp" using namespace std; diff --git a/examples/c++/lcm1602-i2c.cxx b/examples/c++/lcm1602-i2c.cxx index f405f96c..66ae8f28 100644 --- a/examples/c++/lcm1602-i2c.cxx +++ b/examples/c++/lcm1602-i2c.cxx @@ -22,7 +22,7 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "lcm1602.h" +#include "lcm1602.hpp" int main(int argc, char **argv) diff --git a/examples/c++/lcm1602-parallel.cxx b/examples/c++/lcm1602-parallel.cxx index 642c6af3..d85ab06f 100644 --- a/examples/c++/lcm1602-parallel.cxx +++ b/examples/c++/lcm1602-parallel.cxx @@ -23,7 +23,7 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include +#include int main(int argc, char **argv) diff --git a/examples/c++/ldt0028.cxx b/examples/c++/ldt0028.cxx index 8d9c8b7b..baaac118 100644 --- a/examples/c++/ldt0028.cxx +++ b/examples/c++/ldt0028.cxx @@ -26,7 +26,7 @@ #include #include #include -#include "ldt0028.h" +#include "ldt0028.hpp" int main(int argc, char **argv) diff --git a/examples/c++/light-controller.cxx b/examples/c++/light-controller.cxx index c2c5a2f2..2eec0cca 100644 --- a/examples/c++/light-controller.cxx +++ b/examples/c++/light-controller.cxx @@ -3,9 +3,9 @@ #include #include #include -#include "lp8860.h" -#include "ds1808lc.h" -#include "hlg150h.h" +#include "lp8860.hpp" +#include "ds1808lc.hpp" +#include "hlg150h.hpp" #define EDISON_I2C_BUS 1 // Edison I2C-1 #define GPIO_SI7005_CS 20 // Edison GP12 diff --git a/examples/c++/light-sensor.cxx b/examples/c++/light-sensor.cxx index fce5668c..c4b87ea5 100644 --- a/examples/c++/light-sensor.cxx +++ b/examples/c++/light-sensor.cxx @@ -24,8 +24,8 @@ #include #include -#include "max44009.h" -#include "si1132.h" +#include "max44009.hpp" +#include "si1132.hpp" #define EDISON_I2C_BUS 1 #define FT4222_I2C_BUS 0 diff --git a/examples/c++/lm35.cxx b/examples/c++/lm35.cxx index 89309407..abdfd91b 100644 --- a/examples/c++/lm35.cxx +++ b/examples/c++/lm35.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "lm35.h" +#include "lm35.hpp" using namespace std; diff --git a/examples/c++/lol.cxx b/examples/c++/lol.cxx index 9f2943de..9cf71bd7 100644 --- a/examples/c++/lol.cxx +++ b/examples/c++/lol.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "lol.h" +#include "lol.hpp" #include #include diff --git a/examples/c++/loudness.cxx b/examples/c++/loudness.cxx index 44e62b06..9eaa59b3 100644 --- a/examples/c++/loudness.cxx +++ b/examples/c++/loudness.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "loudness.h" +#include "loudness.hpp" using namespace std; diff --git a/examples/c++/lp8860.cxx b/examples/c++/lp8860.cxx index 2a290eae..0288986e 100644 --- a/examples/c++/lp8860.cxx +++ b/examples/c++/lp8860.cxx @@ -3,7 +3,7 @@ #include #include #include -#include "lp8860.h" +#include "lp8860.hpp" #define EDISON_I2C_BUS 1 // Edison I2C-1 #define LP8860_GPIO_PWR 45 // Edison GP45 diff --git a/examples/c++/lpd8806.cxx b/examples/c++/lpd8806.cxx index 8828f07b..bc1e17f7 100644 --- a/examples/c++/lpd8806.cxx +++ b/examples/c++/lpd8806.cxx @@ -24,7 +24,7 @@ #include #include -#include "lpd8806.h" +#include "lpd8806.hpp" #include void scanner(uint8_t r, uint8_t g, uint8_t b, uint8_t wait); diff --git a/examples/c++/lsm303.cxx b/examples/c++/lsm303.cxx index f75fd5b5..94e9b7bb 100644 --- a/examples/c++/lsm303.cxx +++ b/examples/c++/lsm303.cxx @@ -25,7 +25,7 @@ #include //! [Interesting] -#include "lsm303.h" +#include "lsm303.hpp" int main(int argc, char **argv) diff --git a/examples/c++/lsm9ds0.cxx b/examples/c++/lsm9ds0.cxx index 66644a02..655e02cb 100644 --- a/examples/c++/lsm9ds0.cxx +++ b/examples/c++/lsm9ds0.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "lsm9ds0.h" +#include "lsm9ds0.hpp" using namespace std; diff --git a/examples/c++/m24lr64e.cxx b/examples/c++/m24lr64e.cxx index 6c3aae01..63b186f9 100644 --- a/examples/c++/m24lr64e.cxx +++ b/examples/c++/m24lr64e.cxx @@ -24,7 +24,7 @@ #include #include -#include "m24lr64e.h" +#include "m24lr64e.hpp" using namespace std; using namespace upm; diff --git a/examples/c++/max31723.cxx b/examples/c++/max31723.cxx index 96082af0..4b983108 100644 --- a/examples/c++/max31723.cxx +++ b/examples/c++/max31723.cxx @@ -24,7 +24,7 @@ #include #include -#include "max31723.h" +#include "max31723.hpp" #include int doWork = 0; diff --git a/examples/c++/max31855.cxx b/examples/c++/max31855.cxx index 2390d931..6e729981 100644 --- a/examples/c++/max31855.cxx +++ b/examples/c++/max31855.cxx @@ -27,7 +27,7 @@ #include //! [Interesting] -#include "max31855.h" +#include "max31855.hpp" int main(int argc, char **argv) diff --git a/examples/c++/max44000.cxx b/examples/c++/max44000.cxx index 404f5448..c344bdf3 100644 --- a/examples/c++/max44000.cxx +++ b/examples/c++/max44000.cxx @@ -24,7 +24,7 @@ #include #include -#include "max44000.h" +#include "max44000.hpp" int main(int argc, char **argv) diff --git a/examples/c++/max44009.cxx b/examples/c++/max44009.cxx index 29dca788..bf911cbb 100644 --- a/examples/c++/max44009.cxx +++ b/examples/c++/max44009.cxx @@ -24,7 +24,7 @@ #include #include -#include "max44009.h" +#include "max44009.hpp" #define EDISON_I2C_BUS 1 diff --git a/examples/c++/max5487.cxx b/examples/c++/max5487.cxx index 661be05f..a13223ac 100644 --- a/examples/c++/max5487.cxx +++ b/examples/c++/max5487.cxx @@ -24,7 +24,7 @@ #include #include -#include "max5487.h" +#include "max5487.hpp" #include upm::MAX5487 *sensor = NULL; diff --git a/examples/c++/maxds3231m.cxx b/examples/c++/maxds3231m.cxx index e5a6fc18..ef5f95f6 100644 --- a/examples/c++/maxds3231m.cxx +++ b/examples/c++/maxds3231m.cxx @@ -24,7 +24,7 @@ #include #include -#include "maxds3231m.h" +#include "maxds3231m.hpp" #include int doWork = 0; diff --git a/examples/c++/maxsonarez.cxx b/examples/c++/maxsonarez.cxx index 3c3d3004..5ffb5c10 100644 --- a/examples/c++/maxsonarez.cxx +++ b/examples/c++/maxsonarez.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "maxsonarez.h" +#include "maxsonarez.hpp" using namespace std; diff --git a/examples/c++/mcp9808.cxx b/examples/c++/mcp9808.cxx index ba4e5e4d..32076da1 100644 --- a/examples/c++/mcp9808.cxx +++ b/examples/c++/mcp9808.cxx @@ -1,6 +1,6 @@ #include #include -#include "mcp9808.h" +#include "mcp9808.hpp" #include "mraa.hpp" diff --git a/examples/c++/mg811.cxx b/examples/c++/mg811.cxx index b17423cf..3d334c1e 100644 --- a/examples/c++/mg811.cxx +++ b/examples/c++/mg811.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "mg811.h" +#include "mg811.hpp" using namespace std; diff --git a/examples/c++/mhz16.cxx b/examples/c++/mhz16.cxx index 542dc5fd..dae109d4 100644 --- a/examples/c++/mhz16.cxx +++ b/examples/c++/mhz16.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "mhz16.h" +#include "mhz16.hpp" using namespace std; diff --git a/examples/c++/mic.cxx b/examples/c++/mic.cxx index 8773d716..bb7ae22c 100644 --- a/examples/c++/mic.cxx +++ b/examples/c++/mic.cxx @@ -24,7 +24,7 @@ #include #include -#include "mic.h" +#include "mic.hpp" #include #include #include diff --git a/examples/c++/micsv89.cxx b/examples/c++/micsv89.cxx index cf1530bd..b2e42749 100644 --- a/examples/c++/micsv89.cxx +++ b/examples/c++/micsv89.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "micsv89.h" +#include "micsv89.hpp" /* * An example for using the MICSV89 sensor library. diff --git a/examples/c++/mlx90614.cxx b/examples/c++/mlx90614.cxx index dbd00f42..c7f2a3f8 100644 --- a/examples/c++/mlx90614.cxx +++ b/examples/c++/mlx90614.cxx @@ -24,7 +24,7 @@ #include #include -#include "mlx90614.h" +#include "mlx90614.hpp" #include int doWork = 0; diff --git a/examples/c++/mma7455.cxx b/examples/c++/mma7455.cxx index 052919f5..0e732337 100644 --- a/examples/c++/mma7455.cxx +++ b/examples/c++/mma7455.cxx @@ -24,7 +24,7 @@ #include #include -#include "mma7455.h" +#include "mma7455.hpp" #include #include diff --git a/examples/c++/mma7660.cxx b/examples/c++/mma7660.cxx index c426db55..19e3e02d 100644 --- a/examples/c++/mma7660.cxx +++ b/examples/c++/mma7660.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "mma7660.h" +#include "mma7660.hpp" using namespace std; diff --git a/examples/c++/mpl3115a2.cxx b/examples/c++/mpl3115a2.cxx index f9499d11..77890f14 100644 --- a/examples/c++/mpl3115a2.cxx +++ b/examples/c++/mpl3115a2.cxx @@ -26,7 +26,7 @@ #include #include -#include "mpl3115a2.h" +#include "mpl3115a2.hpp" volatile int doWork = 0; diff --git a/examples/c++/mpr121.cxx b/examples/c++/mpr121.cxx index 79989652..e8aa4b78 100644 --- a/examples/c++/mpr121.cxx +++ b/examples/c++/mpr121.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "mpr121.h" +#include "mpr121.hpp" using namespace std; diff --git a/examples/c++/mpu60x0.cxx b/examples/c++/mpu60x0.cxx index d90a0179..63882cd6 100644 --- a/examples/c++/mpu60x0.cxx +++ b/examples/c++/mpu60x0.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "mpu9150.h" +#include "mpu9150.hpp" using namespace std; diff --git a/examples/c++/mpu9150.cxx b/examples/c++/mpu9150.cxx index d6f5da50..df75057f 100644 --- a/examples/c++/mpu9150.cxx +++ b/examples/c++/mpu9150.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "mpu9150.h" +#include "mpu9150.hpp" using namespace std; diff --git a/examples/c++/mpu9250.cxx b/examples/c++/mpu9250.cxx index fd093f9b..ecd88771 100644 --- a/examples/c++/mpu9250.cxx +++ b/examples/c++/mpu9250.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "mpu9250.h" +#include "mpu9250.hpp" using namespace std; diff --git a/examples/c++/mq2.cxx b/examples/c++/mq2.cxx index f3bd9ca9..040706e6 100644 --- a/examples/c++/mq2.cxx +++ b/examples/c++/mq2.cxx @@ -24,7 +24,7 @@ #include #include -#include "mq2.h" +#include "mq2.hpp" #include #include #include diff --git a/examples/c++/mq3.cxx b/examples/c++/mq3.cxx index 9fd3cce5..13e7586c 100644 --- a/examples/c++/mq3.cxx +++ b/examples/c++/mq3.cxx @@ -24,7 +24,7 @@ #include #include -#include "mq3.h" +#include "mq3.hpp" #include #include #include diff --git a/examples/c++/mq303a.cxx b/examples/c++/mq303a.cxx index 4557de0a..8a8764d1 100644 --- a/examples/c++/mq303a.cxx +++ b/examples/c++/mq303a.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "mq303a.h" +#include "mq303a.hpp" using namespace std; diff --git a/examples/c++/mq4.cxx b/examples/c++/mq4.cxx index 686970b6..87d5dafa 100644 --- a/examples/c++/mq4.cxx +++ b/examples/c++/mq4.cxx @@ -24,7 +24,7 @@ #include #include -#include "mq4.h" +#include "mq4.hpp" #include #include #include diff --git a/examples/c++/mq5.cxx b/examples/c++/mq5.cxx index 541bb263..89c0a529 100644 --- a/examples/c++/mq5.cxx +++ b/examples/c++/mq5.cxx @@ -24,7 +24,7 @@ #include #include -#include "mq5.h" +#include "mq5.hpp" #include #include #include diff --git a/examples/c++/mq6.cxx b/examples/c++/mq6.cxx index 0a73af12..be25f14c 100644 --- a/examples/c++/mq6.cxx +++ b/examples/c++/mq6.cxx @@ -24,7 +24,7 @@ #include #include -#include "mq6.h" +#include "mq6.hpp" #include #include #include diff --git a/examples/c++/mq7.cxx b/examples/c++/mq7.cxx index a6279f1a..561fde0a 100644 --- a/examples/c++/mq7.cxx +++ b/examples/c++/mq7.cxx @@ -24,7 +24,7 @@ #include #include -#include "mq7.h" +#include "mq7.hpp" #include #include #include diff --git a/examples/c++/mq8.cxx b/examples/c++/mq8.cxx index eae583f5..5f9fb28d 100644 --- a/examples/c++/mq8.cxx +++ b/examples/c++/mq8.cxx @@ -24,7 +24,7 @@ #include #include -#include "mq8.h" +#include "mq8.hpp" #include #include #include diff --git a/examples/c++/mq9.cxx b/examples/c++/mq9.cxx index b62dad32..f1a8cd30 100644 --- a/examples/c++/mq9.cxx +++ b/examples/c++/mq9.cxx @@ -24,7 +24,7 @@ #include #include -#include "mq9.h" +#include "mq9.hpp" #include #include #include diff --git a/examples/c++/nlgpio16.cxx b/examples/c++/nlgpio16.cxx index 44c901ec..ecd9f024 100644 --- a/examples/c++/nlgpio16.cxx +++ b/examples/c++/nlgpio16.cxx @@ -26,7 +26,7 @@ #include #include #include -#include "nlgpio16.h" +#include "nlgpio16.hpp" using namespace std; using namespace upm; diff --git a/examples/c++/nrf24l01-broadcast.cxx b/examples/c++/nrf24l01-broadcast.cxx index f4a1d21e..81c70e0c 100644 --- a/examples/c++/nrf24l01-broadcast.cxx +++ b/examples/c++/nrf24l01-broadcast.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "nrf24l01.h" +#include "nrf24l01.hpp" #include #include #include diff --git a/examples/c++/nrf24l01-receiver.cxx b/examples/c++/nrf24l01-receiver.cxx index 344cb0c7..a2430afb 100644 --- a/examples/c++/nrf24l01-receiver.cxx +++ b/examples/c++/nrf24l01-receiver.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "nrf24l01.h" +#include "nrf24l01.hpp" #include int running = 0; diff --git a/examples/c++/nrf24l01-transmitter.cxx b/examples/c++/nrf24l01-transmitter.cxx index 5d9f7cca..d64cf2e2 100644 --- a/examples/c++/nrf24l01-transmitter.cxx +++ b/examples/c++/nrf24l01-transmitter.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "nrf24l01.h" +#include "nrf24l01.hpp" #include int running = 0; diff --git a/examples/c++/nrf8001-broadcast.cxx b/examples/c++/nrf8001-broadcast.cxx index 534e32bb..a30e15dc 100644 --- a/examples/c++/nrf8001-broadcast.cxx +++ b/examples/c++/nrf8001-broadcast.cxx @@ -24,8 +24,8 @@ #include #include -#include "nrf8001.h" -#include "nrf8001-broadcast.h" +#include "nrf8001.hpp" +#include "nrf8001-broadcast.hpp" #include #include #include diff --git a/examples/c++/nrf8001-broadcast.h b/examples/c++/nrf8001-broadcast.hpp similarity index 100% rename from examples/c++/nrf8001-broadcast.h rename to examples/c++/nrf8001-broadcast.hpp diff --git a/examples/c++/nrf8001-helloworld.cxx b/examples/c++/nrf8001-helloworld.cxx index 5866a0f4..9da070f3 100644 --- a/examples/c++/nrf8001-helloworld.cxx +++ b/examples/c++/nrf8001-helloworld.cxx @@ -24,8 +24,8 @@ #include #include -#include "nrf8001.h" -#include "nrf8001-helloworld.h" +#include "nrf8001.hpp" +#include "nrf8001-helloworld.hpp" #include #include #include diff --git a/examples/c++/nrf8001-helloworld.h b/examples/c++/nrf8001-helloworld.hpp similarity index 100% rename from examples/c++/nrf8001-helloworld.h rename to examples/c++/nrf8001-helloworld.hpp diff --git a/examples/c++/nunchuck.cxx b/examples/c++/nunchuck.cxx index 4b9d6170..03d2cbb3 100644 --- a/examples/c++/nunchuck.cxx +++ b/examples/c++/nunchuck.cxx @@ -26,7 +26,7 @@ #include #include -#include "nunchuck.h" +#include "nunchuck.hpp" using namespace std; diff --git a/examples/c++/otp538u.cxx b/examples/c++/otp538u.cxx index ea6e3b32..914350f0 100644 --- a/examples/c++/otp538u.cxx +++ b/examples/c++/otp538u.cxx @@ -26,7 +26,7 @@ #include #include #include -#include "otp538u.h" +#include "otp538u.hpp" using namespace std; diff --git a/examples/c++/ozw.cxx b/examples/c++/ozw.cxx index 40c30f43..ab9521a1 100644 --- a/examples/c++/ozw.cxx +++ b/examples/c++/ozw.cxx @@ -25,7 +25,7 @@ #include #include -#include "ozw.h" +#include "ozw.hpp" using namespace std; diff --git a/examples/c++/pca9685.cxx b/examples/c++/pca9685.cxx index 0806e40c..82f39864 100644 --- a/examples/c++/pca9685.cxx +++ b/examples/c++/pca9685.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "pca9685.h" +#include "pca9685.hpp" using namespace std; diff --git a/examples/c++/pn532-writeurl.cxx b/examples/c++/pn532-writeurl.cxx index f7fc956f..8e63f54d 100644 --- a/examples/c++/pn532-writeurl.cxx +++ b/examples/c++/pn532-writeurl.cxx @@ -24,7 +24,7 @@ #include #include -#include "pn532.h" +#include "pn532.hpp" using namespace std; diff --git a/examples/c++/pn532.cxx b/examples/c++/pn532.cxx index d1b7ba0f..ea66a028 100644 --- a/examples/c++/pn532.cxx +++ b/examples/c++/pn532.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "pn532.h" +#include "pn532.hpp" using namespace std; diff --git a/examples/c++/ppd42ns.cxx b/examples/c++/ppd42ns.cxx index 38a64e5a..8a2a302c 100644 --- a/examples/c++/ppd42ns.cxx +++ b/examples/c++/ppd42ns.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "ppd42ns.h" +#include "ppd42ns.hpp" using namespace std; diff --git a/examples/c++/pressure-sensor.cxx b/examples/c++/pressure-sensor.cxx index d92b9e9b..5e72e243 100644 --- a/examples/c++/pressure-sensor.cxx +++ b/examples/c++/pressure-sensor.cxx @@ -24,8 +24,8 @@ #include #include -#include "bmp180.h" -#include "bme280.h" +#include "bmp180.hpp" +#include "bme280.hpp" #define EDISON_I2C_BUS 1 diff --git a/examples/c++/pulsensor.cxx b/examples/c++/pulsensor.cxx index dcb9cbab..a2919e9f 100644 --- a/examples/c++/pulsensor.cxx +++ b/examples/c++/pulsensor.cxx @@ -24,7 +24,7 @@ #include #include -#include "pulsensor.h" +#include "pulsensor.hpp" #include using namespace upm; diff --git a/examples/c++/rfr359f.cxx b/examples/c++/rfr359f.cxx index b7a8c21f..81b2d483 100644 --- a/examples/c++/rfr359f.cxx +++ b/examples/c++/rfr359f.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "rfr359f.h" +#include "rfr359f.hpp" using namespace std; diff --git a/examples/c++/rgbringcoder.cxx b/examples/c++/rgbringcoder.cxx index 52644cdc..c648bbad 100644 --- a/examples/c++/rgbringcoder.cxx +++ b/examples/c++/rgbringcoder.cxx @@ -24,7 +24,7 @@ #include #include -#include "rgbringcoder.h" +#include "rgbringcoder.hpp" #include using namespace std; diff --git a/examples/c++/rhusb.cxx b/examples/c++/rhusb.cxx index 20f12ed2..0b14aaa9 100644 --- a/examples/c++/rhusb.cxx +++ b/examples/c++/rhusb.cxx @@ -26,7 +26,7 @@ #include #include -#include "rhusb.h" +#include "rhusb.hpp" using namespace std; diff --git a/examples/c++/rotaryencoder.cxx b/examples/c++/rotaryencoder.cxx index f6c505e4..e211f032 100644 --- a/examples/c++/rotaryencoder.cxx +++ b/examples/c++/rotaryencoder.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "rotaryencoder.h" +#include "rotaryencoder.hpp" using namespace std; diff --git a/examples/c++/rpr220-intr.cxx b/examples/c++/rpr220-intr.cxx index 05a8381d..401640c4 100644 --- a/examples/c++/rpr220-intr.cxx +++ b/examples/c++/rpr220-intr.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "rpr220.h" +#include "rpr220.hpp" using namespace std; diff --git a/examples/c++/rpr220.cxx b/examples/c++/rpr220.cxx index c9bdf1dc..dffffc8e 100644 --- a/examples/c++/rpr220.cxx +++ b/examples/c++/rpr220.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "rpr220.h" +#include "rpr220.hpp" using namespace std; diff --git a/examples/c++/sainsmartks.cxx b/examples/c++/sainsmartks.cxx index 19c8704c..8f17033c 100644 --- a/examples/c++/sainsmartks.cxx +++ b/examples/c++/sainsmartks.cxx @@ -26,7 +26,7 @@ #include #include -#include "sainsmartks.h" +#include "sainsmartks.hpp" using namespace std; diff --git a/examples/c++/si1132.cxx b/examples/c++/si1132.cxx index 5cfec309..31d5bdec 100644 --- a/examples/c++/si1132.cxx +++ b/examples/c++/si1132.cxx @@ -24,7 +24,7 @@ #include #include -#include "si1132.h" +#include "si1132.hpp" #define FT4222_I2C_BUS 1 diff --git a/examples/c++/si114x.cxx b/examples/c++/si114x.cxx index 4c069c9f..cf9d1689 100644 --- a/examples/c++/si114x.cxx +++ b/examples/c++/si114x.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "si114x.h" +#include "si114x.hpp" using namespace std; diff --git a/examples/c++/si7005.cxx b/examples/c++/si7005.cxx index a1d48c6c..97e013db 100644 --- a/examples/c++/si7005.cxx +++ b/examples/c++/si7005.cxx @@ -24,7 +24,7 @@ #include #include -#include "si7005.h" +#include "si7005.hpp" #define EDISON_I2C_BUS 1 #define EDISON_GPIO_SI7005_CS 20 diff --git a/examples/c++/sm130.cxx b/examples/c++/sm130.cxx index 3d1e3bdb..27127901 100644 --- a/examples/c++/sm130.cxx +++ b/examples/c++/sm130.cxx @@ -27,7 +27,7 @@ #include #include #include -#include "sm130.h" +#include "sm130.hpp" using namespace std; using namespace upm; diff --git a/examples/c++/ssd1306-oled.cxx b/examples/c++/ssd1306-oled.cxx index a5bbe059..c0eef153 100644 --- a/examples/c++/ssd1306-oled.cxx +++ b/examples/c++/ssd1306-oled.cxx @@ -26,7 +26,7 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "ssd1306.h" +#include "ssd1306.hpp" #define DEVICE_ADDRESS 0x3C #define BUS_NUMBER 0x0 diff --git a/examples/c++/ssd1308-oled.cxx b/examples/c++/ssd1308-oled.cxx index f54169e1..c78e8b85 100644 --- a/examples/c++/ssd1308-oled.cxx +++ b/examples/c++/ssd1308-oled.cxx @@ -22,7 +22,7 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "ssd1308.h" +#include "ssd1308.hpp" #define DEVICE_ADDRESS 0x3C #define BUS_NUMBER 0x0 diff --git a/examples/c++/ssd1327-oled.cxx b/examples/c++/ssd1327-oled.cxx index 73323ec7..d087f700 100644 --- a/examples/c++/ssd1327-oled.cxx +++ b/examples/c++/ssd1327-oled.cxx @@ -22,7 +22,7 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "ssd1327.h" +#include "ssd1327.hpp" #define DEVICE_ADDRESS 0x3C #define BUS_NUMBER 0x0 diff --git a/examples/c++/ssd1351.cxx b/examples/c++/ssd1351.cxx index c0de509f..dec565d2 100644 --- a/examples/c++/ssd1351.cxx +++ b/examples/c++/ssd1351.cxx @@ -2,7 +2,7 @@ #include #include -#include "ssd1351.h" +#include "ssd1351.hpp" #define BLACK 0x0000 #define WHITE 0xFFFF diff --git a/examples/c++/st7735.cxx b/examples/c++/st7735.cxx index 2c14d498..5dedd8b3 100644 --- a/examples/c++/st7735.cxx +++ b/examples/c++/st7735.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "st7735.h" +#include "st7735.hpp" #include int diff --git a/examples/c++/stepmotor.cxx b/examples/c++/stepmotor.cxx index 9357d5da..8f4194c3 100644 --- a/examples/c++/stepmotor.cxx +++ b/examples/c++/stepmotor.cxx @@ -26,7 +26,7 @@ #include #include #include -#include "stepmotor.h" +#include "stepmotor.hpp" using namespace std; diff --git a/examples/c++/sx1276-fsk.cxx b/examples/c++/sx1276-fsk.cxx index f63d1bfd..c6bf3ad7 100644 --- a/examples/c++/sx1276-fsk.cxx +++ b/examples/c++/sx1276-fsk.cxx @@ -26,7 +26,7 @@ #include #include #include -#include "sx1276.h" +#include "sx1276.hpp" using namespace std; diff --git a/examples/c++/sx1276-lora.cxx b/examples/c++/sx1276-lora.cxx index 7c455977..6ac3706e 100644 --- a/examples/c++/sx1276-lora.cxx +++ b/examples/c++/sx1276-lora.cxx @@ -26,7 +26,7 @@ #include #include #include -#include "sx1276.h" +#include "sx1276.hpp" using namespace std; diff --git a/examples/c++/sx6119.cxx b/examples/c++/sx6119.cxx index 2608387b..0d1178fd 100644 --- a/examples/c++/sx6119.cxx +++ b/examples/c++/sx6119.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "sx6119.h" +#include "sx6119.hpp" using namespace std; diff --git a/examples/c++/t3311.cxx b/examples/c++/t3311.cxx index 1859dc6f..4401a1b5 100644 --- a/examples/c++/t3311.cxx +++ b/examples/c++/t3311.cxx @@ -26,7 +26,7 @@ #include #include -#include "t3311.h" +#include "t3311.hpp" using namespace std; diff --git a/examples/c++/t6713.cxx b/examples/c++/t6713.cxx index c163607f..c07871ac 100644 --- a/examples/c++/t6713.cxx +++ b/examples/c++/t6713.cxx @@ -24,7 +24,7 @@ #include #include -#include "t6713.h" +#include "t6713.hpp" #define FT4222_I2C_BUS 0 diff --git a/examples/c++/ta12200.cxx b/examples/c++/ta12200.cxx index 5f949a13..8fdffd8d 100644 --- a/examples/c++/ta12200.cxx +++ b/examples/c++/ta12200.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "ta12200.h" +#include "ta12200.hpp" using namespace std; diff --git a/examples/c++/tcs3414cs.cxx b/examples/c++/tcs3414cs.cxx index 5e6376e3..7efcebd1 100644 --- a/examples/c++/tcs3414cs.cxx +++ b/examples/c++/tcs3414cs.cxx @@ -24,7 +24,7 @@ #include #include -#include "tcs3414cs.h" +#include "tcs3414cs.hpp" #include int doWork = 0; diff --git a/examples/c++/teams.cxx b/examples/c++/teams.cxx index 8d8b54c0..40570ada 100644 --- a/examples/c++/teams.cxx +++ b/examples/c++/teams.cxx @@ -26,7 +26,7 @@ #include #include -#include "teams.h" +#include "teams.hpp" using namespace std; diff --git a/examples/c++/temperature-sensor.cxx b/examples/c++/temperature-sensor.cxx index 0683c6f9..c63b1cc7 100644 --- a/examples/c++/temperature-sensor.cxx +++ b/examples/c++/temperature-sensor.cxx @@ -24,9 +24,9 @@ #include #include -#include "si7005.h" -#include "bmp180.h" -#include "bme280.h" +#include "si7005.hpp" +#include "bmp180.hpp" +#include "bme280.hpp" #define EDISON_I2C_BUS 1 #define FT4222_I2C_BUS 0 diff --git a/examples/c++/tex00.cxx b/examples/c++/tex00.cxx index 821026eb..8fdb9cb0 100644 --- a/examples/c++/tex00.cxx +++ b/examples/c++/tex00.cxx @@ -26,7 +26,7 @@ #include #include -#include "tex00.h" +#include "tex00.hpp" using namespace std; diff --git a/examples/c++/th02.cxx b/examples/c++/th02.cxx index cce0367b..3079d8d7 100644 --- a/examples/c++/th02.cxx +++ b/examples/c++/th02.cxx @@ -24,7 +24,7 @@ #include #include -#include "th02.h" +#include "th02.hpp" #include int doWork = 0; diff --git a/examples/c++/tm1637.cxx b/examples/c++/tm1637.cxx index 235ae506..14ec3a2a 100644 --- a/examples/c++/tm1637.cxx +++ b/examples/c++/tm1637.cxx @@ -22,7 +22,7 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "tm1637.h" +#include "tm1637.hpp" #include #include #include diff --git a/examples/c++/tp401.cxx b/examples/c++/tp401.cxx index 255d3f0b..4749ea52 100644 --- a/examples/c++/tp401.cxx +++ b/examples/c++/tp401.cxx @@ -25,7 +25,7 @@ #include #include -#include "tp401.h" +#include "tp401.hpp" using namespace std; diff --git a/examples/c++/tsl2561.cxx b/examples/c++/tsl2561.cxx index 14ddb8a4..87f83393 100644 --- a/examples/c++/tsl2561.cxx +++ b/examples/c++/tsl2561.cxx @@ -26,7 +26,7 @@ #include -#include "tsl2561.h" +#include "tsl2561.hpp" int main (int argc, char **argv) { diff --git a/examples/c++/ttp223.cxx b/examples/c++/ttp223.cxx index 1d155854..88cbcf08 100644 --- a/examples/c++/ttp223.cxx +++ b/examples/c++/ttp223.cxx @@ -24,7 +24,7 @@ #include #include -#include "ttp223.h" +#include "ttp223.hpp" int main(int argc, char **argv) diff --git a/examples/c++/ublox6.cxx b/examples/c++/ublox6.cxx index adc2886d..2d3d34b3 100644 --- a/examples/c++/ublox6.cxx +++ b/examples/c++/ublox6.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "ublox6.h" +#include "ublox6.hpp" using namespace std; diff --git a/examples/c++/uln200xa.cxx b/examples/c++/uln200xa.cxx index 53a6958a..6a953288 100644 --- a/examples/c++/uln200xa.cxx +++ b/examples/c++/uln200xa.cxx @@ -24,7 +24,7 @@ #include #include -#include "uln200xa.h" +#include "uln200xa.hpp" using namespace std; diff --git a/examples/c++/urm37-uart.cxx b/examples/c++/urm37-uart.cxx index 7a94a1ff..0a0ff9c9 100644 --- a/examples/c++/urm37-uart.cxx +++ b/examples/c++/urm37-uart.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "urm37.h" +#include "urm37.hpp" using namespace std; diff --git a/examples/c++/urm37.cxx b/examples/c++/urm37.cxx index 820b2a18..a7a7e240 100644 --- a/examples/c++/urm37.cxx +++ b/examples/c++/urm37.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "urm37.h" +#include "urm37.hpp" using namespace std; diff --git a/examples/c++/waterlevel.cxx b/examples/c++/waterlevel.cxx index d3a069fb..301e4891 100644 --- a/examples/c++/waterlevel.cxx +++ b/examples/c++/waterlevel.cxx @@ -24,7 +24,7 @@ #include #include #include -#include "waterlevel.h" +#include "waterlevel.hpp" using namespace std; diff --git a/examples/c++/wheelencoder.cxx b/examples/c++/wheelencoder.cxx index 08a7825b..1741b971 100644 --- a/examples/c++/wheelencoder.cxx +++ b/examples/c++/wheelencoder.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "wheelencoder.h" +#include "wheelencoder.hpp" using namespace std; diff --git a/examples/c++/wt5001.cxx b/examples/c++/wt5001.cxx index 317e877f..92a65815 100644 --- a/examples/c++/wt5001.cxx +++ b/examples/c++/wt5001.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "wt5001.h" +#include "wt5001.hpp" using namespace std; diff --git a/examples/c++/xbee.cxx b/examples/c++/xbee.cxx index 834d8bce..d56052e4 100644 --- a/examples/c++/xbee.cxx +++ b/examples/c++/xbee.cxx @@ -26,7 +26,7 @@ #include #include #include -#include "xbee.h" +#include "xbee.hpp" using namespace std; using namespace upm; diff --git a/examples/c++/yg1006.cxx b/examples/c++/yg1006.cxx index 07dbfb5a..6b944218 100644 --- a/examples/c++/yg1006.cxx +++ b/examples/c++/yg1006.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "yg1006.h" +#include "yg1006.hpp" using namespace std; diff --git a/examples/c++/zfm20-register.cxx b/examples/c++/zfm20-register.cxx index fb1292cf..c1f68d77 100644 --- a/examples/c++/zfm20-register.cxx +++ b/examples/c++/zfm20-register.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "zfm20.h" +#include "zfm20.hpp" using namespace std; using namespace upm; diff --git a/examples/c++/zfm20.cxx b/examples/c++/zfm20.cxx index a7323b03..1ce6aaf0 100644 --- a/examples/c++/zfm20.cxx +++ b/examples/c++/zfm20.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "zfm20.h" +#include "zfm20.hpp" using namespace std; using namespace upm; diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 803135ba..ff17b4bb 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -245,7 +245,7 @@ macro(upm_module_init) upm_doxygen() endif() install(TARGETS ${libname} DESTINATION ${LIB_INSTALL_DIR}) - install (FILES ${module_h} DESTINATION include/upm COMPONENT ${libname}) + install (FILES ${module_hpp} DESTINATION include/upm COMPONENT ${libname}) if (IPK) cpack_add_component (${libname} DISPLAY_NAME ${libname} REQUIRED INSTALL_TYPES all) diff --git a/src/a110x/CMakeLists.txt b/src/a110x/CMakeLists.txt index f649239c..844846f7 100644 --- a/src/a110x/CMakeLists.txt +++ b/src/a110x/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "a110x") set (libdescription "upm a110x sensor module") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/a110x/a110x.cxx b/src/a110x/a110x.cxx index 90230915..f6058654 100644 --- a/src/a110x/a110x.cxx +++ b/src/a110x/a110x.cxx @@ -26,7 +26,7 @@ #include #include -#include "a110x.h" +#include "a110x.hpp" using namespace upm; using namespace std; diff --git a/src/a110x/a110x.h b/src/a110x/a110x.hpp similarity index 100% rename from src/a110x/a110x.h rename to src/a110x/a110x.hpp diff --git a/src/a110x/javaupm_a110x.i b/src/a110x/javaupm_a110x.i index ca9cb37d..4e558725 100644 --- a/src/a110x/javaupm_a110x.i +++ b/src/a110x/javaupm_a110x.i @@ -4,9 +4,9 @@ %include "typemaps.i" %{ - #include "a110x.h" + #include "a110x.hpp" %} -%include "a110x.h" +%include "a110x.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/a110x/jsupm_a110x.i b/src/a110x/jsupm_a110x.i index 1aa7916b..f6a53050 100644 --- a/src/a110x/jsupm_a110x.i +++ b/src/a110x/jsupm_a110x.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "a110x.h" + #include "a110x.hpp" %} -%include "a110x.h" +%include "a110x.hpp" diff --git a/src/a110x/pyupm_a110x.i b/src/a110x/pyupm_a110x.i index 9eeabdbf..dd90cef7 100644 --- a/src/a110x/pyupm_a110x.i +++ b/src/a110x/pyupm_a110x.i @@ -5,7 +5,7 @@ %feature("autodoc", "3"); -%include "a110x.h" +%include "a110x.hpp" %{ - #include "a110x.h" + #include "a110x.hpp" %} diff --git a/src/ad8232/CMakeLists.txt b/src/ad8232/CMakeLists.txt index 0a572409..8c04807b 100644 --- a/src/ad8232/CMakeLists.txt +++ b/src/ad8232/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "ad8232") set (libdescription "upm ad8232 heart rate monitor") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/ad8232/ad8232.cxx b/src/ad8232/ad8232.cxx index 35612ae6..de8d650e 100644 --- a/src/ad8232/ad8232.cxx +++ b/src/ad8232/ad8232.cxx @@ -24,7 +24,7 @@ #include -#include "ad8232.h" +#include "ad8232.hpp" using namespace upm; using namespace std; diff --git a/src/ad8232/ad8232.h b/src/ad8232/ad8232.hpp similarity index 100% rename from src/ad8232/ad8232.h rename to src/ad8232/ad8232.hpp diff --git a/src/ad8232/javaupm_ad8232.i b/src/ad8232/javaupm_ad8232.i index 391f1cf2..5b90bbe5 100644 --- a/src/ad8232/javaupm_ad8232.i +++ b/src/ad8232/javaupm_ad8232.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "ad8232.h" + #include "ad8232.hpp" %} -%include "ad8232.h" +%include "ad8232.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/ad8232/jsupm_ad8232.i b/src/ad8232/jsupm_ad8232.i index e2fe8d8e..63490dac 100644 --- a/src/ad8232/jsupm_ad8232.i +++ b/src/ad8232/jsupm_ad8232.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "ad8232.h" + #include "ad8232.hpp" %} -%include "ad8232.h" +%include "ad8232.hpp" diff --git a/src/ad8232/pyupm_ad8232.i b/src/ad8232/pyupm_ad8232.i index 46abb7d5..db748c6f 100644 --- a/src/ad8232/pyupm_ad8232.i +++ b/src/ad8232/pyupm_ad8232.i @@ -5,7 +5,7 @@ %feature("autodoc", "3"); -%include "ad8232.h" +%include "ad8232.hpp" %{ - #include "ad8232.h" + #include "ad8232.hpp" %} diff --git a/src/adafruitms1438/CMakeLists.txt b/src/adafruitms1438/CMakeLists.txt index d3da7e71..3c2f7a1a 100644 --- a/src/adafruitms1438/CMakeLists.txt +++ b/src/adafruitms1438/CMakeLists.txt @@ -1,7 +1,7 @@ set (libname "adafruitms1438") set (libdescription "upm module for the Adafruit Motor Shield 1438") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) set (reqlibname "upm-pca9685") include_directories("../pca9685") upm_module_init() diff --git a/src/adafruitms1438/adafruitms1438.cxx b/src/adafruitms1438/adafruitms1438.cxx index f1475d43..54352191 100644 --- a/src/adafruitms1438/adafruitms1438.cxx +++ b/src/adafruitms1438/adafruitms1438.cxx @@ -27,7 +27,7 @@ #include #include -#include "adafruitms1438.h" +#include "adafruitms1438.hpp" using namespace upm; using namespace std; diff --git a/src/adafruitms1438/adafruitms1438.h b/src/adafruitms1438/adafruitms1438.hpp similarity index 99% rename from src/adafruitms1438/adafruitms1438.h rename to src/adafruitms1438/adafruitms1438.hpp index 1f00ac93..05c4326e 100644 --- a/src/adafruitms1438/adafruitms1438.h +++ b/src/adafruitms1438/adafruitms1438.hpp @@ -30,7 +30,7 @@ #include #include -#include "pca9685.h" +#include "pca9685.hpp" #define ADAFRUITMS1438_I2C_BUS 0 #define ADAFRUITMS1438_DEFAULT_I2C_ADDR 0x60 diff --git a/src/adafruitms1438/javaupm_adafruitms1438.i b/src/adafruitms1438/javaupm_adafruitms1438.i index a02306c9..b29b20ca 100644 --- a/src/adafruitms1438/javaupm_adafruitms1438.i +++ b/src/adafruitms1438/javaupm_adafruitms1438.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "adafruitms1438.h" + #include "adafruitms1438.hpp" %} -%include "adafruitms1438.h" +%include "adafruitms1438.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/adafruitms1438/jsupm_adafruitms1438.i b/src/adafruitms1438/jsupm_adafruitms1438.i index 69060e54..f06f2b5e 100644 --- a/src/adafruitms1438/jsupm_adafruitms1438.i +++ b/src/adafruitms1438/jsupm_adafruitms1438.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "adafruitms1438.h" + #include "adafruitms1438.hpp" %} -%include "adafruitms1438.h" +%include "adafruitms1438.hpp" diff --git a/src/adafruitms1438/pyupm_adafruitms1438.i b/src/adafruitms1438/pyupm_adafruitms1438.i index 812311a5..42fc140b 100644 --- a/src/adafruitms1438/pyupm_adafruitms1438.i +++ b/src/adafruitms1438/pyupm_adafruitms1438.i @@ -9,7 +9,7 @@ %include "adafruitms1438_doc.i" #endif -%include "adafruitms1438.h" +%include "adafruitms1438.hpp" %{ - #include "adafruitms1438.h" + #include "adafruitms1438.hpp" %} diff --git a/src/adafruitss/CMakeLists.txt b/src/adafruitss/CMakeLists.txt index 40214ce6..8d5dd483 100644 --- a/src/adafruitss/CMakeLists.txt +++ b/src/adafruitss/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "adafruitss") set (libdescription "upm Adafruit pca9685 based 16-channel servo shield") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/adafruitss/adafruitss.cxx b/src/adafruitss/adafruitss.cxx index 1bd967ac..a43e7b0e 100644 --- a/src/adafruitss/adafruitss.cxx +++ b/src/adafruitss/adafruitss.cxx @@ -25,7 +25,7 @@ #include #include -#include "adafruitss.h" +#include "adafruitss.hpp" #include #include diff --git a/src/adafruitss/adafruitss.h b/src/adafruitss/adafruitss.hpp similarity index 100% rename from src/adafruitss/adafruitss.h rename to src/adafruitss/adafruitss.hpp diff --git a/src/adafruitss/javaupm_adafruitss.i b/src/adafruitss/javaupm_adafruitss.i index 4e642201..1bbccd76 100644 --- a/src/adafruitss/javaupm_adafruitss.i +++ b/src/adafruitss/javaupm_adafruitss.i @@ -1,9 +1,9 @@ %module javaupm_adafruitss %include "../upm.i" -%include "adafruitss.h" +%include "adafruitss.hpp" %{ - #include "adafruitss.h" + #include "adafruitss.hpp" %} %pragma(java) jniclasscode=%{ diff --git a/src/adafruitss/jsupm_adafruitss.i b/src/adafruitss/jsupm_adafruitss.i index cb15aaac..41175439 100644 --- a/src/adafruitss/jsupm_adafruitss.i +++ b/src/adafruitss/jsupm_adafruitss.i @@ -1,7 +1,7 @@ %module jsupm_adafruitss %include "../upm.i" -%include "adafruitss.h" +%include "adafruitss.hpp" %{ - #include "adafruitss.h" + #include "adafruitss.hpp" %} diff --git a/src/adafruitss/pyupm_adafruitss.i b/src/adafruitss/pyupm_adafruitss.i index 8f8131fe..364123e1 100644 --- a/src/adafruitss/pyupm_adafruitss.i +++ b/src/adafruitss/pyupm_adafruitss.i @@ -5,7 +5,7 @@ %feature("autodoc", "3"); -%include "adafruitss.h" +%include "adafruitss.hpp" %{ - #include "adafruitss.h" + #include "adafruitss.hpp" %} diff --git a/src/adc121c021/CMakeLists.txt b/src/adc121c021/CMakeLists.txt index 1c198fd8..bc00f595 100644 --- a/src/adc121c021/CMakeLists.txt +++ b/src/adc121c021/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "adc121c021") set (libdescription "upm adc121c021 I2C ADC converter module") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/adc121c021/adc121c021.cxx b/src/adc121c021/adc121c021.cxx index 7bdb8a30..5c5438a4 100644 --- a/src/adc121c021/adc121c021.cxx +++ b/src/adc121c021/adc121c021.cxx @@ -26,7 +26,7 @@ #include #include -#include "adc121c021.h" +#include "adc121c021.hpp" using namespace upm; using namespace std; diff --git a/src/adc121c021/adc121c021.h b/src/adc121c021/adc121c021.hpp similarity index 100% rename from src/adc121c021/adc121c021.h rename to src/adc121c021/adc121c021.hpp diff --git a/src/adc121c021/javaupm_adc121c021.i b/src/adc121c021/javaupm_adc121c021.i index 33e4d2e2..45096009 100644 --- a/src/adc121c021/javaupm_adc121c021.i +++ b/src/adc121c021/javaupm_adc121c021.i @@ -3,10 +3,10 @@ /*%include "../carrays_uint16_t.i" */ %{ - #include "adc121c021.h" + #include "adc121c021.hpp" %} -%include "adc121c021.h" +%include "adc121c021.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/adc121c021/jsupm_adc121c021.i b/src/adc121c021/jsupm_adc121c021.i index 83c2893b..2a81ccb9 100644 --- a/src/adc121c021/jsupm_adc121c021.i +++ b/src/adc121c021/jsupm_adc121c021.i @@ -3,7 +3,7 @@ %include "../carrays_uint16_t.i" %{ - #include "adc121c021.h" + #include "adc121c021.hpp" %} -%include "adc121c021.h" +%include "adc121c021.hpp" diff --git a/src/adc121c021/pyupm_adc121c021.i b/src/adc121c021/pyupm_adc121c021.i index 9fd2a83a..33668de0 100644 --- a/src/adc121c021/pyupm_adc121c021.i +++ b/src/adc121c021/pyupm_adc121c021.i @@ -9,7 +9,7 @@ %include "adc121c021_doc.i" #endif -%include "adc121c021.h" +%include "adc121c021.hpp" %{ - #include "adc121c021.h" + #include "adc121c021.hpp" %} diff --git a/src/adis16448/CMakeLists.txt b/src/adis16448/CMakeLists.txt index d7b49721..d6ac44cd 100644 --- a/src/adis16448/CMakeLists.txt +++ b/src/adis16448/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "adis16448") set (libdescription "libupm High-Precision IMU") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/adis16448/adis16448.cxx b/src/adis16448/adis16448.cxx index b95d3faa..eb6f4a8c 100644 --- a/src/adis16448/adis16448.cxx +++ b/src/adis16448/adis16448.cxx @@ -44,7 +44,7 @@ #include #include -#include "adis16448.h" +#include "adis16448.hpp" using namespace upm; diff --git a/src/adis16448/adis16448.h b/src/adis16448/adis16448.hpp similarity index 99% rename from src/adis16448/adis16448.h rename to src/adis16448/adis16448.hpp index 0159e488..3227ee5b 100644 --- a/src/adis16448/adis16448.h +++ b/src/adis16448/adis16448.hpp @@ -6,7 +6,7 @@ // Copyright (c) 2015 Juan Jose Chong // ////////////////////////////////////////////////////////////////////////////////////// -// adis16448.h +// adis16448.hpp ////////////////////////////////////////////////////////////////////////////////////// // // This library runs on an Intel Edison and uses mraa to acquire data diff --git a/src/adis16448/javaupm_adis16448.i b/src/adis16448/javaupm_adis16448.i index b4cc0b12..46dbd845 100644 --- a/src/adis16448/javaupm_adis16448.i +++ b/src/adis16448/javaupm_adis16448.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "adis16448.h" + #include "adis16448.hpp" %} -%include "adis16448.h" +%include "adis16448.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/adis16448/jsupm_adis16448.i b/src/adis16448/jsupm_adis16448.i index 64882d0c..95b88f6b 100644 --- a/src/adis16448/jsupm_adis16448.i +++ b/src/adis16448/jsupm_adis16448.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "adis16448.h" + #include "adis16448.hpp" %} -%include "adis16448.h" +%include "adis16448.hpp" diff --git a/src/adis16448/pyupm_adis16448.i b/src/adis16448/pyupm_adis16448.i index 62ef918e..5edec486 100644 --- a/src/adis16448/pyupm_adis16448.i +++ b/src/adis16448/pyupm_adis16448.i @@ -4,7 +4,7 @@ %include "../upm.i" %{ - #include "adis16448.h" + #include "adis16448.hpp" %} -%include "adis16448.h" +%include "adis16448.hpp" diff --git a/src/ads1x15/CMakeLists.txt b/src/ads1x15/CMakeLists.txt index 67c2e857..7d93acdc 100644 --- a/src/ads1x15/CMakeLists.txt +++ b/src/ads1x15/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "ads1x15") set (libdescription "analog to digital converter") set (module_src ${libname}.cxx ads1115.cxx ads1015.cxx) -set (module_h ${libname}.h ads1115.h ads1015.h) +set (module_hpp ${libname}.hpp ads1115.hpp ads1015.hpp) upm_module_init() \ No newline at end of file diff --git a/src/ads1x15/ads1015.cxx b/src/ads1x15/ads1015.cxx index 286cf447..d49b83d5 100644 --- a/src/ads1x15/ads1015.cxx +++ b/src/ads1x15/ads1015.cxx @@ -21,7 +21,7 @@ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "ads1015.h" +#include "ads1015.hpp" using namespace upm; diff --git a/src/ads1x15/ads1015.h b/src/ads1x15/ads1015.hpp similarity index 99% rename from src/ads1x15/ads1015.h rename to src/ads1x15/ads1015.hpp index e41f3657..c51a455a 100644 --- a/src/ads1x15/ads1015.h +++ b/src/ads1x15/ads1015.hpp @@ -25,8 +25,8 @@ #pragma once -#include "ads1x15.h" -#include "upm/iADC.h" +#include "ads1x15.hpp" +#include "upm/iADC.hpp" #define ADS1015_VREF 2.048 diff --git a/src/ads1x15/ads1115.cxx b/src/ads1x15/ads1115.cxx index ee0dfdab..a26aba46 100644 --- a/src/ads1x15/ads1115.cxx +++ b/src/ads1x15/ads1115.cxx @@ -21,7 +21,7 @@ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "ads1115.h" +#include "ads1115.hpp" using namespace upm; diff --git a/src/ads1x15/ads1115.h b/src/ads1x15/ads1115.hpp similarity index 99% rename from src/ads1x15/ads1115.h rename to src/ads1x15/ads1115.hpp index 32c4b93c..ffe44abc 100644 --- a/src/ads1x15/ads1115.h +++ b/src/ads1x15/ads1115.hpp @@ -25,7 +25,7 @@ #pragma once -#include "ads1x15.h" +#include "ads1x15.hpp" diff --git a/src/ads1x15/ads1x15.cxx b/src/ads1x15/ads1x15.cxx index 4a1ea9db..a9a7ff2b 100644 --- a/src/ads1x15/ads1x15.cxx +++ b/src/ads1x15/ads1x15.cxx @@ -23,7 +23,7 @@ */ -#include "ads1x15.h" +#include "ads1x15.hpp" #include diff --git a/src/ads1x15/ads1x15.h b/src/ads1x15/ads1x15.hpp similarity index 100% rename from src/ads1x15/ads1x15.h rename to src/ads1x15/ads1x15.hpp diff --git a/src/ads1x15/javaupm_ads1x15.i b/src/ads1x15/javaupm_ads1x15.i index 88522e3a..e16dc4e8 100644 --- a/src/ads1x15/javaupm_ads1x15.i +++ b/src/ads1x15/javaupm_ads1x15.i @@ -3,14 +3,14 @@ %include "typemaps.i" %{ - #include "ads1x15.h" - #include "ads1015.h" - #include "ads1115.h" + #include "ads1x15.hpp" + #include "ads1015.hpp" + #include "ads1115.hpp" %} -%include "ads1x15.h" -%include "ads1015.h" -%include "ads1115.h" +%include "ads1x15.hpp" +%include "ads1015.hpp" +%include "ads1115.hpp" diff --git a/src/ads1x15/jsupm_ads1x15.i b/src/ads1x15/jsupm_ads1x15.i index 11a00e7c..8a10beb7 100644 --- a/src/ads1x15/jsupm_ads1x15.i +++ b/src/ads1x15/jsupm_ads1x15.i @@ -1,17 +1,17 @@ %module jsupm_ads1x15 %include "../upm.i" -%include "ads1x15.h" +%include "ads1x15.hpp" %{ - #include "ads1x15.h" + #include "ads1x15.hpp" %} -%include "ads1015.h" +%include "ads1015.hpp" %{ - #include "ads1015.h" + #include "ads1015.hpp" %} -%include "ads1115.h" +%include "ads1115.hpp" %{ - #include "ads1115.h" + #include "ads1115.hpp" %} \ No newline at end of file diff --git a/src/ads1x15/pyupm_ads1x15.i b/src/ads1x15/pyupm_ads1x15.i index dc17d1a7..e2573139 100644 --- a/src/ads1x15/pyupm_ads1x15.i +++ b/src/ads1x15/pyupm_ads1x15.i @@ -5,17 +5,17 @@ %feature("autodoc", "3"); -%include "ads1x15.h" +%include "ads1x15.hpp" %{ - #include "ads1x15.h" + #include "ads1x15.hpp" %} -%include "ads1015.h" +%include "ads1015.hpp" %{ - #include "ads1015.h" + #include "ads1015.hpp" %} -%include "ads1115.h" +%include "ads1115.hpp" %{ - #include "ads1115.h" + #include "ads1115.hpp" %} \ No newline at end of file diff --git a/src/adxl335/CMakeLists.txt b/src/adxl335/CMakeLists.txt index 02607677..fe128524 100644 --- a/src/adxl335/CMakeLists.txt +++ b/src/adxl335/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "adxl335") set (libdescription "upm adxl335 grove 3-axis anaolog accelerometer") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/adxl335/adxl335.cxx b/src/adxl335/adxl335.cxx index de6f1b9a..261f66b2 100644 --- a/src/adxl335/adxl335.cxx +++ b/src/adxl335/adxl335.cxx @@ -29,7 +29,7 @@ #include #include -#include "adxl335.h" +#include "adxl335.hpp" using namespace std; using namespace upm; diff --git a/src/adxl335/adxl335.h b/src/adxl335/adxl335.hpp similarity index 100% rename from src/adxl335/adxl335.h rename to src/adxl335/adxl335.hpp diff --git a/src/adxl335/javaupm_adxl335.i b/src/adxl335/javaupm_adxl335.i index 26245715..99e021e3 100644 --- a/src/adxl335/javaupm_adxl335.i +++ b/src/adxl335/javaupm_adxl335.i @@ -7,7 +7,7 @@ %apply float *OUTPUT { float *xAccel, float *yAccel, float *zAccel }; %{ - #include "adxl335.h" + #include "adxl335.hpp" %} %typemap(jni) float* "jfloatArray" @@ -40,7 +40,7 @@ %ignore values(int *, int *, int *); %ignore acceleration(float *, float *, float *); -%include "adxl335.h" +%include "adxl335.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/adxl335/jsupm_adxl335.i b/src/adxl335/jsupm_adxl335.i index 452204c2..4c48eedb 100644 --- a/src/adxl335/jsupm_adxl335.i +++ b/src/adxl335/jsupm_adxl335.i @@ -6,7 +6,7 @@ %pointer_functions(float, floatPointer); %{ - #include "adxl335.h" + #include "adxl335.hpp" %} -%include "adxl335.h" +%include "adxl335.hpp" diff --git a/src/adxl335/pyupm_adxl335.i b/src/adxl335/pyupm_adxl335.i index ea4f2405..4618c927 100644 --- a/src/adxl335/pyupm_adxl335.i +++ b/src/adxl335/pyupm_adxl335.i @@ -9,7 +9,7 @@ %feature("autodoc", "3"); -%include "adxl335.h" +%include "adxl335.hpp" %{ - #include "adxl335.h" + #include "adxl335.hpp" %} diff --git a/src/adxl345/CMakeLists.txt b/src/adxl345/CMakeLists.txt index 9f192281..74c03ab1 100644 --- a/src/adxl345/CMakeLists.txt +++ b/src/adxl345/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "adxl345") set (libdescription "libupm Digital Accelerometer") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/adxl345/adxl345.cxx b/src/adxl345/adxl345.cxx index 3503d64c..cf2dcc6e 100644 --- a/src/adxl345/adxl345.cxx +++ b/src/adxl345/adxl345.cxx @@ -27,7 +27,7 @@ #include #include #include "math.h" -#include "adxl345.h" +#include "adxl345.hpp" #define READ_BUFFER_LENGTH 6 diff --git a/src/adxl345/adxl345.h b/src/adxl345/adxl345.hpp similarity index 100% rename from src/adxl345/adxl345.h rename to src/adxl345/adxl345.hpp diff --git a/src/adxl345/javaupm_adxl345.i b/src/adxl345/javaupm_adxl345.i index 9b759b43..8087a365 100644 --- a/src/adxl345/javaupm_adxl345.i +++ b/src/adxl345/javaupm_adxl345.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "adxl345.h" + #include "adxl345.hpp" %} %typemap(jni) float* "jfloatArray" @@ -33,7 +33,7 @@ delete [] $1; } -%include "adxl345.h" +%include "adxl345.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/adxl345/jsupm_adxl345.i b/src/adxl345/jsupm_adxl345.i index 6f72b795..99578875 100644 --- a/src/adxl345/jsupm_adxl345.i +++ b/src/adxl345/jsupm_adxl345.i @@ -4,7 +4,7 @@ %include "../carrays_float.i" %{ - #include "adxl345.h" + #include "adxl345.hpp" %} %typemap(out) int16_t * { @@ -15,6 +15,6 @@ $result = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_floatArray, 0 | 0 ); } -%include "adxl345.h" +%include "adxl345.hpp" %include diff --git a/src/adxl345/pyupm_adxl345.i b/src/adxl345/pyupm_adxl345.i index b3c53002..b8df6891 100644 --- a/src/adxl345/pyupm_adxl345.i +++ b/src/adxl345/pyupm_adxl345.i @@ -19,7 +19,7 @@ %include "adxl345_doc.i" #endif -%include "adxl345.h" +%include "adxl345.hpp" %{ - #include "adxl345.h" + #include "adxl345.hpp" %} diff --git a/src/adxrs610/CMakeLists.txt b/src/adxrs610/CMakeLists.txt index eb349f8b..8cc5696e 100644 --- a/src/adxrs610/CMakeLists.txt +++ b/src/adxrs610/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "adxrs610") set (libdescription "upm ADXRS610 gyroscope") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/adxrs610/adxrs610.cxx b/src/adxrs610/adxrs610.cxx index 8d489288..30662bbf 100644 --- a/src/adxrs610/adxrs610.cxx +++ b/src/adxrs610/adxrs610.cxx @@ -24,7 +24,7 @@ #include -#include "adxrs610.h" +#include "adxrs610.hpp" using namespace std; using namespace upm; diff --git a/src/adxrs610/adxrs610.h b/src/adxrs610/adxrs610.hpp similarity index 100% rename from src/adxrs610/adxrs610.h rename to src/adxrs610/adxrs610.hpp diff --git a/src/adxrs610/javaupm_adxrs610.i b/src/adxrs610/javaupm_adxrs610.i index 0c89c146..32ca600a 100644 --- a/src/adxrs610/javaupm_adxrs610.i +++ b/src/adxrs610/javaupm_adxrs610.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "adxrs610.h" + #include "adxrs610.hpp" %} -%include "adxrs610.h" +%include "adxrs610.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/adxrs610/jsupm_adxrs610.i b/src/adxrs610/jsupm_adxrs610.i index 841fa600..35ce5595 100644 --- a/src/adxrs610/jsupm_adxrs610.i +++ b/src/adxrs610/jsupm_adxrs610.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "adxrs610.h" + #include "adxrs610.hpp" %} -%include "adxrs610.h" +%include "adxrs610.hpp" diff --git a/src/adxrs610/pyupm_adxrs610.i b/src/adxrs610/pyupm_adxrs610.i index fd597ff0..979750f9 100644 --- a/src/adxrs610/pyupm_adxrs610.i +++ b/src/adxrs610/pyupm_adxrs610.i @@ -5,7 +5,7 @@ %feature("autodoc", "3"); -%include "adxrs610.h" +%include "adxrs610.hpp" %{ - #include "adxrs610.h" + #include "adxrs610.hpp" %} diff --git a/src/am2315/CMakeLists.txt b/src/am2315/CMakeLists.txt index 5931421c..d7afff62 100644 --- a/src/am2315/CMakeLists.txt +++ b/src/am2315/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "am2315") set (libdescription "libupm Humidity Sensor") set (module_src ${libname}.cpp) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/am2315/am2315.cpp b/src/am2315/am2315.cpp index 2e244881..f1e71863 100644 --- a/src/am2315/am2315.cpp +++ b/src/am2315/am2315.cpp @@ -30,7 +30,7 @@ #include #include -#include "am2315.h" +#include "am2315.hpp" using namespace upm; diff --git a/src/am2315/am2315.h b/src/am2315/am2315.hpp similarity index 100% rename from src/am2315/am2315.h rename to src/am2315/am2315.hpp diff --git a/src/am2315/javaupm_am2315.i b/src/am2315/javaupm_am2315.i index 5d2a0ad2..8bdd047c 100644 --- a/src/am2315/javaupm_am2315.i +++ b/src/am2315/javaupm_am2315.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "am2315.h" + #include "am2315.hpp" %} -%include "am2315.h" +%include "am2315.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/am2315/jsupm_am2315.i b/src/am2315/jsupm_am2315.i index f6baf25a..ddf4cac6 100644 --- a/src/am2315/jsupm_am2315.i +++ b/src/am2315/jsupm_am2315.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "am2315.h" + #include "am2315.hpp" %} -%include "am2315.h" +%include "am2315.hpp" diff --git a/src/am2315/pyupm_am2315.i b/src/am2315/pyupm_am2315.i index 7e9acf1d..829ab9cb 100644 --- a/src/am2315/pyupm_am2315.i +++ b/src/am2315/pyupm_am2315.i @@ -9,7 +9,7 @@ %include "am2315_doc.i" #endif -%include "am2315.h" +%include "am2315.hpp" %{ - #include "am2315.h" + #include "am2315.hpp" %} diff --git a/src/apa102/CMakeLists.txt b/src/apa102/CMakeLists.txt index df7db9e0..27335be2 100644 --- a/src/apa102/CMakeLists.txt +++ b/src/apa102/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "apa102") set (libdescription "upm apa102 led strip spi output module") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/apa102/apa102.cxx b/src/apa102/apa102.cxx index 8564a9d5..a43004a9 100644 --- a/src/apa102/apa102.cxx +++ b/src/apa102/apa102.cxx @@ -28,7 +28,7 @@ #include #include -#include "apa102.h" +#include "apa102.hpp" using namespace upm; diff --git a/src/apa102/apa102.h b/src/apa102/apa102.hpp similarity index 100% rename from src/apa102/apa102.h rename to src/apa102/apa102.hpp diff --git a/src/apa102/javaupm_apa102.i b/src/apa102/javaupm_apa102.i index 21456285..372a228b 100644 --- a/src/apa102/javaupm_apa102.i +++ b/src/apa102/javaupm_apa102.i @@ -13,10 +13,10 @@ } %{ - #include "apa102.h" + #include "apa102.hpp" %} -%include "apa102.h" +%include "apa102.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/apa102/jsupm_apa102.i b/src/apa102/jsupm_apa102.i index 2437e141..ae40e2fe 100644 --- a/src/apa102/jsupm_apa102.i +++ b/src/apa102/jsupm_apa102.i @@ -12,8 +12,8 @@ $1 = (uint8_t*) node::Buffer::Data($input); } -%include "apa102.h" +%include "apa102.hpp" %{ - #include "apa102.h" + #include "apa102.hpp" %} diff --git a/src/apa102/pyupm_apa102.i b/src/apa102/pyupm_apa102.i index 941a33f0..c6fe5ace 100644 --- a/src/apa102/pyupm_apa102.i +++ b/src/apa102/pyupm_apa102.i @@ -17,9 +17,9 @@ } } -%include "apa102.h" +%include "apa102.hpp" %{ - #include "apa102.h" + #include "apa102.hpp" %} diff --git a/src/apds9002/CMakeLists.txt b/src/apds9002/CMakeLists.txt index e006f8fe..24d9e70d 100644 --- a/src/apds9002/CMakeLists.txt +++ b/src/apds9002/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "apds9002") set (libdescription "upm apds9002 luminance module") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/apds9002/apds9002.cxx b/src/apds9002/apds9002.cxx index cd3138ef..b417d1b1 100644 --- a/src/apds9002/apds9002.cxx +++ b/src/apds9002/apds9002.cxx @@ -26,7 +26,7 @@ #include #include -#include "apds9002.h" +#include "apds9002.hpp" using namespace upm; diff --git a/src/apds9002/apds9002.h b/src/apds9002/apds9002.hpp similarity index 100% rename from src/apds9002/apds9002.h rename to src/apds9002/apds9002.hpp diff --git a/src/apds9002/javaupm_apds9002.i b/src/apds9002/javaupm_apds9002.i index 645e8f9e..e994e0c1 100644 --- a/src/apds9002/javaupm_apds9002.i +++ b/src/apds9002/javaupm_apds9002.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "apds9002.h" + #include "apds9002.hpp" %} -%include "apds9002.h" +%include "apds9002.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/apds9002/jsupm_apds9002.i b/src/apds9002/jsupm_apds9002.i index 383f5682..0968abaa 100644 --- a/src/apds9002/jsupm_apds9002.i +++ b/src/apds9002/jsupm_apds9002.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "apds9002.h" + #include "apds9002.hpp" %} -%include "apds9002.h" +%include "apds9002.hpp" diff --git a/src/apds9002/pyupm_apds9002.i b/src/apds9002/pyupm_apds9002.i index 516f112e..a4f79199 100644 --- a/src/apds9002/pyupm_apds9002.i +++ b/src/apds9002/pyupm_apds9002.i @@ -5,7 +5,7 @@ %feature("autodoc", "3"); -%include "apds9002.h" +%include "apds9002.hpp" %{ - #include "apds9002.h" + #include "apds9002.hpp" %} diff --git a/src/apds9930/CMakeLists.txt b/src/apds9930/CMakeLists.txt index d534a797..182a1258 100755 --- a/src/apds9930/CMakeLists.txt +++ b/src/apds9930/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "apds9930") set (libdescription "upm apds9930 sensor module") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/apds9930/apds9930.cxx b/src/apds9930/apds9930.cxx index e365d4c6..8e02df46 100644 --- a/src/apds9930/apds9930.cxx +++ b/src/apds9930/apds9930.cxx @@ -26,7 +26,7 @@ #include #include -#include "apds9930.h" +#include "apds9930.hpp" using namespace upm; diff --git a/src/apds9930/apds9930.h b/src/apds9930/apds9930.hpp similarity index 100% rename from src/apds9930/apds9930.h rename to src/apds9930/apds9930.hpp diff --git a/src/apds9930/javaupm_apds9930.i b/src/apds9930/javaupm_apds9930.i index ca8aa53c..2a7afb30 100755 --- a/src/apds9930/javaupm_apds9930.i +++ b/src/apds9930/javaupm_apds9930.i @@ -2,9 +2,9 @@ %include "../upm.i" %{ - #include "apds9930.h" + #include "apds9930.hpp" %} -%include "apds9930.h" +%include "apds9930.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/apds9930/jsupm_apds9930.i b/src/apds9930/jsupm_apds9930.i index 80e77aff..8a22c0dc 100755 --- a/src/apds9930/jsupm_apds9930.i +++ b/src/apds9930/jsupm_apds9930.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "apds9930.h" + #include "apds9930.hpp" %} -%include "apds9930.h" +%include "apds9930.hpp" diff --git a/src/apds9930/pyupm_apds9930.i b/src/apds9930/pyupm_apds9930.i index fb1f6c5d..e54fb2e5 100755 --- a/src/apds9930/pyupm_apds9930.i +++ b/src/apds9930/pyupm_apds9930.i @@ -3,7 +3,7 @@ %feature("autodoc", "3"); -%include "apds9930.h" +%include "apds9930.hpp" %{ - #include "apds9930.h" + #include "apds9930.hpp" %} diff --git a/src/at42qt1070/CMakeLists.txt b/src/at42qt1070/CMakeLists.txt index 8b48db82..60461582 100644 --- a/src/at42qt1070/CMakeLists.txt +++ b/src/at42qt1070/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "at42qt1070") set (libdescription "upm module for the Atmel AT42QT1070 QTouch sensor") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/at42qt1070/at42qt1070.cxx b/src/at42qt1070/at42qt1070.cxx index f9207d21..53ffa0cf 100644 --- a/src/at42qt1070/at42qt1070.cxx +++ b/src/at42qt1070/at42qt1070.cxx @@ -28,7 +28,7 @@ #include #include -#include "at42qt1070.h" +#include "at42qt1070.hpp" using namespace upm; using namespace std; diff --git a/src/at42qt1070/at42qt1070.h b/src/at42qt1070/at42qt1070.hpp similarity index 100% rename from src/at42qt1070/at42qt1070.h rename to src/at42qt1070/at42qt1070.hpp diff --git a/src/at42qt1070/javaupm_at42qt1070.i b/src/at42qt1070/javaupm_at42qt1070.i index 8aceab06..f387c4a6 100644 --- a/src/at42qt1070/javaupm_at42qt1070.i +++ b/src/at42qt1070/javaupm_at42qt1070.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "at42qt1070.h" + #include "at42qt1070.hpp" %} -%include "at42qt1070.h" +%include "at42qt1070.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/at42qt1070/jsupm_at42qt1070.i b/src/at42qt1070/jsupm_at42qt1070.i index 9c47e461..ac72d2d4 100644 --- a/src/at42qt1070/jsupm_at42qt1070.i +++ b/src/at42qt1070/jsupm_at42qt1070.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "at42qt1070.h" + #include "at42qt1070.hpp" %} -%include "at42qt1070.h" +%include "at42qt1070.hpp" diff --git a/src/at42qt1070/pyupm_at42qt1070.i b/src/at42qt1070/pyupm_at42qt1070.i index 21897edb..d3446b51 100644 --- a/src/at42qt1070/pyupm_at42qt1070.i +++ b/src/at42qt1070/pyupm_at42qt1070.i @@ -9,7 +9,7 @@ %include "at42qt1070_doc.i" #endif -%include "at42qt1070.h" +%include "at42qt1070.hpp" %{ - #include "at42qt1070.h" + #include "at42qt1070.hpp" %} diff --git a/src/bacnetmstp/CMakeLists.txt b/src/bacnetmstp/CMakeLists.txt index 9372b9a4..3a198337 100644 --- a/src/bacnetmstp/CMakeLists.txt +++ b/src/bacnetmstp/CMakeLists.txt @@ -1,7 +1,7 @@ set (libname "bacnetmstp") set (libdescription "upm driver module for BACnet MS/TP devices") set (module_src ${libname}.cxx device-client.c) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) pkg_search_module(BACNET libbacnet) if (BACNET_FOUND) diff --git a/src/bacnetmstp/bacnetmstp.cxx b/src/bacnetmstp/bacnetmstp.cxx index 068bcd25..90fa641b 100644 --- a/src/bacnetmstp/bacnetmstp.cxx +++ b/src/bacnetmstp/bacnetmstp.cxx @@ -28,7 +28,7 @@ #include #include -#include "bacnetmstp.h" +#include "bacnetmstp.hpp" #include "handlers.h" #include "client.h" #include "txbuf.h" diff --git a/src/bacnetmstp/bacnetmstp.h b/src/bacnetmstp/bacnetmstp.hpp similarity index 100% rename from src/bacnetmstp/bacnetmstp.h rename to src/bacnetmstp/bacnetmstp.hpp diff --git a/src/bacnetmstp/javaupm_bacnetmstp.i b/src/bacnetmstp/javaupm_bacnetmstp.i index f3b79276..c0b7f967 100644 --- a/src/bacnetmstp/javaupm_bacnetmstp.i +++ b/src/bacnetmstp/javaupm_bacnetmstp.i @@ -6,10 +6,10 @@ %include "../java_buffer.i" %{ - #include "bacnetmstp.h" + #include "bacnetmstp.hpp" %} -%include "bacnetmstp.h" +%include "bacnetmstp.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/bacnetmstp/jsupm_bacnetmstp.i b/src/bacnetmstp/jsupm_bacnetmstp.i index 0a8adea8..1ee6deeb 100644 --- a/src/bacnetmstp/jsupm_bacnetmstp.i +++ b/src/bacnetmstp/jsupm_bacnetmstp.i @@ -5,7 +5,7 @@ %pointer_functions(float, floatp); -%include "bacnetmstp.h" +%include "bacnetmstp.hpp" %{ - #include "bacnetmstp.h" + #include "bacnetmstp.hpp" %} diff --git a/src/bacnetmstp/pyupm_bacnetmstp.i b/src/bacnetmstp/pyupm_bacnetmstp.i index 727f9ef9..2fb74e12 100644 --- a/src/bacnetmstp/pyupm_bacnetmstp.i +++ b/src/bacnetmstp/pyupm_bacnetmstp.i @@ -9,7 +9,7 @@ %pointer_functions(float, floatp); -%include "bacnetmstp.h" +%include "bacnetmstp.hpp" %{ - #include "bacnetmstp.h" + #include "bacnetmstp.hpp" %} diff --git a/src/biss0001/CMakeLists.txt b/src/biss0001/CMakeLists.txt index 1e1223ad..e4d418fd 100644 --- a/src/biss0001/CMakeLists.txt +++ b/src/biss0001/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "biss0001") set (libdescription "upm biss0001 motion module") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/biss0001/biss0001.cxx b/src/biss0001/biss0001.cxx index 7f366a71..d19b3240 100644 --- a/src/biss0001/biss0001.cxx +++ b/src/biss0001/biss0001.cxx @@ -26,7 +26,7 @@ #include #include -#include "biss0001.h" +#include "biss0001.hpp" using namespace upm; diff --git a/src/biss0001/biss0001.h b/src/biss0001/biss0001.hpp similarity index 100% rename from src/biss0001/biss0001.h rename to src/biss0001/biss0001.hpp diff --git a/src/biss0001/javaupm_biss0001.i b/src/biss0001/javaupm_biss0001.i index c8412302..0d7fae82 100644 --- a/src/biss0001/javaupm_biss0001.i +++ b/src/biss0001/javaupm_biss0001.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "biss0001.h" + #include "biss0001.hpp" %} -%include "biss0001.h" +%include "biss0001.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/biss0001/jsupm_biss0001.i b/src/biss0001/jsupm_biss0001.i index bff6ccff..ce8fac67 100644 --- a/src/biss0001/jsupm_biss0001.i +++ b/src/biss0001/jsupm_biss0001.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "biss0001.h" + #include "biss0001.hpp" %} -%include "biss0001.h" +%include "biss0001.hpp" diff --git a/src/biss0001/pyupm_biss0001.i b/src/biss0001/pyupm_biss0001.i index c485f583..15b92f79 100644 --- a/src/biss0001/pyupm_biss0001.i +++ b/src/biss0001/pyupm_biss0001.i @@ -5,7 +5,7 @@ %feature("autodoc", "3"); -%include "biss0001.h" +%include "biss0001.hpp" %{ - #include "biss0001.h" + #include "biss0001.hpp" %} diff --git a/src/bma220/CMakeLists.txt b/src/bma220/CMakeLists.txt index fcea4bbe..3cc8980e 100644 --- a/src/bma220/CMakeLists.txt +++ b/src/bma220/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "bma220") set (libdescription "accelerometer sensor based on bma220") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/bma220/bma220.cxx b/src/bma220/bma220.cxx index 4148b932..4f540be8 100644 --- a/src/bma220/bma220.cxx +++ b/src/bma220/bma220.cxx @@ -28,7 +28,7 @@ #include #include -#include "bma220.h" +#include "bma220.hpp" using namespace upm; using namespace std; diff --git a/src/bma220/bma220.h b/src/bma220/bma220.hpp similarity index 100% rename from src/bma220/bma220.h rename to src/bma220/bma220.hpp diff --git a/src/bma220/javaupm_bma220.i b/src/bma220/javaupm_bma220.i index 82e1f566..c2363c06 100644 --- a/src/bma220/javaupm_bma220.i +++ b/src/bma220/javaupm_bma220.i @@ -25,10 +25,10 @@ %ignore getAccelerometer(float *, float *, float *); %{ - #include "bma220.h" + #include "bma220.hpp" %} -%include "bma220.h" +%include "bma220.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/bma220/jsupm_bma220.i b/src/bma220/jsupm_bma220.i index fa25b7f6..2816e085 100644 --- a/src/bma220/jsupm_bma220.i +++ b/src/bma220/jsupm_bma220.i @@ -4,8 +4,8 @@ %pointer_functions(float, floatp); -%include "bma220.h" +%include "bma220.hpp" %{ - #include "bma220.h" + #include "bma220.hpp" %} diff --git a/src/bma220/pyupm_bma220.i b/src/bma220/pyupm_bma220.i index 30f16b77..c4f82bfc 100644 --- a/src/bma220/pyupm_bma220.i +++ b/src/bma220/pyupm_bma220.i @@ -10,8 +10,8 @@ %pointer_functions(float, floatp); -%include "bma220.h" +%include "bma220.hpp" %{ - #include "bma220.h" + #include "bma220.hpp" %} diff --git a/src/bme280/CMakeLists.txt b/src/bme280/CMakeLists.txt index 6674c7fa..a1bb54ff 100644 --- a/src/bme280/CMakeLists.txt +++ b/src/bme280/CMakeLists.txt @@ -2,5 +2,5 @@ include_directories(..) set (libname "bme280") set (libdescription "upm bme280 temperature humidity pressure sensor module") set (module_src ${libname}.cxx bme280driver.cxx) -set (module_h ${libname}.h bme280driver.h) +set (module_hpp ${libname}.hpp bme280driver.h) upm_module_init() diff --git a/src/bme280/bme280.cxx b/src/bme280/bme280.cxx index f303b760..f498ca50 100644 --- a/src/bme280/bme280.cxx +++ b/src/bme280/bme280.cxx @@ -28,7 +28,7 @@ #include #include -#include "bme280.h" +#include "bme280.hpp" #include "bme280driver.h" /************** I2C buffer length ******/ #define I2C_BUFFER_LEN 26 @@ -361,7 +361,7 @@ int8_t BME280::I2C_routine() /*-------------------------------------------------------------------* -* The device address defined in the bme280.h file +* The device address defined in the bme280.hpp file *-----------------------------------------------------------------------*/ int32_t BME280::i2c_write_string(uint8_t dev_addr,uint8_t* ptr, uint8_t cnt) { diff --git a/src/bme280/bme280.h b/src/bme280/bme280.hpp similarity index 96% rename from src/bme280/bme280.h rename to src/bme280/bme280.hpp index a24aa19a..a1474663 100644 --- a/src/bme280/bme280.h +++ b/src/bme280/bme280.hpp @@ -1,7 +1,7 @@ #include -#include "upm/iPressureSensor.h" -#include "upm/iTemperatureSensor.h" -#include "upm/iHumiditySensor.h" +#include "upm/iPressureSensor.hpp" +#include "upm/iTemperatureSensor.hpp" +#include "upm/iHumiditySensor.hpp" #ifndef __BME280_H__ #define __BME280_H__ diff --git a/src/bme280/bme280driver.h b/src/bme280/bme280driver.h index b84d1ef0..dfb5712a 100644 --- a/src/bme280/bme280driver.h +++ b/src/bme280/bme280driver.h @@ -3,7 +3,7 @@ **************************************************************************** * Copyright (C) 2013 - 2015 Bosch Sensortec GmbH * -* File : bme280.h +* File : bme280driver.h * * Date : 2015/03/27 * diff --git a/src/bme280/javaupm_bme280.i b/src/bme280/javaupm_bme280.i index f8f78636..e04beb05 100644 --- a/src/bme280/javaupm_bme280.i +++ b/src/bme280/javaupm_bme280.i @@ -6,10 +6,10 @@ %include "typemaps.i" %{ - #include "bme280.h" + #include "bme280.hpp" %} -%include "bme280.h" +%include "bme280.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/bme280/jsupm_bme280.i b/src/bme280/jsupm_bme280.i index ee50a01a..e7af6c3d 100644 --- a/src/bme280/jsupm_bme280.i +++ b/src/bme280/jsupm_bme280.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "bme280.h" + #include "bme280.hpp" %} -%include "bme280.h" +%include "bme280.hpp" diff --git a/src/bme280/pyupm_bme280.i b/src/bme280/pyupm_bme280.i index 942ad008..e5c19cc0 100644 --- a/src/bme280/pyupm_bme280.i +++ b/src/bme280/pyupm_bme280.i @@ -3,8 +3,8 @@ %include "stdint.i" -%include "bme280.h" +%include "bme280.hpp" %{ - #include "bme280.h" + #include "bme280.hpp" %} diff --git a/src/bmi160/CMakeLists.txt b/src/bmi160/CMakeLists.txt index b3ebbfc5..42868519 100644 --- a/src/bmi160/CMakeLists.txt +++ b/src/bmi160/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "bmi160") set (libdescription "Bosch BMI160 Accelerometer, Gyroscope and BMM150 Magnetometer") set (module_src ${libname}.cxx bosch_bmi160.c) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/bmi160/bmi160.cxx b/src/bmi160/bmi160.cxx index ac838ace..d9f35b77 100644 --- a/src/bmi160/bmi160.cxx +++ b/src/bmi160/bmi160.cxx @@ -30,7 +30,7 @@ // we have to do it the old skool way #include -#include "bmi160.h" +#include "bmi160.hpp" extern "C" { #include "bosch_bmi160.h" diff --git a/src/bmi160/bmi160.h b/src/bmi160/bmi160.hpp similarity index 100% rename from src/bmi160/bmi160.h rename to src/bmi160/bmi160.hpp diff --git a/src/bmi160/bosch_bmi160.c b/src/bmi160/bosch_bmi160.c index 8e8ab89b..52c834ae 100644 --- a/src/bmi160/bosch_bmi160.c +++ b/src/bmi160/bosch_bmi160.c @@ -2,7 +2,7 @@ **************************************************************************** * Copyright (C) 2015 Bosch Sensortec GmbH * -* bmi160.c +* bosch_bmi160.c * Date: 2014/10/27 * Revision: 2.0.6 $ * diff --git a/src/bmi160/bosch_bmi160.h b/src/bmi160/bosch_bmi160.h index 390850b0..96f79daa 100644 --- a/src/bmi160/bosch_bmi160.h +++ b/src/bmi160/bosch_bmi160.h @@ -3,7 +3,7 @@ **************************************************************************** * Copyright (C) 2014 Bosch Sensortec GmbH * -* File : bmi160.h +* File : bosch_bmi160.h * * Date : 2014/10/27 * @@ -54,7 +54,7 @@ * patent rights of the copyright holder. **************************************************************************/ -/*! \file bmi160.h +/*! \file bmi160.hpp \brief BMI160 Sensor Driver Support Header File */ /* user defined code to be added here ... */ #ifndef __BMI160_H__ diff --git a/src/bmi160/javaupm_bmi160.i b/src/bmi160/javaupm_bmi160.i index 34312f7a..478b58fc 100644 --- a/src/bmi160/javaupm_bmi160.i +++ b/src/bmi160/javaupm_bmi160.i @@ -5,7 +5,7 @@ %include "../java_buffer.i" %{ - #include "bmi160.h" + #include "bmi160.hpp" %} @@ -27,7 +27,7 @@ %ignore getGyroscope(float *, float *, float *); %ignore getMagnetometer(float *, float *, float *); -%include "bmi160.h" +%include "bmi160.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/bmi160/jsupm_bmi160.i b/src/bmi160/jsupm_bmi160.i index 0f1c70e0..d7287160 100644 --- a/src/bmi160/jsupm_bmi160.i +++ b/src/bmi160/jsupm_bmi160.i @@ -4,7 +4,7 @@ %pointer_functions(float, floatp); -%include "bmi160.h" +%include "bmi160.hpp" %{ - #include "bmi160.h" + #include "bmi160.hpp" %} diff --git a/src/bmi160/license.txt b/src/bmi160/license.txt index a2c7d849..f9e8cd4f 100644 --- a/src/bmi160/license.txt +++ b/src/bmi160/license.txt @@ -3,7 +3,7 @@ **************************************************************************** * Copyright (C) 2014 Bosch Sensortec GmbH * -* File : bmi160.h +* File : bmi160.hpp * * Date : 2014/10/27 * diff --git a/src/bmi160/pyupm_bmi160.i b/src/bmi160/pyupm_bmi160.i index 831b0d54..e5cd91ed 100644 --- a/src/bmi160/pyupm_bmi160.i +++ b/src/bmi160/pyupm_bmi160.i @@ -10,7 +10,7 @@ %pointer_functions(float, floatp); -%include "bmi160.h" +%include "bmi160.hpp" %{ - #include "bmi160.h" + #include "bmi160.hpp" %} diff --git a/src/bmp180/CMakeLists.txt b/src/bmp180/CMakeLists.txt index 359c9fee..e35656cf 100644 --- a/src/bmp180/CMakeLists.txt +++ b/src/bmp180/CMakeLists.txt @@ -2,5 +2,5 @@ include_directories(..) set (libname "bmp180") set (libdescription "upm BMP180") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/bmp180/bmp180.cxx b/src/bmp180/bmp180.cxx index 6096ea40..fb4989c0 100644 --- a/src/bmp180/bmp180.cxx +++ b/src/bmp180/bmp180.cxx @@ -26,7 +26,7 @@ #include #include -#include "bmp180.h" +#include "bmp180.hpp" /* CALIBRATION */ #define BMP180_PROM_START_ADDR (0xAA) diff --git a/src/bmp180/bmp180.h b/src/bmp180/bmp180.hpp similarity index 97% rename from src/bmp180/bmp180.h rename to src/bmp180/bmp180.hpp index 64e88321..820b6655 100644 --- a/src/bmp180/bmp180.h +++ b/src/bmp180/bmp180.hpp @@ -29,8 +29,8 @@ #include #include -#include "upm/iPressureSensor.h" -#include "upm/iTemperatureSensor.h" +#include "upm/iPressureSensor.hpp" +#include "upm/iTemperatureSensor.hpp" #define BMP180_ADDR 0x77 // device address diff --git a/src/bmp180/javaupm_bmp180.i b/src/bmp180/javaupm_bmp180.i index 06aa8136..89da387d 100644 --- a/src/bmp180/javaupm_bmp180.i +++ b/src/bmp180/javaupm_bmp180.i @@ -6,10 +6,10 @@ %include "typemaps.i" %{ - #include "bmp180.h" + #include "bmp180.hpp" %} -%include "bmp180.h" +%include "bmp180.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/bmp180/jsupm_bmp180.i b/src/bmp180/jsupm_bmp180.i index ede9324a..9872d5c9 100644 --- a/src/bmp180/jsupm_bmp180.i +++ b/src/bmp180/jsupm_bmp180.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "bmp180.h" + #include "bmp180.hpp" %} -%include "bmp180.h" +%include "bmp180.hpp" diff --git a/src/bmp180/pyupm_bmp180.i b/src/bmp180/pyupm_bmp180.i index 5961c63e..feceacdd 100644 --- a/src/bmp180/pyupm_bmp180.i +++ b/src/bmp180/pyupm_bmp180.i @@ -3,8 +3,8 @@ %include "stdint.i" -%include "bmp180.h" +%include "bmp180.hpp" %{ - #include "bmp180.h" + #include "bmp180.hpp" %} diff --git a/src/bmpx8x/CMakeLists.txt b/src/bmpx8x/CMakeLists.txt index 5960e124..172e432c 100644 --- a/src/bmpx8x/CMakeLists.txt +++ b/src/bmpx8x/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "bmpx8x") set (libdescription "upm BMPX8X") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/bmpx8x/bmpx8x.cxx b/src/bmpx8x/bmpx8x.cxx index a0bbec4d..5bf7f57c 100644 --- a/src/bmpx8x/bmpx8x.cxx +++ b/src/bmpx8x/bmpx8x.cxx @@ -28,7 +28,7 @@ #include #include -#include "bmpx8x.h" +#include "bmpx8x.hpp" using namespace upm; diff --git a/src/bmpx8x/bmpx8x.h b/src/bmpx8x/bmpx8x.hpp similarity index 99% rename from src/bmpx8x/bmpx8x.h rename to src/bmpx8x/bmpx8x.hpp index 09b0dd1b..92818a69 100644 --- a/src/bmpx8x/bmpx8x.h +++ b/src/bmpx8x/bmpx8x.hpp @@ -30,7 +30,7 @@ #include #include #include -#include "upm/iTemperatureSensor.h" +#include "upm/iTemperatureSensor.hpp" #define ADDR 0x77 // device address diff --git a/src/bmpx8x/javaupm_bmpx8x.i b/src/bmpx8x/javaupm_bmpx8x.i index 227056b6..d50c74d4 100644 --- a/src/bmpx8x/javaupm_bmpx8x.i +++ b/src/bmpx8x/javaupm_bmpx8x.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "bmpx8x.h" + #include "bmpx8x.hpp" %} -%include "bmpx8x.h" +%include "bmpx8x.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/bmpx8x/jsupm_bmpx8x.i b/src/bmpx8x/jsupm_bmpx8x.i index 419f75c5..de9c9493 100644 --- a/src/bmpx8x/jsupm_bmpx8x.i +++ b/src/bmpx8x/jsupm_bmpx8x.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "bmpx8x.h" + #include "bmpx8x.hpp" %} -%include "bmpx8x.h" +%include "bmpx8x.hpp" diff --git a/src/bmpx8x/pyupm_bmpx8x.i b/src/bmpx8x/pyupm_bmpx8x.i index 22f3fe28..c514e0ff 100644 --- a/src/bmpx8x/pyupm_bmpx8x.i +++ b/src/bmpx8x/pyupm_bmpx8x.i @@ -5,8 +5,8 @@ %include "stdint.i" -%include "bmpx8x.h" +%include "bmpx8x.hpp" %{ - #include "bmpx8x.h" + #include "bmpx8x.hpp" %} diff --git a/src/buzzer/CMakeLists.txt b/src/buzzer/CMakeLists.txt index 02749c04..49f5cce1 100644 --- a/src/buzzer/CMakeLists.txt +++ b/src/buzzer/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "buzzer") set (libdescription "upm buzzer") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/buzzer/buzzer.cxx b/src/buzzer/buzzer.cxx index 8ef89227..4150f631 100644 --- a/src/buzzer/buzzer.cxx +++ b/src/buzzer/buzzer.cxx @@ -27,7 +27,7 @@ #include #include -#include "buzzer.h" +#include "buzzer.hpp" using namespace upm; using namespace std; diff --git a/src/buzzer/buzzer.h b/src/buzzer/buzzer.hpp similarity index 100% rename from src/buzzer/buzzer.h rename to src/buzzer/buzzer.hpp diff --git a/src/buzzer/javaupm_buzzer.i b/src/buzzer/javaupm_buzzer.i index e647831b..ce8ed60f 100644 --- a/src/buzzer/javaupm_buzzer.i +++ b/src/buzzer/javaupm_buzzer.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "buzzer.h" + #include "buzzer.hpp" %} -%include "buzzer.h" +%include "buzzer.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/buzzer/jsupm_buzzer.i b/src/buzzer/jsupm_buzzer.i index d957892e..4b7c452c 100644 --- a/src/buzzer/jsupm_buzzer.i +++ b/src/buzzer/jsupm_buzzer.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "buzzer.h" + #include "buzzer.hpp" %} -%include "buzzer.h" +%include "buzzer.hpp" diff --git a/src/buzzer/pyupm_buzzer.i b/src/buzzer/pyupm_buzzer.i index a58d139c..56de1212 100644 --- a/src/buzzer/pyupm_buzzer.i +++ b/src/buzzer/pyupm_buzzer.i @@ -5,7 +5,7 @@ %feature("autodoc", "3"); -%include "buzzer.h" +%include "buzzer.hpp" %{ - #include "buzzer.h" + #include "buzzer.hpp" %} diff --git a/src/cjq4435/CMakeLists.txt b/src/cjq4435/CMakeLists.txt index b9c954b6..a5c4b8fc 100644 --- a/src/cjq4435/CMakeLists.txt +++ b/src/cjq4435/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "cjq4435") set (libdescription "upm cjq4435 MOSFET module") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/cjq4435/cjq4435.cxx b/src/cjq4435/cjq4435.cxx index 43c2a56f..d730624c 100644 --- a/src/cjq4435/cjq4435.cxx +++ b/src/cjq4435/cjq4435.cxx @@ -26,7 +26,7 @@ #include #include -#include "cjq4435.h" +#include "cjq4435.hpp" using namespace upm; using namespace std; diff --git a/src/cjq4435/cjq4435.h b/src/cjq4435/cjq4435.hpp similarity index 100% rename from src/cjq4435/cjq4435.h rename to src/cjq4435/cjq4435.hpp diff --git a/src/cjq4435/javaupm_cjq4435.i b/src/cjq4435/javaupm_cjq4435.i index a67fb5b4..414863d4 100644 --- a/src/cjq4435/javaupm_cjq4435.i +++ b/src/cjq4435/javaupm_cjq4435.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "cjq4435.h" + #include "cjq4435.hpp" %} -%include "cjq4435.h" +%include "cjq4435.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/cjq4435/jsupm_cjq4435.i b/src/cjq4435/jsupm_cjq4435.i index 3fe19eec..fa7be735 100644 --- a/src/cjq4435/jsupm_cjq4435.i +++ b/src/cjq4435/jsupm_cjq4435.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "cjq4435.h" + #include "cjq4435.hpp" %} -%include "cjq4435.h" +%include "cjq4435.hpp" diff --git a/src/cjq4435/pyupm_cjq4435.i b/src/cjq4435/pyupm_cjq4435.i index 706cd28f..c2f7354c 100644 --- a/src/cjq4435/pyupm_cjq4435.i +++ b/src/cjq4435/pyupm_cjq4435.i @@ -5,7 +5,7 @@ %feature("autodoc", "3"); -%include "cjq4435.h" +%include "cjq4435.hpp" %{ - #include "cjq4435.h" + #include "cjq4435.hpp" %} diff --git a/src/curieimu/CMakeLists.txt b/src/curieimu/CMakeLists.txt index d6a0a661..a3230ff7 100644 --- a/src/curieimu/CMakeLists.txt +++ b/src/curieimu/CMakeLists.txt @@ -6,6 +6,6 @@ if (HAVE_FIRMATA) set (libname "curieimu") set (libdescription "upm Curie IMU via Firmata") set (module_src ${libname}.cpp) - set (module_h ${libname}.hpp) + set (module_hpp ${libname}.hpp) upm_module_init () endif () diff --git a/src/cwlsxxa/CMakeLists.txt b/src/cwlsxxa/CMakeLists.txt index 42eff10a..87755d0d 100644 --- a/src/cwlsxxa/CMakeLists.txt +++ b/src/cwlsxxa/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "cwlsxxa") set (libdescription "upm Veris CWLSXXA CO2/Temperature/Humidity transmitter") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/cwlsxxa/cwlsxxa.cxx b/src/cwlsxxa/cwlsxxa.cxx index 15e0649b..8101698a 100644 --- a/src/cwlsxxa/cwlsxxa.cxx +++ b/src/cwlsxxa/cwlsxxa.cxx @@ -24,7 +24,7 @@ #include -#include "cwlsxxa.h" +#include "cwlsxxa.hpp" using namespace upm; using namespace std; diff --git a/src/cwlsxxa/cwlsxxa.h b/src/cwlsxxa/cwlsxxa.hpp similarity index 100% rename from src/cwlsxxa/cwlsxxa.h rename to src/cwlsxxa/cwlsxxa.hpp diff --git a/src/cwlsxxa/javaupm_cwlsxxa.i b/src/cwlsxxa/javaupm_cwlsxxa.i index 07b2ee05..8a25f336 100644 --- a/src/cwlsxxa/javaupm_cwlsxxa.i +++ b/src/cwlsxxa/javaupm_cwlsxxa.i @@ -2,9 +2,9 @@ %include "../upm.i" %include "std_string.i" -%include "cwlsxxa.h" +%include "cwlsxxa.hpp" %{ - #include "cwlsxxa.h" + #include "cwlsxxa.hpp" %} %pragma(java) jniclasscode=%{ diff --git a/src/cwlsxxa/jsupm_cwlsxxa.i b/src/cwlsxxa/jsupm_cwlsxxa.i index e3fa9cc4..cae0224f 100644 --- a/src/cwlsxxa/jsupm_cwlsxxa.i +++ b/src/cwlsxxa/jsupm_cwlsxxa.i @@ -3,8 +3,8 @@ %include "std_string.i" %{ - #include "cwlsxxa.h" + #include "cwlsxxa.hpp" %} -%include "cwlsxxa.h" +%include "cwlsxxa.hpp" diff --git a/src/cwlsxxa/pyupm_cwlsxxa.i b/src/cwlsxxa/pyupm_cwlsxxa.i index 805ea03b..0393e391 100644 --- a/src/cwlsxxa/pyupm_cwlsxxa.i +++ b/src/cwlsxxa/pyupm_cwlsxxa.i @@ -7,7 +7,7 @@ %feature("autodoc", "3"); %{ - #include "cwlsxxa.h" + #include "cwlsxxa.hpp" %} -%include "cwlsxxa.h" +%include "cwlsxxa.hpp" diff --git a/src/dfrph/CMakeLists.txt b/src/dfrph/CMakeLists.txt index 1f08e95e..6de74f52 100644 --- a/src/dfrph/CMakeLists.txt +++ b/src/dfrph/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "dfrph") set (libdescription "upm dfrobot pH sensors") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/dfrph/dfrph.cxx b/src/dfrph/dfrph.cxx index a984af77..000d64d7 100644 --- a/src/dfrph/dfrph.cxx +++ b/src/dfrph/dfrph.cxx @@ -24,7 +24,7 @@ #include -#include "dfrph.h" +#include "dfrph.hpp" using namespace std; using namespace upm; diff --git a/src/dfrph/dfrph.h b/src/dfrph/dfrph.hpp similarity index 100% rename from src/dfrph/dfrph.h rename to src/dfrph/dfrph.hpp diff --git a/src/dfrph/javaupm_dfrph.i b/src/dfrph/javaupm_dfrph.i index 68fe1932..975520bc 100644 --- a/src/dfrph/javaupm_dfrph.i +++ b/src/dfrph/javaupm_dfrph.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "dfrph.h" + #include "dfrph.hpp" %} -%include "dfrph.h" +%include "dfrph.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/dfrph/jsupm_dfrph.i b/src/dfrph/jsupm_dfrph.i index ca3a2491..764fc77c 100644 --- a/src/dfrph/jsupm_dfrph.i +++ b/src/dfrph/jsupm_dfrph.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "dfrph.h" + #include "dfrph.hpp" %} -%include "dfrph.h" +%include "dfrph.hpp" diff --git a/src/dfrph/pyupm_dfrph.i b/src/dfrph/pyupm_dfrph.i index f22183ee..6231c7e5 100644 --- a/src/dfrph/pyupm_dfrph.i +++ b/src/dfrph/pyupm_dfrph.i @@ -5,7 +5,7 @@ %feature("autodoc", "3"); -%include "dfrph.h" +%include "dfrph.hpp" %{ - #include "dfrph.h" + #include "dfrph.hpp" %} diff --git a/src/ds1307/CMakeLists.txt b/src/ds1307/CMakeLists.txt index 3ee7e08c..b9054d6d 100644 --- a/src/ds1307/CMakeLists.txt +++ b/src/ds1307/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "ds1307") set (libdescription "upm ds1307 RTC module") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/ds1307/ds1307.cxx b/src/ds1307/ds1307.cxx index 8681ceab..1b3dbc0e 100644 --- a/src/ds1307/ds1307.cxx +++ b/src/ds1307/ds1307.cxx @@ -29,7 +29,7 @@ #include #include -#include "ds1307.h" +#include "ds1307.hpp" using namespace upm; using namespace std; diff --git a/src/ds1307/ds1307.h b/src/ds1307/ds1307.hpp similarity index 100% rename from src/ds1307/ds1307.h rename to src/ds1307/ds1307.hpp diff --git a/src/ds1307/javaupm_ds1307.i b/src/ds1307/javaupm_ds1307.i index ba7de157..6bb3b71b 100644 --- a/src/ds1307/javaupm_ds1307.i +++ b/src/ds1307/javaupm_ds1307.i @@ -4,10 +4,10 @@ %include "../java_buffer.i" %{ - #include "ds1307.h" + #include "ds1307.hpp" %} -%include "ds1307.h" +%include "ds1307.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/ds1307/jsupm_ds1307.i b/src/ds1307/jsupm_ds1307.i index f102ea0d..f2e689c2 100644 --- a/src/ds1307/jsupm_ds1307.i +++ b/src/ds1307/jsupm_ds1307.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "ds1307.h" + #include "ds1307.hpp" %} -%include "ds1307.h" +%include "ds1307.hpp" diff --git a/src/ds1307/pyupm_ds1307.i b/src/ds1307/pyupm_ds1307.i index 33e65eb0..5d4c0b27 100644 --- a/src/ds1307/pyupm_ds1307.i +++ b/src/ds1307/pyupm_ds1307.i @@ -9,7 +9,7 @@ %include "ds1307_doc.i" #endif -%include "ds1307.h" +%include "ds1307.hpp" %{ - #include "ds1307.h" + #include "ds1307.hpp" %} diff --git a/src/ds1808lc/CMakeLists.txt b/src/ds1808lc/CMakeLists.txt index a657fa63..6a46ccbc 100644 --- a/src/ds1808lc/CMakeLists.txt +++ b/src/ds1808lc/CMakeLists.txt @@ -2,5 +2,5 @@ include_directories(..) set (libname "ds1808lc") set (libdescription “DS1808 lighting controller”) set (module_src ${libname}.cxx mraa-utils.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/ds1808lc/ds1808lc.cxx b/src/ds1808lc/ds1808lc.cxx index a157e856..ff98980c 100644 --- a/src/ds1808lc/ds1808lc.cxx +++ b/src/ds1808lc/ds1808lc.cxx @@ -2,8 +2,8 @@ #include #include #include -#include "ds1808lc.h" -#include "mraa-utils.h" +#include "ds1808lc.hpp" +#include "mraa-utils.hpp" #define DS1808_I2C_ADDR 0x28 #define DS1808_POT2_OFFSET 0x40 diff --git a/src/ds1808lc/ds1808lc.h b/src/ds1808lc/ds1808lc.hpp similarity index 98% rename from src/ds1808lc/ds1808lc.h rename to src/ds1808lc/ds1808lc.hpp index ddedce28..9b871921 100644 --- a/src/ds1808lc/ds1808lc.h +++ b/src/ds1808lc/ds1808lc.hpp @@ -22,7 +22,7 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "upm/iLightController.h" +#include "upm/iLightController.hpp" #include "mraa/i2c.hpp" namespace upm diff --git a/src/ds1808lc/javaupm_ds1808lc.i b/src/ds1808lc/javaupm_ds1808lc.i index f434758d..988bb1dd 100644 --- a/src/ds1808lc/javaupm_ds1808lc.i +++ b/src/ds1808lc/javaupm_ds1808lc.i @@ -6,10 +6,10 @@ %include "typemaps.i" %{ - #include "ds1808lc.h" + #include "ds1808lc.hpp" %} -%include "ds1808lc.h" +%include "ds1808lc.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/ds1808lc/jsupm_ds1808lc.i b/src/ds1808lc/jsupm_ds1808lc.i index 2c5197da..5f8fa160 100644 --- a/src/ds1808lc/jsupm_ds1808lc.i +++ b/src/ds1808lc/jsupm_ds1808lc.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "ds1808lc.h" + #include "ds1808lc.hpp" %} -%include "ds1808lc.h" +%include "ds1808lc.hpp" diff --git a/src/ds1808lc/mraa-utils.cxx b/src/ds1808lc/mraa-utils.cxx index 3c12561d..b0e9d92c 100644 --- a/src/ds1808lc/mraa-utils.cxx +++ b/src/ds1808lc/mraa-utils.cxx @@ -22,7 +22,7 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "mraa-utils.h" +#include "mraa-utils.hpp" #include "mraa/gpio.hpp" #define UPM_THROW(msg) throw std::runtime_error(std::string(__FUNCTION__) + ": " + (msg)) diff --git a/src/si7005/mraa-utils.h b/src/ds1808lc/mraa-utils.hpp similarity index 100% rename from src/si7005/mraa-utils.h rename to src/ds1808lc/mraa-utils.hpp diff --git a/src/ds1808lc/pyupm_ds1808lc.i b/src/ds1808lc/pyupm_ds1808lc.i index 08d05920..4c2b34ac 100644 --- a/src/ds1808lc/pyupm_ds1808lc.i +++ b/src/ds1808lc/pyupm_ds1808lc.i @@ -3,7 +3,7 @@ %feature("autodoc", "3"); -%include "ds1808lc.h" +%include "ds1808lc.hpp" %{ - #include "ds1808lc.h" + #include "ds1808lc.hpp" %} diff --git a/src/e50hx/CMakeLists.txt b/src/e50hx/CMakeLists.txt index ca51dad3..48fd673f 100644 --- a/src/e50hx/CMakeLists.txt +++ b/src/e50hx/CMakeLists.txt @@ -1,7 +1,7 @@ set (libname "e50hx") set (libdescription "upm module for the Veris E50HX (E50H2/E50H5)Energy Meters") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) pkg_search_module(BACNET libbacnet) if (BACNET_FOUND) diff --git a/src/e50hx/e50hx.cxx b/src/e50hx/e50hx.cxx index 87f1acee..9b62ab50 100644 --- a/src/e50hx/e50hx.cxx +++ b/src/e50hx/e50hx.cxx @@ -29,7 +29,7 @@ #include #include -#include "e50hx.h" +#include "e50hx.hpp" using namespace upm; using namespace std; diff --git a/src/e50hx/e50hx.h b/src/e50hx/e50hx.hpp similarity index 99% rename from src/e50hx/e50hx.h rename to src/e50hx/e50hx.hpp index 5be7c593..615cb309 100644 --- a/src/e50hx/e50hx.h +++ b/src/e50hx/e50hx.hpp @@ -26,7 +26,7 @@ #include #include -#include "bacnetmstp.h" +#include "bacnetmstp.hpp" namespace upm { diff --git a/src/e50hx/javaupm_e50hx.i b/src/e50hx/javaupm_e50hx.i index 585723cf..caa78000 100644 --- a/src/e50hx/javaupm_e50hx.i +++ b/src/e50hx/javaupm_e50hx.i @@ -2,10 +2,10 @@ %include "../upm.i" %include "typemaps.i" -%include "bacnetmstp.h" -%include "e50hx.h" +%include "bacnetmstp.hpp" +%include "e50hx.hpp" %{ - #include "e50hx.h" + #include "e50hx.hpp" %} diff --git a/src/e50hx/jsupm_e50hx.i b/src/e50hx/jsupm_e50hx.i index 9826b237..daac7ae7 100644 --- a/src/e50hx/jsupm_e50hx.i +++ b/src/e50hx/jsupm_e50hx.i @@ -2,8 +2,8 @@ %include "../upm.i" %include "stdint.i" -%include "bacnetmstp.h" -%include "e50hx.h" +%include "bacnetmstp.hpp" +%include "e50hx.hpp" %{ - #include "e50hx.h" + #include "e50hx.hpp" %} diff --git a/src/e50hx/pyupm_e50hx.i b/src/e50hx/pyupm_e50hx.i index 7fe9e932..42a90fb8 100644 --- a/src/e50hx/pyupm_e50hx.i +++ b/src/e50hx/pyupm_e50hx.i @@ -6,8 +6,8 @@ %feature("autodoc", "3"); -%include "bacnetmstp.h" -%include "e50hx.h" +%include "bacnetmstp.hpp" +%include "e50hx.hpp" %{ - #include "e50hx.h" + #include "e50hx.hpp" %} diff --git a/src/ecs1030/CMakeLists.txt b/src/ecs1030/CMakeLists.txt index ccbe8dcc..caaf58ef 100644 --- a/src/ecs1030/CMakeLists.txt +++ b/src/ecs1030/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "ecs1030") set (libdescription "Non-invasive current sensor") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/ecs1030/ecs1030.cxx b/src/ecs1030/ecs1030.cxx index aa1c73a4..4db49fab 100644 --- a/src/ecs1030/ecs1030.cxx +++ b/src/ecs1030/ecs1030.cxx @@ -28,7 +28,7 @@ #include #include -#include "ecs1030.h" +#include "ecs1030.hpp" using namespace upm; diff --git a/src/ecs1030/ecs1030.h b/src/ecs1030/ecs1030.hpp similarity index 100% rename from src/ecs1030/ecs1030.h rename to src/ecs1030/ecs1030.hpp diff --git a/src/ecs1030/javaupm_ecs1030.i b/src/ecs1030/javaupm_ecs1030.i index 93f5c5ea..54ac2bb5 100644 --- a/src/ecs1030/javaupm_ecs1030.i +++ b/src/ecs1030/javaupm_ecs1030.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "ecs1030.h" + #include "ecs1030.hpp" %} -%include "ecs1030.h" +%include "ecs1030.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/ecs1030/jsupm_ecs1030.i b/src/ecs1030/jsupm_ecs1030.i index 12abd2c3..ce30b75c 100644 --- a/src/ecs1030/jsupm_ecs1030.i +++ b/src/ecs1030/jsupm_ecs1030.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "ecs1030.h" + #include "ecs1030.hpp" %} -%include "ecs1030.h" +%include "ecs1030.hpp" diff --git a/src/ecs1030/pyupm_ecs1030.i b/src/ecs1030/pyupm_ecs1030.i index 82c4d953..baf82d17 100644 --- a/src/ecs1030/pyupm_ecs1030.i +++ b/src/ecs1030/pyupm_ecs1030.i @@ -7,7 +7,7 @@ %feature("autodoc", "3"); -%include "ecs1030.h" +%include "ecs1030.hpp" %{ - #include "ecs1030.h" + #include "ecs1030.hpp" %} diff --git a/src/enc03r/CMakeLists.txt b/src/enc03r/CMakeLists.txt index 3fc04201..25bc77a4 100644 --- a/src/enc03r/CMakeLists.txt +++ b/src/enc03r/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "enc03r") set (libdescription "upm enc03r single axis analog gyro module") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/enc03r/enc03r.cxx b/src/enc03r/enc03r.cxx index 6b1faa84..ee2da1ea 100644 --- a/src/enc03r/enc03r.cxx +++ b/src/enc03r/enc03r.cxx @@ -26,7 +26,7 @@ #include #include -#include "enc03r.h" +#include "enc03r.hpp" using namespace upm; using namespace std; diff --git a/src/enc03r/enc03r.h b/src/enc03r/enc03r.hpp similarity index 100% rename from src/enc03r/enc03r.h rename to src/enc03r/enc03r.hpp diff --git a/src/enc03r/javaupm_enc03r.i b/src/enc03r/javaupm_enc03r.i index 2557969e..5f901ebd 100644 --- a/src/enc03r/javaupm_enc03r.i +++ b/src/enc03r/javaupm_enc03r.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "enc03r.h" + #include "enc03r.hpp" %} -%include "enc03r.h" +%include "enc03r.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/enc03r/jsupm_enc03r.i b/src/enc03r/jsupm_enc03r.i index b47cdd4d..5e150606 100644 --- a/src/enc03r/jsupm_enc03r.i +++ b/src/enc03r/jsupm_enc03r.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "enc03r.h" + #include "enc03r.hpp" %} -%include "enc03r.h" +%include "enc03r.hpp" diff --git a/src/enc03r/pyupm_enc03r.i b/src/enc03r/pyupm_enc03r.i index c50e66ad..c76cd030 100644 --- a/src/enc03r/pyupm_enc03r.i +++ b/src/enc03r/pyupm_enc03r.i @@ -5,7 +5,7 @@ %feature("autodoc", "3"); -%include "enc03r.h" +%include "enc03r.hpp" %{ - #include "enc03r.h" + #include "enc03r.hpp" %} diff --git a/src/flex/CMakeLists.txt b/src/flex/CMakeLists.txt index 57692812..e1410530 100644 --- a/src/flex/CMakeLists.txt +++ b/src/flex/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "flex") set (libdescription "upm flex sensor module") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/flex/flex.cxx b/src/flex/flex.cxx index 4e63362e..0ab1d738 100644 --- a/src/flex/flex.cxx +++ b/src/flex/flex.cxx @@ -26,7 +26,7 @@ #include #include -#include "flex.h" +#include "flex.hpp" using namespace upm; using namespace std; diff --git a/src/flex/flex.h b/src/flex/flex.hpp similarity index 100% rename from src/flex/flex.h rename to src/flex/flex.hpp diff --git a/src/flex/javaupm_flex.i b/src/flex/javaupm_flex.i index fc28dcf9..b4017c5b 100644 --- a/src/flex/javaupm_flex.i +++ b/src/flex/javaupm_flex.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "flex.h" + #include "flex.hpp" %} -%include "flex.h" +%include "flex.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/flex/jsupm_flex.i b/src/flex/jsupm_flex.i index 12c45f3e..eba2fd85 100644 --- a/src/flex/jsupm_flex.i +++ b/src/flex/jsupm_flex.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "flex.h" + #include "flex.hpp" %} -%include "flex.h" +%include "flex.hpp" diff --git a/src/flex/pyupm_flex.i b/src/flex/pyupm_flex.i index e9646897..9036994b 100644 --- a/src/flex/pyupm_flex.i +++ b/src/flex/pyupm_flex.i @@ -5,7 +5,7 @@ %feature("autodoc", "3"); -%include "flex.h" +%include "flex.hpp" %{ - #include "flex.h" + #include "flex.hpp" %} diff --git a/src/gas/CMakeLists.txt b/src/gas/CMakeLists.txt index 9d50cc24..76b36cab 100644 --- a/src/gas/CMakeLists.txt +++ b/src/gas/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "gas") set (libdescription "Gas sensors") set (module_src ${libname}.cxx mq2.cxx mq3.cxx mq4.cxx mq5.cxx mq6.cxx mq7.cxx mq8.cxx mq9.cxx tp401.cxx) -set (module_h ${libname}.h mq2.h mq3.h mq4.h mq5.h mq6.h mq7.h mq8.h mq9.h tp401.h) +set (module_hpp ${libname}.hpp mq2.hpp mq3.hpp mq4.hpp mq5.hpp mq6.hpp mq7.hpp mq8.hpp mq9.hpp tp401.hpp) upm_module_init() diff --git a/src/gas/gas.cxx b/src/gas/gas.cxx index a43b82c3..1fd0a497 100644 --- a/src/gas/gas.cxx +++ b/src/gas/gas.cxx @@ -28,7 +28,7 @@ #include #include #include -#include "gas.h" +#include "gas.hpp" using namespace upm; diff --git a/src/gas/gas.h b/src/gas/gas.hpp similarity index 100% rename from src/gas/gas.h rename to src/gas/gas.hpp diff --git a/src/gas/javaupm_gas.i b/src/gas/javaupm_gas.i index fc3b016e..6e87530c 100644 --- a/src/gas/javaupm_gas.i +++ b/src/gas/javaupm_gas.i @@ -3,16 +3,16 @@ %include "typemaps.i" %{ - #include "gas.h" - #include "mq2.h" - #include "mq3.h" - #include "mq4.h" - #include "mq5.h" - #include "mq6.h" - #include "mq7.h" - #include "mq8.h" - #include "mq9.h" - #include "tp401.h" + #include "gas.hpp" + #include "mq2.hpp" + #include "mq3.hpp" + #include "mq4.hpp" + #include "mq5.hpp" + #include "mq6.hpp" + #include "mq7.hpp" + #include "mq8.hpp" + #include "mq9.hpp" + #include "tp401.hpp" %} %typemap(jni) (uint16_t *buffer, int len) "jshortArray"; @@ -45,16 +45,16 @@ JCALL3(ReleaseShortArrayElements, jenv, $input, (jshort *)$2, 0); } -%include "gas.h" -%include "mq2.h" -%include "mq3.h" -%include "mq4.h" -%include "mq5.h" -%include "mq6.h" -%include "mq7.h" -%include "mq8.h" -%include "mq9.h" -%include "tp401.h" +%include "gas.hpp" +%include "mq2.hpp" +%include "mq3.hpp" +%include "mq4.hpp" +%include "mq5.hpp" +%include "mq6.hpp" +%include "mq7.hpp" +%include "mq8.hpp" +%include "mq9.hpp" +%include "tp401.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/gas/jsupm_gas.i b/src/gas/jsupm_gas.i index 25a50971..add44b1b 100644 --- a/src/gas/jsupm_gas.i +++ b/src/gas/jsupm_gas.i @@ -2,52 +2,52 @@ %include "../upm.i" %include "../carrays_uint16_t.i" -%include "gas.h" +%include "gas.hpp" %{ - #include "gas.h" + #include "gas.hpp" %} -%include "mq2.h" +%include "mq2.hpp" %{ - #include "mq2.h" + #include "mq2.hpp" %} -%include "mq3.h" +%include "mq3.hpp" %{ - #include "mq3.h" + #include "mq3.hpp" %} -%include "mq4.h" +%include "mq4.hpp" %{ - #include "mq4.h" + #include "mq4.hpp" %} -%include "mq5.h" +%include "mq5.hpp" %{ - #include "mq5.h" + #include "mq5.hpp" %} -%include "mq6.h" +%include "mq6.hpp" %{ - #include "mq6.h" + #include "mq6.hpp" %} -%include "mq7.h" +%include "mq7.hpp" %{ - #include "mq7.h" + #include "mq7.hpp" %} -%include "mq8.h" +%include "mq8.hpp" %{ - #include "mq8.h" + #include "mq8.hpp" %} -%include "mq9.h" +%include "mq9.hpp" %{ - #include "mq9.h" + #include "mq9.hpp" %} -%include "tp401.h" +%include "tp401.hpp" %{ - #include "tp401.h" + #include "tp401.hpp" %} diff --git a/src/gas/mq2.cxx b/src/gas/mq2.cxx index d91dc358..913c66a1 100644 --- a/src/gas/mq2.cxx +++ b/src/gas/mq2.cxx @@ -22,7 +22,7 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "mq2.h" +#include "mq2.hpp" using namespace upm; diff --git a/src/gas/mq2.h b/src/gas/mq2.hpp similarity index 99% rename from src/gas/mq2.h rename to src/gas/mq2.hpp index a30d7377..6126bdeb 100644 --- a/src/gas/mq2.h +++ b/src/gas/mq2.hpp @@ -25,7 +25,7 @@ #include #include -#include "gas.h" +#include "gas.hpp" namespace upm { /** diff --git a/src/gas/mq3.cxx b/src/gas/mq3.cxx index f000a708..609c885e 100644 --- a/src/gas/mq3.cxx +++ b/src/gas/mq3.cxx @@ -22,7 +22,7 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "mq3.h" +#include "mq3.hpp" using namespace upm; diff --git a/src/gas/mq3.h b/src/gas/mq3.hpp similarity index 99% rename from src/gas/mq3.h rename to src/gas/mq3.hpp index 295e2aa6..fb0af324 100644 --- a/src/gas/mq3.h +++ b/src/gas/mq3.hpp @@ -25,7 +25,7 @@ #include #include -#include "gas.h" +#include "gas.hpp" namespace upm { /** diff --git a/src/gas/mq4.cxx b/src/gas/mq4.cxx index ac136ce4..be07eb44 100644 --- a/src/gas/mq4.cxx +++ b/src/gas/mq4.cxx @@ -22,7 +22,7 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "mq4.h" +#include "mq4.hpp" using namespace upm; diff --git a/src/gas/mq4.h b/src/gas/mq4.hpp similarity index 99% rename from src/gas/mq4.h rename to src/gas/mq4.hpp index 581c9083..f06a229a 100644 --- a/src/gas/mq4.h +++ b/src/gas/mq4.hpp @@ -25,7 +25,7 @@ #include #include -#include "gas.h" +#include "gas.hpp" namespace upm { /** diff --git a/src/gas/mq5.cxx b/src/gas/mq5.cxx index 8d1536fd..ae0fcdef 100644 --- a/src/gas/mq5.cxx +++ b/src/gas/mq5.cxx @@ -22,7 +22,7 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "mq5.h" +#include "mq5.hpp" using namespace upm; diff --git a/src/gas/mq5.h b/src/gas/mq5.hpp similarity index 99% rename from src/gas/mq5.h rename to src/gas/mq5.hpp index ec176f7e..2218b091 100644 --- a/src/gas/mq5.h +++ b/src/gas/mq5.hpp @@ -25,7 +25,7 @@ #include #include -#include "gas.h" +#include "gas.hpp" namespace upm { /** diff --git a/src/gas/mq6.cxx b/src/gas/mq6.cxx index 90fae152..023ade22 100644 --- a/src/gas/mq6.cxx +++ b/src/gas/mq6.cxx @@ -22,7 +22,7 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "mq6.h" +#include "mq6.hpp" using namespace upm; diff --git a/src/gas/mq6.h b/src/gas/mq6.hpp similarity index 99% rename from src/gas/mq6.h rename to src/gas/mq6.hpp index fafa7fd1..7a77b093 100644 --- a/src/gas/mq6.h +++ b/src/gas/mq6.hpp @@ -25,7 +25,7 @@ #include #include -#include "gas.h" +#include "gas.hpp" namespace upm { /** diff --git a/src/gas/mq7.cxx b/src/gas/mq7.cxx index 76201a49..c6a34634 100644 --- a/src/gas/mq7.cxx +++ b/src/gas/mq7.cxx @@ -22,7 +22,7 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "mq7.h" +#include "mq7.hpp" using namespace upm; diff --git a/src/gas/mq7.h b/src/gas/mq7.hpp similarity index 99% rename from src/gas/mq7.h rename to src/gas/mq7.hpp index 1550a3e0..4707c5b6 100644 --- a/src/gas/mq7.h +++ b/src/gas/mq7.hpp @@ -25,7 +25,7 @@ #include #include -#include "gas.h" +#include "gas.hpp" namespace upm { /** diff --git a/src/gas/mq8.cxx b/src/gas/mq8.cxx index 667eab50..bc6e0a96 100644 --- a/src/gas/mq8.cxx +++ b/src/gas/mq8.cxx @@ -22,7 +22,7 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "mq8.h" +#include "mq8.hpp" using namespace upm; diff --git a/src/gas/mq8.h b/src/gas/mq8.hpp similarity index 99% rename from src/gas/mq8.h rename to src/gas/mq8.hpp index 10bc7a4f..3f7f780d 100644 --- a/src/gas/mq8.h +++ b/src/gas/mq8.hpp @@ -25,7 +25,7 @@ #include #include -#include "gas.h" +#include "gas.hpp" namespace upm { /** diff --git a/src/gas/mq9.cxx b/src/gas/mq9.cxx index f9ee171a..bd7aa740 100644 --- a/src/gas/mq9.cxx +++ b/src/gas/mq9.cxx @@ -22,7 +22,7 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "mq9.h" +#include "mq9.hpp" using namespace upm; diff --git a/src/gas/mq9.h b/src/gas/mq9.hpp similarity index 99% rename from src/gas/mq9.h rename to src/gas/mq9.hpp index dada03a3..41d87917 100644 --- a/src/gas/mq9.h +++ b/src/gas/mq9.hpp @@ -25,7 +25,7 @@ #include #include -#include "gas.h" +#include "gas.hpp" namespace upm { /** diff --git a/src/gas/pyupm_gas.i b/src/gas/pyupm_gas.i index 1af489d7..7029ccff 100644 --- a/src/gas/pyupm_gas.i +++ b/src/gas/pyupm_gas.i @@ -6,52 +6,52 @@ %feature("autodoc", "3"); -%include "gas.h" +%include "gas.hpp" %{ - #include "gas.h" + #include "gas.hpp" %} -%include "mq2.h" +%include "mq2.hpp" %{ - #include "mq2.h" + #include "mq2.hpp" %} -%include "mq3.h" +%include "mq3.hpp" %{ - #include "mq3.h" + #include "mq3.hpp" %} -%include "mq4.h" +%include "mq4.hpp" %{ - #include "mq4.h" + #include "mq4.hpp" %} -%include "mq5.h" +%include "mq5.hpp" %{ - #include "mq5.h" + #include "mq5.hpp" %} -%include "mq6.h" +%include "mq6.hpp" %{ - #include "mq6.h" + #include "mq6.hpp" %} -%include "mq7.h" +%include "mq7.hpp" %{ - #include "mq7.h" + #include "mq7.hpp" %} -%include "mq8.h" +%include "mq8.hpp" %{ - #include "mq8.h" + #include "mq8.hpp" %} -%include "mq9.h" +%include "mq9.hpp" %{ - #include "mq9.h" + #include "mq9.hpp" %} -%include "tp401.h" +%include "tp401.hpp" %{ - #include "tp401.h" + #include "tp401.hpp" %} diff --git a/src/gas/tp401.cxx b/src/gas/tp401.cxx index 94263551..6df491c6 100644 --- a/src/gas/tp401.cxx +++ b/src/gas/tp401.cxx @@ -22,7 +22,7 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "tp401.h" +#include "tp401.hpp" using namespace upm; diff --git a/src/gas/tp401.h b/src/gas/tp401.hpp similarity index 99% rename from src/gas/tp401.h rename to src/gas/tp401.hpp index 494cbb58..14b15c03 100644 --- a/src/gas/tp401.h +++ b/src/gas/tp401.hpp @@ -25,7 +25,7 @@ #include #include -#include "gas.h" +#include "gas.hpp" namespace upm { /** diff --git a/src/gp2y0a/CMakeLists.txt b/src/gp2y0a/CMakeLists.txt index ddb50a55..e6b56ec9 100644 --- a/src/gp2y0a/CMakeLists.txt +++ b/src/gp2y0a/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "gp2y0a") set (libdescription "upm gp2y0a family of IR distance detectors") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/gp2y0a/gp2y0a.cxx b/src/gp2y0a/gp2y0a.cxx index 07abc7d3..ecc8fd6c 100644 --- a/src/gp2y0a/gp2y0a.cxx +++ b/src/gp2y0a/gp2y0a.cxx @@ -26,7 +26,7 @@ #include #include -#include "gp2y0a.h" +#include "gp2y0a.hpp" using namespace std; using namespace upm; diff --git a/src/gp2y0a/gp2y0a.h b/src/gp2y0a/gp2y0a.hpp similarity index 100% rename from src/gp2y0a/gp2y0a.h rename to src/gp2y0a/gp2y0a.hpp diff --git a/src/gp2y0a/javaupm_gp2y0a.i b/src/gp2y0a/javaupm_gp2y0a.i index 8b2f7610..7edfcea5 100644 --- a/src/gp2y0a/javaupm_gp2y0a.i +++ b/src/gp2y0a/javaupm_gp2y0a.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "gp2y0a.h" + #include "gp2y0a.hpp" %} -%include "gp2y0a.h" +%include "gp2y0a.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/gp2y0a/jsupm_gp2y0a.i b/src/gp2y0a/jsupm_gp2y0a.i index 95eaad2d..81f731f2 100644 --- a/src/gp2y0a/jsupm_gp2y0a.i +++ b/src/gp2y0a/jsupm_gp2y0a.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "gp2y0a.h" + #include "gp2y0a.hpp" %} -%include "gp2y0a.h" +%include "gp2y0a.hpp" diff --git a/src/gp2y0a/pyupm_gp2y0a.i b/src/gp2y0a/pyupm_gp2y0a.i index dba38d38..dab897ae 100644 --- a/src/gp2y0a/pyupm_gp2y0a.i +++ b/src/gp2y0a/pyupm_gp2y0a.i @@ -5,7 +5,7 @@ %feature("autodoc", "3"); -%include "gp2y0a.h" +%include "gp2y0a.hpp" %{ - #include "gp2y0a.h" + #include "gp2y0a.hpp" %} diff --git a/src/grove/CMakeLists.txt b/src/grove/CMakeLists.txt index c102c2e2..e76ac5dd 100644 --- a/src/grove/CMakeLists.txt +++ b/src/grove/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "grove") set (libdescription "upm grove module") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/grove/grove.cxx b/src/grove/grove.cxx index 4be1f3e8..6140f20c 100644 --- a/src/grove/grove.cxx +++ b/src/grove/grove.cxx @@ -28,7 +28,7 @@ #include #include -#include "grove.h" +#include "grove.hpp" #include "math.h" using namespace upm; diff --git a/src/grove/grove.h b/src/grove/grove.hpp similarity index 100% rename from src/grove/grove.h rename to src/grove/grove.hpp diff --git a/src/grove/grovebutton.h b/src/grove/grovebutton.hpp similarity index 100% rename from src/grove/grovebutton.h rename to src/grove/grovebutton.hpp diff --git a/src/grove/groveled.h b/src/grove/groveled.hpp similarity index 100% rename from src/grove/groveled.h rename to src/grove/groveled.hpp diff --git a/src/grove/grovelight.h b/src/grove/grovelight.hpp similarity index 100% rename from src/grove/grovelight.h rename to src/grove/grovelight.hpp diff --git a/src/grove/groverelay.h b/src/grove/groverelay.hpp similarity index 100% rename from src/grove/groverelay.h rename to src/grove/groverelay.hpp diff --git a/src/grove/groverotary.h b/src/grove/groverotary.hpp similarity index 100% rename from src/grove/groverotary.h rename to src/grove/groverotary.hpp diff --git a/src/grove/groveslide.h b/src/grove/groveslide.hpp similarity index 100% rename from src/grove/groveslide.h rename to src/grove/groveslide.hpp diff --git a/src/grove/grovetemp.h b/src/grove/grovetemp.hpp similarity index 100% rename from src/grove/grovetemp.h rename to src/grove/grovetemp.hpp diff --git a/src/grove/javaupm_grove.i b/src/grove/javaupm_grove.i index ab9636b7..72cc8ad7 100644 --- a/src/grove/javaupm_grove.i +++ b/src/grove/javaupm_grove.i @@ -5,10 +5,10 @@ %apply int {mraa::Edge} %{ - #include "grove.h" + #include "grove.hpp" %} -%include "grove.h" +%include "grove.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/grove/jsupm_grove.i b/src/grove/jsupm_grove.i index b1f9e7dd..59269d99 100644 --- a/src/grove/jsupm_grove.i +++ b/src/grove/jsupm_grove.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "grove.h" + #include "grove.hpp" %} -%include "grove.h" +%include "grove.hpp" diff --git a/src/grove/pyupm_grove.i b/src/grove/pyupm_grove.i index b61c155c..1edd8028 100644 --- a/src/grove/pyupm_grove.i +++ b/src/grove/pyupm_grove.i @@ -9,7 +9,7 @@ %include "grove_doc.i" #endif -%include "grove.h" +%include "grove.hpp" %{ - #include "grove.h" + #include "grove.hpp" %} diff --git a/src/grovecollision/CMakeLists.txt b/src/grovecollision/CMakeLists.txt index 0bdce67b..38a5b34d 100644 --- a/src/grovecollision/CMakeLists.txt +++ b/src/grovecollision/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "grovecollision") set (libdescription "upm grovecollision sensor module") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init("-lrt") diff --git a/src/grovecollision/grovecollision.cxx b/src/grovecollision/grovecollision.cxx index fd8aa9bd..d83e02ea 100644 --- a/src/grovecollision/grovecollision.cxx +++ b/src/grovecollision/grovecollision.cxx @@ -25,7 +25,7 @@ #include #include -#include "grovecollision.h" +#include "grovecollision.hpp" using namespace upm; diff --git a/src/grovecollision/grovecollision.h b/src/grovecollision/grovecollision.hpp similarity index 100% rename from src/grovecollision/grovecollision.h rename to src/grovecollision/grovecollision.hpp diff --git a/src/grovecollision/javaupm_grovecollision.i b/src/grovecollision/javaupm_grovecollision.i index 7cb10497..39b50252 100644 --- a/src/grovecollision/javaupm_grovecollision.i +++ b/src/grovecollision/javaupm_grovecollision.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "grovecollision.h" + #include "grovecollision.hpp" %} -%include "grovecollision.h" +%include "grovecollision.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/grovecollision/jsupm_grovecollision.i b/src/grovecollision/jsupm_grovecollision.i index 5164b3e2..7cd1ca0b 100644 --- a/src/grovecollision/jsupm_grovecollision.i +++ b/src/grovecollision/jsupm_grovecollision.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "grovecollision.h" + #include "grovecollision.hpp" %} -%include "grovecollision.h" +%include "grovecollision.hpp" diff --git a/src/grovecollision/pyupm_grovecollision.i b/src/grovecollision/pyupm_grovecollision.i index 3d128a04..7ce2d3f7 100644 --- a/src/grovecollision/pyupm_grovecollision.i +++ b/src/grovecollision/pyupm_grovecollision.i @@ -5,7 +5,7 @@ %feature("autodoc", "3"); -%include "grovecollision.h" +%include "grovecollision.hpp" %{ - #include "grovecollision.h" + #include "grovecollision.hpp" %} diff --git a/src/groveehr/CMakeLists.txt b/src/groveehr/CMakeLists.txt index 32efe5a8..f53d9c2e 100644 --- a/src/groveehr/CMakeLists.txt +++ b/src/groveehr/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "groveehr") set (libdescription "upm grove ear-clip heart rate sensor module") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/groveehr/groveehr.cxx b/src/groveehr/groveehr.cxx index d2b0cd95..953e5f5a 100644 --- a/src/groveehr/groveehr.cxx +++ b/src/groveehr/groveehr.cxx @@ -26,7 +26,7 @@ #include #include -#include "groveehr.h" +#include "groveehr.hpp" using namespace upm; using namespace std; diff --git a/src/groveehr/groveehr.h b/src/groveehr/groveehr.hpp similarity index 100% rename from src/groveehr/groveehr.h rename to src/groveehr/groveehr.hpp diff --git a/src/groveehr/javaupm_groveehr.i b/src/groveehr/javaupm_groveehr.i index 2b5d110e..2ac1d9c4 100644 --- a/src/groveehr/javaupm_groveehr.i +++ b/src/groveehr/javaupm_groveehr.i @@ -4,10 +4,10 @@ %ignore beatISR; %{ - #include "groveehr.h" + #include "groveehr.hpp" %} -%include "groveehr.h" +%include "groveehr.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/groveehr/jsupm_groveehr.i b/src/groveehr/jsupm_groveehr.i index 9c324bae..3005cc9f 100644 --- a/src/groveehr/jsupm_groveehr.i +++ b/src/groveehr/jsupm_groveehr.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "groveehr.h" + #include "groveehr.hpp" %} -%include "groveehr.h" +%include "groveehr.hpp" diff --git a/src/groveehr/pyupm_groveehr.i b/src/groveehr/pyupm_groveehr.i index 0568df49..002a85e1 100644 --- a/src/groveehr/pyupm_groveehr.i +++ b/src/groveehr/pyupm_groveehr.i @@ -5,7 +5,7 @@ %feature("autodoc", "3"); -%include "groveehr.h" +%include "groveehr.hpp" %{ - #include "groveehr.h" + #include "groveehr.hpp" %} diff --git a/src/groveeldriver/CMakeLists.txt b/src/groveeldriver/CMakeLists.txt index 9ce5b02b..2ed19797 100644 --- a/src/groveeldriver/CMakeLists.txt +++ b/src/groveeldriver/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "groveeldriver") set (libdescription "upm groveeldriver sensor module") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init("-lrt") diff --git a/src/groveeldriver/groveeldriver.cxx b/src/groveeldriver/groveeldriver.cxx index c8755d66..322d6660 100644 --- a/src/groveeldriver/groveeldriver.cxx +++ b/src/groveeldriver/groveeldriver.cxx @@ -25,7 +25,7 @@ #include #include -#include "groveeldriver.h" +#include "groveeldriver.hpp" using namespace upm; diff --git a/src/groveeldriver/groveeldriver.h b/src/groveeldriver/groveeldriver.hpp similarity index 100% rename from src/groveeldriver/groveeldriver.h rename to src/groveeldriver/groveeldriver.hpp diff --git a/src/groveeldriver/javaupm_groveeldriver.i b/src/groveeldriver/javaupm_groveeldriver.i index 061329cf..f6e67877 100644 --- a/src/groveeldriver/javaupm_groveeldriver.i +++ b/src/groveeldriver/javaupm_groveeldriver.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "groveeldriver.h" + #include "groveeldriver.hpp" %} -%include "groveeldriver.h" +%include "groveeldriver.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/groveeldriver/jsupm_groveeldriver.i b/src/groveeldriver/jsupm_groveeldriver.i index 28964e8e..bfd05ac1 100644 --- a/src/groveeldriver/jsupm_groveeldriver.i +++ b/src/groveeldriver/jsupm_groveeldriver.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "groveeldriver.h" + #include "groveeldriver.hpp" %} -%include "groveeldriver.h" +%include "groveeldriver.hpp" diff --git a/src/groveeldriver/pyupm_groveeldriver.i b/src/groveeldriver/pyupm_groveeldriver.i index 057367bf..002797d3 100644 --- a/src/groveeldriver/pyupm_groveeldriver.i +++ b/src/groveeldriver/pyupm_groveeldriver.i @@ -5,7 +5,7 @@ %feature("autodoc", "3"); -%include "groveeldriver.h" +%include "groveeldriver.hpp" %{ - #include "groveeldriver.h" + #include "groveeldriver.hpp" %} diff --git a/src/groveelectromagnet/CMakeLists.txt b/src/groveelectromagnet/CMakeLists.txt index 69b1d88f..a12d3715 100644 --- a/src/groveelectromagnet/CMakeLists.txt +++ b/src/groveelectromagnet/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "groveelectromagnet") set (libdescription "upm groveelectromagnet sensor module") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init("-lrt") diff --git a/src/groveelectromagnet/groveelectromagnet.cxx b/src/groveelectromagnet/groveelectromagnet.cxx index d3e118da..e7206f7e 100644 --- a/src/groveelectromagnet/groveelectromagnet.cxx +++ b/src/groveelectromagnet/groveelectromagnet.cxx @@ -25,7 +25,7 @@ #include #include -#include "groveelectromagnet.h" +#include "groveelectromagnet.hpp" using namespace upm; diff --git a/src/groveelectromagnet/groveelectromagnet.h b/src/groveelectromagnet/groveelectromagnet.hpp similarity index 100% rename from src/groveelectromagnet/groveelectromagnet.h rename to src/groveelectromagnet/groveelectromagnet.hpp diff --git a/src/groveelectromagnet/javaupm_groveelectromagnet.i b/src/groveelectromagnet/javaupm_groveelectromagnet.i index 5def2836..ecfffde1 100644 --- a/src/groveelectromagnet/javaupm_groveelectromagnet.i +++ b/src/groveelectromagnet/javaupm_groveelectromagnet.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "groveelectromagnet.h" + #include "groveelectromagnet.hpp" %} -%include "groveelectromagnet.h" +%include "groveelectromagnet.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/groveelectromagnet/jsupm_groveelectromagnet.i b/src/groveelectromagnet/jsupm_groveelectromagnet.i index 323a8fb7..62d5ac9b 100644 --- a/src/groveelectromagnet/jsupm_groveelectromagnet.i +++ b/src/groveelectromagnet/jsupm_groveelectromagnet.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "groveelectromagnet.h" + #include "groveelectromagnet.hpp" %} -%include "groveelectromagnet.h" +%include "groveelectromagnet.hpp" diff --git a/src/groveelectromagnet/pyupm_groveelectromagnet.i b/src/groveelectromagnet/pyupm_groveelectromagnet.i index 8102266c..82492c30 100644 --- a/src/groveelectromagnet/pyupm_groveelectromagnet.i +++ b/src/groveelectromagnet/pyupm_groveelectromagnet.i @@ -5,7 +5,7 @@ %feature("autodoc", "3"); -%include "groveelectromagnet.h" +%include "groveelectromagnet.hpp" %{ - #include "groveelectromagnet.h" + #include "groveelectromagnet.hpp" %} diff --git a/src/groveemg/CMakeLists.txt b/src/groveemg/CMakeLists.txt index 7e2388db..a65dec3d 100644 --- a/src/groveemg/CMakeLists.txt +++ b/src/groveemg/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "groveemg") set (libdescription "upm groveemg muscle signal reader sensor module") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/groveemg/groveemg.cxx b/src/groveemg/groveemg.cxx index 17f3d251..2685dfda 100644 --- a/src/groveemg/groveemg.cxx +++ b/src/groveemg/groveemg.cxx @@ -26,7 +26,7 @@ #include #include -#include "groveemg.h" +#include "groveemg.hpp" using namespace upm; using namespace std; diff --git a/src/groveemg/groveemg.h b/src/groveemg/groveemg.hpp similarity index 100% rename from src/groveemg/groveemg.h rename to src/groveemg/groveemg.hpp diff --git a/src/groveemg/javaupm_groveemg.i b/src/groveemg/javaupm_groveemg.i index c829829f..9c66328b 100644 --- a/src/groveemg/javaupm_groveemg.i +++ b/src/groveemg/javaupm_groveemg.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "groveemg.h" + #include "groveemg.hpp" %} -%include "groveemg.h" +%include "groveemg.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/groveemg/jsupm_groveemg.i b/src/groveemg/jsupm_groveemg.i index 7cac0459..99041721 100644 --- a/src/groveemg/jsupm_groveemg.i +++ b/src/groveemg/jsupm_groveemg.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "groveemg.h" + #include "groveemg.hpp" %} -%include "groveemg.h" +%include "groveemg.hpp" diff --git a/src/groveemg/pyupm_groveemg.i b/src/groveemg/pyupm_groveemg.i index 8bccef28..09ce0c92 100644 --- a/src/groveemg/pyupm_groveemg.i +++ b/src/groveemg/pyupm_groveemg.i @@ -5,7 +5,7 @@ %feature("autodoc", "3"); -%include "groveemg.h" +%include "groveemg.hpp" %{ - #include "groveemg.h" + #include "groveemg.hpp" %} diff --git a/src/grovegprs/CMakeLists.txt b/src/grovegprs/CMakeLists.txt index 524cb362..85a8397d 100644 --- a/src/grovegprs/CMakeLists.txt +++ b/src/grovegprs/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "grovegprs") set (libdescription "upm grove GPRS module") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/grovegprs/grovegprs.cxx b/src/grovegprs/grovegprs.cxx index 4f83bc84..8634cd48 100644 --- a/src/grovegprs/grovegprs.cxx +++ b/src/grovegprs/grovegprs.cxx @@ -24,7 +24,7 @@ #include -#include "grovegprs.h" +#include "grovegprs.hpp" using namespace upm; using namespace std; diff --git a/src/grovegprs/grovegprs.h b/src/grovegprs/grovegprs.hpp similarity index 100% rename from src/grovegprs/grovegprs.h rename to src/grovegprs/grovegprs.hpp diff --git a/src/grovegprs/javaupm_grovegprs.i b/src/grovegprs/javaupm_grovegprs.i index e0486267..29972361 100644 --- a/src/grovegprs/javaupm_grovegprs.i +++ b/src/grovegprs/javaupm_grovegprs.i @@ -4,10 +4,10 @@ %include "std_string.i" %{ - #include "grovegprs.h" + #include "grovegprs.hpp" %} -%include "grovegprs.h" +%include "grovegprs.hpp" %array_class(char, charArray); %pragma(java) jniclasscode=%{ diff --git a/src/grovegprs/jsupm_grovegprs.i b/src/grovegprs/jsupm_grovegprs.i index a4f05561..bd14764f 100644 --- a/src/grovegprs/jsupm_grovegprs.i +++ b/src/grovegprs/jsupm_grovegprs.i @@ -4,8 +4,8 @@ %include "std_string.i" %{ - #include "grovegprs.h" + #include "grovegprs.hpp" %} -%include "grovegprs.h" +%include "grovegprs.hpp" %array_class(char, charArray); diff --git a/src/grovegprs/pyupm_grovegprs.i b/src/grovegprs/pyupm_grovegprs.i index 46567e9f..04e11787 100644 --- a/src/grovegprs/pyupm_grovegprs.i +++ b/src/grovegprs/pyupm_grovegprs.i @@ -8,7 +8,7 @@ %feature("autodoc", "3"); %{ - #include "grovegprs.h" + #include "grovegprs.hpp" %} -%include "grovegprs.h" +%include "grovegprs.hpp" %array_class(char, charArray); diff --git a/src/grovegsr/CMakeLists.txt b/src/grovegsr/CMakeLists.txt index 051ad082..d352cdd7 100644 --- a/src/grovegsr/CMakeLists.txt +++ b/src/grovegsr/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "grovegsr") set (libdescription "upm grovegsr galvanic skin response sensor module") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/grovegsr/grovegsr.cxx b/src/grovegsr/grovegsr.cxx index 0d7669d4..487fb223 100644 --- a/src/grovegsr/grovegsr.cxx +++ b/src/grovegsr/grovegsr.cxx @@ -26,7 +26,7 @@ #include #include -#include "grovegsr.h" +#include "grovegsr.hpp" using namespace upm; using namespace std; diff --git a/src/grovegsr/grovegsr.h b/src/grovegsr/grovegsr.hpp similarity index 100% rename from src/grovegsr/grovegsr.h rename to src/grovegsr/grovegsr.hpp diff --git a/src/grovegsr/javaupm_grovegsr.i b/src/grovegsr/javaupm_grovegsr.i index 658146d8..22e27b0c 100644 --- a/src/grovegsr/javaupm_grovegsr.i +++ b/src/grovegsr/javaupm_grovegsr.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "grovegsr.h" + #include "grovegsr.hpp" %} -%include "grovegsr.h" +%include "grovegsr.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/grovegsr/jsupm_grovegsr.i b/src/grovegsr/jsupm_grovegsr.i index d1ec0165..5ee875bc 100644 --- a/src/grovegsr/jsupm_grovegsr.i +++ b/src/grovegsr/jsupm_grovegsr.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "grovegsr.h" + #include "grovegsr.hpp" %} -%include "grovegsr.h" +%include "grovegsr.hpp" diff --git a/src/grovegsr/pyupm_grovegsr.i b/src/grovegsr/pyupm_grovegsr.i index 6e1a7cee..92a30c2f 100644 --- a/src/grovegsr/pyupm_grovegsr.i +++ b/src/grovegsr/pyupm_grovegsr.i @@ -5,7 +5,7 @@ %feature("autodoc", "3"); -%include "grovegsr.h" +%include "grovegsr.hpp" %{ - #include "grovegsr.h" + #include "grovegsr.hpp" %} diff --git a/src/grovelinefinder/CMakeLists.txt b/src/grovelinefinder/CMakeLists.txt index 46d22e97..04ee8b44 100644 --- a/src/grovelinefinder/CMakeLists.txt +++ b/src/grovelinefinder/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "grovelinefinder") set (libdescription "upm grove line finder sensor module") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/grovelinefinder/grovelinefinder.cxx b/src/grovelinefinder/grovelinefinder.cxx index 297f526a..3f4f55ce 100644 --- a/src/grovelinefinder/grovelinefinder.cxx +++ b/src/grovelinefinder/grovelinefinder.cxx @@ -26,7 +26,7 @@ #include #include -#include "grovelinefinder.h" +#include "grovelinefinder.hpp" using namespace upm; using namespace std; diff --git a/src/grovelinefinder/grovelinefinder.h b/src/grovelinefinder/grovelinefinder.hpp similarity index 100% rename from src/grovelinefinder/grovelinefinder.h rename to src/grovelinefinder/grovelinefinder.hpp diff --git a/src/grovelinefinder/javaupm_grovelinefinder.i b/src/grovelinefinder/javaupm_grovelinefinder.i index bee2ffd4..ebad50a8 100644 --- a/src/grovelinefinder/javaupm_grovelinefinder.i +++ b/src/grovelinefinder/javaupm_grovelinefinder.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "grovelinefinder.h" + #include "grovelinefinder.hpp" %} -%include "grovelinefinder.h" +%include "grovelinefinder.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/grovelinefinder/jsupm_grovelinefinder.i b/src/grovelinefinder/jsupm_grovelinefinder.i index e379f37b..174f4b42 100644 --- a/src/grovelinefinder/jsupm_grovelinefinder.i +++ b/src/grovelinefinder/jsupm_grovelinefinder.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "grovelinefinder.h" + #include "grovelinefinder.hpp" %} -%include "grovelinefinder.h" +%include "grovelinefinder.hpp" diff --git a/src/grovelinefinder/pyupm_grovelinefinder.i b/src/grovelinefinder/pyupm_grovelinefinder.i index 3e58d210..99832ebe 100644 --- a/src/grovelinefinder/pyupm_grovelinefinder.i +++ b/src/grovelinefinder/pyupm_grovelinefinder.i @@ -5,7 +5,7 @@ %feature("autodoc", "3"); -%include "grovelinefinder.h" +%include "grovelinefinder.hpp" %{ - #include "grovelinefinder.h" + #include "grovelinefinder.hpp" %} diff --git a/src/groveloudness/groveloudness.cxx b/src/groveloudness/groveloudness.cxx index 6a6a2848..d9df9e08 100644 --- a/src/groveloudness/groveloudness.cxx +++ b/src/groveloudness/groveloudness.cxx @@ -26,7 +26,7 @@ #include #include -#include "groveloudness.h" +#include "groveloudness.hpp" using namespace upm; diff --git a/src/grovemd/CMakeLists.txt b/src/grovemd/CMakeLists.txt index 6f307151..627632c8 100644 --- a/src/grovemd/CMakeLists.txt +++ b/src/grovemd/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "grovemd") set (libdescription "upm grove i2c motor driver module") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/grovemd/grovemd.cxx b/src/grovemd/grovemd.cxx index 2e588a43..fcf83ac3 100644 --- a/src/grovemd/grovemd.cxx +++ b/src/grovemd/grovemd.cxx @@ -27,7 +27,7 @@ #include #include -#include "grovemd.h" +#include "grovemd.hpp" using namespace upm; using namespace std; diff --git a/src/grovemd/grovemd.h b/src/grovemd/grovemd.hpp similarity index 100% rename from src/grovemd/grovemd.h rename to src/grovemd/grovemd.hpp diff --git a/src/grovemd/javaupm_grovemd.i b/src/grovemd/javaupm_grovemd.i index 341297c7..4fa1da78 100644 --- a/src/grovemd/javaupm_grovemd.i +++ b/src/grovemd/javaupm_grovemd.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "grovemd.h" + #include "grovemd.hpp" %} -%include "grovemd.h" +%include "grovemd.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/grovemd/jsupm_grovemd.i b/src/grovemd/jsupm_grovemd.i index a907c05b..b15aa496 100644 --- a/src/grovemd/jsupm_grovemd.i +++ b/src/grovemd/jsupm_grovemd.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "grovemd.h" + #include "grovemd.hpp" %} -%include "grovemd.h" +%include "grovemd.hpp" diff --git a/src/grovemd/pyupm_grovemd.i b/src/grovemd/pyupm_grovemd.i index 4de7fbe1..eb9996d7 100644 --- a/src/grovemd/pyupm_grovemd.i +++ b/src/grovemd/pyupm_grovemd.i @@ -9,7 +9,7 @@ %include "grovemd_doc.i" #endif -%include "grovemd.h" +%include "grovemd.hpp" %{ - #include "grovemd.h" + #include "grovemd.hpp" %} diff --git a/src/grovemoisture/CMakeLists.txt b/src/grovemoisture/CMakeLists.txt index a50d11e7..c7fbf14f 100644 --- a/src/grovemoisture/CMakeLists.txt +++ b/src/grovemoisture/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "grovemoisture") set (libdescription "upm grove moisture module") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/grovemoisture/grovemoisture.cxx b/src/grovemoisture/grovemoisture.cxx index 2145b445..aa44e783 100644 --- a/src/grovemoisture/grovemoisture.cxx +++ b/src/grovemoisture/grovemoisture.cxx @@ -26,7 +26,7 @@ #include #include -#include "grovemoisture.h" +#include "grovemoisture.hpp" using namespace upm; diff --git a/src/grovemoisture/grovemoisture.h b/src/grovemoisture/grovemoisture.hpp similarity index 100% rename from src/grovemoisture/grovemoisture.h rename to src/grovemoisture/grovemoisture.hpp diff --git a/src/grovemoisture/javaupm_grovemoisture.i b/src/grovemoisture/javaupm_grovemoisture.i index 886991a8..1cf217c7 100644 --- a/src/grovemoisture/javaupm_grovemoisture.i +++ b/src/grovemoisture/javaupm_grovemoisture.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "grovemoisture.h" + #include "grovemoisture.hpp" %} -%include "grovemoisture.h" +%include "grovemoisture.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/grovemoisture/jsupm_grovemoisture.i b/src/grovemoisture/jsupm_grovemoisture.i index e77e94bc..40a877ee 100644 --- a/src/grovemoisture/jsupm_grovemoisture.i +++ b/src/grovemoisture/jsupm_grovemoisture.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "grovemoisture.h" + #include "grovemoisture.hpp" %} -%include "grovemoisture.h" +%include "grovemoisture.hpp" diff --git a/src/grovemoisture/pyupm_grovemoisture.i b/src/grovemoisture/pyupm_grovemoisture.i index cc1e0154..e661aadf 100644 --- a/src/grovemoisture/pyupm_grovemoisture.i +++ b/src/grovemoisture/pyupm_grovemoisture.i @@ -5,7 +5,7 @@ %feature("autodoc", "3"); -%include "grovemoisture.h" +%include "grovemoisture.hpp" %{ - #include "grovemoisture.h" + #include "grovemoisture.hpp" %} diff --git a/src/groveo2/CMakeLists.txt b/src/groveo2/CMakeLists.txt index a9edadb5..d0be3539 100644 --- a/src/groveo2/CMakeLists.txt +++ b/src/groveo2/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "groveo2") set (libdescription "upm groveO2 oxygen concentration sensor module") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/groveo2/groveo2.cxx b/src/groveo2/groveo2.cxx index 61b95eb5..3c2e6194 100644 --- a/src/groveo2/groveo2.cxx +++ b/src/groveo2/groveo2.cxx @@ -26,7 +26,7 @@ #include #include -#include "groveo2.h" +#include "groveo2.hpp" using namespace upm; using namespace std; diff --git a/src/groveo2/groveo2.h b/src/groveo2/groveo2.hpp similarity index 100% rename from src/groveo2/groveo2.h rename to src/groveo2/groveo2.hpp diff --git a/src/groveo2/javaupm_groveo2.i b/src/groveo2/javaupm_groveo2.i index 8ae03995..a7611088 100644 --- a/src/groveo2/javaupm_groveo2.i +++ b/src/groveo2/javaupm_groveo2.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "groveo2.h" + #include "groveo2.hpp" %} -%include "groveo2.h" +%include "groveo2.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/groveo2/jsupm_groveo2.i b/src/groveo2/jsupm_groveo2.i index 8e3482e1..11d849e2 100644 --- a/src/groveo2/jsupm_groveo2.i +++ b/src/groveo2/jsupm_groveo2.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "groveo2.h" + #include "groveo2.hpp" %} -%include "groveo2.h" +%include "groveo2.hpp" diff --git a/src/groveo2/pyupm_groveo2.i b/src/groveo2/pyupm_groveo2.i index f468b52b..79bf2061 100644 --- a/src/groveo2/pyupm_groveo2.i +++ b/src/groveo2/pyupm_groveo2.i @@ -5,7 +5,7 @@ %feature("autodoc", "3"); -%include "groveo2.h" +%include "groveo2.hpp" %{ - #include "groveo2.h" + #include "groveo2.hpp" %} diff --git a/src/grovescam/CMakeLists.txt b/src/grovescam/CMakeLists.txt index 509a6644..7154d3c6 100644 --- a/src/grovescam/CMakeLists.txt +++ b/src/grovescam/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "grovescam") set (libdescription "upm grove serial camera module") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/grovescam/grovescam.cxx b/src/grovescam/grovescam.cxx index 53bd2c01..3812b096 100644 --- a/src/grovescam/grovescam.cxx +++ b/src/grovescam/grovescam.cxx @@ -29,7 +29,7 @@ #include #include -#include "grovescam.h" +#include "grovescam.hpp" using namespace upm; using namespace std; diff --git a/src/grovescam/grovescam.h b/src/grovescam/grovescam.hpp similarity index 100% rename from src/grovescam/grovescam.h rename to src/grovescam/grovescam.hpp diff --git a/src/grovescam/javaupm_grovescam.i b/src/grovescam/javaupm_grovescam.i index 8e55cdfc..c22bf9c5 100644 --- a/src/grovescam/javaupm_grovescam.i +++ b/src/grovescam/javaupm_grovescam.i @@ -3,10 +3,10 @@ %include "../java_buffer.i" %{ - #include "grovescam.h" + #include "grovescam.hpp" %} -%include "grovescam.h" +%include "grovescam.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/grovescam/jsupm_grovescam.i b/src/grovescam/jsupm_grovescam.i index d8e12ec0..18cf4744 100644 --- a/src/grovescam/jsupm_grovescam.i +++ b/src/grovescam/jsupm_grovescam.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "grovescam.h" + #include "grovescam.hpp" %} -%include "grovescam.h" +%include "grovescam.hpp" diff --git a/src/grovescam/pyupm_grovescam.i b/src/grovescam/pyupm_grovescam.i index 6bb71633..0f8c4160 100644 --- a/src/grovescam/pyupm_grovescam.i +++ b/src/grovescam/pyupm_grovescam.i @@ -6,6 +6,6 @@ %feature("autodoc", "3"); %{ - #include "grovescam.h" + #include "grovescam.hpp" %} -%include "grovescam.h" +%include "grovescam.hpp" diff --git a/src/grovespeaker/CMakeLists.txt b/src/grovespeaker/CMakeLists.txt index ab3b5115..171bfd69 100644 --- a/src/grovespeaker/CMakeLists.txt +++ b/src/grovespeaker/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "grovespeaker") set (libdescription "upm grovespeaker speaker module") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/grovespeaker/grovespeaker.cxx b/src/grovespeaker/grovespeaker.cxx index 0b34e487..61d25481 100644 --- a/src/grovespeaker/grovespeaker.cxx +++ b/src/grovespeaker/grovespeaker.cxx @@ -26,7 +26,7 @@ #include #include -#include "grovespeaker.h" +#include "grovespeaker.hpp" using namespace upm; diff --git a/src/grovespeaker/grovespeaker.h b/src/grovespeaker/grovespeaker.hpp similarity index 100% rename from src/grovespeaker/grovespeaker.h rename to src/grovespeaker/grovespeaker.hpp diff --git a/src/grovespeaker/javaupm_grovespeaker.i b/src/grovespeaker/javaupm_grovespeaker.i index c3f98a7b..4af4564a 100644 --- a/src/grovespeaker/javaupm_grovespeaker.i +++ b/src/grovespeaker/javaupm_grovespeaker.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "grovespeaker.h" + #include "grovespeaker.hpp" %} -%include "grovespeaker.h" +%include "grovespeaker.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/grovespeaker/jsupm_grovespeaker.i b/src/grovespeaker/jsupm_grovespeaker.i index cf0f1e65..ef71438f 100644 --- a/src/grovespeaker/jsupm_grovespeaker.i +++ b/src/grovespeaker/jsupm_grovespeaker.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "grovespeaker.h" + #include "grovespeaker.hpp" %} -%include "grovespeaker.h" +%include "grovespeaker.hpp" diff --git a/src/grovespeaker/pyupm_grovespeaker.i b/src/grovespeaker/pyupm_grovespeaker.i index 16d54dbe..667c872f 100644 --- a/src/grovespeaker/pyupm_grovespeaker.i +++ b/src/grovespeaker/pyupm_grovespeaker.i @@ -5,7 +5,7 @@ %feature("autodoc", "3"); -%include "grovespeaker.h" +%include "grovespeaker.hpp" %{ - #include "grovespeaker.h" + #include "grovespeaker.hpp" %} diff --git a/src/groveultrasonic/CMakeLists.txt b/src/groveultrasonic/CMakeLists.txt index 3144f437..0a05ad21 100644 --- a/src/groveultrasonic/CMakeLists.txt +++ b/src/groveultrasonic/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "groveultrasonic") set (libdescription "upm grove ultrasonic proximity sensor") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/groveultrasonic/groveultrasonic.cxx b/src/groveultrasonic/groveultrasonic.cxx index 2a695f7e..87ec1f65 100644 --- a/src/groveultrasonic/groveultrasonic.cxx +++ b/src/groveultrasonic/groveultrasonic.cxx @@ -29,7 +29,7 @@ #include #include -#include "groveultrasonic.h" +#include "groveultrasonic.hpp" using namespace upm; diff --git a/src/groveultrasonic/groveultrasonic.h b/src/groveultrasonic/groveultrasonic.hpp similarity index 100% rename from src/groveultrasonic/groveultrasonic.h rename to src/groveultrasonic/groveultrasonic.hpp diff --git a/src/groveultrasonic/javaupm_groveultrasonic.i b/src/groveultrasonic/javaupm_groveultrasonic.i index a0680e94..f8907065 100644 --- a/src/groveultrasonic/javaupm_groveultrasonic.i +++ b/src/groveultrasonic/javaupm_groveultrasonic.i @@ -4,10 +4,10 @@ %ignore signalISR; %{ - #include "groveultrasonic.h" + #include "groveultrasonic.hpp" %} -%include "groveultrasonic.h" +%include "groveultrasonic.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/groveultrasonic/jsupm_groveultrasonic.i b/src/groveultrasonic/jsupm_groveultrasonic.i index 6993b015..6cfae0af 100644 --- a/src/groveultrasonic/jsupm_groveultrasonic.i +++ b/src/groveultrasonic/jsupm_groveultrasonic.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "groveultrasonic.h" + #include "groveultrasonic.hpp" %} -%include "groveultrasonic.h" +%include "groveultrasonic.hpp" diff --git a/src/groveultrasonic/pyupm_groveultrasonic.i b/src/groveultrasonic/pyupm_groveultrasonic.i index 188dd407..8f7eb3f7 100644 --- a/src/groveultrasonic/pyupm_groveultrasonic.i +++ b/src/groveultrasonic/pyupm_groveultrasonic.i @@ -5,7 +5,7 @@ %feature("autodoc", "3"); -%include "groveultrasonic.h" +%include "groveultrasonic.hpp" %{ - #include "groveultrasonic.h" + #include "groveultrasonic.hpp" %} diff --git a/src/grovevdiv/CMakeLists.txt b/src/grovevdiv/CMakeLists.txt index ec612c07..66d925be 100644 --- a/src/grovevdiv/CMakeLists.txt +++ b/src/grovevdiv/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "grovevdiv") set (libdescription "upm grove voltage divider module") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/grovevdiv/grovevdiv.cxx b/src/grovevdiv/grovevdiv.cxx index 722956ea..91485b7b 100644 --- a/src/grovevdiv/grovevdiv.cxx +++ b/src/grovevdiv/grovevdiv.cxx @@ -26,7 +26,7 @@ #include #include -#include "grovevdiv.h" +#include "grovevdiv.hpp" using namespace upm; using namespace std; diff --git a/src/grovevdiv/grovevdiv.h b/src/grovevdiv/grovevdiv.hpp similarity index 100% rename from src/grovevdiv/grovevdiv.h rename to src/grovevdiv/grovevdiv.hpp diff --git a/src/grovevdiv/javaupm_grovevdiv.i b/src/grovevdiv/javaupm_grovevdiv.i index 1fb23bdf..b3c5e02f 100644 --- a/src/grovevdiv/javaupm_grovevdiv.i +++ b/src/grovevdiv/javaupm_grovevdiv.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "grovevdiv.h" + #include "grovevdiv.hpp" %} -%include "grovevdiv.h" +%include "grovevdiv.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/grovevdiv/jsupm_grovevdiv.i b/src/grovevdiv/jsupm_grovevdiv.i index 35c3bd46..ab9bedfe 100644 --- a/src/grovevdiv/jsupm_grovevdiv.i +++ b/src/grovevdiv/jsupm_grovevdiv.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "grovevdiv.h" + #include "grovevdiv.hpp" %} -%include "grovevdiv.h" +%include "grovevdiv.hpp" diff --git a/src/grovevdiv/pyupm_grovevdiv.i b/src/grovevdiv/pyupm_grovevdiv.i index 1267a8f4..5ad7aafb 100644 --- a/src/grovevdiv/pyupm_grovevdiv.i +++ b/src/grovevdiv/pyupm_grovevdiv.i @@ -5,7 +5,7 @@ %feature("autodoc", "3"); -%include "grovevdiv.h" +%include "grovevdiv.hpp" %{ - #include "grovevdiv.h" + #include "grovevdiv.hpp" %} diff --git a/src/grovewater/CMakeLists.txt b/src/grovewater/CMakeLists.txt index 2fa64b15..6561276b 100644 --- a/src/grovewater/CMakeLists.txt +++ b/src/grovewater/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "grovewater") set (libdescription "upm grove water module") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/grovewater/grovewater.cxx b/src/grovewater/grovewater.cxx index 7456df26..9220adcf 100644 --- a/src/grovewater/grovewater.cxx +++ b/src/grovewater/grovewater.cxx @@ -26,7 +26,7 @@ #include #include -#include "grovewater.h" +#include "grovewater.hpp" using namespace upm; using namespace std; diff --git a/src/grovewater/grovewater.h b/src/grovewater/grovewater.hpp similarity index 100% rename from src/grovewater/grovewater.h rename to src/grovewater/grovewater.hpp diff --git a/src/grovewater/javaupm_grovewater.i b/src/grovewater/javaupm_grovewater.i index d679c2ed..0c074171 100644 --- a/src/grovewater/javaupm_grovewater.i +++ b/src/grovewater/javaupm_grovewater.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "grovewater.h" + #include "grovewater.hpp" %} -%include "grovewater.h" +%include "grovewater.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/grovewater/jsupm_grovewater.i b/src/grovewater/jsupm_grovewater.i index b1407afd..48c5deeb 100644 --- a/src/grovewater/jsupm_grovewater.i +++ b/src/grovewater/jsupm_grovewater.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "grovewater.h" + #include "grovewater.hpp" %} -%include "grovewater.h" +%include "grovewater.hpp" diff --git a/src/grovewater/pyupm_grovewater.i b/src/grovewater/pyupm_grovewater.i index f4218a1c..0af321c7 100644 --- a/src/grovewater/pyupm_grovewater.i +++ b/src/grovewater/pyupm_grovewater.i @@ -5,7 +5,7 @@ %feature("autodoc", "3"); -%include "grovewater.h" +%include "grovewater.hpp" %{ - #include "grovewater.h" + #include "grovewater.hpp" %} diff --git a/src/grovewfs/CMakeLists.txt b/src/grovewfs/CMakeLists.txt index 826a32e5..df87cf83 100644 --- a/src/grovewfs/CMakeLists.txt +++ b/src/grovewfs/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "grovewfs") set (libdescription "upm grove water flow sensor module") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/grovewfs/grovewfs.cxx b/src/grovewfs/grovewfs.cxx index 2eb70ac6..2b6f4baa 100644 --- a/src/grovewfs/grovewfs.cxx +++ b/src/grovewfs/grovewfs.cxx @@ -26,7 +26,7 @@ #include #include -#include "grovewfs.h" +#include "grovewfs.hpp" using namespace upm; using namespace std; diff --git a/src/grovewfs/grovewfs.h b/src/grovewfs/grovewfs.hpp similarity index 100% rename from src/grovewfs/grovewfs.h rename to src/grovewfs/grovewfs.hpp diff --git a/src/grovewfs/javaupm_grovewfs.i b/src/grovewfs/javaupm_grovewfs.i index 7e650ac0..f4e5f045 100644 --- a/src/grovewfs/javaupm_grovewfs.i +++ b/src/grovewfs/javaupm_grovewfs.i @@ -4,10 +4,10 @@ %ignore flowISR; %{ - #include "grovewfs.h" + #include "grovewfs.hpp" %} -%include "grovewfs.h" +%include "grovewfs.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/grovewfs/jsupm_grovewfs.i b/src/grovewfs/jsupm_grovewfs.i index d85d64de..1b837c28 100644 --- a/src/grovewfs/jsupm_grovewfs.i +++ b/src/grovewfs/jsupm_grovewfs.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "grovewfs.h" + #include "grovewfs.hpp" %} -%include "grovewfs.h" +%include "grovewfs.hpp" diff --git a/src/grovewfs/pyupm_grovewfs.i b/src/grovewfs/pyupm_grovewfs.i index 7dd71ff9..735b1309 100644 --- a/src/grovewfs/pyupm_grovewfs.i +++ b/src/grovewfs/pyupm_grovewfs.i @@ -5,7 +5,7 @@ %feature("autodoc", "3"); -%include "grovewfs.h" +%include "grovewfs.hpp" %{ - #include "grovewfs.h" + #include "grovewfs.hpp" %} diff --git a/src/guvas12d/CMakeLists.txt b/src/guvas12d/CMakeLists.txt index 3485e0ed..24faa190 100644 --- a/src/guvas12d/CMakeLists.txt +++ b/src/guvas12d/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "guvas12d") set (libdescription "upm guvas12d UV sensor module") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/guvas12d/guvas12d.cxx b/src/guvas12d/guvas12d.cxx index 7b30e1f3..2fd87897 100644 --- a/src/guvas12d/guvas12d.cxx +++ b/src/guvas12d/guvas12d.cxx @@ -26,7 +26,7 @@ #include #include -#include "guvas12d.h" +#include "guvas12d.hpp" using namespace upm; using namespace std; diff --git a/src/guvas12d/guvas12d.h b/src/guvas12d/guvas12d.hpp similarity index 100% rename from src/guvas12d/guvas12d.h rename to src/guvas12d/guvas12d.hpp diff --git a/src/guvas12d/javaupm_guvas12d.i b/src/guvas12d/javaupm_guvas12d.i index 1b7af281..0cf05992 100644 --- a/src/guvas12d/javaupm_guvas12d.i +++ b/src/guvas12d/javaupm_guvas12d.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "guvas12d.h" + #include "guvas12d.hpp" %} -%include "guvas12d.h" +%include "guvas12d.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/guvas12d/jsupm_guvas12d.i b/src/guvas12d/jsupm_guvas12d.i index 96607545..db1e6c4f 100644 --- a/src/guvas12d/jsupm_guvas12d.i +++ b/src/guvas12d/jsupm_guvas12d.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "guvas12d.h" + #include "guvas12d.hpp" %} -%include "guvas12d.h" +%include "guvas12d.hpp" diff --git a/src/guvas12d/pyupm_guvas12d.i b/src/guvas12d/pyupm_guvas12d.i index 715b533b..7d63013b 100644 --- a/src/guvas12d/pyupm_guvas12d.i +++ b/src/guvas12d/pyupm_guvas12d.i @@ -5,7 +5,7 @@ %feature("autodoc", "3"); -%include "guvas12d.h" +%include "guvas12d.hpp" %{ - #include "guvas12d.h" + #include "guvas12d.hpp" %} diff --git a/src/h3lis331dl/CMakeLists.txt b/src/h3lis331dl/CMakeLists.txt index cec9f55e..df4294be 100644 --- a/src/h3lis331dl/CMakeLists.txt +++ b/src/h3lis331dl/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "h3lis331dl") set (libdescription "upm h3lis331dl I2c Accelerometer (400g)") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/h3lis331dl/h3lis331dl.cxx b/src/h3lis331dl/h3lis331dl.cxx index e726f2ab..86daedae 100644 --- a/src/h3lis331dl/h3lis331dl.cxx +++ b/src/h3lis331dl/h3lis331dl.cxx @@ -28,7 +28,7 @@ #include #include -#include "h3lis331dl.h" +#include "h3lis331dl.hpp" using namespace upm; using namespace std; diff --git a/src/h3lis331dl/h3lis331dl.h b/src/h3lis331dl/h3lis331dl.hpp similarity index 100% rename from src/h3lis331dl/h3lis331dl.h rename to src/h3lis331dl/h3lis331dl.hpp diff --git a/src/h3lis331dl/javaupm_h3lis331dl.i b/src/h3lis331dl/javaupm_h3lis331dl.i index 812a53d4..9a8d1e0e 100644 --- a/src/h3lis331dl/javaupm_h3lis331dl.i +++ b/src/h3lis331dl/javaupm_h3lis331dl.i @@ -9,7 +9,7 @@ %ignore i2cContext; %{ - #include "h3lis331dl.h" + #include "h3lis331dl.hpp" %} %typemap(jni) float* "jfloatArray" @@ -48,7 +48,7 @@ %ignore getXYZ(int *, int *, int *); %ignore getAcceleration(float *, float *, float *); -%include "h3lis331dl.h" +%include "h3lis331dl.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/h3lis331dl/jsupm_h3lis331dl.i b/src/h3lis331dl/jsupm_h3lis331dl.i index f459bf3a..052cc5bf 100644 --- a/src/h3lis331dl/jsupm_h3lis331dl.i +++ b/src/h3lis331dl/jsupm_h3lis331dl.i @@ -7,7 +7,7 @@ %pointer_functions(float, floatp); %{ - #include "h3lis331dl.h" + #include "h3lis331dl.hpp" %} -%include "h3lis331dl.h" +%include "h3lis331dl.hpp" diff --git a/src/h3lis331dl/pyupm_h3lis331dl.i b/src/h3lis331dl/pyupm_h3lis331dl.i index 553081ea..b9d76d5c 100644 --- a/src/h3lis331dl/pyupm_h3lis331dl.i +++ b/src/h3lis331dl/pyupm_h3lis331dl.i @@ -14,7 +14,7 @@ %include "h3lis331dl_doc.i" #endif -%include "h3lis331dl.h" +%include "h3lis331dl.hpp" %{ - #include "h3lis331dl.h" + #include "h3lis331dl.hpp" %} diff --git a/src/h803x/CMakeLists.txt b/src/h803x/CMakeLists.txt index b7a1eef6..828f3a61 100644 --- a/src/h803x/CMakeLists.txt +++ b/src/h803x/CMakeLists.txt @@ -1,7 +1,7 @@ set (libname "h803x") set (libdescription "upm module for the Veris H803X (H8035/H8036)") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) pkg_search_module(MODBUS libmodbus) if (MODBUS_FOUND) diff --git a/src/h803x/h803x.cxx b/src/h803x/h803x.cxx index 187159e5..03e7f588 100644 --- a/src/h803x/h803x.cxx +++ b/src/h803x/h803x.cxx @@ -29,7 +29,7 @@ #include #include -#include "h803x.h" +#include "h803x.hpp" using namespace upm; using namespace std; diff --git a/src/h803x/h803x.h b/src/h803x/h803x.hpp similarity index 100% rename from src/h803x/h803x.h rename to src/h803x/h803x.hpp diff --git a/src/h803x/javaupm_h803x.i b/src/h803x/javaupm_h803x.i index 95df7069..7c98031f 100644 --- a/src/h803x/javaupm_h803x.i +++ b/src/h803x/javaupm_h803x.i @@ -3,10 +3,10 @@ %include "typemaps.i" %{ - #include "h803x.h" + #include "h803x.hpp" %} -%include "h803x.h" +%include "h803x.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/h803x/jsupm_h803x.i b/src/h803x/jsupm_h803x.i index b26156fe..4938fe67 100644 --- a/src/h803x/jsupm_h803x.i +++ b/src/h803x/jsupm_h803x.i @@ -2,7 +2,7 @@ %include "../upm.i" %include "stdint.i" -%include "h803x.h" +%include "h803x.hpp" %{ - #include "h803x.h" + #include "h803x.hpp" %} diff --git a/src/h803x/pyupm_h803x.i b/src/h803x/pyupm_h803x.i index b31387c5..134bbaf2 100644 --- a/src/h803x/pyupm_h803x.i +++ b/src/h803x/pyupm_h803x.i @@ -6,7 +6,7 @@ %feature("autodoc", "3"); -%include "h803x.h" +%include "h803x.hpp" %{ - #include "h803x.h" + #include "h803x.hpp" %} diff --git a/src/hcsr04/CMakeLists.txt b/src/hcsr04/CMakeLists.txt index 81e692de..5aec1955 100644 --- a/src/hcsr04/CMakeLists.txt +++ b/src/hcsr04/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "hcsr04") set (libdescription "upm proximity sensor") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/hcsr04/hcsr04.cxx b/src/hcsr04/hcsr04.cxx index 1a6a49ed..a05b9d5d 100644 --- a/src/hcsr04/hcsr04.cxx +++ b/src/hcsr04/hcsr04.cxx @@ -34,7 +34,7 @@ #undef JAVACALLBACK #endif -#include "hcsr04.h" +#include "hcsr04.hpp" using namespace upm; diff --git a/src/hcsr04/hcsr04.h b/src/hcsr04/hcsr04.hpp similarity index 100% rename from src/hcsr04/hcsr04.h rename to src/hcsr04/hcsr04.hpp diff --git a/src/hcsr04/javaupm_hcsr04.i b/src/hcsr04/javaupm_hcsr04.i index 046646bd..a92d6f0c 100644 --- a/src/hcsr04/javaupm_hcsr04.i +++ b/src/hcsr04/javaupm_hcsr04.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "hcsr04.h" + #include "hcsr04.hpp" %} -%include "hcsr04.h" +%include "hcsr04.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/hcsr04/jsupm_hcsr04.i b/src/hcsr04/jsupm_hcsr04.i index f86bd1b1..0b5aa52d 100644 --- a/src/hcsr04/jsupm_hcsr04.i +++ b/src/hcsr04/jsupm_hcsr04.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "hcsr04.h" + #include "hcsr04.hpp" %} -%include "hcsr04.h" +%include "hcsr04.hpp" diff --git a/src/hcsr04/pyupm_hcsr04.i b/src/hcsr04/pyupm_hcsr04.i index 56e435b0..87c4e9d0 100644 --- a/src/hcsr04/pyupm_hcsr04.i +++ b/src/hcsr04/pyupm_hcsr04.i @@ -5,7 +5,7 @@ %feature("autodoc", "3"); -%include "hcsr04.h" +%include "hcsr04.hpp" %{ - #include "hcsr04.h" + #include "hcsr04.hpp" %} diff --git a/src/hdxxvxta/CMakeLists.txt b/src/hdxxvxta/CMakeLists.txt index 9f8244d3..ec6ac671 100644 --- a/src/hdxxvxta/CMakeLists.txt +++ b/src/hdxxvxta/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "hdxxvxta") set (libdescription "upm Veris HDXXVXTA Temperature/Humidity transmitter") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/hdxxvxta/hdxxvxta.cxx b/src/hdxxvxta/hdxxvxta.cxx index 6c25d1b8..0d734925 100644 --- a/src/hdxxvxta/hdxxvxta.cxx +++ b/src/hdxxvxta/hdxxvxta.cxx @@ -24,7 +24,7 @@ #include -#include "hdxxvxta.h" +#include "hdxxvxta.hpp" using namespace upm; using namespace std; diff --git a/src/hdxxvxta/hdxxvxta.h b/src/hdxxvxta/hdxxvxta.hpp similarity index 100% rename from src/hdxxvxta/hdxxvxta.h rename to src/hdxxvxta/hdxxvxta.hpp diff --git a/src/hdxxvxta/javaupm_hdxxvxta.i b/src/hdxxvxta/javaupm_hdxxvxta.i index 95c78bfa..3a0d6a23 100644 --- a/src/hdxxvxta/javaupm_hdxxvxta.i +++ b/src/hdxxvxta/javaupm_hdxxvxta.i @@ -3,10 +3,10 @@ %include "std_string.i" %{ - #include "hdxxvxta.h" + #include "hdxxvxta.hpp" %} -%include "hdxxvxta.h" +%include "hdxxvxta.hpp" %pragma(java) jniclasscode=%{ diff --git a/src/hdxxvxta/jsupm_hdxxvxta.i b/src/hdxxvxta/jsupm_hdxxvxta.i index 8fa283d8..b3b25e32 100644 --- a/src/hdxxvxta/jsupm_hdxxvxta.i +++ b/src/hdxxvxta/jsupm_hdxxvxta.i @@ -3,8 +3,8 @@ %include "std_string.i" %{ - #include "hdxxvxta.h" + #include "hdxxvxta.hpp" %} -%include "hdxxvxta.h" +%include "hdxxvxta.hpp" diff --git a/src/hdxxvxta/pyupm_hdxxvxta.i b/src/hdxxvxta/pyupm_hdxxvxta.i index 377deab5..b7926474 100644 --- a/src/hdxxvxta/pyupm_hdxxvxta.i +++ b/src/hdxxvxta/pyupm_hdxxvxta.i @@ -7,7 +7,7 @@ %feature("autodoc", "3"); %{ - #include "hdxxvxta.h" + #include "hdxxvxta.hpp" %} -%include "hdxxvxta.h" +%include "hdxxvxta.hpp" diff --git a/src/hlg150h/CMakeLists.txt b/src/hlg150h/CMakeLists.txt index d3c21976..6650f8b9 100644 --- a/src/hlg150h/CMakeLists.txt +++ b/src/hlg150h/CMakeLists.txt @@ -2,5 +2,5 @@ include_directories(..) set (libname "hlg150h") set (libdescription “Lighting power supply”) set (module_src ${libname}.cxx mraa-utils.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/hlg150h/hlg150h.cxx b/src/hlg150h/hlg150h.cxx index d3ed9e3a..bfc8cd6f 100644 --- a/src/hlg150h/hlg150h.cxx +++ b/src/hlg150h/hlg150h.cxx @@ -1,8 +1,8 @@ #include #include #include -#include "hlg150h.h" -#include "mraa-utils.h" +#include "hlg150h.hpp" +#include "mraa-utils.hpp" #define PWM_PERIOD 3333 diff --git a/src/hlg150h/hlg150h.h b/src/hlg150h/hlg150h.hpp similarity index 98% rename from src/hlg150h/hlg150h.h rename to src/hlg150h/hlg150h.hpp index 2337ec8a..a92a8be8 100644 --- a/src/hlg150h/hlg150h.h +++ b/src/hlg150h/hlg150h.hpp @@ -22,7 +22,7 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "upm/iLightController.h" +#include "upm/iLightController.hpp" // #include "mraa/gpio.hpp" #include "mraa/pwm.hpp" diff --git a/src/hlg150h/javaupm_hlg150h.i b/src/hlg150h/javaupm_hlg150h.i index f9e32d16..ffe620b1 100644 --- a/src/hlg150h/javaupm_hlg150h.i +++ b/src/hlg150h/javaupm_hlg150h.i @@ -6,10 +6,10 @@ %include "typemaps.i" %{ - #include "hlg150h.h" + #include "hlg150h.hpp" %} -%include "hlg150h.h" +%include "hlg150h.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/hlg150h/jsupm_hlg150h.i b/src/hlg150h/jsupm_hlg150h.i index 26823f32..18cb2e0f 100644 --- a/src/hlg150h/jsupm_hlg150h.i +++ b/src/hlg150h/jsupm_hlg150h.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "hlg150h.h" + #include "hlg150h.hpp" %} -%include "hlg150h.h" +%include "hlg150h.hpp" diff --git a/src/hlg150h/mraa-utils.cxx b/src/hlg150h/mraa-utils.cxx index 00158e17..b59c7188 100644 --- a/src/hlg150h/mraa-utils.cxx +++ b/src/hlg150h/mraa-utils.cxx @@ -22,7 +22,7 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "mraa-utils.h" +#include "mraa-utils.hpp" #include "mraa/gpio.hpp" #define UPM_THROW(msg) throw std::runtime_error(std::string(__FUNCTION__) + ": " + (msg)) diff --git a/src/lp8860/mraa-utils.h b/src/hlg150h/mraa-utils.hpp similarity index 100% rename from src/lp8860/mraa-utils.h rename to src/hlg150h/mraa-utils.hpp diff --git a/src/hlg150h/pyupm_hlg150h.i b/src/hlg150h/pyupm_hlg150h.i index 5bea646a..29c6697b 100644 --- a/src/hlg150h/pyupm_hlg150h.i +++ b/src/hlg150h/pyupm_hlg150h.i @@ -3,7 +3,7 @@ %feature("autodoc", "3"); -%include "hlg150h.h" +%include "hlg150h.hpp" %{ - #include "hlg150h.h" + #include "hlg150h.hpp" %} diff --git a/src/hm11/CMakeLists.txt b/src/hm11/CMakeLists.txt index 6e9fb87e..d586b5ce 100644 --- a/src/hm11/CMakeLists.txt +++ b/src/hm11/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "hm11") set (libdescription "upm grove hm11 bluetooth low energy module") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/hm11/hm11.cxx b/src/hm11/hm11.cxx index 0c6cebcf..bc0c3bae 100644 --- a/src/hm11/hm11.cxx +++ b/src/hm11/hm11.cxx @@ -26,7 +26,7 @@ #include #include -#include "hm11.h" +#include "hm11.hpp" using namespace upm; using namespace std; diff --git a/src/hm11/hm11.h b/src/hm11/hm11.hpp similarity index 100% rename from src/hm11/hm11.h rename to src/hm11/hm11.hpp diff --git a/src/hm11/javaupm_hm11.i b/src/hm11/javaupm_hm11.i index df710826..a5fee074 100644 --- a/src/hm11/javaupm_hm11.i +++ b/src/hm11/javaupm_hm11.i @@ -4,11 +4,11 @@ %include "../java_buffer.i" %{ - #include "hm11.h" + #include "hm11.hpp" speed_t int_B9600 = B9600; %} -%include "hm11.h" +%include "hm11.hpp" speed_t int_B9600 = B9600; %array_class(char, charArray); diff --git a/src/hm11/jsupm_hm11.i b/src/hm11/jsupm_hm11.i index 4f02b7a2..bf2f6050 100644 --- a/src/hm11/jsupm_hm11.i +++ b/src/hm11/jsupm_hm11.i @@ -3,10 +3,10 @@ %include "carrays.i" %{ - #include "hm11.h" + #include "hm11.hpp" speed_t int_B9600 = B9600; %} -%include "hm11.h" +%include "hm11.hpp" speed_t int_B9600 = B9600; %array_class(char, charArray); diff --git a/src/hm11/pyupm_hm11.i b/src/hm11/pyupm_hm11.i index 345d1063..453cdb0d 100644 --- a/src/hm11/pyupm_hm11.i +++ b/src/hm11/pyupm_hm11.i @@ -7,9 +7,9 @@ %feature("autodoc", "3"); %{ - #include "hm11.h" + #include "hm11.hpp" speed_t int_B9600 = B9600; %} -%include "hm11.h" +%include "hm11.hpp" speed_t int_B9600 = B9600; %array_class(char, charArray); diff --git a/src/hmc5883l/CMakeLists.txt b/src/hmc5883l/CMakeLists.txt index f97d75f2..9f83850f 100644 --- a/src/hmc5883l/CMakeLists.txt +++ b/src/hmc5883l/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "hmc5883l") set (libdescription "libupm Digital Compass") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/hmc5883l/hmc5883l.cxx b/src/hmc5883l/hmc5883l.cxx index bcada4b5..fc8f690b 100644 --- a/src/hmc5883l/hmc5883l.cxx +++ b/src/hmc5883l/hmc5883l.cxx @@ -27,7 +27,7 @@ #include #include "math.h" -#include "hmc5883l.h" +#include "hmc5883l.hpp" #define MAX_BUFFER_LENGTH 6 #define HMC5883L_I2C_ADDR 0x1E diff --git a/src/hmc5883l/hmc5883l.h b/src/hmc5883l/hmc5883l.hpp similarity index 100% rename from src/hmc5883l/hmc5883l.h rename to src/hmc5883l/hmc5883l.hpp diff --git a/src/hmc5883l/javaupm_hmc5883l.i b/src/hmc5883l/javaupm_hmc5883l.i index cc80059c..db43d6d9 100644 --- a/src/hmc5883l/javaupm_hmc5883l.i +++ b/src/hmc5883l/javaupm_hmc5883l.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "hmc5883l.h" + #include "hmc5883l.hpp" %} %typemap(jni) int16_t* "jshortArray" @@ -18,7 +18,7 @@ JCALL4(SetShortArrayRegion, jenv, $result, 0, 3, (jshort*)$1); } -%include "hmc5883l.h" +%include "hmc5883l.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/hmc5883l/jsupm_hmc5883l.i b/src/hmc5883l/jsupm_hmc5883l.i index b04b3e90..f5b71923 100644 --- a/src/hmc5883l/jsupm_hmc5883l.i +++ b/src/hmc5883l/jsupm_hmc5883l.i @@ -2,7 +2,7 @@ %include "../upm.i" %include "../carrays_int16_t.i" %{ - #include "hmc5883l.h" + #include "hmc5883l.hpp" %} // Adding this typemap because SWIG is converting int16 into a short by default @@ -11,4 +11,4 @@ $result = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_int16Array, 0 | 0 ); } -%include "hmc5883l.h" +%include "hmc5883l.hpp" diff --git a/src/hmc5883l/pyupm_hmc5883l.i b/src/hmc5883l/pyupm_hmc5883l.i index c14f9493..c79a43b3 100644 --- a/src/hmc5883l/pyupm_hmc5883l.i +++ b/src/hmc5883l/pyupm_hmc5883l.i @@ -14,7 +14,7 @@ $result = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_int16Array, 0 | 0 ); } -%include "hmc5883l.h" +%include "hmc5883l.hpp" %{ - #include "hmc5883l.h" + #include "hmc5883l.hpp" %} diff --git a/src/hmtrp/CMakeLists.txt b/src/hmtrp/CMakeLists.txt index 6a43ba36..f48a1f6e 100644 --- a/src/hmtrp/CMakeLists.txt +++ b/src/hmtrp/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "hmtrp") set (libdescription "upm grove serial rf pro (hmtrp) module") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/hmtrp/hmtrp.cxx b/src/hmtrp/hmtrp.cxx index ca71c319..60e52d3d 100644 --- a/src/hmtrp/hmtrp.cxx +++ b/src/hmtrp/hmtrp.cxx @@ -26,7 +26,7 @@ #include #include -#include "hmtrp.h" +#include "hmtrp.hpp" using namespace upm; using namespace std; diff --git a/src/hmtrp/hmtrp.h b/src/hmtrp/hmtrp.hpp similarity index 100% rename from src/hmtrp/hmtrp.h rename to src/hmtrp/hmtrp.hpp diff --git a/src/hmtrp/javaupm_hmtrp.i b/src/hmtrp/javaupm_hmtrp.i index 2f38e060..6d4c4ded 100644 --- a/src/hmtrp/javaupm_hmtrp.i +++ b/src/hmtrp/javaupm_hmtrp.i @@ -12,7 +12,7 @@ %apply uint8_t *OUTPUT { uint8_t *strength }; %{ - #include "hmtrp.h" + #include "hmtrp.hpp" speed_t int_B9600 = B9600; %} @@ -22,7 +22,7 @@ READDATA_EXCEPTION(getRFSignalStrength()) %ignore getModSignalStrength(uint8_t *strength); READDATA_EXCEPTION(getModSignalStrength()) -%include "hmtrp.h" +%include "hmtrp.hpp" speed_t int_B9600 = B9600; %pragma(java) jniclasscode=%{ diff --git a/src/hmtrp/jsupm_hmtrp.i b/src/hmtrp/jsupm_hmtrp.i index 28536770..3c2bfbe0 100644 --- a/src/hmtrp/jsupm_hmtrp.i +++ b/src/hmtrp/jsupm_hmtrp.i @@ -5,10 +5,10 @@ %include "../carrays_uint32_t.i" %{ - #include "hmtrp.h" + #include "hmtrp.hpp" speed_t int_B9600 = B9600; %} -%include "hmtrp.h" +%include "hmtrp.hpp" speed_t int_B9600 = B9600; %array_class(char, charArray); diff --git a/src/hmtrp/pyupm_hmtrp.i b/src/hmtrp/pyupm_hmtrp.i index 3898382c..8cb96e39 100644 --- a/src/hmtrp/pyupm_hmtrp.i +++ b/src/hmtrp/pyupm_hmtrp.i @@ -11,9 +11,9 @@ %feature("autodoc", "3"); -%include "hmtrp.h" +%include "hmtrp.hpp" %{ - #include "hmtrp.h" + #include "hmtrp.hpp" speed_t int_B9600 = B9600; %} speed_t int_B9600 = B9600; diff --git a/src/hp20x/CMakeLists.txt b/src/hp20x/CMakeLists.txt index 63c0b829..169d2da6 100644 --- a/src/hp20x/CMakeLists.txt +++ b/src/hp20x/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "hp20x") set (libdescription "upm grove barometer (high efficiency)") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/hp20x/hp20x.cxx b/src/hp20x/hp20x.cxx index 73ae3e25..3cbe0fe8 100644 --- a/src/hp20x/hp20x.cxx +++ b/src/hp20x/hp20x.cxx @@ -28,7 +28,7 @@ #include #include -#include "hp20x.h" +#include "hp20x.hpp" using namespace upm; using namespace std; diff --git a/src/hp20x/hp20x.h b/src/hp20x/hp20x.hpp similarity index 100% rename from src/hp20x/hp20x.h rename to src/hp20x/hp20x.hpp diff --git a/src/hp20x/javaupm_hp20x.i b/src/hp20x/javaupm_hp20x.i index 54d7c33b..8602c46b 100644 --- a/src/hp20x/javaupm_hp20x.i +++ b/src/hp20x/javaupm_hp20x.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "hp20x.h" + #include "hp20x.hpp" %} -%include "hp20x.h" +%include "hp20x.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/hp20x/jsupm_hp20x.i b/src/hp20x/jsupm_hp20x.i index cf9a6453..e83a6b24 100644 --- a/src/hp20x/jsupm_hp20x.i +++ b/src/hp20x/jsupm_hp20x.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "hp20x.h" + #include "hp20x.hpp" %} -%include "hp20x.h" +%include "hp20x.hpp" diff --git a/src/hp20x/pyupm_hp20x.i b/src/hp20x/pyupm_hp20x.i index 39c0b073..20aea4df 100644 --- a/src/hp20x/pyupm_hp20x.i +++ b/src/hp20x/pyupm_hp20x.i @@ -9,7 +9,7 @@ %include "hp20x_doc.i" #endif -%include "hp20x.h" +%include "hp20x.hpp" %{ - #include "hp20x.h" + #include "hp20x.hpp" %} diff --git a/src/ht9170/CMakeLists.txt b/src/ht9170/CMakeLists.txt index b00f1eb9..889038d7 100644 --- a/src/ht9170/CMakeLists.txt +++ b/src/ht9170/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "ht9170") set (libdescription "upm ht9170 DTMF decoder") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/ht9170/ht9170.cxx b/src/ht9170/ht9170.cxx index d34987b1..109e104d 100644 --- a/src/ht9170/ht9170.cxx +++ b/src/ht9170/ht9170.cxx @@ -26,7 +26,7 @@ #include #include -#include "ht9170.h" +#include "ht9170.hpp" using namespace upm; using namespace std; diff --git a/src/ht9170/ht9170.h b/src/ht9170/ht9170.hpp similarity index 100% rename from src/ht9170/ht9170.h rename to src/ht9170/ht9170.hpp diff --git a/src/ht9170/javaupm_ht9170.i b/src/ht9170/javaupm_ht9170.i index 4bc6b1d5..25fd7135 100644 --- a/src/ht9170/javaupm_ht9170.i +++ b/src/ht9170/javaupm_ht9170.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "ht9170.h" + #include "ht9170.hpp" %} -%include "ht9170.h" +%include "ht9170.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/ht9170/jsupm_ht9170.i b/src/ht9170/jsupm_ht9170.i index f4d14b35..1c7c7898 100644 --- a/src/ht9170/jsupm_ht9170.i +++ b/src/ht9170/jsupm_ht9170.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "ht9170.h" + #include "ht9170.hpp" %} -%include "ht9170.h" +%include "ht9170.hpp" diff --git a/src/ht9170/pyupm_ht9170.i b/src/ht9170/pyupm_ht9170.i index bb5d3d21..9b6ccac9 100644 --- a/src/ht9170/pyupm_ht9170.i +++ b/src/ht9170/pyupm_ht9170.i @@ -5,7 +5,7 @@ %feature("autodoc", "3"); -%include "ht9170.h" +%include "ht9170.hpp" %{ - #include "ht9170.h" + #include "ht9170.hpp" %} diff --git a/src/htu21d/CMakeLists.txt b/src/htu21d/CMakeLists.txt index 4385a1f9..aa8aece0 100644 --- a/src/htu21d/CMakeLists.txt +++ b/src/htu21d/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "htu21d") set (libdescription "libupm Humidity Sensor") set (module_src ${libname}.cpp) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/htu21d/htu21d.cpp b/src/htu21d/htu21d.cpp index 0ff097c0..540d381d 100644 --- a/src/htu21d/htu21d.cpp +++ b/src/htu21d/htu21d.cpp @@ -28,7 +28,7 @@ #include #include -#include "htu21d.h" +#include "htu21d.hpp" using namespace upm; diff --git a/src/htu21d/htu21d.h b/src/htu21d/htu21d.hpp similarity index 100% rename from src/htu21d/htu21d.h rename to src/htu21d/htu21d.hpp diff --git a/src/htu21d/javaupm_htu21d.i b/src/htu21d/javaupm_htu21d.i index 7c6b1eff..25c44b4f 100644 --- a/src/htu21d/javaupm_htu21d.i +++ b/src/htu21d/javaupm_htu21d.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "htu21d.h" + #include "htu21d.hpp" %} -%include "htu21d.h" +%include "htu21d.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/htu21d/jsupm_htu21d.i b/src/htu21d/jsupm_htu21d.i index e6d9c9d4..66dcdb49 100644 --- a/src/htu21d/jsupm_htu21d.i +++ b/src/htu21d/jsupm_htu21d.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "htu21d.h" + #include "htu21d.hpp" %} -%include "htu21d.h" +%include "htu21d.hpp" diff --git a/src/htu21d/pyupm_htu21d.i b/src/htu21d/pyupm_htu21d.i index 6f87b987..b68f5ee4 100644 --- a/src/htu21d/pyupm_htu21d.i +++ b/src/htu21d/pyupm_htu21d.i @@ -9,7 +9,7 @@ %include "htu21d_doc.i" #endif -%include "htu21d.h" +%include "htu21d.hpp" %{ - #include "htu21d.h" + #include "htu21d.hpp" %} diff --git a/src/hwxpxx/CMakeLists.txt b/src/hwxpxx/CMakeLists.txt index 0b5fd2f7..a344022c 100644 --- a/src/hwxpxx/CMakeLists.txt +++ b/src/hwxpxx/CMakeLists.txt @@ -1,7 +1,7 @@ set (libname "hwxpxx") set (libdescription "upm module for the Veris HWXPXX (HWXPHTX)") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) pkg_search_module(MODBUS libmodbus) if (MODBUS_FOUND) diff --git a/src/hwxpxx/hwxpxx.cxx b/src/hwxpxx/hwxpxx.cxx index 78753ce9..51deae96 100644 --- a/src/hwxpxx/hwxpxx.cxx +++ b/src/hwxpxx/hwxpxx.cxx @@ -27,7 +27,7 @@ #include #include -#include "hwxpxx.h" +#include "hwxpxx.hpp" using namespace upm; using namespace std; diff --git a/src/hwxpxx/hwxpxx.h b/src/hwxpxx/hwxpxx.hpp similarity index 100% rename from src/hwxpxx/hwxpxx.h rename to src/hwxpxx/hwxpxx.hpp diff --git a/src/hwxpxx/javaupm_hwxpxx.i b/src/hwxpxx/javaupm_hwxpxx.i index f6f849bd..b4311371 100644 --- a/src/hwxpxx/javaupm_hwxpxx.i +++ b/src/hwxpxx/javaupm_hwxpxx.i @@ -3,10 +3,10 @@ %include "typemaps.i" %{ - #include "hwxpxx.h" + #include "hwxpxx.hpp" %} -%include "hwxpxx.h" +%include "hwxpxx.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/hwxpxx/jsupm_hwxpxx.i b/src/hwxpxx/jsupm_hwxpxx.i index 26200005..b58732ae 100644 --- a/src/hwxpxx/jsupm_hwxpxx.i +++ b/src/hwxpxx/jsupm_hwxpxx.i @@ -2,7 +2,7 @@ %include "../upm.i" %include "stdint.i" -%include "hwxpxx.h" +%include "hwxpxx.hpp" %{ - #include "hwxpxx.h" + #include "hwxpxx.hpp" %} diff --git a/src/hwxpxx/pyupm_hwxpxx.i b/src/hwxpxx/pyupm_hwxpxx.i index fcfec090..e37e3870 100644 --- a/src/hwxpxx/pyupm_hwxpxx.i +++ b/src/hwxpxx/pyupm_hwxpxx.i @@ -6,7 +6,7 @@ %feature("autodoc", "3"); -%include "hwxpxx.h" +%include "hwxpxx.hpp" %{ - #include "hwxpxx.h" + #include "hwxpxx.hpp" %} diff --git a/src/hx711/CMakeLists.txt b/src/hx711/CMakeLists.txt index 8cdf95e7..29c42c97 100644 --- a/src/hx711/CMakeLists.txt +++ b/src/hx711/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "hx711") set (libdescription "HX711 24bit ADC") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/hx711/hx711.cxx b/src/hx711/hx711.cxx index 28e60bf1..cf6c987c 100644 --- a/src/hx711/hx711.cxx +++ b/src/hx711/hx711.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "hx711.h" +#include "hx711.hpp" using namespace upm; using namespace std; diff --git a/src/hx711/hx711.h b/src/hx711/hx711.hpp similarity index 100% rename from src/hx711/hx711.h rename to src/hx711/hx711.hpp diff --git a/src/hx711/javaupm_hx711.i b/src/hx711/javaupm_hx711.i index 2d8fdf59..1d3e9efa 100644 --- a/src/hx711/javaupm_hx711.i +++ b/src/hx711/javaupm_hx711.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "hx711.h" + #include "hx711.hpp" %} -%include "hx711.h" +%include "hx711.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/hx711/jsupm_hx711.i b/src/hx711/jsupm_hx711.i index ddaabe99..a3a79f37 100644 --- a/src/hx711/jsupm_hx711.i +++ b/src/hx711/jsupm_hx711.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "hx711.h" + #include "hx711.hpp" %} -%include "hx711.h" +%include "hx711.hpp" diff --git a/src/hx711/pyupm_hx711.i b/src/hx711/pyupm_hx711.i index 8d313f0c..3811e274 100644 --- a/src/hx711/pyupm_hx711.i +++ b/src/hx711/pyupm_hx711.i @@ -6,7 +6,7 @@ %feature("autodoc", "3"); -%include "hx711.h" +%include "hx711.hpp" %{ - #include "hx711.h" + #include "hx711.hpp" %} diff --git a/src/ili9341/CMakeLists.txt b/src/ili9341/CMakeLists.txt index 8420d01f..43489be2 100644 --- a/src/ili9341/CMakeLists.txt +++ b/src/ili9341/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "ili9341") set (libdescription "libupm ILI9341 SPI LCD") set (module_src ili9341_gfx.cxx ili9341.cxx) -set (module_h ili9341_gfx.h ili9341.h) +set (module_hpp ili9341_gfx.hpp ili9341.hpp) upm_module_init() diff --git a/src/ili9341/ili9341.cxx b/src/ili9341/ili9341.cxx index b0a4e577..22e23506 100644 --- a/src/ili9341/ili9341.cxx +++ b/src/ili9341/ili9341.cxx @@ -33,7 +33,7 @@ #include #include -#include "ili9341.h" +#include "ili9341.hpp" using namespace upm; diff --git a/src/ili9341/ili9341.h b/src/ili9341/ili9341.hpp similarity index 99% rename from src/ili9341/ili9341.h rename to src/ili9341/ili9341.hpp index 35727416..23eb3f48 100644 --- a/src/ili9341/ili9341.h +++ b/src/ili9341/ili9341.hpp @@ -32,7 +32,7 @@ #include #include #include -#include "ili9341_gfx.h" +#include "ili9341_gfx.hpp" // Defines #define ILI9341_TFTWIDTH 240 diff --git a/src/ili9341/ili9341_gfx.cxx b/src/ili9341/ili9341_gfx.cxx index 7ddab468..98882655 100644 --- a/src/ili9341/ili9341_gfx.cxx +++ b/src/ili9341/ili9341_gfx.cxx @@ -24,7 +24,7 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "ili9341_gfx.h" +#include "ili9341_gfx.hpp" using namespace upm; diff --git a/src/ili9341/ili9341_gfx.h b/src/ili9341/ili9341_gfx.hpp similarity index 100% rename from src/ili9341/ili9341_gfx.h rename to src/ili9341/ili9341_gfx.hpp diff --git a/src/ili9341/javaupm_ili9341.i b/src/ili9341/javaupm_ili9341.i index 731ed82a..6a7071b8 100644 --- a/src/ili9341/javaupm_ili9341.i +++ b/src/ili9341/javaupm_ili9341.i @@ -5,16 +5,16 @@ %apply uint8_t *INPUT { uint8_t *addr } -%include "ili9341_gfx.h" +%include "ili9341_gfx.hpp" %{ - #include "ili9341_gfx.h" + #include "ili9341_gfx.hpp" %} %{ - #include "ili9341.h" + #include "ili9341.hpp" %} -%include "ili9341.h" +%include "ili9341.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/ili9341/jsupm_ili9341.i b/src/ili9341/jsupm_ili9341.i index c6d8f02d..fd47fb67 100644 --- a/src/ili9341/jsupm_ili9341.i +++ b/src/ili9341/jsupm_ili9341.i @@ -1,12 +1,12 @@ %module jsupm_ili9341 %include "../upm.i" -%include "ili9341_gfx.h" +%include "ili9341_gfx.hpp" %{ - #include "ili9341_gfx.h" + #include "ili9341_gfx.hpp" %} -%include "ili9341.h" +%include "ili9341.hpp" %{ - #include "ili9341.h" + #include "ili9341.hpp" %} diff --git a/src/ili9341/pyupm_ili9341.i b/src/ili9341/pyupm_ili9341.i index ee71226a..2d36cc0d 100644 --- a/src/ili9341/pyupm_ili9341.i +++ b/src/ili9341/pyupm_ili9341.i @@ -6,12 +6,12 @@ %feature("autodoc", "3"); %rename("printString") print(std::string msg); -%include "ili9341_gfx.h" +%include "ili9341_gfx.hpp" %{ - #include "ili9341_gfx.h" + #include "ili9341_gfx.hpp" %} -%include "ili9341.h" +%include "ili9341.hpp" %{ - #include "ili9341.h" + #include "ili9341.hpp" %} diff --git a/src/ina132/CMakeLists.txt b/src/ina132/CMakeLists.txt index d1dd9fd8..31471e63 100644 --- a/src/ina132/CMakeLists.txt +++ b/src/ina132/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "ina132") set (libdescription "upm ina132 differential amplifier sensor module") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/ina132/ina132.cxx b/src/ina132/ina132.cxx index ffba0077..c66a145e 100644 --- a/src/ina132/ina132.cxx +++ b/src/ina132/ina132.cxx @@ -27,7 +27,7 @@ #include #include -#include "ina132.h" +#include "ina132.hpp" using namespace upm; using namespace std; diff --git a/src/ina132/ina132.h b/src/ina132/ina132.hpp similarity index 100% rename from src/ina132/ina132.h rename to src/ina132/ina132.hpp diff --git a/src/ina132/javaupm_ina132.i b/src/ina132/javaupm_ina132.i index b49ed207..affc72f5 100644 --- a/src/ina132/javaupm_ina132.i +++ b/src/ina132/javaupm_ina132.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "ina132.h" + #include "ina132.hpp" %} -%include "ina132.h" +%include "ina132.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/ina132/jsupm_ina132.i b/src/ina132/jsupm_ina132.i index 28be9bac..2780b89d 100644 --- a/src/ina132/jsupm_ina132.i +++ b/src/ina132/jsupm_ina132.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "ina132.h" + #include "ina132.hpp" %} -%include "ina132.h" +%include "ina132.hpp" diff --git a/src/ina132/pyupm_ina132.i b/src/ina132/pyupm_ina132.i index 01f6a601..44a7f9d1 100644 --- a/src/ina132/pyupm_ina132.i +++ b/src/ina132/pyupm_ina132.i @@ -5,7 +5,7 @@ %feature("autodoc", "3"); -%include "ina132.h" +%include "ina132.hpp" %{ - #include "ina132.h" + #include "ina132.hpp" %} diff --git a/src/isd1820/CMakeLists.txt b/src/isd1820/CMakeLists.txt index 57ee9c13..329781ca 100644 --- a/src/isd1820/CMakeLists.txt +++ b/src/isd1820/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "isd1820") set (libdescription "upm grove recorder") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/isd1820/isd1820.cxx b/src/isd1820/isd1820.cxx index 29aed20d..9cfbfad0 100644 --- a/src/isd1820/isd1820.cxx +++ b/src/isd1820/isd1820.cxx @@ -26,7 +26,7 @@ #include #include -#include "isd1820.h" +#include "isd1820.hpp" using namespace upm; using namespace std; diff --git a/src/isd1820/isd1820.h b/src/isd1820/isd1820.hpp similarity index 100% rename from src/isd1820/isd1820.h rename to src/isd1820/isd1820.hpp diff --git a/src/isd1820/javaupm_isd1820.i b/src/isd1820/javaupm_isd1820.i index ac5f341b..235c9d99 100644 --- a/src/isd1820/javaupm_isd1820.i +++ b/src/isd1820/javaupm_isd1820.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "isd1820.h" + #include "isd1820.hpp" %} -%include "isd1820.h" +%include "isd1820.hpp" %pragma(java) jniclasscode=%{ diff --git a/src/isd1820/jsupm_isd1820.i b/src/isd1820/jsupm_isd1820.i index 30d7e03f..00be649d 100644 --- a/src/isd1820/jsupm_isd1820.i +++ b/src/isd1820/jsupm_isd1820.i @@ -2,8 +2,8 @@ %include "../upm.i" %{ - #include "isd1820.h" + #include "isd1820.hpp" %} -%include "isd1820.h" +%include "isd1820.hpp" diff --git a/src/isd1820/pyupm_isd1820.i b/src/isd1820/pyupm_isd1820.i index ec916f40..1a9f138f 100644 --- a/src/isd1820/pyupm_isd1820.i +++ b/src/isd1820/pyupm_isd1820.i @@ -6,8 +6,8 @@ %feature("autodoc", "3"); %{ - #include "isd1820.h" + #include "isd1820.hpp" %} -%include "isd1820.h" +%include "isd1820.hpp" diff --git a/src/itg3200/CMakeLists.txt b/src/itg3200/CMakeLists.txt index 5be008b8..d26844d8 100644 --- a/src/itg3200/CMakeLists.txt +++ b/src/itg3200/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "itg3200") set (libdescription "libupm Digital Gyro") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/itg3200/itg3200.cxx b/src/itg3200/itg3200.cxx index 1f2f2ffb..8f2fb291 100644 --- a/src/itg3200/itg3200.cxx +++ b/src/itg3200/itg3200.cxx @@ -27,7 +27,7 @@ #include #include #include "math.h" -#include "itg3200.h" +#include "itg3200.hpp" #define READ_BUFFER_LENGTH 8 diff --git a/src/itg3200/itg3200.h b/src/itg3200/itg3200.hpp similarity index 100% rename from src/itg3200/itg3200.h rename to src/itg3200/itg3200.hpp diff --git a/src/itg3200/javaupm_itg3200.i b/src/itg3200/javaupm_itg3200.i index 012c6a06..b11cce90 100644 --- a/src/itg3200/javaupm_itg3200.i +++ b/src/itg3200/javaupm_itg3200.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "itg3200.h" + #include "itg3200.hpp" %} %typemap(jni) float* "jfloatArray" @@ -32,7 +32,7 @@ JCALL4(SetShortArrayRegion, jenv, $result, 0, 3, (jshort*)$1); } -%include "itg3200.h" +%include "itg3200.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/itg3200/jsupm_itg3200.i b/src/itg3200/jsupm_itg3200.i index 011ffc69..0dda5ce7 100644 --- a/src/itg3200/jsupm_itg3200.i +++ b/src/itg3200/jsupm_itg3200.i @@ -4,7 +4,7 @@ %include "../carrays_float.i" %{ - #include "itg3200.h" + #include "itg3200.hpp" %} %typemap(out) int16_t * { @@ -15,6 +15,6 @@ $result = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_floatArray, 0 | 0 ); } -%include "itg3200.h" +%include "itg3200.hpp" %include diff --git a/src/itg3200/pyupm_itg3200.i b/src/itg3200/pyupm_itg3200.i index 7faae41b..96fa74c7 100644 --- a/src/itg3200/pyupm_itg3200.i +++ b/src/itg3200/pyupm_itg3200.i @@ -19,7 +19,7 @@ %include "itg3200_doc.i" #endif -%include "itg3200.h" +%include "itg3200.hpp" %{ - #include "itg3200.h" + #include "itg3200.hpp" %} diff --git a/src/joystick12/CMakeLists.txt b/src/joystick12/CMakeLists.txt index 750e62e9..0d0afc25 100644 --- a/src/joystick12/CMakeLists.txt +++ b/src/joystick12/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "joystick12") set (libdescription "ElecFreaks Joystick 1.2") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/joystick12/javaupm_joystick12.i b/src/joystick12/javaupm_joystick12.i index 8ebe78f0..c4ecf63b 100644 --- a/src/joystick12/javaupm_joystick12.i +++ b/src/joystick12/javaupm_joystick12.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "joystick12.h" + #include "joystick12.hpp" %} -%include "joystick12.h" +%include "joystick12.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/joystick12/joystick12.cxx b/src/joystick12/joystick12.cxx index b70557ca..c6789494 100644 --- a/src/joystick12/joystick12.cxx +++ b/src/joystick12/joystick12.cxx @@ -29,7 +29,7 @@ #include #include #include -#include "joystick12.h" +#include "joystick12.hpp" using namespace upm; diff --git a/src/joystick12/joystick12.h b/src/joystick12/joystick12.hpp similarity index 100% rename from src/joystick12/joystick12.h rename to src/joystick12/joystick12.hpp diff --git a/src/joystick12/jsupm_joystick12.i b/src/joystick12/jsupm_joystick12.i index 640273f1..29459182 100644 --- a/src/joystick12/jsupm_joystick12.i +++ b/src/joystick12/jsupm_joystick12.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "joystick12.h" + #include "joystick12.hpp" %} -%include "joystick12.h" +%include "joystick12.hpp" diff --git a/src/joystick12/pyupm_joystick12.i b/src/joystick12/pyupm_joystick12.i index fa7637c1..9fb2aa96 100644 --- a/src/joystick12/pyupm_joystick12.i +++ b/src/joystick12/pyupm_joystick12.i @@ -7,7 +7,7 @@ %feature("autodoc", "3"); -%include "joystick12.h" +%include "joystick12.hpp" %{ - #include "joystick12.h" + #include "joystick12.hpp" %} diff --git a/src/kxcjk1013/CMakeLists.txt b/src/kxcjk1013/CMakeLists.txt index 679dc4ae..d957a00c 100755 --- a/src/kxcjk1013/CMakeLists.txt +++ b/src/kxcjk1013/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "kxcjk1013") set (libdescription "upm kxcjk1013 sensor module") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/kxcjk1013/jsupm_kxcjk1013.i b/src/kxcjk1013/jsupm_kxcjk1013.i index e4575638..7671462b 100755 --- a/src/kxcjk1013/jsupm_kxcjk1013.i +++ b/src/kxcjk1013/jsupm_kxcjk1013.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "kxcjk1013.h" + #include "kxcjk1013.hpp" %} -%include "kxcjk1013.h" +%include "kxcjk1013.hpp" diff --git a/src/kxcjk1013/kxcjk1013.cxx b/src/kxcjk1013/kxcjk1013.cxx index 0eafbb7b..c19042be 100644 --- a/src/kxcjk1013/kxcjk1013.cxx +++ b/src/kxcjk1013/kxcjk1013.cxx @@ -26,7 +26,7 @@ #include #include #include -#include "kxcjk1013.h" +#include "kxcjk1013.hpp" using namespace upm; diff --git a/src/kxcjk1013/kxcjk1013.h b/src/kxcjk1013/kxcjk1013.hpp similarity index 100% rename from src/kxcjk1013/kxcjk1013.h rename to src/kxcjk1013/kxcjk1013.hpp diff --git a/src/kxcjk1013/pyupm_kxcjk1013.i b/src/kxcjk1013/pyupm_kxcjk1013.i index 87b8d77b..05b03e69 100755 --- a/src/kxcjk1013/pyupm_kxcjk1013.i +++ b/src/kxcjk1013/pyupm_kxcjk1013.i @@ -3,7 +3,7 @@ %feature("autodoc", "3"); -%include "kxcjk1013.h" +%include "kxcjk1013.hpp" %{ - #include "kxcjk1013.h" + #include "kxcjk1013.hpp" %} diff --git a/src/l298/CMakeLists.txt b/src/l298/CMakeLists.txt index e42e3b57..21e27bf4 100644 --- a/src/l298/CMakeLists.txt +++ b/src/l298/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "l298") set (libdescription "upm l298 dual h-bridge") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/l298/javaupm_l298.i b/src/l298/javaupm_l298.i index 8a9355ea..af7fc452 100644 --- a/src/l298/javaupm_l298.i +++ b/src/l298/javaupm_l298.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "l298.h" + #include "l298.hpp" %} -%include "l298.h" +%include "l298.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/l298/jsupm_l298.i b/src/l298/jsupm_l298.i index 7fec3a03..0d779c2d 100644 --- a/src/l298/jsupm_l298.i +++ b/src/l298/jsupm_l298.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "l298.h" + #include "l298.hpp" %} -%include "l298.h" +%include "l298.hpp" diff --git a/src/l298/l298.cxx b/src/l298/l298.cxx index 00c08ec2..75d7587f 100644 --- a/src/l298/l298.cxx +++ b/src/l298/l298.cxx @@ -26,7 +26,7 @@ #include #include -#include "l298.h" +#include "l298.hpp" using namespace upm; using namespace std; diff --git a/src/l298/l298.h b/src/l298/l298.hpp similarity index 100% rename from src/l298/l298.h rename to src/l298/l298.hpp diff --git a/src/l298/pyupm_l298.i b/src/l298/pyupm_l298.i index c8aaa5f0..b26d9364 100644 --- a/src/l298/pyupm_l298.i +++ b/src/l298/pyupm_l298.i @@ -5,7 +5,7 @@ %feature("autodoc", "3"); -%include "l298.h" +%include "l298.hpp" %{ - #include "l298.h" + #include "l298.hpp" %} diff --git a/src/lcd/CMakeLists.txt b/src/lcd/CMakeLists.txt index c21ea8a9..26be0cbb 100755 --- a/src/lcd/CMakeLists.txt +++ b/src/lcd/CMakeLists.txt @@ -2,5 +2,5 @@ set (libname "i2clcd") set (classname "lcd") set (libdescription "upm lcd/oled displays") set (module_src lcd.cxx lcm1602.cxx jhd1313m1.cxx ssd1308.cxx eboled.cxx ssd1327.cxx sainsmartks.cxx ssd1306.cxx) -set (module_h lcd.h lcm1602.h jhd1313m1.h ssd1308.h eboled.h ssd1327.h ssd.h sainsmartks.h ssd1306.h) +set (module_hpp lcd.hpp lcm1602.hpp jhd1313m1.hpp ssd1308.hpp eboled.hpp ssd1327.hpp ssd.hpp sainsmartks.hpp ssd1306.hpp) upm_module_init() diff --git a/src/lcd/eboled.cxx b/src/lcd/eboled.cxx index a85356d5..cf561477 100644 --- a/src/lcd/eboled.cxx +++ b/src/lcd/eboled.cxx @@ -27,7 +27,7 @@ #include #include -#include "eboled.h" +#include "eboled.hpp" using namespace upm; using namespace std; diff --git a/src/lcd/eboled.h b/src/lcd/eboled.hpp similarity index 99% rename from src/lcd/eboled.h rename to src/lcd/eboled.hpp index bd6f3d08..a25b063f 100644 --- a/src/lcd/eboled.h +++ b/src/lcd/eboled.hpp @@ -34,8 +34,8 @@ #include -#include "lcd.h" -#include "ssd.h" +#include "lcd.hpp" +#include "ssd.hpp" #define EBOLED_DEFAULT_SPI_BUS 0 #define EBOLED_DEFAULT_CD 36 diff --git a/src/lcd/hd44780_bits.h b/src/lcd/hd44780_bits.hpp similarity index 100% rename from src/lcd/hd44780_bits.h rename to src/lcd/hd44780_bits.hpp diff --git a/src/lcd/javaupm_i2clcd.i b/src/lcd/javaupm_i2clcd.i index 4705025f..2bf10d4b 100644 --- a/src/lcd/javaupm_i2clcd.i +++ b/src/lcd/javaupm_i2clcd.i @@ -23,26 +23,26 @@ } %{ - #include "lcd.h" - #include "ssd.h" - #include "ssd1327.h" - #include "ssd1308.h" - #include "ssd1306.h" - #include "eboled.h" - #include "lcm1602.h" - #include "jhd1313m1.h" - #include "sainsmartks.h" + #include "lcd.hpp" + #include "ssd.hpp" + #include "ssd1327.hpp" + #include "ssd1308.hpp" + #include "ssd1306.hpp" + #include "eboled.hpp" + #include "lcm1602.hpp" + #include "jhd1313m1.hpp" + #include "sainsmartks.hpp" %} -%include "lcd.h" -%include "ssd.h" -%include "ssd1327.h" -%include "ssd1308.h" -%include "ssd1306.h" -%include "eboled.h" -%include "lcm1602.h" -%include "jhd1313m1.h" -%include "sainsmartks.h" +%include "lcd.hpp" +%include "ssd.hpp" +%include "ssd1327.hpp" +%include "ssd1308.hpp" +%include "ssd1306.hpp" +%include "eboled.hpp" +%include "lcm1602.hpp" +%include "jhd1313m1.hpp" +%include "sainsmartks.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/lcd/jhd1313m1.cxx b/src/lcd/jhd1313m1.cxx index d1afc92f..f8ae980a 100644 --- a/src/lcd/jhd1313m1.cxx +++ b/src/lcd/jhd1313m1.cxx @@ -28,9 +28,9 @@ #include #include -#include "lcd_private.h" -#include "hd44780_bits.h" -#include "jhd1313m1.h" +#include "lcd_private.hpp" +#include "hd44780_bits.hpp" +#include "jhd1313m1.hpp" using namespace upm; diff --git a/src/lcd/jhd1313m1.h b/src/lcd/jhd1313m1.hpp similarity index 99% rename from src/lcd/jhd1313m1.h rename to src/lcd/jhd1313m1.hpp index e13b6461..0009d138 100644 --- a/src/lcd/jhd1313m1.h +++ b/src/lcd/jhd1313m1.hpp @@ -26,7 +26,7 @@ #pragma once #include -#include "lcm1602.h" +#include "lcm1602.hpp" namespace upm { diff --git a/src/lcd/jsupm_i2clcd.i b/src/lcd/jsupm_i2clcd.i index fe106b70..3999a90c 100755 --- a/src/lcd/jsupm_i2clcd.i +++ b/src/lcd/jsupm_i2clcd.i @@ -2,43 +2,43 @@ %include "../upm.i" %include "../carrays_uint8_t.i" -%include "ssd.h" -%include "lcd.h" +%include "ssd.hpp" +%include "lcd.hpp" %{ - #include "lcd.h" + #include "lcd.hpp" %} -%include "lcm1602.h" +%include "lcm1602.hpp" %{ - #include "lcm1602.h" + #include "lcm1602.hpp" %} -%include "jhd1313m1.h" +%include "jhd1313m1.hpp" %{ - #include "jhd1313m1.h" + #include "jhd1313m1.hpp" %} -%include "ssd1327.h" +%include "ssd1327.hpp" %{ - #include "ssd1327.h" + #include "ssd1327.hpp" %} -%include "ssd1308.h" +%include "ssd1308.hpp" %{ - #include "ssd1308.h" + #include "ssd1308.hpp" %} -%include "eboled.h" +%include "eboled.hpp" %{ - #include "eboled.h" + #include "eboled.hpp" %} -%include "sainsmartks.h" +%include "sainsmartks.hpp" %{ - #include "sainsmartks.h" + #include "sainsmartks.hpp" %} -%include "ssd1306.h" +%include "ssd1306.hpp" %{ - #include "ssd1306.h" + #include "ssd1306.hpp" %} diff --git a/src/lcd/lcd.cxx b/src/lcd/lcd.cxx index af3d0829..21b3a12f 100644 --- a/src/lcd/lcd.cxx +++ b/src/lcd/lcd.cxx @@ -25,7 +25,7 @@ #include #include -#include "lcd.h" +#include "lcd.hpp" using namespace upm; diff --git a/src/lcd/lcd.h b/src/lcd/lcd.hpp similarity index 100% rename from src/lcd/lcd.h rename to src/lcd/lcd.hpp diff --git a/src/lcd/lcd_private.h b/src/lcd/lcd_private.hpp similarity index 100% rename from src/lcd/lcd_private.h rename to src/lcd/lcd_private.hpp diff --git a/src/lcd/lcm1602.cxx b/src/lcd/lcm1602.cxx index 38f0c878..57d039ee 100644 --- a/src/lcd/lcm1602.cxx +++ b/src/lcd/lcm1602.cxx @@ -35,8 +35,8 @@ #include #include -#include "hd44780_bits.h" -#include "lcm1602.h" +#include "hd44780_bits.hpp" +#include "lcm1602.hpp" using namespace upm; diff --git a/src/lcd/lcm1602.h b/src/lcd/lcm1602.hpp similarity index 99% rename from src/lcd/lcm1602.h rename to src/lcd/lcm1602.hpp index 6c260827..5f5d5835 100644 --- a/src/lcd/lcm1602.h +++ b/src/lcd/lcm1602.hpp @@ -38,7 +38,7 @@ #include -#include "lcd.h" +#include "lcd.hpp" namespace upm { diff --git a/src/lcd/pyupm_i2clcd.i b/src/lcd/pyupm_i2clcd.i index 04cab461..7de2f554 100755 --- a/src/lcd/pyupm_i2clcd.i +++ b/src/lcd/pyupm_i2clcd.i @@ -6,43 +6,43 @@ %feature("autodoc", "3"); -%include "ssd.h" -%include "lcd.h" +%include "ssd.hpp" +%include "lcd.hpp" %{ - #include "lcd.h" + #include "lcd.hpp" %} -%include "lcm1602.h" +%include "lcm1602.hpp" %{ - #include "lcm1602.h" + #include "lcm1602.hpp" %} -%include "jhd1313m1.h" +%include "jhd1313m1.hpp" %{ - #include "jhd1313m1.h" + #include "jhd1313m1.hpp" %} -%include "ssd1327.h" +%include "ssd1327.hpp" %{ - #include "ssd1327.h" + #include "ssd1327.hpp" %} -%include "ssd1308.h" +%include "ssd1308.hpp" %{ - #include "ssd1308.h" + #include "ssd1308.hpp" %} -%include "eboled.h" +%include "eboled.hpp" %{ - #include "eboled.h" + #include "eboled.hpp" %} -%include "sainsmartks.h" +%include "sainsmartks.hpp" %{ - #include "sainsmartks.h" + #include "sainsmartks.hpp" %} -%include "ssd1306.h" +%include "ssd1306.hpp" %{ - #include "ssd1306.h" + #include "ssd1306.hpp" %} diff --git a/src/lcd/sainsmartks.cxx b/src/lcd/sainsmartks.cxx index 5c1eb992..f65311d6 100644 --- a/src/lcd/sainsmartks.cxx +++ b/src/lcd/sainsmartks.cxx @@ -25,7 +25,7 @@ #include #include -#include "sainsmartks.h" +#include "sainsmartks.hpp" using namespace upm; diff --git a/src/lcd/sainsmartks.h b/src/lcd/sainsmartks.hpp similarity index 99% rename from src/lcd/sainsmartks.h rename to src/lcd/sainsmartks.hpp index fa4e4ccf..f51dd2a6 100644 --- a/src/lcd/sainsmartks.h +++ b/src/lcd/sainsmartks.hpp @@ -25,7 +25,7 @@ #include #include -#include "lcm1602.h" +#include "lcm1602.hpp" namespace upm { diff --git a/src/lcd/ssd.h b/src/lcd/ssd.hpp similarity index 100% rename from src/lcd/ssd.h rename to src/lcd/ssd.hpp diff --git a/src/lcd/ssd1306.cxx b/src/lcd/ssd1306.cxx index 29ffa7ea..834096ac 100644 --- a/src/lcd/ssd1306.cxx +++ b/src/lcd/ssd1306.cxx @@ -29,8 +29,8 @@ #include #include -#include "hd44780_bits.h" -#include "ssd1306.h" +#include "hd44780_bits.hpp" +#include "ssd1306.hpp" using namespace upm; diff --git a/src/lcd/ssd1306.h b/src/lcd/ssd1306.hpp similarity index 99% rename from src/lcd/ssd1306.h rename to src/lcd/ssd1306.hpp index e1fbc460..52d226ea 100644 --- a/src/lcd/ssd1306.h +++ b/src/lcd/ssd1306.hpp @@ -30,8 +30,8 @@ #include #include -#include "lcd.h" -#include "ssd.h" +#include "lcd.hpp" +#include "ssd.hpp" namespace upm { diff --git a/src/lcd/ssd1308.cxx b/src/lcd/ssd1308.cxx index 7adc8308..a48a1f73 100644 --- a/src/lcd/ssd1308.cxx +++ b/src/lcd/ssd1308.cxx @@ -26,8 +26,8 @@ #include #include -#include "hd44780_bits.h" -#include "ssd1308.h" +#include "hd44780_bits.hpp" +#include "ssd1308.hpp" using namespace upm; diff --git a/src/lcd/ssd1308.h b/src/lcd/ssd1308.hpp similarity index 98% rename from src/lcd/ssd1308.h rename to src/lcd/ssd1308.hpp index 8fd2b355..59c9da1b 100644 --- a/src/lcd/ssd1308.h +++ b/src/lcd/ssd1308.hpp @@ -26,8 +26,8 @@ #include #include -#include "lcd.h" -#include "ssd.h" +#include "lcd.hpp" +#include "ssd.hpp" namespace upm { diff --git a/src/lcd/ssd1327.cxx b/src/lcd/ssd1327.cxx index 28cc3432..65c5306d 100644 --- a/src/lcd/ssd1327.cxx +++ b/src/lcd/ssd1327.cxx @@ -26,8 +26,8 @@ #include #include -#include "hd44780_bits.h" -#include "ssd1327.h" +#include "hd44780_bits.hpp" +#include "ssd1327.hpp" using namespace upm; diff --git a/src/lcd/ssd1327.h b/src/lcd/ssd1327.hpp similarity index 99% rename from src/lcd/ssd1327.h rename to src/lcd/ssd1327.hpp index 5785080a..4e26f4d7 100644 --- a/src/lcd/ssd1327.h +++ b/src/lcd/ssd1327.hpp @@ -26,8 +26,8 @@ #include #include -#include "lcd.h" -#include "ssd.h" +#include "lcd.hpp" +#include "ssd.hpp" namespace upm { diff --git a/src/ldt0028/CMakeLists.txt b/src/ldt0028/CMakeLists.txt index e066e351..bae23833 100644 --- a/src/ldt0028/CMakeLists.txt +++ b/src/ldt0028/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "ldt0028") set (libdescription "upm ldt0028") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/ldt0028/javaupm_ldt0028.i b/src/ldt0028/javaupm_ldt0028.i index 6407f5f8..c8a132a9 100644 --- a/src/ldt0028/javaupm_ldt0028.i +++ b/src/ldt0028/javaupm_ldt0028.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "ldt0028.h" + #include "ldt0028.hpp" %} -%include "ldt0028.h" +%include "ldt0028.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/ldt0028/jsupm_ldt0028.i b/src/ldt0028/jsupm_ldt0028.i index 7682fb20..3c22594e 100644 --- a/src/ldt0028/jsupm_ldt0028.i +++ b/src/ldt0028/jsupm_ldt0028.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "ldt0028.h" + #include "ldt0028.hpp" %} -%include "ldt0028.h" +%include "ldt0028.hpp" diff --git a/src/ldt0028/ldt0028.cxx b/src/ldt0028/ldt0028.cxx index c1c8445a..19e712f1 100644 --- a/src/ldt0028/ldt0028.cxx +++ b/src/ldt0028/ldt0028.cxx @@ -25,7 +25,7 @@ #include #include -#include "ldt0028.h" +#include "ldt0028.hpp" using namespace upm; diff --git a/src/ldt0028/ldt0028.h b/src/ldt0028/ldt0028.hpp similarity index 100% rename from src/ldt0028/ldt0028.h rename to src/ldt0028/ldt0028.hpp diff --git a/src/ldt0028/pyupm_ldt0028.i b/src/ldt0028/pyupm_ldt0028.i index 6760eedb..1d6c942c 100644 --- a/src/ldt0028/pyupm_ldt0028.i +++ b/src/ldt0028/pyupm_ldt0028.i @@ -5,8 +5,8 @@ %feature("autodoc", "3"); -%include "ldt0028.h" +%include "ldt0028.hpp" %{ - #include "ldt0028.h" + #include "ldt0028.hpp" %} diff --git a/src/lm35/CMakeLists.txt b/src/lm35/CMakeLists.txt index 54e41fa6..e2c15d47 100644 --- a/src/lm35/CMakeLists.txt +++ b/src/lm35/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "lm35") set (libdescription "upm DFRobot LM35 temperature sensor") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/lm35/javaupm_lm35.i b/src/lm35/javaupm_lm35.i index aafab80b..4274ed29 100644 --- a/src/lm35/javaupm_lm35.i +++ b/src/lm35/javaupm_lm35.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "lm35.h" + #include "lm35.hpp" %} -%include "lm35.h" +%include "lm35.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/lm35/jsupm_lm35.i b/src/lm35/jsupm_lm35.i index a0cb3348..73a7af2b 100644 --- a/src/lm35/jsupm_lm35.i +++ b/src/lm35/jsupm_lm35.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "lm35.h" + #include "lm35.hpp" %} -%include "lm35.h" +%include "lm35.hpp" diff --git a/src/lm35/lm35.cxx b/src/lm35/lm35.cxx index 07509e8a..03f478d2 100644 --- a/src/lm35/lm35.cxx +++ b/src/lm35/lm35.cxx @@ -23,7 +23,7 @@ */ #include -#include "lm35.h" +#include "lm35.hpp" using namespace std; using namespace upm; diff --git a/src/lm35/lm35.h b/src/lm35/lm35.hpp similarity index 100% rename from src/lm35/lm35.h rename to src/lm35/lm35.hpp diff --git a/src/lm35/pyupm_lm35.i b/src/lm35/pyupm_lm35.i index 5a29a379..8e669b4a 100644 --- a/src/lm35/pyupm_lm35.i +++ b/src/lm35/pyupm_lm35.i @@ -5,7 +5,7 @@ %feature("autodoc", "3"); -%include "lm35.h" +%include "lm35.hpp" %{ - #include "lm35.h" + #include "lm35.hpp" %} diff --git a/src/lol/CMakeLists.txt b/src/lol/CMakeLists.txt index d43c02b2..694e7bfe 100644 --- a/src/lol/CMakeLists.txt +++ b/src/lol/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "lol") set (libdescription "LoL Olimex LoL rev A") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/lol/javaupm_lol.i b/src/lol/javaupm_lol.i index 6c1ceaee..2947ae7a 100644 --- a/src/lol/javaupm_lol.i +++ b/src/lol/javaupm_lol.i @@ -19,10 +19,10 @@ } %{ - #include "lol.h" + #include "lol.hpp" %} -%include "lol.h" +%include "lol.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/lol/jsupm_lol.i b/src/lol/jsupm_lol.i index 73659e89..3280ecbe 100644 --- a/src/lol/jsupm_lol.i +++ b/src/lol/jsupm_lol.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "lol.h" + #include "lol.hpp" %} -%include "lol.h" +%include "lol.hpp" diff --git a/src/lol/lol.cxx b/src/lol/lol.cxx index aa712e64..e6672aa7 100644 --- a/src/lol/lol.cxx +++ b/src/lol/lol.cxx @@ -29,7 +29,7 @@ #include #include #include -#include "lol.h" +#include "lol.hpp" using namespace upm; diff --git a/src/lol/lol.h b/src/lol/lol.hpp similarity index 100% rename from src/lol/lol.h rename to src/lol/lol.hpp diff --git a/src/lol/pyupm_lol.i b/src/lol/pyupm_lol.i index aedf9974..92153e4c 100644 --- a/src/lol/pyupm_lol.i +++ b/src/lol/pyupm_lol.i @@ -7,7 +7,7 @@ %feature("autodoc", "3"); -%include "lol.h" +%include "lol.hpp" %{ - #include "lol.h" + #include "lol.hpp" %} diff --git a/src/loudness/CMakeLists.txt b/src/loudness/CMakeLists.txt index 49e6af60..41fffd7c 100644 --- a/src/loudness/CMakeLists.txt +++ b/src/loudness/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "loudness") set (libdescription "upm loudness sensors") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/loudness/javaupm_loudness.i b/src/loudness/javaupm_loudness.i index 5818ee71..91e949c0 100644 --- a/src/loudness/javaupm_loudness.i +++ b/src/loudness/javaupm_loudness.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "loudness.h" + #include "loudness.hpp" %} -%include "loudness.h" +%include "loudness.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/loudness/jsupm_loudness.i b/src/loudness/jsupm_loudness.i index 5a3ed4fd..d6e8533e 100644 --- a/src/loudness/jsupm_loudness.i +++ b/src/loudness/jsupm_loudness.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "loudness.h" + #include "loudness.hpp" %} -%include "loudness.h" +%include "loudness.hpp" diff --git a/src/loudness/loudness.cxx b/src/loudness/loudness.cxx index d16610f8..3aa381c4 100644 --- a/src/loudness/loudness.cxx +++ b/src/loudness/loudness.cxx @@ -24,7 +24,7 @@ #include -#include "loudness.h" +#include "loudness.hpp" using namespace std; using namespace upm; diff --git a/src/loudness/loudness.h b/src/loudness/loudness.hpp similarity index 100% rename from src/loudness/loudness.h rename to src/loudness/loudness.hpp diff --git a/src/loudness/pyupm_loudness.i b/src/loudness/pyupm_loudness.i index 4fc9c8d8..6f0a715e 100644 --- a/src/loudness/pyupm_loudness.i +++ b/src/loudness/pyupm_loudness.i @@ -5,7 +5,7 @@ %feature("autodoc", "3"); -%include "loudness.h" +%include "loudness.hpp" %{ - #include "loudness.h" + #include "loudness.hpp" %} diff --git a/src/lp8860/CMakeLists.txt b/src/lp8860/CMakeLists.txt index a648c101..c4e99fb7 100644 --- a/src/lp8860/CMakeLists.txt +++ b/src/lp8860/CMakeLists.txt @@ -2,5 +2,5 @@ include_directories(..) set (libname "lp8860") set (libdescription “LED lighting controller”) set (module_src ${libname}.cxx mraa-utils.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/lp8860/javaupm_lp8860.i b/src/lp8860/javaupm_lp8860.i index 33c8a226..5479cbde 100644 --- a/src/lp8860/javaupm_lp8860.i +++ b/src/lp8860/javaupm_lp8860.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "lp8860.h" + #include "lp8860.hpp" %} -%include "lp8860.h" +%include "lp8860.hpp" diff --git a/src/lp8860/jsupm_lp8860.i b/src/lp8860/jsupm_lp8860.i index af84b46d..d7c0fbcc 100644 --- a/src/lp8860/jsupm_lp8860.i +++ b/src/lp8860/jsupm_lp8860.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "lp8860.h" + #include "lp8860.hpp" %} -%include "lp8860.h" +%include "lp8860.hpp" diff --git a/src/lp8860/lp8860.cxx b/src/lp8860/lp8860.cxx index edcbbe86..97db81ba 100644 --- a/src/lp8860/lp8860.cxx +++ b/src/lp8860/lp8860.cxx @@ -25,8 +25,8 @@ #include #include #include -#include "lp8860.h" -#include "mraa-utils.h" +#include "lp8860.hpp" +#include "mraa-utils.hpp" // Used to prevent silent failure in mraa_i2c_write() // Value come from I2C_SMBUS_I2C_BLOCK_MAX in i2c driver diff --git a/src/lp8860/lp8860.h b/src/lp8860/lp8860.hpp similarity index 98% rename from src/lp8860/lp8860.h rename to src/lp8860/lp8860.hpp index 8828fe45..4b96dffe 100644 --- a/src/lp8860/lp8860.h +++ b/src/lp8860/lp8860.hpp @@ -22,7 +22,7 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "upm/iLightController.h" +#include "upm/iLightController.hpp" #include "mraa/i2c.hpp" namespace upm diff --git a/src/lp8860/mraa-utils.cxx b/src/lp8860/mraa-utils.cxx index 3c12561d..b0e9d92c 100644 --- a/src/lp8860/mraa-utils.cxx +++ b/src/lp8860/mraa-utils.cxx @@ -22,7 +22,7 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "mraa-utils.h" +#include "mraa-utils.hpp" #include "mraa/gpio.hpp" #define UPM_THROW(msg) throw std::runtime_error(std::string(__FUNCTION__) + ": " + (msg)) diff --git a/src/hlg150h/mraa-utils.h b/src/lp8860/mraa-utils.hpp similarity index 100% rename from src/hlg150h/mraa-utils.h rename to src/lp8860/mraa-utils.hpp diff --git a/src/lp8860/pyupm_lp8860.i b/src/lp8860/pyupm_lp8860.i index 116ce8d8..04eafe5c 100644 --- a/src/lp8860/pyupm_lp8860.i +++ b/src/lp8860/pyupm_lp8860.i @@ -3,7 +3,7 @@ %feature("autodoc", "3"); -%include "lp8860.h" +%include "lp8860.hpp" %{ - #include "lp8860.h" + #include "lp8860.hpp" %} diff --git a/src/lpd8806/CMakeLists.txt b/src/lpd8806/CMakeLists.txt index 146ce83a..0bbd74c7 100644 --- a/src/lpd8806/CMakeLists.txt +++ b/src/lpd8806/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "lpd8806") set (libdescription “Digital RGB LED strip”) set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/lpd8806/javaupm_lpd8806.i b/src/lpd8806/javaupm_lpd8806.i index 5de138a5..0faac254 100644 --- a/src/lpd8806/javaupm_lpd8806.i +++ b/src/lpd8806/javaupm_lpd8806.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "lpd8806.h" + #include "lpd8806.hpp" %} -%include "lpd8806.h" +%include "lpd8806.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/lpd8806/jsupm_lpd8806.i b/src/lpd8806/jsupm_lpd8806.i index 279c8fee..bafc2b4d 100644 --- a/src/lpd8806/jsupm_lpd8806.i +++ b/src/lpd8806/jsupm_lpd8806.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "lpd8806.h" + #include "lpd8806.hpp" %} -%include "lpd8806.h" +%include "lpd8806.hpp" diff --git a/src/lpd8806/lpd8806.cxx b/src/lpd8806/lpd8806.cxx index 40c1e823..6f0bffbf 100644 --- a/src/lpd8806/lpd8806.cxx +++ b/src/lpd8806/lpd8806.cxx @@ -28,7 +28,7 @@ #include #include -#include "lpd8806.h" +#include "lpd8806.hpp" using namespace upm; diff --git a/src/lpd8806/lpd8806.h b/src/lpd8806/lpd8806.hpp similarity index 100% rename from src/lpd8806/lpd8806.h rename to src/lpd8806/lpd8806.hpp diff --git a/src/lpd8806/pyupm_lpd8806.i b/src/lpd8806/pyupm_lpd8806.i index ee8db84c..643abcd6 100644 --- a/src/lpd8806/pyupm_lpd8806.i +++ b/src/lpd8806/pyupm_lpd8806.i @@ -5,7 +5,7 @@ %feature("autodoc", "3"); -%include "lpd8806.h" +%include "lpd8806.hpp" %{ - #include "lpd8806.h" + #include "lpd8806.hpp" %} diff --git a/src/lsm303/CMakeLists.txt b/src/lsm303/CMakeLists.txt index d97e58bb..7349b35f 100644 --- a/src/lsm303/CMakeLists.txt +++ b/src/lsm303/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "lsm303") set (libdescription "upm lsm303") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/lsm303/javaupm_lsm303.i b/src/lsm303/javaupm_lsm303.i index 961c74fd..da0ce2bf 100644 --- a/src/lsm303/javaupm_lsm303.i +++ b/src/lsm303/javaupm_lsm303.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "lsm303.h" + #include "lsm303.hpp" %} %typemap(jni) int16_t* "jshortArray" @@ -18,7 +18,7 @@ JCALL4(SetShortArrayRegion, jenv, $result, 0, 3, (jshort*)$1); } -%include "lsm303.h" +%include "lsm303.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/lsm303/jsupm_lsm303.i b/src/lsm303/jsupm_lsm303.i index f6f65cf7..ba6d27b3 100644 --- a/src/lsm303/jsupm_lsm303.i +++ b/src/lsm303/jsupm_lsm303.i @@ -9,7 +9,7 @@ } %{ - #include "lsm303.h" + #include "lsm303.hpp" %} -%include "lsm303.h" +%include "lsm303.hpp" diff --git a/src/lsm303/lsm303.cxx b/src/lsm303/lsm303.cxx index 87d4afe2..268a411c 100644 --- a/src/lsm303/lsm303.cxx +++ b/src/lsm303/lsm303.cxx @@ -31,7 +31,7 @@ #include #include -#include "lsm303.h" +#include "lsm303.hpp" using namespace upm; diff --git a/src/lsm303/lsm303.h b/src/lsm303/lsm303.hpp similarity index 100% rename from src/lsm303/lsm303.h rename to src/lsm303/lsm303.hpp diff --git a/src/lsm303/pyupm_lsm303.i b/src/lsm303/pyupm_lsm303.i index b32d25e5..f865cee5 100644 --- a/src/lsm303/pyupm_lsm303.i +++ b/src/lsm303/pyupm_lsm303.i @@ -12,7 +12,7 @@ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_int16Array, 0 | 0 ); } -%include "lsm303.h" +%include "lsm303.hpp" %{ - #include "lsm303.h" + #include "lsm303.hpp" %} diff --git a/src/lsm9ds0/CMakeLists.txt b/src/lsm9ds0/CMakeLists.txt index d4a45fd6..917385b6 100644 --- a/src/lsm9ds0/CMakeLists.txt +++ b/src/lsm9ds0/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "lsm9ds0") set (libdescription "gyro, accelerometer and magnometer sensor based on lsm9ds0") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/lsm9ds0/javaupm_lsm9ds0.i b/src/lsm9ds0/javaupm_lsm9ds0.i index 05ca5dcf..a91723f4 100644 --- a/src/lsm9ds0/javaupm_lsm9ds0.i +++ b/src/lsm9ds0/javaupm_lsm9ds0.i @@ -39,10 +39,10 @@ %ignore getMagnetometer(float *, float *, float *); %{ - #include "lsm9ds0.h" + #include "lsm9ds0.hpp" %} -%include "lsm9ds0.h" +%include "lsm9ds0.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/lsm9ds0/jsupm_lsm9ds0.i b/src/lsm9ds0/jsupm_lsm9ds0.i index 3f0c6add..982d652c 100644 --- a/src/lsm9ds0/jsupm_lsm9ds0.i +++ b/src/lsm9ds0/jsupm_lsm9ds0.i @@ -4,8 +4,8 @@ %pointer_functions(float, floatp); -%include "lsm9ds0.h" +%include "lsm9ds0.hpp" %{ - #include "lsm9ds0.h" + #include "lsm9ds0.hpp" %} diff --git a/src/lsm9ds0/lsm9ds0.cxx b/src/lsm9ds0/lsm9ds0.cxx index 3253a62e..9be82724 100644 --- a/src/lsm9ds0/lsm9ds0.cxx +++ b/src/lsm9ds0/lsm9ds0.cxx @@ -27,7 +27,7 @@ #include #include -#include "lsm9ds0.h" +#include "lsm9ds0.hpp" using namespace upm; using namespace std; diff --git a/src/lsm9ds0/lsm9ds0.h b/src/lsm9ds0/lsm9ds0.hpp similarity index 100% rename from src/lsm9ds0/lsm9ds0.h rename to src/lsm9ds0/lsm9ds0.hpp diff --git a/src/lsm9ds0/pyupm_lsm9ds0.i b/src/lsm9ds0/pyupm_lsm9ds0.i index 7472a9d8..4665f27e 100644 --- a/src/lsm9ds0/pyupm_lsm9ds0.i +++ b/src/lsm9ds0/pyupm_lsm9ds0.i @@ -10,8 +10,8 @@ %pointer_functions(float, floatp); -%include "lsm9ds0.h" +%include "lsm9ds0.hpp" %{ - #include "lsm9ds0.h" + #include "lsm9ds0.hpp" %} diff --git a/src/m24lr64e/CMakeLists.txt b/src/m24lr64e/CMakeLists.txt index 57daeac1..ee9ad3f9 100644 --- a/src/m24lr64e/CMakeLists.txt +++ b/src/m24lr64e/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "m24lr64e") set (libdescription "upm m24lr64e grove NFC tag") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/m24lr64e/javaupm_m24lr64e.i b/src/m24lr64e/javaupm_m24lr64e.i index 185e7e5f..048e1883 100644 --- a/src/m24lr64e/javaupm_m24lr64e.i +++ b/src/m24lr64e/javaupm_m24lr64e.i @@ -20,10 +20,10 @@ } %{ - #include "m24lr64e.h" + #include "m24lr64e.hpp" %} -%include "m24lr64e.h" +%include "m24lr64e.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/m24lr64e/jsupm_m24lr64e.i b/src/m24lr64e/jsupm_m24lr64e.i index 8e1993c9..104efae9 100644 --- a/src/m24lr64e/jsupm_m24lr64e.i +++ b/src/m24lr64e/jsupm_m24lr64e.i @@ -4,7 +4,7 @@ %include "stdint.i" %{ - #include "m24lr64e.h" + #include "m24lr64e.hpp" %} -%include "m24lr64e.h" +%include "m24lr64e.hpp" diff --git a/src/m24lr64e/m24lr64e.cxx b/src/m24lr64e/m24lr64e.cxx index 633d5e74..a4e1cd7d 100644 --- a/src/m24lr64e/m24lr64e.cxx +++ b/src/m24lr64e/m24lr64e.cxx @@ -27,7 +27,7 @@ #include #include -#include "m24lr64e.h" +#include "m24lr64e.hpp" using namespace upm; using namespace std; diff --git a/src/m24lr64e/m24lr64e.h b/src/m24lr64e/m24lr64e.hpp similarity index 100% rename from src/m24lr64e/m24lr64e.h rename to src/m24lr64e/m24lr64e.hpp diff --git a/src/m24lr64e/pyupm_m24lr64e.i b/src/m24lr64e/pyupm_m24lr64e.i index 7b702989..5b8b538b 100644 --- a/src/m24lr64e/pyupm_m24lr64e.i +++ b/src/m24lr64e/pyupm_m24lr64e.i @@ -11,7 +11,7 @@ %include "m24lr64e_doc.i" #endif -%include "m24lr64e.h" +%include "m24lr64e.hpp" %{ - #include "m24lr64e.h" + #include "m24lr64e.hpp" %} diff --git a/src/max31723/CMakeLists.txt b/src/max31723/CMakeLists.txt index 911b3745..f6e5c72c 100644 --- a/src/max31723/CMakeLists.txt +++ b/src/max31723/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "max31723") set (libdescription "Very accurate temperature sensor") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/max31723/javaupm_max31723.i b/src/max31723/javaupm_max31723.i index 419a34ac..c4a6a0b2 100644 --- a/src/max31723/javaupm_max31723.i +++ b/src/max31723/javaupm_max31723.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "max31723.h" + #include "max31723.hpp" %} -%include "max31723.h" +%include "max31723.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/max31723/jsupm_max31723.i b/src/max31723/jsupm_max31723.i index e35ead5d..cfb8a7e0 100644 --- a/src/max31723/jsupm_max31723.i +++ b/src/max31723/jsupm_max31723.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "max31723.h" + #include "max31723.hpp" %} -%include "max31723.h" +%include "max31723.hpp" diff --git a/src/max31723/max31723.cxx b/src/max31723/max31723.cxx index 133a44d5..f34dd886 100644 --- a/src/max31723/max31723.cxx +++ b/src/max31723/max31723.cxx @@ -27,7 +27,7 @@ #include #include -#include "max31723.h" +#include "max31723.hpp" using namespace upm; diff --git a/src/max31723/max31723.h b/src/max31723/max31723.hpp similarity index 100% rename from src/max31723/max31723.h rename to src/max31723/max31723.hpp diff --git a/src/max31723/pyupm_max31723.i b/src/max31723/pyupm_max31723.i index 2694b7d3..da8e4974 100644 --- a/src/max31723/pyupm_max31723.i +++ b/src/max31723/pyupm_max31723.i @@ -5,7 +5,7 @@ %feature("autodoc", "3"); -%include "max31723.h" +%include "max31723.hpp" %{ - #include "max31723.h" + #include "max31723.hpp" %} diff --git a/src/max31855/CMakeLists.txt b/src/max31855/CMakeLists.txt index b2ff5dfd..312ee00a 100644 --- a/src/max31855/CMakeLists.txt +++ b/src/max31855/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "max31855") set (libdescription "K type thermistor amplifier") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/max31855/javaupm_max31855.i b/src/max31855/javaupm_max31855.i index a778d370..17bbdc50 100644 --- a/src/max31855/javaupm_max31855.i +++ b/src/max31855/javaupm_max31855.i @@ -3,10 +3,10 @@ %include "../upm.i" %{ - #include "max31855.h" + #include "max31855.hpp" %} -%include "max31855.h" +%include "max31855.hpp" //! [Interesting] %pragma(java) jniclasscode=%{ diff --git a/src/max31855/jsupm_max31855.i b/src/max31855/jsupm_max31855.i index 6bb69673..d3c28972 100644 --- a/src/max31855/jsupm_max31855.i +++ b/src/max31855/jsupm_max31855.i @@ -3,8 +3,8 @@ %include "../upm.i" %{ - #include "max31855.h" + #include "max31855.hpp" %} -%include "max31855.h" +%include "max31855.hpp" //! [Interesting] diff --git a/src/max31855/max31855.cxx b/src/max31855/max31855.cxx index 3037aaf3..d940703c 100644 --- a/src/max31855/max31855.cxx +++ b/src/max31855/max31855.cxx @@ -30,7 +30,7 @@ #include #include -#include "max31855.h" +#include "max31855.hpp" using namespace upm; diff --git a/src/max31855/max31855.h b/src/max31855/max31855.hpp similarity index 100% rename from src/max31855/max31855.h rename to src/max31855/max31855.hpp diff --git a/src/max31855/pyupm_max31855.i b/src/max31855/pyupm_max31855.i index e06c7b7d..cfbfd7a8 100644 --- a/src/max31855/pyupm_max31855.i +++ b/src/max31855/pyupm_max31855.i @@ -7,7 +7,7 @@ %feature("autodoc", "3"); -%include "max31855.h" +%include "max31855.hpp" %{ - #include "max31855.h" + #include "max31855.hpp" %} diff --git a/src/max44000/CMakeLists.txt b/src/max44000/CMakeLists.txt index 11090615..430e64d2 100644 --- a/src/max44000/CMakeLists.txt +++ b/src/max44000/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "max44000") set (libdescription "upm MAX44000") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/max44000/javaupm_max44000.i b/src/max44000/javaupm_max44000.i index fbf331a5..b4080d6e 100644 --- a/src/max44000/javaupm_max44000.i +++ b/src/max44000/javaupm_max44000.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "max44000.h" + #include "max44000.hpp" %} -%include "max44000.h" +%include "max44000.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/max44000/jsupm_max44000.i b/src/max44000/jsupm_max44000.i index 80a2b5a8..d8f90e4a 100644 --- a/src/max44000/jsupm_max44000.i +++ b/src/max44000/jsupm_max44000.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "max44000.h" + #include "max44000.hpp" %} -%include "max44000.h" +%include "max44000.hpp" diff --git a/src/max44000/max44000.cxx b/src/max44000/max44000.cxx index eb7025d6..384e7470 100644 --- a/src/max44000/max44000.cxx +++ b/src/max44000/max44000.cxx @@ -28,7 +28,7 @@ #include #include -#include "max44000.h" +#include "max44000.hpp" using namespace upm; diff --git a/src/max44000/max44000.h b/src/max44000/max44000.hpp similarity index 100% rename from src/max44000/max44000.h rename to src/max44000/max44000.hpp diff --git a/src/max44000/pyupm_max44000.i b/src/max44000/pyupm_max44000.i index f4275313..6fb69208 100644 --- a/src/max44000/pyupm_max44000.i +++ b/src/max44000/pyupm_max44000.i @@ -7,7 +7,7 @@ %feature("autodoc", "3"); -%include "max44000.h" +%include "max44000.hpp" %{ - #include "max44000.h" + #include "max44000.hpp" %} diff --git a/src/max44009/CMakeLists.txt b/src/max44009/CMakeLists.txt index 4b644594..8a3a9a4d 100644 --- a/src/max44009/CMakeLists.txt +++ b/src/max44009/CMakeLists.txt @@ -2,5 +2,5 @@ include_directories(..) set (libname "max44009") set (libdescription "upm MAX44009") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/max44009/javaupm_max44009.i b/src/max44009/javaupm_max44009.i index fcfcf729..c6ce339d 100644 --- a/src/max44009/javaupm_max44009.i +++ b/src/max44009/javaupm_max44009.i @@ -6,10 +6,10 @@ %include "typemaps.i" %{ - #include "max44009.h" + #include "max44009.hpp" %} -%include "max44009.h" +%include "max44009.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/max44009/jsupm_max44009.i b/src/max44009/jsupm_max44009.i index e27586ec..afebbae5 100644 --- a/src/max44009/jsupm_max44009.i +++ b/src/max44009/jsupm_max44009.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "max44009.h" + #include "max44009.hpp" %} -%include "max44009.h" +%include "max44009.hpp" diff --git a/src/max44009/max44009.cxx b/src/max44009/max44009.cxx index ff6038f8..d7696c10 100644 --- a/src/max44009/max44009.cxx +++ b/src/max44009/max44009.cxx @@ -27,7 +27,7 @@ #include #include -#include "max44009.h" +#include "max44009.hpp" using namespace upm; diff --git a/src/max44009/max44009.h b/src/max44009/max44009.hpp similarity index 98% rename from src/max44009/max44009.h rename to src/max44009/max44009.hpp index 764475b5..87b98ffa 100644 --- a/src/max44009/max44009.h +++ b/src/max44009/max44009.hpp @@ -26,7 +26,7 @@ #include #include -#include "upm/iLightSensor.h" +#include "upm/iLightSensor.hpp" /* ADDRESS AND NOT_FOUND VALUE */ #define MAX44009_ADDRESS ( 0x4A ) @@ -102,7 +102,7 @@ namespace upm { * @con i2c * @if ilightsensor * - * @snippet iLightSensor.h Interesting + * @snippet iLightSensor.hpp Interesting * */ class MAX44009 : public ILightSensor { diff --git a/src/max44009/pyupm_max44009.i b/src/max44009/pyupm_max44009.i index b1488b73..c8e614f9 100644 --- a/src/max44009/pyupm_max44009.i +++ b/src/max44009/pyupm_max44009.i @@ -5,7 +5,7 @@ %feature("autodoc", "3"); -%include "max44009.h" +%include "max44009.hpp" %{ - #include "max44009.h" + #include "max44009.hpp" %} diff --git a/src/max5487/CMakeLists.txt b/src/max5487/CMakeLists.txt index e6d59b61..d546ebdd 100644 --- a/src/max5487/CMakeLists.txt +++ b/src/max5487/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "max5487") set (libdescription "Digital potentiometer") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/max5487/javaupm_max5487.i b/src/max5487/javaupm_max5487.i index e31fed55..e5873b44 100644 --- a/src/max5487/javaupm_max5487.i +++ b/src/max5487/javaupm_max5487.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "max5487.h" + #include "max5487.hpp" %} -%include "max5487.h" +%include "max5487.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/max5487/jsupm_max5487.i b/src/max5487/jsupm_max5487.i index 880aeaaf..9dd9c51b 100644 --- a/src/max5487/jsupm_max5487.i +++ b/src/max5487/jsupm_max5487.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "max5487.h" + #include "max5487.hpp" %} -%include "max5487.h" +%include "max5487.hpp" diff --git a/src/max5487/max5487.cxx b/src/max5487/max5487.cxx index 4eb90ac4..a7e93e21 100644 --- a/src/max5487/max5487.cxx +++ b/src/max5487/max5487.cxx @@ -27,7 +27,7 @@ #include #include -#include "max5487.h" +#include "max5487.hpp" using namespace upm; diff --git a/src/max5487/max5487.h b/src/max5487/max5487.hpp similarity index 100% rename from src/max5487/max5487.h rename to src/max5487/max5487.hpp diff --git a/src/max5487/pyupm_max5487.i b/src/max5487/pyupm_max5487.i index 693d5261..e8026ec0 100644 --- a/src/max5487/pyupm_max5487.i +++ b/src/max5487/pyupm_max5487.i @@ -5,7 +5,7 @@ %feature("autodoc", "3"); -%include "max5487.h" +%include "max5487.hpp" %{ - #include "max5487.h" + #include "max5487.hpp" %} diff --git a/src/maxds3231m/CMakeLists.txt b/src/maxds3231m/CMakeLists.txt index 561ead48..ff1fdd0b 100644 --- a/src/maxds3231m/CMakeLists.txt +++ b/src/maxds3231m/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "maxds3231m") set (libdescription "realtime clock sensor from MAX family") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/maxds3231m/javaupm_maxds3231m.i b/src/maxds3231m/javaupm_maxds3231m.i index 4dcf6f33..a7a6801c 100644 --- a/src/maxds3231m/javaupm_maxds3231m.i +++ b/src/maxds3231m/javaupm_maxds3231m.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "maxds3231m.h" + #include "maxds3231m.hpp" %} -%include "maxds3231m.h" +%include "maxds3231m.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/maxds3231m/jsupm_maxds3231m.i b/src/maxds3231m/jsupm_maxds3231m.i index b18f3476..aba6c8c9 100644 --- a/src/maxds3231m/jsupm_maxds3231m.i +++ b/src/maxds3231m/jsupm_maxds3231m.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "maxds3231m.h" + #include "maxds3231m.hpp" %} -%include "maxds3231m.h" +%include "maxds3231m.hpp" diff --git a/src/maxds3231m/maxds3231m.cxx b/src/maxds3231m/maxds3231m.cxx index 77483034..10bb2342 100644 --- a/src/maxds3231m/maxds3231m.cxx +++ b/src/maxds3231m/maxds3231m.cxx @@ -27,7 +27,7 @@ #include #include -#include "maxds3231m.h" +#include "maxds3231m.hpp" using namespace upm; diff --git a/src/maxds3231m/maxds3231m.h b/src/maxds3231m/maxds3231m.hpp similarity index 100% rename from src/maxds3231m/maxds3231m.h rename to src/maxds3231m/maxds3231m.hpp diff --git a/src/maxds3231m/pyupm_maxds3231m.i b/src/maxds3231m/pyupm_maxds3231m.i index 05c30397..7c2f8f95 100644 --- a/src/maxds3231m/pyupm_maxds3231m.i +++ b/src/maxds3231m/pyupm_maxds3231m.i @@ -5,7 +5,7 @@ %feature("autodoc", "3"); -%include "maxds3231m.h" +%include "maxds3231m.hpp" %{ - #include "maxds3231m.h" + #include "maxds3231m.hpp" %} diff --git a/src/maxsonarez/CMakeLists.txt b/src/maxsonarez/CMakeLists.txt index 09441bbf..5e4fcde1 100644 --- a/src/maxsonarez/CMakeLists.txt +++ b/src/maxsonarez/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "maxsonarez") set (libdescription "upm MaxSonar EZ family of ultrasonic rangers") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/maxsonarez/javaupm_maxsonarez.i b/src/maxsonarez/javaupm_maxsonarez.i index dc3faeff..6c56b8b7 100644 --- a/src/maxsonarez/javaupm_maxsonarez.i +++ b/src/maxsonarez/javaupm_maxsonarez.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "maxsonarez.h" + #include "maxsonarez.hpp" %} -%include "maxsonarez.h" +%include "maxsonarez.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/maxsonarez/jsupm_maxsonarez.i b/src/maxsonarez/jsupm_maxsonarez.i index b0af4c42..05911d38 100644 --- a/src/maxsonarez/jsupm_maxsonarez.i +++ b/src/maxsonarez/jsupm_maxsonarez.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "maxsonarez.h" + #include "maxsonarez.hpp" %} -%include "maxsonarez.h" +%include "maxsonarez.hpp" diff --git a/src/maxsonarez/maxsonarez.cxx b/src/maxsonarez/maxsonarez.cxx index 51224662..9c5330d8 100644 --- a/src/maxsonarez/maxsonarez.cxx +++ b/src/maxsonarez/maxsonarez.cxx @@ -26,7 +26,7 @@ #include #include -#include "maxsonarez.h" +#include "maxsonarez.hpp" using namespace std; using namespace upm; diff --git a/src/maxsonarez/maxsonarez.h b/src/maxsonarez/maxsonarez.hpp similarity index 100% rename from src/maxsonarez/maxsonarez.h rename to src/maxsonarez/maxsonarez.hpp diff --git a/src/maxsonarez/pyupm_maxsonarez.i b/src/maxsonarez/pyupm_maxsonarez.i index e4504c8a..2ebfc261 100644 --- a/src/maxsonarez/pyupm_maxsonarez.i +++ b/src/maxsonarez/pyupm_maxsonarez.i @@ -5,7 +5,7 @@ %feature("autodoc", "3"); -%include "maxsonarez.h" +%include "maxsonarez.hpp" %{ - #include "maxsonarez.h" + #include "maxsonarez.hpp" %} diff --git a/src/mcp9808/CMakeLists.txt b/src/mcp9808/CMakeLists.txt index 11d39e70..1200446e 100644 --- a/src/mcp9808/CMakeLists.txt +++ b/src/mcp9808/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "mcp9808") set (libdescription "upm mcp9808 Precision I2c temperature sensor") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/mcp9808/javaupm_mcp9808.i b/src/mcp9808/javaupm_mcp9808.i index ff6383be..1e5e5c88 100644 --- a/src/mcp9808/javaupm_mcp9808.i +++ b/src/mcp9808/javaupm_mcp9808.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "mcp9808.h" + #include "mcp9808.hpp" %} -%include "mcp9808.h" +%include "mcp9808.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/mcp9808/jsupm_mcp9808.i b/src/mcp9808/jsupm_mcp9808.i index 60e4f2f0..4bd46cb5 100644 --- a/src/mcp9808/jsupm_mcp9808.i +++ b/src/mcp9808/jsupm_mcp9808.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "mcp9808.h" + #include "mcp9808.hpp" %} -%include "mcp9808.h" +%include "mcp9808.hpp" diff --git a/src/mcp9808/mcp9808.cxx b/src/mcp9808/mcp9808.cxx index a9da8edc..2d0fa2a1 100644 --- a/src/mcp9808/mcp9808.cxx +++ b/src/mcp9808/mcp9808.cxx @@ -24,7 +24,7 @@ -#include "mcp9808.h" +#include "mcp9808.hpp" #include diff --git a/src/mcp9808/mcp9808.h b/src/mcp9808/mcp9808.hpp similarity index 100% rename from src/mcp9808/mcp9808.h rename to src/mcp9808/mcp9808.hpp diff --git a/src/mcp9808/pyupm_mcp9808.i b/src/mcp9808/pyupm_mcp9808.i index 2f094ec2..7a9db9b9 100644 --- a/src/mcp9808/pyupm_mcp9808.i +++ b/src/mcp9808/pyupm_mcp9808.i @@ -5,7 +5,7 @@ %feature("autodoc", "3"); -%include "mcp9808.h" +%include "mcp9808.hpp" %{ - #include "mcp9808.h" + #include "mcp9808.hpp" %} diff --git a/src/mg811/CMakeLists.txt b/src/mg811/CMakeLists.txt index 66b70dab..1a91c4f9 100644 --- a/src/mg811/CMakeLists.txt +++ b/src/mg811/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "mg811") set (libdescription "upm DFRobot CO2 sensor") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/mg811/javaupm_mg811.i b/src/mg811/javaupm_mg811.i index 3f7e201a..574fa795 100644 --- a/src/mg811/javaupm_mg811.i +++ b/src/mg811/javaupm_mg811.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "mg811.h" + #include "mg811.hpp" %} -%include "mg811.h" +%include "mg811.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/mg811/jsupm_mg811.i b/src/mg811/jsupm_mg811.i index 0a4a4bb9..06fd8b5c 100644 --- a/src/mg811/jsupm_mg811.i +++ b/src/mg811/jsupm_mg811.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "mg811.h" + #include "mg811.hpp" %} -%include "mg811.h" +%include "mg811.hpp" diff --git a/src/mg811/mg811.cxx b/src/mg811/mg811.cxx index 622dd854..8330f88a 100644 --- a/src/mg811/mg811.cxx +++ b/src/mg811/mg811.cxx @@ -28,7 +28,7 @@ #include #include -#include "mg811.h" +#include "mg811.hpp" using namespace std; using namespace upm; diff --git a/src/mg811/mg811.h b/src/mg811/mg811.hpp similarity index 100% rename from src/mg811/mg811.h rename to src/mg811/mg811.hpp diff --git a/src/mg811/pyupm_mg811.i b/src/mg811/pyupm_mg811.i index 614da5c7..34c34377 100644 --- a/src/mg811/pyupm_mg811.i +++ b/src/mg811/pyupm_mg811.i @@ -5,7 +5,7 @@ %feature("autodoc", "3"); -%include "mg811.h" +%include "mg811.hpp" %{ - #include "mg811.h" + #include "mg811.hpp" %} diff --git a/src/mhz16/CMakeLists.txt b/src/mhz16/CMakeLists.txt index b032acb6..d435cc81 100644 --- a/src/mhz16/CMakeLists.txt +++ b/src/mhz16/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "mhz16") set (libdescription "upm grove CO2 sensor") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/mhz16/javaupm_mhz16.i b/src/mhz16/javaupm_mhz16.i index c2735a34..3be6f6c8 100644 --- a/src/mhz16/javaupm_mhz16.i +++ b/src/mhz16/javaupm_mhz16.i @@ -8,11 +8,11 @@ %apply int *OUTPUT { int *gas, int *temp }; %{ - #include "mhz16.h" + #include "mhz16.hpp" speed_t int_B9600 = B9600; %} -%include "mhz16.h" +%include "mhz16.hpp" speed_t int_B9600 = B9600; %pragma(java) jniclasscode=%{ diff --git a/src/mhz16/jsupm_mhz16.i b/src/mhz16/jsupm_mhz16.i index 2b3f9d8e..14e6f28a 100644 --- a/src/mhz16/jsupm_mhz16.i +++ b/src/mhz16/jsupm_mhz16.i @@ -5,9 +5,9 @@ /* Send "int *" to JavaScript as intp */ %pointer_functions(int, intp); %{ - #include "mhz16.h" + #include "mhz16.hpp" speed_t int_B9600 = B9600; %} -%include "mhz16.h" +%include "mhz16.hpp" speed_t int_B9600 = B9600; diff --git a/src/mhz16/mhz16.cxx b/src/mhz16/mhz16.cxx index 8ea39258..161451c4 100644 --- a/src/mhz16/mhz16.cxx +++ b/src/mhz16/mhz16.cxx @@ -26,7 +26,7 @@ #include #include -#include "mhz16.h" +#include "mhz16.hpp" using namespace upm; using namespace std; diff --git a/src/mhz16/mhz16.h b/src/mhz16/mhz16.hpp similarity index 100% rename from src/mhz16/mhz16.h rename to src/mhz16/mhz16.hpp diff --git a/src/mhz16/pyupm_mhz16.i b/src/mhz16/pyupm_mhz16.i index 843b380d..dee82ae3 100644 --- a/src/mhz16/pyupm_mhz16.i +++ b/src/mhz16/pyupm_mhz16.i @@ -9,8 +9,8 @@ /* Send "int *" to JavaScript as intp */ %pointer_functions(int, intp); %{ - #include "mhz16.h" + #include "mhz16.hpp" speed_t int_B9600 = B9600; %} -%include "mhz16.h" +%include "mhz16.hpp" speed_t int_B9600 = B9600; diff --git a/src/mic/CMakeLists.txt b/src/mic/CMakeLists.txt index c21cce72..12b5c627 100644 --- a/src/mic/CMakeLists.txt +++ b/src/mic/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "mic") set (libdescription "Microphone simple API") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/mic/javaupm_mic.i b/src/mic/javaupm_mic.i index 5abc65ca..fb7965d9 100644 --- a/src/mic/javaupm_mic.i +++ b/src/mic/javaupm_mic.i @@ -4,7 +4,7 @@ %include "arrays_java.i" %{ - #include "mic.h" + #include "mic.hpp" %} %typemap(jni) (uint16_t *buffer, int len) "jshortArray"; @@ -37,7 +37,7 @@ JCALL3(ReleaseShortArrayElements, jenv, $input, (jshort *)$2, 0); } -%include "mic.h" +%include "mic.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/mic/jsupm_mic.i b/src/mic/jsupm_mic.i index c6fcad3d..567f8b24 100644 --- a/src/mic/jsupm_mic.i +++ b/src/mic/jsupm_mic.i @@ -3,7 +3,7 @@ %include "../carrays_uint16_t.i" %{ - #include "mic.h" + #include "mic.hpp" %} -%include "mic.h" +%include "mic.hpp" diff --git a/src/mic/mic.cxx b/src/mic/mic.cxx index ac4eb9be..2a0f4066 100644 --- a/src/mic/mic.cxx +++ b/src/mic/mic.cxx @@ -29,7 +29,7 @@ #include #include #include -#include "mic.h" +#include "mic.hpp" using namespace upm; diff --git a/src/mic/mic.h b/src/mic/mic.hpp similarity index 100% rename from src/mic/mic.h rename to src/mic/mic.hpp diff --git a/src/mic/pyupm_mic.i b/src/mic/pyupm_mic.i index 4cf7ff91..9cf904ba 100644 --- a/src/mic/pyupm_mic.i +++ b/src/mic/pyupm_mic.i @@ -5,6 +5,6 @@ %include "../carrays_uint16_t.i" %{ - #include "mic.h" + #include "mic.hpp" %} -%include "mic.h" +%include "mic.hpp" diff --git a/src/micsv89/CMakeLists.txt b/src/micsv89/CMakeLists.txt index 7297e087..97a191ec 100644 --- a/src/micsv89/CMakeLists.txt +++ b/src/micsv89/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "micsv89") set (libdescription "upm micsv89 environmental sensor module") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/micsv89/javaupm_micsv89.i b/src/micsv89/javaupm_micsv89.i index 1e11060d..e904570d 100644 --- a/src/micsv89/javaupm_micsv89.i +++ b/src/micsv89/javaupm_micsv89.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "micsv89.h" + #include "micsv89.hpp" %} -%include "micsv89.h" +%include "micsv89.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/micsv89/jsupm_micsv89.i b/src/micsv89/jsupm_micsv89.i index 98c92c08..5e51fac0 100644 --- a/src/micsv89/jsupm_micsv89.i +++ b/src/micsv89/jsupm_micsv89.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "micsv89.h" + #include "micsv89.hpp" %} -%include "micsv89.h" +%include "micsv89.hpp" diff --git a/src/micsv89/micsv89.cxx b/src/micsv89/micsv89.cxx index 6fa60368..9637c221 100644 --- a/src/micsv89/micsv89.cxx +++ b/src/micsv89/micsv89.cxx @@ -22,7 +22,7 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "micsv89.h" +#include "micsv89.hpp" using namespace upm; diff --git a/src/micsv89/micsv89.h b/src/micsv89/micsv89.hpp similarity index 100% rename from src/micsv89/micsv89.h rename to src/micsv89/micsv89.hpp diff --git a/src/micsv89/pyupm_micsv89.i b/src/micsv89/pyupm_micsv89.i index 8ae233f0..ba45581b 100644 --- a/src/micsv89/pyupm_micsv89.i +++ b/src/micsv89/pyupm_micsv89.i @@ -5,7 +5,7 @@ %feature("autodoc", "3"); -%include "micsv89.h" +%include "micsv89.hpp" %{ - #include "micsv89.h" + #include "micsv89.hpp" %} diff --git a/src/mlx90614/CMakeLists.txt b/src/mlx90614/CMakeLists.txt index ca02e694..28d3be78 100644 --- a/src/mlx90614/CMakeLists.txt +++ b/src/mlx90614/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "mlx90614") set (libdescription "Infrared thermometer designed for non-contact emperature sensing") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/mlx90614/javaupm_mlx90614.i b/src/mlx90614/javaupm_mlx90614.i index a5809259..dddd6998 100644 --- a/src/mlx90614/javaupm_mlx90614.i +++ b/src/mlx90614/javaupm_mlx90614.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "mlx90614.h" + #include "mlx90614.hpp" %} -%include "mlx90614.h" +%include "mlx90614.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/mlx90614/jsupm_mlx90614.i b/src/mlx90614/jsupm_mlx90614.i index a73650e4..7ccde4c4 100644 --- a/src/mlx90614/jsupm_mlx90614.i +++ b/src/mlx90614/jsupm_mlx90614.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "mlx90614.h" + #include "mlx90614.hpp" %} -%include "mlx90614.h" +%include "mlx90614.hpp" diff --git a/src/mlx90614/mlx90614.cxx b/src/mlx90614/mlx90614.cxx index aaa05ae8..5afaac34 100644 --- a/src/mlx90614/mlx90614.cxx +++ b/src/mlx90614/mlx90614.cxx @@ -27,7 +27,7 @@ #include #include -#include "mlx90614.h" +#include "mlx90614.hpp" using namespace upm; diff --git a/src/mlx90614/mlx90614.h b/src/mlx90614/mlx90614.hpp similarity index 100% rename from src/mlx90614/mlx90614.h rename to src/mlx90614/mlx90614.hpp diff --git a/src/mlx90614/pyupm_mlx90614.i b/src/mlx90614/pyupm_mlx90614.i index 59c6cb4f..fada9efb 100644 --- a/src/mlx90614/pyupm_mlx90614.i +++ b/src/mlx90614/pyupm_mlx90614.i @@ -5,7 +5,7 @@ %feature("autodoc", "3"); -%include "mlx90614.h" +%include "mlx90614.hpp" %{ - #include "mlx90614.h" + #include "mlx90614.hpp" %} diff --git a/src/mma7455/CMakeLists.txt b/src/mma7455/CMakeLists.txt index a52cbc98..96b993c9 100644 --- a/src/mma7455/CMakeLists.txt +++ b/src/mma7455/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "mma7455") set (libdescription "upm MMA7455") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/mma7455/javaupm_mma7455.i b/src/mma7455/javaupm_mma7455.i index 04a1f1f2..44b50f93 100644 --- a/src/mma7455/javaupm_mma7455.i +++ b/src/mma7455/javaupm_mma7455.i @@ -23,10 +23,10 @@ %ignore readData(short *, short *, short *); %{ - #include "mma7455.h" + #include "mma7455.hpp" %} -%include "mma7455.h" +%include "mma7455.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/mma7455/jsupm_mma7455.i b/src/mma7455/jsupm_mma7455.i index 3ec5f132..b0673971 100644 --- a/src/mma7455/jsupm_mma7455.i +++ b/src/mma7455/jsupm_mma7455.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "mma7455.h" + #include "mma7455.hpp" %} -%include "mma7455.h" +%include "mma7455.hpp" diff --git a/src/mma7455/mma7455.cxx b/src/mma7455/mma7455.cxx index 371ac2f8..c54b5ced 100644 --- a/src/mma7455/mma7455.cxx +++ b/src/mma7455/mma7455.cxx @@ -31,7 +31,7 @@ #include #include -#include "mma7455.h" +#include "mma7455.hpp" using namespace upm; diff --git a/src/mma7455/mma7455.h b/src/mma7455/mma7455.hpp similarity index 100% rename from src/mma7455/mma7455.h rename to src/mma7455/mma7455.hpp diff --git a/src/mma7455/pyupm_mma7455.i b/src/mma7455/pyupm_mma7455.i index 309a1386..f990a3ca 100644 --- a/src/mma7455/pyupm_mma7455.i +++ b/src/mma7455/pyupm_mma7455.i @@ -5,7 +5,7 @@ %feature("autodoc", "3"); -%include "mma7455.h" +%include "mma7455.hpp" %{ - #include "mma7455.h" + #include "mma7455.hpp" %} diff --git a/src/mma7660/CMakeLists.txt b/src/mma7660/CMakeLists.txt index 4748db55..1eaa49f5 100644 --- a/src/mma7660/CMakeLists.txt +++ b/src/mma7660/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "mma7660") set (libdescription "upm mma7660 I2C 3-axis digital accelermeter (1.5g)") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/mma7660/javaupm_mma7660.i b/src/mma7660/javaupm_mma7660.i index 50a21165..abe2aced 100644 --- a/src/mma7660/javaupm_mma7660.i +++ b/src/mma7660/javaupm_mma7660.i @@ -7,7 +7,7 @@ %apply float *OUTPUT { float *ax, float *ay, float *az }; %{ - #include "mma7660.h" + #include "mma7660.hpp" %} %typemap(jni) float* "jfloatArray" @@ -42,7 +42,7 @@ %ignore getRawValues(int *, int *, int *); %ignore getAcceleration(float *, float *, float *); -%include "mma7660.h" +%include "mma7660.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/mma7660/jsupm_mma7660.i b/src/mma7660/jsupm_mma7660.i index 25adc073..64a3cfa7 100644 --- a/src/mma7660/jsupm_mma7660.i +++ b/src/mma7660/jsupm_mma7660.i @@ -7,7 +7,7 @@ %pointer_functions(float, floatp); %{ - #include "mma7660.h" + #include "mma7660.hpp" %} -%include "mma7660.h" +%include "mma7660.hpp" diff --git a/src/mma7660/mma7660.cxx b/src/mma7660/mma7660.cxx index d8789c2c..a0a87738 100644 --- a/src/mma7660/mma7660.cxx +++ b/src/mma7660/mma7660.cxx @@ -26,7 +26,7 @@ #include #include -#include "mma7660.h" +#include "mma7660.hpp" using namespace upm; using namespace std; diff --git a/src/mma7660/mma7660.h b/src/mma7660/mma7660.hpp similarity index 100% rename from src/mma7660/mma7660.h rename to src/mma7660/mma7660.hpp diff --git a/src/mma7660/pyupm_mma7660.i b/src/mma7660/pyupm_mma7660.i index 23ba3fdb..c653badf 100644 --- a/src/mma7660/pyupm_mma7660.i +++ b/src/mma7660/pyupm_mma7660.i @@ -14,7 +14,7 @@ %include "mma7660_doc.i" #endif -%include "mma7660.h" +%include "mma7660.hpp" %{ - #include "mma7660.h" + #include "mma7660.hpp" %} diff --git a/src/mpl3115a2/CMakeLists.txt b/src/mpl3115a2/CMakeLists.txt index 586cf21d..74c5d362 100644 --- a/src/mpl3115a2/CMakeLists.txt +++ b/src/mpl3115a2/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "mpl3115a2") set (libdescription "libupm Pressure/Temperature Sensor") set (module_src ${libname}.cpp) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/mpl3115a2/javaupm_mpl3115a2.i b/src/mpl3115a2/javaupm_mpl3115a2.i index 651dbccd..5c1f3d39 100644 --- a/src/mpl3115a2/javaupm_mpl3115a2.i +++ b/src/mpl3115a2/javaupm_mpl3115a2.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "mpl3115a2.h" + #include "mpl3115a2.hpp" %} -%include "mpl3115a2.h" +%include "mpl3115a2.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/mpl3115a2/jsupm_mpl3115a2.i b/src/mpl3115a2/jsupm_mpl3115a2.i index 318c8a3f..45785207 100644 --- a/src/mpl3115a2/jsupm_mpl3115a2.i +++ b/src/mpl3115a2/jsupm_mpl3115a2.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "mpl3115a2.h" + #include "mpl3115a2.hpp" %} -%include "mpl3115a2.h" +%include "mpl3115a2.hpp" diff --git a/src/mpl3115a2/mpl3115a2.cpp b/src/mpl3115a2/mpl3115a2.cpp index 0ed700aa..df80c688 100644 --- a/src/mpl3115a2/mpl3115a2.cpp +++ b/src/mpl3115a2/mpl3115a2.cpp @@ -32,7 +32,7 @@ #include #include -#include "mpl3115a2.h" +#include "mpl3115a2.hpp" using namespace upm; diff --git a/src/mpl3115a2/mpl3115a2.h b/src/mpl3115a2/mpl3115a2.hpp similarity index 100% rename from src/mpl3115a2/mpl3115a2.h rename to src/mpl3115a2/mpl3115a2.hpp diff --git a/src/mpl3115a2/pyupm_mpl3115a2.i b/src/mpl3115a2/pyupm_mpl3115a2.i index 2221d3a4..27bee18b 100644 --- a/src/mpl3115a2/pyupm_mpl3115a2.i +++ b/src/mpl3115a2/pyupm_mpl3115a2.i @@ -9,7 +9,7 @@ %include "mpl3115a2_doc.i" #endif -%include "mpl3115a2.h" +%include "mpl3115a2.hpp" %{ - #include "mpl3115a2.h" + #include "mpl3115a2.hpp" %} diff --git a/src/mpr121/CMakeLists.txt b/src/mpr121/CMakeLists.txt index e4ffacb5..669a59e5 100644 --- a/src/mpr121/CMakeLists.txt +++ b/src/mpr121/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "mpr121") set (libdescription "upm mpr121 I2C Touch module") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/mpr121/javaupm_mpr121.i b/src/mpr121/javaupm_mpr121.i index 8f1e146e..7e2a7ee9 100644 --- a/src/mpr121/javaupm_mpr121.i +++ b/src/mpr121/javaupm_mpr121.i @@ -4,10 +4,10 @@ %include "../java_buffer.i" %{ - #include "mpr121.h" + #include "mpr121.hpp" %} -%include "mpr121.h" +%include "mpr121.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/mpr121/jsupm_mpr121.i b/src/mpr121/jsupm_mpr121.i index d725fd2d..a1a14d05 100644 --- a/src/mpr121/jsupm_mpr121.i +++ b/src/mpr121/jsupm_mpr121.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "mpr121.h" + #include "mpr121.hpp" %} -%include "mpr121.h" +%include "mpr121.hpp" diff --git a/src/mpr121/mpr121.cxx b/src/mpr121/mpr121.cxx index 8e7f7039..93a91497 100644 --- a/src/mpr121/mpr121.cxx +++ b/src/mpr121/mpr121.cxx @@ -26,7 +26,7 @@ #include #include -#include "mpr121.h" +#include "mpr121.hpp" using namespace upm; using namespace std; diff --git a/src/mpr121/mpr121.h b/src/mpr121/mpr121.hpp similarity index 100% rename from src/mpr121/mpr121.h rename to src/mpr121/mpr121.hpp diff --git a/src/mpr121/pyupm_mpr121.i b/src/mpr121/pyupm_mpr121.i index 993e0c44..baa8f51d 100644 --- a/src/mpr121/pyupm_mpr121.i +++ b/src/mpr121/pyupm_mpr121.i @@ -9,7 +9,7 @@ %include "mpr121_doc.i" #endif -%include "mpr121.h" +%include "mpr121.hpp" %{ - #include "mpr121.h" + #include "mpr121.hpp" %} diff --git a/src/mpu9150/CMakeLists.txt b/src/mpu9150/CMakeLists.txt index 816f46c8..f77bc5f0 100644 --- a/src/mpu9150/CMakeLists.txt +++ b/src/mpu9150/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "mpu9150") set (libdescription "gyro, acceleromter and magnometer sensor based on mpu9150") set (module_src ${libname}.cxx ak8975.cxx mpu60x0.cxx mpu9250.cxx) -set (module_h ${libname}.h ak8975.h mpu60x0.h mpu9250.h) +set (module_hpp ${libname}.hpp ak8975.hpp mpu60x0.hpp mpu9250.hpp) upm_module_init() diff --git a/src/mpu9150/ak8975.cxx b/src/mpu9150/ak8975.cxx index 7330eb37..83c80aac 100644 --- a/src/mpu9150/ak8975.cxx +++ b/src/mpu9150/ak8975.cxx @@ -27,7 +27,7 @@ #include #include -#include "ak8975.h" +#include "ak8975.hpp" using namespace upm; using namespace std; diff --git a/src/mpu9150/ak8975.h b/src/mpu9150/ak8975.hpp similarity index 100% rename from src/mpu9150/ak8975.h rename to src/mpu9150/ak8975.hpp diff --git a/src/mpu9150/javaupm_mpu9150.i b/src/mpu9150/javaupm_mpu9150.i index 0d7c70be..012afab4 100644 --- a/src/mpu9150/javaupm_mpu9150.i +++ b/src/mpu9150/javaupm_mpu9150.i @@ -7,8 +7,8 @@ %apply int {mraa::Edge}; %{ - #include "mpu60x0.h" - #include "mpu9150.h" + #include "mpu60x0.hpp" + #include "mpu9150.hpp" %} @@ -30,8 +30,8 @@ %ignore getGyroscope(float *, float *, float *); %ignore getMagnetometer(float *, float *, float *); -%include "mpu60x0.h" -%include "mpu9150.h" +%include "mpu60x0.hpp" +%include "mpu9150.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/mpu9150/jsupm_mpu9150.i b/src/mpu9150/jsupm_mpu9150.i index b08eb537..f0a728b5 100644 --- a/src/mpu9150/jsupm_mpu9150.i +++ b/src/mpu9150/jsupm_mpu9150.i @@ -5,26 +5,26 @@ %pointer_functions(float, floatp); %{ - #include "mpu9150.h" + #include "mpu9150.hpp" %} -%include "ak8975.h" +%include "ak8975.hpp" %{ - #include "ak8975.h" + #include "ak8975.hpp" %} -%include "mpu60x0.h" +%include "mpu60x0.hpp" %{ - #include "mpu60x0.h" + #include "mpu60x0.hpp" %} -%include "mpu9150.h" +%include "mpu9150.hpp" %{ - #include "mpu9150.h" + #include "mpu9150.hpp" %} -%include "mpu9250.h" +%include "mpu9250.hpp" %{ - #include "mpu9250.h" + #include "mpu9250.hpp" %} diff --git a/src/mpu9150/mpu60x0.cxx b/src/mpu9150/mpu60x0.cxx index ad79051b..7962c380 100644 --- a/src/mpu9150/mpu60x0.cxx +++ b/src/mpu9150/mpu60x0.cxx @@ -26,7 +26,7 @@ #include #include -#include "mpu60x0.h" +#include "mpu60x0.hpp" using namespace upm; using namespace std; diff --git a/src/mpu9150/mpu60x0.h b/src/mpu9150/mpu60x0.hpp similarity index 100% rename from src/mpu9150/mpu60x0.h rename to src/mpu9150/mpu60x0.hpp diff --git a/src/mpu9150/mpu9150.cxx b/src/mpu9150/mpu9150.cxx index a253e843..d699466b 100644 --- a/src/mpu9150/mpu9150.cxx +++ b/src/mpu9150/mpu9150.cxx @@ -26,7 +26,7 @@ #include #include -#include "mpu9150.h" +#include "mpu9150.hpp" using namespace upm; using namespace std; diff --git a/src/mpu9150/mpu9150.h b/src/mpu9150/mpu9150.hpp similarity index 98% rename from src/mpu9150/mpu9150.h rename to src/mpu9150/mpu9150.hpp index 65679629..b49f6fd3 100644 --- a/src/mpu9150/mpu9150.h +++ b/src/mpu9150/mpu9150.hpp @@ -24,8 +24,8 @@ #pragma once -#include "mpu60x0.h" -#include "ak8975.h" +#include "mpu60x0.hpp" +#include "ak8975.hpp" #define MPU9150_I2C_BUS 0 #define MPU9150_DEFAULT_I2C_ADDR MPU60X0_DEFAULT_I2C_ADDR diff --git a/src/mpu9150/mpu9250.cxx b/src/mpu9150/mpu9250.cxx index c646a983..e0135a6c 100644 --- a/src/mpu9150/mpu9250.cxx +++ b/src/mpu9150/mpu9250.cxx @@ -26,7 +26,7 @@ #include #include -#include "mpu9250.h" +#include "mpu9250.hpp" using namespace upm; using namespace std; diff --git a/src/mpu9150/mpu9250.h b/src/mpu9150/mpu9250.hpp similarity index 99% rename from src/mpu9150/mpu9250.h rename to src/mpu9150/mpu9250.hpp index c4da9446..3b1c50cc 100644 --- a/src/mpu9150/mpu9250.h +++ b/src/mpu9150/mpu9250.hpp @@ -24,7 +24,7 @@ #pragma once -#include "mpu9150.h" +#include "mpu9150.hpp" #define MPU9250_I2C_BUS 0 #define MPU9250_DEFAULT_I2C_ADDR MPU9150_DEFAULT_I2C_ADDR diff --git a/src/mpu9150/pyupm_mpu9150.i b/src/mpu9150/pyupm_mpu9150.i index 0918efb5..87fbbfd2 100644 --- a/src/mpu9150/pyupm_mpu9150.i +++ b/src/mpu9150/pyupm_mpu9150.i @@ -10,23 +10,23 @@ %pointer_functions(float, floatp); -%include "ak8975.h" +%include "ak8975.hpp" %{ - #include "ak8975.h" + #include "ak8975.hpp" %} -%include "mpu60x0.h" +%include "mpu60x0.hpp" %{ - #include "mpu60x0.h" + #include "mpu60x0.hpp" %} -%include "mpu9150.h" +%include "mpu9150.hpp" %{ - #include "mpu9150.h" + #include "mpu9150.hpp" %} -%include "mpu9250.h" +%include "mpu9250.hpp" %{ - #include "mpu9250.h" + #include "mpu9250.hpp" %} diff --git a/src/mq303a/CMakeLists.txt b/src/mq303a/CMakeLists.txt index aae1c759..2607608c 100644 --- a/src/mq303a/CMakeLists.txt +++ b/src/mq303a/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "mq303a") set (libdescription "upm mq303a module") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/mq303a/javaupm_mq303a.i b/src/mq303a/javaupm_mq303a.i index da7c5bb8..d6aa0dc4 100644 --- a/src/mq303a/javaupm_mq303a.i +++ b/src/mq303a/javaupm_mq303a.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "mq303a.h" + #include "mq303a.hpp" %} -%include "mq303a.h" +%include "mq303a.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/mq303a/jsupm_mq303a.i b/src/mq303a/jsupm_mq303a.i index 857b92ac..f2547495 100644 --- a/src/mq303a/jsupm_mq303a.i +++ b/src/mq303a/jsupm_mq303a.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "mq303a.h" + #include "mq303a.hpp" %} -%include "mq303a.h" +%include "mq303a.hpp" diff --git a/src/mq303a/mq303a.cxx b/src/mq303a/mq303a.cxx index 612ffd51..0f5a9597 100644 --- a/src/mq303a/mq303a.cxx +++ b/src/mq303a/mq303a.cxx @@ -26,7 +26,7 @@ #include #include -#include "mq303a.h" +#include "mq303a.hpp" using namespace upm; diff --git a/src/mq303a/mq303a.h b/src/mq303a/mq303a.hpp similarity index 100% rename from src/mq303a/mq303a.h rename to src/mq303a/mq303a.hpp diff --git a/src/mq303a/pyupm_mq303a.i b/src/mq303a/pyupm_mq303a.i index 4aee330a..3d6eec4c 100644 --- a/src/mq303a/pyupm_mq303a.i +++ b/src/mq303a/pyupm_mq303a.i @@ -5,7 +5,7 @@ %feature("autodoc", "3"); -%include "mq303a.h" +%include "mq303a.hpp" %{ - #include "mq303a.h" + #include "mq303a.hpp" %} diff --git a/src/my9221/CMakeLists.txt b/src/my9221/CMakeLists.txt index dbf8ba68..451bc912 100644 --- a/src/my9221/CMakeLists.txt +++ b/src/my9221/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "my9221") set (libdescription "upm my9221") set (module_src ${libname}.cxx groveledbar.cxx grovecircularled.cxx) -set (module_h ${libname}.h groveledbar.h grovecircularled.h) +set (module_hpp ${libname}.hpp groveledbar.hpp grovecircularled.hpp) upm_module_init() diff --git a/src/my9221/grovecircularled.cxx b/src/my9221/grovecircularled.cxx index 7c89cd61..4eba41d1 100644 --- a/src/my9221/grovecircularled.cxx +++ b/src/my9221/grovecircularled.cxx @@ -39,7 +39,7 @@ #include #include -#include "grovecircularled.h" +#include "grovecircularled.hpp" using namespace upm; using namespace std; diff --git a/src/my9221/grovecircularled.h b/src/my9221/grovecircularled.hpp similarity index 99% rename from src/my9221/grovecircularled.h rename to src/my9221/grovecircularled.hpp index 51bc2da1..0ec7de3c 100644 --- a/src/my9221/grovecircularled.h +++ b/src/my9221/grovecircularled.hpp @@ -37,7 +37,7 @@ #include #include #include -#include "my9221.h" +#include "my9221.hpp" namespace upm { diff --git a/src/my9221/groveledbar.cxx b/src/my9221/groveledbar.cxx index 0146a84f..c81d0c4a 100644 --- a/src/my9221/groveledbar.cxx +++ b/src/my9221/groveledbar.cxx @@ -39,7 +39,7 @@ #include #include -#include "groveledbar.h" +#include "groveledbar.hpp" using namespace upm; using namespace std; diff --git a/src/my9221/groveledbar.h b/src/my9221/groveledbar.hpp similarity index 99% rename from src/my9221/groveledbar.h rename to src/my9221/groveledbar.hpp index 35c8c4da..3dbf452b 100644 --- a/src/my9221/groveledbar.h +++ b/src/my9221/groveledbar.hpp @@ -38,7 +38,7 @@ #include #include -#include "my9221.h" +#include "my9221.hpp" namespace upm { diff --git a/src/my9221/javaupm_my9221.i b/src/my9221/javaupm_my9221.i index 0534108d..cb98ab26 100644 --- a/src/my9221/javaupm_my9221.i +++ b/src/my9221/javaupm_my9221.i @@ -1,19 +1,19 @@ %module javaupm_my9221 %include "../upm.i" -%include "my9221.h" +%include "my9221.hpp" %{ - #include "my9221.h" + #include "my9221.hpp" %} -%include "groveledbar.h" +%include "groveledbar.hpp" %{ - #include "groveledbar.h" + #include "groveledbar.hpp" %} -%include "grovecircularled.h" +%include "grovecircularled.hpp" %{ - #include "grovecircularled.h" + #include "grovecircularled.hpp" %} %pragma(java) jniclasscode=%{ diff --git a/src/my9221/jsupm_my9221.i b/src/my9221/jsupm_my9221.i index a8e51e79..29df86bd 100644 --- a/src/my9221/jsupm_my9221.i +++ b/src/my9221/jsupm_my9221.i @@ -1,18 +1,18 @@ %module jsupm_my9221 %include "../upm.i" -%include "my9221.h" +%include "my9221.hpp" %{ - #include "my9221.h" + #include "my9221.hpp" %} -%include "groveledbar.h" +%include "groveledbar.hpp" %{ - #include "groveledbar.h" + #include "groveledbar.hpp" %} -%include "grovecircularled.h" +%include "grovecircularled.hpp" %{ - #include "grovecircularled.h" + #include "grovecircularled.hpp" %} diff --git a/src/my9221/my9221.cxx b/src/my9221/my9221.cxx index a5df3fb5..4cb10c6c 100644 --- a/src/my9221/my9221.cxx +++ b/src/my9221/my9221.cxx @@ -39,7 +39,7 @@ #include #include -#include "my9221.h" +#include "my9221.hpp" using namespace upm; using namespace std; diff --git a/src/my9221/my9221.h b/src/my9221/my9221.hpp similarity index 100% rename from src/my9221/my9221.h rename to src/my9221/my9221.hpp diff --git a/src/my9221/pyupm_my9221.i b/src/my9221/pyupm_my9221.i index ee9422a5..84286194 100644 --- a/src/my9221/pyupm_my9221.i +++ b/src/my9221/pyupm_my9221.i @@ -5,17 +5,17 @@ %feature("autodoc", "3"); -%include "my9221.h" +%include "my9221.hpp" %{ - #include "my9221.h" + #include "my9221.hpp" %} -%include "groveledbar.h" +%include "groveledbar.hpp" %{ - #include "groveledbar.h" + #include "groveledbar.hpp" %} -%include "grovecircularled.h" +%include "grovecircularled.hpp" %{ - #include "grovecircularled.h" + #include "grovecircularled.hpp" %} diff --git a/src/nlgpio16/CMakeLists.txt b/src/nlgpio16/CMakeLists.txt index 585c781c..a9f33db4 100644 --- a/src/nlgpio16/CMakeLists.txt +++ b/src/nlgpio16/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "nlgpio16") set (libdescription "upm module for the Numato Labs GPIO 16 USB") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/nlgpio16/javaupm_nlgpio16.i b/src/nlgpio16/javaupm_nlgpio16.i index 481df82e..f741c3ad 100644 --- a/src/nlgpio16/javaupm_nlgpio16.i +++ b/src/nlgpio16/javaupm_nlgpio16.i @@ -4,10 +4,10 @@ %include "std_string.i" %{ - #include "nlgpio16.h" + #include "nlgpio16.hpp" %} -%include "nlgpio16.h" +%include "nlgpio16.hpp" %array_class(char, charArray); %pragma(java) jniclasscode=%{ diff --git a/src/nlgpio16/jsupm_nlgpio16.i b/src/nlgpio16/jsupm_nlgpio16.i index d44e4d91..a5118b2a 100644 --- a/src/nlgpio16/jsupm_nlgpio16.i +++ b/src/nlgpio16/jsupm_nlgpio16.i @@ -4,8 +4,8 @@ %include "std_string.i" %{ - #include "nlgpio16.h" + #include "nlgpio16.hpp" %} -%include "nlgpio16.h" +%include "nlgpio16.hpp" %array_class(char, charArray); diff --git a/src/nlgpio16/nlgpio16.cxx b/src/nlgpio16/nlgpio16.cxx index 591decec..466af880 100644 --- a/src/nlgpio16/nlgpio16.cxx +++ b/src/nlgpio16/nlgpio16.cxx @@ -25,7 +25,7 @@ #include #include -#include "nlgpio16.h" +#include "nlgpio16.hpp" using namespace upm; using namespace std; diff --git a/src/nlgpio16/nlgpio16.h b/src/nlgpio16/nlgpio16.hpp similarity index 100% rename from src/nlgpio16/nlgpio16.h rename to src/nlgpio16/nlgpio16.hpp diff --git a/src/nlgpio16/pyupm_nlgpio16.i b/src/nlgpio16/pyupm_nlgpio16.i index e2683757..823d0c22 100644 --- a/src/nlgpio16/pyupm_nlgpio16.i +++ b/src/nlgpio16/pyupm_nlgpio16.i @@ -8,7 +8,7 @@ %feature("autodoc", "3"); %{ - #include "nlgpio16.h" + #include "nlgpio16.hpp" %} -%include "nlgpio16.h" +%include "nlgpio16.hpp" %array_class(char, charArray); diff --git a/src/nrf24l01/CMakeLists.txt b/src/nrf24l01/CMakeLists.txt index 538d3a14..46ebe24a 100644 --- a/src/nrf24l01/CMakeLists.txt +++ b/src/nrf24l01/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "nrf24l01") set (libdescription "libupm NRF tx/rx") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/nrf24l01/Callback.h b/src/nrf24l01/Callback.hpp similarity index 100% rename from src/nrf24l01/Callback.h rename to src/nrf24l01/Callback.hpp diff --git a/src/nrf24l01/javaupm_nrf24l01.i b/src/nrf24l01/javaupm_nrf24l01.i index a78cbc30..d3e32b93 100644 --- a/src/nrf24l01/javaupm_nrf24l01.i +++ b/src/nrf24l01/javaupm_nrf24l01.i @@ -7,12 +7,12 @@ SWIG_DIRECTOR_OWNED(Callback) %include "arrays_java.i"; %apply signed char[] {uint8_t *}; -%include "Callback.h" +%include "Callback.hpp" %{ - #include "nrf24l01.h" + #include "nrf24l01.hpp" %} -%include "nrf24l01.h" +%include "nrf24l01.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/nrf24l01/jsupm_nrf24l01.i b/src/nrf24l01/jsupm_nrf24l01.i index 05ab11a1..71ed7091 100644 --- a/src/nrf24l01/jsupm_nrf24l01.i +++ b/src/nrf24l01/jsupm_nrf24l01.i @@ -3,7 +3,7 @@ %include "../carrays_uint8_t.i" %{ - #include "nrf24l01.h" + #include "nrf24l01.hpp" %} -%include "nrf24l01.h" +%include "nrf24l01.hpp" diff --git a/src/nrf24l01/nrf24l01.cxx b/src/nrf24l01/nrf24l01.cxx index 1b8b702d..57092daf 100644 --- a/src/nrf24l01/nrf24l01.cxx +++ b/src/nrf24l01/nrf24l01.cxx @@ -29,7 +29,7 @@ #include #include -#include "nrf24l01.h" +#include "nrf24l01.hpp" using namespace upm; diff --git a/src/nrf24l01/nrf24l01.h b/src/nrf24l01/nrf24l01.hpp similarity index 99% rename from src/nrf24l01/nrf24l01.h rename to src/nrf24l01/nrf24l01.hpp index 0a468b85..9a386624 100644 --- a/src/nrf24l01/nrf24l01.h +++ b/src/nrf24l01/nrf24l01.hpp @@ -34,7 +34,7 @@ #include #if defined(SWIGJAVA) || defined(JAVACALLBACK) -#include "Callback.h" +#include "Callback.hpp" #endif /* Memory Map */ diff --git a/src/nrf24l01/pyupm_nrf24l01.i b/src/nrf24l01/pyupm_nrf24l01.i index 17c23058..1cb91ea2 100644 --- a/src/nrf24l01/pyupm_nrf24l01.i +++ b/src/nrf24l01/pyupm_nrf24l01.i @@ -6,7 +6,7 @@ %feature("autodoc", "3"); -%include "nrf24l01.h" +%include "nrf24l01.hpp" %{ - #include "nrf24l01.h" + #include "nrf24l01.hpp" %} diff --git a/src/nrf8001/CMakeLists.txt b/src/nrf8001/CMakeLists.txt index a449e44a..15c606ba 100644 --- a/src/nrf8001/CMakeLists.txt +++ b/src/nrf8001/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "nrf8001") set (libdescription "BLE module from NordicSemiconductor family") set (module_src hal_aci_tl.cpp aci_setup.cpp aci_queue.cpp acilib.cpp lib_aci.cpp ${libname}.cxx) -set (module_h hal_aci_tl.h aci_setup.h aci_queue.h acilib.h lib_aci.h ${libname}.h) +set (module_hpp hal_aci_tl.h aci_setup.h aci_queue.h acilib.h lib_aci.h ${libname}.hpp) upm_module_init() diff --git a/src/nrf8001/jsupm_nrf8001.i b/src/nrf8001/jsupm_nrf8001.i index cb1aadd2..d9d710da 100644 --- a/src/nrf8001/jsupm_nrf8001.i +++ b/src/nrf8001/jsupm_nrf8001.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "nrf8001.h" + #include "nrf8001.hpp" %} -%include "nrf8001.h" +%include "nrf8001.hpp" diff --git a/src/nrf8001/nrf8001.cxx b/src/nrf8001/nrf8001.cxx index b7714369..d7b111b0 100644 --- a/src/nrf8001/nrf8001.cxx +++ b/src/nrf8001/nrf8001.cxx @@ -26,7 +26,7 @@ #include #include -#include "nrf8001.h" +#include "nrf8001.hpp" /** * Include the services_lock.h to put the setup in the OTP memory of the nRF8001. diff --git a/src/nrf8001/nrf8001.h b/src/nrf8001/nrf8001.hpp similarity index 100% rename from src/nrf8001/nrf8001.h rename to src/nrf8001/nrf8001.hpp diff --git a/src/nrf8001/pyupm_nrf8001.i b/src/nrf8001/pyupm_nrf8001.i index a6b5dd5b..1515c769 100644 --- a/src/nrf8001/pyupm_nrf8001.i +++ b/src/nrf8001/pyupm_nrf8001.i @@ -5,7 +5,7 @@ %feature("autodoc", "3"); -%include "nrf8001.h" +%include "nrf8001.hpp" %{ - #include "nrf8001.h" + #include "nrf8001.hpp" %} diff --git a/src/nunchuck/CMakeLists.txt b/src/nunchuck/CMakeLists.txt index 7263ec87..72e44955 100644 --- a/src/nunchuck/CMakeLists.txt +++ b/src/nunchuck/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "nunchuck") set (libdescription "upm wii nunchuck module") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/nunchuck/javaupm_nunchuck.i b/src/nunchuck/javaupm_nunchuck.i index e479d053..57b0d92b 100644 --- a/src/nunchuck/javaupm_nunchuck.i +++ b/src/nunchuck/javaupm_nunchuck.i @@ -3,10 +3,10 @@ %include "../java_buffer.i" %{ - #include "nunchuck.h" + #include "nunchuck.hpp" %} -%include "nunchuck.h" +%include "nunchuck.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/nunchuck/jsupm_nunchuck.i b/src/nunchuck/jsupm_nunchuck.i index 2e67267f..006895e0 100644 --- a/src/nunchuck/jsupm_nunchuck.i +++ b/src/nunchuck/jsupm_nunchuck.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "nunchuck.h" + #include "nunchuck.hpp" %} -%include "nunchuck.h" +%include "nunchuck.hpp" diff --git a/src/nunchuck/nunchuck.cxx b/src/nunchuck/nunchuck.cxx index 2790deb8..a6f00d96 100644 --- a/src/nunchuck/nunchuck.cxx +++ b/src/nunchuck/nunchuck.cxx @@ -27,7 +27,7 @@ #include #include -#include "nunchuck.h" +#include "nunchuck.hpp" using namespace upm; using namespace std; diff --git a/src/nunchuck/nunchuck.h b/src/nunchuck/nunchuck.hpp similarity index 100% rename from src/nunchuck/nunchuck.h rename to src/nunchuck/nunchuck.hpp diff --git a/src/nunchuck/pyupm_nunchuck.i b/src/nunchuck/pyupm_nunchuck.i index 091eba65..cdad26cf 100644 --- a/src/nunchuck/pyupm_nunchuck.i +++ b/src/nunchuck/pyupm_nunchuck.i @@ -5,7 +5,7 @@ %feature("autodoc", "3"); -%include "nunchuck.h" +%include "nunchuck.hpp" %{ - #include "nunchuck.h" + #include "nunchuck.hpp" %} diff --git a/src/otp538u/CMakeLists.txt b/src/otp538u/CMakeLists.txt index 25004b7b..5b010b03 100644 --- a/src/otp538u/CMakeLists.txt +++ b/src/otp538u/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "otp538u") set (libdescription "upm otp538u IR temperature sensor") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/otp538u/javaupm_otp538u.i b/src/otp538u/javaupm_otp538u.i index 90703b89..455c6c5c 100644 --- a/src/otp538u/javaupm_otp538u.i +++ b/src/otp538u/javaupm_otp538u.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "otp538u.h" + #include "otp538u.hpp" %} -%include "otp538u.h" +%include "otp538u.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/otp538u/jsupm_otp538u.i b/src/otp538u/jsupm_otp538u.i index f8972cee..038cdb5b 100644 --- a/src/otp538u/jsupm_otp538u.i +++ b/src/otp538u/jsupm_otp538u.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "otp538u.h" + #include "otp538u.hpp" %} -%include "otp538u.h" +%include "otp538u.hpp" diff --git a/src/otp538u/otp538u.cxx b/src/otp538u/otp538u.cxx index 6231ae38..e7ef1b6e 100644 --- a/src/otp538u/otp538u.cxx +++ b/src/otp538u/otp538u.cxx @@ -26,10 +26,10 @@ #include #include -#include "otp538u.h" +#include "otp538u.hpp" -#include "thermopile_vt_table.h" -#include "thermister_rt_table.h" +#include "thermopile_vt_table.hpp" +#include "thermister_rt_table.hpp" using namespace upm; using namespace std; diff --git a/src/otp538u/otp538u.h b/src/otp538u/otp538u.hpp similarity index 100% rename from src/otp538u/otp538u.h rename to src/otp538u/otp538u.hpp diff --git a/src/otp538u/pyupm_otp538u.i b/src/otp538u/pyupm_otp538u.i index cb03b1e7..764e0e1f 100644 --- a/src/otp538u/pyupm_otp538u.i +++ b/src/otp538u/pyupm_otp538u.i @@ -5,7 +5,7 @@ %feature("autodoc", "3"); -%include "otp538u.h" +%include "otp538u.hpp" %{ - #include "otp538u.h" + #include "otp538u.hpp" %} diff --git a/src/otp538u/thermister_rt_table.h b/src/otp538u/thermister_rt_table.hpp similarity index 100% rename from src/otp538u/thermister_rt_table.h rename to src/otp538u/thermister_rt_table.hpp diff --git a/src/otp538u/thermopile_vt_table.h b/src/otp538u/thermopile_vt_table.hpp similarity index 100% rename from src/otp538u/thermopile_vt_table.h rename to src/otp538u/thermopile_vt_table.hpp diff --git a/src/ozw/CMakeLists.txt b/src/ozw/CMakeLists.txt index 9515063f..8cc11366 100644 --- a/src/ozw/CMakeLists.txt +++ b/src/ozw/CMakeLists.txt @@ -1,7 +1,7 @@ set (libname "ozw") set (libdescription "upm module for the OpenZWave library interface") set (module_src ${libname}.cxx zwNode.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) pkg_search_module(OPENZWAVE libopenzwave) if (OPENZWAVE_FOUND) diff --git a/src/ozw/javaupm_ozw.i b/src/ozw/javaupm_ozw.i index 1b6ccdc4..3f0d9150 100644 --- a/src/ozw/javaupm_ozw.i +++ b/src/ozw/javaupm_ozw.i @@ -6,10 +6,10 @@ %include "../java_buffer.i" %{ - #include "ozw.h" + #include "ozw.hpp" %} -%include "ozw.h" +%include "ozw.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/ozw/jsupm_ozw.i b/src/ozw/jsupm_ozw.i index 209fe621..b3ad852c 100644 --- a/src/ozw/jsupm_ozw.i +++ b/src/ozw/jsupm_ozw.i @@ -5,8 +5,8 @@ %pointer_functions(float, floatp); -%include "ozw.h" +%include "ozw.hpp" %{ - #include "ozw.h" + #include "ozw.hpp" %} diff --git a/src/ozw/ozw.cxx b/src/ozw/ozw.cxx index 4f8df346..02f5e7cf 100644 --- a/src/ozw/ozw.cxx +++ b/src/ozw/ozw.cxx @@ -30,9 +30,9 @@ #include "platform/Log.h" -#include "zwNode.h" +#include "zwNode.hpp" -#include "ozw.h" +#include "ozw.hpp" using namespace upm; using namespace std; diff --git a/src/ozw/ozw.h b/src/ozw/ozw.hpp similarity index 100% rename from src/ozw/ozw.h rename to src/ozw/ozw.hpp diff --git a/src/ozw/pyupm_ozw.i b/src/ozw/pyupm_ozw.i index ee987a36..b05579ba 100644 --- a/src/ozw/pyupm_ozw.i +++ b/src/ozw/pyupm_ozw.i @@ -10,8 +10,8 @@ %pointer_functions(float, floatp); -%include "ozw.h" +%include "ozw.hpp" %{ - #include "ozw.h" + #include "ozw.hpp" %} diff --git a/src/ozw/zwNode.cxx b/src/ozw/zwNode.cxx index a55729b5..673880dd 100644 --- a/src/ozw/zwNode.cxx +++ b/src/ozw/zwNode.cxx @@ -24,7 +24,7 @@ #include #include -#include "zwNode.h" +#include "zwNode.hpp" #include "Node.h" diff --git a/src/ozw/zwNode.h b/src/ozw/zwNode.hpp similarity index 100% rename from src/ozw/zwNode.h rename to src/ozw/zwNode.hpp diff --git a/src/pca9685/CMakeLists.txt b/src/pca9685/CMakeLists.txt index 621148f2..56e6c361 100644 --- a/src/pca9685/CMakeLists.txt +++ b/src/pca9685/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "pca9685") set (libdescription "upm pca9685 I2C 16ch, 12b pwm, LED controller") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/pca9685/javaupm_pca9685.i b/src/pca9685/javaupm_pca9685.i index 4ff61980..ccca3fc8 100644 --- a/src/pca9685/javaupm_pca9685.i +++ b/src/pca9685/javaupm_pca9685.i @@ -3,10 +3,10 @@ %include "cpointer.i" %{ - #include "pca9685.h" + #include "pca9685.hpp" %} -%include "pca9685.h" +%include "pca9685.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/pca9685/jsupm_pca9685.i b/src/pca9685/jsupm_pca9685.i index 63515d01..db3b629e 100644 --- a/src/pca9685/jsupm_pca9685.i +++ b/src/pca9685/jsupm_pca9685.i @@ -3,7 +3,7 @@ %include "cpointer.i" %{ - #include "pca9685.h" + #include "pca9685.hpp" %} -%include "pca9685.h" +%include "pca9685.hpp" diff --git a/src/pca9685/pca9685.cxx b/src/pca9685/pca9685.cxx index ce0ae382..c9a1a2ce 100644 --- a/src/pca9685/pca9685.cxx +++ b/src/pca9685/pca9685.cxx @@ -28,7 +28,7 @@ #include #include -#include "pca9685.h" +#include "pca9685.hpp" using namespace upm; using namespace std; diff --git a/src/pca9685/pca9685.h b/src/pca9685/pca9685.hpp similarity index 100% rename from src/pca9685/pca9685.h rename to src/pca9685/pca9685.hpp diff --git a/src/pca9685/pyupm_pca9685.i b/src/pca9685/pyupm_pca9685.i index dd0b9490..2580e7fd 100644 --- a/src/pca9685/pyupm_pca9685.i +++ b/src/pca9685/pyupm_pca9685.i @@ -9,7 +9,7 @@ %include "pca9685_doc.i" #endif -%include "pca9685.h" +%include "pca9685.hpp" %{ - #include "pca9685.h" + #include "pca9685.hpp" %} diff --git a/src/pn532/CMakeLists.txt b/src/pn532/CMakeLists.txt index a03aeb48..54db39e7 100644 --- a/src/pn532/CMakeLists.txt +++ b/src/pn532/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "pn532") set (libdescription "upm pn532 NFC/RFID reader/writer") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/pn532/javaupm_pn532.i b/src/pn532/javaupm_pn532.i index ad97bf3e..a833817d 100644 --- a/src/pn532/javaupm_pn532.i +++ b/src/pn532/javaupm_pn532.i @@ -10,10 +10,10 @@ %ignore i2cContext; %{ - #include "pn532.h" + #include "pn532.hpp" %} -%include "pn532.h" +%include "pn532.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/pn532/jsupm_pn532.i b/src/pn532/jsupm_pn532.i index 9fab1725..66e55995 100644 --- a/src/pn532/jsupm_pn532.i +++ b/src/pn532/jsupm_pn532.i @@ -3,7 +3,7 @@ %include "../carrays_uint8_t.i" %{ - #include "pn532.h" + #include "pn532.hpp" %} -%include "pn532.h" +%include "pn532.hpp" diff --git a/src/pn532/pn532.cxx b/src/pn532/pn532.cxx index efb5b794..4bb2b608 100644 --- a/src/pn532/pn532.cxx +++ b/src/pn532/pn532.cxx @@ -36,7 +36,7 @@ #undef JAVACALLBACK #endif -#include "pn532.h" +#include "pn532.hpp" using namespace upm; using namespace std; diff --git a/src/pn532/pn532.h b/src/pn532/pn532.hpp similarity index 100% rename from src/pn532/pn532.h rename to src/pn532/pn532.hpp diff --git a/src/pn532/pyupm_pn532.i b/src/pn532/pyupm_pn532.i index 64bfad3b..bccbc35a 100644 --- a/src/pn532/pyupm_pn532.i +++ b/src/pn532/pyupm_pn532.i @@ -10,7 +10,7 @@ %include "pn532_doc.i" #endif -%include "pn532.h" +%include "pn532.hpp" %{ - #include "pn532.h" + #include "pn532.hpp" %} diff --git a/src/ppd42ns/CMakeLists.txt b/src/ppd42ns/CMakeLists.txt index 7cffed14..f7b10afc 100644 --- a/src/ppd42ns/CMakeLists.txt +++ b/src/ppd42ns/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "ppd42ns") set (libdescription "upm ppd42ns dust sensor module") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init("-lrt") diff --git a/src/ppd42ns/javaupm_ppd42ns.i b/src/ppd42ns/javaupm_ppd42ns.i index beecd3e0..2be86f7e 100644 --- a/src/ppd42ns/javaupm_ppd42ns.i +++ b/src/ppd42ns/javaupm_ppd42ns.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "ppd42ns.h" + #include "ppd42ns.hpp" %} -%include "ppd42ns.h" +%include "ppd42ns.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/ppd42ns/jsupm_ppd42ns.i b/src/ppd42ns/jsupm_ppd42ns.i index 812d7cb6..415c4d5a 100644 --- a/src/ppd42ns/jsupm_ppd42ns.i +++ b/src/ppd42ns/jsupm_ppd42ns.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "ppd42ns.h" + #include "ppd42ns.hpp" %} -%include "ppd42ns.h" +%include "ppd42ns.hpp" diff --git a/src/ppd42ns/ppd42ns.cxx b/src/ppd42ns/ppd42ns.cxx index a7b0e0db..651049c2 100644 --- a/src/ppd42ns/ppd42ns.cxx +++ b/src/ppd42ns/ppd42ns.cxx @@ -30,7 +30,7 @@ #include #include #include -#include "ppd42ns.h" +#include "ppd42ns.hpp" using namespace upm; diff --git a/src/ppd42ns/ppd42ns.h b/src/ppd42ns/ppd42ns.hpp similarity index 100% rename from src/ppd42ns/ppd42ns.h rename to src/ppd42ns/ppd42ns.hpp diff --git a/src/ppd42ns/pyupm_ppd42ns.i b/src/ppd42ns/pyupm_ppd42ns.i index 38fab6d8..1f5852c5 100644 --- a/src/ppd42ns/pyupm_ppd42ns.i +++ b/src/ppd42ns/pyupm_ppd42ns.i @@ -5,7 +5,7 @@ %feature("autodoc", "3"); -%include "ppd42ns.h" +%include "ppd42ns.hpp" %{ - #include "ppd42ns.h" + #include "ppd42ns.hpp" %} diff --git a/src/pulsensor/CMakeLists.txt b/src/pulsensor/CMakeLists.txt index 223c6429..9bf09972 100644 --- a/src/pulsensor/CMakeLists.txt +++ b/src/pulsensor/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "pulsensor") set (libdescription "upm PULSENSOR") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/pulsensor/Callback.h b/src/pulsensor/Callback.hpp similarity index 100% rename from src/pulsensor/Callback.h rename to src/pulsensor/Callback.hpp diff --git a/src/pulsensor/javaupm_pulsensor.i b/src/pulsensor/javaupm_pulsensor.i index 91b34ccf..5f2669a6 100644 --- a/src/pulsensor/javaupm_pulsensor.i +++ b/src/pulsensor/javaupm_pulsensor.i @@ -10,12 +10,12 @@ SWIG_DIRECTOR_OWNED(Callback) %ignore do_sample; %ignore callback; -%include "Callback.h" +%include "Callback.hpp" %{ - #include "pulsensor.h" + #include "pulsensor.hpp" %} -%include "pulsensor.h" +%include "pulsensor.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/pulsensor/jsupm_pulsensor.i b/src/pulsensor/jsupm_pulsensor.i index d92312a5..f401d1ec 100644 --- a/src/pulsensor/jsupm_pulsensor.i +++ b/src/pulsensor/jsupm_pulsensor.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "pulsensor.h" + #include "pulsensor.hpp" %} -%include "pulsensor.h" +%include "pulsensor.hpp" diff --git a/src/pulsensor/pulsensor.cxx b/src/pulsensor/pulsensor.cxx index 73d9a09a..e0bff814 100644 --- a/src/pulsensor/pulsensor.cxx +++ b/src/pulsensor/pulsensor.cxx @@ -28,7 +28,7 @@ #include #include -#include "pulsensor.h" +#include "pulsensor.hpp" using namespace upm; diff --git a/src/pulsensor/pulsensor.h b/src/pulsensor/pulsensor.hpp similarity index 99% rename from src/pulsensor/pulsensor.h rename to src/pulsensor/pulsensor.hpp index 8c9866d4..de1144b2 100644 --- a/src/pulsensor/pulsensor.h +++ b/src/pulsensor/pulsensor.hpp @@ -48,7 +48,7 @@ struct clbk_data { }; #if defined(SWIGJAVA) || defined(JAVACALLBACK) -#include "Callback.h" +#include "Callback.hpp" #else typedef void (* callback_handler) (clbk_data); #endif diff --git a/src/pulsensor/pyupm_pulsensor.i b/src/pulsensor/pyupm_pulsensor.i index 7d470cf8..3d340e5d 100644 --- a/src/pulsensor/pyupm_pulsensor.i +++ b/src/pulsensor/pyupm_pulsensor.i @@ -7,7 +7,7 @@ %feature("autodoc", "3"); -%include "pulsensor.h" +%include "pulsensor.hpp" %{ - #include "pulsensor.h" + #include "pulsensor.hpp" %} diff --git a/src/rfr359f/CMakeLists.txt b/src/rfr359f/CMakeLists.txt index 94cb79df..539e6b7b 100644 --- a/src/rfr359f/CMakeLists.txt +++ b/src/rfr359f/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "rfr359f") set (libdescription "upm rfr359f grove distance interrupter") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/rfr359f/javaupm_rfr359f.i b/src/rfr359f/javaupm_rfr359f.i index ebd528f5..ce2e2eef 100644 --- a/src/rfr359f/javaupm_rfr359f.i +++ b/src/rfr359f/javaupm_rfr359f.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "rfr359f.h" + #include "rfr359f.hpp" %} -%include "rfr359f.h" +%include "rfr359f.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/rfr359f/jsupm_rfr359f.i b/src/rfr359f/jsupm_rfr359f.i index be5748f6..93709a5e 100644 --- a/src/rfr359f/jsupm_rfr359f.i +++ b/src/rfr359f/jsupm_rfr359f.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "rfr359f.h" + #include "rfr359f.hpp" %} -%include "rfr359f.h" +%include "rfr359f.hpp" diff --git a/src/rfr359f/pyupm_rfr359f.i b/src/rfr359f/pyupm_rfr359f.i index eacc68a7..3900e6ef 100644 --- a/src/rfr359f/pyupm_rfr359f.i +++ b/src/rfr359f/pyupm_rfr359f.i @@ -5,7 +5,7 @@ %feature("autodoc", "3"); -%include "rfr359f.h" +%include "rfr359f.hpp" %{ - #include "rfr359f.h" + #include "rfr359f.hpp" %} diff --git a/src/rfr359f/rfr359f.cxx b/src/rfr359f/rfr359f.cxx index 96dfc22f..e24ce73b 100644 --- a/src/rfr359f/rfr359f.cxx +++ b/src/rfr359f/rfr359f.cxx @@ -26,7 +26,7 @@ #include #include -#include "rfr359f.h" +#include "rfr359f.hpp" using namespace upm; using namespace std; diff --git a/src/rfr359f/rfr359f.h b/src/rfr359f/rfr359f.hpp similarity index 100% rename from src/rfr359f/rfr359f.h rename to src/rfr359f/rfr359f.hpp diff --git a/src/rgbringcoder/CMakeLists.txt b/src/rgbringcoder/CMakeLists.txt index 86d6ee42..da1f695f 100644 --- a/src/rgbringcoder/CMakeLists.txt +++ b/src/rgbringcoder/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "rgbringcoder") set (libdescription "upm Sparkfun RGB RingCoder") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/rgbringcoder/javaupm_rgbringcoder.i b/src/rgbringcoder/javaupm_rgbringcoder.i index 2e67125e..42109154 100644 --- a/src/rgbringcoder/javaupm_rgbringcoder.i +++ b/src/rgbringcoder/javaupm_rgbringcoder.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "rgbringcoder.h" + #include "rgbringcoder.hpp" %} -%include "rgbringcoder.h" +%include "rgbringcoder.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/rgbringcoder/jsupm_rgbringcoder.i b/src/rgbringcoder/jsupm_rgbringcoder.i index 8f4f5f8d..a208aced 100644 --- a/src/rgbringcoder/jsupm_rgbringcoder.i +++ b/src/rgbringcoder/jsupm_rgbringcoder.i @@ -3,7 +3,7 @@ %include "stdint.i" %{ - #include "rgbringcoder.h" + #include "rgbringcoder.hpp" %} -%include "rgbringcoder.h" +%include "rgbringcoder.hpp" diff --git a/src/rgbringcoder/pyupm_rgbringcoder.i b/src/rgbringcoder/pyupm_rgbringcoder.i index 7f7afff3..25560a6d 100644 --- a/src/rgbringcoder/pyupm_rgbringcoder.i +++ b/src/rgbringcoder/pyupm_rgbringcoder.i @@ -5,7 +5,7 @@ %feature("autodoc", "3"); -%include "rgbringcoder.h" +%include "rgbringcoder.hpp" %{ - #include "rgbringcoder.h" + #include "rgbringcoder.hpp" %} diff --git a/src/rgbringcoder/rgbringcoder.cxx b/src/rgbringcoder/rgbringcoder.cxx index 6716f812..4a48314f 100644 --- a/src/rgbringcoder/rgbringcoder.cxx +++ b/src/rgbringcoder/rgbringcoder.cxx @@ -27,7 +27,7 @@ #ifdef JAVACALLBACK #undef JAVACALLBACK #endif -#include "rgbringcoder.h" +#include "rgbringcoder.hpp" using namespace std; using namespace upm; diff --git a/src/rgbringcoder/rgbringcoder.h b/src/rgbringcoder/rgbringcoder.hpp similarity index 100% rename from src/rgbringcoder/rgbringcoder.h rename to src/rgbringcoder/rgbringcoder.hpp diff --git a/src/rhusb/CMakeLists.txt b/src/rhusb/CMakeLists.txt index 64f2aff0..f5525a2d 100644 --- a/src/rhusb/CMakeLists.txt +++ b/src/rhusb/CMakeLists.txt @@ -1,6 +1,6 @@ set (libname "rhusb") set (libdescription "upm module for the Omega RH-USB sensor") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/rhusb/javaupm_rhusb.i b/src/rhusb/javaupm_rhusb.i index e72f423d..c6a600cf 100644 --- a/src/rhusb/javaupm_rhusb.i +++ b/src/rhusb/javaupm_rhusb.i @@ -6,10 +6,10 @@ %include "../java_buffer.i" %{ - #include "rhusb.h" + #include "rhusb.hpp" %} -%include "rhusb.h" +%include "rhusb.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/rhusb/jsupm_rhusb.i b/src/rhusb/jsupm_rhusb.i index 3786cb7a..17a14667 100644 --- a/src/rhusb/jsupm_rhusb.i +++ b/src/rhusb/jsupm_rhusb.i @@ -2,7 +2,7 @@ %include "../upm.i" %include "stdint.i" -%include "rhusb.h" +%include "rhusb.hpp" %{ - #include "rhusb.h" + #include "rhusb.hpp" %} diff --git a/src/rhusb/pyupm_rhusb.i b/src/rhusb/pyupm_rhusb.i index 83322af3..214fbc69 100644 --- a/src/rhusb/pyupm_rhusb.i +++ b/src/rhusb/pyupm_rhusb.i @@ -6,7 +6,7 @@ %feature("autodoc", "3"); -%include "rhusb.h" +%include "rhusb.hpp" %{ - #include "rhusb.h" + #include "rhusb.hpp" %} diff --git a/src/rhusb/rhusb.cxx b/src/rhusb/rhusb.cxx index 6b6b88ca..ca51d6e9 100644 --- a/src/rhusb/rhusb.cxx +++ b/src/rhusb/rhusb.cxx @@ -28,7 +28,7 @@ #include #include -#include "rhusb.h" +#include "rhusb.hpp" using namespace upm; using namespace std; diff --git a/src/rhusb/rhusb.h b/src/rhusb/rhusb.hpp similarity index 100% rename from src/rhusb/rhusb.h rename to src/rhusb/rhusb.hpp diff --git a/src/rotaryencoder/CMakeLists.txt b/src/rotaryencoder/CMakeLists.txt index 56b8f577..099e87d1 100644 --- a/src/rotaryencoder/CMakeLists.txt +++ b/src/rotaryencoder/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "rotaryencoder") set (libdescription "upm grove rotary encoder module") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/rotaryencoder/javaupm_rotaryencoder.i b/src/rotaryencoder/javaupm_rotaryencoder.i index af10c233..404df455 100644 --- a/src/rotaryencoder/javaupm_rotaryencoder.i +++ b/src/rotaryencoder/javaupm_rotaryencoder.i @@ -4,10 +4,10 @@ %ignore signalAISR; %{ - #include "rotaryencoder.h" + #include "rotaryencoder.hpp" %} -%include "rotaryencoder.h" +%include "rotaryencoder.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/rotaryencoder/jsupm_rotaryencoder.i b/src/rotaryencoder/jsupm_rotaryencoder.i index 13fd7b80..b217742c 100644 --- a/src/rotaryencoder/jsupm_rotaryencoder.i +++ b/src/rotaryencoder/jsupm_rotaryencoder.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "rotaryencoder.h" + #include "rotaryencoder.hpp" %} -%include "rotaryencoder.h" +%include "rotaryencoder.hpp" diff --git a/src/rotaryencoder/pyupm_rotaryencoder.i b/src/rotaryencoder/pyupm_rotaryencoder.i index ea27bc3b..26d9e6fa 100644 --- a/src/rotaryencoder/pyupm_rotaryencoder.i +++ b/src/rotaryencoder/pyupm_rotaryencoder.i @@ -5,7 +5,7 @@ %feature("autodoc", "3"); -%include "rotaryencoder.h" +%include "rotaryencoder.hpp" %{ - #include "rotaryencoder.h" + #include "rotaryencoder.hpp" %} diff --git a/src/rotaryencoder/rotaryencoder.cxx b/src/rotaryencoder/rotaryencoder.cxx index 15b7b5d4..cc368d79 100644 --- a/src/rotaryencoder/rotaryencoder.cxx +++ b/src/rotaryencoder/rotaryencoder.cxx @@ -26,7 +26,7 @@ #include #include -#include "rotaryencoder.h" +#include "rotaryencoder.hpp" using namespace upm; using namespace std; diff --git a/src/rotaryencoder/rotaryencoder.h b/src/rotaryencoder/rotaryencoder.hpp similarity index 100% rename from src/rotaryencoder/rotaryencoder.h rename to src/rotaryencoder/rotaryencoder.hpp diff --git a/src/rpr220/CMakeLists.txt b/src/rpr220/CMakeLists.txt index 2a88bf04..2f63724a 100644 --- a/src/rpr220/CMakeLists.txt +++ b/src/rpr220/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "rpr220") set (libdescription "upm rpr220 grove IR reflective sensor") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/rpr220/javaupm_rpr220.i b/src/rpr220/javaupm_rpr220.i index fd466d87..ec4b3003 100644 --- a/src/rpr220/javaupm_rpr220.i +++ b/src/rpr220/javaupm_rpr220.i @@ -3,9 +3,9 @@ %{ - #include "rpr220.h" + #include "rpr220.hpp" %} -%include "rpr220.h" +%include "rpr220.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/rpr220/jsupm_rpr220.i b/src/rpr220/jsupm_rpr220.i index 75706ae5..6c83979a 100644 --- a/src/rpr220/jsupm_rpr220.i +++ b/src/rpr220/jsupm_rpr220.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "rpr220.h" + #include "rpr220.hpp" %} -%include "rpr220.h" +%include "rpr220.hpp" diff --git a/src/rpr220/pyupm_rpr220.i b/src/rpr220/pyupm_rpr220.i index 2f356ca3..1dd955bf 100644 --- a/src/rpr220/pyupm_rpr220.i +++ b/src/rpr220/pyupm_rpr220.i @@ -5,7 +5,7 @@ %feature("autodoc", "3"); -%include "rpr220.h" +%include "rpr220.hpp" %{ - #include "rpr220.h" + #include "rpr220.hpp" %} diff --git a/src/rpr220/rpr220.cxx b/src/rpr220/rpr220.cxx index 8068eaa3..acf3fc45 100644 --- a/src/rpr220/rpr220.cxx +++ b/src/rpr220/rpr220.cxx @@ -26,7 +26,7 @@ #include #include -#include "rpr220.h" +#include "rpr220.hpp" using namespace upm; using namespace std; diff --git a/src/rpr220/rpr220.h b/src/rpr220/rpr220.hpp similarity index 100% rename from src/rpr220/rpr220.h rename to src/rpr220/rpr220.hpp diff --git a/src/servo/CMakeLists.txt b/src/servo/CMakeLists.txt index 923c09c0..9cd02270 100644 --- a/src/servo/CMakeLists.txt +++ b/src/servo/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "servo") set (libdescription "upm servo") set (module_src servo.cxx es08a.cxx es9257.cxx) -set (module_h servo.h es08a.h es9257.h) +set (module_hpp servo.hpp es08a.hpp es9257.hpp) upm_module_init() diff --git a/src/servo/es08a.cxx b/src/servo/es08a.cxx index b7d72d3f..eab14c9f 100644 --- a/src/servo/es08a.cxx +++ b/src/servo/es08a.cxx @@ -25,7 +25,7 @@ #include #include -#include "es08a.h" +#include "es08a.hpp" using namespace upm; diff --git a/src/servo/es08a.h b/src/servo/es08a.hpp similarity index 99% rename from src/servo/es08a.h rename to src/servo/es08a.hpp index 2c28096a..88223895 100644 --- a/src/servo/es08a.h +++ b/src/servo/es08a.hpp @@ -24,7 +24,7 @@ #pragma once #include -#include "servo.h" +#include "servo.hpp" namespace upm { diff --git a/src/servo/es9257.cxx b/src/servo/es9257.cxx index b7edf0fa..6f55d451 100644 --- a/src/servo/es9257.cxx +++ b/src/servo/es9257.cxx @@ -25,7 +25,7 @@ #include #include -#include "es9257.h" +#include "es9257.hpp" using namespace upm; diff --git a/src/servo/es9257.h b/src/servo/es9257.hpp similarity index 98% rename from src/servo/es9257.h rename to src/servo/es9257.hpp index 51b41ef1..a2e2e5cc 100644 --- a/src/servo/es9257.h +++ b/src/servo/es9257.hpp @@ -24,7 +24,7 @@ #pragma once #include -#include "servo.h" +#include "servo.hpp" namespace upm { diff --git a/src/servo/javaupm_servo.i b/src/servo/javaupm_servo.i index 38e04361..1ab59ea7 100644 --- a/src/servo/javaupm_servo.i +++ b/src/servo/javaupm_servo.i @@ -1,19 +1,19 @@ %module javaupm_servo %include "../upm.i" -%include "servo.h" +%include "servo.hpp" %{ - #include "servo.h" + #include "servo.hpp" %} -%include "es08a.h" +%include "es08a.hpp" %{ - #include "es08a.h" + #include "es08a.hpp" %} -%include "es9257.h" +%include "es9257.hpp" %{ - #include "es9257.h" + #include "es9257.hpp" %} %pragma(java) jniclasscode=%{ diff --git a/src/servo/jsupm_servo.i b/src/servo/jsupm_servo.i index 6b17bc24..72ef29c9 100644 --- a/src/servo/jsupm_servo.i +++ b/src/servo/jsupm_servo.i @@ -1,17 +1,17 @@ %module jsupm_servo %include "../upm.i" -%include "servo.h" +%include "servo.hpp" %{ - #include "servo.h" + #include "servo.hpp" %} -%include "es08a.h" +%include "es08a.hpp" %{ - #include "es08a.h" + #include "es08a.hpp" %} -%include "es9257.h" +%include "es9257.hpp" %{ - #include "es9257.h" + #include "es9257.hpp" %} diff --git a/src/servo/pyupm_servo.i b/src/servo/pyupm_servo.i index 8db40d67..40239753 100644 --- a/src/servo/pyupm_servo.i +++ b/src/servo/pyupm_servo.i @@ -3,17 +3,17 @@ %module pyupm_servo %include "../upm.i" -%include "servo.h" +%include "servo.hpp" %{ - #include "servo.h" + #include "servo.hpp" %} -%include "es08a.h" +%include "es08a.hpp" %{ - #include "es08a.h" + #include "es08a.hpp" %} -%include "es9257.h" +%include "es9257.hpp" %{ - #include "es9257.h" + #include "es9257.hpp" %} diff --git a/src/servo/servo.cxx b/src/servo/servo.cxx index b956ec40..9ed031db 100644 --- a/src/servo/servo.cxx +++ b/src/servo/servo.cxx @@ -30,7 +30,7 @@ #include #include -#include "servo.h" +#include "servo.hpp" using namespace upm; diff --git a/src/servo/servo.h b/src/servo/servo.hpp similarity index 100% rename from src/servo/servo.h rename to src/servo/servo.hpp diff --git a/src/si1132/CMakeLists.txt b/src/si1132/CMakeLists.txt index 0b13ba54..e09e9db8 100644 --- a/src/si1132/CMakeLists.txt +++ b/src/si1132/CMakeLists.txt @@ -2,5 +2,5 @@ include_directories(..) set (libname "si1132") set (libdescription "upm Si1132") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/si1132/javaupm_si1132.i b/src/si1132/javaupm_si1132.i index 6b1c9bdd..3b0786a7 100644 --- a/src/si1132/javaupm_si1132.i +++ b/src/si1132/javaupm_si1132.i @@ -3,15 +3,15 @@ %include "../upm/javaupm_interfaces.i" %{ - #include "si1132.h" + #include "si1132.hpp" %} /* -%include "../upm/iModuleStatus.h" -%include "../upm/iLightSensor.h" +%include "../upm/iModuleStatus.hpp" +%include "../upm/iLightSensor.hpp" %feature("director") IModuleStatus; %feature("director") ILightSensor; */ -%include "si1132.h" +%include "si1132.hpp" diff --git a/src/si1132/jsupm_si1132.i b/src/si1132/jsupm_si1132.i index 48f62a78..5e117dfe 100644 --- a/src/si1132/jsupm_si1132.i +++ b/src/si1132/jsupm_si1132.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "si1132.h" + #include "si1132.hpp" %} -%include "si1132.h" +%include "si1132.hpp" diff --git a/src/si1132/pyupm_si1132.i b/src/si1132/pyupm_si1132.i index 495232fd..00a4d942 100644 --- a/src/si1132/pyupm_si1132.i +++ b/src/si1132/pyupm_si1132.i @@ -5,7 +5,7 @@ %feature("autodoc", "3"); -%include "si1132.h" +%include "si1132.hpp" %{ - #include "si1132.h" + #include "si1132.hpp" %} diff --git a/src/si1132/si1132.cxx b/src/si1132/si1132.cxx index 2228cf33..5d81eae8 100644 --- a/src/si1132/si1132.cxx +++ b/src/si1132/si1132.cxx @@ -28,7 +28,7 @@ #include #include -#include "si1132.h" +#include "si1132.hpp" #define SI1132_ADDRESS 0x60 diff --git a/src/si1132/si1132.h b/src/si1132/si1132.hpp similarity index 98% rename from src/si1132/si1132.h rename to src/si1132/si1132.hpp index 9f3cad3e..55260013 100644 --- a/src/si1132/si1132.h +++ b/src/si1132/si1132.hpp @@ -25,7 +25,7 @@ #include #include "mraa/i2c.hpp" -#include "upm/iLightSensor.h" +#include "upm/iLightSensor.hpp" namespace upm { diff --git a/src/si114x/CMakeLists.txt b/src/si114x/CMakeLists.txt index e2d8f2ef..0d1c24fd 100644 --- a/src/si114x/CMakeLists.txt +++ b/src/si114x/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "si114x") set (libdescription "upm si114x UV/IR/Visible light sensor") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/si114x/javaupm_si114x.i b/src/si114x/javaupm_si114x.i index 173c4a66..1bb66120 100644 --- a/src/si114x/javaupm_si114x.i +++ b/src/si114x/javaupm_si114x.i @@ -3,10 +3,10 @@ %include "cpointer.i" %{ - #include "si114x.h" + #include "si114x.hpp" %} -%include "si114x.h" +%include "si114x.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/si114x/jsupm_si114x.i b/src/si114x/jsupm_si114x.i index 9ee70e0f..1b0d0157 100644 --- a/src/si114x/jsupm_si114x.i +++ b/src/si114x/jsupm_si114x.i @@ -3,7 +3,7 @@ %include "cpointer.i" %{ - #include "si114x.h" + #include "si114x.hpp" %} -%include "si114x.h" +%include "si114x.hpp" diff --git a/src/si114x/pyupm_si114x.i b/src/si114x/pyupm_si114x.i index 7b35cb80..5aa596fc 100644 --- a/src/si114x/pyupm_si114x.i +++ b/src/si114x/pyupm_si114x.i @@ -9,7 +9,7 @@ %include "si114x_doc.i" #endif -%include "si114x.h" +%include "si114x.hpp" %{ - #include "si114x.h" + #include "si114x.hpp" %} diff --git a/src/si114x/si114x.cxx b/src/si114x/si114x.cxx index 68876904..e1b17182 100644 --- a/src/si114x/si114x.cxx +++ b/src/si114x/si114x.cxx @@ -30,7 +30,7 @@ #include #include -#include "si114x.h" +#include "si114x.hpp" using namespace upm; using namespace std; diff --git a/src/si114x/si114x.h b/src/si114x/si114x.hpp similarity index 100% rename from src/si114x/si114x.h rename to src/si114x/si114x.hpp diff --git a/src/si7005/CMakeLists.txt b/src/si7005/CMakeLists.txt index 6aaec974..2c068a0a 100644 --- a/src/si7005/CMakeLists.txt +++ b/src/si7005/CMakeLists.txt @@ -2,5 +2,5 @@ include_directories(..) set (libname "si7005") set (libdescription "upm SI7005") set (module_src ${libname}.cxx mraa-utils.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/si7005/javaupm_si7005.i b/src/si7005/javaupm_si7005.i index 047e76ba..66e9dff4 100644 --- a/src/si7005/javaupm_si7005.i +++ b/src/si7005/javaupm_si7005.i @@ -6,10 +6,10 @@ %include "typemaps.i" %{ - #include "si7005.h" + #include "si7005.hpp" %} -%include "si7005.h" +%include "si7005.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/si7005/jsupm_si7005.i b/src/si7005/jsupm_si7005.i index 9af5003c..6f614eef 100644 --- a/src/si7005/jsupm_si7005.i +++ b/src/si7005/jsupm_si7005.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "si7005.h" + #include "si7005.hpp" %} -%include "si7005.h" +%include "si7005.hpp" diff --git a/src/si7005/mraa-utils.cxx b/src/si7005/mraa-utils.cxx index 3c12561d..b0e9d92c 100644 --- a/src/si7005/mraa-utils.cxx +++ b/src/si7005/mraa-utils.cxx @@ -22,7 +22,7 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "mraa-utils.h" +#include "mraa-utils.hpp" #include "mraa/gpio.hpp" #define UPM_THROW(msg) throw std::runtime_error(std::string(__FUNCTION__) + ": " + (msg)) diff --git a/src/ds1808lc/mraa-utils.h b/src/si7005/mraa-utils.hpp similarity index 100% rename from src/ds1808lc/mraa-utils.h rename to src/si7005/mraa-utils.hpp diff --git a/src/si7005/pyupm_si7005.i b/src/si7005/pyupm_si7005.i index a6e67ff8..914d3ffa 100644 --- a/src/si7005/pyupm_si7005.i +++ b/src/si7005/pyupm_si7005.i @@ -5,7 +5,7 @@ %feature("autodoc", "3"); -%include "si7005.h" +%include "si7005.hpp" %{ - #include "si7005.h" + #include "si7005.hpp" %} diff --git a/src/si7005/si7005.cxx b/src/si7005/si7005.cxx index beb3d000..6dd07a65 100644 --- a/src/si7005/si7005.cxx +++ b/src/si7005/si7005.cxx @@ -27,8 +27,8 @@ #include #include -#include "mraa-utils.h" -#include "si7005.h" +#include "mraa-utils.hpp" +#include "si7005.hpp" /* REGISTER ADDRESSES */ #define SI7005_REG_STATUS ( 0x00 ) diff --git a/src/si7005/si7005.h b/src/si7005/si7005.hpp similarity index 98% rename from src/si7005/si7005.h rename to src/si7005/si7005.hpp index b9f8032b..bec2825f 100644 --- a/src/si7005/si7005.h +++ b/src/si7005/si7005.hpp @@ -25,8 +25,8 @@ #include -#include "upm/iTemperatureSensor.h" -#include "upm/iHumiditySensor.h" +#include "upm/iTemperatureSensor.hpp" +#include "upm/iHumiditySensor.hpp" /* ADDRESS AND NOT_FOUND VALUE */ #define SI7005_ADDRESS ( 0x40 ) diff --git a/src/sm130/CMakeLists.txt b/src/sm130/CMakeLists.txt index 1875951b..71de8681 100644 --- a/src/sm130/CMakeLists.txt +++ b/src/sm130/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "sm130") set (libdescription "upm rfid reader") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/sm130/javaupm_sm130.i b/src/sm130/javaupm_sm130.i index 5c1e1a91..648620e8 100644 --- a/src/sm130/javaupm_sm130.i +++ b/src/sm130/javaupm_sm130.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "sm130.h" + #include "sm130.hpp" %} -%include "sm130.h" +%include "sm130.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/sm130/jsupm_sm130.i b/src/sm130/jsupm_sm130.i index 6ee78060..ee9e2bc6 100644 --- a/src/sm130/jsupm_sm130.i +++ b/src/sm130/jsupm_sm130.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "sm130.h" + #include "sm130.hpp" %} -%include "sm130.h" +%include "sm130.hpp" diff --git a/src/sm130/pyupm_sm130.i b/src/sm130/pyupm_sm130.i index d7cd2b1b..29cfd322 100644 --- a/src/sm130/pyupm_sm130.i +++ b/src/sm130/pyupm_sm130.i @@ -5,7 +5,7 @@ %feature("autodoc", "3"); -%include "sm130.h" +%include "sm130.hpp" %{ - #include "sm130.h" + #include "sm130.hpp" %} diff --git a/src/sm130/sm130.cxx b/src/sm130/sm130.cxx index fb84c11a..79489c08 100644 --- a/src/sm130/sm130.cxx +++ b/src/sm130/sm130.cxx @@ -24,7 +24,7 @@ #include -#include "sm130.h" +#include "sm130.hpp" using namespace upm; using namespace std; diff --git a/src/sm130/sm130.h b/src/sm130/sm130.hpp similarity index 100% rename from src/sm130/sm130.h rename to src/sm130/sm130.hpp diff --git a/src/smartdrive/CMakeLists.txt b/src/smartdrive/CMakeLists.txt index 3c9b0d22..014a4dd4 100644 --- a/src/smartdrive/CMakeLists.txt +++ b/src/smartdrive/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "smartdrive") set (libdescription "upm SmartDrive") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/smartdrive/javaupm_smartdrive.i b/src/smartdrive/javaupm_smartdrive.i index 438d45b5..e7183a9b 100644 --- a/src/smartdrive/javaupm_smartdrive.i +++ b/src/smartdrive/javaupm_smartdrive.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "smartdrive.h" + #include "smartdrive.hpp" %} -%include "smartdrive.h" +%include "smartdrive.hpp" diff --git a/src/smartdrive/jsupm_smartdrive.i b/src/smartdrive/jsupm_smartdrive.i index cd81c983..d8b0b55c 100644 --- a/src/smartdrive/jsupm_smartdrive.i +++ b/src/smartdrive/jsupm_smartdrive.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "smartdrive.h" + #include "smartdrive.hpp" %} -%include "smartdrive.h" +%include "smartdrive.hpp" diff --git a/src/smartdrive/pyupm_smartdrive.i b/src/smartdrive/pyupm_smartdrive.i index 2bb84024..3ed4ff20 100644 --- a/src/smartdrive/pyupm_smartdrive.i +++ b/src/smartdrive/pyupm_smartdrive.i @@ -3,7 +3,7 @@ %include "stdint.i" -%include "smartdrive.h" +%include "smartdrive.hpp" %{ - #include "smartdrive.h" + #include "smartdrive.hpp" %} diff --git a/src/smartdrive/smartdrive.cxx b/src/smartdrive/smartdrive.cxx index 23a7570b..7c945912 100644 --- a/src/smartdrive/smartdrive.cxx +++ b/src/smartdrive/smartdrive.cxx @@ -29,7 +29,7 @@ #include #include -#include "smartdrive.h" +#include "smartdrive.hpp" using namespace upm; diff --git a/src/smartdrive/smartdrive.h b/src/smartdrive/smartdrive.hpp similarity index 100% rename from src/smartdrive/smartdrive.h rename to src/smartdrive/smartdrive.hpp diff --git a/src/ssd1351/CMakeLists.txt b/src/ssd1351/CMakeLists.txt index 3d277bfb..03a9b6c0 100644 --- a/src/ssd1351/CMakeLists.txt +++ b/src/ssd1351/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "ssd1351") set (libdescription "libupm SSD1351 SPI LCD") set (module_src ssd1351_gfx.cxx ssd1351.cxx) -set (module_h ssd1351_gfx.h ssd1351.h) +set (module_hpp ssd1351_gfx.hpp ssd1351.hpp) upm_module_init() diff --git a/src/ssd1351/javaupm_ssd1351.i b/src/ssd1351/javaupm_ssd1351.i index a33b842c..36ca1596 100644 --- a/src/ssd1351/javaupm_ssd1351.i +++ b/src/ssd1351/javaupm_ssd1351.i @@ -6,14 +6,14 @@ %ignore m_map; %ignore font; -%include "ssd1351_gfx.h" +%include "ssd1351_gfx.hpp" %{ - #include "ssd1351_gfx.h" + #include "ssd1351_gfx.hpp" %} -%include "ssd1351.h" +%include "ssd1351.hpp" %{ - #include "ssd1351.h" + #include "ssd1351.hpp" %} %pragma(java) jniclasscode=%{ diff --git a/src/ssd1351/jsupm_ssd1351.i b/src/ssd1351/jsupm_ssd1351.i index 01934af4..37677fce 100644 --- a/src/ssd1351/jsupm_ssd1351.i +++ b/src/ssd1351/jsupm_ssd1351.i @@ -1,12 +1,12 @@ %module jsupm_ssd1351 %include "../upm.i" -%include "ssd1351_gfx.h" +%include "ssd1351_gfx.hpp" %{ - #include "ssd1351_gfx.h" + #include "ssd1351_gfx.hpp" %} -%include "ssd1351.h" +%include "ssd1351.hpp" %{ - #include "ssd1351.h" + #include "ssd1351.hpp" %} diff --git a/src/ssd1351/pyupm_ssd1351.i b/src/ssd1351/pyupm_ssd1351.i index 9c3dbef7..70aa0665 100644 --- a/src/ssd1351/pyupm_ssd1351.i +++ b/src/ssd1351/pyupm_ssd1351.i @@ -6,12 +6,12 @@ %feature("autodoc", "3"); %rename("printString") print(std::string msg); -%include "ssd1351_gfx.h" +%include "ssd1351_gfx.hpp" %{ - #include "ssd1351_gfx.h" + #include "ssd1351_gfx.hpp" %} -%include "ssd1351.h" +%include "ssd1351.hpp" %{ - #include "ssd1351.h" + #include "ssd1351.hpp" %} diff --git a/src/ssd1351/ssd1351.cxx b/src/ssd1351/ssd1351.cxx index 691b64a0..ab4e1f30 100644 --- a/src/ssd1351/ssd1351.cxx +++ b/src/ssd1351/ssd1351.cxx @@ -30,7 +30,7 @@ #include #include -#include "ssd1351.h" +#include "ssd1351.hpp" using namespace upm; using namespace std; diff --git a/src/ssd1351/ssd1351.h b/src/ssd1351/ssd1351.hpp similarity index 99% rename from src/ssd1351/ssd1351.h rename to src/ssd1351/ssd1351.hpp index 9a1a514e..4462fcaa 100644 --- a/src/ssd1351/ssd1351.h +++ b/src/ssd1351/ssd1351.hpp @@ -30,7 +30,7 @@ #include #include #include -#include "ssd1351_gfx.h" +#include "ssd1351_gfx.hpp" // Display Size #define SSD1351WIDTH 128 diff --git a/src/ssd1351/ssd1351_gfx.cxx b/src/ssd1351/ssd1351_gfx.cxx index 55f0f6ee..0eadfd1f 100644 --- a/src/ssd1351/ssd1351_gfx.cxx +++ b/src/ssd1351/ssd1351_gfx.cxx @@ -28,7 +28,7 @@ #include #include -#include "ssd1351_gfx.h" +#include "ssd1351_gfx.hpp" using namespace upm; diff --git a/src/ssd1351/ssd1351_gfx.h b/src/ssd1351/ssd1351_gfx.hpp similarity index 100% rename from src/ssd1351/ssd1351_gfx.h rename to src/ssd1351/ssd1351_gfx.hpp diff --git a/src/st7735/CMakeLists.txt b/src/st7735/CMakeLists.txt index 3434e178..b4247790 100644 --- a/src/st7735/CMakeLists.txt +++ b/src/st7735/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "st7735") set (libdescription "libupm SPI LCD") set (module_src st7735_gfx.cxx st7735.cxx) -set (module_h st7735_gfx.h st7735.h) +set (module_hpp st7735_gfx.hpp st7735.hpp) upm_module_init() diff --git a/src/st7735/javaupm_st7735.i b/src/st7735/javaupm_st7735.i index c73a46ca..be91f460 100644 --- a/src/st7735/javaupm_st7735.i +++ b/src/st7735/javaupm_st7735.i @@ -35,14 +35,14 @@ $1 = (unsigned char *)JCALL2(GetByteArrayElements, jenv, $input, NULL); } -%include "st7735_gfx.h" +%include "st7735_gfx.hpp" %{ - #include "st7735_gfx.h" + #include "st7735_gfx.hpp" %} -%include "st7735.h" +%include "st7735.hpp" %{ - #include "st7735.h" + #include "st7735.hpp" %} %pragma(java) jniclasscode=%{ diff --git a/src/st7735/jsupm_st7735.i b/src/st7735/jsupm_st7735.i index cf00008d..258db943 100644 --- a/src/st7735/jsupm_st7735.i +++ b/src/st7735/jsupm_st7735.i @@ -1,12 +1,12 @@ %module jsupm_st7735 %include "../upm.i" -%include "st7735_gfx.h" +%include "st7735_gfx.hpp" %{ - #include "st7735_gfx.h" + #include "st7735_gfx.hpp" %} -%include "st7735.h" +%include "st7735.hpp" %{ - #include "st7735.h" + #include "st7735.hpp" %} diff --git a/src/st7735/pyupm_st7735.i b/src/st7735/pyupm_st7735.i index e18f83d4..a41316b2 100644 --- a/src/st7735/pyupm_st7735.i +++ b/src/st7735/pyupm_st7735.i @@ -6,12 +6,12 @@ %feature("autodoc", "3"); %rename("printString") print(std::string msg); -%include "st7735_gfx.h" +%include "st7735_gfx.hpp" %{ - #include "st7735_gfx.h" + #include "st7735_gfx.hpp" %} -%include "st7735.h" +%include "st7735.hpp" %{ - #include "st7735.h" + #include "st7735.hpp" %} diff --git a/src/st7735/st7735.cxx b/src/st7735/st7735.cxx index ac01c565..70af29df 100644 --- a/src/st7735/st7735.cxx +++ b/src/st7735/st7735.cxx @@ -30,7 +30,7 @@ #include #include -#include "st7735.h" +#include "st7735.hpp" using namespace upm; diff --git a/src/st7735/st7735.h b/src/st7735/st7735.hpp similarity index 99% rename from src/st7735/st7735.h rename to src/st7735/st7735.hpp index 7180ee2c..4d80400c 100644 --- a/src/st7735/st7735.h +++ b/src/st7735/st7735.hpp @@ -33,7 +33,7 @@ #include #include -#include "st7735_gfx.h" +#include "st7735_gfx.hpp" #define INITR_GREENTAB 0x0 #define INITR_REDTAB 0x1 diff --git a/src/st7735/st7735_gfx.cxx b/src/st7735/st7735_gfx.cxx index df53cb15..00c56be8 100644 --- a/src/st7735/st7735_gfx.cxx +++ b/src/st7735/st7735_gfx.cxx @@ -26,7 +26,7 @@ #include #include -#include "st7735_gfx.h" +#include "st7735_gfx.hpp" using namespace upm; diff --git a/src/st7735/st7735_gfx.h b/src/st7735/st7735_gfx.hpp similarity index 100% rename from src/st7735/st7735_gfx.h rename to src/st7735/st7735_gfx.hpp diff --git a/src/stepmotor/CMakeLists.txt b/src/stepmotor/CMakeLists.txt index 666086b6..562a50c8 100644 --- a/src/stepmotor/CMakeLists.txt +++ b/src/stepmotor/CMakeLists.txt @@ -1,6 +1,6 @@ set (libname "stepmotor") set (libdescription "upm STEPMOTOR") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() target_link_libraries(${libname} rt) diff --git a/src/stepmotor/javaupm_stepmotor.i b/src/stepmotor/javaupm_stepmotor.i index 96ec7bcd..90505c56 100644 --- a/src/stepmotor/javaupm_stepmotor.i +++ b/src/stepmotor/javaupm_stepmotor.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "stepmotor.h" + #include "stepmotor.hpp" %} -%include "stepmotor.h" +%include "stepmotor.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/stepmotor/jsupm_stepmotor.i b/src/stepmotor/jsupm_stepmotor.i index 9cea2ec0..dac8f4f4 100644 --- a/src/stepmotor/jsupm_stepmotor.i +++ b/src/stepmotor/jsupm_stepmotor.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "stepmotor.h" + #include "stepmotor.hpp" %} -%include "stepmotor.h" +%include "stepmotor.hpp" diff --git a/src/stepmotor/pyupm_stepmotor.i b/src/stepmotor/pyupm_stepmotor.i index 83ade003..d2bdfaed 100644 --- a/src/stepmotor/pyupm_stepmotor.i +++ b/src/stepmotor/pyupm_stepmotor.i @@ -7,7 +7,7 @@ %feature("autodoc", "3"); -%include "stepmotor.h" +%include "stepmotor.hpp" %{ - #include "stepmotor.h" + #include "stepmotor.hpp" %} diff --git a/src/stepmotor/stepmotor.cxx b/src/stepmotor/stepmotor.cxx index 574c5361..6a4f5d03 100644 --- a/src/stepmotor/stepmotor.cxx +++ b/src/stepmotor/stepmotor.cxx @@ -28,7 +28,7 @@ #include #include #include -#include "stepmotor.h" +#include "stepmotor.hpp" using namespace upm; using namespace std; diff --git a/src/stepmotor/stepmotor.h b/src/stepmotor/stepmotor.hpp similarity index 100% rename from src/stepmotor/stepmotor.h rename to src/stepmotor/stepmotor.hpp diff --git a/src/sx1276/CMakeLists.txt b/src/sx1276/CMakeLists.txt index 21fb5add..d5078cf3 100644 --- a/src/sx1276/CMakeLists.txt +++ b/src/sx1276/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "sx1276") set (libdescription "SZ1276 LoRa/FSK/OOK radio") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/sx1276/javaupm_sx1276.i b/src/sx1276/javaupm_sx1276.i index 61bb24bd..8b1dd8a7 100644 --- a/src/sx1276/javaupm_sx1276.i +++ b/src/sx1276/javaupm_sx1276.i @@ -6,13 +6,13 @@ %include "../java_buffer.i" %{ - #include "sx1276.h" + #include "sx1276.hpp" %} %ignore send(uint8_t *buffer, uint8_t size, int txTimeout); %ignore getRxBuffer(); -%include "sx1276.h" +%include "sx1276.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/sx1276/jsupm_sx1276.i b/src/sx1276/jsupm_sx1276.i index 2911804b..a75f54b3 100644 --- a/src/sx1276/jsupm_sx1276.i +++ b/src/sx1276/jsupm_sx1276.i @@ -2,8 +2,8 @@ %include "../upm.i" %include "cpointer.i" -%include "sx1276.h" +%include "sx1276.hpp" %{ - #include "sx1276.h" + #include "sx1276.hpp" %} diff --git a/src/sx1276/pyupm_sx1276.i b/src/sx1276/pyupm_sx1276.i index 196de39d..03730630 100644 --- a/src/sx1276/pyupm_sx1276.i +++ b/src/sx1276/pyupm_sx1276.i @@ -10,8 +10,8 @@ %pointer_functions(float, floatp); -%include "sx1276.h" +%include "sx1276.hpp" %{ - #include "sx1276.h" + #include "sx1276.hpp" %} diff --git a/src/sx1276/sx1276.cxx b/src/sx1276/sx1276.cxx index 20fa6fdf..de37c084 100644 --- a/src/sx1276/sx1276.cxx +++ b/src/sx1276/sx1276.cxx @@ -33,7 +33,7 @@ #undef JAVACALLBACK #endif -#include "sx1276.h" +#include "sx1276.hpp" using namespace upm; using namespace std; diff --git a/src/sx1276/sx1276.h b/src/sx1276/sx1276.hpp similarity index 100% rename from src/sx1276/sx1276.h rename to src/sx1276/sx1276.hpp diff --git a/src/sx6119/CMakeLists.txt b/src/sx6119/CMakeLists.txt index 6effe43d..459de73d 100644 --- a/src/sx6119/CMakeLists.txt +++ b/src/sx6119/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "sx6119") set (libdescription "upm grove FM receiver") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/sx6119/javaupm_sx6119.i b/src/sx6119/javaupm_sx6119.i index f7e5327d..4bbf6b7b 100644 --- a/src/sx6119/javaupm_sx6119.i +++ b/src/sx6119/javaupm_sx6119.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "sx6119.h" + #include "sx6119.hpp" %} -%include "sx6119.h" +%include "sx6119.hpp" %pragma(java) jniclasscode=%{ diff --git a/src/sx6119/jsupm_sx6119.i b/src/sx6119/jsupm_sx6119.i index 807008f3..eef43815 100644 --- a/src/sx6119/jsupm_sx6119.i +++ b/src/sx6119/jsupm_sx6119.i @@ -2,8 +2,8 @@ %include "../upm.i" %{ - #include "sx6119.h" + #include "sx6119.hpp" %} -%include "sx6119.h" +%include "sx6119.hpp" diff --git a/src/sx6119/pyupm_sx6119.i b/src/sx6119/pyupm_sx6119.i index d98477dc..42cf97bd 100644 --- a/src/sx6119/pyupm_sx6119.i +++ b/src/sx6119/pyupm_sx6119.i @@ -6,8 +6,8 @@ %feature("autodoc", "3"); %{ - #include "sx6119.h" + #include "sx6119.hpp" %} -%include "sx6119.h" +%include "sx6119.hpp" diff --git a/src/sx6119/sx6119.cxx b/src/sx6119/sx6119.cxx index caa8d966..5de0911c 100644 --- a/src/sx6119/sx6119.cxx +++ b/src/sx6119/sx6119.cxx @@ -27,7 +27,7 @@ #include #include -#include "sx6119.h" +#include "sx6119.hpp" using namespace upm; using namespace std; diff --git a/src/sx6119/sx6119.h b/src/sx6119/sx6119.hpp similarity index 100% rename from src/sx6119/sx6119.h rename to src/sx6119/sx6119.hpp diff --git a/src/t3311/CMakeLists.txt b/src/t3311/CMakeLists.txt index 74b48429..8b86bcf2 100644 --- a/src/t3311/CMakeLists.txt +++ b/src/t3311/CMakeLists.txt @@ -1,7 +1,7 @@ set (libname "t3311") set (libdescription "upm module for the Comet System T3311") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) pkg_search_module(MODBUS libmodbus) if (MODBUS_FOUND) diff --git a/src/t3311/javaupm_t3311.i b/src/t3311/javaupm_t3311.i index a383b49e..611a347f 100644 --- a/src/t3311/javaupm_t3311.i +++ b/src/t3311/javaupm_t3311.i @@ -6,10 +6,10 @@ %include "../java_buffer.i" %{ - #include "t3311.h" + #include "t3311.hpp" %} -%include "t3311.h" +%include "t3311.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/t3311/jsupm_t3311.i b/src/t3311/jsupm_t3311.i index 4b07290c..d9e76e40 100644 --- a/src/t3311/jsupm_t3311.i +++ b/src/t3311/jsupm_t3311.i @@ -5,7 +5,7 @@ %pointer_functions(float, floatp); -%include "t3311.h" +%include "t3311.hpp" %{ - #include "t3311.h" + #include "t3311.hpp" %} diff --git a/src/t3311/pyupm_t3311.i b/src/t3311/pyupm_t3311.i index 51f706b7..203517a3 100644 --- a/src/t3311/pyupm_t3311.i +++ b/src/t3311/pyupm_t3311.i @@ -9,7 +9,7 @@ %pointer_functions(float, floatp); -%include "t3311.h" +%include "t3311.hpp" %{ - #include "t3311.h" + #include "t3311.hpp" %} diff --git a/src/t3311/t3311.cxx b/src/t3311/t3311.cxx index 01115566..342ebfa1 100644 --- a/src/t3311/t3311.cxx +++ b/src/t3311/t3311.cxx @@ -29,7 +29,7 @@ #include #include -#include "t3311.h" +#include "t3311.hpp" using namespace upm; using namespace std; diff --git a/src/t3311/t3311.h b/src/t3311/t3311.hpp similarity index 100% rename from src/t3311/t3311.h rename to src/t3311/t3311.hpp diff --git a/src/t6713/CMakeLists.txt b/src/t6713/CMakeLists.txt index 83149760..b610aa9b 100644 --- a/src/t6713/CMakeLists.txt +++ b/src/t6713/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "t6713") set (libdescription "upm Amphenol Telaire 6713 Series CO2 Module") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/t6713/javaupm_t6713.i b/src/t6713/javaupm_t6713.i index c8c068b4..9851bea3 100644 --- a/src/t6713/javaupm_t6713.i +++ b/src/t6713/javaupm_t6713.i @@ -6,10 +6,10 @@ %include "typemaps.i" %{ - #include "t6713.h" + #include "t6713.hpp" %} -%include "t6713.h" +%include "t6713.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/t6713/jsupm_t6713.i b/src/t6713/jsupm_t6713.i index 35572d78..f929b29c 100644 --- a/src/t6713/jsupm_t6713.i +++ b/src/t6713/jsupm_t6713.i @@ -3,7 +3,7 @@ %include "../carrays_uint16_t.i" %{ - #include "t6713.h" + #include "t6713.hpp" %} -%include "t6713.h" +%include "t6713.hpp" diff --git a/src/t6713/pyupm_t6713.i b/src/t6713/pyupm_t6713.i index ad1c338b..ab749163 100644 --- a/src/t6713/pyupm_t6713.i +++ b/src/t6713/pyupm_t6713.i @@ -4,7 +4,7 @@ %feature("autodoc", "3"); -%include "t6713.h" +%include "t6713.hpp" %{ - #include "t6713.h" + #include "t6713.hpp" %} diff --git a/src/t6713/t6713.cxx b/src/t6713/t6713.cxx index ef042ae9..c2c91262 100644 --- a/src/t6713/t6713.cxx +++ b/src/t6713/t6713.cxx @@ -27,7 +27,7 @@ #include #include #include -#include +#include #define T6713_ADDR 0x15 diff --git a/src/t6713/t6713.h b/src/t6713/t6713.hpp similarity index 99% rename from src/t6713/t6713.h rename to src/t6713/t6713.hpp index 79382778..06a973bd 100644 --- a/src/t6713/t6713.h +++ b/src/t6713/t6713.hpp @@ -24,7 +24,7 @@ #include "mraa/i2c.hpp" -#include "upm/iCO2Sensor.h" +#include "upm/iCO2Sensor.hpp" namespace upm { diff --git a/src/ta12200/CMakeLists.txt b/src/ta12200/CMakeLists.txt index 0f3f0ba5..f7e1b0ab 100644 --- a/src/ta12200/CMakeLists.txt +++ b/src/ta12200/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "ta12200") set (libdescription "upm ta12200 current transformer module") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/ta12200/javaupm_ta12200.i b/src/ta12200/javaupm_ta12200.i index 3feb4688..a3fae852 100644 --- a/src/ta12200/javaupm_ta12200.i +++ b/src/ta12200/javaupm_ta12200.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "ta12200.h" + #include "ta12200.hpp" %} -%include "ta12200.h" +%include "ta12200.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/ta12200/jsupm_ta12200.i b/src/ta12200/jsupm_ta12200.i index 519f1ec3..3f90ced4 100644 --- a/src/ta12200/jsupm_ta12200.i +++ b/src/ta12200/jsupm_ta12200.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "ta12200.h" + #include "ta12200.hpp" %} -%include "ta12200.h" +%include "ta12200.hpp" diff --git a/src/ta12200/pyupm_ta12200.i b/src/ta12200/pyupm_ta12200.i index d1838fc8..5ca0db52 100644 --- a/src/ta12200/pyupm_ta12200.i +++ b/src/ta12200/pyupm_ta12200.i @@ -5,7 +5,7 @@ %feature("autodoc", "3"); -%include "ta12200.h" +%include "ta12200.hpp" %{ - #include "ta12200.h" + #include "ta12200.hpp" %} diff --git a/src/ta12200/ta12200.cxx b/src/ta12200/ta12200.cxx index f9d3cb07..67244ad2 100644 --- a/src/ta12200/ta12200.cxx +++ b/src/ta12200/ta12200.cxx @@ -26,7 +26,7 @@ #include #include -#include "ta12200.h" +#include "ta12200.hpp" using namespace upm; using namespace std; diff --git a/src/ta12200/ta12200.h b/src/ta12200/ta12200.hpp similarity index 100% rename from src/ta12200/ta12200.h rename to src/ta12200/ta12200.hpp diff --git a/src/tcs3414cs/CMakeLists.txt b/src/tcs3414cs/CMakeLists.txt index fbdebd97..7d68dc64 100644 --- a/src/tcs3414cs/CMakeLists.txt +++ b/src/tcs3414cs/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "tcs3414cs") set (libdescription "I2C Color sensor") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/tcs3414cs/javaupm_tcs3414cs.i b/src/tcs3414cs/javaupm_tcs3414cs.i index 61724e1c..1389d3f5 100644 --- a/src/tcs3414cs/javaupm_tcs3414cs.i +++ b/src/tcs3414cs/javaupm_tcs3414cs.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "tcs3414cs.h" + #include "tcs3414cs.hpp" %} -%include "tcs3414cs.h" +%include "tcs3414cs.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/tcs3414cs/jsupm_tcs3414cs.i b/src/tcs3414cs/jsupm_tcs3414cs.i index 58fa1bf2..db7f4535 100644 --- a/src/tcs3414cs/jsupm_tcs3414cs.i +++ b/src/tcs3414cs/jsupm_tcs3414cs.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "tcs3414cs.h" + #include "tcs3414cs.hpp" %} -%include "tcs3414cs.h" +%include "tcs3414cs.hpp" diff --git a/src/tcs3414cs/pyupm_tcs3414cs.i b/src/tcs3414cs/pyupm_tcs3414cs.i index 243c05c5..8022fbbc 100644 --- a/src/tcs3414cs/pyupm_tcs3414cs.i +++ b/src/tcs3414cs/pyupm_tcs3414cs.i @@ -5,7 +5,7 @@ %feature("autodoc", "3"); -%include "tcs3414cs.h" +%include "tcs3414cs.hpp" %{ - #include "tcs3414cs.h" + #include "tcs3414cs.hpp" %} diff --git a/src/tcs3414cs/tcs3414cs.cxx b/src/tcs3414cs/tcs3414cs.cxx index 28defac3..2d58f9a5 100644 --- a/src/tcs3414cs/tcs3414cs.cxx +++ b/src/tcs3414cs/tcs3414cs.cxx @@ -31,7 +31,7 @@ #include #include -#include "tcs3414cs.h" +#include "tcs3414cs.hpp" using namespace upm; diff --git a/src/tcs3414cs/tcs3414cs.h b/src/tcs3414cs/tcs3414cs.hpp similarity index 100% rename from src/tcs3414cs/tcs3414cs.h rename to src/tcs3414cs/tcs3414cs.hpp diff --git a/src/teams/CMakeLists.txt b/src/teams/CMakeLists.txt index 8122e265..ec0974e8 100644 --- a/src/teams/CMakeLists.txt +++ b/src/teams/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "teams") set (libdescription "upm Veris TEAMS Temperature transmitter") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/teams/javaupm_teams.i b/src/teams/javaupm_teams.i index ddf62b30..eb8c43c0 100644 --- a/src/teams/javaupm_teams.i +++ b/src/teams/javaupm_teams.i @@ -2,9 +2,9 @@ %include "../upm.i" %include "std_string.i" -%include "teams.h" +%include "teams.hpp" %{ - #include "teams.h" + #include "teams.hpp" %} %pragma(java) jniclasscode=%{ diff --git a/src/teams/jsupm_teams.i b/src/teams/jsupm_teams.i index 73a8115e..97d6628e 100644 --- a/src/teams/jsupm_teams.i +++ b/src/teams/jsupm_teams.i @@ -3,8 +3,8 @@ %include "std_string.i" %{ - #include "teams.h" + #include "teams.hpp" %} -%include "teams.h" +%include "teams.hpp" diff --git a/src/teams/pyupm_teams.i b/src/teams/pyupm_teams.i index 94d0d0b1..efce3a1c 100644 --- a/src/teams/pyupm_teams.i +++ b/src/teams/pyupm_teams.i @@ -7,7 +7,7 @@ %feature("autodoc", "3"); %{ - #include "teams.h" + #include "teams.hpp" %} -%include "teams.h" +%include "teams.hpp" diff --git a/src/teams/teams.cxx b/src/teams/teams.cxx index 794100a8..eab59c19 100644 --- a/src/teams/teams.cxx +++ b/src/teams/teams.cxx @@ -24,7 +24,7 @@ #include -#include "teams.h" +#include "teams.hpp" using namespace upm; using namespace std; diff --git a/src/teams/teams.h b/src/teams/teams.hpp similarity index 100% rename from src/teams/teams.h rename to src/teams/teams.hpp diff --git a/src/tex00/CMakeLists.txt b/src/tex00/CMakeLists.txt index eb393099..210deab7 100644 --- a/src/tex00/CMakeLists.txt +++ b/src/tex00/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "tex00") set (libdescription "upm Veris TEX00 Temperature thermistors") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/tex00/javaupm_tex00.i b/src/tex00/javaupm_tex00.i index 0ed19386..f59ddd42 100644 --- a/src/tex00/javaupm_tex00.i +++ b/src/tex00/javaupm_tex00.i @@ -2,9 +2,9 @@ %include "../upm.i" %include "std_string.i" -%include "tex00.h" +%include "tex00.hpp" %{ - #include "tex00.h" + #include "tex00.hpp" %} %pragma(java) jniclasscode=%{ diff --git a/src/tex00/jsupm_tex00.i b/src/tex00/jsupm_tex00.i index 4e185b4d..3ddae3b0 100644 --- a/src/tex00/jsupm_tex00.i +++ b/src/tex00/jsupm_tex00.i @@ -3,8 +3,8 @@ %include "std_string.i" %{ - #include "tex00.h" + #include "tex00.hpp" %} -%include "tex00.h" +%include "tex00.hpp" diff --git a/src/tex00/pyupm_tex00.i b/src/tex00/pyupm_tex00.i index dd9bc10b..220106a9 100644 --- a/src/tex00/pyupm_tex00.i +++ b/src/tex00/pyupm_tex00.i @@ -7,7 +7,7 @@ %feature("autodoc", "3"); %{ - #include "tex00.h" + #include "tex00.hpp" %} -%include "tex00.h" +%include "tex00.hpp" diff --git a/src/tex00/tex00.cxx b/src/tex00/tex00.cxx index f16133c8..2a3c1ad8 100644 --- a/src/tex00/tex00.cxx +++ b/src/tex00/tex00.cxx @@ -24,7 +24,7 @@ #include #include -#include "tex00.h" +#include "tex00.hpp" using namespace upm; using namespace std; diff --git a/src/tex00/tex00.h b/src/tex00/tex00.hpp similarity index 100% rename from src/tex00/tex00.h rename to src/tex00/tex00.hpp diff --git a/src/th02/CMakeLists.txt b/src/th02/CMakeLists.txt index 94426f43..5ceb30e4 100644 --- a/src/th02/CMakeLists.txt +++ b/src/th02/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "th02") set (libdescription "Temperature and Humidity Sensor Pro") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/th02/javaupm_th02.i b/src/th02/javaupm_th02.i index d16ae4fa..d20e8993 100644 --- a/src/th02/javaupm_th02.i +++ b/src/th02/javaupm_th02.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "th02.h" + #include "th02.hpp" %} -%include "th02.h" +%include "th02.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/th02/jsupm_th02.i b/src/th02/jsupm_th02.i index dcf48cf9..8ab407f8 100644 --- a/src/th02/jsupm_th02.i +++ b/src/th02/jsupm_th02.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "th02.h" + #include "th02.hpp" %} -%include "th02.h" +%include "th02.hpp" diff --git a/src/th02/pyupm_th02.i b/src/th02/pyupm_th02.i index b280c7d5..77b3688e 100644 --- a/src/th02/pyupm_th02.i +++ b/src/th02/pyupm_th02.i @@ -5,7 +5,7 @@ %feature("autodoc", "3"); -%include "th02.h" +%include "th02.hpp" %{ - #include "th02.h" + #include "th02.hpp" %} diff --git a/src/th02/th02.cxx b/src/th02/th02.cxx index ae7230b6..5e79e068 100644 --- a/src/th02/th02.cxx +++ b/src/th02/th02.cxx @@ -30,7 +30,7 @@ #include #include -#include "th02.h" +#include "th02.hpp" using namespace std; using namespace upm; diff --git a/src/th02/th02.h b/src/th02/th02.hpp similarity index 100% rename from src/th02/th02.h rename to src/th02/th02.hpp diff --git a/src/tm1637/CMakeLists.txt b/src/tm1637/CMakeLists.txt index 6138d2e2..0b0176d5 100644 --- a/src/tm1637/CMakeLists.txt +++ b/src/tm1637/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "tm1637") set (libdescription "C++ API for the TM1637 7-segment display") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/tm1637/javaupm_tm1637.i b/src/tm1637/javaupm_tm1637.i index a0e55467..b6d283f8 100644 --- a/src/tm1637/javaupm_tm1637.i +++ b/src/tm1637/javaupm_tm1637.i @@ -11,10 +11,10 @@ %apply uint8_t *INPUT { uint8_t *digits } %{ - #include "tm1637.h" + #include "tm1637.hpp" %} -%include "tm1637.h" +%include "tm1637.hpp" %pragma(java) jniclasscode=%{ diff --git a/src/tm1637/jsupm_tm1637.i b/src/tm1637/jsupm_tm1637.i index 57992e06..3a71411d 100644 --- a/src/tm1637/jsupm_tm1637.i +++ b/src/tm1637/jsupm_tm1637.i @@ -8,8 +8,8 @@ %rename("writeString") write(std::string digits); %{ - #include "tm1637.h" + #include "tm1637.hpp" %} -%include "tm1637.h" +%include "tm1637.hpp" diff --git a/src/tm1637/pyupm_tm1637.i b/src/tm1637/pyupm_tm1637.i index fe347eb4..a607e707 100644 --- a/src/tm1637/pyupm_tm1637.i +++ b/src/tm1637/pyupm_tm1637.i @@ -7,6 +7,6 @@ %varargs(4, int digit = 0) write; %{ - #include "tm1637.h" + #include "tm1637.hpp" %} -%include "tm1637.h" +%include "tm1637.hpp" diff --git a/src/tm1637/tm1637.cxx b/src/tm1637/tm1637.cxx index 74507f28..b2c27223 100644 --- a/src/tm1637/tm1637.cxx +++ b/src/tm1637/tm1637.cxx @@ -24,7 +24,7 @@ #include #include -#include "tm1637.h" +#include "tm1637.hpp" #include const uint8_t m_brkt[2] = {0x39, 0x0f}; diff --git a/src/tm1637/tm1637.h b/src/tm1637/tm1637.hpp similarity index 100% rename from src/tm1637/tm1637.h rename to src/tm1637/tm1637.hpp diff --git a/src/tsl2561/CMakeLists.txt b/src/tsl2561/CMakeLists.txt index 9434da3a..1a396399 100644 --- a/src/tsl2561/CMakeLists.txt +++ b/src/tsl2561/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "tsl2561") set (libdescription "upm tsl2561") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/tsl2561/javaupm_tsl2561.i b/src/tsl2561/javaupm_tsl2561.i index 2d542e6f..78606b5f 100644 --- a/src/tsl2561/javaupm_tsl2561.i +++ b/src/tsl2561/javaupm_tsl2561.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "tsl2561.h" + #include "tsl2561.hpp" %} -%include "tsl2561.h" +%include "tsl2561.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/tsl2561/jsupm_tsl2561.i b/src/tsl2561/jsupm_tsl2561.i index e5403d13..d3447309 100644 --- a/src/tsl2561/jsupm_tsl2561.i +++ b/src/tsl2561/jsupm_tsl2561.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "tsl2561.h" + #include "tsl2561.hpp" %} -%include "tsl2561.h" +%include "tsl2561.hpp" diff --git a/src/tsl2561/pyupm_tsl2561.i b/src/tsl2561/pyupm_tsl2561.i index 1e4ac905..56189bf9 100644 --- a/src/tsl2561/pyupm_tsl2561.i +++ b/src/tsl2561/pyupm_tsl2561.i @@ -9,7 +9,7 @@ %include "tsl2561_doc.i" #endif -%include "tsl2561.h" +%include "tsl2561.hpp" %{ - #include "tsl2561.h" + #include "tsl2561.hpp" %} diff --git a/src/tsl2561/tsl2561.cxx b/src/tsl2561/tsl2561.cxx index 7bbbfc0e..14eb673a 100644 --- a/src/tsl2561/tsl2561.cxx +++ b/src/tsl2561/tsl2561.cxx @@ -30,7 +30,7 @@ #include #include #include -#include "tsl2561.h" +#include "tsl2561.hpp" using namespace upm; diff --git a/src/tsl2561/tsl2561.h b/src/tsl2561/tsl2561.hpp similarity index 100% rename from src/tsl2561/tsl2561.h rename to src/tsl2561/tsl2561.hpp diff --git a/src/ttp223/CMakeLists.txt b/src/ttp223/CMakeLists.txt index 33341e13..3ae45946 100644 --- a/src/ttp223/CMakeLists.txt +++ b/src/ttp223/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "ttp223") set (libdescription "upm ttp223") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/ttp223/javaupm_ttp223.i b/src/ttp223/javaupm_ttp223.i index c6b77c6b..c3b5e29d 100644 --- a/src/ttp223/javaupm_ttp223.i +++ b/src/ttp223/javaupm_ttp223.i @@ -6,10 +6,10 @@ %{ - #include "ttp223.h" + #include "ttp223.hpp" %} -%include "ttp223.h" +%include "ttp223.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/ttp223/jsupm_ttp223.i b/src/ttp223/jsupm_ttp223.i index f083dd8f..d408deab 100644 --- a/src/ttp223/jsupm_ttp223.i +++ b/src/ttp223/jsupm_ttp223.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "ttp223.h" + #include "ttp223.hpp" %} -%include "ttp223.h" +%include "ttp223.hpp" diff --git a/src/ttp223/pyupm_ttp223.i b/src/ttp223/pyupm_ttp223.i index 8037e916..8f2194f3 100644 --- a/src/ttp223/pyupm_ttp223.i +++ b/src/ttp223/pyupm_ttp223.i @@ -5,8 +5,8 @@ %feature("autodoc", "3"); -%include "ttp223.h" +%include "ttp223.hpp" %{ - #include "ttp223.h" + #include "ttp223.hpp" %} diff --git a/src/ttp223/ttp223.cxx b/src/ttp223/ttp223.cxx index c20e468a..7e2775dc 100644 --- a/src/ttp223/ttp223.cxx +++ b/src/ttp223/ttp223.cxx @@ -25,7 +25,7 @@ #include #include -#include "ttp223.h" +#include "ttp223.hpp" using namespace upm; diff --git a/src/ttp223/ttp223.h b/src/ttp223/ttp223.hpp similarity index 100% rename from src/ttp223/ttp223.h rename to src/ttp223/ttp223.hpp diff --git a/src/ublox6/CMakeLists.txt b/src/ublox6/CMakeLists.txt index 5db12669..91ba1b66 100644 --- a/src/ublox6/CMakeLists.txt +++ b/src/ublox6/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "ublox6") set (libdescription "upm u-blox 6 GPS UART support module") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/ublox6/javaupm_ublox6.i b/src/ublox6/javaupm_ublox6.i index c5f0777d..d8f6e5ac 100644 --- a/src/ublox6/javaupm_ublox6.i +++ b/src/ublox6/javaupm_ublox6.i @@ -3,11 +3,11 @@ %include "../java_buffer.i" %{ - #include "ublox6.h" + #include "ublox6.hpp" speed_t int_B9600 = B9600; %} -%include "ublox6.h" +%include "ublox6.hpp" speed_t int_B9600 = B9600; %pragma(java) jniclasscode=%{ diff --git a/src/ublox6/jsupm_ublox6.i b/src/ublox6/jsupm_ublox6.i index 12c75528..e2556817 100644 --- a/src/ublox6/jsupm_ublox6.i +++ b/src/ublox6/jsupm_ublox6.i @@ -4,10 +4,10 @@ %include "carrays.i" %{ - #include "ublox6.h" + #include "ublox6.hpp" speed_t int_B9600 = B9600; %} -%include "ublox6.h" +%include "ublox6.hpp" speed_t int_B9600 = B9600; %array_class(char, charArray); diff --git a/src/ublox6/pyupm_ublox6.i b/src/ublox6/pyupm_ublox6.i index 8567d509..dc1c378f 100644 --- a/src/ublox6/pyupm_ublox6.i +++ b/src/ublox6/pyupm_ublox6.i @@ -8,10 +8,10 @@ %feature("autodoc", "3"); %{ - #include "ublox6.h" + #include "ublox6.hpp" speed_t int_B9600 = B9600; %} -%include "ublox6.h" +%include "ublox6.hpp" speed_t int_B9600 = B9600; %array_class(char, charArray); diff --git a/src/ublox6/ublox6.cxx b/src/ublox6/ublox6.cxx index b9d15c5f..f9eb9669 100644 --- a/src/ublox6/ublox6.cxx +++ b/src/ublox6/ublox6.cxx @@ -26,7 +26,7 @@ #include #include -#include "ublox6.h" +#include "ublox6.hpp" using namespace upm; using namespace std; diff --git a/src/ublox6/ublox6.h b/src/ublox6/ublox6.hpp similarity index 100% rename from src/ublox6/ublox6.h rename to src/ublox6/ublox6.hpp diff --git a/src/uln200xa/CMakeLists.txt b/src/uln200xa/CMakeLists.txt index 3ac82ff5..88a732d2 100644 --- a/src/uln200xa/CMakeLists.txt +++ b/src/uln200xa/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "uln200xa") set (libdescription "upm uln200xa darlington stepper driver") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/uln200xa/javaupm_uln200xa.i b/src/uln200xa/javaupm_uln200xa.i index 0805ae30..3b11bf2a 100644 --- a/src/uln200xa/javaupm_uln200xa.i +++ b/src/uln200xa/javaupm_uln200xa.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "uln200xa.h" + #include "uln200xa.hpp" %} -%include "uln200xa.h" +%include "uln200xa.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/uln200xa/jsupm_uln200xa.i b/src/uln200xa/jsupm_uln200xa.i index 48127af8..a7ee87d4 100644 --- a/src/uln200xa/jsupm_uln200xa.i +++ b/src/uln200xa/jsupm_uln200xa.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "uln200xa.h" + #include "uln200xa.hpp" %} -%include "uln200xa.h" +%include "uln200xa.hpp" diff --git a/src/uln200xa/pyupm_uln200xa.i b/src/uln200xa/pyupm_uln200xa.i index 6385933c..60a16b76 100644 --- a/src/uln200xa/pyupm_uln200xa.i +++ b/src/uln200xa/pyupm_uln200xa.i @@ -5,7 +5,7 @@ %feature("autodoc", "3"); -%include "uln200xa.h" +%include "uln200xa.hpp" %{ - #include "uln200xa.h" + #include "uln200xa.hpp" %} diff --git a/src/uln200xa/uln200xa.cxx b/src/uln200xa/uln200xa.cxx index 068c7665..49a3dda8 100644 --- a/src/uln200xa/uln200xa.cxx +++ b/src/uln200xa/uln200xa.cxx @@ -26,7 +26,7 @@ #include #include -#include "uln200xa.h" +#include "uln200xa.hpp" using namespace upm; using namespace std; diff --git a/src/uln200xa/uln200xa.h b/src/uln200xa/uln200xa.hpp similarity index 100% rename from src/uln200xa/uln200xa.h rename to src/uln200xa/uln200xa.hpp diff --git a/src/upm/CMakeLists.txt b/src/upm/CMakeLists.txt index e275021f..cd9b4793 100644 --- a/src/upm/CMakeLists.txt +++ b/src/upm/CMakeLists.txt @@ -1,10 +1,8 @@ -install (DIRECTORY . DESTINATION include/upm FILES_MATCHING PATTERN "*.h") +install (DIRECTORY . DESTINATION include/upm FILES_MATCHING PATTERN "*.hpp") if (BUILDSWIGJAVA AND BUILDSWIG) - set (libname "interfaces") - set (libdescription "upm interfaces") - set (module_src ${libname}.cxx) -# set (module_h ${libname}.h) - upm_module_init() + set (libname "interfaces") + set (libdescription "upm interfaces") + set (module_src ${libname}.cxx) +# set (module_hpp ${libname}.hpp) + upm_module_init() endif() - - diff --git a/src/upm/iADC.h b/src/upm/iADC.hpp similarity index 98% rename from src/upm/iADC.h rename to src/upm/iADC.hpp index fbb32f2b..ad127edd 100644 --- a/src/upm/iADC.h +++ b/src/upm/iADC.hpp @@ -26,7 +26,7 @@ #pragma once #include #include "mraa/common.h" -#include "iModuleStatus.h" +#include "iModuleStatus.hpp" namespace upm diff --git a/src/upm/iCO2Sensor.h b/src/upm/iCO2Sensor.hpp similarity index 97% rename from src/upm/iCO2Sensor.h rename to src/upm/iCO2Sensor.hpp index e8e789ca..cbb1460b 100644 --- a/src/upm/iCO2Sensor.h +++ b/src/upm/iCO2Sensor.hpp @@ -24,7 +24,7 @@ #pragma once -#include "iModuleStatus.h" +#include "iModuleStatus.hpp" namespace upm diff --git a/src/upm/iHumiditySensor.h b/src/upm/iHumiditySensor.hpp similarity index 97% rename from src/upm/iHumiditySensor.h rename to src/upm/iHumiditySensor.hpp index 4b555d6e..360d91e5 100644 --- a/src/upm/iHumiditySensor.h +++ b/src/upm/iHumiditySensor.hpp @@ -23,7 +23,7 @@ */ #pragma once -#include "iModuleStatus.h" +#include "iModuleStatus.hpp" namespace upm { diff --git a/src/upm/iLightController.h b/src/upm/iLightController.hpp similarity index 98% rename from src/upm/iLightController.h rename to src/upm/iLightController.hpp index d0b8dee3..395cbf4f 100644 --- a/src/upm/iLightController.h +++ b/src/upm/iLightController.hpp @@ -24,7 +24,7 @@ #pragma once -#include "iModuleStatus.h" +#include "iModuleStatus.hpp" namespace upm { diff --git a/src/upm/iLightSensor.h b/src/upm/iLightSensor.hpp similarity index 98% rename from src/upm/iLightSensor.h rename to src/upm/iLightSensor.hpp index 1519436a..1d58e622 100644 --- a/src/upm/iLightSensor.h +++ b/src/upm/iLightSensor.hpp @@ -26,7 +26,7 @@ #pragma once #include -#include "iModuleStatus.h" +#include "iModuleStatus.hpp" namespace upm { diff --git a/src/upm/iModuleStatus.h b/src/upm/iModuleStatus.hpp similarity index 100% rename from src/upm/iModuleStatus.h rename to src/upm/iModuleStatus.hpp diff --git a/src/upm/iPressureSensor.h b/src/upm/iPressureSensor.hpp similarity index 98% rename from src/upm/iPressureSensor.h rename to src/upm/iPressureSensor.hpp index 1628f18a..63688b1d 100644 --- a/src/upm/iPressureSensor.h +++ b/src/upm/iPressureSensor.hpp @@ -27,7 +27,7 @@ #include #include "mraa/common.h" -#include "iModuleStatus.h" +#include "iModuleStatus.hpp" namespace upm { diff --git a/src/upm/iTemperatureSensor.h b/src/upm/iTemperatureSensor.hpp similarity index 98% rename from src/upm/iTemperatureSensor.h rename to src/upm/iTemperatureSensor.hpp index 978015aa..7b393e86 100644 --- a/src/upm/iTemperatureSensor.h +++ b/src/upm/iTemperatureSensor.hpp @@ -23,7 +23,7 @@ */ #pragma once -#include "iModuleStatus.h" +#include "iModuleStatus.hpp" namespace upm { diff --git a/src/upm/interfaces.cxx b/src/upm/interfaces.cxx index 9a79a68c..e76f7062 100644 --- a/src/upm/interfaces.cxx +++ b/src/upm/interfaces.cxx @@ -1 +1 @@ -#include "upm/iLightSensor.h" +#include "upm/iLightSensor.hpp" diff --git a/src/upm/javaupm_interfaces.i b/src/upm/javaupm_interfaces.i index 51daa1c8..42b94505 100644 --- a/src/upm/javaupm_interfaces.i +++ b/src/upm/javaupm_interfaces.i @@ -6,10 +6,10 @@ %{ - #include "../upm/iLightSensor.h" - #include "../upm/iLightController.h" + #include "../upm/iLightSensor.hpp" + #include "../upm/iLightController.hpp" %} -%include "iModuleStatus.h" -%include "iLightSensor.h" -%include "iLightController.h" +%include "iModuleStatus.hpp" +%include "iLightSensor.hpp" +%include "iLightController.hpp" diff --git a/src/upm/javaupm_light_sensor.i b/src/upm/javaupm_light_sensor.i index adf5f12a..d285ee83 100644 --- a/src/upm/javaupm_light_sensor.i +++ b/src/upm/javaupm_light_sensor.i @@ -1,15 +1,15 @@ %module(directors="1") javaupm_light_sensor %{ - #include "iLightSensor.h" + #include "iLightSensor.hpp" %} /* -%include "../upm/iModuleStatus.h" +%include "../upm/iModuleStatus.hpp" */ -%include "iLightSensor.h" +%include "iLightSensor.hpp" %feature("director") IModuleStatus; %feature("director") ILightSensor; -%include "iLightSensor.h" +%include "iLightSensor.hpp" diff --git a/src/upm/jsupm_interfaces.i b/src/upm/jsupm_interfaces.i index d503a9c8..4cdfda6f 100644 --- a/src/upm/jsupm_interfaces.i +++ b/src/upm/jsupm_interfaces.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "../upm/iLightSensor.h" - #include "../upm/iLightController.h" + #include "../upm/iLightSensor.hpp" + #include "../upm/iLightController.hpp" %} -%include "iModuleStatus.h" -%include "iLightSensor.h" -%include "iLightController.h" +%include "iModuleStatus.hpp" +%include "iLightSensor.hpp" +%include "iLightController.hpp" diff --git a/src/upm/pyupm_interfaces.i b/src/upm/pyupm_interfaces.i index 8712aedf..2914ee49 100644 --- a/src/upm/pyupm_interfaces.i +++ b/src/upm/pyupm_interfaces.i @@ -4,10 +4,10 @@ %feature("autodoc", "3"); %{ - #include "../upm/iLightSensor.h" - #include "../upm/iLightController.h" + #include "../upm/iLightSensor.hpp" + #include "../upm/iLightController.hpp" %} -%include "iModuleStatus.h" -%include "iLightSensor.h" -%include "iLightController.h" +%include "iModuleStatus.hpp" +%include "iLightSensor.hpp" +%include "iLightController.hpp" diff --git a/src/urm37/CMakeLists.txt b/src/urm37/CMakeLists.txt index 91a490e6..8db47937 100644 --- a/src/urm37/CMakeLists.txt +++ b/src/urm37/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "urm37") set (libdescription "upm DFRobot URM37 Ultrasonic ranger") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/urm37/javaupm_urm37.i b/src/urm37/javaupm_urm37.i index 725bafec..7d169749 100644 --- a/src/urm37/javaupm_urm37.i +++ b/src/urm37/javaupm_urm37.i @@ -3,10 +3,10 @@ %include "std_string.i" %{ - #include "urm37.h" + #include "urm37.hpp" %} -%include "urm37.h" +%include "urm37.hpp" %pragma(java) jniclasscode=%{ diff --git a/src/urm37/jsupm_urm37.i b/src/urm37/jsupm_urm37.i index bc029464..744978a9 100644 --- a/src/urm37/jsupm_urm37.i +++ b/src/urm37/jsupm_urm37.i @@ -3,8 +3,8 @@ %include "std_string.i" %{ - #include "urm37.h" + #include "urm37.hpp" %} -%include "urm37.h" +%include "urm37.hpp" diff --git a/src/urm37/pyupm_urm37.i b/src/urm37/pyupm_urm37.i index 4635dbb4..23ebae4d 100644 --- a/src/urm37/pyupm_urm37.i +++ b/src/urm37/pyupm_urm37.i @@ -7,7 +7,7 @@ %feature("autodoc", "3"); %{ - #include "urm37.h" + #include "urm37.hpp" %} -%include "urm37.h" +%include "urm37.hpp" diff --git a/src/urm37/urm37.cxx b/src/urm37/urm37.cxx index 85305d31..faa68f91 100644 --- a/src/urm37/urm37.cxx +++ b/src/urm37/urm37.cxx @@ -24,7 +24,7 @@ #include -#include "urm37.h" +#include "urm37.hpp" using namespace upm; using namespace std; diff --git a/src/urm37/urm37.h b/src/urm37/urm37.hpp similarity index 100% rename from src/urm37/urm37.h rename to src/urm37/urm37.hpp diff --git a/src/vcap/CMakeLists.txt b/src/vcap/CMakeLists.txt index 4d596443..2bb07ae6 100644 --- a/src/vcap/CMakeLists.txt +++ b/src/vcap/CMakeLists.txt @@ -1,7 +1,7 @@ set (libname "vcap") set (libdescription "upm Video Frame Capture and image save utility") set (module_src ${libname}.cxx) -set (module_h ${libname}.hpp) +set (module_hpp ${libname}.hpp) set (reqlibname "jpeg") upm_module_init() target_link_libraries(${libname} jpeg) diff --git a/src/waterlevel/CMakeLists.txt b/src/waterlevel/CMakeLists.txt index 4f985e26..f92eddcc 100644 --- a/src/waterlevel/CMakeLists.txt +++ b/src/waterlevel/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "waterlevel") set (libdescription "upm waterlevel sensor module") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init("-lrt") diff --git a/src/waterlevel/javaupm_waterlevel.i b/src/waterlevel/javaupm_waterlevel.i index 7365c37a..b9e9f2d8 100644 --- a/src/waterlevel/javaupm_waterlevel.i +++ b/src/waterlevel/javaupm_waterlevel.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "waterlevel.h" + #include "waterlevel.hpp" %} -%include "waterlevel.h" +%include "waterlevel.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/waterlevel/jsupm_waterlevel.i b/src/waterlevel/jsupm_waterlevel.i index 44a715e8..7eef6828 100644 --- a/src/waterlevel/jsupm_waterlevel.i +++ b/src/waterlevel/jsupm_waterlevel.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "waterlevel.h" + #include "waterlevel.hpp" %} -%include "waterlevel.h" +%include "waterlevel.hpp" diff --git a/src/waterlevel/pyupm_waterlevel.i b/src/waterlevel/pyupm_waterlevel.i index 75b6bdad..40f98d45 100644 --- a/src/waterlevel/pyupm_waterlevel.i +++ b/src/waterlevel/pyupm_waterlevel.i @@ -5,7 +5,7 @@ %feature("autodoc", "3"); -%include "waterlevel.h" +%include "waterlevel.hpp" %{ - #include "waterlevel.h" + #include "waterlevel.hpp" %} diff --git a/src/waterlevel/waterlevel.cxx b/src/waterlevel/waterlevel.cxx index 8a060196..02db04f3 100644 --- a/src/waterlevel/waterlevel.cxx +++ b/src/waterlevel/waterlevel.cxx @@ -24,7 +24,7 @@ #include #include -#include "waterlevel.h" +#include "waterlevel.hpp" using namespace upm; diff --git a/src/waterlevel/waterlevel.h b/src/waterlevel/waterlevel.hpp similarity index 100% rename from src/waterlevel/waterlevel.h rename to src/waterlevel/waterlevel.hpp diff --git a/src/wheelencoder/CMakeLists.txt b/src/wheelencoder/CMakeLists.txt index 9528920a..c11f9751 100644 --- a/src/wheelencoder/CMakeLists.txt +++ b/src/wheelencoder/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "wheelencoder") set (libdescription "upm DFRobot wheelencoder") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/wheelencoder/javaupm_wheelencoder.i b/src/wheelencoder/javaupm_wheelencoder.i index 2b29f35e..7baff367 100644 --- a/src/wheelencoder/javaupm_wheelencoder.i +++ b/src/wheelencoder/javaupm_wheelencoder.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "wheelencoder.h" + #include "wheelencoder.hpp" %} -%include "wheelencoder.h" +%include "wheelencoder.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/wheelencoder/jsupm_wheelencoder.i b/src/wheelencoder/jsupm_wheelencoder.i index ded5481b..bd6bd12f 100644 --- a/src/wheelencoder/jsupm_wheelencoder.i +++ b/src/wheelencoder/jsupm_wheelencoder.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "wheelencoder.h" + #include "wheelencoder.hpp" %} -%include "wheelencoder.h" +%include "wheelencoder.hpp" diff --git a/src/wheelencoder/pyupm_wheelencoder.i b/src/wheelencoder/pyupm_wheelencoder.i index 9cfab7e1..46df2f01 100644 --- a/src/wheelencoder/pyupm_wheelencoder.i +++ b/src/wheelencoder/pyupm_wheelencoder.i @@ -5,7 +5,7 @@ %feature("autodoc", "3"); -%include "wheelencoder.h" +%include "wheelencoder.hpp" %{ - #include "wheelencoder.h" + #include "wheelencoder.hpp" %} diff --git a/src/wheelencoder/wheelencoder.cxx b/src/wheelencoder/wheelencoder.cxx index ae48c1db..ffcf709f 100644 --- a/src/wheelencoder/wheelencoder.cxx +++ b/src/wheelencoder/wheelencoder.cxx @@ -27,7 +27,7 @@ #ifdef JAVACALLBACK #undef JAVACALLBACK #endif -#include "wheelencoder.h" +#include "wheelencoder.hpp" using namespace upm; using namespace std; diff --git a/src/wheelencoder/wheelencoder.h b/src/wheelencoder/wheelencoder.hpp similarity index 100% rename from src/wheelencoder/wheelencoder.h rename to src/wheelencoder/wheelencoder.hpp diff --git a/src/wt5001/CMakeLists.txt b/src/wt5001/CMakeLists.txt index f70c82be..d0d6e50d 100644 --- a/src/wt5001/CMakeLists.txt +++ b/src/wt5001/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "wt5001") set (libdescription "upm grove serial mp3 (wt5001) module") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/wt5001/javaupm_wt5001.i b/src/wt5001/javaupm_wt5001.i index fa38c569..dd9c9dca 100644 --- a/src/wt5001/javaupm_wt5001.i +++ b/src/wt5001/javaupm_wt5001.i @@ -14,7 +14,7 @@ %apply uint8_t *OUTPUT { uint8_t *hour, uint8_t *minute, uint8_t *second }; %{ - #include "wt5001.h" + #include "wt5001.hpp" speed_t int_B9600 = B9600; %} @@ -30,7 +30,7 @@ READDATA_EXCEPTION(getNumFiles(WT5001_PLAYSOURCE_T psrc)) %ignore getCurrentFile(uint16_t *curf); READDATA_EXCEPTION(getCurrentFile()) -%include "wt5001.h" +%include "wt5001.hpp" speed_t int_B9600 = B9600; %pragma(java) jniclasscode=%{ diff --git a/src/wt5001/jsupm_wt5001.i b/src/wt5001/jsupm_wt5001.i index c53fc575..336e693a 100644 --- a/src/wt5001/jsupm_wt5001.i +++ b/src/wt5001/jsupm_wt5001.i @@ -4,9 +4,9 @@ %include "../carrays_uint16_t.i" %{ - #include "wt5001.h" + #include "wt5001.hpp" speed_t int_B9600 = B9600; %} -%include "wt5001.h" +%include "wt5001.hpp" speed_t int_B9600 = B9600; diff --git a/src/wt5001/pyupm_wt5001.i b/src/wt5001/pyupm_wt5001.i index aa0089d6..a074be45 100644 --- a/src/wt5001/pyupm_wt5001.i +++ b/src/wt5001/pyupm_wt5001.i @@ -13,8 +13,8 @@ %feature("autodoc", "3"); %{ - #include "wt5001.h" + #include "wt5001.hpp" speed_t int_B9600 = B9600; %} -%include "wt5001.h" +%include "wt5001.hpp" speed_t int_B9600 = B9600; diff --git a/src/wt5001/wt5001.cxx b/src/wt5001/wt5001.cxx index e4d18ba4..9d2e61e5 100644 --- a/src/wt5001/wt5001.cxx +++ b/src/wt5001/wt5001.cxx @@ -27,7 +27,7 @@ #include #include -#include "wt5001.h" +#include "wt5001.hpp" using namespace upm; using namespace std; diff --git a/src/wt5001/wt5001.h b/src/wt5001/wt5001.hpp similarity index 100% rename from src/wt5001/wt5001.h rename to src/wt5001/wt5001.hpp diff --git a/src/xbee/CMakeLists.txt b/src/xbee/CMakeLists.txt index 3f46f2d6..7c0c9bcf 100644 --- a/src/xbee/CMakeLists.txt +++ b/src/xbee/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "xbee") set (libdescription "upm XBee serial module") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/xbee/javaupm_xbee.i b/src/xbee/javaupm_xbee.i index c886424b..95d7cea0 100644 --- a/src/xbee/javaupm_xbee.i +++ b/src/xbee/javaupm_xbee.i @@ -4,10 +4,10 @@ %include "std_string.i" %{ - #include "xbee.h" + #include "xbee.hpp" %} -%include "xbee.h" +%include "xbee.hpp" %array_class(char, charArray); %pragma(java) jniclasscode=%{ diff --git a/src/xbee/jsupm_xbee.i b/src/xbee/jsupm_xbee.i index f71f0ce3..1d7339dd 100644 --- a/src/xbee/jsupm_xbee.i +++ b/src/xbee/jsupm_xbee.i @@ -4,8 +4,8 @@ %include "std_string.i" %{ - #include "xbee.h" + #include "xbee.hpp" %} -%include "xbee.h" +%include "xbee.hpp" %array_class(char, charArray); diff --git a/src/xbee/pyupm_xbee.i b/src/xbee/pyupm_xbee.i index a895f54c..12433dee 100644 --- a/src/xbee/pyupm_xbee.i +++ b/src/xbee/pyupm_xbee.i @@ -8,7 +8,7 @@ %feature("autodoc", "3"); %{ - #include "xbee.h" + #include "xbee.hpp" %} -%include "xbee.h" +%include "xbee.hpp" %array_class(char, charArray); diff --git a/src/xbee/xbee.cxx b/src/xbee/xbee.cxx index 91c2150b..d3073e1b 100644 --- a/src/xbee/xbee.cxx +++ b/src/xbee/xbee.cxx @@ -25,7 +25,7 @@ #include #include -#include "xbee.h" +#include "xbee.hpp" using namespace upm; using namespace std; diff --git a/src/xbee/xbee.h b/src/xbee/xbee.hpp similarity index 100% rename from src/xbee/xbee.h rename to src/xbee/xbee.hpp diff --git a/src/yg1006/CMakeLists.txt b/src/yg1006/CMakeLists.txt index 8f585498..01bdc2a3 100644 --- a/src/yg1006/CMakeLists.txt +++ b/src/yg1006/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "yg1006") set (libdescription "upm yg1006 flame sensor module") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/yg1006/javaupm_yg1006.i b/src/yg1006/javaupm_yg1006.i index c3b01c42..a2c26506 100644 --- a/src/yg1006/javaupm_yg1006.i +++ b/src/yg1006/javaupm_yg1006.i @@ -2,10 +2,10 @@ %include "../upm.i" %{ - #include "yg1006.h" + #include "yg1006.hpp" %} -%include "yg1006.h" +%include "yg1006.hpp" %pragma(java) jniclasscode=%{ static { diff --git a/src/yg1006/jsupm_yg1006.i b/src/yg1006/jsupm_yg1006.i index 1b83ad17..e9ae926a 100644 --- a/src/yg1006/jsupm_yg1006.i +++ b/src/yg1006/jsupm_yg1006.i @@ -2,7 +2,7 @@ %include "../upm.i" %{ - #include "yg1006.h" + #include "yg1006.hpp" %} -%include "yg1006.h" +%include "yg1006.hpp" diff --git a/src/yg1006/pyupm_yg1006.i b/src/yg1006/pyupm_yg1006.i index 2b5dd5a0..92bbcb6a 100644 --- a/src/yg1006/pyupm_yg1006.i +++ b/src/yg1006/pyupm_yg1006.i @@ -5,7 +5,7 @@ %feature("autodoc", "3"); -%include "yg1006.h" +%include "yg1006.hpp" %{ - #include "yg1006.h" + #include "yg1006.hpp" %} diff --git a/src/yg1006/yg1006.cxx b/src/yg1006/yg1006.cxx index 7ac721aa..07be0ef1 100644 --- a/src/yg1006/yg1006.cxx +++ b/src/yg1006/yg1006.cxx @@ -26,7 +26,7 @@ #include #include -#include "yg1006.h" +#include "yg1006.hpp" using namespace upm; using namespace std; diff --git a/src/yg1006/yg1006.h b/src/yg1006/yg1006.hpp similarity index 100% rename from src/yg1006/yg1006.h rename to src/yg1006/yg1006.hpp diff --git a/src/zfm20/CMakeLists.txt b/src/zfm20/CMakeLists.txt index 1ad514bb..b7d055b9 100644 --- a/src/zfm20/CMakeLists.txt +++ b/src/zfm20/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "zfm20") set (libdescription "upm grove zfm20 fingerprint sensor module") set (module_src ${libname}.cxx) -set (module_h ${libname}.h) +set (module_hpp ${libname}.hpp) upm_module_init() diff --git a/src/zfm20/javaupm_zfm20.i b/src/zfm20/javaupm_zfm20.i index 561ec12a..cbecc9e2 100644 --- a/src/zfm20/javaupm_zfm20.i +++ b/src/zfm20/javaupm_zfm20.i @@ -8,12 +8,12 @@ %apply uint16_t *OUTPUT { uint16_t *id, uint16_t *score }; %{ - #include "zfm20.h" + #include "zfm20.hpp" speed_t int_B57600 = B57600; %} -%include "zfm20.h" +%include "zfm20.hpp" speed_t int_B57600 = B57600; %pragma(java) jniclasscode=%{ diff --git a/src/zfm20/jsupm_zfm20.i b/src/zfm20/jsupm_zfm20.i index 55b07b15..a6a959fc 100644 --- a/src/zfm20/jsupm_zfm20.i +++ b/src/zfm20/jsupm_zfm20.i @@ -7,9 +7,9 @@ /* Send "int *" to JavaScript as intp */ %pointer_functions(int, intp); %{ - #include "zfm20.h" + #include "zfm20.hpp" speed_t int_B57600 = B57600; %} -%include "zfm20.h" +%include "zfm20.hpp" speed_t int_B57600 = B57600; diff --git a/src/zfm20/pyupm_zfm20.i b/src/zfm20/pyupm_zfm20.i index d1cac936..1f02c24c 100644 --- a/src/zfm20/pyupm_zfm20.i +++ b/src/zfm20/pyupm_zfm20.i @@ -11,8 +11,8 @@ /* Send "int *" to python as intp */ %pointer_functions(int, intp); %{ - #include "zfm20.h" + #include "zfm20.hpp" speed_t int_B57600 = B57600; %} -%include "zfm20.h" +%include "zfm20.hpp" speed_t int_B57600 = B57600; diff --git a/src/zfm20/zfm20.cxx b/src/zfm20/zfm20.cxx index f0e42c84..0c4825af 100644 --- a/src/zfm20/zfm20.cxx +++ b/src/zfm20/zfm20.cxx @@ -26,7 +26,7 @@ #include #include -#include "zfm20.h" +#include "zfm20.hpp" using namespace upm; using namespace std; diff --git a/src/zfm20/zfm20.h b/src/zfm20/zfm20.hpp similarity index 100% rename from src/zfm20/zfm20.h rename to src/zfm20/zfm20.hpp