diff --git a/birdnet.conf-defaults b/birdnet.conf-defaults index afe90b3..01a857a 100644 --- a/birdnet.conf-defaults +++ b/birdnet.conf-defaults @@ -4,13 +4,10 @@ #--------------------- Required: Latitude, and Longitude ----------------------# -## The shell substitution below guesses these based on your network. THESE NEED -## TO BE CHANGED TO STATIC VALUES ## Please only go to 4 decimal places. Example:43.3984 -LATITUDE="$(curl -s4 ifconfig.co/json | awk '/lat/ {print $2}' | tr -d ',')" -LONGITUDE="$(curl -s4 ifconfig.co/json | awk '/lon/ {print $2}' | tr -d ',')" - +LATITUDE= +LONGITUDE= #--------------------- BirdWeather Station Information -----------------------# #_____________The variable below can be set to have your BirdNET-Pi____________# @@ -76,24 +73,6 @@ PUSHED_APP_SECRET= RECS_DIR=/home/pi/BirdSongs - -#------------------------------ Extraction Service ---------------------------# - -## DO_EXTRACTIONS is simply a setting for enabling the extraction.service. -## Set this to Y or y to enable extractions. - -DO_EXTRACTIONS=y - -#----------------------------- Recording Service ----------------------------# -#____________________The variable below can be set to enable __________________# -#________________________the birdnet_recording.service ________________________# - -## DO_RECORDING is simply a setting for enabling the 24/7 -## birdnet_recording.service. -## Set this to Y or y to enable recording. - -DO_RECORDING=y - ## REC_CARD is the sound card you would want the birdnet_recording.service to ## use. Leave this as "default" to use PulseAudio (recommended), or use ## the output from "aplay -L" to specify an ALSA device. @@ -110,12 +89,6 @@ PROCESSED=${RECS_DIR}/Processed EXTRACTED=${RECS_DIR}/Extracted -## IDFILE is the file that keeps a complete list of every spececies that -## BirdNET has identified from your data-set. It is a relic and not really -## used anymore. - -IDFILE=${HOME}/BirdNET-Pi/IdentifiedSoFar.txt - ## OVERLAP is the value in seconds which BirdNET should use when analyzing ## the data. The values must be between 0.0-2.9. @@ -142,11 +115,6 @@ CHANNELS=2 FULL_DISK=purge -## VENV is the python virtual environment wherein all modules and site-packages -## have been installed. - -VENV=/home/pi/BirdNET-Pi/birdnet - ## RECORDING_LENGTH sets the length of the recording that BirdNET-Lite will ## analyze. @@ -177,18 +145,3 @@ BIRDNET_USER=pi ## These are just for debugging LAST_RUN= THIS_RUN= - -## DEPRECATED -#------------------------------- NoMachine ----------------------------------# -#_____________The variable below can be set include NoMachine__________________# -#_________________remote desktop software to be installed._____________________# - -# Keep this EMPTY if you do not want to install NoMachine. # - -## INSTALL_NOMACHINE is simply a setting that can be enabled to install -## NoMachine alongside the BirdNET-Pi for remote desktop access. This in- -## staller assumes personal use. Please reference the LICENSE file included -## in this repository for more information. -## Set this to Y or y to install NoMachine alongside the BirdNET-Lite - -INSTALL_NOMACHINE=y diff --git a/scripts/install_config.sh b/scripts/install_config.sh index 5c9fd16..efdbb13 100755 --- a/scripts/install_config.sh +++ b/scripts/install_config.sh @@ -20,9 +20,8 @@ install_config() { ## TO BE CHANGED TO STATIC VALUES ## Please only go to 4 decimal places. Example:43.3984 -LATITUDE="$(curl -s4 ifconfig.co/json | awk '/lat/ {print $2}' | tr -d ',')" -LONGITUDE="$(curl -s4 ifconfig.co/json | awk '/lon/ {print $2}' | tr -d ',')" - +LATITUDE=$(curl -s4 ifconfig.co/json | awk '/lat/ {print $2}' | tr -d ',') +LONGITUDE=$(curl -s4 ifconfig.co/json | awk '/lon/ {print $2}' | tr -d ',') #--------------------- BirdWeather Station Information -----------------------# #_____________The variable below can be set to have your BirdNET-Pi____________# @@ -88,24 +87,6 @@ PUSHED_APP_SECRET= RECS_DIR=/home/pi/BirdSongs - -#------------------------------ Extraction Service ---------------------------# - -## DO_EXTRACTIONS is simply a setting for enabling the extraction.service. -## Set this to Y or y to enable extractions. - -DO_EXTRACTIONS=y - -#----------------------------- Recording Service ----------------------------# -#____________________The variable below can be set to enable __________________# -#________________________the birdnet_recording.service ________________________# - -## DO_RECORDING is simply a setting for enabling the 24/7 -## birdnet_recording.service. -## Set this to Y or y to enable recording. - -DO_RECORDING=y - ## REC_CARD is the sound card you would want the birdnet_recording.service to ## use. Leave this as "default" to use PulseAudio (recommended), or use ## the output from "aplay -L" to specify an ALSA device. @@ -116,17 +97,11 @@ REC_CARD=default ## after extractions have been made from them. This includes both WAVE and ## BirdNET.selection.txt files. -PROCESSED=${RECS_DIR}/Processed +PROCESSED=/home/pi/BirdSongs/Processed ## EXTRACTED is the directory where the extracted audio selections are moved. -EXTRACTED=${RECS_DIR}/Extracted - -## IDFILE is the file that keeps a complete list of every spececies that -## BirdNET has identified from your data-set. It is a relic and not really -## used anymore. - -IDFILE=${HOME}/BirdNET-Pi/IdentifiedSoFar.txt +EXTRACTED=/home/pi/BirdSongs/Extracted ## OVERLAP is the value in seconds which BirdNET should use when analyzing ## the data. The values must be between 0.0-2.9. @@ -154,11 +129,6 @@ CHANNELS=2 FULL_DISK=purge -## VENV is the python virtual environment wherein all modules and site-packages -## have been installed. - -VENV=/home/pi/BirdNET-Pi/birdnet - ## RECORDING_LENGTH sets the length of the recording that BirdNET-Lite will ## analyze.