app/data/cfg.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.7.21",
+  "version": "1.7.20",
   "ext_port": 1111,
   "profiles": {
     "mcopy": {

app/js/app.js

@@ -2497,7 +2497,6 @@ const devices 	= require('./lib/ui/devices.js');
 const filmout 	= require('./lib/ui/filmout.js');
 const mse 		= require('./lib/ui/mscript.js');
 const capper    = require('./lib/ui/capper.js');
-const timing    = require('./lib/ui/timing.js');
 const Mscript 	= require('./lib/mscript');
 const { delay }	= require('./lib/delay');
 const alertObj  = require('./lib/ui/alert.js');

app/lib/cmd/index.js

@@ -612,21 +612,6 @@ class Commands {
         }
         return ms;
     }
-    /**
-     * Pauses a sequence for a length of time
-     *
-     * @returns {integer} Length of action in ms
-     **/
-    async pause(cmd) {
-        let ms;
-        try {
-            ms = await delay_1.delay(cmd.light * 1000); //delay is in seconds
-        }
-        catch (err) {
-            throw err;
-        }
-        return ms;
-    }
 }
 module.exports = function (cfg, proj, cam, light, alert, cam2, proj2, capper) {
     return new Commands(cfg, proj, cam, light, alert, cam2, proj2, capper);

app/lib/delay/index.d.ts

@@ -0,0 +1,8 @@
+/**
+ * Delay in an async/await function
+ *
+ * @param {integer}  ms 	Milliseconds to delay for
+ *
+ * @returns {Promise} Promise to resolve after timeout
+ **/
+declare function delay(ms: number): Promise<unknown>;

app/lib/devices/index.js

@@ -41,16 +41,9 @@ class Devices {
      * local settings object.
      **/
     listener(event, arg) {
-        if (typeof arg.profile !== 'undefined') {
+        this.log.info(`Saving profile ${arg.profile}`, 'SETTINGS', false, false);
-            this.log.info(`Saving profile ${arg.profile}`, 'SETTINGS', false, false);
+        this.settings.update('profile', arg.profile);
-            this.settings.update('profile', arg.profile);
+        this.settings.save();
-            this.settings.save();
-        }
-        if (typeof arg.timing !== 'undefined') {
-            this.log.info(`Saving timing info`, 'SETTINGS', false, false);
-            this.settings.update('timing', arg.timing);
-            this.settings.save();
-        }
     }
     /**
      *
@@ -517,9 +510,6 @@ class Devices {
             light,
             profile: this.settings.state.profile
         };
-        if (this.settings.state.timing) {
-            args.timing = this.settings.state.timing;
-        }
         if (projector_second && projector_second.arduino) {
             args.projector_second = projector_second;
             this.settings.update('projector_second', projector_second);

app/lib/mscript/index.d.ts

@@ -212,23 +212,17 @@ export default class Mscript {
      */
     light_state(str: string): void;
     /**
-     * Interpret a delay command
+     * Interpret a pause command
      *
-     * @param {string} line String containing delay command
+     * @param {string} line String containing pause command
      **/
-    delay(line: string): void;
+    pause(line: string): void;
     /**
     * Interpret an alert command
     *
-    * @param {string} line String containing alert message
+    * @param {string} line String containing pause command
     **/
     alert(line: string): void;
-    /**
-    * Interpret an pause command
-    *
-    * @param {string} line String containing alert message
-    **/
-    pause(line: string): void;
     /**
      * Throw an error with specific message
      *

app/lib/mscript/index.js

@@ -60,7 +60,6 @@ const ALTS = {
     'PFPB': [],
     'PBPF': []
 };
-const DELAY = 'DELAY';
 const PAUSE = 'PAUSE';
 const ALERT = 'ALERT';
 /** helper functions */
@@ -150,11 +149,8 @@ class Mscript {
             else if (CMD.indexOf(this.two) !== -1) {
                 this.basic_cmd(line, this.two);
             }
-            else if (startsWith(line, DELAY)) {
-                this.delay(line);
-            }
             else if (startsWith(line, PAUSE)) {
-                this.pause(line);
+                //this.pause(line);
             }
             else if (startsWith(line, ALERT)) {
                 this.alert(line);
@@ -901,11 +897,11 @@ class Mscript {
         this.color = color;
     }
     /**
-     * Interpret a delay command
+     * Interpret a pause command
      *
-     * @param {string} line String containing delay command
+     * @param {string} line String containing pause command
      **/
-    delay(line) {
+    pause(line) {
         let lenStr = line.split(' ')[1] || '';
         let len;
         lenStr = lenStr.trim();
@@ -922,19 +918,19 @@ class Mscript {
         if (this.rec !== -1) {
             //hold generated arr in state loop array
             this.loops[this.rec].arr
-                .push('DE');
+                .push('PA');
             this.loops[this.rec].meta
                 .push(lenStr);
         }
         else {
-            this.arr.push('DE');
+            this.arr.push('PA');
             this.meta.push(lenStr);
         }
     }
     /**
     * Interpret an alert command
     *
-    * @param {string} line String containing alert message
+    * @param {string} line String containing pause command
     **/
     alert(line) {
         let msg = line.split(' ')[1] || '';
@@ -951,25 +947,6 @@ class Mscript {
             this.meta.push(line);
         }
     }
-    /**
-    * Interpret an pause command
-    *
-    * @param {string} line String containing alert message
-    **/
-    pause(line) {
-        const msg = "Paused script. Click OK to continue.";
-        if (this.rec !== -1) {
-            //hold generated arr in state loop array
-            this.loops[this.rec].arr
-                .push('AL');
-            this.loops[this.rec].meta
-                .push(msg);
-        }
-        else {
-            this.arr.push('AL');
-            this.meta.push(msg);
-        }
-    }
     /**
      * Throw an error with specific message
      *

app/lib/settings/index.js

@@ -19,8 +19,7 @@ class Settings {
             camera: {},
             projector: {},
             light: {},
-            capper: {},
+            capper: {}
-            timing: {}
         };
         this.state = this.freshState();
     }

app/lib/settings/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/settings/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/settings/index.ts"],"names":[],"mappings":"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"}

app/lib/ui/cam.js

@@ -80,7 +80,6 @@ cam.end = function (c, id, ms) {
 		}
 		gui.counterUpdate('cam2', cam.second.pos);
 	}
-	timing.update(c, ms);
 	gui.counterUpdate('cam', cam.pos)
 	if (typeof cam.queue[id] !== 'undefined') {
 		if (typeof cam.queue[id].callback !== 'undefined') {
@@ -183,7 +182,6 @@ cam.second.end = function (c, id, ms) {
 			cam.second.pos -= 1;
 		}
 	}
-	timing.update(c, ms);
 	gui.counterUpdate('cam2', cam.second.pos)
 	if (typeof cam.second.queue[id] !== 'undefined') {
 		if (typeof cam.queue[id].callback !== 'undefined') {

app/lib/ui/devices.js

@@ -83,12 +83,8 @@ class Devices {
                 else {
                     light.enable();
                 }
-                timing.reset(p);
                 //devices.profile(arg.profile)
             }
-            if (arg && arg.timing) {
-                timing.restore(arg.timing);
-            }
             if (arg.projector_second) {
                 //add second row of projector pads to grid
                 proj.second.enable();
@@ -132,7 +128,6 @@ class Devices {
         for (let key of keys) {
             cfg[key] = keys[key];
         }
-        timing.reset(p);
         if (typeof p.light !== 'undefined' && p.light === false) {
             light.disable();
         }
@@ -140,7 +135,6 @@ class Devices {
             light.enable();
         }
         ipcRenderer.send('profile', { profile });
-        timing.store();
     }
     intval() {
         const url = $('#intval').val();

app/lib/ui/proj.js

@@ -173,7 +173,6 @@ proj.second.end = function (c, id, ms) {
 			proj.second.pos -= 1;
 		}
 	}
-	timing.update(c, ms);
 	gui.counterUpdate('proj2', proj.second.pos);
 	if (typeof proj.second.queue[id] !== 'undefined') {
 		if (typeof proj.second.queue[id].callback !== 'undefined') {

app/lib/ui/seq.js

@@ -51,8 +51,6 @@ class Sequence {
                     $('#cmd_capper_off').addClass('active');
                     $('#cmd_capper_on').removeClass('active');
                 }
-                this.stats();
-                timing.store();
             }
         }
         return event.returnValue = true;
@@ -180,8 +178,23 @@ class Sequence {
             if (!step)
                 continue;
             c = step.cmd;
-            ms += timing.get(c);
+            if (c === cfg.cmd.camera_forward || c === cfg.cmd.camera_backward) {
-            ms += cfg.arduino.serialDelay;
+                ms += cfg.arduino.cam.time;
+                ms += cfg.arduino.cam.delay;
+                ms += cfg.arduino.serialDelay;
+            }
+            if (c === cfg.cmd.projector_forward || c === cfg.cmd.projector_backward) {
+                ms += cfg.arduino.proj.time;
+                ms += cfg.arduino.proj.delay;
+                ms += cfg.arduino.serialDelay;
+            }
+            if (c === cfg.cmd.black_forward || c === cfg.cmd.black_backward) {
+                ms += cfg.arduino.black.before;
+                ms += cfg.arduino.black.after;
+                ms += cfg.arduino.cam.time;
+                ms += cfg.arduino.cam.delay;
+                ms += cfg.arduino.serialDelay;
+            }
             ms += cfg.arduino.sequenceDelay;
             if (c === cfg.cmd.camera_forward || c === cfg.cmd.black_forward) {
                 cam_total++;

app/lib/ui/timing.js

@@ -1,96 +0,0 @@
-'use strict';
-let timing;
-class Timing {
-    constructor() {
-        this.data = {};
-        this.fromArduino = {
-            'c': 'cam',
-            '3': 'cam2',
-            '4': 'cams',
-            'b': 'black',
-            'p': 'proj',
-            'w': 'proj2',
-            'x': 'projs'
-        };
-        this.fromCmd = {
-            'CF': 'cam',
-            'CB': 'cam',
-            'BF': 'black',
-            'BB': 'black',
-            'C2F': 'cam2',
-            'C2B': 'cam2',
-            'CCF': 'cams',
-            'CCB': 'cams',
-            'CFCB': 'cams',
-            'CBCF': 'cams',
-            'PF': 'proj',
-            'PB': 'proj',
-            'P2F': 'proj2',
-            'P2B': 'proj2',
-            'PPF': 'projs',
-            'PPB': 'projs',
-            'PFPB': 'projs',
-            'PBPF': 'projs'
-        };
-    }
-    reset(profile) {
-        const keys = Object.keys(profile);
-        const cmds = Object.keys(cfg.cmd);
-        let cam;
-        let proj;
-        let pad;
-        for (let key of keys) {
-            console.log(key);
-            if (key === 'label') {
-                continue;
-            }
-            else if (key === 'cam') {
-                cam = 0;
-                cam += profile[key].time;
-                cam += profile[key].delay;
-                cam += profile[key].momentary;
-                pad = 0;
-                if (typeof profile['black'] !== 'undefined' && typeof profile['black'].before !== 'undefined' && typeof profile['black'].after !== 'undefined') {
-                    pad = (profile['black'].before + profile['black'].after);
-                }
-                this.data['cam'] = cam;
-                this.data['cam2'] = cam;
-                this.data['cams'] = cam;
-                this.data['black'] = cam + pad;
-            }
-            else if (key === 'proj') {
-                proj = 0;
-                proj += profile[key].time;
-                proj += profile[key].delay;
-                proj += profile[key].momentary;
-                this.data['proj'] = proj;
-                this.data['proj2'] = proj;
-                this.data['projs'] = proj;
-            }
-        }
-    }
-    restore(timing) {
-        this.data = timing;
-    }
-    //update with rolling average
-    update(c, ms) {
-        let cmd = this.fromArduino[c];
-        if (typeof cmd !== 'undefined' && typeof this.data[cmd] !== 'undefined') {
-            this.data[cmd] = Math.round((this.data[cmd] + ms) / 2);
-        }
-    }
-    //get current value
-    get(c) {
-        const cmd = this.fromCmd[c];
-        if (typeof cmd !== 'undefined' && typeof this.data[cmd] !== 'undefined') {
-            return this.data[cmd];
-        }
-        return 0;
-    }
-    store() {
-        ipcRenderer.send('profile', { timing: this.data });
-    }
-}
-timing = new Timing();
-module.exports = timing;
-//# sourceMappingURL=timing.js.map

app/lib/ui/timing.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"timing.js","sourceRoot":"","sources":["../../src/lib/ui/timing.ts"],"names":[],"mappings":"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"}

app/main.js

@@ -20,26 +20,26 @@ const { delay } = require('delay')
 //Objects
 const mcopy = {}
 
-let SYSTEM
+let SYSTEM;
-let log
+let log;
-let mainWindow
+let mainWindow;
-let arduino
+let arduino;
-let menu
+let menu;
-let display
+let display;
-let ffmpeg
+let ffmpeg;
-let ffprobe
+let ffprobe;
-let cam
+let cam;
-let cam2
+let cam2;
-let proj
+let proj;
-let proj2
+let proj2;
-let light
+let light;
-let filmout
+let filmout;
-let dev
+let dev;
-let cmd
+let cmd;
-let seq
+let seq;
-let capper
+let capper;
-let alert
+let alert;
-let server
+let server;
 
 const cfg = require('./data/cfg.json')
 
@@ -142,12 +142,12 @@ var init = async function () {
 app.on('ready', init)
 
 app.on('window-all-closed', () => {
-	app.quit()
+	app.quit();
 });
 
 app.on('activate', () => {
 	if (mainWindow === null) {
-		createWindow()
+		createWindow();
 	}
 });
 

app/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "mcopy-app",
-  "version": "1.7.21",
+  "version": "1.7.20",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {

app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mcopy-app",
-  "version": "1.7.21",
+  "version": "1.7.20",
   "description": "GUI for the mcopy small gauge film optical printer platform",
   "main": "main.js",
   "scripts": {

app/src/index.js

@@ -23,7 +23,6 @@ const devices 	= require('./lib/ui/devices.js');
 const filmout 	= require('./lib/ui/filmout.js');
 const mse 		= require('./lib/ui/mscript.js');
 const capper    = require('./lib/ui/capper.js');
-const timing    = require('./lib/ui/timing.js');
 const Mscript 	= require('./lib/mscript');
 const { delay }	= require('./lib/delay');
 const alertObj  = require('./lib/ui/alert.js');

app/src/lib/ui/devices.ts

@@ -79,12 +79,8 @@ class Devices {
 			} else {
 				light.enable();
 			}
-			timing.reset(p);
 			//devices.profile(arg.profile)
 		}
-		if (arg && arg.timing) {
-			timing.restore(arg.timing);
-		}
 		
 		if (arg.projector_second) {
 			//add second row of projector pads to grid
@@ -130,17 +126,14 @@ class Devices {
 		const p : any = cfg.profiles[profile];
 		const keys : any[] = Object.keys(p);
 		for (let key of keys) {
-			cfg[key] = keys[key];
+			cfg[key] = keys[key]
 		}
-		timing.reset(p);
 		if (typeof p.light !== 'undefined' && p.light === false) {
 			light.disable();
 		} else {
 			light.enable();
 		}
 		ipcRenderer.send('profile', { profile })
-		timing.store();
-
 	}
 
 	intval () {

app/src/lib/ui/seq.ts

@@ -75,8 +75,6 @@ class Sequence {
 					$('#cmd_capper_off').addClass('active');
 					$('#cmd_capper_on').removeClass('active');
 				}
-				this.stats();
-				timing.store();
 			}
 		}
 		return event.returnValue = true;
@@ -209,13 +207,28 @@ class Sequence {
 			}
 			return true;
 		});
-		
+
 		//timing
 		for (let step of this.grid) {
 			if (!step) continue
 			c = step.cmd;
-			ms += timing.get(c);
+			if (c === cfg.cmd.camera_forward || c === cfg.cmd.camera_backward){
-			ms += cfg.arduino.serialDelay;
+				ms += cfg.arduino.cam.time;
+				ms += cfg.arduino.cam.delay;
+				ms += cfg.arduino.serialDelay;
+			}
+			if (c === cfg.cmd.projector_forward || c === cfg.cmd.projector_backward){
+				ms += cfg.arduino.proj.time;
+				ms += cfg.arduino.proj.delay;
+				ms += cfg.arduino.serialDelay;
+			}
+			if (c === cfg.cmd.black_forward || c === cfg.cmd.black_backward){
+				ms += cfg.arduino.black.before;
+				ms += cfg.arduino.black.after;
+				ms += cfg.arduino.cam.time;
+				ms += cfg.arduino.cam.delay;
+				ms += cfg.arduino.serialDelay;
+			}
 			ms += cfg.arduino.sequenceDelay;
 
 			if (c === cfg.cmd.camera_forward || c === cfg.cmd.black_forward) {

app/src/lib/ui/timing.ts

@@ -1,113 +0,0 @@
-'use strict';
-
-let timing : Timing;
-
-interface TimingData {
-	[key: string]: number;
-}
-
-class Timing {
-	public data : TimingData = {
-
-	}
-
-	private fromArduino : any = {
-		'c' : 'cam',
-    	'3' : 'cam2',
-    	'4' : 'cams',
-    	'b' : 'black',
-		'p' : 'proj',
-   		'w' : 'proj2',
-		'x' : 'projs'
-	}
-
-	private fromCmd  : any = {
-		'CF' : 'cam',
-		'CB' : 'cam',
-		'BF' : 'black',
-    	'BB' : 'black',
-    	'C2F': 'cam2',
-    	'C2B': 'cam2',
-    	'CCF' : 'cams',
-    	'CCB' : 'cams',
-    	'CFCB': 'cams',
-    	'CBCF': 'cams',
-		'PF' : 'proj',
-		'PB' : 'proj',
-		'P2F' : 'proj2',
-		'P2B' : 'proj2',
-		'PPF' : 'projs',
-		'PPB' : 'projs',
-		'PFPB' : 'projs',
-		'PBPF' : 'projs'
-	}
-
-	constructor () {
-
-	}
-
-	public reset (profile : any) {
-		const keys : string[] = Object.keys(profile);
-		const cmds : string[] = Object.keys(cfg.cmd);
-		let cam : number;
-		let proj : number;
-		let pad : number;
-		for (let key of keys) {
-			if (key === 'label') {
-				continue
-			} else if (key === 'cam') {
-				cam = 0;
-				cam += profile[key].time;
-				cam += profile[key].delay;
-				cam += profile[key].momentary;
-				pad = 0;
-
-				if (typeof profile['black'] !== 'undefined' && typeof profile['black'].before !== 'undefined' && typeof profile['black'].after !== 'undefined') {
-					pad = (profile['black'].before + profile['black'].after);
-				}
-
-				this.data['cam'] = cam 
-				this.data['cam2'] = cam 
-				this.data['cams'] = cam 
-				this.data['black'] = cam + pad
-			} else if (key === 'proj') {
-				proj = 0;
-				proj += profile[key].time;
-				proj += profile[key].delay;
-				proj += profile[key].momentary;
-				this.data['proj'] = proj;
-				this.data['proj2'] = proj;
-				this.data['projs'] = proj;
-			}
-		}
-	}
-
-	public restore (timing : TimingData) {
-		this.data = timing;
-	}
-
-	//update with rolling average
-	public update (c : string, ms : number) {
-		let cmd : string = this.fromArduino[c];
-		if (typeof cmd !== 'undefined' && typeof this.data[cmd] !== 'undefined') {
-			this.data[cmd] = Math.round((this.data[cmd] + ms) / 2);
-		}
-	}
-
-	//get current value
-	public get (c : string) : number {
-		const cmd : string = this.fromCmd[c];
-		if (typeof cmd !== 'undefined' && typeof this.data[cmd] !== 'undefined') {
-			return this.data[cmd];
-		}
-		return 0;
-	}
-
-	public store () {
-		ipcRenderer.send('profile', { timing : this.data })
-	}
-}
-
-timing = new Timing();
-
-module.exports = timing;

data/cfg.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.7.21",
+  "version": "1.7.20",
   "ext_port": 1111,
   "profiles": {
     "mcopy": {

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "mcopy",
-  "version": "1.7.21",
+  "version": "1.7.20",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "mcopy",
-      "version": "1.7.21",
+      "version": "1.7.20",
       "license": "MIT",
       "dependencies": {
         "arduino": "file:app/lib/arduino",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mcopy",
-  "version": "1.7.21",
+  "version": "1.7.20",
   "description": "Small gauge film optical printer platform",
   "main": "build.js",
   "directories": {

processing/mcopy/cfg.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.7.21",
+  "version": "1.7.20",
   "ext_port": 1111,
   "profiles": {
     "mcopy": {

src/cmd/index.ts

@@ -619,23 +619,6 @@ class Commands {
 		}
 		return ms;
 	}
-
-
-	/**
-	 * Pauses a sequence for a length of time
-	 * 
-	 * @returns {integer} Length of action in ms 
-	 **/
-
-	public async pause (cmd : any) {
-		let ms : number;
-		try {
-			ms = await delay(cmd.light * 1000); //delay is in seconds
-		} catch (err) {
-			throw err;
-		}
-		return ms;
-	}
 }
 
 module.exports = function (cfg : any, proj : any, cam : any, light : any, alert : any, cam2 : any, proj2 : any, capper : any) {

src/devices/index.ts

@@ -53,16 +53,9 @@ class Devices {
 	 * local settings object.
 	 **/
 	private listener (event : any, arg : any){
-		if (typeof arg.profile !== 'undefined') {
+		this.log.info(`Saving profile ${arg.profile}`, 'SETTINGS', false, false);
-			this.log.info(`Saving profile ${arg.profile}`, 'SETTINGS', false, false);
+		this.settings.update('profile', arg.profile);
-			this.settings.update('profile', arg.profile);
+		this.settings.save();
-			this.settings.save();
-		}
-		if (typeof arg.timing !== 'undefined') {
-			this.log.info(`Saving timing info`, 'SETTINGS', false, false);
-			this.settings.update('timing', arg.timing);
-			this.settings.save();
-		}
 	}
 	/**
 	 * 
@@ -508,10 +501,7 @@ class Devices {
 			camera, 
 			projector, 
 			light, 
-			profile: this.settings.state.profile
+			profile: this.settings.state.profile 
-		}
-		if (this.settings.state.timing) {
-			args.timing = this.settings.state.timing
 		}
 
 		if (projector_second && projector_second.arduino) {

src/mscript/index.ts

@@ -72,7 +72,6 @@ const ALTS : any = {
     'PBPF' : [ ]
 };
 
-const DELAY : string = 'DELAY';
 const PAUSE : string = 'PAUSE';
 const ALERT : string = 'ALERT';
 
@@ -191,10 +190,8 @@ export default class Mscript {
 				this.basic_cmd(line, this.three);
 			} else if (CMD.indexOf(this.two) !== -1) {
 				this.basic_cmd(line, this.two);
-			} else if (startsWith(line, DELAY)) {
-				this.delay(line);
 			} else if (startsWith(line, PAUSE)) {
-				this.pause(line);
+				//this.pause(line);
 			} else if (startsWith(line, ALERT)) {
 				this.alert(line);
 			} else if (startsWith(line, '@') || line.indexOf('@') !== -1) {
@@ -889,11 +886,11 @@ export default class Mscript {
 	}
 
 	/**
-	 * Interpret a delay command
+	 * Interpret a pause command
 	 * 
-	 * @param {string} line String containing delay command
+	 * @param {string} line String containing pause command
 	 **/
-	 delay (line : string) {
+	 pause (line : string) {
 	 	let lenStr : string = line.split(' ')[1] || ''
 	 	let len : number;
 	 	lenStr = lenStr.trim();
@@ -913,11 +910,11 @@ export default class Mscript {
 	 	if (this.rec !== -1) {
 			//hold generated arr in state loop array
 			this.loops[this.rec].arr
-				.push('DE');
+				.push('PA');
 			this.loops[this.rec].meta
 				.push(lenStr);
 		} else {
-			this.arr.push('DE');
+			this.arr.push('PA');
 			this.meta.push(lenStr);
 		}
 	 }
@@ -925,7 +922,7 @@ export default class Mscript {
 	 /**
 	 * Interpret an alert command
 	 * 
-	 * @param {string} line String containing alert message
+	 * @param {string} line String containing pause command
 	 **/
 	 alert (line : string) {
 	 	let msg : string = line.split(' ')[1] || ''
@@ -942,25 +939,6 @@ export default class Mscript {
 		}
 	 }
 
-	 /**
-	 * Interpret an pause command
-	 * 
-	 * @param {string} line String containing alert message
-	 **/
-	 pause (line : string) {
-	 	const msg : string = "Paused script. Click OK to continue."
-	 	if (this.rec !== -1) {
-			//hold generated arr in state loop array
-			this.loops[this.rec].arr
-				.push('AL');
-			this.loops[this.rec].meta
-				.push(msg);
-		} else {
-			this.arr.push('AL');
-			this.meta.push(msg);
-		}
-	 }
-
 	/**
 	 * Throw an error with specific message
 	 *

src/settings/index.ts

@@ -16,8 +16,7 @@ class Settings {
 		camera : {},
 		projector : {},
 		light : {},
-		capper : {},
+		capper : {}
-		timing : {}
 	}
 	public state : any;
 	/**