6 files changed, 0 insertions, 270 deletions
diff --git a/peripheral/libupm/src/ta12200/CMakeLists.txt b/peripheral/libupm/src/ta12200/CMakeLists.txt
deleted file mode 100644
index 0f3f0ba..0000000
--- a/peripheral/libupm/src/ta12200/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-set (libname "ta12200")
-set (libdescription "upm ta12200 current transformer module")
-set (module_src ${libname}.cxx)
-set (module_h ${libname}.h)
-upm_module_init()
diff --git a/peripheral/libupm/src/ta12200/javaupm_ta12200.i b/peripheral/libupm/src/ta12200/javaupm_ta12200.i
deleted file mode 100644
index 3feb468..0000000
--- a/peripheral/libupm/src/ta12200/javaupm_ta12200.i
+++ /dev/null
@@ -1,19 +0,0 @@
-%module javaupm_ta12200
-%include "../upm.i"
-
-%{
-    #include "ta12200.h"
-%}
-
-%include "ta12200.h"
-
-%pragma(java) jniclasscode=%{
-    static {
-        try {
-            System.loadLibrary("javaupm_ta12200");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}
-\ No newline at end of file
diff --git a/peripheral/libupm/src/ta12200/jsupm_ta12200.i b/peripheral/libupm/src/ta12200/jsupm_ta12200.i
deleted file mode 100644
index 519f1ec..0000000
--- a/peripheral/libupm/src/ta12200/jsupm_ta12200.i
+++ /dev/null
@@ -1,8 +0,0 @@
-%module jsupm_ta12200
-%include "../upm.i"
-
-%{
-    #include "ta12200.h"
-%}
-
-%include "ta12200.h"
diff --git a/peripheral/libupm/src/ta12200/pyupm_ta12200.i b/peripheral/libupm/src/ta12200/pyupm_ta12200.i
deleted file mode 100644
index d1838fc..0000000
--- a/peripheral/libupm/src/ta12200/pyupm_ta12200.i
+++ /dev/null
@@ -1,11 +0,0 @@
-// Include doxygen-generated documentation
-%include "pyupm_doxy2swig.i"
-%module pyupm_ta12200
-%include "../upm.i"
-
-%feature("autodoc", "3");
-
-%include "ta12200.h"
-%{
-    #include "ta12200.h"
-%}
diff --git a/peripheral/libupm/src/ta12200/ta12200.cxx b/peripheral/libupm/src/ta12200/ta12200.cxx
deleted file mode 100644
index f9d3cb0..0000000
--- a/peripheral/libupm/src/ta12200/ta12200.cxx
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Author: Jon Trulson <jtrulson@ics.com>
- * Copyright (c) 2014 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 <string>
-#include <stdexcept>
-
-#include "ta12200.h"
-
-using namespace upm;
-using namespace std;
-
-TA12200::TA12200(int pin)
-{
-  initClock();
-
-  if ( !(m_aio = mraa_aio_init(pin)) )
-    {
-      throw std::invalid_argument(std::string(__FUNCTION__) +
-                                  ": mraa_aio_init() failed, invalid pin?");
-      return;
-    }
-}
-
-TA12200::~TA12200()
-{
-  mraa_aio_close(m_aio);
-}
-
-void TA12200::initClock()
-{
-  gettimeofday(&m_startTime, NULL);
-}
-
-uint32_t TA12200::getMillis()
-{
-  struct timeval elapsed, now;
-  uint32_t elapse;
-
-  // get current time
-  gettimeofday(&now, NULL);
-
-  // compute the delta since m_startTime
-  if( (elapsed.tv_usec = now.tv_usec - m_startTime.tv_usec) < 0 ) 
-    {
-      elapsed.tv_usec += 1000000;
-      elapsed.tv_sec = now.tv_sec - m_startTime.tv_sec - 1;
-    } 
-  else 
-    {
-      elapsed.tv_sec = now.tv_sec - m_startTime.tv_sec;
-    }
-
-  elapse = (uint32_t)((elapsed.tv_sec * 1000) + (elapsed.tv_usec / 1000));
-
-  // never return 0
-  if (elapse == 0)
-    elapse = 1;
-
-  return elapse;
-}
-
-
-unsigned int TA12200::highestValue()
-{
-  unsigned int hiVal = 0;
-  unsigned int val;
-  uint32_t start = getMillis();
-
-  // 1 second
-  while (getMillis() < (start + 1000))
-    {
-      val = mraa_aio_read(m_aio);
-      if (val > hiVal)
-        hiVal = val;
-    }
-        
-  return hiVal;
-}
-
-float TA12200::milliAmps(unsigned int val, int res)
-{
-  float ampCurrent;
-  float effectiveVal;
-
-  // From grove wiki page:
-  // minimum_current=1/1024*5/800*2000000/1.414=8.6(mA) 
-  // Only for sinusoidal alternating current
-  //ampCurrent = float(val) / float(res) * 5.0 / 800.0 * 2000000.0;
-  ampCurrent = float(val) / float(res) * 12500.0;
-  effectiveVal = ampCurrent/1.414;
-  return (effectiveVal);
-}
-
diff --git a/peripheral/libupm/src/ta12200/ta12200.h b/peripheral/libupm/src/ta12200/ta12200.h
deleted file mode 100644
index b3561d4..0000000
--- a/peripheral/libupm/src/ta12200/ta12200.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Author: Jon Trulson <jtrulson@ics.com>
- * Copyright (c) 2014 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.
- */
-#pragma once
-
-#include <string>
-#include <iostream>
-#include <stdint.h>
-#include <sys/time.h>
-#include <mraa/aio.h>
-
-// default ADC resolution. 
-#define TA12200_ADC_RES 1024
-
-namespace upm {
-/**
- * @brief TA12-200 Current Transformer library
- * @defgroup ta12200 libupm-ta12200
- * @ingroup seeed analog electric
- */
-/**
- * @library ta12200
- * @sensor ta12200
- * @comname TA12-200 Current Transformer
- * @altname Grove Electricity Sensor
- * @type electric
- * @man seeed
- * @web http://www.seeedstudio.com/wiki/Grove_-_Electricity_Sensor
- * @con analog
- *
- * @brief API for the TA12-200 Current Transformer
- * 
- *   UPM module for the TA12-200 current transformer found,
- *   for instance, in the Grove Electricity Sensor. 
- *   This module can measure AC moving through a wire at up 
- *   to 5 A.
- *
- * @image html ta12200.jpg
- * @snippet ta12200.cxx Interesting
- */
-  class TA12200 {
-  public:
-    /**
-     * TA12200 constructor
-     *
-     * @param pin Analog pin to use
-     */
-    TA12200(int pin);
-
-    /**
-     * TA12200 destructor
-     */
-    ~TA12200();
-
-    /**
-     * Returns the number of milliseconds elapsed since initClock()
-     * was last called.
-     *
-     * @return Elapsed milliseconds
-     */
-    uint32_t getMillis();
-
-    /**
-     * Resets the clock
-     *
-     */
-    void initClock();
-
-    /**
-     * Gets the conversion value from the sensor
-     *
-     * @return Highest value obtained over 1 second of measuring
-     */
-    unsigned int highestValue();
-
-    /**
-     * Computes the measured voltage
-     *
-     * @param val Value measured by highestValue()
-     * @param res ADC resolution
-     *
-     * @return Measured current in mA
-     */
-    float milliAmps(unsigned int val, int res=TA12200_ADC_RES);
-
-  private:
-    struct timeval m_startTime;
-    mraa_aio_context m_aio;
-  };
-}
-
-