From d47719a4438d8f2c426722c7341bbe527526a0f3 Mon Sep 17 00:00:00 2001
From: ehpersonal38 <103586016+ehpersonal38@users.noreply.github.com>
Date: Fri, 9 Jun 2023 18:01:49 -0400
Subject: [PATCH] make 2.4 the default model

---
 birdnet.conf-defaults      |  2 +-
 scripts/config.php         | 15 +++++++++------
 scripts/install_birdnet.sh |  2 +-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/birdnet.conf-defaults b/birdnet.conf-defaults
index 58a30fd..ee3c270 100644
--- a/birdnet.conf-defaults
+++ b/birdnet.conf-defaults
@@ -11,7 +11,7 @@ SITE_NAME=""
 #______________________used for detecting bird audio.__________________________#
 #_It's recommended that you only change these values through the web interface.#
 
-MODEL=BirdNET_6K_GLOBAL_MODEL
+MODEL=BirdNET_GLOBAL_6K_V2.4_Model_FP16
 SF_THRESH=0.03
 
 #--------------------- Required: Latitude, and Longitude ----------------------#
diff --git a/scripts/config.php b/scripts/config.php
index e8d422a..5172af2 100644
--- a/scripts/config.php
+++ b/scripts/config.php
@@ -366,7 +366,7 @@ function sendTestNotification(e) {
       <label for="model">Select a Model: </label>
       <select id="modelsel" name="model">
       <?php
-      $models = array("BirdNET_6K_GLOBAL_MODEL", "BirdNET_GLOBAL_6K_V2.4_Model_FP16");
+      $models = array("BirdNET_GLOBAL_6K_V2.4_Model_FP16", "BirdNET_6K_GLOBAL_MODEL");
       foreach($models as $modelName){
           $isSelected = "";
           if($config['MODEL'] == $modelName){
@@ -480,11 +480,14 @@ function runProcess() {
 </script>
 
       <dl>
-      <dt>BirdNET_6K_GLOBAL_MODEL (2020)</dt><br>
-      <dd id="ddnewline">This is the BirdNET-Lite model, with bird sound recognition for more than 6,000 species worldwide. This is the default option and will generally work very for people in most of the world.</dd>
-    <br>
-      <dt>BirdNET_GLOBAL_6K_V2.4_Model_FP16 (2023)</dt><br>
-      <dd id="ddnewline">This is the BirdNET-Analyzer model, a newer work-in-progress project with aims to improve on the BirdNET-Lite model. Currently it only supports about 3,500 species worldwide, meaning for some regions (North America, Europe, Australia) it will usually outperform the BirdNET-Lite model, but for other regions it will be worse.</dd><br>
+      <dt>BirdNET_GLOBAL_6K_V2.4_Model_FP16 (2023)</dt>
+      <br>
+      <dd id="ddnewline">This is the BirdNET-Analyzer model, the most advanced BirdNET model to date. Currently it  supports over 6,000 species worldwide, giving quite good species coverage for people in most of the world.</dd>
+      <br>
+      <dt>BirdNET_6K_GLOBAL_MODEL (2020)</dt>
+      <br>
+      <dd id="ddnewline">This is the BirdNET-Lite model, with bird sound recognition for more than 6,000 species worldwide. This has generally worse performance than the newer models but is kept as a legacy option.</dd>
+      <br>
       <dt>[ In-depth technical write-up on the models <a target="_blank" href="https://github.com/mcguirepr89/BirdNET-Pi/wiki/BirdNET-Pi:-some-theory-on-classification-&-some-practical-hints">here</a> ]</dt>
       </dl>
       </td></tr></table><br>
diff --git a/scripts/install_birdnet.sh b/scripts/install_birdnet.sh
index 598b224..74e4b42 100755
--- a/scripts/install_birdnet.sh
+++ b/scripts/install_birdnet.sh
@@ -37,6 +37,6 @@ install_birdnet
 
 cd $my_dir/scripts || exit 1
 
-./install_language_label.sh -l $DATABASE_LANG || exit 1
+./install_language_label_nm.sh -l $DATABASE_LANG || exit 1
 
 exit 0