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] 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