From c25da7fc60f54f7d4f42fde9fa50fa0d16c44901 Mon Sep 17 00:00:00 2001
From: Michael DM Dryden <mdryden@chem.utoronto.ca>
Date: Tue, 14 Mar 2017 19:25:43 -0400
Subject: [PATCH] Update changelog and readme.

---
 CHANGELOG       | 102 +++++++++++++++++++++++++-----------------------
 README.markdown |   5 +--
 2 files changed, 54 insertions(+), 53 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index f90415d..0c5a35d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,34 +1,35 @@
-Version 1.0.2
-    -Improved logging system: Log messages now print showing where they came from.
-    -Implemented gobject IO callbacks for experiments:
-        Process will not continuously poll for new data from serial process anymore.
-    -Stop button works again
-    -Buttons in Photodiode and Calibration modules remain insensitive until ready.
+Version 1.3.3
+	-Bugfix #24: Remove ZODB support until it can be fixed for latest ZODB
 
-Version 1.0.2a
-    -Hotfix #12: Restored measurement ability on Windows
-    -Minor logging changes
-    -Automatically enable TCS on DStat when measure light sensor button clicked.
+Version 1.3.2
+    -Improves initial connection reliability
+
+Version 1.3.1
+    -Fixed electrochem modes broken when database added
+    -Make metadata keys optional.	
     
-Version 1.0.3
-    -Fixed #14: Added support for PMT idle mode
-    -Reduced CPU usage when running OCP by reducing polling frequency
+Version 1.3
+    -Fixed a bug related to calibration mode
+    -Added ZODB data storage
+        -Integrated with zmq_plugin
+		
+Version 1.2
+    -Old Microdrop interface depreciated
+        -New zmq_plugin based interface
+    -Internal changes to save functionality and plot storage.
 
-Version 1.0.4
-    -Adds support for synchronous electromechanical shutter detection (added in dstat/dstat-firmware@29d4c86)
-    -New version string system
+Version 1.1.3
+    -Changed internal storage of experiment data
+    -Added Analysis options:
+        -FFT integral moved there
+        -Basic statistics
 
-Version 1.0.5
-    -Bugfix for saving error introduced by new logging system
-    
-Version 1.0.6
-    -Automatically integrates shutter FFT peak and saves to data file
-    -Adds option to offset start of FFT to avoid PMT startup delay
-    
-Version 1.0.7
-    -Fixed a few bugs for systems without git
-    -Implements mean crossing detection instead of windowing for shutter FFT
+Version 1.1.2
+    -Fixed more critical bugs from refactoring
 
+Version 1.1.1
+    -Fixed critical bug that made PGA setting change with Gain resistor
+  
 Version 1.1
     -Plot will be prettier if seaborn is installed
     -Fixed bug in shutter FFT display
@@ -36,32 +37,35 @@ Version 1.1
         -Adds requirement for yaml
         -Parameters automatically saved and loaded from last session
         -Can manually save and load parameter files
+  
+Version 1.0.7
+    -Fixed a few bugs for systems without git
+    -Implements mean crossing detection instead of windowing for shutter FFT
 
-Version 1.1.1
-    -Fixed critical bug that made PGA setting change with Gain resistor
-    
-Version 1.1.2
-    -Fixed more critical bugs from refactoring
+Version 1.0.6
+    -Automatically integrates shutter FFT peak and saves to data file
+    -Adds option to offset start of FFT to avoid PMT startup delay
 
-Version 1.1.3
-    -Changed internal storage of experiment data
-    -Added Analysis options:
-        -FFT integral moved there
-        -Basic statistics
 
-Version 1.2
-    -Old Microdrop interface depreciated
-        -New zmq_plugin based interface
-    -Internal changes to save functionality and plot storage.
+Version 1.0.5
+    -Bugfix for saving error introduced by new logging system
 
-Version 1.3
-    -Fixed a bug related to calibration mode
-    -Added ZODB data storage
-        -Integrated with zmq_plugin
+Version 1.0.4
+    -Adds support for synchronous electromechanical shutter detection (added in dstat/dstat-firmware@29d4c86)
+    -New version string system
 
-Version 1.3.1
-    -Fixed electrochem modes broken when database added
-    -Make metadata keys optional.
+Version 1.0.3
+    -Fixed #14: Added support for PMT idle mode
+    -Reduced CPU usage when running OCP by reducing polling frequency
+
+Version 1.0.2a
+    -Hotfix #12: Restored measurement ability on Windows
+    -Minor logging changes
+    -Automatically enable TCS on DStat when measure light sensor button clicked.
     
-Version 1.3.2
-    -Improves initial connection reliability
\ No newline at end of file
+Version 1.0.2
+    -Improved logging system: Log messages now print showing where they came from.
+    -Implemented gobject IO callbacks for experiments:
+        Process will not continuously poll for new data from serial process anymore.
+    -Stop button works again
+    -Buttons in Photodiode and Calibration modules remain insensitive until ready.
diff --git a/README.markdown b/README.markdown
index a0157f9..c428347 100644
--- a/README.markdown
+++ b/README.markdown
@@ -38,9 +38,6 @@ Python and related packages needed: (versions listed are tested, older versions
 * XQuartz (2.7.7)
 * zeromq (4.0.5) and pyzmq (14.6.0)
 * pyyaml (3.11)
-* zodb
-* zeo
-* psutil
 
 Optional:
 
@@ -168,4 +165,4 @@ If the connection failed, unplug the DStat and try again.
 3. Set an appropriate potentiostat gain.
 4. Click Execute.
 
-![experiment](images/3.png)
\ No newline at end of file
+![experiment](images/3.png)
-- 
GitLab