Matt McWilliams
8b235bb6b0
mitchell work
2023-08-05 14:42:03 -04:00
Matt McWilliams
2f56dd4b8a
Update the timing after delaying for 5000ms (hack)
2023-07-30 23:03:06 -04:00
Matt McWilliams
699c2dbec8
UI cleanup 1: confirm setting the exposure
2023-07-30 22:26:05 -04:00
Matt McWilliams
dac720863d
Resolves #80 and #81 . UI will need a little cleanup. There is some string concatenation happening where it shouldn't.
2023-07-30 22:13:50 -04:00
Matt McWilliams
a173cf0d7c
WIP
2023-07-23 20:00:42 -04:00
Matt McWilliams
fb51716e3a
All work
2023-07-14 21:13:04 -04:00
Matt McWilliams
bdd74fa90a
Save css changes
2023-07-14 21:12:48 -04:00
Matt McWilliams
8631250b9e
Ignore all apple hidden files
2023-07-13 13:00:10 -04:00
Matt McWilliams
0cc167b3a6
Incredibly close to #80 and #81 . Can get state confirmation at startup. Can send exposure string and get confirmation after. Cannot get state outside of initial confirmation. Something is either locked or failing to wait?
2023-07-10 22:33:16 -04:00
Matt McWilliams
4539c6d897
Methods in place for setting exposure
2023-07-05 15:17:45 -04:00
Matt McWilliams
58ce079330
Both components are working properly.
2023-07-04 22:46:37 -04:00
6d379d284b
on site work at MONO
2023-07-01 16:34:07 -04:00
Matt McWilliams
c0d6cbccec
Can now detect if state is available on a device
2023-06-17 17:57:30 -04:00
Matt McWilliams
71e4bea384
Preliminary state support in arduino library. Currently confirms the negative state. Might want to push it until after verify, out of enumerate.
2023-06-16 23:04:16 -04:00
Matt McWilliams
83aa3099c4
Update the settings page with time for projector and camera actions
2023-06-16 22:07:53 -04:00
Matt McWilliams
672db32917
Put in place changes needed to receive a string from an arduino
2023-06-12 22:45:25 -04:00
Matt McWilliams
174b900cd8
Update commands
2023-03-18 17:00:13 -04:00
Matt McWilliams
142c990a0e
Refactored GUI into TypeScript and class-based format
2023-03-18 16:59:26 -04:00
Matt McWilliams
70ab8cb527
Improve timing. Sequence takes into account serialDelay within each command and sequenceDelay has no bearing. Was adding 120ms of error to every step
2023-03-01 13:37:22 -05:00
Matt McWilliams
512f6c86ad
Resolves #73 . Delay is exported in .ts file so it is non-ambient
2023-03-01 13:35:45 -05:00
Matt McWilliams
5db5d477e4
Timing is now updated via rolling average on all projector and camera actions. This data is reset when profile is changed. This data is stored in the settings.json and loaded on start so estimates will improve the more it is used.
2023-02-28 15:55:02 -05:00
Matt McWilliams
7741134917
Create the Timing class
2023-02-28 14:30:17 -05:00
Matt McWilliams
3c19cd35cf
Resolves #4 (4 years ago!). Adds delay (stops scripts for X seconds), alert (displays an alert that stops script execution) and pause (displays a pre-populated alert).
2023-02-28 12:49:11 -05:00
Matt McWilliams
d9290f7262
Add branch_name.sh to print out only the branch name
2023-02-25 22:22:42 -05:00
Matt McWilliams
81b6846261
Only update patch on main
2023-02-25 22:22:18 -05:00
Matt McWilliams
02639466ee
By doing a check for active clients during the sequencer start and stop actions, the local display is no longer used. Resolves first part of #20 .
2023-02-25 17:00:11 -05:00
Matt McWilliams
6e2795d380
Remove ACK messages for ping, rely on
2023-02-25 16:33:55 -05:00
Matt McWilliams
8e35596088
Fixed the iOS issue. Also allow for fullscreen on all browsers (with no sleep). Can preview properly but normal mode does not work
2023-02-25 16:32:08 -05:00
Matt McWilliams
0162d012c5
Server can now display images and will completely preempt local display when done
2023-02-25 13:22:20 -05:00
Matt McWilliams
47fb673b78
Combined script and html into single request (problems with iOS safari).
...
Can get script loaded but still cannot connect to websocket server without SSL.
ALSO: Now can pre-empt opening new display if an active client is connected to server.
Otherwise will open a local link.
2023-02-25 13:11:40 -05:00
Matt McWilliams
f296488bc2
Further progress on #20 . TODO: Image display logic on the server side. Need to add image to proxy list and give it a properly-extensioned name and cmdAll.
...
ALSO: Server is not working on iOS.
2023-02-25 12:40:35 -05:00
Matt McWilliams
f5392aea9f
Resolves #74
2023-02-25 12:33:18 -05:00
Matt McWilliams
24b1301f9f
Adding contextIsolation: false to the display module fixes the initial issue in #74 , cannot use "require" but the escape button does not work due to "Cannot read properties of undefined (reading 'getCurrentWindow')"
2023-02-25 12:16:47 -05:00
Matt McWilliams
1290a8f324
Major progress on #20 . Promised-based websocket command structure is completed. All functionality needs to be placed into individual classes and any new functions get added to the server.
...
Will create entire thin client using this method.
2023-02-25 11:59:56 -05:00
Matt McWilliams
e64277e438
More work on #20 . Fix typos in display code. Should re-work script into transpiled ts file.
2023-02-25 02:08:56 -05:00
Matt McWilliams
c9bcb74a9f
Progress on #20 . Can start up a server and serve client.js
2023-02-25 02:08:05 -05:00
Matt McWilliams
42db1f81b8
Server work
2023-02-25 00:24:07 -05:00
Matt McWilliams
7222952eba
Update version nubmers
2023-02-19 19:43:12 -05:00
Matt McWilliams
744f10c948
Display version in app
2023-02-19 11:36:06 -05:00
Matt McWilliams
b50704a6a8
Fix minor layout issue on sequence page (on mac at least).
2023-02-19 01:28:18 -05:00
Matt McWilliams
c152806511
Now it works.
2023-02-19 01:27:19 -05:00
Matt McWilliams
4d9454daf2
Patch script now working
2023-02-19 01:22:44 -05:00
Matt McWilliams
e754c65602
Increment patch without npm install
2023-02-19 01:20:51 -05:00
Matt McWilliams
6116ada2fd
Getting a new error when compiling delay library. Attempt to stop autogenerating d.ts files.
...
src/delay/index.ts:11:10 - error TS2384: Overload signatures must all be ambient or non-ambient.
2023-02-19 00:55:17 -05:00
Matt McWilliams
ebc5504998
Add commands for takeup
2023-02-19 00:29:07 -05:00
5026cf869f
Arri-S work
2022-10-07 19:47:56 -04:00
72b5077356
Restructure includes and type definition files so that mscript runs
2022-08-07 22:18:58 -04:00
6601c030f7
Refactor mscript GUI code into Typescript
2022-08-07 22:10:53 -04:00
3ec1373f08
Caught a possible ancient bug in the loop logic for calculating state of camera and projector backwards movements.
2022-08-07 17:23:06 -04:00
Matt McWilliams
b29478cb58
Increment build patch version
2022-08-04 10:57:36 -04:00
Matt McWilliams
fe61e63e76
Add secondary projector and camera commands to the mscript module
2022-08-04 10:52:00 -04:00
Matt McWilliams
ee0ab663d7
Complete the alert feature. Have not created pause, but this could be done using the same alert object to prevent code duplication.
2022-08-03 09:02:47 -04:00
Matt McWilliams
3f759f5678
Add the ability to detect a single capper device
2022-07-17 09:57:52 -04:00
Matt McWilliams
9d0545aa4f
All capper features in app, can shoot blank frames, can turn on capper independently and can schedule blank frames in the sequencer. Some cleanup may be needed but there are no noticeable regressions in the app. TODO: Finish all arduino scripts.
2022-07-15 18:11:26 -04:00
70c2c695f0
All capper work. Need to wrap all actions in the 'b' command and push functionality to a lower level to prevent unneeded complexity.
2022-07-13 15:21:26 -04:00
8ec5816364
Adjust settings page to support Processing input
2022-07-13 10:15:47 -04:00
Matt McWilliams
585c47d6c7
Allow capper identifier in list of acceptable responses.
2022-06-13 08:08:42 -04:00
Matt McWilliams
129647b863
App work
2022-06-12 13:37:00 -04:00
Matt McWilliams
f585aa2a5a
Upgrade electron 11 -> 19 (huge jump). Install new remote module to preserve legacy communication protocol.
2022-06-04 11:11:23 -04:00
Matt McWilliams
22bed4632b
Update the notarization process for installing mcopy
2022-04-30 18:51:33 -04:00
Matt McWilliams
81d94fd727
update package lock
2022-04-30 16:03:03 -04:00
Matt McWilliams
bbfe6fc657
Add option to use Processing with a server as a capture method triggered by the camera.
...
Enter a url into the Settings panel in the Processing URL input box and select the radio button.
2022-04-30 15:58:17 -04:00
Matt McWilliams
9dce9fb1f2
Add an alternate script for notarizing builds
2021-05-01 12:20:19 -04:00
Matt McWilliams
e1c8ba1320
Build_linux.sh already tags the installer with the correct version number
2021-04-13 18:39:22 -04:00
mmcwilliams
4ef318c55e
Rename installer after build process.
2021-04-13 14:45:15 -04:00
mmcwilliams
7f7513809a
Established an app signing process for macs using electron-packager. The process takes an enormous amount of time but has so far been running without throwing an exception and the signature is confirmed by codesign.
2021-04-13 14:17:12 -04:00
Matt McWilliams
faad084b2b
Hide "blank" buttons because they do not have a use case in the current app.
2021-04-01 22:21:27 -04:00
Matt McWilliams
3e528c23a5
Give the filmout position input element a fixed width value
2021-04-01 19:45:08 -04:00
Matt McWilliams
6fed941441
Filmout UI was breaking on linux (all of a sudden)
2021-04-01 19:40:29 -04:00
Matt McWilliams
8c14a06b96
Removed naked console.log statements that were used to debug a serial issue. If needed they can be re-added to the actual log library.
2021-03-19 12:10:07 -04:00
Matt McWilliams
3e0ac3f0d0
Added return types to Filmout library and added return types to comments where needed.
2021-03-19 12:09:03 -04:00
Matt McWilliams
394fbe2323
Update cfg.json. Not sure why this lags??
2021-03-18 11:55:18 -04:00
Matt McWilliams
aac5e5d488
Increment patch to 1.6.9
2021-03-18 11:28:46 -04:00
Matt McWilliams
8a6bc0b4f5
Fixed video export, still sequence selection
2021-03-18 11:27:53 -04:00
Matt McWilliams
a2af605d37
Filmout needs to receive the whole state, not just the frame. Still broken.
2021-03-18 10:00:49 -04:00
Matt McWilliams
32f70be614
Fixes #50 - Support image sequences in filmout feature
2021-02-24 11:58:19 -05:00
Matt McWilliams
31c701734a
Corrected a UI issue with selecting directories of non-supported images. Works on macOS now with videos, images and image sequences. Testing on linux again before resolving.
2021-02-24 11:50:15 -05:00
Matt McWilliams
fb7b1e2fb6
Added an edge-case helper for choosing files/directories in linux. This finishes the requirement for issue #50 on linux, but will test changes on macOS before marking the issue resolved.
2021-02-24 10:05:45 -05:00
Matt McWilliams
5061a511ab
Corrected an issue with the monitor selection UI where the text is cut off.
2021-02-24 00:38:11 -05:00
Matt McWilliams
c0121bcfe7
Have seemingly added the ability to use image sequences with the filmout feature with a few caveats. File selection is working on mac but was not on Linux. Also using this method only jpeg and png sequences can be used. This is not unacceptable, but the UI will have to be made more explicit about this limitation. I would like to support TIFF files but even now with single images they are rendered to PNG using ffmpeg.
2021-02-24 00:22:08 -05:00
Matt McWilliams
66639e951b
Allow for the selection of a video file, image or directory containing images to be selected in the filmout UI.
2021-02-23 19:54:03 -05:00
Matt McWilliams
53d147b9bc
Add lstat and "directory" property onto the filmout.state object.
2021-02-23 19:53:22 -05:00
Matt McWilliams
ad1ac51fc8
Need to enableRemote in the electron browser window that gets created by filmout.
2021-02-23 16:16:17 -05:00
Matt McWilliams
6473f388d8
Update package-lock to latest version
2021-02-22 13:40:44 -05:00
Matt McWilliams
85bfa57127
Update all modules in app to latest version, including electron. Removed electron updater because of no plans to integrate and to reduce the app size.
2021-02-22 13:23:36 -05:00
Matt McWilliams
338a60f947
Restructure function to match convention. Declare all variables in the beginning of the function rather than declaring them throughout. Small edit while I re-read the UI code and build the file sequence feature.
2021-02-22 13:12:27 -05:00
Matt McWilliams
9ab1436d49
Move dev commands into its own script.
2021-02-22 13:03:41 -05:00
b90a68cb39
Bump electron from 9.1.1 to 9.3.1 in /app
...
Bumps [electron](https://github.com/electron/electron ) from 9.1.1 to 9.3.1.
- [Release notes](https://github.com/electron/electron/releases )
- [Changelog](https://github.com/electron/electron/blob/master/docs/breaking-changes.md )
- [Commits](https://github.com/electron/electron/compare/v9.1.1...v9.3.1 )
Signed-off-by: dependabot[bot] <support@github.com>
2020-10-06 17:50:14 +00:00
e84f1ce8ff
Add additional logging
2020-10-03 21:33:45 -04:00
7d4e53fe24
Bump bl from 4.0.2 to 4.0.3 in /app
...
Bumps [bl](https://github.com/rvagg/bl ) from 4.0.2 to 4.0.3.
- [Release notes](https://github.com/rvagg/bl/releases )
- [Commits](https://github.com/rvagg/bl/compare/v4.0.2...v4.0.3 )
Signed-off-by: dependabot[bot] <support@github.com>
2020-09-29 19:50:29 +00:00
e672c2dc93
Merge pull request #47 from sixteenmillimeter/dependabot/npm_and_yarn/app/lodash-4.17.19
...
Bump lodash from 4.17.15 to 4.17.19 in /app
2020-09-29 15:49:24 -04:00
7c9543239e
Rest of last commit. Renderer js
2020-09-29 13:57:59 -04:00
8672b6584a
Work towards issue #52 . Adds a statement within the arduino.end() method that watches for an 'E' char byte and will alert the UI while pausing a running sequence. Needs to be in place for firmware to be able to throw errors to UI.
2020-09-29 13:48:06 -04:00
6eeeae85c8
Updated patch number, now working on 1.6.5
2020-08-18 14:21:07 -04:00
7c61af7043
Added logging to the arduino module to list all connected devices.
2020-08-18 14:20:43 -04:00
f02782d4da
Increment build to 1.6.4. Re-package and deploy for mac
2020-08-09 23:39:52 -04:00
32356b0037
Log doesn't need to print its own path.
2020-08-09 23:25:55 -04:00
4f2252d113
Merge remote-tracking branch 'origin/master'
2020-08-09 20:03:52 -04:00
0145bebb4b
Turn off notifier if errors out
2020-08-09 20:03:48 -04:00
mmcwilliams
5e6fbbb43c
Add armv7l architecture to dpkg for Raspian.
2020-07-30 11:28:11 -04:00
mmcwilliams
7e516a59b6
Wrong arch again
2020-07-30 11:04:02 -04:00
mmcwilliams
948b20fead
Install dependencies for rpi. Package as armv71 for raspberry pi
2020-07-30 11:01:57 -04:00
mmcwilliams
c61c128044
Merge remote-tracking branch 'origin/master'
2020-07-30 10:54:44 -04:00
mmcwilliams
296ef93ecb
Installer for rpi
2020-07-30 10:54:35 -04:00
74621ef1fb
Squashing notifier/notify-send errors on raspian. If the system doesnt work with node-notifier just skip
2020-07-27 11:43:55 -04:00
0811222d27
Normalize paths being used in filmout feature. Purpose of this is to rely on fs module to correctly handle paths for windows because it was previously broken. Will run tests.
2020-07-26 22:26:34 -04:00
0c364576c9
Squash errors in case of mkdir trying to create an existing directory (need mkdirp, but this works without an extra module)
2020-07-26 22:01:28 -04:00
7ff49f0aa6
Bump lodash from 4.17.15 to 4.17.19 in /app
...
Bumps [lodash](https://github.com/lodash/lodash ) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases )
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19 )
Signed-off-by: dependabot[bot] <support@github.com>
2020-07-27 01:56:48 +00:00
8c97258866
Update all modules in core project and desktop app. Needed to update syntax of import in sequencer module because uuid is updated to 8.2.0
2020-07-26 21:55:36 -04:00
5c691a8e12
Fixed serialization error that was breaking raspberry pi 4 installation. It is apparently a real bug that should be breaking the app.
2020-07-26 21:52:53 -04:00
a748f689bd
Merge pull request #45 from sixteenmillimeter/dependabot/npm_and_yarn/app/electron-7.2.4
...
Bump electron from 7.1.8 to 7.2.4 in /app
2020-07-07 12:16:04 -04:00
efc6d0ef03
Moving further down up the path. See previous commit.
2020-07-07 12:07:00 -04:00
a379e4b086
Windows path differences from linux/darwin are ruining my day https://github.com/felixrieseberg/electron-wix-msi/issues/5
2020-07-07 12:05:28 -04:00
4a1bf417a4
Running build scripts on windows for the first time in a while.
2020-07-07 11:59:34 -04:00
270862bd5f
Bump electron from 7.1.8 to 7.2.4 in /app
...
Bumps [electron](https://github.com/electron/electron ) from 7.1.8 to 7.2.4.
- [Release notes](https://github.com/electron/electron/releases )
- [Changelog](https://github.com/electron/electron/blob/master/docs/breaking-changes.md )
- [Commits](https://github.com/electron/electron/compare/v7.1.8...v7.2.4 )
Signed-off-by: dependabot[bot] <support@github.com>
2020-07-07 00:20:09 +00:00
mmcwilliams
fb63bade2f
Fix windows build process (avoid asar)
2020-04-29 10:06:51 -04:00
mmcwilliams
8163f7d454
Merge remote-tracking branch 'origin/master'
2020-04-24 22:38:35 -04:00
mmcwilliams
5ec50713ba
Remove extraneous build config from package.json.
2020-04-24 22:38:32 -04:00
3fd2b04e75
Update build script on mac to not throw an error
2020-04-24 22:26:00 -04:00
mmcwilliams
c15cd512ae
The trick on linux is to not build as an asar. Go figure.
2020-04-24 22:17:10 -04:00
mmcwilliams
cc41b75130
FFMPEG not working yet
2020-04-24 22:12:56 -04:00
mmcwilliams
f929ea2cc2
No, use ffmpeg-static and ffprobe-static but explcitly whitelist the node_modules bin folder where the binaries actually sit
2020-04-24 17:22:58 -04:00
mmcwilliams
d4987ed3a3
Replace ffmpeg-static and ffprobe-static with ffmpeg-static-electron and ffprobe-static-electron. These will allow for packaging ffmpeg and ffprobe binaries that can be accessed from within the build. The path replace string hacks weren't cutting it.
2020-04-24 16:01:09 -04:00
mmcwilliams
da00c62db3
FFMPEG and FFPROBE need to be stored unpacked in asar for build.
2020-04-24 15:09:51 -04:00
55c460fbb4
Install new frame module in electron app package
2020-04-24 14:46:05 -04:00
01cac728f5
Remove ImageMagick dependency. Replace sharp with jimp (prevent linux build issues). Jimp will also perform the same composite step as convert was. Light module is still disabled globally.
2020-04-24 14:33:58 -04:00
8d5663d3a2
Drop unnecessary console.dir statement
2020-03-09 15:58:36 -04:00
1c940d6df7
Display export progress and time estimate while all frames are being exported
2020-03-09 15:46:06 -04:00
e25a8bbc7c
Use the gui.confirm dialog and not the native confirm function.
2020-02-21 16:58:35 -05:00
d70de98256
Pre-export all frames in video (with confirmation dialog). Greatly improves sequence times and reliablity in conjunction with last commit. Resolves #36 and resolves #39 .
2020-02-21 13:34:22 -05:00
aec3e29476
Wait until image is loaded in a temp element and then report back to main process using ipc. This uses the "display_load" ipc channel to call back to the Display class and resolve a promise made in the .show() method. Resolves #38 .
2020-02-21 02:28:26 -05:00
32fe873707
Allow for longer videos by using longer padded numbers for sequences
2020-02-21 01:58:56 -05:00
549cd3cc04
1.5.2 changes. Build includes code not in repo :(
2020-01-21 11:38:50 -05:00
8dc955a5e7
FFprobe added as static binary. Needed for filmout feature.
2020-01-20 11:51:15 -05:00
ed75924e24
Filmout release 1.5.0.
2020-01-20 01:37:38 -05:00
49ba9a090b
Turn off light feature for all cfgs. None support it.
2020-01-20 01:20:56 -05:00
691e741d70
Add check for convert. Never used.
2020-01-20 01:15:20 -05:00
35b8b0def2
Fixed some counter confusion. Setting the primary and secondary projectors with correct variables.
2020-01-19 01:39:57 -05:00
mmcwilliams
529c275c0f
Filmout needed update in use of dialog class. ffmpeg-static needed to reference the required module, not .path
2020-01-19 00:36:58 -05:00
mmcwilliams
d604f2aab5
Resolved #28 issues with color selection in the GUI. Performing final tests before 1.5 release. On release will use new repo tagging methods and will build more frequently.
2020-01-14 12:48:15 -05:00
mmcwilliams
b0c7e4eed4
Created a new, custom superior log format with timestamps and "splat()" objects. Tired of parsing json from logfiles for analysis. Now can easily grep through logfiles.
2020-01-14 11:51:25 -05:00
mmcwilliams
c6d0256929
Compile renderer js with tsconfig.json file. Add maps.
2020-01-10 16:43:12 -05:00
mmcwilliams
4d022883ff
Update cfg files
2020-01-09 20:19:13 -05:00
b595225870
Increment patch to 1.4.20
2020-01-09 18:43:16 -05:00
fc2593c6ee
Resolves #34 . Added delay lib to renderer and added a magic delay before ending devices.ready(). Just works. Move on and don't question it.
2020-01-09 18:06:18 -05:00
4c0aa4220c
Log with "simple" format, no more json in the console.
2020-01-09 18:05:10 -05:00
mmcwilliams
42621bbf71
Devices discovery WIP
2020-01-05 12:40:38 -05:00
mmcwilliams
4c8c2b66f3
Serialport library was updated and changed to Promise-based returns from callbacks as was being used in the arduino lib.
2019-12-18 17:17:48 -05:00
mmcwilliams
c6ebab4032
Post upgrade, log library needs to be upgraded to support winston 3.x API
2019-12-18 16:05:58 -05:00
mmcwilliams
4461670e14
Fixes security concerns. Resolves #24 and #27
2019-12-16 19:25:51 -05:00
Matt McWilliams
Matthew McWilliams
Matthew McWilliams
mmcwilliams
dependabot[bot]
sixteenmillimeter
sixteenmillimeter