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

Allsky changes from Eric Claeys and Linda Thomas-Fowler #405

Merged
merged 24 commits into from
Aug 6, 2021
Merged

Allsky changes from Eric Claeys and Linda Thomas-Fowler #405

merged 24 commits into from
Aug 6, 2021

Conversation

EricClaeys
Copy link
Collaborator

Lots of enhancements, fixes, and error checking, many of which were discussed with Thomas the end of July, 2021.
Users who also have allsky-portal should update it when they update allsky since many new settings were added and many changed names.
Several of us have been running with these changes for a couple months, although we all have ZWO cameras.

@EricClaeys
Add files via upload
94e425e
@EricClaeys
Add files via upload
a08f239 
Implements notification images, reboots USB bus if camera isn't found, adds error checking.
@EricClaeys
Add files via upload
82f1d28 
Implements notification images.  Allows users to specify via config file if bad images should be removed.  Removed duplicate code.  Added return code checks.
@EricClaeys
Add files via upload
a6d8abf 
Added some error checking.  Added COPY_TO_WEBSITE and RESIZE_UPLOADS options.  Added lftp commands to upload temporary file name, then move to permanent name, to help avoid issues with slow upload speeds.
@EricClaeys
Merge branch 'thomasjacquin:master' into master
998950d
@EricClaeys
Update copy_notification_image.sh
3ae07e8 
Minor updates.
@EricClaeys
Update darkCapture.sh
1145558 
Implement notification images.
Dark frame from "capture" is now called "dark.$EXTENSION" to distinguish from normal image.
Used $IMG_PREFIX.
@EricClaeys
Update darkSubtract.sh
2829369 
Does error checking on "convert".
Lets user know if they've set DARK_FRAME_SUBTRACTION on but have no darks.
@EricClaeys
Update endOfNight.sh
8b7f315 
Saves "keogram" and "startrails" output in temp files rather than putting the 1000+ lines in the log file.
Runs "removeBadImages" based on "$REMOVE_BAD_IMAGES" in config.sh.
Only upload keogram and startrails if they were successfully created.
@EricClaeys
Update endOfNight_additionalSteps.sh
12042de 
Mention adding "$ME" to any messages.  "$ME" is the command name, and is useful to have in the log file to know which command produced the output.
@EricClaeys
Update generateForDay.sh
ca5412b 
Added $DATE and $DIR for readability.
@EricClaeys
Update postData.sh
4983636 
Implemented $ME.
Commented out line since endOfNight.sh prints a similar line.
Removed unnecessary double quotes on lftp line to make it easier to read.
@EricClaeys
Update saveImageDay.sh
c8f8ebc 
Removed check for DARK_MODE since darkCapture.sh exits the script if DARK_MODE is on.
Moved "identity" check to top; there's no need to do anything else if the image is corrupt.
Perform error checking on "convert".
Allow user to specify thumbnail size and resize size.
Implement $IMG_PREFIX instead of hard-coding "liveview-".
Removed unnecessary double quotes on lftp line to make it easier to read.
@EricClaeys
Update saveImageNight.sh
d19202a 
Removed check for DARK_MODE since darkCapture.sh exits the script if DARK_MODE is on.
Moved "identity" check to top; there's no need to do anything else if the image is corrupt.
Perform error checking on "convert".
Allow user to specify thumbnail size and resize size.
Implement $IMG_PREFIX instead of hard-coding "liveview-".
Removed unnecessary double quotes on lftp line to make it easier to read.
The final image name is always the same now, so it's no longer "image-processed.jpg" if dark subtract is on, and "image.jpg" if it's off.  That was confusing.
@EricClaeys
Update removeBadImages.sh
cecbf31 
Optionally also checks for too dark and too bright images, based on REMOVE_BAD_IMAGES_THRESHOLD_LOW and REMOVE_BAD_IMAGES_THRESHOLD_HIGH from config.sh.
NOTE: I'm not sure how to do that check if "parallel" is used.
Removes bad thumbnails in addition to bad images, and displays reason they are removed.
Centralized redundant code for easier maintenance.
Outputs a summary line.
@EricClaeys
Update timelapse.sh
6bd2a68 
Allows timelapses to be created for images no in ~/allsky/images.  For example, for observatory cameras.
Save "ln -s" output to temp file rather than outputting 1000+ lines to log file.  temp file is save so user can look at it, and a summary is output.
Perform error checking.
Decreased useless output from ffmpeg.
lftp puts to a temp name, then renames it to the correct name.  This is because timelapse files are large and if the web server tries to read the file as it's being uploaded, it will get an error.
@EricClaeys
Update uploadForDay.sh
1a707fb 
Implement $ME.
Remove unneeded double quotes in lftp.
Removed "-u $USER,$PASSWORD" since it's not needed.
@EricClaeys
Update README.md
cbba45c 
Mention new settings and new names to existing settings.
Note that many of the settings (now and prior to these changes) don't apply to Pi cameras; I didn't do anything about that.

I'm assuming the will be version 0.8, so added summary of changes.
@EricClaeys
Update allsky.sh
a273911 
Keep prior log file to aid in debugging.
Ability to reset the USB bus if the ZWO camera isn't found.
Put settings in a bash array, so they can have spaces in them.
Optionally display "notification" images.
Checks if output is a tty (user invoked it manually) or not (service invoked it) - this is used by capture program to display appropriate log messages.
@EricClaeys
Update config.sh.repo
74f6356 
Includes new variables.
@EricClaeys
Update settings_RPiHQ.json.repo
149cf7b 
Added new and renamed settings.
@EricClaeys
Update settings_ZWO.json.repo
e321f5e 
Add new settings.  Changed names on others.
@EricClaeys
Update capture_RPiHQ.cpp
fc044bc 
Added many of the changes from the ZWO capture.cpp file to keep both files in better sync.

NOTE: I don't have an RPiHQ camera so was unable to test the new version.  It compiles, however.

NOTE: I suggest removing the unused code from capture.cpp (it's commented out).  It makes the file harder to read.
@EricClaeys
Update capture.cpp
f67fa12 
Lots of updates from Eric Claeys and Linda xxx
Workaround for ZWO auto exposure bug (included in #ifdef USE_HISTOGRAM blocks - on my default).
Improved exposure algorithm that decreases sensor temperature about 10 C.
Better exposure transition between day and night when gain is different.
Many new settings and many old ones changed names.  The recently submitted allsky-portal knows about these changes.
Lots of error checking.
Optionally displays "notification" images, like "Taking darks".
On user error, displays a message and waits for the user to fix it, rather than exiting, restarting, exiting, etc.
Gracefully exits when service sends SIGTERM signal.
Lots of comments and additional debugging code added (based on actual problems people had).
Handles dark frames better.
@thomasjacquin
Copy link
Collaborator

Thanks @EricClaeys and Linda. This is a pretty exciting update. Let me pull this locally and test on both the ZWO and RPiHQ setups and then I'll merge it to master.

@bbillp
Copy link

bbillp commented Aug 5, 2021 via email

@jcauthen78
Copy link

@bbillp - These are suggested/requested changes, they have not been put into the current live version yet. But hopefully soon if all the remaining testing goes well :)

@thomasjacquin thomasjacquin merged commit 0b7cc31 into AllskyTeam:master Aug 6, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@EricClaeys @thomasjacquin @bbillp @jcauthen78