Updated to ver 0.8 and other changes #423
Conversation
Implements notification images, reboots USB bus if camera isn't found, adds error checking.
Implements notification images. Allows users to specify via config file if bad images should be removed. Removed duplicate code. Added return code checks.
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.
Minor updates.
Implement notification images. Dark frame from "capture" is now called "dark.$EXTENSION" to distinguish from normal image. Used $IMG_PREFIX.
Does error checking on "convert". Lets user know if they've set DARK_FRAME_SUBTRACTION on but have no darks.
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.
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.
Added $DATE and $DIR for readability.
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.
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.
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.
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.
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.
Implement $ME. Remove unneeded double quotes in lftp. Removed "-u $USER,$PASSWORD" since it's not needed.
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.
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.
Includes new variables.
Added new and renamed settings.
Add new settings. Changed names on others.
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.
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.
Updated to ver 0.8 (should have been done in prior update). Mention allowing users to change timelapse bitrate. Other changes that were missed in prior update.
|
Eric, your I know submitting PRs is time consuming so let's find a way to do this more easily. |
|
Thomas,
That’s what I’ve been trying to tell you 😊 My GitHub web page says I am X commits ahead and Y commits behind yours, and I haven’t figured out how to fix that.
How do I keep that from happening?
Anyhow, I merged all 15 PRs into my master.
Should I delete my fork and all its branches (not sure how to do that, though)?
Eric
From: Thomas Jacquin ***@***.***>
Sent: Sunday, August 15, 2021 2:08 AM
To: thomasjacquin/allsky ***@***.***>
Cc: EricClaeys ***@***.***>; Author ***@***.***>
Subject: Re: [thomasjacquin/allsky] Updated to ver 0.8 and other changes (#423)
Eric, your master branch has diverged from the allsky master branch. Hence, all PRs based on it can't be automatically merged through GitHub (You can see that it includes 29 commits vs. only one commit when you do the PR on your repo).
If you're not using gitk or some git tree program, take a look at the network graph to see what's happening.
https://github.com/thomasjacquin/allsky/network
It's a common mistake (I've done this a lot in the past). It basically happens when you create a new branch off master but your master is older than the main repo. Things get out of sync and it results in merge conflicts.
I know submitting PRs is time consuming so let's find a way to do this more easily.
I'm proposing that you go ahead and merge your own PRs into your master branch. You can just use GitHub for that.
Once this is all merged, let me know and I will try to bring your changes into my repository.
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub <#423 (comment)> , or unsubscribe <https://github.com/notifications/unsubscribe-auth/AT2PYK5FQT5DNZOGTZQLQ4DT45RTVANCNFSM5CFSRRTA> .
Triage notifications on the go with GitHub Mobile for iOS <https://apps.apple.com/app/apple-store/id1477376905?ct=notification-email&mt=8&pt=524675> or Android <https://play.google.com/store/apps/details?id=com.github.android&utm_campaign=notification-email> . <https://github.com/notifications/beacon/AT2PYKYCT2SZLGBTHNPGA4TT45RTVA5CNFSM5CFSRRTKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOGWK4DRI.gif>
|
|
Alright Eric, I managed to pull your changes and merge them into From now on, make sure you're working from the latest code. I'm not sure how you pull the recent changes (GitHub or Git CLI). If you have the most recent version of the code, you can create patches that can be merged easily through a PR. If you've already made additional changes since yesterday, just Let me know if you have more questions. If that's easier, I can give you write access to my repository. That might be easier. |
|
Thanks much Thomas.
PR # 424 is still in your queue.
I accepted your invitations. I assume I can now create PRs on your branch, so mine isn’t needed? If that’s true, how do I delete mine?
The problem I’ve had ever since you merged Linda and my changes is that I’ve never known how to use GitHub to pull those changes back to my fork.
Eric
From: Thomas Jacquin ***@***.***>
Sent: Sunday, August 15, 2021 5:06 PM
To: thomasjacquin/allsky ***@***.***>
Cc: EricClaeys ***@***.***>; Author ***@***.***>
Subject: Re: [thomasjacquin/allsky] Updated to ver 0.8 and other changes (#423)
Alright Eric, I managed to pull your changes and merge them into master. There were a few merge conflicts because I had already applied your previous patch from You and Linda but your branch still had those changes as well (hence the large number of commits).
From now on, make sure you're working from the latest code. I'm not sure how you pull the recent changes (GitHub or Git CLI). If you have the most recent version of the code, you can create patches that can be merged easily through a PR.
If you've already made additional changes since yesterday, just git stash them first, update your code then git stash pop. (that's if you're using the command line).
Let me know if you have more questions. If that's easier, I can give you write access to my repository. That might be easier.
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub <#423 (comment)> , or unsubscribe <https://github.com/notifications/unsubscribe-auth/AT2PYK6BID6OGY7QSPI4WNTT5A23BANCNFSM5CFSRRTA> .
Triage notifications on the go with GitHub Mobile for iOS <https://apps.apple.com/app/apple-store/id1477376905?ct=notification-email&mt=8&pt=524675> or Android <https://play.google.com/store/apps/details?id=com.github.android&utm_campaign=notification-email> . <https://github.com/notifications/beacon/AT2PYK2FR2ILIKJH2OBXUYTT5A23BA5CNFSM5CFSRRTKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOGWLWXWA.gif>
|
|
I'm not too sure how to do it with GitHub but I can look into it. I usually just use the command line. I know I said it's best to create 1 PR per feature but since you're modifying the code on a regular basis, you can group some features together. I'll let you decide what's best. In general, large code changes are harder to merge in case of conflicts. |
|
Thomas, I didn't figure anything out... It's something you did that fixed my problems, but regardless, I'm glad it's working now. I haven't yet figured out how to put 2 or more changes into one PR. Once I do, I'll group features or at least put multiple files in the same feature into one PR. I assume you are reviewing my changes and if there's something you disagree with you'll let me know? |
|
I just added you as a collaborator on the project so now you have repo access (I assume fetch and pull access is what fixed it). I believe, if you keep committing onto the same branch, it all ends up in the same PR. Once the PR is merged and the branch deleted, you can create a new branch. However, that's how I do it inn the terminal. Not sure if the GitHub workflow is the same. |
Updated to ver 0.8 (should have been done in prior update).
Mention allowing users to change timelapse bitrate.
Other changes that were missed in prior update.