Diff: task.cpp

Revision:

16:33c17c62840e

Parent:

15:20f7f737c256

Child:

17:0b241aa1f5b6

--- a/task.cpp	Mon Jun 25 17:43:40 2018 +0000
+++ b/task.cpp	Sat Jun 30 12:28:18 2018 +0000
@@ -5,20 +5,21 @@
 
 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,  3000),
-    aud_dur_ms  (CHR_AUD_DUR,   4000),
-    aud_tick_hz (CHR_AUD_FREQ,  4),
-    resp_dur_ms (CHR_RESP_DUR,  1000),
-    post_dur_ms (CHR_POST_DUR,  4000),
-    reward_ms   (CHR_REWARD_DUR,10),
-    pre_min_ms  (CHR_PRE_MIN,   500),
-    vis_min_ms  (CHR_VIS_MIN,   1),
-    vis_avg_ms  (CHR_VIS_AVG,   60),
-    vis_fail_perc(CHR_VIS_FAIL, 30),
-    test_reward (CMD_TEST_REWARD, callback(this, &Task::testReward)),
-    run         (CMD_EXECUTE,     callback(this, &Task::runTrial))
+    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,      3000),
+    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),
+    test_reward     (CMD_TEST_REWARD, callback(this, &Task::testReward)),
+    run             (CMD_EXECUTE,     callback(this, &Task::runTrial))
 { }
 
 const char ModeSelection::CMD_ID_MODE        = '_';
@@ -26,6 +27,7 @@
 const char ModeSelection::CMD_MODE_REPORT    = 'R';
 const char ModeSelection::CMD_MODE_ASSOCIATE = 'A';
 const char ModeSelection::CMD_MODE_MOTION    = 'M';
+const char ModeSelection::CMD_MODE_MOTION_ALT= 'N';
 
 ModeSelection::ModeSelection(const Mode& defaultValue):
     value(defaultValue) {
@@ -42,6 +44,7 @@
     case CMD_MODE_REPORT:       value = Report;    return true;
     case CMD_MODE_ASSOCIATE:    value = Associate; return true;
     case CMD_MODE_MOTION:       value = Motion;    return true;
+    case CMD_MODE_MOTION_ALT:   value = MotionAlt; return true;
     default:
         return false;
     }
@@ -53,6 +56,7 @@
     WRITE(CMD_MODE_REPORT,      Report)
     WRITE(CMD_MODE_ASSOCIATE,   Associate)
     WRITE(CMD_MODE_MOTION,      Motion)
+    WRITE(CMD_MODE_MOTION_ALT,  MotionAlt)
 #undef WRITE
     return true;
 }