commit fcf0b61052e733642e00c6175c4a2f590c19a2a6
author Jenny Ho <hsiufangho@google.com> Wed May 22 15:36:02 2024 +0800
committer Jenny Ho <hsiufangho@google.com> Wed May 22 15:36:02 2024 +0800
tree b381ecf3749842b0ffc35bea7dbabbfa9e726a20
parent 1d82f7efdaa278fb71bfcc8f803bf43ac5a155e7

pixelstats: update GMSR format

Bug: 330077035
Change-Id: I0c12d34396498ed1a4e6c9249c583c4adb4d0606
Signed-off-by: Jenny Ho <hsiufangho@google.com>

pixelstats/BatteryEEPROMReporter.cpp

diff --git a/pixelstats/BatteryEEPROMReporter.cpp b/pixelstats/BatteryEEPROMReporter.cpp
index d9e8b96..a15bf55 100644
--- a/pixelstats/BatteryEEPROMReporter.cpp
+++ b/pixelstats/BatteryEEPROMReporter.cpp
@@ -298,28 +298,17 @@
         return;
     }
 
-    if (path.find("max77779") == std::string::npos &&
-        paths[0].find("max77779") == std::string::npos) {
-        num = sscanf(file_contents.c_str(),  "rcomp0\t:%4" SCNx16 "\ntempco\t:%4" SCNx16
-                     "\nfullcaprep\t:%4" SCNx16 "\ncycles\t:%4" SCNx16 "\nfullcapnom\t:%4" SCNx16
-                     "\nqresidual00\t:%4" SCNx16 "\nqresidual10\t:%4" SCNx16
-                     "\nqresidual20\t:%4" SCNx16 "\nqresidual30\t:%4" SCNx16
-                     "\ncv_mixcap\t:%4" SCNx16 "\nhalftime\t:%4" SCNx16,
-                     &gmsr.rcomp0, &gmsr.tempco, &gmsr.full_rep, &gmsr.cycle_cnt, &gmsr.full_cap,
-                     &gmsr.max_vbatt, &gmsr.min_vbatt, &gmsr.max_ibatt, &gmsr.min_ibatt,
-                     &gmsr.esr, &gmsr.rslow);
-        if (num != kNum77759GMSRFields) {
-            ALOGE("Couldn't process 77759GMSR. num=%d\n", num);
-            return;
-        }
-    } else {
-        num = sscanf(file_contents.c_str(),  "rcomp0\t:%4" SCNx16 "\ntempco\t:%4" SCNx16
-                     "\nfullcaprep\t:%4" SCNx16 "\ncycles\t:%4" SCNx16 "\nfullcapnom\t:%4" SCNx16,
-                     &gmsr.rcomp0, &gmsr.tempco, &gmsr.full_rep, &gmsr.cycle_cnt, &gmsr.full_cap);
-        if (num != kNum77779GMSRFields) {
-            ALOGE("Couldn't process 77779GMSR. num=%d\n", num);
-            return;
-        }
+    num = sscanf(file_contents.c_str(),  "rcomp0\t:%4" SCNx16 "\ntempco\t:%4" SCNx16
+                 "\nfullcaprep\t:%4" SCNx16 "\ncycles\t:%4" SCNx16 "\nfullcapnom\t:%4" SCNx16
+                 "\nqresidual00\t:%4" SCNx16 "\nqresidual10\t:%4" SCNx16
+                 "\nqresidual20\t:%4" SCNx16 "\nqresidual30\t:%4" SCNx16
+                 "\ncv_mixcap\t:%4" SCNx16 "\nhalftime\t:%4" SCNx16,
+                 &gmsr.rcomp0, &gmsr.tempco, &gmsr.full_rep, &gmsr.cycle_cnt, &gmsr.full_cap,
+                 &gmsr.max_vbatt, &gmsr.min_vbatt, &gmsr.max_ibatt, &gmsr.min_ibatt,
+                 &gmsr.esr, &gmsr.rslow);
+    if (num != kNum77759GMSRFields && num != kNum77779GMSRFields) {
+        ALOGE("Couldn't process GMSR. num=%d\n", num);
+        return;
     }
 
     if (gmsr.tempco == 0xFFFF || gmsr.rcomp0 == 0xFFFF || gmsr.full_cap == 0xFFFF) {

pixelstats/include/pixelstats/BatteryEEPROMReporter.h

diff --git a/pixelstats/include/pixelstats/BatteryEEPROMReporter.h b/pixelstats/include/pixelstats/BatteryEEPROMReporter.h
index 426515a..8a4a893 100644
--- a/pixelstats/include/pixelstats/BatteryEEPROMReporter.h
+++ b/pixelstats/include/pixelstats/BatteryEEPROMReporter.h
@@ -153,7 +153,7 @@
                      const struct BatteryHistory &hist);
 
     const int kNum77759GMSRFields = 11;
-    const int kNum77779GMSRFields = 5;
+    const int kNum77779GMSRFields = 9;
     const int kNum17201HISTFields = 16;
 };