Skip to content

Commit

Permalink
Fixed camera auto detection code
Browse files Browse the repository at this point in the history
  • Loading branch information
thomasjacquin committed Nov 29, 2020
1 parent c35dd4d commit 425c907
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion allsky.sh
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ echo "Settings check done"
echo "CAMERA: ${CAMERA}"
echo "CAMERA_SETTINGS: ${CAMERA_SETTINGS}"
# save auto camera selection for the current session, will be read in "$ALLSKY_HOME/config.sh" file
echo "export CAMERA=$CAMERA" > "$CAMERA_SETTINGS_DIR/autocam.sh"
echo "export CAMERA=$CAMERA" > "$ALLSKY_HOME/autocam.sh"

# this must be called after camera autoselect
source $ALLSKY_HOME/scripts/filename.sh
Expand Down
Empty file modified autocam.sh
100644 → 100755
Empty file.
3 changes: 1 addition & 2 deletions config.sh.repo
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
# Choose between ZWO or RPiHQ or auto (prefers ZWO if present)
CAMERA="auto"


# Set to true to upload current image to your website
UPLOAD_IMG=false

Expand Down Expand Up @@ -66,6 +65,6 @@ CAMERA_SETTINGS_DIR="$ALLSKY_HOME"

if [[ $CAMERA -eq "auto" ]]; then
# restore currently saved autodiscovered camera mode if any
source "$CAMERA_SETTINGS_DIR/autocam.sh"
source "$ALLSKY_HOME/autocam.sh"
fi
CAMERA_SETTINGS="$CAMERA_SETTINGS_DIR/settings_$CAMERA.json"

0 comments on commit 425c907

Please sign in to comment.