@@ -402,11 +402,13 @@ function stop(obj)
402402
403403 function set .isArmed(obj , isArmed )
404404 if isArmed
405- assert(~obj .isGeneratorRunning , ' Cannot arm target while generator is running.' );
405+ if obj .isGeneratorRunning
406+ obj .logObj .error(' Cannot arm target while generator is running.' );
407+ end
406408 setparam(obj , ' GEN' , ' enabled' , true );
407409 setparam(obj , ' TRG' , ' enabled' , 1 );
408410 if ~obj .isRunning
409- obj .logObj .info(' bossdevice is armed and ready to start.' );
411+ obj .logObj .info(' bossdevice is armed and ready to trigger. Call start to begin the sequence .' );
410412 end
411413 else
412414 setparam(obj , ' GEN' , ' enabled' , false );
@@ -468,20 +470,26 @@ function sendPulse(obj, port, width, marker)
468470 end
469471
470472 function manualTrigger(obj )
471- setparam(obj , ' GEN' , ' enabled' , true );
472- setparam(obj , ' TRG' , ' enabled' , 0 );
473+ if obj .isRunning
474+ setparam(obj , ' GEN' , ' enabled' , true );
475+ setparam(obj , ' TRG' , ' enabled' , 0 );
473476
474- setparam(obj , ' GEN' , ' manualtrigger' , true );
475- setparam(obj , ' GEN' , ' manualtrigger' , false );
477+ setparam(obj , ' GEN' , ' manualtrigger' , true );
478+ setparam(obj , ' GEN' , ' manualtrigger' , false );
476479
477- obj .logObj .info(' Triggering sequence...' );
480+ obj .logObj .info(' Triggering sequence (press Ctrl-C to abort) ...' );
478481
479- % Block execution of manualTrigger while generator is running
480- while obj .isGeneratorRunning
481- pause(0.1 );
482- end
482+ % Block execution of manualTrigger while generator is running
483+ while obj .isGeneratorRunning
484+ pause(0.1 );
485+ end
486+
487+ obj .logObj .info(' Sequence completed.' );
483488
484- obj .logObj .info(' Sequence completed.' );
489+ else
490+ obj .logObj .error(' Target "%s " is not running yet. Start it before sending a trigger.' ,...
491+ obj .targetObject .TargetSettings .name );
492+ end
485493 end
486494
487495 function openDocumentation(obj )
0 commit comments