From 76e5ac8816fea90c74bee20bb93067d06683eb41 Mon Sep 17 00:00:00 2001
From: jacobperron <jacobmperron@gmail.com>
Date: Tue, 29 Mar 2016 19:16:04 -0700
Subject: [PATCH] Convert units to base units

---
 include/create/create.h | 16 ++++++++--------
 src/create.cpp          | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/include/create/create.h b/include/create/create.h
index 615da02..9a4877a 100644
--- a/include/create/create.h
+++ b/include/create/create.h
@@ -354,15 +354,15 @@ namespace create {
       bool isSpotButtonPressed() const;
 
       /* Get battery voltage.
-       * \return value in millivolts
+       * \return value in volts
        */
-      uint16_t getVoltage() const;
+      float getVoltage() const;
 
       /* Get current flowing in/out of battery.
        * A positive current implies Create is charging.
-       * \return value in milliamps
+       * \return value in amps
        */
-      int16_t getCurrent() const;
+      float getCurrent() const;
 
       /* Get the temperature of battery.
        * \return value in Celsius
@@ -370,14 +370,14 @@ namespace create {
       int8_t getTemperature() const;
 
       /* Get battery's remaining charge.
-       * \return value in milliamp-hours
+       * \return value in amp-hours
        */
-      uint16_t getBatteryCharge() const;
+      float getBatteryCharge() const;
 
       /* Get estimated battery charge capacity.
-       * \return in milliamp-hours
+       * \return in amp-hours
        */
-      uint16_t getBatteryCapacity() const;
+      float getBatteryCapacity() const;
 
       /* Return true if farthest left light sensor detects an obstacle, false otherwise.
        */
diff --git a/src/create.cpp b/src/create.cpp
index 3c12fdb..4612aa9 100644
--- a/src/create.cpp
+++ b/src/create.cpp
@@ -567,9 +567,9 @@ namespace create {
     }
   }
 
-  uint16_t Create::getVoltage() const {
+  float Create::getVoltage() const {
     if (data->isValidPacketID(ID_VOLTAGE)) {
-      return GET_DATA(ID_VOLTAGE);
+      return (GET_DATA(ID_VOLTAGE) / 1000.0);
     }
     else {
       CERR("[create::Create] ", "Voltage sensor not supported!");
@@ -577,9 +577,9 @@ namespace create {
     }
   }
 
-  int16_t Create::getCurrent() const {
+  float Create::getCurrent() const {
     if (data->isValidPacketID(ID_VOLTAGE)) {
-      return (int16_t) GET_DATA(ID_CURRENT);
+      return (((int16_t)GET_DATA(ID_CURRENT)) / 1000.0);
     }
     else {
       CERR("[create::Create] ", "Current sensor not supported!");
@@ -597,9 +597,9 @@ namespace create {
     }
   }
 
-  uint16_t Create::getBatteryCharge() const {
+  float Create::getBatteryCharge() const {
     if (data->isValidPacketID(ID_CHARGE)) {
-      return GET_DATA(ID_CHARGE);
+      return (GET_DATA(ID_CHARGE) / 1000.0);
     }
     else {
       CERR("[create::Create] ", "Battery charge not supported!");
@@ -607,9 +607,9 @@ namespace create {
     }
   }
 
-  uint16_t Create::getBatteryCapacity() const {
+  float Create::getBatteryCapacity() const {
     if (data->isValidPacketID(ID_CAPACITY)) {
-      return GET_DATA(ID_CAPACITY);
+      return (GET_DATA(ID_CAPACITY) / 1000.0);
     }
     else {
       CERR("[create::Create] ", "Battery capacity not supported!");