Some changes

maxritter · Feb 1, 2019 · 2a341b4 · 2a341b4
1 parent e9e6fd7
commit 2a341b4
Show file tree

Hide file tree

Showing 26 changed files with 28,784 additions and 15 deletions.
diff --git a/Enclosure/3D_Print_Radiometric/image/assembly_redner_image1.png b/Enclosure/3D_Print_Radiometric/image/assembly_redner_image1.png
diff --git a/Enclosure/3D_Print_Radiometric/image/assembly_render_image0.png b/Enclosure/3D_Print_Radiometric/image/assembly_render_image0.png
diff --git a/Enclosure/3D_Print_Radiometric/image/assembly_render_image2.png b/Enclosure/3D_Print_Radiometric/image/assembly_render_image2.png
diff --git a/Enclosure/3D_Print_Radiometric/image/assembly_render_image3.png b/Enclosure/3D_Print_Radiometric/image/assembly_render_image3.png
diff --git a/Enclosure/3D_Print_Radiometric/step/base.step b/Enclosure/3D_Print_Radiometric/step/base.step
diff --git a/Enclosure/3D_Print_Radiometric/step/front.step b/Enclosure/3D_Print_Radiometric/step/front.step
diff --git a/Enclosure/3D_Print_Radiometric/step/left.step b/Enclosure/3D_Print_Radiometric/step/left.step
diff --git a/Enclosure/3D_Print_Radiometric/step/rear.step b/Enclosure/3D_Print_Radiometric/step/rear.step
diff --git a/Enclosure/3D_Print_Radiometric/step/right.step b/Enclosure/3D_Print_Radiometric/step/right.step
diff --git a/Enclosure/3D_Print_Radiometric/step/right_w_text.step b/Enclosure/3D_Print_Radiometric/step/right_w_text.step
diff --git a/Enclosure/3D_Print_Radiometric/step/top.step b/Enclosure/3D_Print_Radiometric/step/top.step
diff --git a/Enclosure/3D_Print_Radiometric/stl/assembly.stl b/Enclosure/3D_Print_Radiometric/stl/assembly.stl
diff --git a/Enclosure/3D_Print_Radiometric/stl/base.stl b/Enclosure/3D_Print_Radiometric/stl/base.stl
diff --git a/Enclosure/3D_Print_Radiometric/stl/front.stl b/Enclosure/3D_Print_Radiometric/stl/front.stl
diff --git a/Enclosure/3D_Print_Radiometric/stl/left.stl b/Enclosure/3D_Print_Radiometric/stl/left.stl
diff --git a/Enclosure/3D_Print_Radiometric/stl/rear.stl b/Enclosure/3D_Print_Radiometric/stl/rear.stl
diff --git a/Enclosure/3D_Print_Radiometric/stl/right.stl b/Enclosure/3D_Print_Radiometric/stl/right.stl
diff --git a/Enclosure/3D_Print_Radiometric/stl/right_w_text.stl b/Enclosure/3D_Print_Radiometric/stl/right_w_text.stl
diff --git a/Enclosure/3D_Print_Radiometric/stl/top.stl b/Enclosure/3D_Print_Radiometric/stl/top.stl
diff --git a/Enclosure/README.MD b/Enclosure/README.MD
@@ -1,9 +1,19 @@
 There are **two versions** of the enclosure. The difference between the **radiometric** and **non-radiometric** versions is, that the non-radiometric setup also needs an external spot sensor. For the radiometric version, this cutout in the enclosure has been removed.
 
-For most users starting the project now, the **Radiometric** version will be the preferred one, in case they use the **Lepton3.5** as sensor. For this version, there exists also a folder "3D print", which, contains the **single sides for 3D printing** instead of laser cutting.
+For most users starting the project now, the **radiometric** version will be the preferred one, in case they use the **Lepton2.5** or **Lepton3.5** as sensor. For this version, there exists also a folder "3D print", which, contains the **single sides for 3D printing** instead of laser cutting.
+
+The non-radiometric version is suitable for the **Lepton2.0** as well as the **Lepton3.0**. It has an additional hole for the MLX90614 spot sensor.
 
 ----------
 
+**Patrik Thürlemann** from the Kantonsschule Trogen has created a nice 3D enclosure for the radiometric version of the device:
+
+![](https://raw.githubusercontent.com/maxritter/DIY-Thermocam/master/Images/Website/3dprint_1.JPG) ![](https://raw.githubusercontent.com/maxritter/DIY-Thermocam/master/Images/Website/3dprint_2.JPG)
+
+You can find it in the folder "**3D_Print_Radiometric**". It includes STEP and STL files.
+
+------
+
 The enclosure has been designed with Google Sketchup for a material thickness of **3mm**. The standard enclosure is cut out of **black acryl plastic** by a laser cutting service. 
 
 

diff --git a/Images/Website/3dprint_1.JPG b/Images/Website/3dprint_1.JPG
diff --git a/Images/Website/3dprint_2.JPG b/Images/Website/3dprint_2.JPG
diff --git a/Software/Thermal Analysis Software/1.4.0.0/TVision_V1.4.0.0/ThermoVision_JoeC.exe b/Software/Thermal Analysis Software/1.4.0.0/TVision_V1.4.0.0/ThermoVision_JoeC.exe
diff --git a/Software/Thermal Analysis Software/1.4.2.1/TVision_V1.4.2.1/ThermoVision_JoeC.exe b/Software/Thermal Analysis Software/1.4.2.1/TVision_V1.4.2.1/ThermoVision_JoeC.exe
diff --git a/Software/Thermal Analysis Software/1.4.4.2/TVision/ThermoVision_JoeC.exe b/Software/Thermal Analysis Software/1.4.4.2/TVision/ThermoVision_JoeC.exe
diff --git a/Software/Thermal Live Viewer/README.MD b/Software/Thermal Live Viewer/README.MD
@@ -1,32 +1,33 @@
-Compiled versions of the thermal live viewer for Windows can be downloaded here: 
+Compiled versions of the thermal live viewer for Windows can be [downloaded here](http://diy-thermocam.bplaced.net/ThermalViewer/).
-http://diy-thermocam.bplaced.net/ThermalViewer/.
 
-For this compiled version, the device needs to be connected to comport COM10. Check out this tutorial how to change to comport on Windows: http://plugable.com/2011/07/04/how-to-change-the-com-port-for-a-usb-serial-adapter-on-windows-7/.
+If the comport is not COM10 on Windows, you need to [change it](http://plugable.com/2011/07/04/how-to-change-the-com-port-for-a-usb-serial-adapter-on-windows-7/).
 
-The python source code can also be executed on Linux or Mac OSX. Use Python 2.x, not 3.x, otherwise there will be an issue with the serial communication.
+On Linux, look for changes in the list of devices in /dev/ - the camera will be listed as a terminal device in the manner of "ttyACM0". You can also list them in the terminal with the "ls /dev/tty*" command.
 
-If the comport is not COM10 on Windows, you need to change it. For Linux / Mac OSX, look at the output of ls /dev/tty.* in Terminal, whereby an output such as this would be seen:
+Edit the "ThermalViewer.py" file, find the line that reads "device = "COM10" under the "Global Variables" section and change it to the full path of the device, for example:
-dyn-736-872-21-211:~ Jason$ ls /dev/tty.*
-/dev/tty.Bluetooth-Incoming-Port	/dev/tty.usbmodem2516811
-/dev/tty.JasonsiPhone-
 
-Looking at the entry with “tty.usbmodem...”, change the line
+```
-ser = serial.Serial("COM10", 115200)
+device = "/dev/ttyACM0"
-to this:
+```
-ser = serial.Serial("/dev/tty.usbmodem1894391", 115200)
 
-The number suffixing the path seems to change with each camera.
+And save the file.
 
-For the video recording functionality you need ffmpeg. It is included for the combiled Windows versions, otherwise you need to download the ffmpeg package from here: https://ffmpeg.org/download.html.
+If there are problems getting the UI to show up, run the program in terminal (e.g. "python ./ThermalViewer.py"). If there are missing dependencies, they will be listed. The program depends on packages like pygame,pybutton and scipy - if they are missing, you can install them using the command "pip install", for example "pyp install pygame"
+
+For the video recording functionality you need ffmpeg. It is included for the combiled Windows versions, otherwise you need to [download](https://ffmpeg.org/download.html) the ffmpeg package.
 
 Change the line:
 
+```
 ffmpegCmd = 'ffmpeg -framerate %d -i %s/%%06d.jpg -codec copy %s' % \
             (round(frames), videoFolder, videoFolder + ".avi")
+```
 
 to this to get it to work under Linux / Mac OSX:
 
+```
 ffmpeg_loc = os.getcwd() + "/"
 ffmpeg_loc = ffmpeg_loc.replace(' ', '\\ ')
 ffmpegCmd = ffmpeg_loc + 'ffmpeg -framerate %d -i %s/%%06d.jpg -codec copy %s' % \
             (round(frames), videoFolder, videoFolder + ".avi”)
+```