From 9bbff69b36bc06e430a416452c5f3cea879c83ee Mon Sep 17 00:00:00 2001
From: Chris Kerr <chris.kerr@mykolab.ch>
Date: Mon, 30 Aug 2021 19:42:26 +0300
Subject: [PATCH 1/2] Add column IDs for 'R/Ohm' and 'Rapp/Ohm'

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

diff --git a/galvani/BioLogic.py b/galvani/BioLogic.py
index a3786c0..4708bb4 100644
--- a/galvani/BioLogic.py
+++ b/galvani/BioLogic.py
@@ -154,6 +154,7 @@ VMPdata_colID_dtype_map = {
     20: ('control/mA', '<f4'),
     23: ('dQ/mA.h', '<f8'),  # Same as 7?
     24: ('cycle number', '<f8'),
+    26: ('Rapp/Ohm', '<f4'),
     32: ('freq/Hz', '<f4'),
     33: ('|Ewe|/V', '<f4'),
     34: ('|I|/A', '<f4'),
@@ -162,6 +163,7 @@ VMPdata_colID_dtype_map = {
     37: ('Re(Z)/Ohm', '<f4'),
     38: ('-Im(Z)/Ohm', '<f4'),
     39: ('I Range', '<u2'),
+    69: ('R/Ohm', '<f4'),
     70: ('P/W', '<f4'),
     74: ('Energy/W.h', '<f8'),
     75: ('Analog OUT/V', '<f4'),

From de182bd400e00eabc87681de615bbdddf9304716 Mon Sep 17 00:00:00 2001
From: Chris Kerr <chris.kerr@mykolab.ch>
Date: Mon, 30 Aug 2021 19:45:30 +0300
Subject: [PATCH 2/2] Add a test for the Rapp/Ohm column ID

---
 tests/test_BioLogic.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/test_BioLogic.py b/tests/test_BioLogic.py
index 76e65e8..9c0ff44 100644
--- a/tests/test_BioLogic.py
+++ b/tests/test_BioLogic.py
@@ -87,6 +87,7 @@ def test_colID_to_dtype(colIDs, expected):
     ('bio_logic6.mpr', '2012-09-11', None),
     # C019P-0ppb-A_C01.mpr stores the date in a different format
     ('C019P-0ppb-A_C01.mpr', '2019-03-14', '2019-03-14'),
+    ('Rapp_Error.mpr', '2010-12-02', '2010-12-02'),
 ])
 def test_MPR_dates(testdata_dir, filename, startdate, enddate):
     """Check that the start and end dates in .mpr files are read correctly."""