diff --git a/examples/c++/CMakeLists.txt b/examples/c++/CMakeLists.txt index 51b35545..afcbe08e 100644 --- a/examples/c++/CMakeLists.txt +++ b/examples/c++/CMakeLists.txt @@ -213,7 +213,7 @@ add_example (loudness) add_example (mg811) add_example (wheelencoder) add_example (sm130) -add_example (grovegprs) +add_example (gprs) add_example (lm35) add_example (micsv89) add_example (xbee) diff --git a/examples/c++/grovegprs.cxx b/examples/c++/gprs.cxx similarity index 94% rename from examples/c++/grovegprs.cxx rename to examples/c++/gprs.cxx index f882cba7..48fe922e 100644 --- a/examples/c++/grovegprs.cxx +++ b/examples/c++/gprs.cxx @@ -26,7 +26,7 @@ #include #include #include -#include "grovegprs.hpp" +#include "gprs.hpp" using namespace std; using namespace upm; @@ -48,7 +48,7 @@ void printUsage(char *progname) } // simple helper function to send a command and wait for a response -void sendCommand(upm::GroveGPRS* sensor, string cmd) +void sendCommand(upm::GPRS* sensor, string cmd) { // commands need to be terminated with a carriage return cmd += "\r"; @@ -71,8 +71,8 @@ int main(int argc, char **argv) { //! [Interesting] - // Instantiate a GroveGPRS Module on UART 0 - upm::GroveGPRS* sensor = new upm::GroveGPRS(0); + // Instantiate a GPRS Module on UART 0 + upm::GPRS* sensor = new upm::GPRS(0); // Set the baud rate, 19200 baud is the default. if (sensor->setBaudRate(19200) != mraa::SUCCESS) @@ -108,4 +108,4 @@ int main(int argc, char **argv) delete sensor; return 0; -} +} \ No newline at end of file diff --git a/examples/javascript/grovegprs.js b/examples/javascript/gprs.js similarity index 95% rename from examples/javascript/grovegprs.js rename to examples/javascript/gprs.js index dda80acd..30d61214 100644 --- a/examples/javascript/grovegprs.js +++ b/examples/javascript/gprs.js @@ -23,7 +23,7 @@ */ -var sensorObj = require('jsupm_grovegprs'); +var sensorObj = require('jsupm_gprs'); /************** Functions **************/ @@ -57,8 +57,8 @@ function sendCommand(sensor, cmd, callback) } /************** Main code **************/ -// Instantiate a GROVEGPRS Module on UART 0 -var sensor = new sensorObj.GroveGPRS(0); +// Instantiate a GPRS Module on UART 0 +var sensor = new sensorObj.GPRS(0); // Set the baud rate, 19200 baud is the default. if (sensor.setBaudRate(19200)) @@ -70,7 +70,7 @@ if (sensor.setBaudRate(19200)) printUsage(process.argv[1]); // Note: in nodeJS, command-line argument 0 is "node". -// Command-line argument 1 is "grovegprs.js" +// Command-line argument 1 is "gprs.js" // If you have a third argument, then it's a command if (process.argv.length > 2) { diff --git a/examples/python/grovegprs.py b/examples/python/gprs.py similarity index 96% rename from examples/python/grovegprs.py rename to examples/python/gprs.py index d441e38a..3f031144 100644 --- a/examples/python/grovegprs.py +++ b/examples/python/gprs.py @@ -22,10 +22,10 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. import time, sys, signal, atexit -import pyupm_grovegprs as sensorObj +import pyupm_gprs as sensorObj -# Instantiate a GroveGPRS Module on UART 0 -sensor = sensorObj.GroveGPRS(0) +# Instantiate a GPRS Module on UART 0 +sensor = sensorObj.GPRS(0) ## Exit handlers ## # This stops python from printing a stacktrace when you hit control-C diff --git a/src/gprs/CMakeLists.txt b/src/gprs/CMakeLists.txt new file mode 100644 index 00000000..b5ac5893 --- /dev/null +++ b/src/gprs/CMakeLists.txt @@ -0,0 +1,5 @@ +upm_mixed_module_init (NAME gprs + DESCRIPTION "upm grove GPRS module" + CPP_HDR gprs.hpp + CPP_SRC gprs.cxx + REQUIRES mraa) diff --git a/src/grovegprs/grovegprs.cxx b/src/gprs/gprs.cxx similarity index 80% rename from src/grovegprs/grovegprs.cxx rename to src/gprs/gprs.cxx index 8634cd48..7a4bb45e 100644 --- a/src/grovegprs/grovegprs.cxx +++ b/src/gprs/gprs.cxx @@ -24,50 +24,50 @@ #include -#include "grovegprs.hpp" +#include "gprs.hpp" using namespace upm; using namespace std; static const int defaultDelay = 100; // max wait time for read -GroveGPRS::GroveGPRS(int uart) : +GPRS::GPRS(int uart) : m_uart(uart) { } -GroveGPRS::~GroveGPRS() +GPRS::~GPRS() { } -bool GroveGPRS::dataAvailable(unsigned int millis) +bool GPRS::dataAvailable(unsigned int millis) { return m_uart.dataAvailable(millis); } -int GroveGPRS::readData(char *buffer, unsigned int len) +int GPRS::readData(char *buffer, unsigned int len) { return m_uart.read(buffer, len); } -std::string GroveGPRS::readDataStr(int len) +std::string GPRS::readDataStr(int len) { return m_uart.readStr(len); } -int GroveGPRS::writeData(char *buffer, unsigned int len) +int GPRS::writeData(char *buffer, unsigned int len) { m_uart.flush(); return m_uart.write(buffer, len); } -int GroveGPRS::writeDataStr(std::string data) +int GPRS::writeDataStr(std::string data) { m_uart.flush(); return m_uart.writeStr(data); } -mraa::Result GroveGPRS::setBaudRate(int baud) +mraa::Result GPRS::setBaudRate(int baud) { return m_uart.setBaudRate(baud); } diff --git a/src/grovegprs/grovegprs.hpp b/src/gprs/gprs.hpp similarity index 88% rename from src/grovegprs/grovegprs.hpp rename to src/gprs/gprs.hpp index 1aa774f6..22028db0 100644 --- a/src/grovegprs/grovegprs.hpp +++ b/src/gprs/gprs.hpp @@ -36,27 +36,27 @@ #include #include -#define GROVEGPRS_DEFAULT_UART 0 +#define GPRS_DEFAULT_UART 0 namespace upm { /** - * @brief Grove GPRS Module library - * @defgroup grovegprs libupm-grovegprs + * @brief GPRS Module library + * @defgroup gprs libupm-gprs * @ingroup seeed uart wifi */ /** - * @library grovegprs - * @sensor grovegprs - * @comname Grove GPRS Module + * @library gprs + * @sensor gprs + * @comname GPRS Module * @type wifi * @man seeed * @con uart * @web http://www.seeedstudio.com/wiki/GPRS_Shield_V2.0 * - * @brief API for the Grove GPRS Module + * @brief API for the GPRS Module * - * The driver was tested with the Grove GPRS Module, V2. It's a + * The driver was tested with the GPRS Module, V2. It's a * GSM GPRS module based on the SIM900. This module uses a * standard 'AT' command set. See the datasheet for a full list * of available commands and their possible responses: @@ -65,24 +65,24 @@ namespace upm { * * It is connected via a UART at 19200 baud. * - * @image html grovegprs.jpg - * @snippet grovegprs.cxx Interesting + * @image html gprs.jpg + * @snippet gprs.cxx Interesting */ - class GroveGPRS { + class GPRS { public: /** - * GroveGPRS object constructor + * GPRS object constructor * * @param uart Default UART to use (0 or 1). Default is 0. */ - GroveGPRS(int uart=GROVEGPRS_DEFAULT_UART); + GPRS(int uart=GPRS_DEFAULT_UART); /** - * GroveGPRS object destructor + * GPRS object destructor */ - ~GroveGPRS(); + ~GPRS(); /** * Checks to see if there is data available for reading diff --git a/src/grovegprs/javaupm_grovegprs.i b/src/gprs/javaupm_gprs.i similarity index 71% rename from src/grovegprs/javaupm_grovegprs.i rename to src/gprs/javaupm_gprs.i index 29972361..fd79f474 100644 --- a/src/grovegprs/javaupm_grovegprs.i +++ b/src/gprs/javaupm_gprs.i @@ -1,19 +1,19 @@ -%module javaupm_grovegprs +%module javaupm_gprs %include "../upm.i" %include "carrays.i" %include "std_string.i" %{ - #include "grovegprs.hpp" + #include "gprs.hpp" %} -%include "grovegprs.hpp" +%include "gprs.hpp" %array_class(char, charArray); %pragma(java) jniclasscode=%{ static { try { - System.loadLibrary("javaupm_grovegprs"); + System.loadLibrary("javaupm_gprs"); } catch (UnsatisfiedLinkError e) { System.err.println("Native code library failed to load. \n" + e); System.exit(1); diff --git a/src/grovegprs/jsupm_grovegprs.i b/src/gprs/jsupm_gprs.i similarity index 57% rename from src/grovegprs/jsupm_grovegprs.i rename to src/gprs/jsupm_gprs.i index bd14764f..820dcef9 100644 --- a/src/grovegprs/jsupm_grovegprs.i +++ b/src/gprs/jsupm_gprs.i @@ -1,11 +1,11 @@ -%module jsupm_grovegprs +%module jsupm_gprs %include "../upm.i" %include "carrays.i" %include "std_string.i" %{ - #include "grovegprs.hpp" + #include "gprs.hpp" %} -%include "grovegprs.hpp" +%include "gprs.hpp" %array_class(char, charArray); diff --git a/src/grovegprs/pyupm_grovegprs.i b/src/gprs/pyupm_gprs.i similarity index 72% rename from src/grovegprs/pyupm_grovegprs.i rename to src/gprs/pyupm_gprs.i index 04e11787..fc1c666d 100644 --- a/src/grovegprs/pyupm_grovegprs.i +++ b/src/gprs/pyupm_gprs.i @@ -1,6 +1,6 @@ // Include doxygen-generated documentation %include "pyupm_doxy2swig.i" -%module pyupm_grovegprs +%module pyupm_gprs %include "../upm.i" %include "carrays.i" %include "std_string.i" @@ -8,7 +8,7 @@ %feature("autodoc", "3"); %{ - #include "grovegprs.hpp" + #include "gprs.hpp" %} -%include "grovegprs.hpp" +%include "gprs.hpp" %array_class(char, charArray); diff --git a/src/grovegprs/CMakeLists.txt b/src/grovegprs/CMakeLists.txt deleted file mode 100644 index 85a8397d..00000000 --- a/src/grovegprs/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ -set (libname "grovegprs") -set (libdescription "upm grove GPRS module") -set (module_src ${libname}.cxx) -set (module_hpp ${libname}.hpp) -upm_module_init()