Use volts and amps as unit

Author: sebromero

Diff for: examples/Powershell/Powershell.ino

@@ -217,9 +217,9 @@ void setup() {
 
 
   #if !defined(ARDUINO_NICLA_VISION)
-    charger.setChargeCurrent(ChargeCurrent::I_200_mA);
-    charger.setChargeVoltage(ChargeVoltage::V_4_20);
-    charger.setEndOfChargeCurrent(EndOfChargeCurrent::I_5_mA);
+    charger.setChargeCurrent(0.2);
+    charger.setChargeVoltage(4.2);
+    charger.setEndOfChargeCurrent(0.005);
   #endif
 }
 

Diff for: src/Battery.cpp

@@ -34,20 +34,22 @@ bool Battery::isConnected(){
   return bitRead(statusRegister, BATTERY_STATUS_BIT) == 0;
 }
 
-int Battery::voltage(){
+float Battery::voltage(){
   if(!isConnected()){
     return -1;
   }
 
-  return readRegister16Bits(this->wire, FUEL_GAUGE_ADDRESS, VCELL_REG) * VOLTAGE_MULTIPLIER;
+  auto voltageInMV = readRegister16Bits(this->wire, FUEL_GAUGE_ADDRESS, VCELL_REG) * VOLTAGE_MULTIPLIER;
+  return voltageInMV / 1000.0f;
 }
 
-unsigned int Battery::averageVoltage(){
+float Battery::averageVoltage(){
   if(!isConnected()){
     return -1;
   }
 
-  return readRegister16Bits(this->wire, FUEL_GAUGE_ADDRESS, AVG_VCELL_REG) * VOLTAGE_MULTIPLIER;
+  auto voltageInVolts = readRegister16Bits(this->wire, FUEL_GAUGE_ADDRESS, AVG_VCELL_REG) * VOLTAGE_MULTIPLIER;
+  return voltageInVolts / 1000.0f;
 }
 
 int Battery::temperature(){
@@ -66,20 +68,22 @@ int Battery::averageTemperature(){
   return readRegister16Bits(this->wire, FUEL_GAUGE_ADDRESS, AVG_TA_REG) >> 8;
 }
 
-int Battery::current(){
+float Battery::current(){
   if(!isConnected()){
     return -1;
   }
 
-  return (int16_t)readRegister16Bits(this->wire, FUEL_GAUGE_ADDRESS, CURRENT_REG) * CURRENT_MULTIPLIER;
+  auto currentInAmperes = (int16_t)readRegister16Bits(this->wire, FUEL_GAUGE_ADDRESS, CURRENT_REG) * CURRENT_MULTIPLIER;
+  return currentInAmperes / 1000.0f;
 }
 
-int Battery::averageCurrent(){
+float Battery::averageCurrent(){
   if(!isConnected()){
     return -1;
   }
 
-  return (int16_t)readRegister16Bits(this->wire, FUEL_GAUGE_ADDRESS, AVG_CURRENT_REG) * CURRENT_MULTIPLIER;
+  auto currentInAmperes = (int16_t)readRegister16Bits(this->wire, FUEL_GAUGE_ADDRESS, AVG_CURRENT_REG) * CURRENT_MULTIPLIER;
+  return currentInAmperes / 1000.0f;
 }
 
 int Battery::percentage(){

Diff for: src/Battery.h

@@ -45,20 +45,20 @@ class Battery {
         // TODO Shall this be in volts to be consistent?
         /**
          * @brief Reads the current voltage of the battery.
-         * Voltage is usually between 3000mV and 4200mV.
-         * @return The current voltage in millivolts (mV).
+         * Voltage is usually between 3.0V and 4.2V.
+         * @return The current voltage in volts (V).
         */
-        int voltage();
+        float voltage();
 
         // TODO Shall this be in ampere to be consistent?
         /**
          * @brief Reads the current flowing from the battery at the moment.
          * Negative values indicate that the battery is charging, 
          * positive values indicate that the battery is discharging.
          * When no battery is connected, the value is 0.
-         * @return The current flowing from the battery in milliamperes (mA).
+         * @return The current flowing from the battery in amperes (A).
         */
-        int current();
+        float current();
 
         /**
          * @brief Reads the current temperature of the battery.
@@ -92,16 +92,16 @@ class Battery {
         // TODO Shall this be in ampere to be consistent?
         /**
          * @brief Reads the average current of the battery.
-         * @return The average current in millivolts (mV). 
+         * @return The average current in amperes (A).
         */
-        int averageCurrent();
+        float averageCurrent();
 
         // TODO Shall this be in volts to be consistent?
         /**
          * @brief Reads the average voltage of the battery.
-         * @return The average voltage in millivolts (mV). 
+         * @return The average voltage in volts (V). 
         */
-        unsigned int averageVoltage();
+        float averageVoltage();
 
         int batteryCapacityInMiliampereHours = DEFAULT_BATTERY_CAPACITY;
         int batteryEmptyVoltage = DEFAULT_BATTERY_EMPTY_VOLTAGE;