Adding support for multiple cameras

.vscode/launch.json

@@ -0,0 +1,16 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "java",
+            "name": "Debug (Launch) with Arguments Prompt",
+            "request": "launch",
+            "mainClass": "celtech.roboxremote.Root",
+            "args": "server root.yml",
+            "vmArgs": "-DlibertySystems.configFile=RoboxRoot.configFile.xml"
+        }        
+    ]
+}

RoboxRoot.bat

@@ -1 +1 @@
-java\bin\java -Djava.net.preferIPv4Stack=true -DlibertySystems.configFile=RoboxRoot.configFile.xml -jar RoboxRemoteServer.jar server printerControl.yml
+java -DlibertySystems.configFile=RoboxRoot.configFile.xml -jar target/Root.jar server root.yml

RoboxRoot.sh

@@ -1 +1 @@
-java/bin/java -Djava.net.preferIPv4Stack=true -DlibertySystems.configFile=RoboxRoot.configFile.xml -jar RoboxRemoteServer.jar server printerControl.yml
+java/bin/java -DlibertySystems.configFile=RoboxRoot.configFile.xml -jar target/Root.jar server root.yml

nologname.log.1

@@ -0,0 +1,14 @@
+2023-01-01 13:09:32,654 [main] INFO - StenographerFactory initialised with logfile=nologname.log loglevel= logmode=LOCAL
+>>>> ERROR loading system config (using -DlibertySystems.configFile) org.apache.commons.configuration.ConfigurationException: Cannot locate configuration source null
+2023-01-01 13:09:32,983 [main] ERROR celtech.roboxbase.configuration.BaseConfiguration.loadConfigurationInstance(BaseConfiguration.java:293) - Couldn't load configuration - the application cannot derive the install directory
+Exception in thread "main" 
+java.lang.NullPointerException
+	at java.base/java.io.File.<init>(File.java:278)
+	at celtech.roboxbase.configuration.BaseConfiguration.getCommonApplicationDirectory(BaseConfiguration.java:398)
+	at celtech.roboxbase.configuration.BaseConfiguration.getApplicationPrinterDirectory(BaseConfiguration.java:419)
+	at celtech.roboxbase.configuration.datafileaccessors.PrinterContainer.<init>(PrinterContainer.java:36)
+	at celtech.roboxbase.configuration.datafileaccessors.PrinterContainer.getCompletePrinterList(PrinterContainer.java:97)
+	at celtech.roboxbase.configuration.BaseConfiguration.initialise(BaseConfiguration.java:176)
+	at celtech.roboxremote.Root.initialize(Root.java:65)
+	at io.dropwizard.Application.run(Application.java:88)
+	at celtech.roboxremote.Root.main(Root.java:48)

src/main/resources/assets/about.html

@@ -50,6 +50,7 @@
     <script src="assets/js/access-pin.js"></script>
     <script src="assets/js/error-handling.js"></script>
     <script src="assets/js/about.js"></script>
+    <script src="assets/js/camera.js"></script>
     <script src="assets/js/console.js"></script>
     <script src="assets/js/control.js"></script>
     <script src="assets/js/head-eeprom.js"></script>

src/main/resources/assets/access-pin.html

@@ -62,6 +62,7 @@ <h1 class="localised page-title" data-i18n="access-pin-title">Access PIN</h1>
     <script src="assets/js/access-pin.js"></script>
     <script src="assets/js/error-handling.js"></script>
     <script src="assets/js/about.js"></script>
+    <script src="assets/js/camera.js"></script>
     <script src="assets/js/console.js"></script>
     <script src="assets/js/control.js"></script>
     <script src="assets/js/head-eeprom.js"></script>

src/main/resources/assets/assets/css/RoboxRoot.css

@@ -1707,3 +1707,7 @@ img.rbx-colour-button {
 .machine-logo {
 }
 
+.camera-select-label{
+  color: #009ee3;
+}
+

src/main/resources/assets/assets/js/camera.js

@@ -0,0 +1,59 @@
+var cameraprofilejson;
+var cameras;
+function cameraInit()
+{
+    $('#left-button').on('click', goToPreviousPage);
+    $("#selectcamera").on('change', changeCamera);
+    GetCameraProfile();
+}
+
+function GetCameraProfile(){
+    promiseGetCommandToRoot('discovery/listCameras', null)
+        .then(function(result) 
+              {
+                if(result.cameras.length){
+                    cameras = result.cameras;
+
+                    if(cameras.length > 1){
+                        var select = $("#selectcamera");
+                        $("#camera-select-panel").removeClass("hidden");
+                        cameras.forEach(element => {
+                            var opt = document.createElement('option');
+                            opt.value = element.cameraNumber;
+                            opt.innerHTML = `${element.cameraNumber} : ${element.cameraName}`;
+                            select[0].appendChild(opt);
+                        });
+                    }
+                    loadCamera(cameras[0].cameraNumber);
+                }
+                else{
+                    $("#no-cameras").removeClass("hidden");
+                }
+              });   
+}
+
+function loadCamera(cameranumber){
+    var camera = cameras.find(camera => camera.cameraNumber === Number(cameranumber));;
+    cameraprofilejson = {"profile":{},"camera":{"udevName":camera.udevName,"cameraName":camera.cameraName,"cameraNumber":camera.cameraNumber,"serverIP":""}}
+    loadFrame();     
+}
+
+function loadFrame(){
+    if(cameraprofilejson){
+        promisePostCommandToRoot(`cameraControl/${cameraprofilejson.camera.cameraNumber}/snapshot`, cameraprofilejson, true)
+        .then(function(result) 
+              {
+                var reader = new FileReader();
+                reader.onload = function() {                         
+                    var b64 = reader.result
+                    document.getElementById("camerapreview").src = b64
+                    loadFrame();
+                }
+                reader.readAsDataURL(result)
+              });    
+    }
+}
+
+function changeCamera(){
+    loadCamera($("#selectcamera").find(":selected").val());
+}

src/main/resources/assets/assets/js/jquery.binary.js

@@ -0,0 +1,42 @@
+// use this transport for "binary" data type
+$.ajaxTransport("+binary", function(options, originalOptions, jqXHR){
+    // check for conditions and support for blob / arraybuffer response type
+    if (window.FormData && ((options.dataType && (options.dataType == 'binary')) || (options.data && ((window.ArrayBuffer && options.data instanceof ArrayBuffer) || (window.Blob && options.data instanceof Blob)))))
+    {
+        return {
+            // create new XMLHttpRequest
+            send: function(headers, callback){
+		// setup all variables
+                var xhr = new XMLHttpRequest(),
+		url = options.url,
+		type = options.type,
+		async = options.async || true,
+		// blob or arraybuffer. Default is blob
+		dataType = options.responseType || "blob",
+		data = options.data || null,
+		username = options.username || null,
+		password = options.password || null;
+
+                xhr.addEventListener('load', function(){
+			var data = {};
+			data[options.dataType] = xhr.response;
+			// make callback and send data
+			callback(xhr.status, xhr.statusText, data, xhr.getAllResponseHeaders());
+                });
+
+                xhr.open(type, url, async, username, password);
+
+		// setup custom headers
+		for (var i in headers ) {
+			xhr.setRequestHeader(i, headers[i] );
+		}
+
+                xhr.responseType = dataType;
+                xhr.send(data);
+            },
+            abort: function(){
+                jqXHR.abort();
+            }
+        };
+    }
+});

src/main/resources/assets/assets/js/page-init.js

@@ -1,5 +1,6 @@
 var pageInitMap = {'about':aboutInit,
                    'access-pin':accessPINInit,
+                   'camera':cameraInit,
                    'console':consoleInit,
                    'head-eeprom':headEEPromInit,
                    'home':homeInit,

src/main/resources/assets/assets/js/promise-funcs.js

@@ -1,4 +1,4 @@
-function promiseCommandToRoot(requestType, service, dataToSend)
+function promiseCommandToRoot(requestType, service, dataToSend, isBinary)
 {
 	return new Promise(function(resolve, reject)
 	{
@@ -13,6 +13,8 @@ function promiseCommandToRoot(requestType, service, dataToSend)
                     },
                 contentType: 'application/json', // send as JSON
                 type: requestType,
+                dataType: isBinary ? "binary" : "",
+                processData: !isBinary,
                 success:function (data, textStatus, jqXHR)
                     {
                         resolve(data);
@@ -47,7 +49,7 @@ function promiseGetCommandToRoot(service, dataToSend)
     return promiseCommandToRoot('GET', service, dataToSend);
 }
 
-function promisePostCommandToRoot(service, dataToSend)
+function promisePostCommandToRoot(service, dataToSend, isBinary)
 {
-    return promiseCommandToRoot('POST', service, dataToSend);
+    return promiseCommandToRoot('POST', service, dataToSend, isBinary);
 }

src/main/resources/assets/camera.html

@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no">
+    <title>Robox :: Camera</title>
+    <link rel="stylesheet" href="assets/bootstrap/css/bootstrap.min.css">
+    <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,700">
+    <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Code+Pro:200,300,400,500,600,700,900">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/3.5.2/animate.min.css">
+    <link rel="stylesheet" href="assets/css/OldCss.css">
+    <link rel="stylesheet" href="assets/css/RoboxRoot.css">
+    <link rel="stylesheet" href="assets/css/RootFonts.css">
+</head>
+
+<body id="camera" class="canvas-grey no-touch-action">
+    <div class="container page">
+        <div class="row">
+            <div>
+                <h1 class="localised page-title" data-i18n="camera-title">Camera Preview</h1>
+            </div>
+        </div>
+        <div class="row">
+            <div id="no-cameras" class="hidden canvas-blue">
+                No cameras found
+            </div>
+            <div>
+                <div id="camera-select-panel" class="hidden"><label for="selectcamera" class="localised camera-select-label rbx-text-small" data-i18n="camera-select-label">Select Camera</label> <select id="selectcamera"></select></div>
+                <img id="camerapreview" class="img-responsive" />
+            </div>
+        </div>
+    </div>
+
+    <div class="container footer">
+        <div class="btn-group btn-group-justified" role="group"><a class="btn btn-default menu-bottom-button" role="button" id="left-button" href="#"> <img class="menu-bottom-button-icon" src="assets/img/Icon_Menu_Back.svg"></a><a class="btn btn-default menu-bottom-button" role="button" id="middle-button" href="home.html"> <img id="home-button" style="height:6.5vh;" src="assets/img/Icon-Home.svg"></a>
+            <a
+                class="btn btn-default menu-bottom-button invisible" role="button" id="right-button" href="#"> <img class="menu-bottom-button-icon" src="assets/img/Icon_Menu_Next.svg"></a>
+        </div>
+    </div>
+    <script src="assets/js/jquery.min.js"></script>
+    <script src="assets/js/jquery.binary.js"></script>
+    <script src="assets/bootstrap/js/bootstrap.min.js"></script>
+    <script src="assets/js/i18next.min.js"></script>
+    <script src="assets/js/i18nextBrowserLanguageDetector.min.js"></script>
+    <script src="assets/js/i18nextXHRBackend.min.js"></script>
+    <script src="assets/js/jquery-i18next.min.js"></script>
+    <script src="assets/js/core-vars.js"></script>
+    <script src="assets/js/jquery.base64.js"></script>
+    <script src="assets/js/core-funcs.js"></script>
+    <script src="assets/js/promise-funcs.js"></script>
+    <script src="assets/js/access-pin.js"></script>
+    <script src="assets/js/error-handling.js"></script>
+    <script src="assets/js/about.js"></script>
+    <script src="assets/js/camera.js"></script>
+    <script src="assets/js/console.js"></script>
+    <script src="assets/js/control.js"></script>
+    <script src="assets/js/head-eeprom.js"></script>
+    <script src="assets/js/job-progress.js"></script>
+    <script src="assets/js/home.js"></script>
+    <script src="assets/js/login.js"></script>
+    <script src="assets/js/menu-horz.js"></script>
+    <script src="assets/js/pin-reset.js"></script>
+    <script src="assets/js/print-adjust.js"></script>
+    <script src="assets/js/printer-colour.js"></script>
+    <script src="assets/js/printer-name.js"></script>
+    <script src="assets/js/server-name.js"></script>
+    <script src="assets/js/printer-select.js"></script>
+    <script src="assets/js/purge-intro.js"></script>
+    <script src="assets/js/purge.js"></script>
+    <script src="assets/js/reprint.js"></script>
+    <script src="assets/js/wireless-settings.js"></script>
+    <script src="assets/js/usb-print.js"></script>
+    <script src="assets/js/page-init.js"></script>
+</body>
+</html>

src/main/resources/assets/console.html

@@ -65,6 +65,7 @@
     <script src="assets/js/access-pin.js"></script>
     <script src="assets/js/error-handling.js"></script>
     <script src="assets/js/about.js"></script>
+    <script src="assets/js/camera.js"></script>
     <script src="assets/js/console.js"></script>
     <script src="assets/js/control.js"></script>
     <script src="assets/js/head-eeprom.js"></script>

src/main/resources/assets/control.html

@@ -92,6 +92,7 @@ <h2 class="text-center" style="margin-left: 2.25vh">Heat</h2>
     <script src="assets/js/access-pin.js"></script>
     <script src="assets/js/error-handling.js"></script>
     <script src="assets/js/about.js"></script>
+    <script src="assets/js/camera.js"></script>    
     <script src="assets/js/console.js"></script>
     <script src="assets/js/control.js"></script>
     <script src="assets/js/head-eeprom.js"></script>

src/main/resources/assets/error.html

@@ -56,6 +56,7 @@
     <script src="assets/js/access-pin.js"></script>
     <script src="assets/js/error-handling.js"></script>
     <script src="assets/js/about.js"></script>
+    <script src="assets/js/camera.js"></script>
     <script src="assets/js/console.js"></script>
     <script src="assets/js/control.js"></script>
     <script src="assets/js/head-eeprom.js"></script>

src/main/resources/assets/head-eeprom.html

@@ -57,7 +57,7 @@ <h1 id="title-text" class="localised page-title" data-i18n="head-eeprom-title">H
             <div style="margin-left: 0.75vh; font-weight: 300;">
                 <div class="row">
                     <div>
-                        <p id="head-serial-number" class="no-margins" style="font-family:">&nbsp;</p>
+                        <p id="head-serial-number" class="no-margins">&nbsp;</p>
                     </div>
                 </div>
                 <div class="row">
@@ -190,6 +190,7 @@ <h1 id="title-text" class="localised page-title" data-i18n="head-eeprom-title">H
     <script src="assets/js/access-pin.js"></script>
     <script src="assets/js/error-handling.js"></script>
     <script src="assets/js/about.js"></script>
+    <script src="assets/js/camera.js"></script>
     <script src="assets/js/console.js"></script>
     <script src="assets/js/control.js"></script>
     <script src="assets/js/head-eeprom.js"></script>

src/main/resources/assets/home.html

@@ -160,6 +160,7 @@ <h1 class="text-center no-margins rbx-text-large" id="ambient-temp"><strong>°C<
     <script src="assets/js/access-pin.js"></script>
     <script src="assets/js/error-handling.js"></script>
     <script src="assets/js/about.js"></script>
+    <script src="assets/js/camera.js"></script>
     <script src="assets/js/console.js"></script>
     <script src="assets/js/control.js"></script>
     <script src="assets/js/head-eeprom.js"></script>

src/main/resources/assets/index.html

@@ -46,6 +46,7 @@
     <script src="assets/js/reprint.js"></script>
     <script src="assets/js/wireless-settings.js"></script>
     <script src="assets/js/usb-print.js"></script>
+    <script src="assets/js/camera.js"></script>
     <script src="assets/js/page-init.js"></script>
 </body>
 

src/main/resources/assets/job-progress.html

@@ -72,6 +72,7 @@ <h1 id="title-text">&nbsp;</h1>
     <script src="assets/js/access-pin.js"></script>
     <script src="assets/js/error-handling.js"></script>
     <script src="assets/js/about.js"></script>
+    <script src="assets/js/camera.js"></script>
     <script src="assets/js/console.js"></script>
     <script src="assets/js/control.js"></script>
     <script src="assets/js/head-eeprom.js"></script>