From 45508000d15065535b409f49d31e7c3618996227 Mon Sep 17 00:00:00 2001 From: Patrick McGuire <60325264+mcguirepr89@users.noreply.github.com> Date: Wed, 19 Jan 2022 12:55:40 -0500 Subject: [PATCH 01/20] Update README.md --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index 2817d49..5bc64f2 100644 --- a/README.md +++ b/README.md @@ -107,7 +107,6 @@ and detection/database localization for the following languages: | Afrikaans | 5774 | 90.76% | | Catalan | 544 | 8.55% | | Chinese | 264 | 4.15% | -| Chinese (Traditional) | 295 | 4.64% | | Croatian | 370 | 5.82% | | Czech | 683 | 10.74% | | Danish | 460 | 7.23% | @@ -123,7 +122,6 @@ and detection/database localization for the following languages: | Japanese | 640 | 10.06% | | Latvian | 4821 | 75.78% | | Lithuanian | 597 | 9.38% | -| Northern Sami | 5605 | 88.10% | | Norwegian | 325 | 5.11% | | Polish | 265 | 4.17% | | Portuguese | 2742 | 43.10% | From 5807ea83ef8d83fb2eeb47b9218e842b9739890d Mon Sep 17 00:00:00 2001 From: Patrick McGuire <60325264+mcguirepr89@users.noreply.github.com> Date: Sat, 22 Jan 2022 17:19:49 -0500 Subject: [PATCH 02/20] Update birdnet_analysis.sh --- scripts/birdnet_analysis.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/birdnet_analysis.sh b/scripts/birdnet_analysis.sh index 80f49c2..33dae77 100755 --- a/scripts/birdnet_analysis.sh +++ b/scripts/birdnet_analysis.sh @@ -7,9 +7,10 @@ source /etc/birdnet/birdnet.conf # the birdnet.conf as it was the last time this script was called my_dir=$(realpath $(dirname $0)) if [ -z ${THIS_RUN} ];then THIS_RUN=/home/pi/BirdNET-Pi/thisrun.txt;fi +[ -f ${THIS_RUN} ] || touch ${THIS_RUN} && chmod g+w ${THIS_RUN} if [ -z ${LAST_RUN} ];then LAST_RUN=/home/pi/BirdNET-Pi/lastrun.txt;fi -if [ -z ${LATITUDE} ];then LATITUDE=-1;fi -if [ -z ${LONGITUDE} ];then LONGITUDE=-1;fi +[ -z ${LATITUDE} ] && echo "LATITUDE not set, exiting 1"; exit 1 +[ -z ${LONGITUDE} ] && echo "LONGITUDE not set, exiting 1"; exit 1 make_thisrun() { sleep .4 awk '!/#/ && !/^$/ {print}' /etc/birdnet/birdnet.conf \ From 96d783475ee775de22851a108c47439d6c40a348 Mon Sep 17 00:00:00 2001 From: Patrick McGuire <60325264+mcguirepr89@users.noreply.github.com> Date: Sat, 22 Jan 2022 17:49:23 -0500 Subject: [PATCH 03/20] Update birdnet_analysis.sh --- scripts/birdnet_analysis.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/birdnet_analysis.sh b/scripts/birdnet_analysis.sh index 33dae77..6ef2e24 100755 --- a/scripts/birdnet_analysis.sh +++ b/scripts/birdnet_analysis.sh @@ -9,8 +9,8 @@ my_dir=$(realpath $(dirname $0)) if [ -z ${THIS_RUN} ];then THIS_RUN=/home/pi/BirdNET-Pi/thisrun.txt;fi [ -f ${THIS_RUN} ] || touch ${THIS_RUN} && chmod g+w ${THIS_RUN} if [ -z ${LAST_RUN} ];then LAST_RUN=/home/pi/BirdNET-Pi/lastrun.txt;fi -[ -z ${LATITUDE} ] && echo "LATITUDE not set, exiting 1"; exit 1 -[ -z ${LONGITUDE} ] && echo "LONGITUDE not set, exiting 1"; exit 1 +[ -z ${LATITUDE} ] && echo "LATITUDE not set, exiting 1" && exit 1 +[ -z ${LONGITUDE} ] && echo "LONGITUDE not set, exiting 1" && exit 1 make_thisrun() { sleep .4 awk '!/#/ && !/^$/ {print}' /etc/birdnet/birdnet.conf \ From 9582fdb3201d77d4ce3d00f6bbccc70080b9295e Mon Sep 17 00:00:00 2001 From: Patrick McGuire <60325264+mcguirepr89@users.noreply.github.com> Date: Mon, 24 Jan 2022 09:01:02 -0500 Subject: [PATCH 04/20] Update install_services.sh --- scripts/install_services.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/install_services.sh b/scripts/install_services.sh index 0607af4..e9e4506 100755 --- a/scripts/install_services.sh +++ b/scripts/install_services.sh @@ -294,6 +294,7 @@ Requires=network-online.target [Service] Restart=always +RestartSec=3 Type=simple ExecStart=/bin/bash -c "/usr/bin/avahi-publish -a -R %I $(avahi-resolve -4 -n %H.local | cut -f 2)" From 927cc077cd61eab3215e3b73fea198d3aeb23aba Mon Sep 17 00:00:00 2001 From: Patrick McGuire <60325264+mcguirepr89@users.noreply.github.com> Date: Sun, 30 Jan 2022 11:26:42 -0500 Subject: [PATCH 05/20] Update install_birdnet.sh --- scripts/install_birdnet.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install_birdnet.sh b/scripts/install_birdnet.sh index e95ac05..16a821e 100755 --- a/scripts/install_birdnet.sh +++ b/scripts/install_birdnet.sh @@ -51,7 +51,7 @@ install_birdnet() { python3 -m venv birdnet source ./birdnet/bin/activate echo "Upgrading pip, wheel, and setuptools" - pip3 install --upgrade pip wheel setuptools + pip3 install --upgrade pip~=21.0.0 wheel setuptools python_version="$(awk -F. '{print $2}' <(ls -l $(which /usr/bin/python3)))" echo "python_version=${python_version}" # TFLite Pre-built binaires from https://github.com/PINTO0309/TensorflowLite-bin From a154f3746d98af9f1ec89a5f9ad6b8c43204db85 Mon Sep 17 00:00:00 2001 From: Patrick McGuire <60325264+mcguirepr89@users.noreply.github.com> Date: Wed, 9 Feb 2022 17:42:51 -0500 Subject: [PATCH 06/20] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 1db3c57..6af3f40 100644 --- a/README.md +++ b/README.md @@ -30,6 +30,7 @@ Currently listening in these countries . . . that I know of . . . - Sweden - Scotland - Norway +- England If your installation isn't in one of the countries listed above, please let me know so that I can add your country to the list! Let me know either in a GitHub issue, or [email me](mailto:mcguirepr89@gmail.com) and let me know where your BirdNET-Pi is listening. From 1c2a8bae4102b75f19052f5a053af2a3b9073ce0 Mon Sep 17 00:00:00 2001 From: Patrick McGuire <60325264+mcguirepr89@users.noreply.github.com> Date: Fri, 11 Feb 2022 09:38:49 -0500 Subject: [PATCH 07/20] Update LICENSE --- LICENSE | 680 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 679 insertions(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index a754123..a269ed0 100644 --- a/LICENSE +++ b/LICENSE @@ -369,7 +369,7 @@ Section 8 -- Interpretation. processes of any jurisdiction or authority. ============================================================================= -phpSysInfo uses the GNU General Public License v2.0 +phpSysInfo uses the General Public License v2.0 ============================================================================= @@ -943,6 +943,684 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +============================================================================= +Tiny File Manager is licensed under the GNU General Public License Version 3 +============================================================================= + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may 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. But first, please read +. ============================================================================= NoMachine is installed for personal use only. Please visit the link below to become familiar with the NoMachine v7 End User License Agreement. From cdad986a18483449471b40bbc2b295fa15ba5e5b Mon Sep 17 00:00:00 2001 From: mcguirepr89 Date: Fri, 11 Feb 2022 13:09:38 -0500 Subject: [PATCH 08/20] adding informative section in "System" > "Info" --- scripts/birdnet_analysis.sh | 2 +- scripts/extra_info.sh | 61 +++++++++++++++++++++++++++++++++++++ scripts/network_info.sh | 9 ------ templates/phpsysinfo.ini | 2 +- 4 files changed, 63 insertions(+), 11 deletions(-) create mode 100755 scripts/extra_info.sh delete mode 100755 scripts/network_info.sh diff --git a/scripts/birdnet_analysis.sh b/scripts/birdnet_analysis.sh index ebadfd4..aa04b7b 100755 --- a/scripts/birdnet_analysis.sh +++ b/scripts/birdnet_analysis.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # Runs BirdNET-Lite -set -x +#set -x source /etc/birdnet/birdnet.conf # Document this run's birdnet.conf settings # Make a temporary file to compare the current birdnet.conf with diff --git a/scripts/extra_info.sh b/scripts/extra_info.sh new file mode 100755 index 0000000..b54fc0c --- /dev/null +++ b/scripts/extra_info.sh @@ -0,0 +1,61 @@ +#!/usr/bin/env bash +#Display network info for phpsysinfo + +echo "........................................IPs....................................." +echo "LAN IP: $(hostname -I|cut -d' ' -f1)" +echo "Public IP: $(curl -s4 ifconfig.co)" +echo "..................................\`vcgencmd stats\`.............................." +sudo -upi vcgencmd get_throttled +hex=$(sudo -upi vcgencmd get_throttled|cut -d'x' -f2) +binary=$(echo "ibase=16;obase=2;$hex"|bc) +echo "Binary: $binary"; +revbinary=$(echo $binary|rev) +if echo $binary | grep 1 ;then + echo "ISSUES DETECTED" +fi +if [ ${revbinary:0:1} -eq 1 ];then + echo "Under-voltage detected" +fi +if [ ${revbinary:1:1} -eq 1 ];then + echo "Arm frequency capped" +fi +if [ ${revbinary:2:1} -eq 1 ];then + echo "Currently Throttled" +fi +if [ ${revbinary:3:1} -eq 1 ];then + echo "Soft temperatue limit active" +fi +if [ ${revbinary:16:1} -eq 1 ];then + echo "Under-voltage has occurred" +fi +if [ ${revbinary:17:1} -eq 1 ];then + echo "Arm frequency capping has occurred" +fi +if [ ${revbinary:18:1} -eq 1 ];then + echo "Throttling has occurred" +fi + +Bit Meaning +──── ──────────────────────────────────── + 0 Under-voltage detected + 1 Arm frequency capped + 2 Currently throttled + 3 Soft temperature limit active +16 Under-voltage has occurred +17 Arm frequency capping has occurred +18 Throttling has occurred +19 Soft temperature limit has occurred + + +echo "....................................Clock Speeds................................" +for i in arm core h264 isp v3d uart pwm emmc pixel vec hdmi dpi;do + echo -e "${i}:\t$(sudo -upi vcgencmd measure_clock ${i})" +done +echo "........................................Volts..................................." +for i in core sdram_c sdram_i sdram_p;do + echo -e "${i}:\t$(sudo -upi vcgencmd measure_volts ${i})" +done +echo ".....................................Caddyfile.................................." +cat /etc/caddy/Caddyfile +echo ".................................... Crontab...................................." +cat /etc/crontab | grep -ve '^#' diff --git a/scripts/network_info.sh b/scripts/network_info.sh deleted file mode 100755 index 77b81d6..0000000 --- a/scripts/network_info.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash -#Display network info for phpsysinfo - -echo "LAN IP: $(hostname -I|cut -d' ' -f1)" -echo "Public IP: $(curl -s4 ifconfig.co)" -echo -echo "------------------------------" -echo ' $(ip a) ' -ip a diff --git a/templates/phpsysinfo.ini b/templates/phpsysinfo.ini index ef29419..bdece8e 100644 --- a/templates/phpsysinfo.ini +++ b/templates/phpsysinfo.ini @@ -928,7 +928,7 @@ ACCESS="command" ; - "systeminfo" systeminfo command is run everytime the block gets refreshed or build (WinNT) ; -COMMAND="network_info.sh" +COMMAND="extra_info.sh" #COMMAND="cat" ; define COMMAND parameters (for command access) From 31aa8717d5013e65515cc90305e01764b6f80e38 Mon Sep 17 00:00:00 2001 From: mcguirepr89 Date: Fri, 11 Feb 2022 13:46:24 -0500 Subject: [PATCH 09/20] integrating birdnet_analysis and birdnet_server logs --- scripts/install_services.sh | 2 +- scripts/update_services.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install_services.sh b/scripts/install_services.sh index 2480021..fcdfb68 100755 --- a/scripts/install_services.sh +++ b/scripts/install_services.sh @@ -418,7 +418,7 @@ RestartSec=3 Type=simple User=${USER} Environment=TERM=xterm-256color -ExecStart=/usr/local/bin/gotty -p 8080 --title-format "BirdNET-Pi Log" journalctl -o cat -fu birdnet_server.service +ExecStart=/usr/local/bin/gotty -p 8080 --title-format "BirdNET-Pi Log" journalctl -o short -fu birdnet_server.service -u birdnet_analysis.service [Install] WantedBy=multi-user.target EOF diff --git a/scripts/update_services.sh b/scripts/update_services.sh index ce30fe4..9977b62 100755 --- a/scripts/update_services.sh +++ b/scripts/update_services.sh @@ -411,7 +411,7 @@ RestartSec=3 Type=simple User=${USER} Environment=TERM=xterm-256color -ExecStart=/usr/local/bin/gotty -p 8080 --title-format "BirdNET-Pi Log" journalctl -o cat -fu birdnet_server.service +ExecStart=/usr/local/bin/gotty -p 8080 --title-format "BirdNET-Pi Log" journalctl -o short -fu birdnet_server.service -u birdnet_analysis.service [Install] WantedBy=multi-user.target From c98cd4dad7cee60b3a5220330e327f6f5672c67a Mon Sep 17 00:00:00 2001 From: mcguirepr89 Date: Fri, 11 Feb 2022 13:49:38 -0500 Subject: [PATCH 10/20] removing unneeded hostname in journalctl logs --- scripts/install_services.sh | 2 +- scripts/update_services.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install_services.sh b/scripts/install_services.sh index fcdfb68..30c0cbd 100755 --- a/scripts/install_services.sh +++ b/scripts/install_services.sh @@ -418,7 +418,7 @@ RestartSec=3 Type=simple User=${USER} Environment=TERM=xterm-256color -ExecStart=/usr/local/bin/gotty -p 8080 --title-format "BirdNET-Pi Log" journalctl -o short -fu birdnet_server.service -u birdnet_analysis.service +ExecStart=/usr/local/bin/gotty -p 8080 --title-format "BirdNET-Pi Log" journalctl --no-hostname -o short -fu birdnet_server.service -u birdnet_analysis.service [Install] WantedBy=multi-user.target EOF diff --git a/scripts/update_services.sh b/scripts/update_services.sh index 9977b62..505b85d 100755 --- a/scripts/update_services.sh +++ b/scripts/update_services.sh @@ -411,7 +411,7 @@ RestartSec=3 Type=simple User=${USER} Environment=TERM=xterm-256color -ExecStart=/usr/local/bin/gotty -p 8080 --title-format "BirdNET-Pi Log" journalctl -o short -fu birdnet_server.service -u birdnet_analysis.service +ExecStart=/usr/local/bin/gotty -p 8080 --title-format "BirdNET-Pi Log" journalctl --no-hostname -o short -fu birdnet_server.service -u birdnet_analysis.service [Install] WantedBy=multi-user.target From 4724b1781fa5543a15f8eef1cdba9b79b0b89764 Mon Sep 17 00:00:00 2001 From: mcguirepr89 Date: Fri, 11 Feb 2022 14:37:28 -0500 Subject: [PATCH 11/20] now the birdnet_analysis waits for the socket --- scripts/birdnet_analysis.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/birdnet_analysis.sh b/scripts/birdnet_analysis.sh index aa04b7b..e77f853 100755 --- a/scripts/birdnet_analysis.sh +++ b/scripts/birdnet_analysis.sh @@ -124,6 +124,12 @@ run_analysis() { done fi + if ! grep 5050 <(netstat -tulpn 2>&1) &> /dev/null 2>&1;then + echo "Waiting for socket" + until grep 5050 <(netstat -tulpn 2>&1) &> /dev/null 2>&1;do + sleep 1 + done + fi if [ -f ${1}/${i} ] && [ ! -f ${INCLUDE_LIST} ] && [ ! -f ${EXCLUDE_LIST} ] && [ -z $BIRDWEATHER_ID ];then echo "python3 analyze.py \ --i "${1}/${i}" \ From 5025d56d585fee441945bc5388fe77fcda813def Mon Sep 17 00:00:00 2001 From: mcguirepr89 Date: Fri, 11 Feb 2022 14:51:01 -0500 Subject: [PATCH 12/20] typo --- scripts/extra_info.sh | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/scripts/extra_info.sh b/scripts/extra_info.sh index b54fc0c..e435360 100755 --- a/scripts/extra_info.sh +++ b/scripts/extra_info.sh @@ -12,27 +12,27 @@ echo "Binary: $binary"; revbinary=$(echo $binary|rev) if echo $binary | grep 1 ;then echo "ISSUES DETECTED" -fi -if [ ${revbinary:0:1} -eq 1 ];then - echo "Under-voltage detected" -fi -if [ ${revbinary:1:1} -eq 1 ];then - echo "Arm frequency capped" -fi -if [ ${revbinary:2:1} -eq 1 ];then - echo "Currently Throttled" -fi -if [ ${revbinary:3:1} -eq 1 ];then - echo "Soft temperatue limit active" -fi -if [ ${revbinary:16:1} -eq 1 ];then - echo "Under-voltage has occurred" -fi -if [ ${revbinary:17:1} -eq 1 ];then - echo "Arm frequency capping has occurred" -fi -if [ ${revbinary:18:1} -eq 1 ];then - echo "Throttling has occurred" + if [ ${revbinary:0:1} -eq 1 ];then + echo "Under-voltage detected" + fi + if [ ${revbinary:1:1} -eq 1 ];then + echo "Arm frequency capped" + fi + if [ ${revbinary:2:1} -eq 1 ];then + echo "Currently Throttled" + fi + if [ ${revbinary:3:1} -eq 1 ];then + echo "Soft temperatue limit active" + fi + if [ ${revbinary:16:1} -eq 1 ];then + echo "Under-voltage has occurred" + fi + if [ ${revbinary:17:1} -eq 1 ];then + echo "Arm frequency capping has occurred" + fi + if [ ${revbinary:18:1} -eq 1 ];then + echo "Throttling has occurred" + fi fi Bit Meaning From ede41085d32ea580dafaf095dc5837d0b9ad52c2 Mon Sep 17 00:00:00 2001 From: mcguirepr89 Date: Fri, 11 Feb 2022 14:51:55 -0500 Subject: [PATCH 13/20] wrong version last time --- scripts/extra_info.sh | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/scripts/extra_info.sh b/scripts/extra_info.sh index e435360..6ef5661 100755 --- a/scripts/extra_info.sh +++ b/scripts/extra_info.sh @@ -34,19 +34,6 @@ if echo $binary | grep 1 ;then echo "Throttling has occurred" fi fi - -Bit Meaning -──── ──────────────────────────────────── - 0 Under-voltage detected - 1 Arm frequency capped - 2 Currently throttled - 3 Soft temperature limit active -16 Under-voltage has occurred -17 Arm frequency capping has occurred -18 Throttling has occurred -19 Soft temperature limit has occurred - - echo "....................................Clock Speeds................................" for i in arm core h264 isp v3d uart pwm emmc pixel vec hdmi dpi;do echo -e "${i}:\t$(sudo -upi vcgencmd measure_clock ${i})" From 7c3bf4aaa48482cec23e5db9ab637d082ff6dfd3 Mon Sep 17 00:00:00 2001 From: mcguirepr89 Date: Fri, 11 Feb 2022 14:53:10 -0500 Subject: [PATCH 14/20] adding the 19th bit --- scripts/extra_info.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/extra_info.sh b/scripts/extra_info.sh index 6ef5661..dce9466 100755 --- a/scripts/extra_info.sh +++ b/scripts/extra_info.sh @@ -33,6 +33,9 @@ if echo $binary | grep 1 ;then if [ ${revbinary:18:1} -eq 1 ];then echo "Throttling has occurred" fi + if [ ${revbinary:19:1} -eq 1 ];then + echo "Soft temperature limit has occurred" + fi fi echo "....................................Clock Speeds................................" for i in arm core h264 isp v3d uart pwm emmc pixel vec hdmi dpi;do From 500419da0584cff94381643c4dc16eff0c249e67 Mon Sep 17 00:00:00 2001 From: mcguirepr89 Date: Fri, 11 Feb 2022 14:54:53 -0500 Subject: [PATCH 15/20] removed unneeded mountpoint from reporting --- templates/phpsysinfo.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/phpsysinfo.ini b/templates/phpsysinfo.ini index bdece8e..90bab10 100644 --- a/templates/phpsysinfo.ini +++ b/templates/phpsysinfo.ini @@ -335,7 +335,7 @@ SHOW_INODES=true ; Hide mounts ; Example : HIDE_MOUNTS="/home,/usr" ; -HIDE_MOUNTS="/boot,/run,/run/lock,/run/user/1000,/dev/shm" +HIDE_MOUNTS="/boot,/run,/run/lock,/run/user/1000,/dev/shm,/dev" ; Filesystem usage warning threshold in percent From 38bb74e895ca2ad9b8253092c854771fb75dccad Mon Sep 17 00:00:00 2001 From: mcguirepr89 Date: Fri, 11 Feb 2022 15:03:26 -0500 Subject: [PATCH 16/20] recording waits for socket --- scripts/birdnet_recording.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/birdnet_recording.sh b/scripts/birdnet_recording.sh index 4160123..92cc6f0 100755 --- a/scripts/birdnet_recording.sh +++ b/scripts/birdnet_recording.sh @@ -13,7 +13,11 @@ fi if pgrep arecord &> /dev/null ;then echo "Recording" else + until grep 5050 <(netstat -tulpn 2>&1);do + sleep 1 + done if [ -z ${REC_CARD} ];then + arecord -f S16_LE -c${CHANNELS} -r48000 -t wav --max-file-time ${RECORDING_LENGTH}\ --use-strftime ${RECS_DIR}/%B-%Y/%d-%A/%F-birdnet-${STAMP}.wav else From 9e03d3992d5b6b0d8e5789969e81eb97746c5568 Mon Sep 17 00:00:00 2001 From: mcguirepr89 Date: Fri, 11 Feb 2022 15:10:19 -0500 Subject: [PATCH 17/20] proper new badge --- homepage/images/version.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/homepage/images/version.svg b/homepage/images/version.svg index ad898e3..fd1be85 100644 --- a/homepage/images/version.svg +++ b/homepage/images/version.svg @@ -1 +1 @@ -version: 0.11.1version0.11.1 +version: 0.11.1version0.11.1 \ No newline at end of file From 220d5c44862694eab3e6546516522b1de08f195d Mon Sep 17 00:00:00 2001 From: mcguirepr89 Date: Fri, 11 Feb 2022 15:45:53 -0500 Subject: [PATCH 18/20] better logging --- scripts/birdnet_log.sh | 2 ++ scripts/install_services.sh | 2 +- scripts/update_services.sh | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100755 scripts/birdnet_log.sh diff --git a/scripts/birdnet_log.sh b/scripts/birdnet_log.sh new file mode 100755 index 0000000..df68b9c --- /dev/null +++ b/scripts/birdnet_log.sh @@ -0,0 +1,2 @@ +#!/usr/bin/env bash +journalctl -o short -fu birdnet_analysis -u birdnet_server | sed "s/$(date "+%b %d ")//g" diff --git a/scripts/install_services.sh b/scripts/install_services.sh index 30c0cbd..afeaf39 100755 --- a/scripts/install_services.sh +++ b/scripts/install_services.sh @@ -418,7 +418,7 @@ RestartSec=3 Type=simple User=${USER} Environment=TERM=xterm-256color -ExecStart=/usr/local/bin/gotty -p 8080 --title-format "BirdNET-Pi Log" journalctl --no-hostname -o short -fu birdnet_server.service -u birdnet_analysis.service +ExecStart=/usr/local/bin/gotty -p 8080 --title-format "BirdNET-Pi Log" birdnet_log.sh [Install] WantedBy=multi-user.target EOF diff --git a/scripts/update_services.sh b/scripts/update_services.sh index 505b85d..7e208c5 100755 --- a/scripts/update_services.sh +++ b/scripts/update_services.sh @@ -411,7 +411,7 @@ RestartSec=3 Type=simple User=${USER} Environment=TERM=xterm-256color -ExecStart=/usr/local/bin/gotty -p 8080 --title-format "BirdNET-Pi Log" journalctl --no-hostname -o short -fu birdnet_server.service -u birdnet_analysis.service +ExecStart=/usr/local/bin/gotty -p 8080 --title-format "BirdNET-Pi Log" birdnet_log.sh [Install] WantedBy=multi-user.target From 57f371461e835b7fc5909a4e24ef9d90144752cf Mon Sep 17 00:00:00 2001 From: Patrick McGuire <60325264+mcguirepr89@users.noreply.github.com> Date: Sat, 12 Feb 2022 09:29:45 -0500 Subject: [PATCH 19/20] Update viewdb.php --- scripts/viewdb.php | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/viewdb.php b/scripts/viewdb.php index cf6bafa..fa78751 100644 --- a/scripts/viewdb.php +++ b/scripts/viewdb.php @@ -36,7 +36,6 @@ $lasthourcount = $mysqli->query($sql3); $sql4 = "SELECT Com_Name, Date, Time, MAX(Confidence) FROM detections - WHERE Date = CURDATE() GROUP BY Com_Name ORDER BY MAX(Confidence) DESC"; $specieslist = $mysqli->query($sql4); From ec40ccac3aa7d859dc1b04e7a3929f063510c4f7 Mon Sep 17 00:00:00 2001 From: Patrick McGuire <60325264+mcguirepr89@users.noreply.github.com> Date: Sat, 12 Feb 2022 10:32:38 -0500 Subject: [PATCH 20/20] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 6af3f40..f4abe6c 100644 --- a/README.md +++ b/README.md @@ -46,6 +46,7 @@ If your installation isn't in one of the countries listed above, please let me k * MariaDB integration * NoMachine remote desktop (for personal use only) * Live audio stream +* Adminer database maintenance * Integrated phpSysInfo * New species mobile notifications from Pushed.co (for iOS users only) * Localization supported