diff --git a/README.md b/README.md index ffbb343..b750d8f 100644 --- a/README.md +++ b/README.md @@ -66,7 +66,7 @@ Currently listening in these countries . . . that I know of . . . * **Automatic extraction and cataloguing** of bird sounds * **Tools to visualize your recorded bird data** and analyze trends * **Live audio stream and spectrogram** -* **Automatic disk space management** that periodically purges old audio files to manage disk space +* **Automatic disk space management** that periodically purges old audio files * [BirdWeather](https://app.birdweather.com) integration -- you can request a BirdWeather ID from BirdNET-Pi's "Tools" > "Settings" page * Web interface access to all data and logs provided by [Caddy](https://caddyserver.com) * [GoTTY](https://github.com/yudai/gotty) Web Terminal diff --git a/birdnet.conf-defaults b/birdnet.conf-defaults index 03ca9f5..58a30fd 100644 --- a/birdnet.conf-defaults +++ b/birdnet.conf-defaults @@ -78,6 +78,7 @@ APPRISE_WEEKLY_REPORT=1 APPRISE_NOTIFY_NEW_SPECIES_EACH_DAY=0 APPRISE_MINIMUM_SECONDS_BETWEEN_NOTIFICATIONS_PER_SPECIES=0 APPRISE_ONLY_NOTIFY_SPECIES_NAMES="" +APPRISE_ONLY_NOTIFY_SPECIES_NAMES_2="" #---------------------- Flickr Images API Configuration -----------------------# ## If FLICKR_API_KEY is set, the web interface will try and display bird images diff --git a/model/BirdNET_GLOBAL_3K_V2.2_MData_Model_FP16.tflite b/model/BirdNET_GLOBAL_3K_V2.2_MData_Model_FP16.tflite deleted file mode 100644 index 6dc8b26..0000000 Binary files a/model/BirdNET_GLOBAL_3K_V2.2_MData_Model_FP16.tflite and /dev/null differ diff --git a/model/BirdNET_GLOBAL_3K_V2.2_Model_FP16.tflite b/model/BirdNET_GLOBAL_3K_V2.2_Model_FP16.tflite deleted file mode 100644 index c9b6ac4..0000000 Binary files a/model/BirdNET_GLOBAL_3K_V2.2_Model_FP16.tflite and /dev/null differ diff --git a/model/BirdNET_GLOBAL_3K_V2.3_MData_Model_FP16.tflite b/model/BirdNET_GLOBAL_3K_V2.3_MData_Model_FP16.tflite new file mode 100644 index 0000000..097e181 Binary files /dev/null and b/model/BirdNET_GLOBAL_3K_V2.3_MData_Model_FP16.tflite differ diff --git a/model/BirdNET_GLOBAL_3K_V2.3_Model_FP16.tflite b/model/BirdNET_GLOBAL_3K_V2.3_Model_FP16.tflite new file mode 100644 index 0000000..4b0b022 Binary files /dev/null and b/model/BirdNET_GLOBAL_3K_V2.3_Model_FP16.tflite differ diff --git a/model/labels_nm.zip b/model/labels_nm.zip index 72570ea..d528775 100644 Binary files a/model/labels_nm.zip and b/model/labels_nm.zip differ diff --git a/scripts/config.php b/scripts/config.php index 042a866..0dcdbe5 100644 --- a/scripts/config.php +++ b/scripts/config.php @@ -54,6 +54,7 @@ if(isset($_GET["latitude"])){ $model = $_GET["model"]; $sf_thresh = $_GET["sf_thresh"]; $only_notify_species_names = $_GET['only_notify_species_names']; + $only_notify_species_names_2 = $_GET['only_notify_species_names_2']; if(isset($_GET['apprise_notify_each_detection'])) { $apprise_notify_each_detection = 1; @@ -120,7 +121,7 @@ if(isset($_GET["latitude"])){ // Archive old language file syslog_shell_exec("cp -f $home/BirdNET-Pi/model/labels.txt $home/BirdNET-Pi/model/labels.txt.old", $user); - if($model == "BirdNET_GLOBAL_3K_V2.2_Model_FP16"){ + if($model == "BirdNET_GLOBAL_3K_V2.3_Model_FP16"){ // Install new language label file syslog_shell_exec("sudo chmod +x $home/BirdNET-Pi/scripts/install_language_label_nm.sh && $home/BirdNET-Pi/scripts/install_language_label_nm.sh -l $language", $user); } else { @@ -150,6 +151,7 @@ if(isset($_GET["latitude"])){ $contents = preg_replace("/MODEL=.*/", "MODEL=$model", $contents); $contents = preg_replace("/SF_THRESH=.*/", "SF_THRESH=$sf_thresh", $contents); $contents = preg_replace("/APPRISE_ONLY_NOTIFY_SPECIES_NAMES=.*/", "APPRISE_ONLY_NOTIFY_SPECIES_NAMES=\"$only_notify_species_names\"", $contents); + $contents = preg_replace("/APPRISE_ONLY_NOTIFY_SPECIES_NAMES_2=.*/", "APPRISE_ONLY_NOTIFY_SPECIES_NAMES_2=\"$only_notify_species_names_2\"", $contents); $contents2 = file_get_contents("./scripts/thisrun.txt"); $contents2 = preg_replace("/SITE_NAME=.*/", "SITE_NAME=\"$site_name\"", $contents2); @@ -169,6 +171,7 @@ if(isset($_GET["latitude"])){ $contents2 = preg_replace("/MODEL=.*/", "MODEL=$model", $contents2); $contents2 = preg_replace("/SF_THRESH=.*/", "SF_THRESH=$sf_thresh", $contents2); $contents2 = preg_replace("/APPRISE_ONLY_NOTIFY_SPECIES_NAMES=.*/", "APPRISE_ONLY_NOTIFY_SPECIES_NAMES=\"$only_notify_species_names\"", $contents2); + $contents2 = preg_replace("/APPRISE_ONLY_NOTIFY_SPECIES_NAMES_2=.*/", "APPRISE_ONLY_NOTIFY_SPECIES_NAMES_2=\"$only_notify_species_names_2\"", $contents2); @@ -325,7 +328,7 @@ if (!isset($_SERVER['PHP_AUTH_USER'])) { diff --git a/scripts/system_controls.php b/scripts/system_controls.php index cf3dafb..067b314 100644 --- a/scripts/system_controls.php +++ b/scripts/system_controls.php @@ -44,4 +44,12 @@ function update() {
+ +



Running version:

+ +

+
diff --git a/scripts/todays_detections.php b/scripts/todays_detections.php index 69f1e29..1965313 100644 --- a/scripts/todays_detections.php +++ b/scripts/todays_detections.php @@ -230,6 +230,7 @@ if(isset($_GET['ajax_detections']) && $_GET['ajax_detections'] == "true" ) { $comname = preg_replace('/ /', '_', $todaytable['Com_Name']); $comname = preg_replace('/\'/', '_', $comname); $filename = "/By_Date/".date('Y-m-d')."/".$comname."/".$todaytable['File_Name']; + $filename_formatted = $todaytable['Date']."/".$comname."/".$todaytable['File_Name']; $sciname = preg_replace('/ /', '_', $todaytable['Sci_Name']); $args = "&license=2%2C3%2C4%2C5%2C6%2C9&orientation=square,portrait"; $comnameprefix = "%20bird"; @@ -308,7 +309,9 @@ if(isset($_GET['ajax_detections']) && $_GET['ajax_detections'] == "true" ) { ?> - + + +
@@ -419,8 +422,8 @@ die();
- +

@@ -431,6 +434,25 @@ die();