From 3cf6bca02735b507ead339957a0038045f01c373 Mon Sep 17 00:00:00 2001
From: Tim <16023856+bayesfactor@users.noreply.github.com>
Date: Tue, 10 Jul 2018 22:42:23 -0700
Subject: [PATCH 1/6] improved parsing for PEIS files

I found some new column types and a new placement of the ole_timestamp for PEIS files
---
 galvani/BioLogic.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/galvani/BioLogic.py b/galvani/BioLogic.py
index e5bdb17..7fa4017 100644
--- a/galvani/BioLogic.py
+++ b/galvani/BioLogic.py
@@ -212,6 +212,10 @@ def VMPdata_dtype_from_colIDs(colIDs):
             dtype_dict['Capacitance discharge/µF'] = '<f8'
         elif colID == 131:
             dtype_dict['Ns'] = '<u2'
+        elif colID == 169:
+            dtype_dict['Cs/µF'] = '<f4'
+        elif colID == 172:
+            dtype_dict['Cp/µF'] = '<f4'
         elif colID == 434:
             dtype_dict['(Q-Qo)/C'] = '<f4'
         elif colID == 435:
@@ -344,12 +348,18 @@ class MPRfile:
                                            dtype='<f8', count=1)
             ole_timestamp3 = np.fromstring(log_module['data'][473:],
                                            dtype='<f8', count=1)
+            ole_timestamp4 = np.fromstring(log_module['data'][585:],
+                                           dtype='<f8', count=1)
+
             if ole_timestamp1 > 40000 and ole_timestamp1 < 50000:
                 ole_timestamp = ole_timestamp1
             elif ole_timestamp2 > 40000 and ole_timestamp2 < 50000:
                 ole_timestamp = ole_timestamp2
             elif ole_timestamp3 > 40000 and ole_timestamp3 < 50000:
                 ole_timestamp = ole_timestamp3
+            elif ole_timestamp4 > 40000 and ole_timestamp4 < 50000:
+                ole_timestamp = ole_timestamp4
+    
             else:
                 raise ValueError("Could not find timestamp in the LOG module")
 

From 42ff0d010e26d23da3461d591555dcabd6e92a33 Mon Sep 17 00:00:00 2001
From: bcolsen <bcolsen@gmail.com>
Date: Thu, 4 Oct 2018 15:17:40 -0600
Subject: [PATCH 2/6] added more column types

---
 galvani/BioLogic.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/galvani/BioLogic.py b/galvani/BioLogic.py
index 7fa4017..a421539 100644
--- a/galvani/BioLogic.py
+++ b/galvani/BioLogic.py
@@ -186,6 +186,8 @@ def VMPdata_dtype_from_colIDs(colIDs):
             dtype_dict['(Q-Qo)/mA.h'] = '<f8'
         elif colID == 19:
             dtype_dict['control/V'] = '<f4'
+        elif colID == 20:
+            dtype_dict['control/mA'] = '<f4'
         elif colID == 24:
             dtype_dict['cycle number'] = '<f8'
         elif colID == 32:
@@ -224,7 +226,20 @@ def VMPdata_dtype_from_colIDs(colIDs):
             dtype_dict['Q charge/discharge/mA.h'] = '<f8'
         elif colID == 468:
             dtype_dict['half cycle'] = '<u4'
+        elif colID == 473:
+            dtype_dict['THD Ewe/%'] = '<f4'
+        elif colID == 476:
+            dtype_dict['NSD Ewe/%'] = '<f4'
+        elif colID == 479:
+            dtype_dict['NSR Ewe/%'] = '<f4'
+        elif colID == 474:
+            dtype_dict['THD I/%'] = '<f4'
+        elif colID == 477:
+            dtype_dict['NSD I/%'] = '<f4'
+        elif colID == 480:
+            dtype_dict['NSR I/%'] = '<f4'
         else:
+            print(dtype_dict)
             raise NotImplementedError("column type %d not implemented" % colID)
     return np.dtype(list(dtype_dict.items())), flags_dict, flags2_dict
 

From 1904eb124dcd23e33ea8ffbc3f5955e39fd58afb Mon Sep 17 00:00:00 2001
From: bcolsen <bcolsen@gmail.com>
Date: Thu, 4 Oct 2018 16:59:57 -0600
Subject: [PATCH 3/6] energy indexes

---
 galvani/BioLogic.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/galvani/BioLogic.py b/galvani/BioLogic.py
index a421539..fa35210 100644
--- a/galvani/BioLogic.py
+++ b/galvani/BioLogic.py
@@ -208,6 +208,10 @@ def VMPdata_dtype_from_colIDs(colIDs):
             dtype_dict['I Range'] = '<u2'
         elif colID == 70:
             dtype_dict['P/W'] = '<f4'
+        elif colID == 123:
+            dtype_dict['Energy charge/W.h'] = '<f8'
+        elif colID == 124:
+            dtype_dict['Energy discharge/W.h'] = '<f8'
         elif colID == 125:
             dtype_dict['Capacitance charge/µF'] = '<f8'
         elif colID == 126:

From d5f7cfd301ff8679d3f8eb0b3568fdcfff3b3c61 Mon Sep 17 00:00:00 2001
From: Chris Kerr <chris.kerr@mykolab.ch>
Date: Sun, 10 Mar 2019 10:30:14 +0100
Subject: [PATCH 4/6] Add python 3.7 to tox.ini and travis.yml

---
 .travis.yml | 1 +
 tox.ini     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index a3627fd..c77f38c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,7 @@ cache:
 python:
   - "2.7"
   - "3.5"
+  - "3.7"
 install:
   - pip install tox-travis
   - sh get_testdata.sh
diff --git a/tox.ini b/tox.ini
index 09f70f4..bb55395 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py35
+envlist = py27,py35,py37
 [testenv]
 deps=nose
 commands=nosetests

From 85eb7249ad1439be091a1d97cbe1b071b24acef1 Mon Sep 17 00:00:00 2001
From: Chris Kerr <chris.kerr@mykolab.ch>
Date: Sun, 10 Mar 2019 10:34:02 +0100
Subject: [PATCH 5/6] Use break instead of StopIteration - fixes #17

---
 galvani/BioLogic.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/galvani/BioLogic.py b/galvani/BioLogic.py
index e5bdb17..07172b5 100644
--- a/galvani/BioLogic.py
+++ b/galvani/BioLogic.py
@@ -234,7 +234,7 @@ def read_VMP_modules(fileobj, read_module_data=True):
     while True:
         module_magic = fileobj.read(len(b'MODULE'))
         if len(module_magic) == 0:  # end of file
-            raise StopIteration
+            break
         elif module_magic != b'MODULE':
             raise ValueError("Found %r, expecting start of new VMP MODULE" % module_magic)
 

From 803c4f3dc2493593af749aac122e5aed2281e651 Mon Sep 17 00:00:00 2001
From: Chris Kerr <chris.kerr@mykolab.ch>
Date: Sun, 10 Mar 2019 10:38:26 +0100
Subject: [PATCH 6/6] Disable Python 3.7 Travis testing

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index c77f38c..e84d8f2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ cache:
 python:
   - "2.7"
   - "3.5"
-  - "3.7"
+#  - "3.7"  # Python 3.7 is not available on travis CI yet
 install:
   - pip install tox-travis
   - sh get_testdata.sh