Add getString and print methods

Update commands
Socket connector work
2023-03-18 17:04:06 -04:00 · 2023-03-18 17:00:13 -04:00 · 2023-03-18 17:00:02 -04:00 · 2023-03-18 16:59:26 -04:00
24 changed files with 709 additions and 296 deletions
--- a/app/data/cfg.json
+++ b/app/data/cfg.json
@ -186,7 +186,10 @@
      "capper_on": "A",
      "capper_off": "B",
      "takeup_forward": "D",
-      "takeup_backward": "E"
+      "takeup_backward": "F",
+      "error" : "E",
+      "camera_exposure" : "G",
+      "state" : "H"
    }
  }
 }
--- a/app/lib/server/index.js
+++ b/app/lib/server/index.js
@ -1,4 +1,4 @@
-"use strict";
+'use strict';
 var __importDefault = (this && this.__importDefault) || function (mod) {
    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@ -10,7 +10,7 @@ const path_1 = require("path");
 const uuid_1 = require("uuid");
 const Log = require("log");
 class Server {
-    constructor() {
+    constructor(uiInput) {
        this.id = 'server';
        this.isActive = false;
        this.templates = [
@ -29,6 +29,7 @@ class Server {
        this.queue = {};
        this.intervalPeriod = 10000; //10 sec
        this.init();
+        this.ui = uiInput;
    }
    async init() {
        this.log = await Log({ label: this.id });
@ -59,8 +60,9 @@ class Server {
            this.log.error(err);
            return;
        }
-        this.wss.on('connection', async function (ws) {
-            ws.on("message", function (data) {
+        this.wss.on('connection', async function (ws, req) {
+            const address = req.socket.remoteAddress;
+            ws.on('message', function (data) {
                let obj = JSON.parse(data);
                //this.log.info(data)
                if (obj.id && this.queue[obj.id]) {
@ -73,9 +75,11 @@ class Server {
            }.bind(this));
            ws.on('close', function () {
                this.log.info('Client disconnected');
+                this.notify('Client disconnected', `No longer forwarding digital display to client ${address}`);
            }.bind(this));
            await this.cmd(ws, 'mcopy');
            this.log.info('Client connected');
+            this.notify('Client connected', `Forwarding digital display to client: ${address}`);
        }.bind(this));
        this.log.info(`Websocket server started!`);
        this.log.info(`WSS [ ws://localhost:${this.wsPort} ]`);
@ -190,8 +194,11 @@ class Server {
            //setTimeout() ?
        }.bind(this));
    }
+    notify(title, message) {
+        this.ui.send('gui', { notify: { title, message } });
+    }
 }
-module.exports = function () {
-    return new Server();
+module.exports = function (ui) {
+    return new Server(ui);
 };
 //# sourceMappingURL=index.js.map
--- a/app/lib/server/index.js.map
+++ b/app/lib/server/index.js.map
--- a/app/lib/ui/devices.js.map
+++ b/app/lib/ui/devices.js.map
--- a/app/lib/ui/index.js
+++ b/app/lib/ui/index.js
@ -1,267 +1,293 @@
 /* jslint esversion: 6*/
-
-const gui = {};
-
-//GUI
-gui.init = function () {
-	gui.version();
+'use strict';
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
 };
-
-gui.fmtZero = function (val, len) {
-	'use strict';
-	const raw = val;
-	let str = val + '';
-	let output = '';
-	if (raw < 0) {
-		output = '-' + Array(len - (str.length - 1)).join('0') + str.replace('-', '');
-	} else {
-		if (str.length < len) {
-			output = Array(len - str.length).join('0') + str;
-		} else if (str.length >= len) {
-			str = parseInt(str) + '';
-			output = Array(len - str.length).join('0') + str;
-		}
-	}
-	return output;
-};
-gui.counterFormat = function (t, normal, prevent) {
-	'use strict';
-	const raw = t.value;
-	t.value = gui.fmtZero(raw, 6);
-	if (typeof normal !== 'undefined' && parseInt(raw) !== normal) {
-		$(t).addClass('changed');
-	} else {
-		$(t).removeClass('changed');
-	}
-};
-gui.counterUpdate = function (which, raw) {
-	'use strict';
-	const formattedVal = gui.fmtZero(raw, 6);
-	$(`.${which} .count`).val(formattedVal);
-};
-gui.notifierWorking = true;
-gui.notify = function (title, message) {
-	'use strict';
-	if (!gui.notifierWorking) {
-		return true;
-	}
-	return new Promise((resolve, reject) => {
-		try {
-			notifier.notify({
-				title: title,
-				message: message,
-				//icon: path.join(__dirname, 'coulson.jpg'), // Absolute path (doesn't work on balloons) 
-				sound: true, // Only Notification Center or Windows Toasters 
-				wait: true // Wait with callback, until user action is taken against notification 
-				}, function (err, response) {
-					// Response is response from notification 
-					if (err) {
-						gui.notifierWorking = false;
-						log.error(`Error with notification`, err);
-						return reject(err);
-					}
-					return resolve(true);
-			});
-		} catch (err) {
-			gui.notifierWorking = false;
-			//notify-send is not found
-			//determine an alternate for raspian
-			//this feels like a hack
-		}
-	});
-};
-gui.updateCam = async function (t) {
-	'use strict';
-	const val = t.value;
-	let change;
-
-	if (parseInt(val) === cam.pos) { 
-		return false; 
-	}
-	change = await gui.confirm(`Are you sure you want to set camera counter to ${val}?`);
-
-	if (change) {
-		cam.pos = parseInt(val);
-		gui.updateState();
-	} else {
-		t.value = cam.pos;
-		gui.counterFormat(t);
-	}
-};
-gui.updateCam2 = async function (t) {
-	'use strict';
-	const val = t.value;
-	let change;
-
-	if (parseInt(val) === cam.pos) { 
-		return false; 
-	}
-	change = await gui.confirm(`Are you sure you want to set second camera counter to ${val}?`);
-
-	if (change) {
-		cam.second.pos = parseInt(val);
-		gui.updateState();
-	} else {
-		t.value = cam.second.pos;
-		gui.counterFormat(t);
-	}
-};
-gui.updateProj = async function (t) {
-	'use strict';
-	const val = t.value;
-	let change;
-	if (parseInt(val) === proj.pos) { 
-		return false; 
-	}
-	change = await gui.confirm(`Are you sure you want to set projector counter to ${val}?`);
-	if (change) {
-		proj.pos = parseInt(val);
-		gui.updateState();
-	} else {
-		t.value = proj.pos;
-		gui.counterFormat(t);
-	}
-	proj.setValue(t.value);
-};
-gui.updateProj2 = async function (t) {
-	'use strict';
-	const val = t.value;
-	let change;
-	if (parseInt(val) === proj.second.pos) { 
-		return false; 
-	}
-	change = await gui.confirm(`Are you sure you want to set second projector counter to ${val}?`);
-	if (change) {
-		proj.second.pos = parseInt(val);
-		gui.updateState();
-	} else {
-		t.value = proj.second.pos;
-		gui.counterFormat(t);
-	}
-	proj.setValue(t.value);
-};
-
-gui.updateState = function () {
-	'use strict';
-	const cpos = cam.pos;
-	const ppos = proj.pos;
-	
-	const p2pos = proj.second.pos;
-	const c2pos = cam.second.pos;
-
-	$('#seq_cam_count').val(cpos).change();
-	$('#seq_proj_count').val(ppos).change();
-
-	$('#seq_cam_count_2').val(cpos).change();
-	$('#seq_proj_count_2').val(ppos).change();
-
-	$('#seq_cam_2_count').val(c2pos).change();
-	$('#seq_proj_2_count').val(p2pos).change();
-
-	$('#seq_cam_2_count_2').val(c2pos).change();
-	$('#seq_proj_2_count_2').val(p2pos).change();
-};
-gui.spinnerCfg =  {
-	lines: 11, // The number of lines to draw
-	length: 15, // The length of each line
-	width: 7, // The line thickness
-	radius: 20, // The radius of the inner circle
-	corners: 1, // Corner roundness (0..1)
-	rotate: 0, // The rotation offset
-	direction: 1, // 1: clockwise, -1: counterclockwise
-	color: '#F2F2F1', // #rgb or #rrggbb or array of colors
-	speed: 1, // Rounds per second
-	trail: 60, // Afterglow percentage
-	shadow: true, // Whether to render a shadow
-	hwaccel: true, // Whether to use hardware acceleration
-	className: 'spinner', // The CSS class to assign to the spinner
-	zIndex: 2e9, // The z-index (defaults to 2000000000)
-	top: '50%', // Top position relative to parent
-	left: '50%' // Left position relative to parent
-};
-gui.spinner = function (state, msg, progress, cancel) {
-	'use strict';
-	let target;
-	let spinner;
-	if (msg && msg !== '') {
-		gui.spinnerMsg(msg);
-	}
-	if (state && !$('#spinner').hasClass('created')) {
-		target = document.getElementById('spinner');
-		spinner = new Spinner(gui.spinnerCfg).spin(target);
-		$('#spinnerProgress').hide();
-		$('#spinner').addClass('created');
-	} else if (state) {
-		$('#spinner').show();
-	} else if (!state) {
-		$('#spinner').hide();
-		gui.spinnerMsg('');
-	}
-	if (progress) {
-		$('#spinnerProgress').show();
-	} else {
-		$('#spinnerProgress').hide();
-	}
-	if (cancel) {
-		$('#spinnerCancel').show();
-	} else {
-		$('#spinnerCancel').hide();
-	}
-};
-gui.spinnerMsg = function (msg) {
-	'use strict';
-	$('#spinnerMsg').text(msg);
-};
-gui.overlay = function (state) {
-	'use strict';
-	if (state) {
-		$('#overlay').show();
-	} else {
-		$('#overlay').hide();
-	}
-};
-
-gui.info = async function (title, message) {
-	'use strict';
-	const config = {
-		type : 'info',
-		buttons : ['Ok'],
-		title: title,
-		message : message
-	};
-	return dialog.showMessageBox(config);
-};
-gui.confirm = async function (message, cancel = 'Cancel') {
-	const config = {
-		buttons : ['Yes', cancel],
-		message
-	}
-	const res = await dialog.showMessageBox(config);
-	return res.response === 0;
-};
-gui.choice = async function (message, choices) {
-	const config = {
-		buttons : choices,
-		defaultId : 0,
-		message
-	}
-	const res = await dialog.showMessageBox(config);
-	return res.response;
-};
-gui.warn = async function (title, message) {
-	'use strict';
-	const config = {
-		type : 'warning',
-		buttons : ['Ok'],
-		title: title,
-		message : message
-	};
-	return dialog.showMessageBox(config);
-};
-gui.error = function () {};
-
-gui.version = function () {
-	$('#version').text(PACKAGE.version);
+let gui;
+class GUI {
+    constructor() {
+        this.id = 'gui';
+        this.notifierWorking = true;
+        this.spinnerCfg = {
+            lines: 11,
+            length: 15,
+            width: 7,
+            radius: 20,
+            corners: 1,
+            rotate: 0,
+            direction: 1,
+            color: '#F2F2F1',
+            speed: 1,
+            trail: 60,
+            shadow: true,
+            hwaccel: true,
+            className: 'spinner',
+            zIndex: 2e9,
+            top: '50%',
+            left: '50%' // Left position relative to parent
+        };
+    }
+    init() {
+        this.version();
+        this.listen();
+    }
+    listen() {
+        ipcRenderer.on(this.id, this.listener.bind(this));
+    }
+    listener(event, arg) {
+        if (arg.notify) {
+            this.notify(arg.notify.title, arg.notify.message);
+        }
+    }
+    fmtZero(val, len) {
+        const raw = val;
+        let str = val + '';
+        let output = '';
+        if (raw < 0) {
+            output = '-' + Array(len - (str.length - 1)).join('0') + str.replace('-', '');
+        }
+        else {
+            if (str.length < len) {
+                output = Array(len - str.length).join('0') + str;
+            }
+            else if (str.length >= len) {
+                str = parseInt(str) + '';
+                output = Array(len - str.length).join('0') + str;
+            }
+        }
+        return output;
+    }
+    counterFormat(t, normal = null) {
+        const raw = t.value;
+        t.value = gui.fmtZero(raw, 6);
+        if (typeof normal !== 'undefined' && parseInt(raw) !== normal) {
+            $(t).addClass('changed');
+        }
+        else {
+            $(t).removeClass('changed');
+        }
+    }
+    counterUpdate(which, raw) {
+        const formattedVal = this.fmtZero(raw, 6);
+        $(`.${which} .count`).val(formattedVal);
+    }
+    notify(title, message) {
+        const config = {
+            title,
+            message,
+            //icon: path.join(__dirname, 'coulson.jpg'), // Absolute path (doesn't work on balloons) 
+            sound: true,
+            wait: true // Wait with callback, until user action is taken against notification 
+        };
+        if (!this.notifierWorking) {
+            return new Promise((resolve, reject) => { return resolve(true); });
+        }
+        return new Promise((resolve, reject) => {
+            try {
+                notifier.notify(config, function (err, response) {
+                    // Response is response from notification 
+                    if (err) {
+                        this.notifierWorking = false;
+                        log.error(`Error with notification`, err);
+                        return reject(err);
+                    }
+                    return resolve(true);
+                }.bind(this));
+            }
+            catch (err) {
+                this.notifierWorking = false;
+                //notify-send is not found
+                //determine an alternate for raspian
+                //this feels like a hack
+            }
+        });
+    }
+    updateCam(t) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const val = t.value;
+            let change;
+            if (parseInt(val) === cam.pos) {
+                return false;
+            }
+            change = yield this.confirm(`Are you sure you want to set camera counter to ${val}?`);
+            if (change) {
+                cam.pos = parseInt(val);
+                this.updateState();
+            }
+            else {
+                t.value = cam.pos;
+                this.counterFormat(t);
+            }
+        });
+    }
+    updateCam2(t) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const val = t.value;
+            let change;
+            if (parseInt(val) === cam.pos) {
+                return false;
+            }
+            change = yield this.confirm(`Are you sure you want to set second camera counter to ${val}?`);
+            if (change) {
+                cam.second.pos = parseInt(val);
+                this.updateState();
+            }
+            else {
+                t.value = cam.second.pos;
+                this.counterFormat(t);
+            }
+        });
+    }
+    updateProj(t) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const val = t.value;
+            let change;
+            if (parseInt(val) === proj.pos) {
+                return false;
+            }
+            change = yield this.confirm(`Are you sure you want to set projector counter to ${val}?`);
+            if (change) {
+                proj.pos = parseInt(val);
+                this.updateState();
+            }
+            else {
+                t.value = proj.pos;
+                this.counterFormat(t);
+            }
+            proj.setValue(t.value);
+        });
+    }
+    updateProj2(t) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const val = t.value;
+            let change;
+            if (parseInt(val) === proj.second.pos) {
+                return false;
+            }
+            change = yield this.confirm(`Are you sure you want to set second projector counter to ${val}?`);
+            if (change) {
+                proj.second.pos = parseInt(val);
+                this.updateState();
+            }
+            else {
+                t.value = proj.second.pos;
+                this.counterFormat(t);
+            }
+            proj.setValue(t.value);
+        });
+    }
+    updateState() {
+        const cpos = cam.pos;
+        const ppos = proj.pos;
+        const p2pos = proj.second.pos;
+        const c2pos = cam.second.pos;
+        $('#seq_cam_count').val(cpos).change();
+        $('#seq_proj_count').val(ppos).change();
+        $('#seq_cam_count_2').val(cpos).change();
+        $('#seq_proj_count_2').val(ppos).change();
+        $('#seq_cam_2_count').val(c2pos).change();
+        $('#seq_proj_2_count').val(p2pos).change();
+        $('#seq_cam_2_count_2').val(c2pos).change();
+        $('#seq_proj_2_count_2').val(p2pos).change();
+    }
+    spinner(state, msg = null, progress = false, cancel = false) {
+        let target;
+        let spinner;
+        if (msg && msg !== '') {
+            this.spinnerMsg(msg);
+        }
+        if (state && !$('#spinner').hasClass('created')) {
+            target = document.getElementById('spinner');
+            spinner = new Spinner(this.spinnerCfg).spin(target);
+            $('#spinnerProgress').hide();
+            $('#spinner').addClass('created');
+        }
+        else if (state) {
+            $('#spinner').show();
+        }
+        else if (!state) {
+            $('#spinner').hide();
+            this.spinnerMsg('');
+        }
+        if (progress) {
+            $('#spinnerProgress').show();
+        }
+        else {
+            $('#spinnerProgress').hide();
+        }
+        if (cancel) {
+            $('#spinnerCancel').show();
+        }
+        else {
+            $('#spinnerCancel').hide();
+        }
+    }
+    spinnerMsg(msg) {
+        $('#spinnerMsg').text(msg);
+    }
+    overlay(state) {
+        if (state) {
+            $('#overlay').show();
+        }
+        else {
+            $('#overlay').hide();
+        }
+    }
+    info(title, message) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const config = {
+                type: 'info',
+                buttons: ['Ok'],
+                title: title,
+                message: message
+            };
+            return dialog.showMessageBox(config);
+        });
+    }
+    confirm(message, cancel = 'Cancel') {
+        return __awaiter(this, void 0, void 0, function* () {
+            const config = {
+                buttons: ['Yes', cancel],
+                message
+            };
+            const res = yield dialog.showMessageBox(config);
+            return res.response === 0;
+        });
+    }
+    choice(message, choices) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const config = {
+                buttons: choices,
+                defaultId: 0,
+                message
+            };
+            const res = yield dialog.showMessageBox(config);
+            return res.response;
+        });
+    }
+    warn(title, message) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const config = {
+                type: 'warning',
+                buttons: ['Ok'],
+                title,
+                message
+            };
+            return dialog.showMessageBox(config);
+        });
+    }
+    version() {
+        $('#version').text(PACKAGE.version);
+    }
+    error() {
+    }
 }
-
-module.exports = gui;
+gui = new GUI();
+module.exports = gui;
+//# sourceMappingURL=index.js.map
--- a/app/lib/ui/index.js.map
+++ b/app/lib/ui/index.js.map
--- a/app/lib/ui/mscript.js.map
+++ b/app/lib/ui/mscript.js.map
--- a/app/lib/ui/seq.js.map
+++ b/app/lib/ui/seq.js.map
--- a/app/main.js
+++ b/app/main.js
@ -117,7 +117,7 @@ var init = async function () {
 		log.error('Error enumerating connected devices', err)
 	}

-	server = require('server')()
+	server = require('server')(mainWindow.webContents)
 	light = require('light')(arduino, cfg, mainWindow.webContents)
 	filmout = require('filmout')(display, server, ffmpeg, ffprobe, mainWindow.webContents, light)
 	cam = require('cam')(arduino, cfg, mainWindow.webContents, filmout)
--- a/app/src/lib/ui/devices.ts
+++ b/app/src/lib/ui/devices.ts
@ -2,7 +2,6 @@

 /// <reference path ="jquery.d.ts"/> 

-
 let devices : Devices;

 class Devices {
--- a/app/src/lib/ui/index.ts
+++ b/app/src/lib/ui/index.ts
@ -0,0 +1,306 @@
+/* jslint esversion: 6*/
+'use strict';
+
+/// <reference path ="jquery.d.ts"/> 
+
+declare var cam : any;
+declare var proj : any;
+declare var notifier : any;
+declare var PACKAGE : any;
+declare var Spinner : any;
+declare var dialog : any;
+
+let gui : GUI;
+
+class GUI {
+	private id : string = 'gui';
+	private notifierWorking : boolean = true;
+	private spinnerCfg : any=  {
+		lines: 11, // The number of lines to draw
+		length: 15, // The length of each line
+		width: 7, // The line thickness
+		radius: 20, // The radius of the inner circle
+		corners: 1, // Corner roundness (0..1)
+		rotate: 0, // The rotation offset
+		direction: 1, // 1: clockwise, -1: counterclockwise
+		color: '#F2F2F1', // #rgb or #rrggbb or array of colors
+		speed: 1, // Rounds per second
+		trail: 60, // Afterglow percentage
+		shadow: true, // Whether to render a shadow
+		hwaccel: true, // Whether to use hardware acceleration
+		className: 'spinner', // The CSS class to assign to the spinner
+		zIndex: 2e9, // The z-index (defaults to 2000000000)
+		top: '50%', // Top position relative to parent
+		left: '50%' // Left position relative to parent
+	};
+
+	constructor () {
+
+	}
+
+	public init () {
+		this.version();
+		this.listen();
+	}
+
+	private listen() {
+		ipcRenderer.on(this.id, this.listener.bind(this));
+	}
+
+	private listener (event : any, arg : any) {
+		if (arg.notify) {
+			this.notify(arg.notify.title, arg.notify.message);
+		}
+	}
+
+	public fmtZero (val : any, len : number) : string {
+		const raw : number = val;
+		let str : string = val + '';
+		let output : string = '';
+		if (raw < 0) {
+			output = '-' + Array(len - (str.length - 1)).join('0') + str.replace('-', '');
+		} else {
+			if (str.length < len) {
+				output = Array(len - str.length).join('0') + str;
+			} else if (str.length >= len) {
+				str = parseInt(str) + '';
+				output = Array(len - str.length).join('0') + str;
+			}
+		}
+		return output;
+	}
+
+	counterFormat (t : HTMLInputElement, normal : number = null) {
+		const raw : string = t.value;
+		t.value = gui.fmtZero(raw, 6);
+		if (typeof normal !== 'undefined' && parseInt(raw) !== normal) {
+			$(t).addClass('changed');
+		} else {
+			$(t).removeClass('changed');
+		}
+	}
+
+	counterUpdate (which : string, raw : number) {
+		const formattedVal : string = this.fmtZero(raw, 6);
+		$(`.${which} .count`).val(formattedVal);
+	}
+
+	public notify (title : string, message : string) : Promise<boolean> {
+		const config : any = {
+			title,
+			message,
+			//icon: path.join(__dirname, 'coulson.jpg'), // Absolute path (doesn't work on balloons) 
+			sound: true, // Only Notification Center or Windows Toasters 
+			wait: true // Wait with callback, until user action is taken against notification 
+		};
+		if (!this.notifierWorking) {
+			return new Promise((resolve, reject) => { return resolve(true); })
+		}
+		return new Promise((resolve, reject) => {
+			try {
+				notifier.notify(config,
+					function (err : Error, response : any) {
+						// Response is response from notification 
+						if (err) {
+							this.notifierWorking = false;
+							log.error(`Error with notification`, err);
+							return reject(err);
+						}
+						return resolve(true);
+				}.bind(this));
+			} catch (err) {
+				this.notifierWorking = false;
+				//notify-send is not found
+				//determine an alternate for raspian
+				//this feels like a hack
+			}
+		});
+	}
+
+	public async updateCam (t : HTMLInputElement) {
+		const val : string = t.value;
+		let change : boolean;
+
+		if (parseInt(val) === cam.pos) { 
+			return false; 
+		}
+
+		change = await this.confirm(`Are you sure you want to set camera counter to ${val}?`);
+
+		if (change) {
+			cam.pos = parseInt(val);
+			this.updateState();
+		} else {
+			t.value = cam.pos;
+			this.counterFormat(t);
+		}
+	}
+
+	async updateCam2 (t : HTMLInputElement) {
+		const val : string = t.value;
+		let change : boolean;
+
+		if (parseInt(val) === cam.pos) { 
+			return false; 
+		}
+
+		change = await this.confirm(`Are you sure you want to set second camera counter to ${val}?`);
+
+		if (change) {
+			cam.second.pos = parseInt(val);
+			this.updateState();
+		} else {
+			t.value = cam.second.pos;
+			this.counterFormat(t);
+		}
+	}
+
+	async updateProj (t : HTMLInputElement) {
+		const val : string = t.value;
+		let change : boolean;
+		if (parseInt(val) === proj.pos) { 
+			return false; 
+		}
+		change = await this.confirm(`Are you sure you want to set projector counter to ${val}?`);
+		if (change) {
+			proj.pos = parseInt(val);
+			this.updateState();
+		} else {
+			t.value = proj.pos;
+			this.counterFormat(t);
+		}
+		proj.setValue(t.value);
+	}
+
+	async updateProj2 (t : HTMLInputElement) {
+		const val : string = t.value;
+		let change : boolean;
+
+		if (parseInt(val) === proj.second.pos) { 
+			return false; 
+		}
+
+		change = await this.confirm(`Are you sure you want to set second projector counter to ${val}?`);
+		
+		if (change) {
+			proj.second.pos = parseInt(val);
+			this.updateState();
+		} else {
+			t.value = proj.second.pos;
+			this.counterFormat(t);
+		}
+		proj.setValue(t.value);
+	}
+
+	public updateState () {
+		const cpos : number = cam.pos;
+		const ppos : number = proj.pos;
+		
+		const p2pos : number = proj.second.pos;
+		const c2pos : number = cam.second.pos;
+
+		$('#seq_cam_count').val(cpos).change();
+		$('#seq_proj_count').val(ppos).change();
+
+		$('#seq_cam_count_2').val(cpos).change();
+		$('#seq_proj_count_2').val(ppos).change();
+
+		$('#seq_cam_2_count').val(c2pos).change();
+		$('#seq_proj_2_count').val(p2pos).change();
+
+		$('#seq_cam_2_count_2').val(c2pos).change();
+		$('#seq_proj_2_count_2').val(p2pos).change();
+	}
+
+	public spinner (state : boolean, msg : string = null, progress : boolean = false, cancel : boolean = false) {
+		let target;
+		let spinner;
+		if (msg && msg !== '') {
+			this.spinnerMsg(msg);
+		}
+		if (state && !$('#spinner').hasClass('created')) {
+			target = document.getElementById('spinner');
+			spinner = new Spinner(this.spinnerCfg).spin(target);
+			$('#spinnerProgress').hide();
+			$('#spinner').addClass('created');
+		} else if (state) {
+			$('#spinner').show();
+		} else if (!state) {
+			$('#spinner').hide();
+			this.spinnerMsg('');
+		}
+		if (progress) {
+			$('#spinnerProgress').show();
+		} else {
+			$('#spinnerProgress').hide();
+		}
+		if (cancel) {
+			$('#spinnerCancel').show();
+		} else {
+			$('#spinnerCancel').hide();
+		}
+	}
+
+	private spinnerMsg (msg : string) {
+		$('#spinnerMsg').text(msg);
+	}
+
+	public overlay (state : boolean) {
+		if (state) {
+			$('#overlay').show();
+		} else {
+			$('#overlay').hide();
+		}
+	}
+
+	public async info (title : string, message : string) {
+		const config : any = {
+			type : 'info',
+			buttons : ['Ok'],
+			title: title,
+			message : message
+		};
+		return dialog.showMessageBox(config);
+	}
+
+	async confirm (message : string, cancel : string = 'Cancel') {
+		const config : any = {
+			buttons : ['Yes', cancel],
+			message
+		}
+		const res = await dialog.showMessageBox(config);
+		return res.response === 0;
+	}
+
+	public async choice (message : string, choices : string[]) {
+		const config : any = {
+			buttons : choices,
+			defaultId : 0,
+			message
+		}
+		const res = await dialog.showMessageBox(config);
+		return res.response;
+	}
+
+	public async warn (title : string, message : string) {
+		const config : any = {
+			type : 'warning',
+			buttons : ['Ok'],
+			title,
+			message
+		};
+		return dialog.showMessageBox(config);
+	}
+
+	private version () {
+		$('#version').text(PACKAGE.version);
+	}
+
+	private error () {
+
+	}
+}
+
+
+gui = new GUI();
+module.exports = gui;
--- a/app/src/lib/ui/mscript.ts
+++ b/app/src/lib/ui/mscript.ts
@ -5,7 +5,6 @@
 import Mscript from 'mscript';

 declare var nav : any;
-declare var gui : any;
 declare var CodeMirror : any;
 declare var mscript : any;
 declare var cmd : any;
--- a/app/src/lib/ui/seq.ts
+++ b/app/src/lib/ui/seq.ts
@ -2,7 +2,6 @@

 /// <reference path ="jquery.d.ts"/> 

-declare var gui : any;
 declare var cfg : any;
 declare var log : any;
 declare var w2popup : any;
--- a/data/cfg.json
+++ b/data/cfg.json
@ -186,7 +186,10 @@
      "capper_on": "A",
      "capper_off": "B",
      "takeup_forward": "D",
-      "takeup_backward": "E"
+      "takeup_backward": "F",
+      "error" : "E",
+      "camera_exposure" : "G",
+      "state" : "H"
    }
  }
 }
--- a/ino/lib/McopySerial/McopySerial.cpp
+++ b/ino/lib/McopySerial/McopySerial.cpp
@ -62,4 +62,15 @@ void McopySerial::log (String message) {
 	if (debugOn) {
 		Serial.println(message);
 	}
+}
+
+String McopySerial::getString () {
+  while (Serial.available() == 0) {             
+    //Wait for value string
+  }
+  return Serial.readString();
+}
+
+void McopySerial::print (String message) {
+	Serial.println(message);
 }
--- a/ino/lib/McopySerial/McopySerial.h
+++ b/ino/lib/McopySerial/McopySerial.h
@ -26,6 +26,7 @@ class McopySerial {
 	static const char CAMERA_CAPPER_IDENTIFIER = '8';
 	static const char CAMERA_CAPPER_PROJECTOR_IDENTIFIER = '9';
 	static const char CAMERA_CAPPER_PROJECTORS_IDENTIFIER = '0';
+	static const char CAMERA_EXPOSURE = 'G';
 	static const char CAMERA_FORWARD = 'e';
 	static const char CAMERA_IDENTIFIER = 'k';
 	static const char CAMERA_PROJECTORS_IDENTIFIER = '5';
@ -43,6 +44,7 @@ class McopySerial {
 	static const char CAPPER_ON = 'A';
 	static const char CONNECT = 'i';
 	static const char DEBUG = 'd';
+	static const char ERROR = 'E';
 	static const char LIGHT = 'l';
 	static const char LIGHT_IDENTIFIER = 'o';
 	static const char MCOPY_IDENTIFIER = 'm';
@ -59,7 +61,8 @@ class McopySerial {
 	static const char PROJECTOR_SECOND_IDENTIFIER = 't';
 	static const char PROJECTORS = 'x';
 	static const char PROJECTORS_IDENTIFIER = 'd';
-	static const char TAKEUP_BACKWARD = 'E';
+	static const char STATE = 'H';
+	static const char TAKEUP_BACKWARD = 'F';
 	static const char TAKEUP_FORWARD = 'D';
 	/* END CMD FLAGS */

@ -70,6 +73,8 @@ class McopySerial {
 	void setIdentity(char identity);
 	char loop();
 	void confirm(char cmd);
+	String getString();
+	void print(String message);

 	void debug (bool state);
 	void log (String message);
--- a/ino/mcopy_JKMM100/McopySerial.cpp
+++ b/ino/mcopy_JKMM100/McopySerial.cpp
@ -62,4 +62,15 @@ void McopySerial::log (String message) {
 	if (debugOn) {
 		Serial.println(message);
 	}
+}
+
+String McopySerial::getString () {
+  while (Serial.available() == 0) {             
+    //Wait for value string
+  }
+  return Serial.readString();
+}
+
+void McopySerial::print (String message) {
+	Serial.println(message);
 }
--- a/ino/mcopy_JKMM100/McopySerial.h
+++ b/ino/mcopy_JKMM100/McopySerial.h
@ -26,6 +26,7 @@ class McopySerial {
 	static const char CAMERA_CAPPER_IDENTIFIER = '8';
 	static const char CAMERA_CAPPER_PROJECTOR_IDENTIFIER = '9';
 	static const char CAMERA_CAPPER_PROJECTORS_IDENTIFIER = '0';
+	static const char CAMERA_EXPOSURE = 'G';
 	static const char CAMERA_FORWARD = 'e';
 	static const char CAMERA_IDENTIFIER = 'k';
 	static const char CAMERA_PROJECTORS_IDENTIFIER = '5';
@ -43,6 +44,7 @@ class McopySerial {
 	static const char CAPPER_ON = 'A';
 	static const char CONNECT = 'i';
 	static const char DEBUG = 'd';
+	static const char ERROR = 'E';
 	static const char LIGHT = 'l';
 	static const char LIGHT_IDENTIFIER = 'o';
 	static const char MCOPY_IDENTIFIER = 'm';
@ -59,7 +61,8 @@ class McopySerial {
 	static const char PROJECTOR_SECOND_IDENTIFIER = 't';
 	static const char PROJECTORS = 'x';
 	static const char PROJECTORS_IDENTIFIER = 'd';
-	static const char TAKEUP_BACKWARD = 'E';
+	static const char STATE = 'H';
+	static const char TAKEUP_BACKWARD = 'F';
 	static const char TAKEUP_FORWARD = 'D';
 	/* END CMD FLAGS */

@ -70,6 +73,8 @@ class McopySerial {
 	void setIdentity(char identity);
 	char loop();
 	void confirm(char cmd);
+	String getString();
+	void print(String message);

 	void debug (bool state);
 	void log (String message);
--- a/ino/mcopy_cam_canon/McopySerial.cpp
+++ b/ino/mcopy_cam_canon/McopySerial.cpp
@ -62,4 +62,15 @@ void McopySerial::log (String message) {
 	if (debugOn) {
 		Serial.println(message);
 	}
+}
+
+String McopySerial::getString () {
+  while (Serial.available() == 0) {             
+    //Wait for value string
+  }
+  return Serial.readString();
+}
+
+void McopySerial::print (String message) {
+	Serial.println(message);
 }
--- a/ino/mcopy_cam_canon/McopySerial.h
+++ b/ino/mcopy_cam_canon/McopySerial.h
@ -26,6 +26,7 @@ class McopySerial {
 	static const char CAMERA_CAPPER_IDENTIFIER = '8';
 	static const char CAMERA_CAPPER_PROJECTOR_IDENTIFIER = '9';
 	static const char CAMERA_CAPPER_PROJECTORS_IDENTIFIER = '0';
+	static const char CAMERA_EXPOSURE = 'G';
 	static const char CAMERA_FORWARD = 'e';
 	static const char CAMERA_IDENTIFIER = 'k';
 	static const char CAMERA_PROJECTORS_IDENTIFIER = '5';
@ -43,6 +44,7 @@ class McopySerial {
 	static const char CAPPER_ON = 'A';
 	static const char CONNECT = 'i';
 	static const char DEBUG = 'd';
+	static const char ERROR = 'E';
 	static const char LIGHT = 'l';
 	static const char LIGHT_IDENTIFIER = 'o';
 	static const char MCOPY_IDENTIFIER = 'm';
@ -59,7 +61,8 @@ class McopySerial {
 	static const char PROJECTOR_SECOND_IDENTIFIER = 't';
 	static const char PROJECTORS = 'x';
 	static const char PROJECTORS_IDENTIFIER = 'd';
-	static const char TAKEUP_BACKWARD = 'E';
+	static const char STATE = 'H';
+	static const char TAKEUP_BACKWARD = 'F';
 	static const char TAKEUP_FORWARD = 'D';
 	/* END CMD FLAGS */

@ -70,6 +73,8 @@ class McopySerial {
 	void setIdentity(char identity);
 	char loop();
 	void confirm(char cmd);
+	String getString();
+	void print(String message);

 	void debug (bool state);
 	void log (String message);
--- a/package.json
+++ b/package.json
@ -38,20 +38,28 @@
    "typescript": "^4.1.5"
  },
  "dependencies": {
+    "alert": "file:app/lib/alert",
    "arduino": "file:app/lib/arduino",
    "cam": "file:app/lib/cam",
+    "capper" : "file:app/lib/capper",
    "cmd": "file:app/lib/cmd",
    "delay": "file:app/lib/delay",
    "devices": "file:app/lib/devices",
    "display": "file:app/lib/display",
+    "exec" : "file:app/lib/exec",
+    "exit" : "file:app/lib/exit",
+    "ffmpeg" : "file:app/lib/ffmpeg",
+    "ffprobe" : "file:app/lib/ffprobe",
    "filmout": "file:app/lib/filmout",
    "frame": "file:app/lib/frame",
+    "intval" : "file:app/lib/intval",
    "light": "file:app/lib/light",
    "log": "file:app/lib/log",
    "mscript": "file:app/lib/mscript",
    "processing": "file:app/lib/processing",
    "proj": "file:app/lib/proj",
    "sequencer": "file:app/lib/sequencer",
+    "server" : "file:app/lib/server",
    "settings": "file:app/lib/settings",
    "system": "file:app/lib/system"
  }
--- a/processing/mcopy/cfg.json
+++ b/processing/mcopy/cfg.json
@ -186,7 +186,10 @@
      "capper_on": "A",
      "capper_off": "B",
      "takeup_forward": "D",
-      "takeup_backward": "E"
+      "takeup_backward": "F",
+      "error" : "E",
+      "camera_exposure" : "G",
+      "state" : "H"
    }
  }
 }
--- a/scad/cpc_connectors.scad
+++ b/scad/cpc_connectors.scad
@ -16,9 +16,9 @@ PlugGuideRetraction = 1.25;
 PinSpacing = 3.85;

 SocketD = PlugD + 0.4;
-SocketGuideD = PlugGuideD + 0.2;
+SocketGuideD = PlugGuideD + 0.4;

-SocketOuterD = 21;
+SocketOuterD = 19.5;

 CollarD = 22;

@ -91,7 +91,7 @@ module cpc_9pin_plug_back () {

 module flange_guide_void (pos = [0, 0, 0], Z = 8) {
 	OD = 24;
-	ID = 18;
+	ID = 18.5;
 	translate(pos) {
 		intersection () {
 			difference () {
@ -119,12 +119,12 @@ module cpc_9pin_socket () {
 		translate([0, 0, 3]) union () {
 			cylinder(r = R(SocketD), h = PlugH, center = true);
 			for (i = [0 : len(GuideAngles) - 1]) {
-				guide(SocketGuideD, PlugH, GuideAngles[i], GuideWidths[i] + 0.1);
+				guide(SocketGuideD + 0.1, PlugH, GuideAngles[i], GuideWidths[i] + 0.4);
 			}
 		}

 		plug_pin_voids(PinH);
-		flange_guide_void([0, 0, (PlugH / 2) - (8 / 2) + 0.01], 8);
+		rotate([0,0, 37]) flange_guide_void([0, 0, (PlugH / 2) - (8 / 2) + 0.01], 8);
 	}
 	
 }
--- a/src/server/index.ts
+++ b/src/server/index.ts
@ -1,3 +1,5 @@
+'use strict'
+
 import WebSocket, { WebSocketServer } from 'ws'
 import express, { Express, Request, Response, Application } from 'express'
 import { readFile } from 'fs/promises'
@ -53,9 +55,11 @@ class Server {
 	private queue : ServerQueue = {}
 	private interval : ReturnType<typeof setInterval>
 	private intervalPeriod : number = 10000 //10 sec
+	private ui : any;

-	constructor () {
+	constructor (uiInput : any) {
 		this.init()
+		this.ui = uiInput;
 	}

 	async init () {
@ -91,8 +95,9 @@ class Server {
 			this.log.error(err)
 			return
 		}
-		this.wss.on('connection', async function (ws : WebSocket) {
-			ws.on("message", function (data : string ) {
+		this.wss.on('connection', async function (ws : WebSocket, req: any) {
+			const address : string = req.socket.remoteAddress;
+			ws.on('message', function (data : string ) {
 				let obj : any = JSON.parse(data)
 				//this.log.info(data)
 				if (obj.id && this.queue[obj.id]) {
@ -106,10 +111,12 @@ class Server {

    		ws.on('close', function () {
    			this.log.info('Client disconnected')
+    			this.notify('Client disconnected', `No longer forwarding digital display to client ${address}`)
    		}.bind(this))

    		await this.cmd(ws, 'mcopy')
    		this.log.info('Client connected')
+    		this.notify('Client connected', `Forwarding digital display to client: ${address}`)

 		}.bind(this))
 		this.log.info(`Websocket server started!`)
@ -200,8 +207,8 @@ class Server {
 		return false
 	}

-	public async displayImage (src : string) {
-		let key
+	public async displayImage (src : string) : Promise<boolean> {
+		let key : string
 		if (this.useServer()) {
 			key = basename(src)
 			this.addProxy(key, src)
@ -237,8 +244,12 @@ class Server {
 			//setTimeout() ?
 		}.bind(this))
 	}
+
+	private notify (title : string, message : string) {
+		this.ui.send('gui', { notify : { title, message }});
+	}
 }

-module.exports = function () {
-	return new Server()
+module.exports = function (ui : any) {
+	return new Server(ui)
 }
Author	SHA1	Message	Date
Matt McWilliams	210dc85558	Add getString and print methods	2023-03-18 17:04:06 -04:00
Matt McWilliams	174b900cd8	Update commands	2023-03-18 17:00:13 -04:00
Matt McWilliams	fbe954280f	Socket connector work	2023-03-18 17:00:02 -04:00
Matt McWilliams	142c990a0e	Refactored GUI into TypeScript and class-based format	2023-03-18 16:59:26 -04:00