Compare commits

...

581 Commits
1.6.1 ... main

Author SHA1 Message Date
Matt McWilliams c365eff6a7 Fixed single issue related to #11. If state of secondary projector or camera are set, include in output. 2024-10-13 15:49:44 -04:00
Matt McWilliams 4149d77d70 Render all mcopy_gate parts and add them to the scad render script. 2024-10-08 23:15:15 -04:00
Matt McWilliams 28a323f4f8 Detail work on mcopy gate 2024-10-08 08:16:32 -04:00
Matt McWilliams 09d7274bce Adjustments to gate sprocketed rollers 2024-09-22 11:29:50 -04:00
Matt McWilliams af97f5da1e Update sprocketed roller design to use a nut to lock in place 2024-09-18 23:10:40 -04:00
Matt McWilliams 16b7a7def2 Bevel the sides where the film enters the gate. 2024-09-14 18:49:32 -04:00
Matt McWilliams 320e38bfd8 Fix text labels on gates 2024-09-14 11:18:33 -04:00
Matt McWilliams 1f18b59f9d Round the filmpath bevels. Safer areas touching film. 2024-09-14 11:17:31 -04:00
Matt McWilliams 750cd3e67c Label the gate masks 2024-09-13 19:01:20 -04:00
Matt McWilliams b4271c3c86 Save work on lens assembly 2024-09-12 23:10:34 -04:00
Matt McWilliams 73418031ae Save gate work (broken). 2024-09-12 23:10:08 -04:00
Matt McWilliams 95f8674d72 Work on JK lens assembly 2024-08-25 09:29:31 -04:00
Matt McWilliams 689447611a Update the lens assembly debug mode to match current prints. 2024-08-15 10:28:00 -04:00
Matt McWilliams 8de61abd7b Render parts of the lens assembly 2024-08-09 17:14:23 -04:00
Matt McWilliams 0b59f4906f Implement the button and switch logic for physical interfaces to the camera. In the case that the open/close switch is changed, move to that state, otherwise allow for digital control. 2024-08-05 06:47:12 -04:00
Matt McWilliams 7cecef3de5 Add getDirection() to EndstopCameraShield and fix sloppy bugs in code that were not disabling emitters after actions. Could have caused false positives in behavior so check on the machine 2024-08-03 08:46:46 -04:00
Matt McWilliams 35d832f965 Prefill exposureAvg with 250ms because it is closest to an average from tests 2024-07-31 13:40:10 -04:00
Matt McWilliams c3d2943dcc All updates to EndstopCameraShield library for Oxberry and Mitchell cameras (now working and tested). 2024-07-30 20:00:09 -04:00
Matt McWilliams abc72087b2 Update data in all places 2024-07-08 22:59:54 -04:00
Matt McWilliams f594472fd2 Created the basics of the mitchell and oxberry firmwares. Mitchell still needs button logic but oxberry will be controlled entirely digitally. 2024-07-07 22:17:48 -04:00
Matt McWilliams 29cd83eecf There does not need to be separate open_forward/open_backward and closed_forward/closed_backward commands. Direction should be set with separate commands and can be controlled at a higher level. 2024-07-07 21:32:02 -04:00
Matt McWilliams c0e7422920 Work on oxberry camera firmware. Basics are there. Will add button features to mitchell. 2024-07-05 23:56:45 -04:00
Matt McWilliams 84fe1b71be Accidentally modified an autogenerated part of McopySerial. Fixed 2024-06-30 12:10:30 -04:00
Matt McWilliams 966f67882a Fix ino.sh script. Add pin declarations to EndstopCameraShield 2024-06-30 11:50:02 -04:00
Matt McWilliams b858c9fba0 Create placeholder scripts for Mitchell and Oxberry cameras 2024-06-23 21:38:36 -04:00
Matt McWilliams d1028a7e02 Work on endstopcamerashield.h 2024-06-22 22:57:20 -04:00
Matt McWilliams 603d5b0219 Merge branch 'main' of ssh://git.sixteenmillimeter.com/16mm/mcopy 2024-06-22 14:11:34 -04:00
Matt McWilliams df66ff1c7d Hardware updates 2024-06-22 14:11:19 -04:00
Matt McWilliams e6ef1ff395 Actually add new commands to cfg and all libs 2024-06-13 13:42:05 -04:00
Matt McWilliams 8e9a57bcd3 Add new command flags for camera open camera closed. Re-organized and separated identifiers and cmd flags 2024-06-13 13:35:25 -04:00
Matt McWilliams 4dc988c5bb Resolves #83; Adds the -hwaccel auto flag to all ffmpeg output commands. May not be used unless the source video is an accelerated format. 2024-05-24 15:43:52 -04:00
Matt McWilliams bc081cfe63 Correct lib jsdocs in modules. Update tests to catch new error in mscript. 2024-05-24 15:23:58 -04:00
Matt McWilliams 6c8d2d712d Remove callback from mscript (never used) and make all non-public methods private. 2024-05-24 00:26:12 -04:00
Matt McWilliams b4a974a33e Updated tests to add cases catching mscript failing on multi-device scripts 2024-05-24 00:09:28 -04:00
Matt McWilliams b21b899303 Re-enabled tests. Re-enabled docs build (jsdocs are very out of date). Removed several any types and created types for Config 2024-05-23 23:36:51 -04:00
Matt McWilliams 5597aea828 Do not display broken layout before devices are ready 2024-05-23 20:56:32 -04:00
Matt McWilliams 5d31bf0020 Ported main.js to TypeScript. Rewrote all imports and replaced with class constructors, not require()(). 2024-05-23 20:51:35 -04:00
Matt McWilliams 91ad944c46 Removed several uses of any and added types to System module. 2024-05-23 19:54:42 -04:00
Matt McWilliams cb63194fc6 All known classes have types exported and imported into dependent modules. This has already caught a class of bugs. Removing references to any will catch another. 2024-05-23 18:49:18 -04:00
Matt McWilliams 7f8a9d4289 Add Settings and Devices classes TypeScript source. 2024-05-22 23:37:21 -04:00
Matt McWilliams 8e8fac92d1 Update Settings class to export properly. Replace use of any in Device. 2024-05-22 23:36:40 -04:00
Matt McWilliams 7e24c70454 Re-write of log module to use export properly (in Typescript) and include the winston types for Logger. Will repeat this step with all of the remaining modules that are declared 'any' type and miss out on the benefits of using Typescript in the first place. 2024-05-19 18:14:33 -04:00
Matt McWilliams a9f20ebf36 Remove extraneous log lines from arduino. Device is printed by send() and also sendAsync is called by send and logs the same information. Removed. 2024-05-19 17:11:31 -04:00
Matt McWilliams 4b8c8ee842 Improve logging in JKMM100 sketches. 2024-05-19 17:10:50 -04:00
Matt McWilliams 5bad15a79a In a two device simultaneous action, the cmd module was attemptint to await both actions in an array. This was not working and caused await to not occur. Instead, all actions have been replaced by a Promise.all, which awaits both actions simultaneously until both are complete. After that, function is correct. 2024-05-19 11:05:16 -04:00
Matt McWilliams 9b7d1a3e5c Add a second projector version of the JKM100 script. In the script, move the 16ms delay to BEFORE the confirmation character and increase it to 100ms to make sure all shake is out of the system before shooting a frame. 2024-05-19 09:38:48 -04:00
Matt McWilliams 5f7fa6287f Add changes from diverged repo 2024-05-15 21:49:45 -04:00
Matt McWilliams 2af8b4b209 Merge remote-tracking branch 'origin/main' 2024-04-28 21:38:32 -04:00
Matt McWilliams 66096fa2ea Add the designs and sketches for the ACME Trebes. 2024-04-19 18:09:44 -06:00
Matt McWilliams 18875a01c6 Correctly reference common.scad and add file for camera mount. 2024-04-15 14:05:38 -06:00
Matt McWilliams 7d2c2b9d09 Use common.scad, change all cylinder entries 2024-04-15 09:42:25 -06:00
Matt McWilliams 67a290a02a Add a bellows adapter for Canon RF cameras and an ACME bellows 2024-04-14 13:34:41 -06:00
Matt McWilliams 63f4278b2b Resolve startup order issues and explanation for all the delays that were meager attempts to solve a race condition. By moving more IPC connectionts to handles, which can be awaited, there are no more attempts to send message to light object that fails because it has not yet been instantiated. 2024-04-06 23:37:30 -04:00
Matt McWilliams 6778f871db Devices, serial and type terms were updated everywhere in code except in the settings object. 2024-04-06 20:29:56 -04:00
Matt McWilliams edc72a5486 Do not overwrite data with an empty object. Overwrite values if there are keys in the object. 2024-04-06 20:15:19 -04:00
Matt McWilliams 2779258111 List of devices looks strange on laptop. Attempt at fix here 2024-04-06 20:10:14 -04:00
Matt McWilliams da735779b4 Add more trycatches add more logs. Not sure where failure is. 2024-04-06 20:00:54 -04:00
Matt McWilliams b7e2e912f4 Figure out why devices.ready() is not reaching end of method on Mono laptop 2024-04-06 19:53:04 -04:00
Matt McWilliams d34172d8e9 Use device.profile() method, seemingly not implemented properly 2024-04-06 19:37:29 -04:00
Matt McWilliams f30ce78f9d Suppress warnings from Intval and execRaw during compilation. Add logging to ready to test on Mono laptop 2024-04-06 19:18:15 -04:00
Matt McWilliams ed767aedb5 Recompile with newer modules. 2024-04-06 19:09:50 -04:00
Matt McWilliams ab35895cb3 update rails 2024-04-06 19:02:39 -04:00
Matt McWilliams 1e2b65644d Update package lock files to work with node16 and electron19 2024-04-06 18:55:46 -04:00
Matt McWilliams 3f58bbc617 Merged changes from work script into JKMM100, works on device in both work script and deployment one 2024-04-06 15:48:02 -04:00
Matt McWilliams c1da7b53a2 Fix for the canonical URL caught by Tom Murphy
Thanks Tom!
2024-01-24 05:19:07 +00:00
Matt McWilliams 4181c22995 Cleanup whitespace/semicolons and add concept for passing an exposure length to the image in millis. 2024-01-19 06:49:03 -05:00
Matt McWilliams d31ac53bd1 Back is ready to print 2024-01-09 13:54:01 -05:00
Matt McWilliams 9b954852aa Add the first draft for the CPC plug back 2024-01-08 15:49:08 -05:00
Matt McWilliams 3758916fb5 Adjust plug insert 2024-01-06 17:56:55 -05:00
Matt McWilliams 25c1395655 make insert thicker for betther overall strength of the plug 2024-01-06 14:30:00 -05:00
Matt McWilliams 440edd7b18 Add 5mm marks to bolex plate 2023-12-27 23:56:10 -05:00
Matt McWilliams a2f045841f Fix bolt countersink in bolex mounting block. Add center line to top 2023-12-27 20:04:43 -05:00
Matt McWilliams c890107e1e Experimental refactor, move commonly-used pattern of cylinder() module with 4 names arguments to cy() with 3 positional arguments, D = diameter, H = height, and FN = $fn. Might improve readability and reduce repetative use of center = true. 2023-12-26 17:37:39 -05:00
Matt McWilliams a5df1650b9 Move nuts to bottom of camera sled and bolts can drop in from the top (easier assembly, bolts can be glued in place or held in more easily). Create camera sled bolex plate and modify the bolex standoff to accomodate it. WIP. 2023-12-23 23:08:59 -05:00
Matt McWilliams 173ce499bc CPC connector work 2023-12-15 19:40:18 -05:00
Matt McWilliams 33412b0588 Merge branch 'main' of ssh://git.sixteenmillimeter.com/16mm/mcopy 2023-12-10 22:51:38 -05:00
Matt McWilliams 3c5e31a961 Work on CPC Connector plug 2023-12-10 22:48:12 -05:00
Matt McWilliams 39676f9a06 fastcsg is non-deterministic 2023-12-02 09:40:54 -05:00
Matt McWilliams 0f893d94c4 Fix the dual projector script and add notes 2023-11-30 22:32:48 -05:00
Matt McWilliams b08f5094d5 Make a solid bearing roller 2023-11-30 22:32:33 -05:00
Matt McWilliams 70e046eeb7 Fix plug diameter 2023-11-30 22:32:18 -05:00
Matt McWilliams 58d0742187 Add takeup signal terminals to the mcopy projector board. 2023-11-28 23:09:09 -05:00
Matt McWilliams f84e8b741a Developed a seemingly working fix with the "correction loop" strategy. Might be putting the motor through hell but it is consistent. 2023-11-25 20:22:44 -05:00
Matt McWilliams fcf24b5539 Add the OFFSET command to the McopySerial library 2023-11-25 20:06:16 -05:00
Matt McWilliams 128a4d2ded Update mcopy_JKMM100_work to have McopySerial library 2023-11-25 20:05:52 -05:00
Matt McWilliams b14d24e650 Prototype for Arduino Mega shield for projector. 2023-11-25 18:08:10 -05:00
Matt McWilliams 7995665c6b Add camera sled 2023-11-24 10:58:20 -05:00
Matt McWilliams a22906d3c2 Add mcopy projector board. 2023-11-22 17:33:23 -05:00
Matt McWilliams 042533dc85 Add plugs for linear bearings in rail ends. 2023-11-19 16:08:37 -05:00
Matt McWilliams 5fbefeecbf Update to the orbital brace 2023-11-13 20:43:13 -05:00
Matt McWilliams a9772ff081 Changes to the brace to allow the projector to fit. Made Y of panel larger. 2023-11-13 20:41:26 -05:00
Matt McWilliams cdf983c7c6 Render STLs for mcopy_projector and mcopy_rails. Make tweaks to orbital mount to fit bolts. 2023-11-12 15:22:23 -05:00
Matt McWilliams 03f886580f Created orbital brace corner and rendered additional stls 2023-11-09 15:54:56 -05:00
Matt McWilliams a06e2869b9 Adjust bolt voids on corner_bracket 2023-11-08 18:15:31 -05:00
Matt McWilliams 6bafb263de Projector rails added and printed 2023-11-04 09:38:20 -04:00
Matt McWilliams 493ff5fbf6 Update raisl and render all files 2023-11-01 00:27:46 -04:00
Matt McWilliams c29e0880ac Work on rails and lens gantry. First prototype is made. Rendering all. 2023-10-30 22:02:30 -04:00
Matt McWilliams 986c7a915b Tweaks to lens sled gantry 2023-10-26 18:11:35 -04:00
Matt McWilliams 68b1b8b819 Double bearings in lens sled 2023-10-24 22:20:47 -04:00
Matt McWilliams 382ba56fa7 Create a prospective "inaccurate" analogReadAverage method. 2023-10-10 22:29:02 -04:00
Matt McWilliams 24d6685047 Use I to trigger projector.home() 2023-10-10 22:12:31 -04:00
Matt McWilliams 565d2ecceb Add second dataset for testing findPeak method 2023-10-10 21:20:51 -04:00
Matt McWilliams c4456e458f Add "home" as command character "I". 2023-10-10 21:16:49 -04:00
Matt McWilliams f707dedc91 New homing behavior. Ready to port back to original. 2023-10-09 22:59:05 -04:00
Matt McWilliams 702fc4680d Had accidentally switched motors, explaining odd homing behavior. New homing behavior whips ass. 2023-10-09 22:58:48 -04:00
Matt McWilliams 99b63150ac Add more smoothing during homing step. Is running consistently but is ending with motor in wrong position each time. Very strange. 2023-10-09 20:52:58 -04:00
Matt McWilliams 6e7c226c57 Make a sample script for analyzing the array during homing step. 2023-10-09 20:52:18 -04:00
Matt McWilliams c8e5f7b742 Caught one bug after separating out code 2023-10-09 19:15:30 -04:00
Matt McWilliams 0cf147d185 Piece off homing code into its own script. 2023-10-09 19:09:50 -04:00
Matt McWilliams cf1514f53e Print lens slded at full width (140mm for now) 2023-10-09 19:07:16 -04:00
Matt McWilliams af3843a8ef Add servo functionality for rack and pinion motion. Need to fix home feature. 2023-10-09 09:59:19 -04:00
Matt McWilliams 91ce2dd450 Add BOM log lines and move rail ends into its own module 2023-10-09 09:58:55 -04:00
Matt McWilliams 71c9efae42 Tweak to the rack and pinion mechanism to allow it to fit. 2023-10-09 09:58:35 -04:00
Matt McWilliams 08ce0d792b Fix for case where this.confirmExec is not a function 2023-10-08 18:15:31 -04:00
Matt McWilliams 754ef17b74 Update servo gear to fit reinforced servo connectors. 2023-10-08 11:41:35 -04:00
Matt McWilliams 5d4fec8c81 Start adding BOM log lines to build. 2023-10-07 15:26:10 -04:00
Matt McWilliams 1e0338a77f Update rack and pinion library to one that produces valid geometry. Make first pass at rack and pinion gear 2023-10-06 13:47:15 -04:00
Matt McWilliams e6b9628746 All projector work from today 2023-10-05 17:28:01 -04:00
Matt McWilliams 6f68081dc5 Restore the home method. Now it compiles. 2023-10-03 13:44:04 -04:00
Matt McWilliams 66b18dd351 Work on LED enclosure 2023-10-03 09:16:34 -04:00
Matt McWilliams b5f5b6461a Work on LED housings 2023-09-28 22:51:55 -04:00
Matt McWilliams 6dd29d9596 Disable home feature for now. Fixed impossibly stupid bug with reverse mode. Used uint16_t rather than int16_t causing an overflow. 2023-09-28 20:46:45 -04:00
Matt McWilliams 29ba125534 Work on LED housing. 2023-09-27 21:31:35 -04:00
Matt McWilliams 144af1414c Merge remote-tracking branch 'origin/main' 2023-09-27 19:10:24 -04:00
Matt McWilliams 06906eca42 Start progress on rack and pinion nub mover 2023-09-27 19:10:13 -04:00
Matt McWilliams 0d47748d6a Saved work in progress 2023-09-27 10:07:50 -04:00
Matt McWilliams b1c8192625 Projector firmware progress: currently the homing function will not compile due to errors with reference and so the sketch method needs to be broken into workable smaller methods 2023-09-25 21:54:31 -04:00
Matt McWilliams d2c7781d79 Servo notch puller progress 2023-09-25 21:53:10 -04:00
Matt McWilliams 37d4f50ef4 Add OpenSCAD/MCAD to the project to prevent double work. Including as a submodule appears to satisfy the requirement of the LGPL and allows mcopy to remain MIT licensed. 2023-09-25 12:25:56 -04:00
Matt McWilliams 082ac85c5c Add deeper notches for 90 degree points 2023-09-25 12:14:59 -04:00
Matt McWilliams cfca56ba48 Migrate stepper block into its own module 2023-09-24 22:58:14 -04:00
Matt McWilliams c7cb4ddbc5 Create the first design of the orbital mount and make slight adjustment to panel (screws were not attaching fully). 2023-09-24 22:46:38 -04:00
Matt McWilliams 7f98d6028b Commit all work in progress 2023-09-21 21:06:31 -04:00
Matt McWilliams 401822a7bb Merge branch 'main' of ssh://git.sixteenmillimeter.com/16mm/mcopy 2023-09-15 19:18:09 -04:00
Matt McWilliams 173ba06590 Work on projector (wrong) 2023-09-14 23:30:29 -04:00
Matt McWilliams 2677118bad fix 2023-09-12 22:36:18 -04:00
Matt McWilliams 8e90456d87 LED gate should be larger 2023-09-12 21:53:38 -04:00
Matt McWilliams 0b880a5e79 Add accurateRead functions and Readme 2023-09-06 15:41:36 -04:00
Matt McWilliams 082dbc0826 Add void for motor, threaded rod (optional) and linear rod. 2023-09-06 00:01:00 -04:00
Matt McWilliams 5eccbbf6df Remove part of the 2020 ends so that it can print without supports 2023-09-05 23:29:48 -04:00
Matt McWilliams 513deb7a0a Render part of the projector. 2023-09-05 23:15:53 -04:00
Matt McWilliams 2b24dc647c Update lens assembly to start using a 2020 frame 2023-09-05 23:15:32 -04:00
Matt McWilliams f8e5968f30 Rename JK lens assembly to reflect it is a new design 2023-09-05 21:31:31 -04:00
Matt McWilliams 18b8c84fff Add additional bearings to lens sled and voids for m5 bolts to hold in side bearings. 2023-09-04 13:10:23 -04:00
Matt McWilliams 1d6ccb7838 Enlarge void for m5 bolt. Add void for m5 nut. 2023-09-04 11:43:01 -04:00
Matt McWilliams a7a63a3be7 Render all projector and rails in current state 2023-09-04 10:49:20 -04:00
Matt McWilliams 153ef9eceb Use fast-csg and parallel with 8 jobs hardcoded 2023-09-04 10:48:54 -04:00
Matt McWilliams eec7765e73 Restore settings logic 2023-08-30 01:18:10 -04:00
Matt McWilliams 03f2b55762 Fucked up the merge 2023-08-29 23:33:42 -04:00
Matt McWilliams 6714374639 restore work from tonight 2023-08-29 23:11:24 -04:00
Matt McWilliams b6b1f5d5ba Parts work 2023-08-29 22:34:55 -04:00
Matt McWilliams d7a10f9737 Enable different modes of stepping by using the settings pins. Previously was causing odd behavior because they were being used for LEDs. 2023-08-29 19:48:49 -04:00
Matt McWilliams d778adc7d0 Add LED holder concept to projector panel design 2023-08-29 17:05:53 -04:00
Matt McWilliams dcbb57f732 Rewrite mcopy_projector_firmware with AccelStepper, replacing the custom Itead firmware (not working) 2023-08-29 15:33:51 -04:00
Matt McWilliams 24452794a9 Merge remote-tracking branch 'origin/main' 2023-08-25 16:44:35 -04:00
Matt McWilliams 24fe1e8773 Work on projector: Still having issues with IteadDualStepperShield (addresses wrong motor, wrong number of steps). 2023-08-25 16:44:28 -04:00
Matt McWilliams b30c637c10 Add structures to insert 2020 Tslot into to make rails fit more snug 2023-08-23 23:35:00 -04:00
Matt McWilliams f16795b11c Render the mcopy rails parts in current form 2023-08-23 22:27:06 -04:00
Matt McWilliams 141d27599f McopyProjector lib for mcopy_projector_firmware rewrite in progress. 2023-08-23 15:21:50 -04:00
Matt McWilliams 86c88c4ac2 Printing a prototype for the lens sled 2023-08-23 00:14:47 -04:00
Matt McWilliams fbab0c043a Give up on SCAD makefile 2023-08-21 22:47:29 -04:00
Matt McWilliams 1a01a4f05e Update sprocketed_roller 2023-08-21 22:47:05 -04:00
Matt McWilliams b0305ae6da Run on all but 1 core. Update JK rails to use actual measurement 2023-08-21 22:46:42 -04:00
Matt McWilliams dd4834de04 Render rails parts (still WIP) 2023-08-21 19:39:08 -04:00
Matt McWilliams 2d90c127a3 Render existing projector panel parts 2023-08-21 19:38:55 -04:00
Matt McWilliams 51d440fccc Render all working CPC connector parts 2023-08-21 19:38:16 -04:00
Matt McWilliams 2e3ed56bb3 Update part names of bellows.scad. Render missing magnetic board. 2023-08-21 19:34:21 -04:00
Matt McWilliams 4be57f3128 Update part names for CPC connectors 2023-08-21 19:31:20 -04:00
Matt McWilliams de6f0d0495 Compile all parts in project, optionally using GNU parallel if available. 2023-08-21 19:04:39 -04:00
Matt McWilliams 98e1e73163 Update to a dynamic bash file that can render all parts in a .scad file 2023-08-21 18:23:41 -04:00
Matt McWilliams 1ae524ff31 Start making a parts list in rails end file 2023-08-21 18:23:16 -04:00
Matt McWilliams 010927c5ca Rename rails_2020 to mcopy_rails 2023-08-20 23:55:27 -04:00
Matt McWilliams 3346bf01af Work on rails having a bearing 2023-08-20 23:54:21 -04:00
Matt McWilliams 788cac7d50 All work towards creating a sled rail for the lens carriage assembly 2023-08-20 18:35:48 -04:00
Matt McWilliams 4c0fa2ba41 rails end prototype 2023-08-20 13:57:00 -04:00
Matt McWilliams 83209f466f Update all submodules 2023-08-20 12:46:36 -04:00
Matt McWilliams 10c452c1b3 Work on rails 2023-08-20 12:37:50 -04:00
Matt McWilliams a8a33a823a Update to 1.8.0 to reflect new breaking changes in app 2023-08-06 15:22:38 -04:00
Matt McWilliams e7e7f86ab3 Manual merge from capper branch: all changes to devices library. 2023-08-06 15:04:33 -04:00
Matt McWilliams 386285d48c Definition file that prevents compiler warnings on some platforms. Still unexplained because tsc is installed local to the project. 2023-08-06 14:58:26 -04:00
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 8a170f65ca Merge pull request 'canon_ble' (#82) from canon_ble into main
Reviewed-on: #82
2023-08-01 03:38:51 +00: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 3b03eb70fb Add placeholder for original stepper motor 2023-07-24 21:20:06 -04:00
Matt McWilliams a173cf0d7c WIP 2023-07-23 20:00:42 -04:00
Matt McWilliams 55b39e7db3 Tweak to USB protector 2023-07-18 23:13:20 -04:00
Matt McWilliams 505a2a71e7 Add magnetic bellows models 2023-07-14 21:40:03 -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 c9f35ffe90 Merge branch 'canon_ble' of ssh://git.sixteenmillimeter.com/16mm/mcopy into canon_ble 2023-07-12 22:25:17 -04:00
Matt McWilliams 18d6e2c7cd WIP on state problem 2023-07-12 22:22:46 -04:00
Matt McWilliams f47ea2d382 Work on rails ends 2023-07-10 23:07:32 -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
Matthew McWilliams 5133295f38 Save JKMM100 work 2023-07-08 19:44:57 -04:00
Matt McWilliams 621948fbac Work on mcopy_rails concepts 2023-07-05 15:17:56 -04:00
Matt McWilliams 4539c6d897 Methods in place for setting exposure 2023-07-05 15:17:45 -04:00
Matt McWilliams a7db072dc6 Accept exposure targets as string arguments to be parsed 2023-07-05 14:46:43 -04:00
Matt McWilliams 58ce079330 Both components are working properly. 2023-07-04 22:46:37 -04:00
Matt McWilliams dd03583a27 Proof of concept works. Nano can proxy requests to ESP32 via soft serial and then receives confirmation after event. Nano has a cleaner serial interface and will not throw junk into mcopy app serial listener. 2023-07-04 18:45:51 -04:00
Matt McWilliams 3feaea74bf Do not need to declare Serial2. 2023-07-04 18:18:51 -04:00
Matt McWilliams 1d6cbe5c53 Update the serial tests 2023-07-04 17:15:26 -04:00
Matt McWilliams 318f931dbf ESP32 HardSerial note 2023-07-03 22:44:43 -04:00
Matt McWilliams 5400518ea6 Merge remote-tracking branch 'origin/canon_ble' into canon_ble 2023-07-03 22:35:37 -04:00
Matt McWilliams f73a1e3931 nano softserial note 2023-07-03 22:35:29 -04:00
Matthew McWilliams 60d7ab4b5e Add missing lines to debug sketch 2023-07-03 20:34:47 -04:00
Matthew McWilliams 95cde2907a Run the debug script 2023-07-03 20:33:32 -04:00
Matthew McWilliams 35b67f1815 Use the correct identifier on projectors 2023-07-03 20:33:18 -04:00
Matt McWilliams f958789b20 Merge remote-tracking branch 'origin/canon_ble' into canon_ble 2023-07-02 13:56:11 -04:00
Matt McWilliams 4beef04a3f Projector debug idea. 2023-07-02 13:56:03 -04:00
Matthew McWilliams 6d379d284b on site work at MONO 2023-07-01 16:34:07 -04:00
Matt McWilliams 2c21110b97 fix reference to cmdChar 2023-06-28 20:01:53 -04:00
Matt McWilliams 777db577d7 Structure of both sketches is complete, need to test on hardware 2023-06-28 15:06:11 -04:00
Matt McWilliams bf320216cf REmove remaining components from ble 2023-06-28 12:43:24 -04:00
Matt McWilliams b48c498574 Remove unneeded components from both ble sketches 2023-06-28 12:41:54 -04:00
Matt McWilliams 0b71da8e7b Canon BLE two-Arduino rewrite WIP 2023-06-27 23:16:16 -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 95ede98623 State string should start and end with the character 2023-06-17 13:08:00 -04:00
Matt McWilliams 3881dd4891 Update McopySerial to have a sendStr method, which is distinct from print, which should be used for debug logging. 2023-06-17 11:40:56 -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 80a9c23f4d Speed down the motors 2023-05-26 07:09:00 -04:00
Matt McWilliams 49ad3c28a8 Only print projector time to state 2023-05-25 10:45:44 -04:00
Matt McWilliams a29c85628c Add bones of the dual stepper motor, JK compatible projector firmware. 2023-05-25 10:43:45 -04:00
Matt McWilliams 3ec93ab3b1 work 2023-05-16 23:05:13 -04:00
Matt McWilliams 10c29d3af1 Add a set screw to the gate_key 2023-05-15 21:48:09 -04:00
Matt McWilliams 41840b90c8 Update gitsub 2023-05-15 12:36:03 -04:00
Matt McWilliams c89e865d3d Bearing needs slight gap to allow the inner bearing wheel to rotate freely 2023-05-14 21:17:20 -04:00
Matt McWilliams c6ec54bd06 Flip projector panel to print 2023-05-14 21:01:46 -04:00
Matt McWilliams af3b1b8cbb Create first draft of projector panel redesign 2023-05-14 21:00:52 -04:00
Matt McWilliams 86273a9f09 Merge remote-tracking branch 'origin/canon_ble' into canon_ble 2023-05-02 23:58:39 -04:00
Matt McWilliams ba0241a811 Update ESP32 case 2023-05-02 23:58:31 -04:00
Matt McWilliams 1bd73876b4 Add sprocketed roller module 2023-04-28 15:35:54 -04:00
Matt McWilliams cc806cbe52 Initialize and connect only after mcopyserial connects. 2023-04-20 22:50:48 -04:00
Matt McWilliams 8f7a40075a Add connected and identified member booleans to determine when fully connected to mcopy. 2023-04-20 22:37:37 -04:00
Matt McWilliams 64faaa9427 Slight change to outer diameter. 2023-04-19 13:32:06 -04:00
Matt McWilliams d44c67ce80 Update the lens board design 2023-04-19 13:31:47 -04:00
Matt McWilliams 144b408092 Print state in the arri-s firmware 2023-04-17 16:44:04 -04:00
Matt McWilliams d2390dca30 Add a bellows board -- to be attached to bellows and then to boards with magnets. Render all STLs 2023-04-16 23:33:11 -04:00
Matt McWilliams 503a8ec92f Add magnets to bellows board design 2023-04-16 22:53:16 -04:00
Matt McWilliams ca22a3ba4b Rewrite arri_s_firmware to use McopySerial 2023-04-16 16:42:00 -04:00
Matt McWilliams ef54e61494 Use McopySerial in mcopy_arri_s_firmware 2023-04-15 22:44:33 -04:00
Matt McWilliams b1745c786b Invert logic for use with solid state relays rather than standard 2023-04-14 19:48:20 -04:00
Matt McWilliams 83efbc18c7 Fix mcopy_cam_canon_ble 2023-04-13 20:39:24 -04:00
Matthew McWilliams f47396e48c Need confirmation after mcopy_cam_relay 2023-04-12 15:25:41 -04:00
Matt McWilliams 03c27a9226 Relay logic was reversed 2023-04-12 15:15:41 -04:00
Matt McWilliams 08655898d4 Merge remote-tracking branch 'origin/canon_ble' into canon_ble 2023-04-12 14:52:40 -04:00
Matt McWilliams 5d347d23e4 Correctly reference backward LED 2023-04-12 14:52:35 -04:00
Matthew McWilliams a25d93ec55 Correctly delay between frames. 2023-04-12 14:52:05 -04:00
Matthew McWilliams bbf0cbd1c6 Add the button to the relay sketch 2023-04-11 23:43:35 -04:00
Matthew McWilliams 4aceeac1c2 Remove libraries required by TickTwo. This sketch will not use blink in this fashion ATM. 2023-04-11 23:26:12 -04:00
Matt McWilliams 1f5bb85304 Correctly reference LEDs 2023-04-11 22:39:44 -04:00
Matthew McWilliams 087fd3f763 Complete the mcopy relay sketch without variable exposure. 2023-04-11 01:13:44 -04:00
Matthew McWilliams daece3b45a Add the new mcopy_cam_relay script. 2023-04-11 00:38:06 -04:00
Matthew McWilliams 9705505285 Refactor ino.sh to loop through array of scripts to copy McopySerial library to. 2023-04-11 00:37:14 -04:00
Matthew McWilliams 9016062f70 Rename mcopy_cam_canon to mcopy_cam_canon_ble to differentiate 2023-04-11 00:28:27 -04:00
Matthew McWilliams a6de66eb66 Blink LED on startup 2023-04-11 00:24:39 -04:00
Matt McWilliams 6ada6b08ed Add LED features to projector firmware. 2023-04-10 23:28:02 -04:00
Matt McWilliams 710e178ba2 Merge branch 'canon_ble' of ssh://git.sixteenmillimeter.com/16mm/mcopy into canon_ble 2023-04-10 21:12:08 -04:00
Matt McWilliams 9e7990851e Case design work 2023-04-10 21:04:01 -04:00
Matt McWilliams ae34558f18 Add project home and mirrors to Readme 2023-04-07 09:44:51 -04:00
Matt McWilliams c1a51f1ce8 Canon EF bellows adapter 2023-04-01 19:24:29 -04:00
Matt McWilliams 13702a3d5b Add a canon_EF_body_cap script 2023-03-30 20:15:43 -04:00
Matt McWilliams 6b66cfe03f Add bolt voids to canon mount 2023-03-29 22:47:49 -04:00
Matt McWilliams cbc876c57c Case ready for production 2023-03-29 21:58:03 -04:00
Matt McWilliams 7813a8c904 First draft of Rebel case 2023-03-28 19:41:35 -04:00
Matt McWilliams 5f941e91b5 Add conecpt for arduino nano case 2023-03-26 20:19:15 -04:00
Matt McWilliams d262ed418d Add base to socket connector. 2023-03-26 20:19:00 -04:00
Matt McWilliams 2e9db4d667 Connector size is working 2023-03-26 18:53:01 -04:00
Matt McWilliams bd9317dd8f Adjust angles. Make $fn configurable (crashing the GUI on my desktop). 2023-03-26 17:53:26 -04:00
Matt McWilliams 461add1cda Start adding LEDs 2023-03-26 16:06:08 -04:00
Matt McWilliams 1528dec668 Rename bellows adapter 2023-03-24 13:51:29 -04:00
Matt McWilliams fff9d5d410 Export mcopy serial to it's own repo 2023-03-24 13:50:38 -04:00
Matt McWilliams 231c354cb1 Update McopySerial usage in both scripts that use it. 2023-03-21 20:38:45 -04:00
Matt McWilliams 4e0149e752 Fixed issue with baud being stored as const overflowed. Silly mistake.
Also storing command chars as public const variables to shorten code and allow for mc.COMMAND rather than McopySerial::COMMAND. Cleans up example code a lot.
2023-03-21 20:35:00 -04:00
Matt McWilliams 5c6b9191e5 Work in progress: Serial does not work from external library 2023-03-20 19:45:32 -04:00
Matt McWilliams 77a0f7d8a0 Use the correct pins for the projector 2023-03-18 17:36:24 -04:00
Matt McWilliams 9faae6fc36 Create the first state sender. 2023-03-18 17:25:58 -04:00
Matt McWilliams 3689eb7528 Rewrite mcopy_light to use McopySerial 2023-03-18 17:13:41 -04:00
Matt McWilliams 210dc85558 Add getString and print methods 2023-03-18 17:04:06 -04:00
Matt McWilliams 174b900cd8 Update commands 2023-03-18 17:00:13 -04:00
Matt McWilliams fbe954280f Socket connector work 2023-03-18 17:00:02 -04:00
Matt McWilliams 142c990a0e Refactored GUI into TypeScript and class-based format 2023-03-18 16:59:26 -04:00
Matt McWilliams 790ea3d551 Add guides for collar flanges 2023-03-15 22:11:48 -04:00
Matt McWilliams c6b8592490 Enlarge case and add bolt 2023-03-15 21:35:35 -04:00
Matt McWilliams f67e011d5e Canon EOS M50 mount design 2023-03-15 21:35:23 -04:00
Matt McWilliams a4bc54482d Work on canon mount 2023-03-15 19:22:18 -04:00
Matt McWilliams be50eb6fcf Work on ESP32 case and CPC socket 2023-03-14 21:45:18 -04:00
Matt McWilliams a7d784583a Case for an ESP32 dev board (Inland, Microcenter) 2023-03-13 17:46:38 -04:00
Matt McWilliams 7af1f739e4 Canon EF M bellows mount 2023-03-13 17:46:21 -04:00
Matt McWilliams 3e247703a8 More CPC connector work 2023-03-13 17:45:50 -04:00
Matt McWilliams c7e338ebff projector electronics improvements, move arduino mount, increase size, adjust resistor mount 2023-03-12 21:28:29 -04:00
Matt McWilliams cc2af435d5 First pass at esp32 case 2023-03-12 17:55:09 -04:00
Matt McWilliams 87695b173d First pass at projector controller design and refactor of sequencer case. 2023-03-12 16:36:16 -04:00
Matt McWilliams 722ff9c05e Remove unneeded comments 2023-03-10 21:19:30 -05:00
Matt McWilliams 51114df576 First draft of the JKMM100 firmware using McopySerial. Boy does this make my life easier.
Need to find a better way than copying it into all of these different projects.
Oh well.
2023-03-09 21:54:54 -05:00
Matt McWilliams 9126bc82c0 Confirm the camera command (this should happen after it expects frame is taken). 2023-03-09 21:51:49 -05:00
Matt McWilliams e09fe7d42f McopySerial now has a confirm() method which marks the end of a command. This is a wrapper around Serial.println() 2023-03-09 21:51:29 -05:00
Matt McWilliams 234e69c7a2 Canon BLE firmware now uses the McopySerial script for it's USB communication. 2023-03-09 21:30:59 -05:00
Matt McWilliams d7017af245 Move connect and identify methods to internal ones. 2023-03-09 21:26:31 -05:00
Matt McWilliams f49c70ead6 Define all command chars as static constants. Provide an identity when initializing and allow for setting with another method. 2023-03-09 21:18:10 -05:00
Matt McWilliams 9a89dbe6a5 Automatically toggle debug state internally 2023-03-09 21:08:36 -05:00
Matt McWilliams 844bb286a5 Build the skeleton of McopySerial. Contains all command chars as flags. Is now re-built with latest command flags automatically when syncing to all projects. Compiles. Will implement more in canon firmware. 2023-03-09 21:01:20 -05:00
Matt McWilliams 4eceecf139 Add ino script 2023-03-08 22:37:40 -05:00
Matt McWilliams 95e2e997e5 Move mcopy serial script. Add work (isn't working). 2023-03-08 21:28:09 -05:00
Matt McWilliams 346c303edb First pass at connector plug 2023-03-08 16:01:02 -05:00
Matt McWilliams 908fe52ad8 Simplify projector_controller.scad 2023-03-05 17:14:01 -05:00
Matt McWilliams 3fd1e47b7b Rename sleeve to collar 2023-03-05 17:13:42 -05:00
Matt McWilliams d41f082839 Update light sketch, add Pixie lib 2023-03-05 17:13:29 -05:00
Matt McWilliams 2047ce4f76 cpc connector work 2023-03-05 00:28:39 -05:00
Matt McWilliams 3ef56cab21 Compile all Arri-S parts 2023-03-04 20:20:16 -05:00
Matt McWilliams 6b77b98aad Add more files to scad.sh 2023-03-04 20:00:01 -05:00
Matt McWilliams 211101cd6b Add common SCAD lib. Add a script that compiles all scad files to stl (make is getting excessive). Canonicalize STL files after they're compiled. 2023-03-04 19:44:20 -05:00
Matt McWilliams e27cae353f Work on McopySerial library. Still having trouble with compiling. 2023-03-04 19:25:50 -05:00
Matt McWilliams b12a08e47a Rename lib to match style of others 2023-03-04 19:04:55 -05:00
Matt McWilliams 9b298ac676 Sync actual files 2023-03-04 19:01:35 -05:00
Matt McWilliams 52acb97e08 Try without symlinks 2023-03-04 18:59:47 -05:00
Matt McWilliams 78450e9e6a Add mcopy_serial library 2023-03-04 18:52:51 -05:00
Matt McWilliams dc746fe6f4 canon work 2023-03-03 10:13:40 -05:00
Matt McWilliams 0e3bc563a7 Update blink functionality. Probably will not work during start? 2023-03-01 13:51:54 -05:00
Matt McWilliams d0ef5d410d Ignore all .svd files 2023-03-01 13:38:48 -05:00
Matt McWilliams d9aa7dc698 Ignore build artifacts 2023-03-01 13:38:27 -05: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 d23eb290d9 Merge branch 'main' into canon_ble 2023-02-28 15:59:11 -05:00
Matt McWilliams 648bca5b2e Merge pull request 'Merge the estimates branch' (#79) from estimates into main
Reviewed-on: #79
2023-02-28 15:58:26 -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 85832d18f6 Placeholder for notes 2023-02-27 23:16:44 -05:00
Matt McWilliams 5f0da91659 Canon BLE work 2023-02-26 22:19:07 -05:00
Matt McWilliams e1bf69e622 Add work on mcopy_cam_canon. This includes teh CanonBLERemote library, ArduinoNvs (dependency of CanonBLERemote) and TickTwo, potentially to manage a blinking UI component. Not working. Finish the firmware feature in this branch. 2023-02-25 22:24:29 -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 a57519adce Merge pull request 'Merge all work on server with filmout features' (#77) from server into main
Reviewed-on: #77
2023-02-25 21:16:28 -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 b672921c84 Increment patch number on commit 2023-02-19 01:18:03 -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 d7baa4d17b Merge branch 'capper'
:w
ls
2023-02-19 00:29:40 -05:00
Matt McWilliams ebc5504998 Add commands for takeup 2023-02-19 00:29:07 -05:00
Matt McWilliams c5e66a6f40 Merge pull request 'Merge in 9 months of work on capper branch' (#71) from capper into main
Reviewed-on: #71
2023-02-19 00:28:45 -05:00
Matt McWilliams cff558ef9a Add 15mm to mount void for camera bolt 2023-02-12 14:14:03 -05:00
Matt McWilliams 325837d93e Adjustment to allow space on the right side 2023-02-12 14:10:44 -05:00
Matt McWilliams 135540b261 Remove some material for the rails 2023-02-03 20:08:18 -05:00
Matt McWilliams 49464cd25a Finished the design of the lens assembly base z attachment 2023-02-02 19:48:30 -05:00
Matt McWilliams d0fe54b429 Add m5 nut to the common lib 2023-02-02 19:48:08 -05:00
Matt McWilliams 2dce6f4b08 Merge branch 'capper' of git.sixteenmillimeter.com:16mm/mcopy into capper 2023-01-31 11:52:13 -05:00
Matt McWilliams 99794d04c2 jk assembly and arri-s wip 2023-01-31 11:52:10 -05:00
Matt McWilliams cc06655cd6 Update debug 2023-01-23 00:28:26 -05:00
Matt McWilliams ab6f517d27 Rails work 2023-01-17 12:04:03 -05:00
Matt McWilliams 682167db48 Add new commands for takeup forward and takeup backward 2023-01-15 10:09:55 -05:00
Matt McWilliams f127dc1128 Merge remote-tracking branch 'origin/capper' into capper 2023-01-14 15:26:07 -05:00
Matt McWilliams 0b816ae8e1 Adjust the position of the Z axis, move the linear bearing up and down to prevent binding on motion 2023-01-14 15:25:53 -05:00
Matt McWilliams c600fea4e1 Start rails concept 2023-01-12 19:26:05 -05:00
Matt McWilliams 92067bdbef Add top part to assembly 2023-01-11 19:17:15 -05:00
Matt McWilliams c181e003a3 First draft of base 2023-01-07 18:43:59 -05:00
Matt McWilliams 597137670d Merge base work with knob changes 2023-01-06 10:31:25 -05:00
Matt McWilliams 3036aebbc4 Knob and collar work 2023-01-06 09:18:03 -05:00
Matt McWilliams cbe6477af2 Improvements to bearing and Tnut size 2023-01-05 17:35:25 -05:00
Matthew McWilliams c2546d2bc5 Add m3 nuts and bolts to threaded z movement 2023-01-05 14:40:25 -05:00
Matt McWilliams 46be1bfd3b Assembly work. Adjusted design to simplify placement of 2 linear bearings 2023-01-04 23:11:48 -05:00
Matt McWilliams 1029885047 Update threaded Z, still needs m3 bolts 2023-01-04 18:26:22 -05:00
Matt McWilliams 164bde8cce All arri s mount and jk lens assembly work. need to do some branch cleanup on this project and tackle capper issues for merge of this branch. 2023-01-03 21:16:19 -05:00
Matt McWilliams 41504caac9 Increase the bolt size on the bellows board 2023-01-02 17:11:44 -05:00
Matt McWilliams 9b34b4e026 Adjust the height of the mount (-14.5mm) and make bolt voids larger 2023-01-02 14:33:16 -05:00
Matt McWilliams 95612c1d18 Add m3 nuts 2023-01-02 14:30:54 -05:00
Matt McWilliams 0829ec9081 Use a variable 2023-01-02 13:53:41 -05:00
Matt McWilliams ef0d246901 Increase the inner diameter of the bellows board to allow the threads to pass through cleanly and be held in place by the screw 2023-01-02 13:53:30 -05:00
Matt McWilliams 622a8a7c42 Add first concept bellows board 2023-01-01 11:43:30 -05:00
Matt McWilliams 925659ba4b Create an Arri S mount for the JK rails 2023-01-01 11:43:21 -05:00
Matt McWilliams 20c9287ac2 Work on concept JK lens assembly 2022-12-24 17:36:25 -05:00
Matt McWilliams 8aaa2b8940 Add a concept JK lens assembly 2022-12-24 01:55:11 -05:00
Matt McWilliams 30bd35e21d Add an M4 nut to the common OpenSCAD lib 2022-12-24 01:54:57 -05:00
Matthew McWilliams 0c2e39f0b2 Arri bellows work 2022-12-23 23:01:37 -05:00
Matt McWilliams cbd7001228 Save work on the JK99 shield. 2022-11-13 17:35:18 -05:00
Matt McWilliams dec96ec9be Use variable in stepper declaration 2022-11-11 15:47:58 -05:00
Matt McWilliams 3942cd05be Declare stepsPerRevolution so change is explicit when that happens 2022-11-11 15:47:43 -05:00
Matt McWilliams ee1e9c9feb Stepper firmware is working. Needed extra tape around coupling connector to add friction to connection and now it keeps. 2022-11-04 19:37:11 -04:00
Matt McWilliams fcb77232ec Create the driveCoupling module for the stepper motor design 2022-10-30 12:14:25 -04:00
Matt McWilliams 1fcbec7466 Work on stepper motor design and software. Motor still moves more slowly than it should but will investigate multiple factors leading to this result 2022-10-28 19:46:02 -04:00
Matt McWilliams 98f2c7a24a Pausing work on arri_s_DC firmware because hardware is less than ideal. Too much play in the motor position to trust right now. Steppers better approach. 2022-10-28 11:28:30 -04:00
Matt McWilliams 787e6ed06e Add a concept arri_s camera controller firmware. Using class-based approach as an experiment in Arduino code structure. 2022-10-28 07:50:30 -04:00
Matt McWilliams bb5b7c7897 Add divot to the drive coupling 2022-10-28 07:44:19 -04:00
Matt McWilliams 42b3aa767d Allow for even more space for microswritch 2022-10-28 01:32:58 -04:00
Matt McWilliams b20a6084e6 Allow for more space for the microswitch 2022-10-27 18:10:13 -04:00
Matthew McWilliams d9a8576701 Adjust size of drive coupling for the DC connector 2022-10-21 16:05:56 -04:00
Matthew McWilliams 69273d2a1c Increase scale of motor shaft void by 5% 2022-10-21 15:26:17 -04:00
Matthew McWilliams 755ea757f7 Add set screw for bearing and counter sink bolt caps for other cap m3s 2022-10-21 15:24:21 -04:00
Matt McWilliams 81fc54af8d DC motor design has all components designed, need to print, test and adjust. 2022-10-19 06:38:56 -04:00
Matt McWilliams 4281ca4390 Work on Arri-S DC motor 2022-10-16 19:03:02 -04:00
Matt McWilliams 3419172535 Arri-S work 2022-10-15 00:13:05 -04:00
Matt McWilliams 206c266b08 Added Arri-S motor and cap measurements as taken 10/8/2022 2022-10-09 11:22:12 -04:00
Matthew McWilliams 5026cf869f Arri-S work 2022-10-07 19:47:56 -04:00
Matthew McWilliams d5ecd9e057 Improve capper documentation 2022-09-16 09:45:19 -04:00
Matthew McWilliams 72b5077356 Restructure includes and type definition files so that mscript runs 2022-08-07 22:18:58 -04:00
Matthew McWilliams 6601c030f7 Refactor mscript GUI code into Typescript 2022-08-07 22:10:53 -04:00
Matthew McWilliams 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 1964d6002d Add mono logo as png, but might use svg instead. Render crashed PC. 2022-07-22 21:56:43 -04:00
Matt McWilliams f55b72044c Mcopy firmware with optional capper feature 2022-07-17 11:05:20 -04:00
Matt McWilliams 3f759f5678 Add the ability to detect a single capper device 2022-07-17 09:57:52 -04:00
Matt McWilliams 6582154ec6 Fix debug script and component 2022-07-17 09:56:03 -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
Matt McWilliams ea055d6e56 Capper case candidate 2022-07-13 23:04:00 -04:00
Matthew McWilliams bc48765b35 Start work on base 2022-07-13 18:16:43 -04:00
Matthew McWilliams 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
Matthew McWilliams 8ec5816364 Adjust settings page to support Processing input 2022-07-13 10:15:47 -04:00
Matthew McWilliams c33c6e24f6 Work on motor rod 2022-07-13 09:01:25 -04:00
Matt McWilliams b0ca15bd8d Merge branch 'capper' of git.sixteenmillimeter.com:16mm/mcopy into capper 2022-07-13 08:28:58 -04:00
Matt McWilliams 76799bd66d Capper work 2022-07-13 08:28:18 -04:00
Matthew McWilliams 18dbb72a54 Minor updates to comments 2022-07-06 14:42:53 -04:00
Matthew McWilliams c0ec81c0f9 Add Servo debug script 2022-07-06 14:42:16 -04:00
Matt McWilliams c3661d6ff1 Remove opto endstop logic, ready for hardware testing. 2022-06-28 08:58:31 -04:00
Matt McWilliams c0f056cd8d Re-render all STLs for capper, removing the opto endstop component (for now) 2022-06-28 08:38:11 -04:00
Matt McWilliams 2924efe39f Reduce the size of the void for the screw in the cap. 2022-06-28 08:34:29 -04:00
Matt McWilliams e275539fb0 Remove endstop completely and start rounding surfaces. 2022-06-22 07:45:01 -04:00
Matt McWilliams 4c13c54815 Updates to endstop mount design. Had incorrectly positioned voids for SMD chips on the endstop 2022-06-20 13:00:40 -04:00
Matt McWilliams 62a66f5f6d More mount work and start of endstop logic. Rebuilding the B&H projector unity. 2022-06-17 23:39:19 -04:00
Matt McWilliams 3a435933e3 Work on the opto endstop mount. This needs to be re-oriented before next print. 2022-06-16 00:29:31 -04:00
Matt McWilliams 78f7ac0e68 Mount work 2022-06-13 22:46:23 -04:00
Matt McWilliams 28dc19fc32 Work on endstop functionality 2022-06-13 22:46:13 -04:00
Matt McWilliams 585c47d6c7 Allow capper identifier in list of acceptable responses. 2022-06-13 08:08:42 -04:00
Matt McWilliams 04a0330327 All work on first draft of capper hardware 2022-06-12 22:26:03 -04:00
Matt McWilliams dae4e65aee Merge branch 'capper' of git.sixteenmillimeter.com:16mm/mcopy into capper 2022-06-12 13:37:52 -04:00
Matt McWilliams 129647b863 App work 2022-06-12 13:37:00 -04:00
Matt McWilliams 2f9201716a All capper work. Debug firmware for testing. STL of cap as printed. 2022-06-12 13:14:43 -04:00
Matt McWilliams f9d716552b Merge branch 'capper' of git.sixteenmillimeter.com:16mm/mcopy into capper 2022-06-11 16:06:25 -04:00
Matt McWilliams 818c8453ee Capper OpenSCAD work 2022-06-11 16:03:08 -04:00
Matthew McWilliams f7a3c52260 Silly typo: did not invoke Servo_init() and so servo was not initalizing 2022-06-10 13:19:38 -04:00
Matt McWilliams 9d3bf24627 Hardware ideas for capper mount and flag. Need to model servo and add places for endstops 2022-06-07 07:55:47 -04:00
Matt McWilliams c77201ef4e Add new commands and identifiers for the capper, start moving into capital characters 2022-06-07 07:55: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 96e0ce6050 Merge branch 'capper' of git.sixteenmillimeter.com:16mm/mcopy into capper 2022-05-31 17:44:56 -04:00
Matt McWilliams 17d4ff459f Notes about 4pin_connectors 2022-05-31 17:43:03 -04:00
Matt McWilliams c15c376a2f Start work on capper branch 2022-05-30 18:50:18 -04:00
Matt McWilliams 22bed4632b Update the notarization process for installing mcopy 2022-04-30 18:51:33 -04:00
Matt McWilliams 8b5faaa1a4 Update global package.lock 2022-04-30 16:03: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 467a5c06d6 Update the projector knob design 2022-04-30 15:52:04 -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 b3bb07454f Add a lamp housing knob 2021-04-05 10:40:50 -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 6fee5a803c connector case box 2021-03-19 21:32:53 -04:00
Matt McWilliams 2861bc52fd intval2 connector firmware 2021-03-19 14:09:46 -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 11267796ba Update links to latest release 2021-03-18 11:35:55 -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 88a6e9f563 Update links to older builds 2021-02-22 13:48:19 -05:00
Matt McWilliams 7dc4d153be Merge remote-tracking branch 'origin/master' 2021-02-22 13:47:05 -05:00
Matt McWilliams dcc91501ee Update readme with links to latest release (1.6.7) 2021-02-22 13:46:58 -05:00
Matt McWilliams 6473f388d8 Update package-lock to latest version 2021-02-22 13:40:44 -05:00
Matt McWilliams a21fff82f1 Update license as work has been ongoing since 2018 2021-02-22 13:26:21 -05:00
Matt McWilliams 2c8eabeffd 3D printable panel for the Oxberry control box. 2021-02-22 13:24:18 -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 112e6b543c Update modules at the project root level. Update to npm lock version 2. 2021-02-22 13:16:49 -05:00
Matt McWilliams 232f39b861 Remove the cli project. It was unmaintained and unnecessarily adds to the project complexity. 2021-02-22 13:15:38 -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
Matt McWilliams 8d3c035e7b Rename "build" to "compile" to match rest of project. 2021-02-22 13:03:08 -05:00
sixteenmillimeter 10b823bca8
Merge pull request #58 from sixteenmillimeter/dependabot/npm_and_yarn/cli/systeminformation-4.27.11
Bump systeminformation from 4.16.0 to 4.27.11 in /cli
2020-11-09 23:49:17 -05:00
sixteenmillimeter 7f9020e698
Merge pull request #57 from sixteenmillimeter/dependabot/npm_and_yarn/app/electron-9.3.1
Bump electron from 9.1.1 to 9.3.1 in /app
2020-11-09 23:49:06 -05:00
sixteenmillimeter 6a563e131b
Merge pull request #56 from sixteenmillimeter/dependabot/npm_and_yarn/electron-10.1.3
Bump electron from 9.1.0 to 10.1.3
2020-11-09 23:48:56 -05:00
dependabot[bot] 1fb5c984ac
Bump systeminformation from 4.16.0 to 4.27.11 in /cli
Bumps [systeminformation](https://github.com/sebhildebrandt/systeminformation) from 4.16.0 to 4.27.11.
- [Release notes](https://github.com/sebhildebrandt/systeminformation/releases)
- [Changelog](https://github.com/sebhildebrandt/systeminformation/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sebhildebrandt/systeminformation/commits)

Signed-off-by: dependabot[bot] <support@github.com>
2020-10-27 20:31:56 +00:00
dependabot[bot] 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
dependabot[bot] 7ebfe16897
Bump electron from 9.1.0 to 10.1.3
Bumps [electron](https://github.com/electron/electron) from 9.1.0 to 10.1.3.
- [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.0...v10.1.3)

Signed-off-by: dependabot[bot] <support@github.com>
2020-10-06 14:48:42 +00:00
sixteenmillimeter e84f1ce8ff Add additional logging 2020-10-03 21:33:45 -04:00
sixteenmillimeter eb7e62aac7 Fixed projector function 2020-10-03 21:32:16 -04:00
sixteenmillimeter dab5c67c04
Merge pull request #54 from sixteenmillimeter/dependabot/npm_and_yarn/cli/bl-3.0.1
Bump bl from 3.0.0 to 3.0.1 in /cli
2020-09-29 15:51:26 -04:00
sixteenmillimeter 69ca62f884
Merge pull request #53 from sixteenmillimeter/dependabot/npm_and_yarn/app/bl-4.0.3
Bump bl from 4.0.2 to 4.0.3 in /app
2020-09-29 15:51:13 -04:00
dependabot[bot] 53941835cb
Bump bl from 3.0.0 to 3.0.1 in /cli
Bumps [bl](https://github.com/rvagg/bl) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/rvagg/bl/releases)
- [Commits](https://github.com/rvagg/bl/compare/v3.0.0...v3.0.1)

Signed-off-by: dependabot[bot] <support@github.com>
2020-09-29 19:50:45 +00:00
dependabot[bot] 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
sixteenmillimeter 6f19842da0
Merge pull request #49 from sixteenmillimeter/dependabot/npm_and_yarn/lodash-4.17.19
Bump lodash from 4.17.15 to 4.17.19
2020-09-29 15:49:53 -04:00
sixteenmillimeter 3692195887
Merge pull request #48 from sixteenmillimeter/dependabot/npm_and_yarn/cli/lodash-4.17.19
Bump lodash from 4.17.15 to 4.17.19 in /cli
2020-09-29 15:49:36 -04:00
sixteenmillimeter 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
sixteenmillimeter 65292524b1 Edit addresses the issue implied by #52. In simple tests with improvised hardware, frame cannot complete in less than 450ms, which is half a full frame. Will add another check to proj_stop() to evaluate the time elapsed and throw an error if too high or low (+/- 20%) 2020-09-29 15:13:22 -04:00
sixteenmillimeter 5e481e77b0 Addressing the issue with the JKMM99 projector functionality where frames stop prematurely. Conceivably, the proj_microswitch() function is the only place that calls proj_stop() so the issue is with the logic there. It makes little sense that this function allows for 15ms frames because of the test that requires a 450ms elapsed time before it is stopped. 2020-09-29 14:00:54 -04:00
sixteenmillimeter 7c9543239e Rest of last commit. Renderer js 2020-09-29 13:57:59 -04:00
sixteenmillimeter 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
sixteenmillimeter c5d7f9c91f Re-write of the JKMM99 which replaces the relay-based camera controller with an intval-based one. This relies on the Arduino Uno in the control box to handle all of the control logic in place of an on-board Arduino Trinket Pro. 2020-09-28 23:49:57 -04:00
sixteenmillimeter 9502d255c7 Fixed typo in Pins() where PROJECTOR_FWD was set to LOW twice instead of PROJECTOR_BWD. 2020-09-28 23:47:36 -04:00
sixteenmillimeter