uhd: created sensors value, made lib/types and moved files

5 files changed, 95 insertions, 2 deletions

diff --git a/host/lib/CMakeLists.txt b/host/lib/CMakeLists.txt
index 43a29df59..0fe137432 100644
--- a/host/lib/CMakeLists.txt
+++ b/host/lib/CMakeLists.txt
@@ -89,6 +89,7 @@ ENDMACRO(INCLUDE_SUBDIRECTORY)
 # Include subdirectories (different than add)
 ########################################################################
 INCLUDE_SUBDIRECTORY(ic_reg_maps)
+INCLUDE_SUBDIRECTORY(types)
 INCLUDE_SUBDIRECTORY(convert)
 INCLUDE_SUBDIRECTORY(transport)
 INCLUDE_SUBDIRECTORY(usrp)
@@ -117,8 +118,6 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
 LIBUHD_APPEND_SOURCES(
     ${CMAKE_CURRENT_BINARY_DIR}/constants.hpp
     ${CMAKE_CURRENT_SOURCE_DIR}/device.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/ranges.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/types.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/version.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/wax.cpp
 )
diff --git a/host/lib/types/CMakeLists.txt b/host/lib/types/CMakeLists.txt
new file mode 100644
index 000000000..7a8093ed5
--- /dev/null
+++ b/host/lib/types/CMakeLists.txt
@@ -0,0 +1,25 @@
+#
+# Copyright 2011 Ettus Research LLC
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+########################################################################
+# This file included, use CMake directory variables
+########################################################################
+LIBUHD_APPEND_SOURCES(
+    ${CMAKE_CURRENT_SOURCE_DIR}/ranges.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/sensors.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/types.cpp
+)
diff --git a/host/lib/ranges.cpp b/host/lib/types/ranges.cpp
index 4a0d05d80..4a0d05d80 100644
--- a/host/lib/ranges.cpp
+++ b/host/lib/types/ranges.cpp
diff --git a/host/lib/types/sensors.cpp b/host/lib/types/sensors.cpp
new file mode 100644
index 000000000..497f4bfd5
--- /dev/null
+++ b/host/lib/types/sensors.cpp
@@ -0,0 +1,69 @@
+//
+// Copyright 2011-2011 Ettus Research LLC
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+#include <uhd/types/sensors.hpp>
+#include <uhd/utils/exception.hpp>
+#include <boost/format.hpp>
+
+using namespace uhd;
+
+sensor_value_t::sensor_value_t(
+    const std::string &name,
+    bool value,
+    const std::string &ufalse,
+    const std::string &utrue
+):
+    name(name), value(value?"true":"false"),
+    unit(value?utrue:ufalse), type(BOOLEAN)
+{
+    /* NOP */
+}
+
+sensor_value_t::sensor_value_t(
+    const std::string &name,
+    int_type value,
+    const std::string &unit,
+    const std::string &formatter
+):
+    name(name), value(str(boost::format(formatter) % value)),
+    unit(unit), type(INTEGER)
+{
+    /* NOP */
+}
+
+sensor_value_t::sensor_value_t(
+    const std::string &name,
+    real_type value,
+    const std::string &unit,
+    const std::string &formatter
+):
+    name(name), value(str(boost::format(formatter) % value)),
+    unit(unit), type(REALNUM)
+{
+    /* NOP */
+}
+
+std::string sensor_value_t::to_pp_string(void) const{
+    switch(type){
+    case BOOLEAN:
+        return str(boost::format("%s: %s") % name % unit);
+    case INTEGER:
+    case REALNUM:
+        return str(boost::format("%s: %s %s") % name % value % unit);
+    }
+    UHD_THROW_INVALID_CODE_PATH();
+}
diff --git a/host/lib/types.cpp b/host/lib/types/types.cpp
index dce8d0828..dce8d0828 100644
--- a/host/lib/types.cpp
+++ b/host/lib/types/types.cpp