GPRS: Remove Grove Dependency

Signed-off-by: Abhishek Malik <abhishek.malik@intel.com>

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)

src/gprs/gprs.cxx

@@ -0,0 +1,74 @@
+/*
+ * Author: Jon Trulson <jtrulson@ics.com>
+ * Copyright (c) 2015 Intel Corporation.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <iostream>
+
+#include "gprs.hpp"
+
+using namespace upm;
+using namespace std;
+
+static const int defaultDelay = 100;     // max wait time for read
+
+GPRS::GPRS(int uart) :
+  m_uart(uart)
+{
+}
+
+GPRS::~GPRS()
+{
+}
+
+bool GPRS::dataAvailable(unsigned int millis)
+{
+  return m_uart.dataAvailable(millis);
+}
+
+int GPRS::readData(char *buffer, unsigned int len)
+{
+  return m_uart.read(buffer, len);
+}
+
+std::string GPRS::readDataStr(int len)
+{
+  return m_uart.readStr(len);
+}
+
+int GPRS::writeData(char *buffer, unsigned int len)
+{
+  m_uart.flush();
+  return m_uart.write(buffer, len);
+}
+
+int GPRS::writeDataStr(std::string data)
+{
+  m_uart.flush();
+  return m_uart.writeStr(data);
+}
+
+mraa::Result GPRS::setBaudRate(int baud)
+{
+  return m_uart.setBaudRate(baud);
+}
+

src/gprs/gprs.hpp

@@ -0,0 +1,154 @@
+/*
+ * Author: Jon Trulson <jtrulson@ics.com>
+ * Copyright (c) 2015 Intel Corporation.
+ *
+ * Thanks to Adafruit for supplying a google translated version of the
+ * Chinese datasheet and some clues in their code.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+#pragma once
+
+#include <string>
+#include <iostream>
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
+#include <mraa/common.hpp>
+#include <mraa/uart.hpp>
+
+#define GPRS_DEFAULT_UART 0
+
+namespace upm {
+    /**
+     * @brief  GPRS Module library
+     * @defgroup gprs libupm-gprs
+     * @ingroup seeed uart wifi
+     */
+
+    /**
+     * @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  GPRS Module
+     *
+     * 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:
+     *
+     * http://www.seeedstudio.com/wiki/images/7/72/AT_Commands_v1.11.pdf
+     *
+     * It is connected via a UART at 19200 baud.
+     *
+     * @image html gprs.jpg
+     * @snippet gprs.cxx Interesting
+     */
+
+  class GPRS {
+  public:
+
+    /**
+     * GPRS object constructor
+     *
+     * @param uart Default UART to use (0 or 1). Default is 0.
+     */
+    GPRS(int uart=GPRS_DEFAULT_UART);
+
+    /**
+     * GPRS object destructor
+     */
+    ~GPRS();
+
+    /**
+     * Checks to see if there is data available for reading
+     *
+     * @param millis Number of milliseconds to wait; 0 means no waiting
+     * @return true if there is data available for reading
+     */
+    bool dataAvailable(unsigned int millis);
+
+    /**
+     * Reads any available data into a user-supplied buffer. Note: the
+     * call blocks until data is available for reading. Use
+     * dataAvailable() to determine whether there is data available
+     * beforehand, to avoid blocking.
+     *
+     * @param buffer Buffer to hold the data read
+     * @param len Length of the buffer
+     * @return Number of bytes read
+     */
+    int readData(char *buffer, unsigned int len);
+
+    /**
+     * Reads any available data and returns it in a std::string. Note:
+     * the call blocks until data is available for reading. Use
+     * dataAvailable() to determine whether there is data available
+     * beforehand, to avoid blocking.
+     *
+     * @param len Maximum length of the data to be returned
+     * @return Number of bytes read
+     */
+    std::string readDataStr(int len);
+
+    /**
+     * Writes the data in the buffer to the device.  If you are
+     * writing a command, be sure to terminate it with a carriage
+     * return (\r)
+     *
+     * @param buffer Buffer to hold the data to write
+     * @param len Length of the buffer
+     * @return Number of bytes written
+     */
+    int writeData(char *buffer, unsigned len);
+
+    /**
+     * Writes the std:string data to the device.  If you are writing a
+     * command, be sure to terminate it with a carriage return (\r)
+     *
+     * @param data Buffer to write to the device
+     * @return Number of bytes written
+     */
+    int writeDataStr(std::string data);
+
+    /**
+     * Sets the baud rate for the device.  The default is 19200.
+     *
+     * @param baud Desired baud rate.
+     * @return true if successful
+     */
+    mraa::Result setBaudRate(int baud=19200);
+
+
+  protected:
+    mraa::Uart m_uart;
+
+  private:
+  };
+}
+
+

src/gprs/javaupm_gprs.i

@@ -0,0 +1,22 @@
+%module javaupm_gprs
+%include "../upm.i"
+%include "carrays.i"
+%include "std_string.i"
+
+%{
+    #include "gprs.hpp"
+%}
+
+%include "gprs.hpp"
+%array_class(char, charArray);
+
+%pragma(java) jniclasscode=%{
+    static {
+        try {
+            System.loadLibrary("javaupm_gprs");
+        } catch (UnsatisfiedLinkError e) {
+            System.err.println("Native code library failed to load. \n" + e);
+            System.exit(1);
+        }
+    }
+%}

src/gprs/jsupm_gprs.i

@@ -0,0 +1,11 @@
+%module jsupm_gprs
+%include "../upm.i"
+%include "carrays.i"
+%include "std_string.i"
+
+%{
+    #include "gprs.hpp"
+%}
+
+%include "gprs.hpp"
+%array_class(char, charArray);

src/gprs/pyupm_gprs.i

@@ -0,0 +1,14 @@
+// Include doxygen-generated documentation
+%include "pyupm_doxy2swig.i"
+%module pyupm_gprs
+%include "../upm.i"
+%include "carrays.i"
+%include "std_string.i"
+
+%feature("autodoc", "3");
+
+%{
+    #include "gprs.hpp"
+%}
+%include "gprs.hpp"
+%array_class(char, charArray);