Merge pull request #3218 from thomasjacquin/Point-Release-4

Point release 4

Author: EricClaeys

README.md

@@ -1,4 +1,4 @@
-# Allsky Camera ![Release](https://img.shields.io/badge/Version-v2023.05.01_03-green.svg) [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=MEBU2KN75G2NG&source=url)
+# Allsky Camera ![Release](https://img.shields.io/badge/Version-v2023.05.01_04-green.svg) [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=MEBU2KN75G2NG&source=url)
 
 This is the source code for the Allsky Camera project described [on Instructables](http://www.instructables.com/id/Wireless-All-Sky-Camera/).
    
@@ -21,9 +21,10 @@ You will need the following:
 
    
 > **NOTES:**
->	- Only the Raspberry Pi OS is supported.  Other operating systems like Ubuntu are NOT supported.
->	- The ZWO ASI120-series cameras are not recommended due to somewhat poor quality. See [Troubleshooting --> ZWO Cameras](https://htmlpreview.github.io/?https://raw.githubusercontent.com/thomasjacquin/allsky/master/html/documentation/troubleshooting/ZWOCameras.html) for notes on the ASI120-series and related T7 / T7C cameras.
->	- The Pi Zero with its limited memory and _very_ limited CPU power (single CPU core), is not recommended.  You will likely not be able to create keograms, startrails, or timelapse videos.
+>	- Only the Raspberry Pi OS is supported (Buster, Bullseye, or Bookworm).  Other operating systems like Ubuntu are NOT supported.
+> 	- **NOTE**: support for Buster is going away so please upgrade to Bookworm.
+>	- The ZWO ASI120-series cameras are not recommended due to somewhat poor quality and tendency to produce timeout errors. See [Troubleshooting --> ZWO Cameras](https://htmlpreview.github.io/?https://raw.githubusercontent.com/thomasjacquin/allsky/master/html/documentation/troubleshooting/ZWOCameras.html) for notes on the ASI120-series and related T7 / T7C cameras.
+>	- The Pi Zero with its limited memory and _very_ limited CPU power (single CPU core), is **not** recommended.  You will most likely not be able to create keograms, startrails, or timelapse videos.
 >	- The Pi Zero 2 with its limited memory and somewhat limited CPU power, is not recommended unless cost is the only concern.  Creating keograms, startrails, and timelapse videos may or may not be possible.
 >	- The Le Potato is the only "Pi-compatible" board that we've found to actually be compatible, so buyer beware.
 ---

allsky.sh

@@ -247,7 +247,7 @@ convert_json_to_tabs "${SETTINGS_FILE}" |
 # The preview mode does not work if we are started as a service or if the debian distribution has no desktop environment.
 [[ $1 == "preview" ]] && echo "-preview=1" >> "${ARGS_FILE}"
 
-echo "-version=$( get_version )" >> "${ARGS_FILE}"
+echo "-version=${ALLSKY_VERSION}" >> "${ARGS_FILE}"
 echo "-save_dir=${CAPTURE_SAVE_DIR}" >> "${ARGS_FILE}"
 
 FREQUENCY_FILE="${ALLSKY_TMP}/IMG_UPLOAD_FREQUENCY.txt"
@@ -265,7 +265,9 @@ CAPTURE="capture_${CAMERA_TYPE}"
 rm -f "${ALLSKY_NOTIFICATION_LOG}"	# clear out any notificatons from prior runs.
 
 # Clear up any flow timings
-"${ALLSKY_SCRIPTS}/flow-runner.py" --cleartimings
+activate_python_venv
+python3 "${ALLSKY_SCRIPTS}/flow-runner.py" --cleartimings
+deactivate_python_venv
 
 # Run the main program - this is the main attraction...
 # -cmd needs to come first since the capture_RPi code checks for it first.  It's ignored

config_repo/Makefile

@@ -78,9 +78,11 @@ install: createDirs $(CONFIGFILES)
 	@install -m 0644 allsky.service $(DESTDIR)$(sysconfdir)/systemd/system/
 	@rm -f allsky.service
 	@echo `date +%F\ %R:%S` Setting up home environment variable...
-	@echo -e "export ALLSKY_TMP=/tmp\nexport ALLSKY_CONFIG=$(DESTDIR)$(sysconfdir)/allsky\nexport ALLSKY_SCRIPTS=$(DESTDIR)$(libexecdir)\nexport ALLSKY_NOTIFICATION_IMAGES=$(DESTDIR)$(sharedir)\nexport ALLSKY_IMAGES=/home/allsky/images/" > $(DESTDIR)$(sysconfdir)/profile.d/allsky.sh
+	@echo "export ALLSKY_TMP=/tmp\nexport ALLSKY_CONFIG=$(DESTDIR)$(sysconfdir)/allsky\nexport ALLSKY_SCRIPTS=$(DESTDIR)$(libexecdir)\nexport ALLSKY_NOTIFICATION_IMAGES=$(DESTDIR)$(sharedir)\nexport ALLSKY_IMAGES=/home/allsky/images/\nPATH=${PATH}:${DESTDIR}$(libexedir)" > $(DESTDIR)$(sysconfdir)/profile.d/allsy.sh
+
+
+else # Not in package build mode ######################################
 
-else # Not in package build mode
 remove_configs:
 	@echo `date +%F\ %R:%S` Removing config path and files ../config
 	@rm -rf ../config
@@ -122,8 +124,8 @@ install: createDirs $(CONFIGFILES)
 	@systemctl daemon-reload
 	@systemctl enable allsky
 	@systemctl enable allskyperiodic
-	@echo `date +%F\ %R:%S` Setting up home environment variable...
-	@echo "export ALLSKY_HOME=$(HOMEDIR)" > $(DESTDIR)$(sysconfdir)/profile.d/allsky.sh
+	@echo `date +%F\ %R:%S` Setting up ALLSKY_HOME environment variable...
+	@echo "export ALLSKY_HOME=$(HOMEDIR)\nPATH=${PATH}:$(SCRIPTSDIR)" > $(DESTDIR)$(sysconfdir)/profile.d/allsky.sh
 .PHONY : install
 endif # Package build check
 endif # Root check

config_repo/config.sh.repo

@@ -60,7 +60,7 @@ TIMELAPSEWIDTH=0
 TIMELAPSEHEIGHT=0
 
 # Bitrate of the timelapse video.
-TIMELAPSE_BITRATE="2000k"
+TIMELAPSE_BITRATE="5000k"
 
 # Timelapse video Frames Per Second.
 FPS=25
@@ -102,7 +102,7 @@ TIMELAPSE_MINI_FREQUENCY=5
 TIMELAPSE_MINI_UPLOAD_VIDEO="true"
 TIMELAPSE_MINI_UPLOAD_THUMBNAIL="true"
 TIMELAPSE_MINI_FPS=5
-TIMELAPSE_MINI_BITRATE="1000k"
+TIMELAPSE_MINI_BITRATE="2000k"
 TIMELAPSE_MINI_WIDTH=1014
 TIMELAPSE_MINI_HEIGHT=760
 

config_repo/lighttpd.conf.repo

@@ -4,8 +4,8 @@ server.document-root        = "XX_ALLSKY_WEBUI_XX"
 server.upload-dirs          = ( "/var/cache/lighttpd/uploads" )
 server.errorlog             = "/var/log/lighttpd/error.log"
 server.pid-file             = "/var/run/lighttpd.pid"
-server.username             = "www-data"
-server.groupname            = "www-data"
+#server.username             = "www-data"
+#server.groupname            = "www-data"
 server.port                 = 80
 server.tag                  = "Allsky"