Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Simplifying to a single file, perf improvements, better user experience #7

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open

Simplifying to a single file, perf improvements, better user experience #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d45e46b
combine logic into a single fle
JesseBuesking Dec 3, 2022
8ead4f0
updating readme
JesseBuesking Dec 3, 2022
61dd6c1
more readme changes
JesseBuesking Dec 3, 2022
eca08d0
support for different frameWidth and frameHeight
JesseBuesking Dec 3, 2022
7f5bd00
performance improvements
JesseBuesking Dec 3, 2022
ab47a5a
update the graticule when modified
JesseBuesking Dec 3, 2022
25c3738
take the peak nearest to where the user clicked
JesseBuesking Dec 3, 2022
005248d
fixing bugs in mouse clicks and graticule
JesseBuesking Dec 3, 2022
7e21695
a bit of cleanup, and a few more perf improvements
JesseBuesking Dec 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,25 +148,28 @@ First, clone this repo!

In /src you will find:

* PySpectrometer2-Picam2-v1.0.py (PySpectrometer for Raspberry Pi)
* PySpectrometer2-USB-v1.0.py (USB version of this program (This is for USB Cameras See end of Readme)).
* specFunctions.py (A library of functions including: Wavelength to RGB, SavGol filter from Scipy, Peak detect from peakutils, readcal and writecal.
* PySpectrometer2.py (The main program. See USB camera usage at the end of the Readme)
* specFunctions.py (A library of functions including: Wavelength to RGB, SavGol filter from Scipy, Peak detect from peakutils, readcal and writecal)

## Dependencies

Run: **sudo apt-get install python3-opencv**

**Also note, this build is designed for Raspberry Pi OS Bullseye, and will only work with the new libcamera based python library (picamera2)**
It will **not** work with older versions of Raspbery Pi OS. You **will** however be able to use PySpectrometer2-USB-v1.0.py with an external USB camera with other Operating Systems.
It will **not** work with older versions of Raspbery Pi OS. You **will** however be able to use with an external USB camera with other Operating Systems.


To run the program, first make it executable by running: **chmod +x PySpectrometer2-Picam2-v1.0.py**
To run the program, first make it executable by running: **chmod +x PySpectrometer2.py**

Run by typing: **./PySpectrometer2-Picam2-v1.0.py**
Run by typing: **./PySpectrometer2.py --X**
Where --X is one of:
* --picam (if using a picamera)
* --webcam (if using the first available camera on your computer)
* --device NUMBER (to specify the device)

Note to also display the waterfall display, run with the option: **./PySpectrometer2-Picam2-v1.0.py --waterfall**
Note to also display the waterfall display, run with the option: **--waterfall**

To run in fullscreen mode (perform calibration in standard mode first), run with the option: **./PySpectrometer2-Picam2-v1.0.py --fullscreen**
To run in fullscreen mode (perform calibration in standard mode first), run with the option: **--fullscreen**

When first started, the spectrometer is in an uncalibrated state! You must therefore perform the calibration procedure, but at this stage you should be able to focus and align your camera with your spectroscope using the preview window. Is is expected that red light is on the right, and blue-violet on the left.
An excellent choice for this is daylight, as well defined Fraunhoffer lines are indicative of good camera focus.
Expand Down Expand Up @@ -259,7 +262,7 @@ For an external USB camera, first find the device by issuing:

Once you have determined this, you can run the program. For example if your camera is /dev/video3 and you require a framerate of 15fps you would issue:

**./PySpectrometer2-USB-v1.0.py --device 3 --fps 15**
**./PySpectrometer2.py --device 3 --fps 15**

If you want fine control over camera settings use guvcview: **sudo apt-get install guvcview**

Expand Down
Loading