From 0887884ea0dfe4594191b360431e49e38cbeb7af Mon Sep 17 00:00:00 2001 From: nfaliszewski Date: Tue, 1 Dec 2020 09:32:23 -0800 Subject: [PATCH 1/6] Added "Digital Gain" dropdown. --- src/index.html | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/src/index.html b/src/index.html index 35e3fc2..a44ae08 100644 --- a/src/index.html +++ b/src/index.html @@ -242,6 +242,18 @@ +
+ Digital Gain +   + +
+
Resolution  
Presets
@@ -754,6 +766,13 @@ "18dB (x8)": function(){ dataSender("set",'{"currentGain": 8}'); }, "24dB (x16)": function(){ dataSender("set",'{"currentGain": 16}'); }, + + "+0dB (x1)": function(){ dataSender("set",'{"digitalGain": 1}'); }, + "+6dB (x2)": function(){ dataSender("set",'{"digitalGain": 2}'); }, + "+12dB (x4)": function(){ dataSender("set",'{"digitalGain": 4}'); }, + "+18dB (x8)": function(){ dataSender("set",'{"digitalGain": 8}'); }, + "+24dB (x16)": function(){ dataSender("set",'{"digitalGain": 16}'); }, + "8000K": function(){ dataSender("set", '{"wbTemperature": 8000}'); }, "6500K": function(){ dataSender("set", '{"wbTemperature": 6500}'); }, "5600K": function(){ dataSender("set", '{"wbTemperature": 5600}'); }, @@ -1372,6 +1391,13 @@ document.getElementById("analogGain").firstChild.textContent = dbFromMult[truncatedValue] + "dB (x" + truncatedValue + ")" ; } + if ("digitalGain" in parsedData) { // set the current gain (also called analog gain) + var truncatedValue = Math.round(parsedData.digitalGain) ; // get the value as an integer (truncated) + if (truncatedValue == 10) + truncatedValue = 16 ; // special case for the 2.1 >> something weird happens at the highest gain + document.getElementById("digitalGain").firstChild.textContent = dbFromMult[truncatedValue] + "dB (x" + truncatedValue + ")" ; + } + if ("calSuggested" in parsedData) { // something changed, and a blackCal is needed } From e08d77e7608258dc648e0b7958ca09edd3f3c700 Mon Sep 17 00:00:00 2001 From: nfaliszewski Date: Thu, 3 Dec 2020 08:09:40 -0800 Subject: [PATCH 2/6] Fixed deleting files with spaces and sub-folders. Now filenames that have spaces or are inside a sub-folder can be deleted properly. --- scripts/mountNetDrive.sh | 9 ++++----- src/PlaySave.html | 2 +- src/cgi-bin/pleaseGiveMeAFile | 4 ++-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/scripts/mountNetDrive.sh b/scripts/mountNetDrive.sh index 652fec5..14ff7cd 100755 --- a/scripts/mountNetDrive.sh +++ b/scripts/mountNetDrive.sh @@ -198,12 +198,13 @@ do then ## make sure the request only affects files on external media (and nobody's trying to be tricky by going up a folder) if [[ "${params[2]}" == *".mp4" ]] || [[ "${params[2]}" == *".dng" ]] || [[ "${params[2]}" == *".tiff" ]] then ## verify that only a video or image is being deleted - rm "${params[2]}" ## delete the file - echo "${params[2]} Deleted" + rm "${params[2]//%20/ }" ## delete the file >> notice that I remove 'spaces' here + echo "${params[2]//%20/ } Deleted" ## the "//%20/ " thing replaces "%20" with a space fi else echo "unacceptable filepath for deleting" fi + echo "For the delete request, I got this: ${params[2]//%20/ }" else echo "Invalid network share type: ${params[5]}" fi @@ -216,8 +217,6 @@ echo ":::: End of program ::::" exit exit -#echo "you gave me this: nfs/smb: $1 IPAddress: $2 folderLocation: $3" - - +#echo "you gave me this: nfs/smb: $1 IPAddress: $2 folderLocation: $3" diff --git a/src/PlaySave.html b/src/PlaySave.html index 62147fb..3e6a0b3 100755 --- a/src/PlaySave.html +++ b/src/PlaySave.html @@ -540,7 +540,7 @@ // the actual request will be sent when the 'Yes (Delete)' button is pressed, so this is the variable it will look at - fileToDelete = "/cgi-bin/pleaseGiveMeAFile?delete=" + location + "&fileName=" + fileName ; + fileToDelete = "/cgi-bin/pleaseGiveMeAFile?delete=" + location + "&fileName=" + encodeURIComponent(fileName) ; } function getFileList() { diff --git a/src/cgi-bin/pleaseGiveMeAFile b/src/cgi-bin/pleaseGiveMeAFile index 41a23c0..1811c56 100755 --- a/src/cgi-bin/pleaseGiveMeAFile +++ b/src/cgi-bin/pleaseGiveMeAFile @@ -61,9 +61,9 @@ then echo "" ## I cannot delete a file from here (permission issues), so instead, I ask the 'mountNetDrive' file to do it (netDriveHelper service) - echo "please delete: /media/${params[1]//%20/ }/${params[3]//%20/ }" > /tmp/mountRequest.nf + echo "please delete: /media/${params[1]//%2F/ }/${params[3]//%2F//}" > /tmp/mountRequest.nf ## replace '%2F' with '/' - echo "deleted the file /media/${params[1]//%20/ }/${params[3]//%20/ } ; hope you meant it" + echo "deleted the file /media/${params[1]//%2F//}/${params[3]//%20/ } ; hope you meant it" elif [[ "${params[3]//%20/ }" == *"/" ]] then ## trying to delete an entire folder ## Not implemented From e77e0af91f5f2bd9314a30a13d69c653cf53b67f Mon Sep 17 00:00:00 2001 From: nfaliszewski Date: Thu, 3 Dec 2020 10:53:36 -0800 Subject: [PATCH 3/6] Hid "simple request" debug messages. --- src/IO.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/IO.html b/src/IO.html index b341aaa..9dce704 100644 --- a/src/IO.html +++ b/src/IO.html @@ -1362,8 +1362,8 @@ } request += '}' ; - - document.getElementById("debugger2").innerHTML += "

" + "This is the \"simple mode\" request: " + request ; + if (DebugOnOff) + document.getElementById("debugger2").innerHTML += "

" + "This is the \"simple mode\" request: " + request ; dataRequester ("set", request, pageUpdate) ; } From f5b1cf41085d61bc386c4b86901261ca3e1fe233 Mon Sep 17 00:00:00 2001 From: nfaliszewski Date: Thu, 14 Jan 2021 11:56:42 -0800 Subject: [PATCH 4/6] Fixed newline characters. Most files were using Windows' standard of CR+LF instead of just LF --- src/PlaySave.html | 2890 +++++++++++++++++++------------------- src/css/windozeFixes.css | 314 ++--- 2 files changed, 1602 insertions(+), 1602 deletions(-) diff --git a/src/PlaySave.html b/src/PlaySave.html index 3e6a0b3..24001a0 100755 --- a/src/PlaySave.html +++ b/src/PlaySave.html @@ -1,1445 +1,1445 @@ - - - -Chronos - - - - - - - - - - - - - - -
-
- -
- - -
by Kron Technologies
-
- -
- - -
-
Main -
Play & Save -
Settings -
I/O Config -
?
Documentation - -
Menu - - -
- - -
- -
- Screenshot Display - -
- -
- - -
- -
- -
-
 Play -
-
-
-
- 0% -
- Mark Start - Step Backward - Step Forward - Mark End -
- -
- - - -
- -
- Frames -
- Frame: - / # -
- Starting Frame: - -
- Ending Frame: - -
- Length: - -
- -
- Video Settings -
- Video framerate: - fps -
- Bits per pixel: - -
- Max Bitrate: - Mbps -
- Text Overlay: - Off -
- -
- Play Speed - fps -
- Note that the image displayed on this page only updates a few times per second -
- -
- Storage Device -
- -
- Size: -
- Used: -
- Available: -
- - -
- Save Video -
- -
- Leave empty to use autoname -

- - Save -
- -
- Download From Camera -
- -
- - - - -
- - -
- - -
- - - -
- - - - - -
-
This page was made by Nicholas Faliszewski
- - - - - - - + + + +Chronos + + + + + + + + + + + + + + +
+
+ +
+ + +
by Kron Technologies
+
+ +
+ + +
+
Main +
Play & Save +
Settings +
I/O Config +
?
Documentation + +
Menu + + +
+ + +
+ +
+ Screenshot Display + +
+ +
+ + +
+ +
+ +
+
 Play +
+
+
+
+ 0% +
+ Mark Start + Step Backward + Step Forward + Mark End +
+ +
+ + + +
+ +
+ Frames +
+ Frame: + / # +
+ Starting Frame: + +
+ Ending Frame: + +
+ Length: + +
+ +
+ Video Settings +
+ Video framerate: + fps +
+ Bits per pixel: + +
+ Max Bitrate: + Mbps +
+ Text Overlay: + Off +
+ +
+ Play Speed + fps +
+ Note that the image displayed on this page only updates a few times per second +
+ +
+ Storage Device +
+ +
+ Size: +
+ Used: +
+ Available: +
+ + +
+ Save Video +
+ +
+ Leave empty to use autoname +

+ + Save +
+ +
+ Download From Camera +
+ +
+ + + + +
+ + +
+ + +
+ + + +
+ + + + + +
+
This page was made by Nicholas Faliszewski
+ + + + + + + diff --git a/src/css/windozeFixes.css b/src/css/windozeFixes.css index 13ace82..fa5d3f4 100755 --- a/src/css/windozeFixes.css +++ b/src/css/windozeFixes.css @@ -1,158 +1,158 @@ -/*input[type=number], input[type=text] { - padding-bottom: 9px; -} */ - -.slider, .slider input[type=range] { - display: inline-block; - width: 256px; - height: 38px; - border-radius: 0; - background: transparent; -/* background-image: linear-gradient(to right, black, white); */ - border: none; - margin: -10px 0; - padding: 0; -} - -.slider::-ms-thumb { /* slider thumb */ - background-color: #ddd; - border: 3px solid black; - width: 6px; - height: 25px; - border-radius: 10px; - cursor: pointer; /* I can't get this to work for some reason */ -} - -.slider::-ms-track { /* style the track */ - width: 250px; - height: 6px; - border-radius: 8px; -/* background: #333; */ - background-image: linear-gradient(to right, black, white); - border: 3px solid black; - margin: 0px; - color: transparent; /* remove the tick marks */ -} - -::-ms-fill-lower, ::-ms-fill-upper { /* slider track before and after thumb */ - background: transparent; -} -::-ms-ticks-before, ::-ms-ticks-after { /* tick marks */ - display: none; - color: transparent; - background: transparent; -} - - -.timelineHolder { - margin: -84px 0 8px 0; -} - - -.timeline, .timeline input[type=range] { - display: inline-block; - box-sizing: border-box; - width: 96%; - height: 38px; - background: transparent; - border: none; - margin: -20px 2% 0 2%; - padding: 0; -} -.timeline::-ms-track { - display: inline-block; - box-sizing: border-box; - width: 100%; - height: 12px; - border-radius: 8px; - background: white; - border: 3px solid black; - margin: 0; - color: transparent; /* remove the tick marks */ -} -.timeline::-ms-thumb { - width: 6px; - height: 25px; - border-radius: 10px; - border: 3px solid black; - cursor: pointer; - background-color: white; -} - -.timelineMarker, .timelineMarker input[type=range] { - display: block; - width: 100%; - height: 30px; - border: none; - background: transparent; - margin: 0; - padding: 0; -} -.timelineMarker::-ms-track { - display: block; - width: 100%; - height: 0; - background: transparent; - margin: 0; - border: none; -} -.timelineMarker::-ms-thumb { - width: 0px; - height: 0px; - border-radius: 0; - background-color: brown; - box-sizing: content-box; - border: 20px solid transparent; - border-bottom-width: 10px; - cursor: pointer; - background-color: transparent; -} -#startMarker::-ms-thumb { - border-right: 0; - border-top-color: green; - border-left-width: 15px; - margin: 0; -} -#endMarker::-ms-thumb { - box-sizing: border-box; - border-left: 0; - border-top-color: #a00; - border-right-width: 15px; - margin: 0; -} -#startMarker { - margin-top: -20px; - margin-bottom: -10px; -} -#endMarker { - margin-bottom: 22px; - padding: 0; -} - -#startEndFill { - display: block; - height: 16px; - margin-top: -61px; - margin-bottom: 27px; - margin-left: 2%; - margin-left: 2%; -} - -#backgroundThing { - margin-top: -25px; - width: 98%; -} -#postTriggerSlider { - background-color: transparent; - background-image: none; -} -#postTriggerSlider::-ms-track { /* style the track */ - width: 98%; - height: 6px; - border-radius: 8px; - background-color: #ddd; - background-image: none; - border: 3px solid black; - margin: 0px; - color: transparent; /* remove the tick marks */ +/*input[type=number], input[type=text] { + padding-bottom: 9px; +} */ + +.slider, .slider input[type=range] { + display: inline-block; + width: 256px; + height: 38px; + border-radius: 0; + background: transparent; +/* background-image: linear-gradient(to right, black, white); */ + border: none; + margin: -10px 0; + padding: 0; +} + +.slider::-ms-thumb { /* slider thumb */ + background-color: #ddd; + border: 3px solid black; + width: 6px; + height: 25px; + border-radius: 10px; + cursor: pointer; /* I can't get this to work for some reason */ +} + +.slider::-ms-track { /* style the track */ + width: 250px; + height: 6px; + border-radius: 8px; +/* background: #333; */ + background-image: linear-gradient(to right, black, white); + border: 3px solid black; + margin: 0px; + color: transparent; /* remove the tick marks */ +} + +::-ms-fill-lower, ::-ms-fill-upper { /* slider track before and after thumb */ + background: transparent; +} +::-ms-ticks-before, ::-ms-ticks-after { /* tick marks */ + display: none; + color: transparent; + background: transparent; +} + + +.timelineHolder { + margin: -84px 0 8px 0; +} + + +.timeline, .timeline input[type=range] { + display: inline-block; + box-sizing: border-box; + width: 96%; + height: 38px; + background: transparent; + border: none; + margin: -20px 2% 0 2%; + padding: 0; +} +.timeline::-ms-track { + display: inline-block; + box-sizing: border-box; + width: 100%; + height: 12px; + border-radius: 8px; + background: white; + border: 3px solid black; + margin: 0; + color: transparent; /* remove the tick marks */ +} +.timeline::-ms-thumb { + width: 6px; + height: 25px; + border-radius: 10px; + border: 3px solid black; + cursor: pointer; + background-color: white; +} + +.timelineMarker, .timelineMarker input[type=range] { + display: block; + width: 100%; + height: 30px; + border: none; + background: transparent; + margin: 0; + padding: 0; +} +.timelineMarker::-ms-track { + display: block; + width: 100%; + height: 0; + background: transparent; + margin: 0; + border: none; +} +.timelineMarker::-ms-thumb { + width: 0px; + height: 0px; + border-radius: 0; + background-color: brown; + box-sizing: content-box; + border: 20px solid transparent; + border-bottom-width: 10px; + cursor: pointer; + background-color: transparent; +} +#startMarker::-ms-thumb { + border-right: 0; + border-top-color: green; + border-left-width: 15px; + margin: 0; +} +#endMarker::-ms-thumb { + box-sizing: border-box; + border-left: 0; + border-top-color: #a00; + border-right-width: 15px; + margin: 0; +} +#startMarker { + margin-top: -20px; + margin-bottom: -10px; +} +#endMarker { + margin-bottom: 22px; + padding: 0; +} + +#startEndFill { + display: block; + height: 16px; + margin-top: -61px; + margin-bottom: 27px; + margin-left: 2%; + margin-left: 2%; +} + +#backgroundThing { + margin-top: -25px; + width: 98%; +} +#postTriggerSlider { + background-color: transparent; + background-image: none; +} +#postTriggerSlider::-ms-track { /* style the track */ + width: 98%; + height: 6px; + border-radius: 8px; + background-color: #ddd; + background-image: none; + border: 3px solid black; + margin: 0px; + color: transparent; /* remove the tick marks */ } \ No newline at end of file From 72b2e9b0d0f8dce103cacbe58701efcfdfd96644 Mon Sep 17 00:00:00 2001 From: nfaliszewski Date: Thu, 14 Jan 2021 20:46:31 -0800 Subject: [PATCH 5/6] Added CR21 matrices. Catch new gain settings --- src/index.html | 3324 +++++++++++++++++++++++---------------------- src/settings.html | 16 +- 2 files changed, 1677 insertions(+), 1663 deletions(-) diff --git a/src/index.html b/src/index.html index a44ae08..d6476ba 100644 --- a/src/index.html +++ b/src/index.html @@ -1,1661 +1,1663 @@ - - - -Chronos - - - - - - - - - - - - - - -
-
- -
- - -
by Kron Technologies
-
- -
- - -
-
Main -
Play & Save -
Settings -
I/O Config -
?
Documentation - -
Menu - - -
- - -
- -
- Screenshot Display - - - -
- -
-
Record -
-
-
-
- 0% -
- Black Calibration - Zebra Stripes - Focus Peaking -
- -
-
-
- -
- - -
- -
- -
- Exposure (Shutter) - -
- ° -   - % -   - µs - MAX -
- -
- Analog Gain -   - -
- -
- Digital Gain -   - -
- -
- Resolution   -
Presets
-
- x -
-
Sensor Coverage
-
- Offset -
- x -   - Center -
-
- Frame Rate -
- - MAX - Apply -
- -
- White Balance   - -
- Set Custom -
- -
- Save Video -
- -
- Size: -
- Used: -
- Available: -

- -
- Leave empty to use autoname -

- - Save -
- - - -
- - - -
- - - -
- - - - - - -
- -
-
This page was made by Nicholas Faliszewski
- - - - - - - - - - + + + +Chronos + + + + + + + + + + + + + + +
+
+ +
+ + +
by Kron Technologies
+
+ +
+ + +
+
Main +
Play & Save +
Settings +
I/O Config +
?
Documentation + +
Menu + + +
+ + +
+ +
+ Screenshot Display + + + +
+ +
+
Record +
+
+
+
+ 0% +
+ Black Calibration + Zebra Stripes + Focus Peaking +
+ +
+
+
+ +
+ + +
+ +
+ +
+ Exposure (Shutter) + +
+ ° +   + % +   + µs + MAX +
+ +
+ Analog Gain +   + +
+ +
+ Digital Gain +   + +
+ +
+ Resolution   +
Presets
+
+ x +
+
Sensor Coverage
+
+ Offset +
+ x +   + Center +
+
+ Frame Rate +
+ + MAX + Apply +
+ +
+ White Balance   + +
+ Set Custom +
+ +
+ Save Video +
+ +
+ Size: +
+ Used: +
+ Available: +

+ +
+ Leave empty to use autoname +

+ + Save +
+ + + +
+ + + +
+ + + +
+ + + + + + +
+ +
+
This page was made by Nicholas Faliszewski
+ + + + + + + + + + diff --git a/src/settings.html b/src/settings.html index a9f7a4a..20f436c 100644 --- a/src/settings.html +++ b/src/settings.html @@ -85,7 +85,7 @@ -#colMatrixa, #colMatrixd, #colMatrixg, #colourPreset1Btn, #colourPreset2Btn, #colourIdentityBtn, +#colMatrixa, #colMatrixd, #colMatrixg, #colourPreset1Btn, #colourPreset2Btn, #colourIdentityBtn, #colourPreset1Btn21, #colourPreset2Btn21, #whiteBalNuma, #autoSaveButton { margin-left: 0; } @@ -252,9 +252,11 @@
CIECAM16 + (Default)
CIECAM02 +
Identity Apply @@ -935,6 +937,8 @@ "colourApplyBtn": function() { detourRequester("set", '{"colorMatrix": [' + document.getElementById("colMatrixa").value + ', ' + document.getElementById("colMatrixb").value + ', ' + document.getElementById("colMatrixc").value + ', ' + document.getElementById("colMatrixd").value + ', ' + document.getElementById("colMatrixe").value + ', ' + document.getElementById("colMatrixf").value + ', ' + document.getElementById("colMatrixg").value + ', ' + document.getElementById("colMatrixh").value + ', ' + document.getElementById("colMatrixi").value + ']}', pageUpdate) ; }, "colourPreset1Btn": function() { detourRequester("set", '{"colorMatrix": [1.91455, -0.57666, -0.234131, -0.30542, 1.3894, -0.0966797, 0.127197, -0.952881, 1.64917]}', pageUpdate) ; }, "colourPreset2Btn": function() { detourRequester("set", '{"colorMatrix": [1.23291, 0.646729, -0.776367, -0.321777, 1.68994, -0.380859, -0.0612793, -0.640869,1.52563]}', pageUpdate) ; }, + "colourPreset1Btn21": function() { detourRequester("set", '{"colorMatrix": [2.20691, -0.86351, -0.23999, -0.37569, 1.63493, -0.27217, 0.01404, -0.91139, 1.72075]}', pageUpdate) ; }, + "colourPreset2Btn21": function() { detourRequester("set", '{"colorMatrix": [2.14923, -0.78854, -0.25728, -0.38481, 1.61877, -0.24689, -0.03149, -0.79188, 1.64677]}', pageUpdate) ;}, "whiteBalApplyBtn": function() { detourRequester("set", '{"wbColor": [' + document.getElementById("whiteBalNuma").value + ', ' + document.getElementById("whiteBalNumb").value + ', ' + document.getElementById("whiteBalNumc").value + ']}', pageUpdate) ; }, @@ -1232,8 +1236,16 @@ } - if ("cameraModel" in parsedData) + if ("cameraModel" in parsedData) { document.getElementById("cameraModel").innerHTML = "Camera Model: " + parsedData.cameraModel ; + if (parsedData.cameraModel.includes("CR21")) { + document.getElementById("colourPreset1Btn21").classList.remove("hidden") ; + document.getElementById("colourPreset2Btn21").classList.remove("hidden") ; + + document.getElementById("colourPreset1Btn").classList.add("hidden") ; + document.getElementById("colourPreset2Btn").classList.add("hidden") ; + } + } if ("cameraSerial" in parsedData) document.getElementById("serialNumber").innerHTML = "Serial Number: " + parsedData.cameraSerial ; From 4b7f2351db6d0f0a8c138a33b31126dc0fdf87d8 Mon Sep 17 00:00:00 2001 From: nfaliszewski Date: Mon, 18 Jan 2021 15:39:22 -0800 Subject: [PATCH 6/6] Fixed a style-sheet typo --- src/css/sizeAndSpacing.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/css/sizeAndSpacing.css b/src/css/sizeAndSpacing.css index 0039755..067d5e6 100755 --- a/src/css/sizeAndSpacing.css +++ b/src/css/sizeAndSpacing.css @@ -61,7 +61,7 @@ img { overflow: auto; border-radius: 10px; border: none; - overflow: hide; + overflow: hidden; white-space: nowrap ; }