Diff: task.cpp

Revision:

18:66246d6c5476

Parent:

17:0b241aa1f5b6

Child:

20:4c06d3041337

--- a/task.cpp	Sun Jul 01 13:00:43 2018 +0000
+++ b/task.cpp	Sun Jul 01 13:08:06 2018 +0000
@@ -5,19 +5,19 @@
 
 Task::Task(const Mode& mode):
     mode(mode),
-    delay_min_ms    (CHR_DELAY_MIN,     3000), 
-    delay_var_ms    (CHR_DELAY_VAR,     3000),
-    prep_dur_ms     (CHR_PREP_DUR,      1500),
-    aud_dur_ms      (CHR_AUD_DUR,       4000),
-    aud_tick_hz     (CHR_AUD_FREQ,      4),
-    resp_dur_ms     (CHR_RESP_DUR,      1500),
-    post_dur_ms     (CHR_POST_DUR,      4000),
-    reward_on_ms    (CHR_REWARD_ONSET,  350),
-    reward_dur_ms   (CHR_REWARD_DUR,    50),
-    pre_min_ms      (CHR_PRE_MIN,       500),
-    vis_min_ms      (CHR_VIS_MIN,       1),
-    vis_avg_ms      (CHR_VIS_AVG,       100),
-    vis_fail_perc   (CHR_VIS_FAIL,      30),
+    delay_min_ms    (CFG_DELAY_MIN), 
+    delay_var_ms    (CFG_DELAY_VAR),
+    prep_dur_ms     (CFG_PREP_DUR),
+    aud_dur_ms      (CFG_AUD_DUR),
+    aud_tick_hz     (CFG_AUD_FREQ),
+    resp_dur_ms     (CFG_RESP_DUR),
+    post_dur_ms     (CFG_POST_DUR),
+    reward_on_ms    (CFG_REWARD_ONSET),
+    reward_dur_ms   (CFG_REWARD_DUR),
+    pre_min_ms      (CFG_PRE_MIN),
+    vis_min_ms      (CFG_VIS_MIN),
+    vis_avg_ms      (CFG_VIS_AVG),
+    vis_fail_perc   (CFG_VIS_FAIL),
     test_reward     (CMD_TEST_REWARD, callback(this, &Task::testReward)),
     run             (CMD_EXECUTE,     callback(this, &Task::runTrial))
 { }