From 03b989b0ac24ba021feb4d96f9eaa97132985114 Mon Sep 17 00:00:00 2001
From: Daniel Cogswell <danielcogswell@ses.ai>
Date: Wed, 5 Feb 2025 13:42:01 -0500
Subject: [PATCH 1/2] Milliseconds added to Timestamp for ndc 11.

---
 NewareNDA/NewareNDAx.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/NewareNDA/NewareNDAx.py b/NewareNDA/NewareNDAx.py
index bacd84e..53b81ff 100644
--- a/NewareNDA/NewareNDAx.py
+++ b/NewareNDA/NewareNDAx.py
@@ -389,16 +389,17 @@ def _read_ndc_11_filetype_18(mm):
     mm.seek(header)
     while mm.tell() < mm_size:
         bytes = mm.read(record_len)
-        for i in struct.iter_unpack('<isffff12siii2s', bytes[132:-63]):
+        for i in struct.iter_unpack('<isffff12siiih', bytes[132:-63]):
             Time = i[0]
             [Charge_Capacity, Discharge_Capacity] = [i[2], i[3]]
             [Charge_Energy, Discharge_Energy] = [i[4], i[5]]
             [Timestamp, Step, Index] = [i[7], i[8], i[9]]
+            Msec = i[10]
             if Index != 0:
                 rec.append([Time/1000,
                             Charge_Capacity/3600, Discharge_Capacity/3600,
                             Charge_Energy/3600, Discharge_Energy/3600,
-                            datetime.fromtimestamp(Timestamp, timezone.utc), Step, Index])
+                            datetime.fromtimestamp(Timestamp + Msec/1000, timezone.utc), Step, Index])
 
     # Create DataFrame
     df = pd.DataFrame(rec, columns=[

From cecdf3ba0664088944d1fe44e83ae9a46d90d321 Mon Sep 17 00:00:00 2001
From: Daniel Cogswell <danielcogswell@ses.ai>
Date: Wed, 5 Feb 2025 15:01:51 -0500
Subject: [PATCH 2/2] Milliseconds added to Timestamp for ndc 14.

---
 NewareNDA/NewareNDAx.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/NewareNDA/NewareNDAx.py b/NewareNDA/NewareNDAx.py
index 53b81ff..be94607 100644
--- a/NewareNDA/NewareNDAx.py
+++ b/NewareNDA/NewareNDAx.py
@@ -469,16 +469,17 @@ def _read_ndc_14_filetype_18(mm):
     mm.seek(header)
     while mm.tell() < mm_size:
         bytes = mm.read(record_len)
-        for i in struct.iter_unpack('<isffff12siii10s', bytes[132:-59]):
+        for i in struct.iter_unpack('<isffff12siiih8s', bytes[132:-59]):
             Time = i[0]
             [Charge_Capacity, Discharge_Capacity] = [i[2], i[3]]
             [Charge_Energy, Discharge_Energy] = [i[4], i[5]]
             [Timestamp, Step, Index] = [i[7], i[8], i[9]]
+            Msec = i[10]
             if Index != 0:
                 rec.append([Time/1000,
                             Charge_Capacity*1000, Discharge_Capacity*1000,
                             Charge_Energy*1000, Discharge_Energy*1000,
-                            datetime.fromtimestamp(Timestamp, timezone.utc), Step, Index])
+                            datetime.fromtimestamp(Timestamp + Msec/1000, timezone.utc), Step, Index])
 
     # Create DataFrame
     df = pd.DataFrame(rec, columns=[