From 5026cf869f2910864a2e1e088fe2b11a70cf367e Mon Sep 17 00:00:00 2001 From: Matthew McWilliams Date: Fri, 7 Oct 2022 19:47:56 -0400 Subject: [PATCH] Arri-S work --- app/lib/alert/index.d.ts | 1 + app/lib/arduino/index.d.ts | 1 + app/lib/cam/index.d.ts | 1 + app/lib/capper/index.d.ts | 1 + app/lib/cmd/index.d.ts | 1 + app/lib/delay/index.d.ts | 0 app/lib/devices/index.d.ts | 1 + app/lib/display/index.d.ts | 1 + app/lib/exec/index.d.ts | 13 +++++++ app/lib/exit/index.d.ts | 8 ++++ app/lib/ffmpeg/index.d.ts | 1 + app/lib/ffprobe/index.d.ts | 1 + app/lib/filmout/index.d.ts | 1 + app/lib/frame/index.d.ts | 15 ++++++++ app/lib/intval/index.d.ts | 9 +++++ app/lib/light/index.d.ts | 1 + app/lib/log/index.d.ts | 1 + app/lib/processing/index.d.ts | 1 + app/lib/proj/index.d.ts | 2 + app/lib/sequencer/index.d.ts | 1 + app/lib/settings/index.d.ts | 1 + app/lib/system/index.d.ts | 1 + scad/arri_s.scad | 72 +++++++++++++++++++++++++++++++++++ 23 files changed, 135 insertions(+) create mode 100644 app/lib/alert/index.d.ts create mode 100644 app/lib/arduino/index.d.ts create mode 100644 app/lib/cam/index.d.ts create mode 100644 app/lib/capper/index.d.ts create mode 100644 app/lib/cmd/index.d.ts create mode 100644 app/lib/delay/index.d.ts create mode 100644 app/lib/devices/index.d.ts create mode 100644 app/lib/display/index.d.ts create mode 100644 app/lib/exec/index.d.ts create mode 100644 app/lib/exit/index.d.ts create mode 100644 app/lib/ffmpeg/index.d.ts create mode 100644 app/lib/ffprobe/index.d.ts create mode 100644 app/lib/filmout/index.d.ts create mode 100644 app/lib/frame/index.d.ts create mode 100644 app/lib/intval/index.d.ts create mode 100644 app/lib/light/index.d.ts create mode 100644 app/lib/log/index.d.ts create mode 100644 app/lib/processing/index.d.ts create mode 100644 app/lib/proj/index.d.ts create mode 100644 app/lib/sequencer/index.d.ts create mode 100644 app/lib/settings/index.d.ts create mode 100644 app/lib/system/index.d.ts create mode 100644 scad/arri_s.scad diff --git a/app/lib/alert/index.d.ts b/app/lib/alert/index.d.ts new file mode 100644 index 0000000..cb0ff5c --- /dev/null +++ b/app/lib/alert/index.d.ts @@ -0,0 +1 @@ +export {}; diff --git a/app/lib/arduino/index.d.ts b/app/lib/arduino/index.d.ts new file mode 100644 index 0000000..cb0ff5c --- /dev/null +++ b/app/lib/arduino/index.d.ts @@ -0,0 +1 @@ +export {}; diff --git a/app/lib/cam/index.d.ts b/app/lib/cam/index.d.ts new file mode 100644 index 0000000..cb0ff5c --- /dev/null +++ b/app/lib/cam/index.d.ts @@ -0,0 +1 @@ +export {}; diff --git a/app/lib/capper/index.d.ts b/app/lib/capper/index.d.ts new file mode 100644 index 0000000..cb0ff5c --- /dev/null +++ b/app/lib/capper/index.d.ts @@ -0,0 +1 @@ +export {}; diff --git a/app/lib/cmd/index.d.ts b/app/lib/cmd/index.d.ts new file mode 100644 index 0000000..cb0ff5c --- /dev/null +++ b/app/lib/cmd/index.d.ts @@ -0,0 +1 @@ +export {}; diff --git a/app/lib/delay/index.d.ts b/app/lib/delay/index.d.ts new file mode 100644 index 0000000..e69de29 diff --git a/app/lib/devices/index.d.ts b/app/lib/devices/index.d.ts new file mode 100644 index 0000000..cb0ff5c --- /dev/null +++ b/app/lib/devices/index.d.ts @@ -0,0 +1 @@ +export {}; diff --git a/app/lib/display/index.d.ts b/app/lib/display/index.d.ts new file mode 100644 index 0000000..cb0ff5c --- /dev/null +++ b/app/lib/display/index.d.ts @@ -0,0 +1 @@ +export {}; diff --git a/app/lib/exec/index.d.ts b/app/lib/exec/index.d.ts new file mode 100644 index 0000000..001b960 --- /dev/null +++ b/app/lib/exec/index.d.ts @@ -0,0 +1,13 @@ +declare const execRaw: any; +/** + * Promisified child_process.exec + * + * @param cmd + * @param arg + * @param opts See child_process.exec node docs + * @param {stream.Writable} opts.stdout If defined, child process stdout will be piped to it. + * @param {stream.Writable} opts.stderr If defined, child process stderr will be piped to it. + * + * @returns {Promise<{ stdout: string, stderr: stderr }>} + */ +declare function exec(...args: string[]): Promise; diff --git a/app/lib/exit/index.d.ts b/app/lib/exit/index.d.ts new file mode 100644 index 0000000..6a939da --- /dev/null +++ b/app/lib/exit/index.d.ts @@ -0,0 +1,8 @@ +/** + * Exit process with either a 0 code or other + * specified failure code. Print message to console first. + * + * @param {string} msg Reason for exit + * @param {integer} code process exit code, default 0 + **/ +declare function exit(msg: string, code?: number): void; diff --git a/app/lib/ffmpeg/index.d.ts b/app/lib/ffmpeg/index.d.ts new file mode 100644 index 0000000..cb0ff5c --- /dev/null +++ b/app/lib/ffmpeg/index.d.ts @@ -0,0 +1 @@ +export {}; diff --git a/app/lib/ffprobe/index.d.ts b/app/lib/ffprobe/index.d.ts new file mode 100644 index 0000000..cb0ff5c --- /dev/null +++ b/app/lib/ffprobe/index.d.ts @@ -0,0 +1 @@ +export {}; diff --git a/app/lib/filmout/index.d.ts b/app/lib/filmout/index.d.ts new file mode 100644 index 0000000..cb0ff5c --- /dev/null +++ b/app/lib/filmout/index.d.ts @@ -0,0 +1 @@ +export {}; diff --git a/app/lib/frame/index.d.ts b/app/lib/frame/index.d.ts new file mode 100644 index 0000000..11935c4 --- /dev/null +++ b/app/lib/frame/index.d.ts @@ -0,0 +1,15 @@ +interface RGBA { + r: number; + g: number; + b: number; + a: number; +} +export default class Frame { + static info(imagePath: string): Promise<{ + width: any; + height: any; + }>; + static solidColor(width: number, height: number, color: RGBA): Promise; + static blend(inPath: any, color: RGBA, imagePath: string): Promise; +} +export {}; diff --git a/app/lib/intval/index.d.ts b/app/lib/intval/index.d.ts new file mode 100644 index 0000000..c00ab7f --- /dev/null +++ b/app/lib/intval/index.d.ts @@ -0,0 +1,9 @@ +declare class Intval { + private _baseUrl; + private req; + constructor(url: string); + move(): Promise; + setDir(dir: boolean): Promise; + setExposure(exposure: number, cb: Function): Promise; + connect(cb: Function): void; +} diff --git a/app/lib/light/index.d.ts b/app/lib/light/index.d.ts new file mode 100644 index 0000000..cb0ff5c --- /dev/null +++ b/app/lib/light/index.d.ts @@ -0,0 +1 @@ +export {}; diff --git a/app/lib/log/index.d.ts b/app/lib/log/index.d.ts new file mode 100644 index 0000000..cb0ff5c --- /dev/null +++ b/app/lib/log/index.d.ts @@ -0,0 +1 @@ +export {}; diff --git a/app/lib/processing/index.d.ts b/app/lib/processing/index.d.ts new file mode 100644 index 0000000..cb0ff5c --- /dev/null +++ b/app/lib/processing/index.d.ts @@ -0,0 +1 @@ +export {}; diff --git a/app/lib/proj/index.d.ts b/app/lib/proj/index.d.ts new file mode 100644 index 0000000..ae6360f --- /dev/null +++ b/app/lib/proj/index.d.ts @@ -0,0 +1,2 @@ +/** class representing the Projector features **/ +export {}; diff --git a/app/lib/sequencer/index.d.ts b/app/lib/sequencer/index.d.ts new file mode 100644 index 0000000..cb0ff5c --- /dev/null +++ b/app/lib/sequencer/index.d.ts @@ -0,0 +1 @@ +export {}; diff --git a/app/lib/settings/index.d.ts b/app/lib/settings/index.d.ts new file mode 100644 index 0000000..cb0ff5c --- /dev/null +++ b/app/lib/settings/index.d.ts @@ -0,0 +1 @@ +export {}; diff --git a/app/lib/system/index.d.ts b/app/lib/system/index.d.ts new file mode 100644 index 0000000..cb0ff5c --- /dev/null +++ b/app/lib/system/index.d.ts @@ -0,0 +1 @@ +export {}; diff --git a/scad/arri_s.scad b/scad/arri_s.scad new file mode 100644 index 0000000..a2e560d --- /dev/null +++ b/scad/arri_s.scad @@ -0,0 +1,72 @@ +// Arri-S Animation Motor + +include <../common.scad>; + +BarrelDiameter = 40; +BarrelLength = 75; + +SeatDiameter = 20; +SeatLength = 3; + +CapLength = 30; +CapDiameter = 30; +CapThickness = 3; + +CapCatchDiameter = 28; +CapCatchLength = 2; +CapCatchOffset = 24; + +CapRimDiameter = 37; +CapRimThickness = 3; + +NotchDiameter = 2; +NotchOffset = 3; + +DriveLength = 8; +DriveDiameter1 = 14; +DriveDiameter2 = 12; + +module motorBarrel () { + $fn = 200; + cylinder(r = BarrelDiameter / 2, r2 = (BarrelDiameter - 1) / 2, h = BarrelLength, center = true); +} + +module motorSeat () { + $fn = 120; + cylinder(r = SeatDiameter / 2, h = SeatLength, center = true); +} + +module motor () { + motorBarrel(); + translate([0, 0, (BarrelLength / 2) + (SeatLength / 2)]) motorSeat(); + //notch + $fn = 50; + translate([BarrelDiameter / 2, 0, -(BarrelLength / 2) + NotchOffset]) { + rotate([0, 90, 0]) { + cylinder(r = NotchDiameter / 2, h = 1, center = true); + translate([0, 0, NotchDiameter / 4]) sphere(r = NotchDiameter / 2); + } + } +} + +module capBellowsAdapter () { + $fn = 200; + difference () { + cylinder(r = CapDiameter / 2, h = CapLength, center = true); + cylinder(r = (CapDiameter - CapThickness) / 2, h = CapLength + 1, center = true); + //catch + translate([0, 0, (CapLength / 2) - CapCatchOffset]) difference () { + cylinder(r = (CapDiameter + 1) / 2, h = CapCatchLength, center = true); + cylinder(r = CapCatchDiameter / 2, h = CapCatchLength + 1, center = true); + } + } + translate([0, 0, (CapLength / 2) + (CapRimThickness / 2)]) { + difference () { + cylinder(r = CapRimDiameter / 2, h = CapRimThickness, center = true); + cube([CapDiameter - CapThickness - 8, CapDiameter - CapThickness - 8, CapRimThickness + 1], center = true); + } + } +} + +motor(); +//capBellowsAdapter();