commit b45f1f5bd00c9a8380960d7c439eb14b3a334f50
author Todd Poynor <toddpoynor@google.com> Tue Jul 30 18:57:16 2013 -0700
committer Todd Poynor <toddpoynor@google.com> Wed Aug 07 18:34:34 2013 +0000
tree ede9b5406173ff09eb2361426b42f0b17099f6b6
parent d893e39d4ff19312096849b2d66bbfbb24d061d1

healthd: add optional current_now and charge_counter to tracked state

uA and uAh units are converted to mA and mAh.

If current_now is present, add it to the heartbeat log (c=nnn).

Change-Id: I2b5fe7b4505c98ca2d11c3f94564c1c38493c8b9

healthd/BatteryMonitor.cpp

diff --git a/healthd/BatteryMonitor.cpp b/healthd/BatteryMonitor.cpp
index 22f7713..882d514 100644
--- a/healthd/BatteryMonitor.cpp
+++ b/healthd/BatteryMonitor.cpp
@@ -176,6 +176,8 @@
     props.chargerWirelessOnline = false;
     props.batteryStatus = BATTERY_STATUS_UNKNOWN;
     props.batteryHealth = BATTERY_HEALTH_UNKNOWN;
+    props.batteryCurrentNow = INT_MIN;
+    props.batteryChargeCounter = INT_MIN;
 
     if (!mBatteryPresentPath.isEmpty())
         props.batteryPresent = getBooleanField(mBatteryPresentPath);
@@ -184,6 +186,13 @@
 
     props.batteryLevel = getIntField(mBatteryCapacityPath);
     props.batteryVoltage = getIntField(mBatteryVoltagePath) / 1000;
+
+    if (!mBatteryCurrentNowPath.isEmpty())
+        props.batteryCurrentNow = getIntField(mBatteryCurrentNowPath) / 1000;
+
+    if (!mBatteryChargeCounterPath.isEmpty())
+        props.batteryChargeCounter = getIntField(mBatteryChargeCounterPath) / 1000;
+
     props.batteryTemperature = getIntField(mBatteryTemperaturePath);
 
     const int SIZE = 128;
@@ -229,12 +238,23 @@
         }
     }
 
-    KLOG_INFO(LOG_TAG, "battery l=%d v=%d t=%s%d.%d h=%d st=%d chg=%s%s%s\n",
-              props.batteryLevel, props.batteryVoltage,
-              props.batteryTemperature < 0 ? "-" : "",
-              abs(props.batteryTemperature / 10),
-              abs(props.batteryTemperature % 10), props.batteryHealth,
-              props.batteryStatus,
+    char dmesgline[256];
+    snprintf(dmesgline, sizeof(dmesgline),
+             "battery l=%d v=%d t=%s%d.%d h=%d st=%d",
+             props.batteryLevel, props.batteryVoltage,
+             props.batteryTemperature < 0 ? "-" : "",
+             abs(props.batteryTemperature / 10),
+             abs(props.batteryTemperature % 10), props.batteryHealth,
+             props.batteryStatus);
+
+    if (!mBatteryCurrentNowPath.isEmpty()) {
+        char b[20];
+
+        snprintf(b, sizeof(b), " c=%d", props.batteryCurrentNow);
+        strlcat(dmesgline, b, sizeof(dmesgline));
+    }
+
+    KLOG_INFO(LOG_TAG, "%s chg=%s%s%s\n", dmesgline,
               props.chargerAcOnline ? "a" : "",
               props.chargerUsbOnline ? "u" : "",
               props.chargerWirelessOnline ? "w" : "");
@@ -305,6 +325,16 @@
                 }
 
                 path.clear();
+                path.appendFormat("%s/%s/current_now", POWER_SUPPLY_SYSFS_PATH, name);
+                if (access(path, R_OK) == 0)
+                    mBatteryCurrentNowPath = path;
+
+                path.clear();
+                path.appendFormat("%s/%s/charge_counter", POWER_SUPPLY_SYSFS_PATH, name);
+                if (access(path, R_OK) == 0)
+                    mBatteryChargeCounterPath = path;
+
+                path.clear();
                 path.appendFormat("%s/%s/temp", POWER_SUPPLY_SYSFS_PATH, name);
                 if (access(path, R_OK) == 0) {
                     mBatteryTemperaturePath = path;