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

Jump to bottom

merging in Dev branch #2

Merged
merged 74 commits into from
Jan 11, 2021
Merged

merging in Dev branch #2

Changes from 1 commit
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
cfd53c2
initial commit
luke-iqt Dec 18, 2020
ab039c5
Update README.md
luke-iqt Dec 18, 2020
377fb22
adding a builtin DB
luke-iqt Dec 19, 2020
6820f38
Update flighttracker.py
luke-iqt Dec 19, 2020
49b8ccd
Dockerized!
luke-iqt Dec 21, 2020
f3bc8e1
Update docker-compose.yml
luke-iqt Dec 21, 2020
665fe4b
Update flighttracker.py
luke-iqt Dec 21, 2020
3e3d447
adding azimuth calculations
luke-iqt Dec 21, 2020
de058a2
Add a camera listener
luke-iqt Dec 22, 2020
86e74dd
controlling the pan tilt hat - basic
luke-iqt Dec 22, 2020
659f083
permission to access the I2C bus
luke-iqt Dec 22, 2020
7f57e5d
Update docker-compose.yml
luke-iqt Dec 22, 2020
1ba7afd
Update docker-compose.yml
luke-iqt Dec 22, 2020
e5a30d0
Update requirements.txt
luke-iqt Dec 22, 2020
f5a6c61
Update camera.py
luke-iqt Dec 22, 2020
9d8f94b
so that is how you ref dicts
luke-iqt Dec 22, 2020
b5436c2
Update camera.py
luke-iqt Dec 22, 2020
5cfe059
Update camera.py
luke-iqt Dec 22, 2020
0dffad5
Update camera.py
luke-iqt Dec 22, 2020
98063f9
Update camera.py
luke-iqt Dec 22, 2020
aec3975
Update camera.py
luke-iqt Dec 22, 2020
f3ba1a5
better pan calculations
luke-iqt Dec 22, 2020
ee5fbd5
better messages
luke-iqt Dec 22, 2020
758cbb3
Update camera.py
luke-iqt Dec 22, 2020
f21a428
Update camera.py
luke-iqt Dec 22, 2020
41e3520
Update flighttracker.py
luke-iqt Dec 22, 2020
eee7900
Update camera.py
luke-iqt Dec 22, 2020
89126e7
Update camera.py
luke-iqt Dec 22, 2020
cff5528
Update camera.py
luke-iqt Dec 22, 2020
2c1da38
Update camera.py
luke-iqt Dec 23, 2020
b77b0b3
Update camera.py
luke-iqt Dec 23, 2020
ff1c35b
Update camera.py
luke-iqt Dec 23, 2020
e272f04
Update camera.py
luke-iqt Dec 23, 2020
398e20a
Update camera.py
luke-iqt Dec 23, 2020
9d0f0b1
Update camera.py
luke-iqt Dec 23, 2020
4c14865
Update camera.py
luke-iqt Dec 23, 2020
6bfb3fd
Update camera.py
luke-iqt Dec 23, 2020
e5b2c4c
Update camera.py
luke-iqt Dec 23, 2020
bf2ae91
Update camera.py
luke-iqt Dec 23, 2020
bc619ab
photo snapping
luke-iqt Dec 24, 2020
7807678
Update docker-compose.yml
luke-iqt Dec 26, 2020
a5e6161
better linking
luke-iqt Dec 26, 2020
7d41ef2
Update docker-compose.yml
luke-iqt Dec 26, 2020
7fb0907
Update docker-compose.yml
luke-iqt Dec 26, 2020
a917696
fix for picam?
luke-iqt Dec 26, 2020
985e835
Update README.md
luke-iqt Dec 26, 2020
5298708
Update camera.py
luke-iqt Dec 26, 2020
5e2c38d
Update camera.py
luke-iqt Dec 26, 2020
834693a
Update camera.py
luke-iqt Dec 26, 2020
6731e2d
Update camera.py
luke-iqt Dec 26, 2020
a1e0207
Update camera.py
luke-iqt Dec 26, 2020
2008809
base elevation
luke-iqt Dec 28, 2020
a101dcc
Update camera.py
luke-iqt Dec 28, 2020
06b78b1
Added a ADSB-MQTT bridge
luke-iqt Jan 5, 2021
1c6ed02
Tracking with Axis PTZ
luke-iqt Jan 7, 2021
4ca9969
corrected terms: azimuth->elevation
luke-iqt Jan 7, 2021
33c1c56
added customized folders for saving pictures
luke-iqt Jan 8, 2021
8d22750
Update utils.py
luke-iqt Jan 8, 2021
caf28f9
changing permissions
luke-iqt Jan 8, 2021
c57895e
Update dockerfile
luke-iqt Jan 8, 2021
2a12d45
Update docker-compose.yml
luke-iqt Jan 8, 2021
e672725
Update docker-compose.yml
luke-iqt Jan 8, 2021
b9053f6
correcting docker-compose build
luke-iqt Jan 8, 2021
32d8e88
cleaned up printing
luke-iqt Jan 9, 2021
aefa14f
added restart
luke-iqt Jan 9, 2021
5ab3b28
Update flighttracker.py
luke-iqt Jan 9, 2021
f372af4
fix a divide by zero error
luke-iqt Jan 9, 2021
115e620
setting altitude
luke-iqt Jan 9, 2021
077245f
Update flighttracker.py
luke-iqt Jan 9, 2021
83048c5
Update camera.py
luke-iqt Jan 9, 2021
23be7db
added additional configuration
luke-iqt Jan 11, 2021
92f6496
Update README.md
luke-iqt Jan 11, 2021
3dc8351
updating readme
luke-iqt Jan 11, 2021
4fc9f83
improved documentation
luke-iqt Jan 11, 2021
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
Prev Previous commit
Next Next commit
Update camera.py
  • Loading branch information
@luke-iqt
luke-iqt committed Dec 26, 2020
commit 6731e2d22a621050640812ec79f0fa225c523903
3 changes: 2 additions & 1 deletion pan-tilt-pi/camera.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@

camera = PiCamera()

tiltCorrect = 30
args = None
pan = 0
tilt = 0
Expand Down Expand Up @@ -111,7 +112,7 @@ def moveCamera():

# Same thing with the tilt. A negative angle moves the camera head up, a positive value down. Backwards!
# Multiplying by -1 again to make it normal. The camera is also off by a little and pointed up a bit, moving it down 20 degrees seems about right
pantilthat.tilt(actualTilt * -1 + 10)
pantilthat.tilt(actualTilt * -1 + tiltCorrect)
# Sleep for a bit so we're not hammering the HAT with updates
time.sleep(0.005)

Expand Down