From a7dd0cfebc7c8ccc55c9ffbafb8a81d9a59196a0 Mon Sep 17 00:00:00 2001
From: Michael Dryden <mdryden@chem.utoronto.ca>
Date: Wed, 26 Nov 2014 18:37:59 -0500
Subject: [PATCH] experiment - Refactor: Change pot_exp_stop() to
 volt_exp_stop()

---
 DSTAT-temp/src/experiment.c | 12 ++++++------
 DSTAT-temp/src/experiment.h |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/DSTAT-temp/src/experiment.c b/DSTAT-temp/src/experiment.c
index cfab49e..d209962 100644
--- a/DSTAT-temp/src/experiment.c
+++ b/DSTAT-temp/src/experiment.c
@@ -225,7 +225,7 @@ void volt_exp_start(void){
 	
 }
 
-void pot_exp_stop(void){
+void volt_exp_stop(void){
 	/**
 	 * Disconnects measurement cell and shorts RE and CE terminals.
 	 */
@@ -302,7 +302,7 @@ void precond(int16_t v1, uint16_t t1, int16_t v2, uint16_t t2){ //assumes potent
 	}
 	
 	aborting:
-		pot_exp_stop();
+		volt_exp_stop();
 		return;
 }
 
@@ -518,7 +518,7 @@ uint8_t lsv_experiment(int16_t start, int16_t stop, uint16_t slope, int8_t first
 			tc_disable(&TCC0);
 			TCC0.CNT = 0x0;
 			tc_disable(&TCC1);
-			pot_exp_stop();
+			volt_exp_stop();
 			ads1255_standby();
 			return ret;
 	}
@@ -621,7 +621,7 @@ void ca_experiment(uint16_t steps, uint16_t step_dac[], uint16_t step_seconds[])
 		tc_set_cca_interrupt_level(&TCC0, TC_INT_LVL_OFF);
 		tc_write_clock_source(&TCC0, TC_CLKSEL_OFF_gc);
 		tc_disable(&TCC0);
-		pot_exp_stop();
+		volt_exp_stop();
 		ads1255_standby();
 
 		return;
@@ -745,7 +745,7 @@ void swv_experiment(int16_t start, int16_t stop, uint16_t step, uint16_t pulse_h
 	printf("D\n\r"); //signal end of experiment
 	
 	aborting:
-		pot_exp_stop();
+		volt_exp_stop();
 		tc_write_clock_source(&TCF0, TC_CLKSEL_OFF_gc);
 		tc_disable(&TCF0);
 		TCF0.CNT = 0;
@@ -915,7 +915,7 @@ void dpv_experiment(int16_t start, int16_t stop, uint16_t step, uint16_t pulse_h
 	printf("D\n\r"); //signal end of experiment
 	
 	aborting:
-		pot_exp_stop();
+		volt_exp_stop();
 		tc_write_clock_source(&TCF0, TC_CLKSEL_OFF_gc);
 		tc_disable(&TCF0);
 		TCF0.CNT = 0;
diff --git a/DSTAT-temp/src/experiment.h b/DSTAT-temp/src/experiment.h
index 2de19ab..943d15a 100644
--- a/DSTAT-temp/src/experiment.h
+++ b/DSTAT-temp/src/experiment.h
@@ -77,7 +77,7 @@ void send_data_int32(int32_t data);
 void pot_init(void);
 void pot_set_gain(void);
 void volt_exp_start(void);
-void pot_exp_stop(void);
+void volt_exp_stop(void);
 void precond(int16_t v1, uint16_t t1, int16_t v2, uint16_t t2);
 void cv_experiment(int16_t v1, int16_t v2, int16_t start, uint8_t scans, uint16_t slope);
 uint8_t lsv_experiment(int16_t start, int16_t stop, uint16_t slope, int8_t first_run);
-- 
GitLab