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.

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

Merge Development into Main #8

Draft
wants to merge 51 commits into
base: main
Choose a base branch
from
Draft
Changes from 1 commit
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
17dee72
Add in a todo :scientist:
TRex22 Sep 21, 2021
32fa580
File change :cop:
TRex22 Sep 24, 2021
c446c93
Merge remote-tracking branch 'origin' into development
TRex22 Sep 24, 2021
63f3a4c
Fix the video mode :cop:
TRex22 Sep 24, 2021
c401f71
Add in video resolution :hammer:
TRex22 Sep 24, 2021
1b56b79
Add in video resolution :hammer:
TRex22 Sep 24, 2021
70810d4
1920x1080 video resolution
TRex22 Sep 24, 2021
92a17af
Add in continuous_shot :hammer:
TRex22 Sep 25, 2021
5a93980
Fix ; :cop:
TRex22 Sep 25, 2021
2e9a9c7
Attemt to fix config access :cop:
TRex22 Sep 25, 2021
265e2f9
Set HDR2 as true by default :cop:
TRex22 Sep 25, 2021
318e1f2
Fix config variable issue :cop:
TRex22 Sep 25, 2021
5210947
Reduce continious count :cop:
TRex22 Sep 25, 2021
aee57ec
Start working on other tools :scientist:
TRex22 Oct 9, 2021
13220da
Add in url :cop:
TRex22 Oct 9, 2021
f13535a
Add in global average method :hammer:
TRex22 Oct 25, 2021
2d63ea0
Add in todo :wrench:
TRex22 Nov 1, 2021
58978e3
Merge branch 'development' of github.com:TRex22/picam into development
TRex22 Nov 1, 2021
8e7b2b1
Get base algrithm coded :hammer:
TRex22 Nov 1, 2021
b57698e
Re-write fft but still not working :cop:
TRex22 Nov 7, 2021
dbf164c
Continue to work on fft ip :hammer:
TRex22 Nov 13, 2021
2c5c831
Experiment on fftn :scientist:
TRex22 Nov 27, 2021
1465514
Update tools :wrench:
TRex22 Jan 10, 2022
d0b4734
Add in camera effects :hammer:
TRex22 Jan 10, 2022
0908d4b
Add in effect text overlay and up bounce time :hammer:
TRex22 Jan 10, 2022
80406c8
Fix missing menu item :cop:
TRex22 Jan 10, 2022
af59df0
Uncomment key :cop:
TRex22 Jan 10, 2022
d7e4aa5
Remove duplicate :cop:
TRex22 Jan 10, 2022
c24d400
Remove duplicate :cop:
TRex22 Jan 10, 2022
b7688a6
Add in a feature to hide overlay :hammer:
TRex22 Jan 10, 2022
dd11528
Add in a feature to hide overlay :hammer:
TRex22 Jan 10, 2022
c728c22
Add in a feature to hide overlay :hammer:
TRex22 Jan 10, 2022
bfd4868
Add in a feature to hide overlay :hammer:
TRex22 Jan 10, 2022
fe6f923
Add in a feature to hide overlay :hammer:
TRex22 Jan 10, 2022
b566834
Add in new TODOs :scientist:
TRex22 Jan 15, 2022
062a51e
Add in new TODOs :scientist:
TRex22 Jan 15, 2022
ebdb623
Add in new TODOs :scientist:
TRex22 Jan 15, 2022
6d82dd4
Add in jnaky cases :construction_worker:
TRex22 Oct 16, 2022
d77390d
Attempt to dial in measurements :cop:
TRex22 Oct 16, 2022
0e43254
More Minor adjustments :cop:
TRex22 Oct 16, 2022
8892717
More adjustents :cop:
TRex22 Oct 16, 2022
49b2aaa
Add in new version of stl :wrench:
TRex22 Oct 16, 2022
d1e9d88
Another try :cop:
TRex22 Oct 16, 2022
ddf8234
Try adjusting the holes again :cop:
TRex22 Oct 16, 2022
d6a7d28
Try adjusting the holes again :cop:
TRex22 Oct 16, 2022
291eeb4
Bump design :cop:
TRex22 Oct 17, 2022
e2d51f9
Add in project file :cop:
TRex22 Oct 17, 2022
1437011
Version 10 base plate with space for two camera modules :scientist:
TRex22 Feb 11, 2023
9f30513
Version 10 base plate with space for two camera modules :scientist:
TRex22 Feb 11, 2023
e56aa60
Add in v12 of the base plate :cop:
TRex22 Feb 11, 2023
e65858f
Add in next version of base plate :cop:
TRex22 Jul 8, 2023
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
1920x1080 video resolution
TRex22 committed Sep 24, 2021
commit 70810d45b106bc4f30f3e7566f3b4d7567681c5c
4 changes: 2 additions & 2 deletions src/main.py
Original file line number Diff line number Diff line change
@@ -71,8 +71,8 @@
"overlay_h": 240,
"width": 4056, # Image width
"height": 3040, # Image height
"video_width": 3840, # 4k
"video_height": 2160, # 4k
"video_width": 1920, # 1920x1080
"video_height": 1080, # 1920x1080
"annotate_text_size": 48, # 6 to 160, inclusive. The default is 32
"exposure_mode": 'auto',
"default_exposure_mode": 'auto',