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/IO.html b/src/IO.html index 04749ad..527d90e 100644 --- a/src/IO.html +++ b/src/IO.html @@ -1357,8 +1357,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) ; } diff --git a/src/PlaySave.html b/src/PlaySave.html index 44965ef..7f5203f 100755 --- a/src/PlaySave.html +++ b/src/PlaySave.html @@ -1,1442 +1,1442 @@ - - - -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/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 diff --git a/src/css/sizeAndSpacing.css b/src/css/sizeAndSpacing.css index 1c13725..f75823b 100755 --- a/src/css/sizeAndSpacing.css +++ b/src/css/sizeAndSpacing.css @@ -60,7 +60,7 @@ img { overflow: auto; border-radius: 10px; border: none; - overflow: hide; + overflow: hidden; white-space: nowrap ; } diff --git a/src/css/windozeFixes.css b/src/css/windozeFixes.css index 929ae78..3bf0863 100755 --- a/src/css/windozeFixes.css +++ b/src/css/windozeFixes.css @@ -1,157 +1,157 @@ -/*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; - 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; + 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 diff --git a/src/index.html b/src/index.html index 78e89eb..270d9b9 100644 --- a/src/index.html +++ b/src/index.html @@ -1,1635 +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 -   - -
- -
- 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 52d496f..205e931 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; } @@ -247,9 +247,11 @@
CIECAM16 + (Default)
CIECAM02 +
Identity Apply @@ -922,6 +924,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) ; }, @@ -1219,8 +1223,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 ;