diff --git a/LICENSE b/LICENSE index a269ed0..b1123ac 100644 --- a/LICENSE +++ b/LICENSE @@ -713,7 +713,7 @@ consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. ============================================================================= -Caddy, and Adminer use the Apache License Version 2.0 +Caddy, ,Streamlit, and Adminer use the Apache License Version 2.0 ============================================================================= Apache License Version 2.0, January 2004 diff --git a/README.md b/README.md index 23abdba..22f5cc9 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@

- BirdNET-Pi + BirdNET-Pi

A realtime acoustic bird classification system for the Raspberry Pi 4B @@ -47,12 +47,11 @@ If your installation isn't in one of the countries listed above, please let me k * FTP server included * Automatic extraction of detected data (creating audio clips of detected bird sounds) * Spectrograms available for all extractions -* MariaDB integration -* NoMachine remote desktop (for personal use only) +* SQLite3 Database * Live audio stream * Adminer database maintenance -* Integrated phpSysInfo -* New species mobile notifications from Pushed.co (for iOS users only) +* [phpSysInfo](https://github.com/phpsysinfo/phpsysinfo) +* New species mobile notifications from [Pushed.co](https://pushed.co/quick-start-guide) (for iOS users only) * Localization supported ## Requirements @@ -65,7 +64,7 @@ If your installation isn't in one of the countries listed above, please let me k The system can be installed with: ``` -curl -s https://raw.githubusercontent.com/mcguirepr89/BirdNET-Pi/main/newinstaller.sh | bash | tee -a installation.log 2>&1 && sudo reboot +curl -s https://raw.githubusercontent.com/mcguirepr89/BirdNET-Pi/main/newinstaller.sh | bash ``` The installer takes care of any and all necessary updates, so you can run that as the very first command upon the first boot, if you'd like. diff --git a/birdnet.conf-defaults b/birdnet.conf-defaults index 0513576..820eaf1 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____________# @@ -28,14 +25,6 @@ BIRDWEATHER_ID= CADDY_PWD= -#------------------------- MariaDB User Passwords ---------------------------# -#_____________The variable below sets the password for the_____________________# -#_______________________'birder' user on the MariaDB___________________________# - -## DB_PWD is for the 'birder' user. The shell substitution below sets a random -## password for you during installation. -DB_PWD=$(< /dev/urandom tr -dc _A-Z-a-z-0-9 | head -c${1:-32};echo;) - #------------------------- Live Audio Stream --------------------------------# #_____________The variable below configures/enables the live___________________# #_____________________________audio stream.____________________________________# @@ -84,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. @@ -118,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. @@ -150,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. @@ -185,18 +145,4 @@ 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 +IDFILE=/home/pi/BirdNET-Pi/IdentifiedSoFar.txt diff --git a/homepage/external.html b/homepage/external.html deleted file mode 100644 index ec8343d..0000000 --- a/homepage/external.html +++ /dev/null @@ -1,60 +0,0 @@ - - -HTML Frames Example - Content - - - -tbc.... -

Thanks

-stefan kahl -patrick mcguire -

Similar Systems

-

Technical Details

-machine learning -deep learning -

Used Tools

-SoX -ffmpeg -Python -Tensorfflow (Lite) -Rasberian OS -

Disclaimer

-

Other Systems

-links to other systems - - - -

Content

-

Replacing the Contents of the Current Frame

-

Clicking on these links will open the new page within the current frame.

- - -

Replacing the Whole Frameset

-

When you click on any of the following links, the whole frameset is replaced with the new website. This is because we're using target="_top" in the anchor links.

- - -

Open a New Window

-

These links open in a new browser window. This is because we use target="_blank".

- - - - \ No newline at end of file diff --git a/homepage/footer.html b/homepage/footer.html deleted file mode 100644 index 9741849..0000000 --- a/homepage/footer.html +++ /dev/null @@ -1,22 +0,0 @@ - - -HTML Frames Example - Footer - - - -

Play Live Audio

-

- - diff --git a/homepage/images/grey-cardinal.png b/homepage/images/grey-cardinal.png deleted file mode 100644 index edcdff7..0000000 Binary files a/homepage/images/grey-cardinal.png and /dev/null differ diff --git a/homepage/images/menu.png b/homepage/images/menu.png new file mode 100644 index 0000000..8c03aff Binary files /dev/null and b/homepage/images/menu.png differ diff --git a/homepage/images/red-cardinal.png b/homepage/images/red-cardinal.png deleted file mode 100644 index 83654f2..0000000 Binary files a/homepage/images/red-cardinal.png and /dev/null differ diff --git a/homepage/images/red-cardinal32.png b/homepage/images/red-cardinal32.png deleted file mode 100644 index 4675524..0000000 Binary files a/homepage/images/red-cardinal32.png and /dev/null differ diff --git a/homepage/images/version.svg b/homepage/images/version.svg index fd1be85..df1dcf8 100644 --- a/homepage/images/version.svg +++ b/homepage/images/version.svg @@ -1 +1 @@ -version: 0.11.1version0.11.1 \ No newline at end of file +Version: 0.13Version0.13 \ No newline at end of file diff --git a/homepage/index.html b/homepage/index.html deleted file mode 100644 index a1294b0..0000000 --- a/homepage/index.html +++ /dev/null @@ -1,42 +0,0 @@ - - - - - BirdNET-Pi - - - - - - - - - - - - - - - - <p>This section (everything between the 'noframes' tags) will only be displayed if the users' browser doesn't support frames. You can provide a link to a non-frames version of the website here. Feel free to use HTML tags within this section.</p> - - - - diff --git a/homepage/index.php b/homepage/index.php new file mode 100644 index 0000000..98df2b4 --- /dev/null +++ b/homepage/index.php @@ -0,0 +1,66 @@ +BirdNET-Pi + + + + +"; + } else { + header('WWW-Authenticate: Basic realm="My Realm"'); + header('HTTP/1.0 401 Unauthorized'); + echo 'You cannot listen to the live audio stream'; + exit; + } + } +} else { + echo " +
+ +
+ +

BirdNET-Pi

+"; +} +if(isset($_GET['log'])) { + if (file_exists('/home/pi/BirdNET-Pi/thisrun.txt')) { + header("Location: /log");} +} elseif(isset($_GET['spectrogram'])){ + header("Location: /spectrogram.php"); +} else { + echo " +