Matt McWilliams
c4119ab7cc
Manual merge from capper branch: all changes to arduino library with some improvements.
2023-08-06 14:56:42 -04:00
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
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
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
e754c65602
Increment patch without npm install
2023-02-19 01:20:51 -05:00
6601c030f7
Refactor mscript GUI code into Typescript
2022-08-07 22:10:53 -04:00
Matt McWilliams
b29478cb58
Increment build patch version
2022-08-04 10:57:36 -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
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
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
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
aac5e5d488
Increment patch to 1.6.9
2021-03-18 11:28:46 -04:00
Matt McWilliams
32f70be614
Fixes #50 - Support image sequences in filmout feature
2021-02-24 11:58:19 -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
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
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
f02782d4da
Increment build to 1.6.4. Re-package and deploy for mac
2020-08-09 23:39:52 -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
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
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
5ec50713ba
Remove extraneous build config from package.json.
2020-04-24 22:38:32 -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
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
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
c6d0256929
Compile renderer js with tsconfig.json file. Add maps.
2020-01-10 16:43:12 -05:00
b595225870
Increment patch to 1.4.20
2020-01-09 18:43:16 -05:00
mmcwilliams
42621bbf71
Devices discovery WIP
2020-01-05 12:40:38 -05:00
mmcwilliams
4461670e14
Fixes security concerns. Resolves #24 and #27
2019-12-16 19:25:51 -05:00
mmcwilliams
5ce0aed2ff
Use module "ffmpeg-static" to use a binary of ffmpeg stored in node_modules, rather than rely on the system version.
2019-08-23 15:39:38 -04:00
mmcwilliams
5f701ccecb
Increment patch number.
2019-08-04 19:53:51 -04:00
mmcwilliams
1b83fe6937
Downgrade winston from 3 to 2 because it prints better in the console. Change all require statements to imports, requiring only what's used.
2019-08-04 19:38:45 -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
f8c64b45a7
Install sharp and animated-gif-detector
2019-07-06 19:53:03 -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
98a0eff503
Uninstall systeminformation, which was the original module being used to determine monitor stats. Now use the internal electron.screen module, which I was using originally? Yikes.
2019-06-22 12:07:07 -04:00
mmcwilliams
717cf77e55
Rename all uses of the previously-named "digital" module to "filmout" in sequence module. Woo! Let's call that a patch.
2019-06-18 16:54:08 -04:00
mmcwilliams
22187777e7
Remove node-side digital lib and replace with filmout lib. Still remaining: rename internal uses of "dig" or "digital" to "filmout", including markup on the frontend.
2019-06-18 15:42:30 -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
39e6ab5247
Update all modules, and update gulpfile to gulp4 syntax.
2019-06-14 13:11:28 -04:00
mmcwilliams
d8e5e4521a
Increment patch number. Commit 418670ce33 resolves #14 ;
2019-05-28 17:53:23 -04:00
mmcwilliams
4ea390897a
Refactored seq.js to Typescript and fixed stats for 1 cam 1 proj. Will need further work to add in multiple devices. Resolves #6 .
2019-05-28 13:33:16 -04:00
mmcwilliams
c942d89572
Wire goto button on projector 2 and camera 2 to cmd.projector_second_to and cmd.camera_second_to. Resolves #9
2019-05-28 12:52:50 -04:00
mmcwilliams
d0cc8eca70
GOTO counter error on projector 2 was due to a CSS error. Resolved #8 . Increment patch number.
2019-05-28 12:28:45 -04:00
mmcwilliams
1b3f554492
Caught the "to sequence" bug. Had not fully updated code. Resolves #5
2019-05-28 10:15:57 -04:00
mmcwilliams
67a009ae8d
Increment patch to reflect changes that resolved issue 3
2019-05-28 09:15:29 -04:00
mmcw-dev
b33ef36ab4
Work on multiple device UI
2019-04-16 10:01:42 -04:00
mmcw-dev
9603f82c49
Use mocha for testing, instead of qunit
2019-04-15 16:14:07 -04:00
mmcwilliams
cda100b3e6
Electron build works again on debian-based linux.
2019-04-03 18:58:13 -04:00
mmcwilliams
63e42f2dd3
Need to install request now, locally, for latest electron build.
2019-04-03 18:54:37 -04:00
mmcw-dev
d995a4800d
Update install process.
2019-04-02 11:11:26 -04:00
mmcwilliams
3e5bda77db
Move docs generation to host repo
2019-03-30 17:56:31 -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
dcca364b78
Update to electron 4. Updated electron-rebuild and electron-packager. Removed sqlite because it is currently unused and takes forever to rebuild. Originally intended to store timings of actions to optimize performance. Putting those plans on ice for now.
2019-03-22 17:01:54 -04:00
mmcwilliams
553d2bbb0d
Made progress on sequencer module, renamed from sequence.
2019-03-22 04:33:53 -04:00
mmcwilliams
600a0abc72
Create and install main process lib to control the cmd.js module
2019-03-21 19:33:01 -04:00
mmcwilliams
82e10bb4a4
Increment minor version. This marks the "feature complete" refactor of the core functionality in typescript using classes instead of objects in the main.js process.
...
Also, install the new devices module that was refactored into a class from an object. This has been tested with firmware, but additional development on this minor version will pull more UI elements into the main process. This will allow a CLI app to be created more efficiently and kept in sync with the rest of the project. Interface with the firmware will be expanded to control multiple projectors or multiple cameras in the next minor version.
2019-03-21 18:08:24 -04:00
mmcwilliams
fce259d29b
Create a "digital" module, moving the "dig" object from the main.js process to it's own class.
2019-03-21 14:58:00 -04:00
mmcwilliams
2408456d47
Install cam, log and mscript modules.
2019-03-20 23:04:52 -04:00
mmcwilliams
d19e83d616
Increment patch number and run `npm audit fix`
2019-03-18 19:43:27 -04:00
mmcwilliams
4202d01630
Calling this a patch commit lets go!
2019-03-09 15:47:26 -05:00
mmcwilliams
307ef33a10
Update description as project expands and reshapes. Now will develop shared modules for the app, cli and then the "native" experimental app written in proton-native.
2019-03-04 22:06:40 -05:00
mmcwilliams
200671b1cf
Increment patch number for new build.
2019-03-01 18:02:39 -05:00
mmcwilliams
73ae599cff
Uninstall and remove references to async module
2019-02-23 22:40:59 -05:00
mmcwilliams
8ebdbf9f6f
Add docs script to package.json
2019-02-23 12:25:47 -05:00
mmcwilliams
8bd505da36
Save and restore settings, including profiles.
2019-02-23 12:25:46 -05:00
mmcwilliams
4de536e2e8
Incrementing patch. Fixed color and timing issues with "digital" sequences.
2019-02-13 19:00:10 -05:00
mmcwilliams
cbb28212d6
Increment a major version because of new Digital projector feature.
2019-02-08 18:23:35 -05:00
mmcwilliams
0e618430ff
Install delay, exit and exec modules.
2019-02-08 14:07:35 -05:00
mmcwilliams
2dbed1215d
Install local capture module to package.
2019-02-08 13:15:22 -05:00
mmcwilliams
e42d7a6e0b
Install local modules to package
2019-02-08 12:57:38 -05:00
mmcw-dev
8adab68cdc
Update package and increment version for local install
2018-12-10 22:14:55 -05:00
M McWilliams
f58f5ae95f
Make electron debian package optional
2018-11-24 20:10:20 -05:00
mmcw-dev
625094f0e3
Update to electron 3
2018-11-23 13:26:36 -05:00
mmcw-dev
1914641b77
Updates after package updates
2018-09-02 14:26:12 -04:00
mmcw-dev
92ba4af306
Update everything, latest electron, latest everything
2018-09-02 09:50:36 -04:00
mmcw-dev
af8e982cc9
Update to the latest electron
2018-09-02 08:10:26 -04:00
mmcw-dev
4565205aad
Install fs-extra for promise-based fs functionality
2018-06-14 11:42:29 -04:00
mmcwilliams
bab6593fba
Add test script to the package file
2018-03-16 11:26:09 -04:00
mmcw-dev
a2406c667a
Rename package to mcopy-app to prevent issues installing alongside mtools. Incremented build after patching issues with the grid sequencer.
2018-03-15 15:31:50 -04:00
mmcw-dev
38b52d0618
Minor version increment, 1.0.0 was broken, and this is a corrective patch. 1.0.1 allows connected light devices to work without locking up the process.
2018-03-15 12:09:49 -04:00
mmcw-dev
95da651d6d
Run from local binaries, not globals
2018-03-15 11:23:23 -04:00
mmcw-dev
88c1e6d72d
Correct version to 1.0.0
2018-03-15 10:19:51 -04:00
mmcwilliams
072ef38a24
Auto packager formatting
2018-03-02 21:12:39 -05:00
mmcwilliams
4a3a99acb6
Add a dev script that builds gulp and starts in -d/--dev mode
2018-02-01 14:56:50 -05:00
mmcwilliams
1807f5881b
Electron update because of vulnerability report
2018-01-23 00:04:37 -05:00
mmcwilliams
57321bff4b
Update serialport and node-notifier, marked is now gone.
2018-01-09 23:23:28 -05:00
mmcwilliams
ea973b522d
Update modules due to security advisory (even though no one will be DDoSing the desktop app anytime soon)
2018-01-09 23:06:11 -05:00
mmcw-dev
af8378de88
Add additional build tools for electron on different platforms.
2018-01-06 17:51:19 -05:00
mmcw-dev
9997df1c99
Remove unnecessary q module, am using async or promises where needed.
2018-01-04 23:41:32 -05:00
mmcw-dev
21ec669b20
Install async and update to electron 1.7 with associated deps
2018-01-02 01:14:29 -05:00
mmcw-dev
530a6fdd4f
Install async module
2018-01-01 23:19:46 -05:00
mmcwilliams
339303c0c2
Update modules, use latest electron and fix bad requires. App is up and running, but needs debugging of the frontend and a fierce refactor.
2017-12-19 22:02:08 -05:00
236908993e
Update requirements
2017-02-09 09:35:07 -05:00
3006e2e706
Lighting GUI complete
...
Able to store swatches of colors in active memory and apply to steps in
the sequencer
2016-04-17 17:55:23 -04:00
b36082d0e7
Sequencer added
2016-04-14 00:17:42 -04:00
4100a0e2b0
Moment added
2016-04-12 23:08:42 -04:00
2b121f8ee0
Install winston, add server logging
2016-04-12 22:55:51 -04:00
6680abdce3
Restructure for gulp build of app.js
2016-04-12 20:53:28 -04:00
d902c26a70
Import work from mcopyJK
2016-04-11 10:49:57 -04:00
5ca261f15d
Add all modules and rebuild script
...
node-notifier
node-uuid
electron-packager
electron-rebuild
2016-04-11 02:20:24 -04:00
8120fb16a1
got up to electron-quick-start level
2016-04-11 02:01:26 -04:00
94620d6b70
Create mcopy electron app
2016-04-11 01:56:06 -04:00
Matt McWilliams
Matthew McWilliams
Matthew McWilliams
dependabot[bot]
sixteenmillimeter
mmcwilliams
Matt