Merge pull request #51 from socallinuxexpo/remove-samsung-camera

Remove samsung camera
socallinuxexpo · Mar 14, 2024 · 0077aab · 0077aab
2 parents 4f0edc1 + 9b474a8
commit 0077aab
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 92 deletions.
diff --git a/user_manual/assets/poe_injector_samsung.puml b/user_manual/assets/poe_injector_samsung.puml
diff --git a/user_manual/assets/pzoptics_camera.png b/user_manual/assets/pzoptics_camera.png
diff --git a/user_manual/assets/samsung_camera.puml b/user_manual/assets/samsung_camera.puml
diff --git a/user_manual/assets/samsung_snp_6200_2_mp_full_970938.jpg b/user_manual/assets/samsung_snp_6200_2_mp_full_970938.jpg
diff --git a/user_manual/room-setup.adoc b/user_manual/room-setup.adoc
@@ -66,63 +66,6 @@ power switch.
 include::./assets/camera_di_box.puml[Camera DI Box]
 ....
 
-<<<
-=== PoE Injector (for Samsung Camera) ===
-
-* [ ] Using Short Ethernet Cable, connect Network Switch 
-(any port from 22 to 27) to DATA Jack of ZyXEL PoE Injector
-
-* [ ] Connect power to PoE Injector, using IEC Cable.
-
-[plantuml, poe_injector_samsung, svg]
-....
-include::./assets/poe_injector_samsung.puml[PoE Injector (Samsung Camera)]
-....
-
-
-<<<
-=== Samsung Camera ===
-
-* [ ] Unfold and place Tripod next to confidence monitor (s.a., teleprompter).
-If there are no confidence monitors, place tripod in the back of the room.
-
-* [ ] Attach PVC camera mount to tripod.
-
- CAUTION: Ensure that the camera and mount will extend over a leg of the tripod for stability
-
-* [ ] Attach Samsung Camera to PVC camera mount:
-
-** [ ] Carefully align and insert metal alignment pins on camera into camera
-mount.
-
-** [ ] Twist camera to lock.
-
-** [ ] Secure camera to mount by connecting metal cable tether.
-
-* [ ] Check that camera is level.
-
-* [ ] Check that camera and mount extends over a leg of tripod for added
-stability.
-
-* [ ] Connect Camera’s Audio Cable to Camera DI Box by plugging in 1/4” RING
-plug to the DI Box PARPOUT Jack. (see the labels on the cable)
-
-  Note: The TIP plug will remain unconnected.
-
-* [ ] Connect Camera’s Ethernet Cable into the PoE Injector’s PoE/DATA Jack.
-This should power on the camera.
-
-* [ ] Raise camera and lock in place with metal pin and tension knobs. 
-
- Note: Camera should be high enough such that it can look over anybody standing in the back of the room; approximately 8 feet. 
-
- WARNING: DO NOT OVERTIGHTEN the tension knobs.
-
-[plantuml, samsung_camera, svg]
-....
-include::./assets/samsung_camera.puml[Samsung Camera]
-....
-
 <<<
 === PoE Injector (for PTZOptics Camera) ===
 

diff --git a/user_manual/video-subsystem.adoc b/user_manual/video-subsystem.adoc
@@ -12,6 +12,6 @@ The audio for the video stream is provided to the camera from the audio subsyste
 This audio track is multiplexed into the video stream by the camera and the resulting stream is made available over SCALE's LAN to be viewed by either the NOC Monitoring System or the Podium Computer.
 You can think of the camera as a server that serves a video stream to any client that connects to it.
 
-The following image shows the two models of cameras in use: On the left  is the Samsung Camera and on the right is the PTZOptics Camera.
+The following image shows the PTZOptics Camera in use.
 
-image::./assets/2-types-of-cameras.jpg[]
+image::./assets/pzoptics_camera.png[]