Matt McWilliams
176643f148
Manual merge from capper branch: all changes to display library.
2023-08-06 14:36:31 -04:00
Matt McWilliams
8b235bb6b0
mitchell work
2023-08-05 14:42:03 -04:00
Matt McWilliams
174b900cd8
Update commands
2023-03-18 17:00:13 -04: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
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
ebc5504998
Add commands for takeup
2023-02-19 00:29:07 -05: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
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
Matt McWilliams
585c47d6c7
Allow capper identifier in list of acceptable responses.
2022-06-13 08:08:42 -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
394fbe2323
Update cfg.json. Not sure why this lags??
2021-03-18 11:55:18 -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
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
e84f1ce8ff
Add additional logging
2020-10-03 21:33:45 -04:00
6eeeae85c8
Updated patch number, now working on 1.6.5
2020-08-18 14:21:07 -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
mmcwilliams
da00c62db3
FFMPEG and FFPROBE need to be stored unpacked in asar for build.
2020-04-24 15:09:51 -04: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
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
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
4d022883ff
Update cfg files
2020-01-09 20:19:13 -05:00
mmcwilliams
42621bbf71
Devices discovery WIP
2020-01-05 12:40:38 -05:00
mmcwilliams
5f701ccecb
Increment patch number.
2019-08-04 19:53:51 -04:00
mmcwilliams
7e05b5f680
Fix dual projector bug and increment patch.
2019-07-27 08:47:35 -04:00
mmcwilliams
60147e3b0f
Increment patch
2019-07-07 00:00:14 -04:00
mmcwilliams
504912009b
Increment patch number of version across the project.
2019-06-26 20:10:18 -04:00
mmcwilliams
b5465384ce
Increment package version
2019-06-26 16:10:04 -04:00
mmcwilliams
6b10e9c28d
System module phones home
2019-06-24 12:42:27 -04:00
mmcwilliams
2e4ef09a60
Apply new patch version everywhere.
2019-06-18 16:54:22 -04:00
mmcwilliams
5cd6b22ea4
Only use webview in full screen mode for now on all platforms. EOG is trickier and flickers the entire screen into view between frames, which is unsettling. Will look for a lower-level solution than webviews, but works for now. Also, uses real fullscreen on macOS instead of just maximizing the window.
2019-06-18 13:47:55 -04:00
mmcwilliams
d8e5e4521a
Increment patch number. Commit 418670ce33 resolves #14 ;
2019-05-28 17:53:23 -04:00
mmcwilliams
9a0ebcca06
cfg has latest version number
2019-05-28 17:41:23 -04:00
mmcwilliams
5c9091d957
Can't reproduce issue #13 . Appeared on installation of unknown version. Close #13 for now.
2019-05-28 10:33:31 -04:00
mmcwilliams
a241ef0a2a
Update config
2019-04-20 10:14:22 -04:00
mmcwilliams
7a52bc7c6e
Secondary projector and secondary camera behaviors have been added to the main process. This is not represented in the UI... yet. All renderer code is still in flux.
2019-04-04 18:49:07 -04:00
mmcwilliams
cda100b3e6
Electron build works again on debian-based linux.
2019-04-03 18:58:13 -04:00
mmcwilliams
43ee0d0672
Sequence now runs entirely in the main process. Renderer no longer stores the sequence, it is a for loop inside the main process.
2019-03-23 21:58:22 -04:00
mmcwilliams
b02b92c1c7
Update version across the repo.
2019-03-22 20:29:09 -04:00
mmcwilliams
f09ada2cd2
Build and version the package json files on each npm run build
2019-03-22 19:52:21 -04:00
mmcwilliams
3dcfa708d2
Add shortened commands to the cfg.json file
2019-03-22 03:12:42 -04:00
mmcwilliams
48e8415ee4
Rename all keys to full "camera_" vs "cam_" and "projector_" vs "proj_" for consistency across the app.
...
Successfully separate and refactor gui.grid object to gui.
2019-03-21 21:02:28 -04:00
mmcwilliams
46da2e6541
Add the new firmware identifiers as accepted responses. Also add text identifiers for firmware identified as the 4 new types.
2019-03-18 17:21:17 -04:00
mmcwilliams
f276d5ce83
Add commands for controlling a secondary projector.
2019-03-01 20:14:20 -05:00
mmcwilliams
643e88aef3
Add a placeholder config profile for the MONO JK
2019-02-26 16:00:59 -05:00
mmcwilliams
7398f7993d
Start work on secondary projector feature
2019-02-25 18:14:29 -05:00
mmcwilliams
34a7d37b7b
Save devices state
...
Restore state
Switch to use intval as camera
2018-02-01 14:52:47 -05:00
M McWilliams
6613558221
named profiles in cfg
2018-01-30 09:33:34 -05:00
M McWilliams
9bbf2393b7
Adjust timings in the jkfirmware
2018-01-30 05:05:04 -05:00
mmcwilliams
71710ecca2
REmove whitespace from cfg.json (testing different platforms that lack this file)
2018-01-17 18:09:51 -05:00
mmcwilliams
5d6e5321ff
Hardcode cfg.json with all the new command characters.
2018-01-09 23:02:47 -05:00
Matt McWilliams
Matthew McWilliams
Matthew McWilliams
sixteenmillimeter
mmcwilliams