diff --git a/luci-app-beardropper/LICENSE b/luci-app-beardropper/LICENSE deleted file mode 100644 index e963df829..000000000 --- a/luci-app-beardropper/LICENSE +++ /dev/null @@ -1,622 +0,0 @@ - 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 - diff --git a/luci-app-beardropper/Makefile b/luci-app-beardropper/Makefile deleted file mode 100644 index bbdbdcc0e..000000000 --- a/luci-app-beardropper/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# -# Copyright (C) 2020 Nate Ding -# -# This is free software, licensed under the GNU General Public License v3. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -LUCI_Title:=LuCI Support for BearDropper -LUCI_PKGARCH=all - -PKG_VERSION:=1.1 -PKG_RELEASE:=20200522 - -PKG_MAINTANINER:=Nate Ding -PKG_LICENSE:=GLPv3 -PKG_LICENSE_FILES:=LICENSE - -include $(TOPDIR)/feeds/luci/luci.mk - -# call BuildPackage - OpenWrt buildroot signature diff --git a/luci-app-beardropper/README.md b/luci-app-beardropper/README.md deleted file mode 100644 index efb0e2232..000000000 --- a/luci-app-beardropper/README.md +++ /dev/null @@ -1,59 +0,0 @@ -luci-app-beardropper -=== - -[Preview][preview] ---- -luci-app-beardropper, a log examination script w/ iptables firewall rule generation response. - - This is the LuCI app built for the elegant firewall rule generation on-the-fly script [bearDropper][bearDropper], only a few modifications were made to work with Luci. - - - -Targets/Devices ---- -Written in shell scripts, so it shall work all good on all devices. - - -Config ---- -The config file path is: `/etc/config/beardropper` and this is the uci configuration format. - - - -Compile ---- -RECOMMENDED!!!! (推荐使用右边的feeds---->)You can use [natelol feeds][feeds] - - -OR - - -0. Go under `openwrt/` - -1. Make your own local feeds, say a folder `mkdir yourfeeds` - -2. Clone master under feeds to have `git clone https://github.com/natelol/luci-app-beardropper yourefeeds/luci-app-beardropper` - -3. Append `src-link yourfeeds /path/to/openwrt/yourfeeds` in the file `openwrt/feeds.conf(.default)` - -4. Run following scripts under `openwrt`: - -```bash -# Update feeds -./scripts/feeds update -a -./scripts/feeds install -a - -# M select luci-app-beardropper in LuCI -> 3. Applications also 2. Modules->Translations if you want translations together -make menuconfig -# compile -make package/feeds/luci-app-beardropper/compile V=99 -``` - -Logs ---- -`2020-05-21` Added a new tab listing the blocked IPs. - - - [preview]: https://github.com/natelol/luci-app-beardropper/tree/master/preview - [bearDropper]: https://github.com/robzr/bearDropper - [feeds]: https://github.com/natelol/natelol \ No newline at end of file diff --git a/luci-app-beardropper/luasrc/controller/beardropper.lua b/luci-app-beardropper/luasrc/controller/beardropper.lua deleted file mode 100755 index c28f0b348..000000000 --- a/luci-app-beardropper/luasrc/controller/beardropper.lua +++ /dev/null @@ -1,19 +0,0 @@ -module("luci.controller.beardropper", package.seeall) - -function index() - if not nixio.fs.access("/etc/config/beardropper") then - return - end - entry({"admin", "services", "beardropper"}, alias("admin", "services", "beardropper", "setting"),_("BearDropper"), 20).dependent = true - entry({"admin", "services", "beardropper", "status"}, call("act_status")) - entry({"admin", "services", "beardropper", "setting"}, cbi("beardropper/setting"), _("Setting"), 30).leaf= true - entry({"admin", "services", "beardropper", "log"}, form("beardropper/log"),_("Log"),40).leaf= true - --entry: -end - -function act_status() - local e={} - e.running = luci.sys.call("pgrep -f /usr/sbin/beardropper >/dev/null")==0 - luci.http.prepare_content("application/json") - luci.http.write_json(e) -end \ No newline at end of file diff --git a/luci-app-beardropper/luasrc/model/cbi/beardropper/log.lua b/luci-app-beardropper/luasrc/model/cbi/beardropper/log.lua deleted file mode 100644 index c725bcdf0..000000000 --- a/luci-app-beardropper/luasrc/model/cbi/beardropper/log.lua +++ /dev/null @@ -1,17 +0,0 @@ -f = SimpleForm("logview") -f.reset = false -f.submit = false -t = f:field(TextValue, "conf") -t.rmempty = true -t.rows = 20 -function t.cfgvalue() -local logs = luci.util.execi("logread | grep authpriv | grep beardropper") -local s = "" -for line in logs do -s = line .. "\n" .. s -end -return s -end -t.readonly="readonly" - -return f diff --git a/luci-app-beardropper/luasrc/model/cbi/beardropper/setting.lua b/luci-app-beardropper/luasrc/model/cbi/beardropper/setting.lua deleted file mode 100755 index 2735200bf..000000000 --- a/luci-app-beardropper/luasrc/model/cbi/beardropper/setting.lua +++ /dev/null @@ -1,54 +0,0 @@ - -m = Map("beardropper", translate("BearDropper"), -translate("luci-app-beardropper, the LuCI app built with the elegant firewall rule generation on-the-fly script bearDropper.

Should you have any questions, please refer to the repo: ")..[[luci-app-beardropper]] -) -m:chain("luci") - -m:section(SimpleSection).template="beardropper/status" - -s = m:section(TypedSection, "beardropper", translate("")) -s.anonymous = true -s.addremove = false - --- TABS -s:tab("options", translate("Options")) -s:tab("blocked", translate("Blocked IP")) - -o = s:taboption("options", Flag, "enabled",translate("Enabled")) -o.default = 0 - --- OPTIONS -o = s:taboption("options", ListValue, "defaultMode", translate("Running Mode")) -o.default = "follow" -o:value("follow", translate("Follow")) -o:value("entire", translate("Entire")) -o:value("today", translate("Today")) -o:value("wipe", translate("Wipe")) - - -o = s:taboption("options", Value, "attemptCount", translate("Attempt Tolerance"), translate("failure attempts from a given IP required to trigger a ban")) - -o = s:taboption("options", Value, "attemptPeriod", translate("Attempt Cycle"), translate("time period during which attemptCount must be exceeded in order to trigger a ban
Format: 1w2d3h4m5s represents 1week 2days 3hours 4minutes 5 seconds")) - -o = s:taboption("options", Value, "banLength", translate("Ban Period"), translate("how long a ban exist once the attempt threshold is exceeded")) - -o = s:taboption("options", ListValue, "logLevel", translate("Log Level")) -o.default = "1" -o:value("0", translate("Silent")) -o:value("1", translate("Default")) -o:value("2", translate("Verbose")) -o:value("3", translate("Debug")) - - -o = s:taboption("blocked", Value, "blocked", translate("Blocked IP List")) -o.template="cbi/tvalue" -o.rows=40 -o.wrap="off" -o.readonly="true" -function o.cfgvalue(e, e) - return luci.sys.exec("cat /tmp/beardropper.bddb | awk /'=1/'| awk -F '=' '{print $1}' | awk '{print substr($0,6)}' | awk 'gsub(/_/,\":\",$0)'") -end - - - -return m diff --git a/luci-app-beardropper/luasrc/view/beardropper/status.htm b/luci-app-beardropper/luasrc/view/beardropper/status.htm deleted file mode 100755 index 808b3a008..000000000 --- a/luci-app-beardropper/luasrc/view/beardropper/status.htm +++ /dev/null @@ -1,22 +0,0 @@ - - -
-

- <%:Collecting data...%> -

-
\ No newline at end of file diff --git a/luci-app-beardropper/po/zh-cn b/luci-app-beardropper/po/zh-cn deleted file mode 120000 index 8d69574dd..000000000 --- a/luci-app-beardropper/po/zh-cn +++ /dev/null @@ -1 +0,0 @@ -zh_Hans \ No newline at end of file diff --git a/luci-app-beardropper/po/zh_Hans/beardropper.po b/luci-app-beardropper/po/zh_Hans/beardropper.po deleted file mode 100755 index bcffc1079..000000000 --- a/luci-app-beardropper/po/zh_Hans/beardropper.po +++ /dev/null @@ -1,115 +0,0 @@ -bearDropper#: ../../package/feeds/luci/luci-app-beardropper/luasrc/model/cbi/bearDropper/setting.lua:36 -msgid "Attempt Cycle" -msgstr "尝试登录时间段" - - -msgid "Setting" -msgstr "设置" - -msgid "Log" -msgstr "日志" - -#: ../../package/feeds/luci/luci-app-beardropper/luasrc/model/cbi/bearDropper/setting.lua:34 -msgid "Attempt Tolerance" -msgstr "最大尝试登录次数" - -#: ../../package/feeds/luci/luci-app-beardropper/luasrc/model/cbi/bearDropper/setting.lua:38 -msgid "Ban Period" -msgstr "封禁IP时长" - -#: ../../package/feeds/luci/luci-app-beardropper/luasrc/controller/bearDropper.lua:7 -#: ../../package/feeds/luci/luci-app-beardropper/luasrc/model/cbi/bearDropper/setting.lua:7 -msgid "BearDropper" -msgstr "" - -#: ../../package/feeds/luci/luci-app-beardropper/luasrc/model/cbi/bearDropper/setting.lua:20 -msgid "Blocked IP" -msgstr "屏蔽列表" - -#: ../../package/feeds/luci/luci-app-beardropper/luasrc/model/cbi/bearDropper/setting.lua:52 -msgid "Blocked IP List" -msgstr "已屏蔽IP列表" - -#: ../../package/feeds/luci/luci-app-beardropper/luasrc/view/bearDropper/status.htm:20 -msgid "Collecting data..." -msgstr "" - -#: ../../package/feeds/luci/luci-app-beardropper/luasrc/model/cbi/bearDropper/setting.lua:45 -msgid "Debug" -msgstr "调试" - -#: ../../package/feeds/luci/luci-app-beardropper/luasrc/model/cbi/bearDropper/setting.lua:43 -msgid "Default" -msgstr "默认" - -#: ../../package/feeds/luci/luci-app-beardropper/luasrc/model/cbi/bearDropper/setting.lua:22 -msgid "Enabled" -msgstr "启用" - -#: ../../package/feeds/luci/luci-app-beardropper/luasrc/model/cbi/bearDropper/setting.lua:29 -msgid "Entire" -msgstr "已有记录" - -#: ../../package/feeds/luci/luci-app-beardropper/luasrc/model/cbi/bearDropper/setting.lua:28 -msgid "Follow" -msgstr "后台监控" - -#: ../../package/feeds/luci/luci-app-beardropper/luasrc/model/cbi/bearDropper/setting.lua:40 -msgid "Log Level" -msgstr "日志等级" - -#: ../../package/feeds/luci/luci-app-beardropper/luasrc/view/bearDropper/status.htm:10 -msgid "NOT RUNNING" -msgstr "" - -#: ../../package/feeds/luci/luci-app-beardropper/luasrc/model/cbi/bearDropper/setting.lua:19 -msgid "Options" -msgstr "选项" - -#: ../../package/feeds/luci/luci-app-beardropper/luasrc/view/bearDropper/status.htm:7 -msgid "RUNNING" -msgstr "" - -#: ../../package/feeds/luci/luci-app-beardropper/luasrc/model/cbi/bearDropper/setting.lua:26 -msgid "Running Mode" -msgstr "运行模式" - -#: ../../package/feeds/luci/luci-app-beardropper/luasrc/model/cbi/bearDropper/setting.lua:42 -msgid "Silent" -msgstr "安静" - -#: ../../package/feeds/luci/luci-app-beardropper/luasrc/model/cbi/bearDropper/setting.lua:30 -msgid "Today" -msgstr "仅今日" - -#: ../../package/feeds/luci/luci-app-beardropper/luasrc/model/cbi/bearDropper/setting.lua:44 -msgid "Verbose" -msgstr "详细" - -#: ../../package/feeds/luci/luci-app-beardropper/luasrc/model/cbi/bearDropper/setting.lua:31 -msgid "Wipe" -msgstr "清除所有" - -#: ../../package/feeds/luci/luci-app-beardropper/luasrc/model/cbi/bearDropper/setting.lua:34 -msgid "failure attempts from a given IP required to trigger a ban" -msgstr "尝试登录超过设定值次数的IP将被封禁" - -#: ../../package/feeds/luci/luci-app-beardropper/luasrc/model/cbi/bearDropper/setting.lua:38 -msgid "how long a ban exist once the attempt threshold is exceeded" -msgstr "IP将被封禁设定的时间" - -#: ../../package/feeds/luci/luci-app-beardropper/luasrc/model/cbi/bearDropper/setting.lua:8 -msgid "" -"luci-app-beardropper, the LuCI app built with the elegant firewall rule " -"generation on-the-fly script bearDropper.

Should you have any " -"questions, please refer to the repo:" -msgstr "" -"luci-app-beardropper, 是一款能够在开启公网访问之后对潜在的ssh attack进行防御" -"的脚本.

如果你在使用中有任何问题，请到项目中提问: " - -#: ../../package/feeds/luci/luci-app-beardropper/luasrc/model/cbi/bearDropper/setting.lua:36 -msgid "" -"time period during which attemptCount must be exceeded in order to trigger a " -"ban
Format: 1w2d3h4m5s represents 1week 2days 3hours 4minutes 5 seconds" -msgstr "" -"在设定的时间段内连续尝试失败
格式：1w2d3h4m5s代表1周2天3小时4分5秒" diff --git a/luci-app-beardropper/po/zh_Hant/beardropper.po b/luci-app-beardropper/po/zh_Hant/beardropper.po deleted file mode 100644 index 00c1da72e..000000000 --- a/luci-app-beardropper/po/zh_Hant/beardropper.po +++ /dev/null @@ -1,115 +0,0 @@ -bearDropper#: ../../package/feeds/luci/luci-app-beardropper/luasrc/model/cbi/bearDropper/setting.lua:36 -msgid "Attempt Cycle" -msgstr "嘗試登錄時間段" - - -msgid "Setting" -msgstr "設置" - -msgid "Log" -msgstr "日誌" - -#: ../../package/feeds/luci/luci-app-beardropper/luasrc/model/cbi/bearDropper/setting.lua:34 -msgid "Attempt Tolerance" -msgstr "最大嘗試登錄次數" - -#: ../../package/feeds/luci/luci-app-beardropper/luasrc/model/cbi/bearDropper/setting.lua:38 -msgid "Ban Period" -msgstr "封禁IP時長" - -#: ../../package/feeds/luci/luci-app-beardropper/luasrc/controller/bearDropper.lua:7 -#: ../../package/feeds/luci/luci-app-beardropper/luasrc/model/cbi/bearDropper/setting.lua:7 -msgid "BearDropper" -msgstr "" - -#: ../../package/feeds/luci/luci-app-beardropper/luasrc/model/cbi/bearDropper/setting.lua:20 -msgid "Blocked IP" -msgstr "屏蔽列表" - -#: ../../package/feeds/luci/luci-app-beardropper/luasrc/model/cbi/bearDropper/setting.lua:52 -msgid "Blocked IP List" -msgstr "已屏蔽IP列表" - -#: ../../package/feeds/luci/luci-app-beardropper/luasrc/view/bearDropper/status.htm:20 -msgid "Collecting data..." -msgstr "" - -#: ../../package/feeds/luci/luci-app-beardropper/luasrc/model/cbi/bearDropper/setting.lua:45 -msgid "Debug" -msgstr "調試" - -#: ../../package/feeds/luci/luci-app-beardropper/luasrc/model/cbi/bearDropper/setting.lua:43 -msgid "Default" -msgstr "默認" - -#: ../../package/feeds/luci/luci-app-beardropper/luasrc/model/cbi/bearDropper/setting.lua:22 -msgid "Enabled" -msgstr "啟用" - -#: ../../package/feeds/luci/luci-app-beardropper/luasrc/model/cbi/bearDropper/setting.lua:29 -msgid "Entire" -msgstr "已有記錄" - -#: ../../package/feeds/luci/luci-app-beardropper/luasrc/model/cbi/bearDropper/setting.lua:28 -msgid "Follow" -msgstr "後臺監控" - -#: ../../package/feeds/luci/luci-app-beardropper/luasrc/model/cbi/bearDropper/setting.lua:40 -msgid "Log Level" -msgstr "日誌等級" - -#: ../../package/feeds/luci/luci-app-beardropper/luasrc/view/bearDropper/status.htm:10 -msgid "NOT RUNNING" -msgstr "" - -#: ../../package/feeds/luci/luci-app-beardropper/luasrc/model/cbi/bearDropper/setting.lua:19 -msgid "Options" -msgstr "選項" - -#: ../../package/feeds/luci/luci-app-beardropper/luasrc/view/bearDropper/status.htm:7 -msgid "RUNNING" -msgstr "" - -#: ../../package/feeds/luci/luci-app-beardropper/luasrc/model/cbi/bearDropper/setting.lua:26 -msgid "Running Mode" -msgstr "運行模式" - -#: ../../package/feeds/luci/luci-app-beardropper/luasrc/model/cbi/bearDropper/setting.lua:42 -msgid "Silent" -msgstr "安靜" - -#: ../../package/feeds/luci/luci-app-beardropper/luasrc/model/cbi/bearDropper/setting.lua:30 -msgid "Today" -msgstr "僅今日" - -#: ../../package/feeds/luci/luci-app-beardropper/luasrc/model/cbi/bearDropper/setting.lua:44 -msgid "Verbose" -msgstr "詳細" - -#: ../../package/feeds/luci/luci-app-beardropper/luasrc/model/cbi/bearDropper/setting.lua:31 -msgid "Wipe" -msgstr "清除所有" - -#: ../../package/feeds/luci/luci-app-beardropper/luasrc/model/cbi/bearDropper/setting.lua:34 -msgid "failure attempts from a given IP required to trigger a ban" -msgstr "嘗試登錄超過設定值次數的IP將被封禁" - -#: ../../package/feeds/luci/luci-app-beardropper/luasrc/model/cbi/bearDropper/setting.lua:38 -msgid "how long a ban exist once the attempt threshold is exceeded" -msgstr "IP將被封禁設定的時間" - -#: ../../package/feeds/luci/luci-app-beardropper/luasrc/model/cbi/bearDropper/setting.lua:8 -msgid "" -"luci-app-beardropper, the LuCI app built with the elegant firewall rule " -"generation on-the-fly script bearDropper.

Should you have any " -"questions, please refer to the repo:" -msgstr "" -"luci-app-beardropper, 是壹款能夠在開啟公網訪問之後對潛在的ssh attack進行防禦" -"的腳本.

如果妳在使用中有任何問題，請到項目中提問: " - -#: ../../package/feeds/luci/luci-app-beardropper/luasrc/model/cbi/bearDropper/setting.lua:36 -msgid "" -"time period during which attemptCount must be exceeded in order to trigger a " -"ban
Format: 1w2d3h4m5s represents 1week 2days 3hours 4minutes 5 seconds" -msgstr "" -"在設定的時間段內連續嘗試失敗
格式：1w2d3h4m5s代表1周2天3小時4分5秒" diff --git a/luci-app-beardropper/preview/1_setting.png b/luci-app-beardropper/preview/1_setting.png deleted file mode 100644 index 6cd9b92cd..000000000 Binary files a/luci-app-beardropper/preview/1_setting.png and /dev/null differ diff --git a/luci-app-beardropper/preview/2_blockedlist.png b/luci-app-beardropper/preview/2_blockedlist.png deleted file mode 100644 index cfee88d3a..000000000 Binary files a/luci-app-beardropper/preview/2_blockedlist.png and /dev/null differ diff --git a/luci-app-beardropper/root/etc/config/beardropper b/luci-app-beardropper/root/etc/config/beardropper deleted file mode 100644 index ec5d0d4e0..000000000 --- a/luci-app-beardropper/root/etc/config/beardropper +++ /dev/null @@ -1,18 +0,0 @@ -config beardropper - option attemptCount '5' - option attemptPeriod '12h' - option banLength '1w' - option logFacility 'authpriv.notice' - option fileStateType 'bddb' - option fileStateTempPrefix '/tmp/beardropper' - option fileStatePersistPrefix '/etc/beardropper' - list firewallHookChain 'input_wan_rule:1' - list firewallHookChain 'forwarding_wan_rule:1' - option firewallTarget 'DROP' - list logRegex 's/[`$"\'\'']//g' - list logRegex '/has invalid shell, rejected$/d' - list logRegex '/^[A-Za-z ]+[0-9: ]+authpriv.warn dropbear\[.+([0-9]+\.){3}[0-9]+/p' - list logRegex '/^[A-Za-z ]+[0-9: ]+authpriv.info dropbear\[.+:\ Exit before auth:.*/p' - option defaultMode 'follow' - option enabled '1' - option logLevel '2' diff --git a/luci-app-beardropper/root/etc/init.d/beardropper b/luci-app-beardropper/root/etc/init.d/beardropper deleted file mode 100755 index a7c1c98db..000000000 --- a/luci-app-beardropper/root/etc/init.d/beardropper +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh /etc/rc.common -START=98 - -PROG=/usr/sbin/beardropper -SERVICE_DAEMONIZE=1 -SERVICE_WRITE_PID=1 - -getKids() { - egrep "^PPid: *$1$" /proc/[0-9]*/s*s 2>/dev/null | cut -f3 -d/ | xargs echo -} - -start() { - service_start ${PROG} -m follow - echo "beardropper started!" -} - -stop() { - #PID=`cat /var/run/bearDropper.pid` - #kill `getKids $PID` - kill -9 `pgrep -f /usr/sbin/beardropper` - sleep 1 - service_stop ${PROG} - echo "beardropper exit...." -} - -restart() { - enabled=$(uci get beardropper.@beardropper[0].enabled) - pgrep -f ${PROG} >/dev/null - if [ $? -eq 0 ];then #running - if [ $enabled -eq 1 ]; then - stop - sleep 1 - echo "beardropper is restarting..." - start - else - stop - fi - else - if [ $enabled -eq 1 ]; then - start - else - exit 0 - fi - fi - -} diff --git a/luci-app-beardropper/root/etc/uci-defaults/luci-beardropper b/luci-app-beardropper/root/etc/uci-defaults/luci-beardropper deleted file mode 100644 index 0565aa652..000000000 --- a/luci-app-beardropper/root/etc/uci-defaults/luci-beardropper +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -uci -q batch <<-EOF >/dev/null - delete ucitrack.@beardropper[-1] - add ucitrack beardropper - set ucitrack.@beardropper[-1].init=beardropper - commit ucitrack -EOF - -rm -rf /tmp/luci-* -exit 0 diff --git a/luci-app-beardropper/root/usr/sbin/beardropper b/luci-app-beardropper/root/usr/sbin/beardropper deleted file mode 100755 index d3015491f..000000000 --- a/luci-app-beardropper/root/usr/sbin/beardropper +++ /dev/null @@ -1,517 +0,0 @@ -#!/bin/ash -# -# beardropper - dropbear log parsing ban agent for OpenWRT (Chaos Calmer rewrite of dropBrute.sh) -# http://github.com/robzr/bearDropper -- Rob Zwissler 11/2015 -# -# - lightweight, no dependencies, busybox ash + native OpenWRT commands -# - uses uci for configuration, overrideable via command line arguments -# - runs continuously in background (via init script) or periodically (via cron) -# - uses BIND time shorthand, ex: 1w5d3h1m8s is 1 week, 5 days, 3 hours, 1 minute, 8 seconds -# - Whitelist IP or CIDR entries (TBD) in uci config file -# - Records state file to tmpfs and intelligently syncs to persistent storage (can disable) -# - Persistent sync routines are optimized to avoid excessive writes (persistentStateWritePeriod) -# - Every run occurs in one of the following modes. If not specified, interval mode (24 hours) is -# the default when not specified (the init script specifies follow mode via command line) -# -# "follow" mode follows syslog to process entries as they happen; generally launched via init -# script. Responds the fastest, runs the most efficiently, but is always in memory. -# "interval" mode only processes entries going back the specified interval; requires -# more processing than today mode, but responds more accurately. Use with cron. -# "today" mode looks at log entries from the day it is being run, simple and lightweight, -# generally run from cron periodically (same simplistic behavior as dropBrute.sh) -# "entire" mode runs through entire contents of the syslog ring buffer -# "wipe" mode tears down the firewall rules and removes the state files - -# Load UCI config variable, or use default if not set -# Args: $1 = variable name (also uci option name), $2 = default_value -uciSection='beardropper.@[0]' -uciLoadVar () { - local getUci - getUci=`uci -q get ${uciSection}."$1"` || getUci="$2" - eval $1=\'$getUci\'; -} -uciLoad() { - local tFile=`mktemp` delim=" -" - [ "$1" = -d ] && { delim="$2"; shift 2; } - uci -q -d"$delim" get "$uciSection.$1" 2>/dev/null >$tFile - if [ $? = 0 ] ; then - sed -e s/^\'// -e s/\'$// <$tFile - else - while [ -n "$2" ]; do echo $2; shift; done - fi - rm -f $tFile -} - -# Common config variables - edit these in /etc/config/beardropper -# or they can be overridden at runtime with command line options -# -uciLoadVar defaultMode entire -uciLoadVar enabled 0 -uciLoadVar attemptCount 10 -uciLoadVar attemptPeriod 12h -uciLoadVar banLength 1w -uciLoadVar logLevel 1 -uciLoadVar logFacility authpriv.notice -uciLoadVar persistentStateWritePeriod -1 -uciLoadVar fileStateType bddb -uciLoadVar fileStateTempPrefix /tmp/beardropper -uciLoadVar fileStatePersistPrefix /etc/beardropper -firewallHookChains="`uciLoad -d \ firewallHookChain input_wan_rule:1 forwarding_wan_rule:1`" -uciLoadVar firewallTarget DROP - -# Not commonly changed, but changeable via uci or cmdline (primarily -# to enable multiple parallel runs with different parameters) -uciLoadVar firewallChain beardropper - -# Advanced variables, changeable via uci only (no cmdline), it is -# unlikely that these will need to be changed, but just in case... -# -uciLoadVar syslogTag "beardropper[$$]" -# how often to attempt to expire bans when in follow mode -uciLoadVar followModeCheckInterval 30m -uciLoadVar cmdLogread 'logread' # for tuning, ex: "logread -l250" -uciLoadVar cmdLogreadEba 'logread' # for "Exit before auth:" backscanning -uciLoadVar formatLogDate '%b %e %H:%M:%S %Y' # used to convert syslog dates -uciLoadVar formatTodayLogDateRegex '^%a %b %e ..:..:.. %Y' # filter for today mode - -# Begin functions -# -# Clear bddb entries from environment -bddbClear () { - local bddbVar - for bddbVar in `set | egrep '^bddb_[0-9_]*=' | cut -f1 -d= | xargs echo -n` ; do eval unset $bddbVar ; done - bddbStateChange=1 -} - -# Returns count of unique IP entries in environment -bddbCount () { set | egrep '^bddb_[0-9_]*=' | wc -l ; } - -# Loads existing bddb file into environment -# Arg: $1 = file, $2 = type (bddb/bddbz), $3 = -bddbLoad () { - local loadFile="$1.$2" fileType="$2" - if [ "$fileType" = bddb -a -f "$loadFile" ] ; then - . "$loadFile" - elif [ "$fileType" = bddbz -a -f "$loadFile" ] ; then - local tmpFile="`mktemp`" - zcat $loadFile > "$tmpFile" - . "$tmpFile" - rm -f "$tmpFile" - fi - bddbStateChange=0 -} - -# Saves environment bddb entries to file, Arg: $1 = file to save in -bddbSave () { - local saveFile="$1.$2" fileType="$2" - if [ "$fileType" = bddb ] ; then - set | egrep '^bddb_[0-9_]*=' | sed s/\'//g > "$saveFile" - elif [ "$fileType" = bddbz ] ; then - set | egrep '^bddb_[0-9_]*=' | sed s/\'//g | gzip -c > "$saveFile" - fi - bddbStateChange=0 -} - -# Set bddb record status=1, update ban time flag with newest -# Args: $1=IP Address $2=timeFlag -bddbEnableStatus () { - local record=`echo $1 | sed -e 's/\./_/g' -e 's/^/bddb_/'` - local newestTime=`bddbGetTimes $1 | sed 's/.* //' | xargs echo $2 | tr \ '\n' | sort -n | tail -1 ` - eval $record="1,$newestTime" - bddbStateChange=1 -} - -# Args: $1=IP Address -bddbGetStatus () { - bddbGetRecord $1 | cut -d, -f1 -} - -# Args: $1=IP Address -bddbGetTimes () { - bddbGetRecord $1 | cut -d, -f2- -} - -# Args: $1 = IP address, $2 [$3 ...] = timestamp (seconds since epoch) -bddbAddRecord () { - local ip="`echo "$1" | tr . _`" ; shift - local newEpochList="$@" status="`eval echo \\\$bddb_$ip | cut -f1 -d,`" - local oldEpochList="`eval echo \\\$bddb_$ip | cut -f2- -d, | tr , \ `" - local epochList=`echo $oldEpochList $newEpochList | xargs -n 1 echo | sort -un | xargs echo -n | tr \ ,` - [ -z "$status" ] && status=0 - eval "bddb_$ip"\=\"$status,$epochList\" - bddbStateChange=1 -} - -# Args: $1 = IP address -bddbRemoveRecord () { - local ip="`echo "$1" | tr . _`" - eval unset bddb_$ip - bddbStateChange=1 -} - -# Returns all IPs (not CIDR) present in records -bddbGetAllIPs () { - local ipRaw record - set | egrep '^bddb_[0-9_]*=' | tr \' \ | while read record ; do - ipRaw=`echo $record | cut -f1 -d= | sed 's/^bddb_//'` - if [ `echo $ipRaw | tr _ \ | wc -w` -eq 4 ] ; then - echo $ipRaw | tr _ . - fi - done -} - -# retrieve single IP record, Args: $1=IP -bddbGetRecord () { - local record - record=`echo $1 | sed -e 's/\./_/g' -e 's/^/bddb_/'` - eval echo \$$record -} - -isValidBindTime () { echo "$1" | egrep -q '^[0-9]+$|^([0-9]+[wdhms]?)+$' ; } - -# expands Bind time syntax into seconds (ex: 3w6d23h59m59s), Arg: $1=time string -expandBindTime () { - isValidBindTime "$1" || { logLine 0 "Error: Invalid time specified ($1)" >&2 ; exit 254 ; } - echo $((`echo "$1" | sed -e 's/w+*/*7d+/g' -e 's/d+*/*24h+/g' -e 's/h+*/*60m+/g' -e 's/m+*/*60+/g' \ - -e s/s//g -e s/+\$//`)) -} - -# Args: $1 = loglevel, $2 = info to log -logLine () { - [ $1 -gt $logLevel ] && return - shift - if [ "$logFacility" = "stdout" ] ; then echo "$@" - elif [ "$logFacility" = "stderr" ] ; then echo "$@" >&2 - else logger -t "$syslogTag" -p "$logFacility" "$@" - fi -} - -# extra validation, fails safe. Args: $1=log line -getLogTime () { - local logDateString=`echo "$1" | sed -n \ - 's/^[A-Z][a-z]* \([A-Z][a-z]* *[0-9][0-9]* *[0-9][0-9]*:[0-9][0-9]:[0-9][0-9] [0-9][0-9]*\) .*$/\1/p'` - date -d"$logDateString" -D"$formatLogDate" +%s || logLine 1 \ - "Error: logDateString($logDateString) malformed line ($1)" -} - -# extra validation, fails safe. Args: $1=log line -getLogIP () { - local logLine="$1" - local ebaPID=`echo "$logLine" | sed -n 's/^.*authpriv.info \(dropbear\[[0-9]*\]:\) Exit before auth:.*/\1/p'` - [ -n "$ebaPID" ] && logLine=`$cmdLogreadEba | fgrep "${ebaPID} Child connection from "` - echo "$logLine" | sed -n 's/^.*[^0-9]\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*$/\1/p' -} - -# Args: $1=IP -unBanIP () { - if iptables -C $firewallChain -s $ip -j "$firewallTarget" 2>/dev/null ; then - logLine 1 "Removing ban rule for IP $ip from iptables" - iptables -D $firewallChain -s $ip -j "$firewallTarget" - else - logLine 3 "unBanIP() Ban rule for $ip not present in iptables" - fi -} - -# Args: $1=IP -banIP () { - local ip="$1" x chain position - if ! iptables -nL $firewallChain >/dev/null 2>/dev/null ; then - logLine 1 "Creating iptables chain $firewallChain" - iptables -N $firewallChain - fi - for x in $firewallHookChains ; do - chain="${x%:*}" ; position="${x#*:}" - if [ $position -ge 0 ] && ! iptables -C $chain -j $firewallChain 2>/dev/null ; then - logLine 1 "Inserting hook into iptables chain $chain" - if [ $position = 0 ] ; then - iptables -A $chain -j $firewallChain - else - iptables -I $chain $position -j $firewallChain - fi ; fi - done - if ! iptables -C $firewallChain -s $ip -j "$firewallTarget" 2>/dev/null ; then - logLine 1 "Inserting ban rule for IP $ip into iptables chain $firewallChain" - iptables -A $firewallChain -s $ip -j "$firewallTarget" - else - logLine 3 "banIP() rule for $ip already present in iptables chain" - fi -} - -wipeFirewall () { - local x chain position - for x in $firewallHookChains ; do - chain="${x%:*}" ; position="${x#*:}" - if [ $position -ge 0 ] ; then - if iptables -C $chain -j $firewallChain 2>/dev/null ; then - logLine 1 "Removing hook from iptables chain $chain" - iptables -D $chain -j $firewallChain - fi ; fi - done - if iptables -nL $firewallChain >/dev/null 2>/dev/null ; then - logLine 1 "Flushing and removing iptables chain $firewallChain" - iptables -F $firewallChain 2>/dev/null - iptables -X $firewallChain 2>/dev/null - fi -} - -# review state file for expired records - we could add the bantime to -# the rule via --comment but I can't think of a reason why that would -# be necessary unless there is a bug in the expiration logic. The -# state db should be more resiliant than the firewall in practice. -# -bddbCheckStatusAll () { - local now=`date +%s` - bddbGetAllIPs | while read ip ; do - if [ `bddbGetStatus $ip` -eq 1 ] ; then - logLine 3 "bddbCheckStatusAll($ip) testing banLength:$banLength + bddbGetTimes:`bddbGetTimes $ip` vs. now:$now" - if [ $((banLength + `bddbGetTimes $ip`)) -lt $now ] ; then - logLine 1 "Ban expired for $ip, removing from iptables" - unBanIP $ip - bddbRemoveRecord $ip - else - logLine 3 "bddbCheckStatusAll($ip) not expired yet" - banIP $ip - fi - elif [ `bddbGetStatus $ip` -eq 0 ] ; then - local times=`bddbGetTimes $ip | tr , \ ` - local timeCount=`echo $times | wc -w` - local lastTime=`echo $times | cut -d\ -f$timeCount` - if [ $((lastTime + attemptPeriod)) -lt $now ] ; then - bddbRemoveRecord $ip - fi ; fi - saveState - done - loadState -} - -# Only used when status is already 0 and possibly going to 1, Args: $1=IP -bddbEvaluateRecord () { - local ip=$1 firstTime lastTime - local times=`bddbGetRecord $1 | cut -d, -f2- | tr , \ ` - local timeCount=`echo $times | wc -w` - local didBan=0 - - # 1: not enough attempts => do nothing and exit - # 2: attempts exceed threshold in time period => ban - # 3: attempts exceed threshold but time period is too long => trim oldest time, recalculate - while [ $timeCount -ge $attemptCount ] ; do - firstTime=`echo $times | cut -d\ -f1` - lastTime=`echo $times | cut -d\ -f$timeCount` - timeDiff=$((lastTime - firstTime)) - logLine 3 "bddbEvaluateRecord($ip) count=$timeCount timeDiff=$timeDiff/$attemptPeriod" - if [ $timeDiff -le $attemptPeriod ] ; then - bddbEnableStatus $ip $lastTime - logLine 2 "bddbEvaluateRecord($ip) exceeded ban threshold, adding to iptables" - banIP $ip - didBan=1 - fi - times=`echo $times | cut -d\ -f2-` - timeCount=`echo $times | wc -w` - done - [ $didBan = 0 ] && logLine 2 "bddbEvaluateRecord($ip) does not exceed threshhold, skipping" -} - -# Reads filtered log line and evaluates for action Args: $1=log line -processLogLine () { - local time=`getLogTime "$1"` - local ip=`getLogIP "$1"` - local status="`bddbGetStatus $ip`" - - if [ "$status" = -1 ] ; then - logLine 2 "processLogLine($ip,$time) IP is whitelisted" - elif [ "$status" = 1 ] ; then - if [ "`bddbGetTimes $ip`" -ge $time ] ; then - logLine 2 "processLogLine($ip,$time) already banned, ban timestamp already equal or newer" - else - logLine 2 "processLogLine($ip,$time) already banned, updating ban timestamp" - bddbEnableStatus $ip $time - fi - banIP $ip - elif [ -n "$ip" -a -n "$time" ] ; then - bddbAddRecord $ip $time - logLine 2 "processLogLine($ip,$time) Added record, comparing" - bddbEvaluateRecord $ip - else - logLine 1 "processLogLine($ip,$time) malformed line ($1)" - fi -} - -# Args, $1=-f to force a persistent write (unless lastPersistentStateWrite=-1) -saveState () { - local forcePersistent=0 - [ "$1" = "-f" ] && forcePersistent=1 - - if [ $bddbStateChange -gt 0 ] ; then - logLine 3 "saveState() saving to temp state file" - bddbSave "$fileStateTempPrefix" "$fileStateType" - logLine 3 "saveState() now=`date +%s` lPSW=$lastPersistentStateWrite pSWP=$persistentStateWritePeriod fP=$forcePersistent" - fi - if [ $persistentStateWritePeriod -gt 1 ] || [ $persistentStateWritePeriod -eq 0 -a $forcePersistent -eq 1 ] ; then - if [ $((`date +%s` - lastPersistentStateWrite)) -ge $persistentStateWritePeriod ] || [ $forcePersistent -eq 1 ] ; then - if [ ! -f "$fileStatePersist" ] || ! cmp -s "$fileStateTemp" "$fileStatePersist" ; then - logLine 2 "saveState() writing to persistent state file" - bddbSave "$fileStatePersistPrefix" "$fileStateType" - lastPersistentStateWrite="`date +%s`" - fi ; fi ; fi -} - -loadState () { - bddbClear - bddbLoad "$fileStatePersistPrefix" "$fileStateType" - bddbLoad "$fileStateTempPrefix" "$fileStateType" - logLine 2 "loadState() loaded `bddbCount` entries" -} - -printUsage () { - cat <<-_EOF_ - Usage: beardropper [-m mode] [-a #] [-b #] [-c ...] [-C ...] [-f ...] [-l #] [-j ...] [-p #] [-P #] [-s ...] - - Running Modes (-m) (def: $defaultMode) - follow constantly monitors log - entire processes entire log contents - today processes log entries from same day only - # interval mode, specify time string or seconds - wipe wipe state files, unhook and remove firewall chain - - Options - -a # attempt count before banning (def: $attemptCount) - -b # ban length once attempts hit threshold (def: $banLength) - -c ... firewall chain to record bans (def: $firewallChain) - -C ... firewall chains/positions to hook into (def: $firewallHookChains) - -f ... log facility (syslog facility or stdout/stderr) (def: $logFacility) - -j ... firewall target (def: $firewallTarget) - -l # log level - 0=off, 1=standard, 2=verbose (def: $logLevel) - -p # attempt period which attempt counts must happen in (def: $attemptPeriod) - -P # persistent state file write period (def: $persistentStateWritePeriod) - -s ... persistent state file prefix (def: $fileStatePersistPrefix) - -t ... temporary state file prefix (def: $fileStateTempPrefix) - - All time strings can be specified in seconds, or using BIND style - time strings, ex: 1w2d3h5m30s is 1 week, 2 days, 3 hours, etc... - - _EOF_ -} - -# Begin main logic -# -unset logMode -while getopts a:b:c:C:f:hj:l:m:p:P:s:t: arg ; do - case "$arg" in - a) attemptCount="$OPTARG" ;; - b) banLength="$OPTARG" ;; - c) firewallChain="$OPTARG" ;; - C) firewallHookChains="$OPTARG" ;; - f) logFacility="$OPTARG" ;; - j) firewallTarget="$OPTARG" ;; - l) logLevel="$OPTARG" ;; - m) logMode="$OPTARG" ;; - p) attemptPeriod="$OPTARG" ;; - P) persistentStateWritePeriod="$OPTARG" ;; - s) fileStatePersistPrefix="$OPTARG" ;; - s) fileStatePersistPrefix="$OPTARG" ;; - *) printUsage - exit 254 - esac - shift `expr $OPTIND - 1` -done -[ -z $logMode ] && logMode="$defaultMode" - -fileStateTemp="$fileStateTempPrefix.$fileStateType" -fileStatePersist="$fileStatePersistPrefix.$fileStateType" - -attemptPeriod=`expandBindTime $attemptPeriod` -banLength=`expandBindTime $banLength` -[ $persistentStateWritePeriod != -1 ] && persistentStateWritePeriod=`expandBindTime $persistentStateWritePeriod` -followModeCheckInterval=`expandBindTime $followModeCheckInterval` -exitStatus=0 - -# Here we convert the logRegex list into a sed -f file -fileRegex="/tmp/beardropper.$$.regex" -uciLoad logRegex 's/[`$"'\\\'']//g' '/has invalid shell, rejected$/d' \ - '/^[A-Za-z ]+[0-9: ]+authpriv.warn dropbear\[.+([0-9]+\.){3}[0-9]+/p' \ - '/^[A-Za-z ]+[0-9: ]+authpriv.info dropbear\[.+:\ Exit before auth:.*/p' > "$fileRegex" -lastPersistentStateWrite="`date +%s`" -loadState -bddbCheckStatusAll - -# main event loops - -if [ "$logMode" = follow ] ; then - logLine 1 "Running in follow mode" - readsSinceSave=0 lastCheckAll=0 worstCaseReads=1 tmpFile="/tmp/beardropper.$$.1" -# Verify if these do any good - try saving to a temp. Scope may make saveState useless. - trap "rm -f "$tmpFile" "$fileRegex" ; exit " SIGINT - [ $persistentStateWritePeriod -gt 1 ] && worstCaseReads=$((persistentStateWritePeriod / followModeCheckInterval)) - firstRun=1 - $cmdLogread -f | while read -t $followModeCheckInterval line || true ; do - if [ $firstRun -eq 1 ] ; then - trap "saveState -f" SIGHUP - trap "saveState -f; exit" SIGINT - firstRun=0 - fi - sed -nEf "$fileRegex" > "$tmpFile" <<-_EOF_ - $line - _EOF_ - line="`cat $tmpFile`" - [ -n "$line" ] && processLogLine "$line" - logLine 3 "ReadComp:$readsSinceSave/$worstCaseReads" - if [ $((++readsSinceSave)) -ge $worstCaseReads ] ; then - now="`date +%s`" - if [ $((now - lastCheckAll)) -ge $followModeCheckInterval ] ; then - bddbCheckStatusAll - lastCheckAll="$now" - saveState - readsSinceSave=0 - fi - fi - done -elif [ "$logMode" = entire ] ; then - logLine 1 "Running in entire mode" - $cmdLogread | sed -nEf "$fileRegex" | while read line ; do - processLogLine "$line" - saveState - done - loadState - bddbCheckStatusAll - saveState -f -elif [ "$logMode" = today ] ; then - logLine 1 "Running in today mode" - # merge the egrep into sed with -e /^$formatTodayLogDateRegex/!d - $cmdLogread | egrep "`date +\'$formatTodayLogDateRegex\'`" | sed -nEf "$fileRegex" | while read line ; do - processLogLine "$line" - saveState - done - loadState - bddbCheckStatusAll - saveState -f -elif isValidBindTime "$logMode" ; then - logInterval=`expandBindTime $logMode` - logLine 1 "Running in interval mode (reviewing $logInterval seconds of log entries)..." - timeStart=$((`date +%s` - logInterval)) - $cmdLogread | sed -nEf "$fileRegex" | while read line ; do - timeWhen=`getLogTime "$line"` - [ $timeWhen -ge $timeStart ] && processLogLine "$line" - saveState - done - loadState - bddbCheckStatusAll - saveState -f -elif [ "$logMode" = wipe ] ; then - logLine 2 "Wiping state files, unhooking and removing iptables chains" - wipeFirewall - if [ -f "$fileStateTemp" ] ; then - logLine 1 "Removing non-persistent statefile ($fileStateTemp)" - rm -f "$fileStateTemp" - fi - if [ -f "$fileStatePersist" ] ; then - logLine 1 "Removing persistent statefile ($fileStatePersist)" - rm -f "$fileStatePersist" - fi -else - logLine 0 "Error: invalid log mode ($logMode)" - exitStatus=254 -fi - -rm -f "$fileRegex" -exit $exitStatus diff --git a/luci-app-beardropper/root/usr/share/rpcd/acl.d/luci-app-beardropper.json b/luci-app-beardropper/root/usr/share/rpcd/acl.d/luci-app-beardropper.json deleted file mode 100644 index 65451ae80..000000000 --- a/luci-app-beardropper/root/usr/share/rpcd/acl.d/luci-app-beardropper.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "luci-app-beardropper": { - "description": "Grant UCI access for luci-app-beardropper", - "read": { - "uci": [ "beardropper" ] - }, - "write": { - "uci": [ "beardropper" ] - } - } -} \ No newline at end of file diff --git a/luci-app-oled/LICENSE b/luci-app-oled/LICENSE deleted file mode 100644 index e963df829..000000000 --- a/luci-app-oled/LICENSE +++ /dev/null @@ -1,622 +0,0 @@ - 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 - diff --git a/luci-app-oled/Makefile b/luci-app-oled/Makefile deleted file mode 100644 index 316a36a0e..000000000 --- a/luci-app-oled/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# -# Copyright (C) 2020 Nate Ding -# -# This is free software, licensed under the GUN General Public License v3. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk -PKG_NAME:=luci-app-oled -LUCI_Title:=LuCI support for ssd1306 0.91\' 138x32 display -LUCI_PKGARCH:=all -LUCI_DEPENDS:=+i2c-tools +coreutils-nohup +libuci -PKG_VERSION:=1.0 -PKG_RELEASE:=1.0 - -PKG_LICENSE:=GPLv3 -PKG_LINCESE_FILES:=LICENSE -PKF_MAINTAINER:=natelol - -include $(TOPDIR)/feeds/luci/luci.mk - -# call BuildPackage - OpenWrt buildroot signature diff --git a/luci-app-oled/README.md b/luci-app-oled/README.md deleted file mode 100644 index 8f78c1d2b..000000000 --- a/luci-app-oled/README.md +++ /dev/null @@ -1,80 +0,0 @@ -# luci-app-oled - -This is the LuCI app written for openwrt (**tested ~~only~~ on NanoPi R2S**) which supports ssd 1306 0.91' oled display. - -**Raspberry Pi CM4** - -This has been tested on Raspberry Pi CM4 as described in issue [#10](https://github.com/NateLol/luci-app-oled/issues/10#issuecomment-922245476). -You can find what revisions you need to make to have it work on your device. -Enjoy! - -## Features|功能 ---- -### Dispaly Info|显示信息 - -**0. Enable|开启** - -开启oled显示。 - -**1. Autoswitch|定时开关** - -由于夜间oled的显示屏太亮，并且也几乎不会看它，所以应邀提供定时开关的功能，选中autoswitch之后，可以设置**显示**的起始和结束时间。 - -**2. Time|时间** - -显示时间。 - -**3. IP|IP地址** - -显示LAN口的IP地址，记得LAN口不可以去除**桥接**选项，否则失效。由于使用的是`br-lan`，因为不同固件可能会交换`eth0`和`eth1`。 - -**4. CPU Temp|CPU温度** - -显示CPU温度。 - -**5. CPU Freq|CPU频率** - -显示实时CPU频率 - -**6. Network Speed|网速** - -提供不同接口的选择，`eth0`和`eth1`,个人可以按需修改。网速单位基准为字节(Byte)而不是一般的位（bit），[MB/s, KB/s, B/s]这样显示的数字能够比较小，不至于过长。 - -**7. Display Interval|显示间隔** - -为了延缓oled的光衰，提供屏保服务，每隔设定的时间运行一次屏保程序。 - ---- -### Screensavers|屏保 - -屏保提供不同的选择，默认推荐的是`Scroll Text|文字滚动`，其他的选择自行探索。 - -## Q&A - -Q0. 如何使用该程序？|在那里找到luci界面？ - -A0. 该程序安装位置在luci界面的`services|服务`下的`OLED`，点击即可找到。 - ---- - -Q1. 是否会支持其他oled屏幕，例如同系列的0.96'的？ - -A1. 由于开发者身边并没有相应的屏幕去调试，所以是暂时不考虑吧。如果你想贡献代码，非常欢迎，请开PR。 - ---- - - -Q2. 为什么我的IP地址显示错误？ - -A2. 很大原因是你修改了LAN接口的属性，例如去除了该接口的**桥接**属性。 - ---- - - -Q3. 为什么我的oled不显示？ - -A3. 很有可能是您的固件内核驱动不完整，该程序的运行需要在内核驱动中加上**kmod-i2c-xxx**，见issue [#10](https://github.com/NateLol/luci-app-oled/issues/10)。 - ---- - -如果你在使用过程中还遇到问题，请开issue。 diff --git a/luci-app-oled/luasrc/controller/oled.lua b/luci-app-oled/luasrc/controller/oled.lua deleted file mode 100644 index 835b054c1..000000000 --- a/luci-app-oled/luasrc/controller/oled.lua +++ /dev/null @@ -1,17 +0,0 @@ -module("luci.controller.oled", package.seeall) - -function index() - if not nixio.fs.access("/etc/config/oled") then - return - end - entry({"admin", "services", "oled"}, alias("admin", "services", "oled", "setting"),_("OLED"), 10).dependent = true - entry({"admin", "services", "oled", "status"}, call("act_status")) - entry({"admin", "services", "oled", "setting"}, cbi("oled/setting"),_("Setting"),30).leaf = true -end - -function act_status() - local e={} - e.running = luci.sys.call("pgrep -f /usr/bin/oled > /dev/null")==0 - luci.http.prepare_content("application/json") - luci.http.write_json(e) -end diff --git a/luci-app-oled/luasrc/model/cbi/oled/setting.lua b/luci-app-oled/luasrc/model/cbi/oled/setting.lua deleted file mode 100644 index 7bc8fbf05..000000000 --- a/luci-app-oled/luasrc/model/cbi/oled/setting.lua +++ /dev/null @@ -1,100 +0,0 @@ -m = Map("oled", translate("OLED"), translate("A LuCI app that helps you config your oled display (SSD1306, 0.91', 128X32) with screensavers!

Any issues, please go to: ")..[[luci-app-oled]]) - ---m.chain("luci") - -m:section(SimpleSection).template="oled/status" - -s = m:section(TypedSection, "oled", translate("")) -s.anonymous=true -s.addremove=false - ---OPTIONS -s:tab("info", translate("Info Display")) -s:tab("screensaver", translate("screensaver")) - -o = s:taboption("info", Flag, "enable", translate("Enable")) -o.default=0 -o = s:taboption("info", Flag, "autoswitch", translate("Enable Auto switch")) -o.default=0 -from = s:taboption("info", ListValue, "from", translate("From")) -to = s:taboption("info", ListValue, "to", translate("To")) -for i=0,23 do - for j=0,30,30 do - from:value(i*60+j,string.format("%02d:%02d",i,j)) - to:value(i*60+j,string.format("%02d:%02d",i,j)) - end -end -from:value(1440,"24:00") -to:value(1440,"24:00") -from:depends("autoswitch",'1') -to:depends("autoswitch",'1') -from.default=0 -to.default=1440 - ---informtion options---- -o = s:taboption("info", Flag, "date", translate("Date"), translate('Format YYYY-MM-DD HH:MM:SS')) -o.default=0 -o = s:taboption("info", Flag, "lanip", translate("IP"), translate("LAN IP address")) -o.default=0 -o = s:taboption("info", Flag, "cputemp", translate("CPU temperature")) -o.default=0 -o = s:taboption("info", Flag, "cpufreq", translate("CPU frequency")) -o.default=0 -o = s:taboption("info", Flag, "netspeed", translate("Network speed"), translate("1Mbps(m/s)=1,000Kbps(k/s)=1,000,000bps(b/s)")) -o.default=0 -o = s:taboption("info", ListValue, "netsource", translate("which eth to monitor")) -o:value("eth0","eth0") -o:value("eth1","eth1") -o:depends("netspeed",'1') -o.default='eth0' -o = s:taboption("info", Value, "time", translate("Display interval(s)"), translate('Screensaver will activate in set seconds')) -o.default=0 - ---screensaver options-- -o = s:taboption("screensaver", Flag, "scroll", translate("Scroll Text")) -o.default=1 -o = s:taboption("screensaver", Value, "text", translate("Text you want to scroll")) -o:depends("scroll",'1') -o.default='OPENWRT' -o = s:taboption("screensaver", Flag, "drawline", translate("Draw Many Lines")) -o.default=0 -o = s:taboption("screensaver", Flag, "drawrect", translate("Draw Rectangles")) -o.default=0 -o = s:taboption("screensaver", Flag, "fillrect", translate("Draw Multiple Rectangles")) -o.default=0 -o = s:taboption("screensaver", Flag, "drawcircle", translate("Draw Multiple Circles")) -o.default=0 -o = s:taboption("screensaver", Flag, "drawroundrect", translate("Draw a white circle, 10 pixel radius")) -o.default=0 -o = s:taboption("screensaver", Flag, "fillroundrect", translate("Fill the Round Rectangles")) -o.default=0 -o = s:taboption("screensaver", Flag, "drawtriangle", translate("Draw Triangles")) -o.default=0 -o = s:taboption("screensaver", Flag, "filltriangle", translate("Fill Triangles")) -o.default=0 -o = s:taboption("screensaver", Flag, "displaybitmap", translate("Display miniature bitmap")) -o.default=0 -o = s:taboption("screensaver", Flag, "displayinvertnormal", translate("Invert Display Normalize it")) -o.default=0 -o = s:taboption("screensaver", Flag, "drawbitmapeg", translate("Draw a bitmap and animate")) -o.default=0 - -return m - - - - - - - - - - - - - - - - - ---- diff --git a/luci-app-oled/luasrc/view/oled/status.htm b/luci-app-oled/luasrc/view/oled/status.htm deleted file mode 100644 index 0da0c6426..000000000 --- a/luci-app-oled/luasrc/view/oled/status.htm +++ /dev/null @@ -1,22 +0,0 @@ - - -
-

- <%:Collecting data...%> -

-
diff --git a/luci-app-oled/po/zh-cn b/luci-app-oled/po/zh-cn deleted file mode 120000 index 8d69574dd..000000000 --- a/luci-app-oled/po/zh-cn +++ /dev/null @@ -1 +0,0 @@ -zh_Hans \ No newline at end of file diff --git a/luci-app-oled/po/zh_Hans/oled.po b/luci-app-oled/po/zh_Hans/oled.po deleted file mode 100644 index bc3f8b056..000000000 --- a/luci-app-oled/po/zh_Hans/oled.po +++ /dev/null @@ -1,143 +0,0 @@ -msgid "" -msgstr "Content-Type: text/plain; charset=UTF-8" - -#: ../../package/new/luci-app-oled/luasrc/model/cbi/oled/setting.lua:1 -msgid "" -"A LuCI app that helps you config your oled display (SSD1306, 0.91', 128X32) " -"with screensavers!

Any issues, please go to:" -msgstr "这是一款支持在ssd1306，0.91寸，128x32像素的oled显示屏上显示你要的信息，包含屏保的程序。

任何问题请到：" - -#: ../../package/new/luci-app-oled/luasrc/model/cbi/oled/setting.lua:24 -msgid "CPU frequency" -msgstr "CPU频率" - -#: ../../package/new/luci-app-oled/luasrc/model/cbi/oled/setting.lua:22 -msgid "CPU temperature" -msgstr "CPU温度" - -msgid "Scroll Text" -msgstr "文字滚动" - -msgid "Enable Auto switch" -msgstr "启用定时开关" - -msgid "From" -msgstr "起始时间" - -msgid "To" -msgstr "结束时间" - -msgid "Text you want to scroll" -msgstr "你想要显示的文字" - -msgid "which eth to monitor" -msgstr "选择监控哪个网口" - -#: ../../package/new/luci-app-oled/luasrc/view/oled/status.htm:20 -msgid "Collecting data..." -msgstr "" - -#: ../../package/new/luci-app-oled/luasrc/model/cbi/oled/setting.lua:18 -msgid "Date" -msgstr "时间" - -#: ../../package/new/luci-app-oled/luasrc/model/cbi/oled/setting.lua:48 -msgid "Display miniature bitmap" -msgstr "小图案" - -#: ../../package/new/luci-app-oled/luasrc/model/cbi/oled/setting.lua:28 -msgid "Display interval(s)" -msgstr "信息显示间隔（秒）" - -#: ../../package/new/luci-app-oled/luasrc/model/cbi/oled/setting.lua:28 -msgid "Screensaver will activate in set seconds" -msgstr "屏保每间隔设置的时间运行一次" -#: ../../package/new/luci-app-oled/luasrc/model/cbi/oled/setting.lua:32 -msgid "Draw Many Lines" -msgstr "直线" - -#: ../../package/new/luci-app-oled/luasrc/model/cbi/oled/setting.lua:38 -msgid "Draw Multiple Circles" -msgstr "多圆" - -#: ../../package/new/luci-app-oled/luasrc/model/cbi/oled/setting.lua:36 -msgid "Draw Multiple Rectangles" -msgstr "多方块" - -#: ../../package/new/luci-app-oled/luasrc/model/cbi/oled/setting.lua:34 -msgid "Draw Rectangles" -msgstr "方块" - -#: ../../package/new/luci-app-oled/luasrc/model/cbi/oled/setting.lua:44 -msgid "Draw Triangles" -msgstr "三角形" - -#: ../../package/new/luci-app-oled/luasrc/model/cbi/oled/setting.lua:54 -msgid "Draw a bitmap and animate" -msgstr "动图" - -#: ../../package/new/luci-app-oled/luasrc/model/cbi/oled/setting.lua:52 -msgid "Draw a bitmap and animate movement" -msgstr "变化图" - -#: ../../package/new/luci-app-oled/luasrc/model/cbi/oled/setting.lua:40 -msgid "Draw a white circle, 10 pixel radius" -msgstr "实心圆" - -#: ../../package/new/luci-app-oled/luasrc/model/cbi/oled/setting.lua:15 -msgid "Enable" -msgstr "启用" - -#: ../../package/new/luci-app-oled/luasrc/model/cbi/oled/setting.lua:46 -msgid "Fill Triangles" -msgstr "三角填充" - -#: ../../package/new/luci-app-oled/luasrc/model/cbi/oled/setting.lua:42 -msgid "Fill the Round Rectangles" -msgstr "方形填充" - -#: ../../package/new/luci-app-oled/luasrc/model/cbi/oled/setting.lua:18 -msgid "Format YYYY-MM-DD HH:MM:SS" -msgstr "日期格式 YYYY-MM-DD HH:MM:SS" - -#: ../../package/new/luci-app-oled/luasrc/model/cbi/oled/setting.lua:20 -msgid "IP" -msgstr "" - -#: ../../package/new/luci-app-oled/luasrc/model/cbi/oled/setting.lua:12 -msgid "Info Display" -msgstr "显示信息" - -#: ../../package/new/luci-app-oled/luasrc/model/cbi/oled/setting.lua:50 -msgid "Invert Display Normalize it" -msgstr "反转" - -#: ../../package/new/luci-app-oled/luasrc/model/cbi/oled/setting.lua:20 -msgid "LAN IP address" -msgstr "LAN地址" - -#: ../../package/new/luci-app-oled/luasrc/view/oled/status.htm:10 -msgid "NOT RUNNING" -msgstr "" - -#: ../../package/new/luci-app-oled/luasrc/model/cbi/oled/setting.lua:26 -msgid "Network speed" -msgstr "网速" - -#: ../../package/new/luci-app-oled/luasrc/controller/oled.lua:7 -#: ../../package/new/luci-app-oled/luasrc/model/cbi/oled/setting.lua:1 -#: ../../package/new/luci-app-oled/luasrc/model/cbi/oled/setting.lua:7 -msgid "OLED" -msgstr "" - -#: ../../package/new/luci-app-oled/luasrc/view/oled/status.htm:7 -msgid "RUNNING" -msgstr "" - -#: ../../package/new/luci-app-oled/luasrc/controller/oled.lua:9 -msgid "Setting" -msgstr "设置" - -#: ../../package/new/luci-app-oled/luasrc/model/cbi/oled/setting.lua:13 -msgid "screensaver" -msgstr "屏保" diff --git a/luci-app-oled/po/zh_Hant/oled.po b/luci-app-oled/po/zh_Hant/oled.po deleted file mode 100644 index 4a24e35fb..000000000 --- a/luci-app-oled/po/zh_Hant/oled.po +++ /dev/null @@ -1,135 +0,0 @@ -msgid "" -msgstr "Content-Type: text/plain; charset=UTF-8" - -#: ../../package/new/luci-app-oled/luasrc/model/cbi/oled/setting.lua:1 -msgid "" -"A LuCI app that helps you config your oled display (SSD1306, 0.91', 128X32) " -"with screensavers!

Any issues, please go to:" -msgstr "這是壹款支持在ssd1306，0.91寸，128x32像素的oled顯示屏上顯示妳要的信息，包含屏保的程序。

任何問題請到：" - -#: ../../package/new/luci-app-oled/luasrc/model/cbi/oled/setting.lua:24 -msgid "CPU frequency" -msgstr "CPU頻率" - -#: ../../package/new/luci-app-oled/luasrc/model/cbi/oled/setting.lua:22 -msgid "CPU temperature" -msgstr "CPU溫度" - -msgid "Scroll Text" -msgstr "文字滾動" - -msgid "Text you want to scroll" -msgstr "妳想要顯示的文字" - -msgid "which eth to monitor" -msgstr "選擇監控哪個網口" - -#: ../../package/new/luci-app-oled/luasrc/view/oled/status.htm:20 -msgid "Collecting data..." -msgstr "" - -#: ../../package/new/luci-app-oled/luasrc/model/cbi/oled/setting.lua:18 -msgid "Date" -msgstr "時間" - -#: ../../package/new/luci-app-oled/luasrc/model/cbi/oled/setting.lua:48 -msgid "Display miniature bitmap" -msgstr "小圖案" - -#: ../../package/new/luci-app-oled/luasrc/model/cbi/oled/setting.lua:28 -msgid "Display interval(s)" -msgstr "信息顯示間隔（秒）" - -#: ../../package/new/luci-app-oled/luasrc/model/cbi/oled/setting.lua:28 -msgid "Screensaver will activate in set seconds" -msgstr "屏保每間隔設置的時間運行壹次" - -#: ../../package/new/luci-app-oled/luasrc/model/cbi/oled/setting.lua:32 -msgid "Draw Many Lines" -msgstr "直線" - -#: ../../package/new/luci-app-oled/luasrc/model/cbi/oled/setting.lua:38 -msgid "Draw Multiple Circles" -msgstr "多圓" - -#: ../../package/new/luci-app-oled/luasrc/model/cbi/oled/setting.lua:36 -msgid "Draw Multiple Rectangles" -msgstr "多方塊" - -#: ../../package/new/luci-app-oled/luasrc/model/cbi/oled/setting.lua:34 -msgid "Draw Rectangles" -msgstr "方塊" - -#: ../../package/new/luci-app-oled/luasrc/model/cbi/oled/setting.lua:44 -msgid "Draw Triangles" -msgstr "三角形" - -#: ../../package/new/luci-app-oled/luasrc/model/cbi/oled/setting.lua:54 -msgid "Draw a bitmap and animate" -msgstr "動圖" - -#: ../../package/new/luci-app-oled/luasrc/model/cbi/oled/setting.lua:52 -msgid "Draw a bitmap and animate movement" -msgstr "變化圖" - -#: ../../package/new/luci-app-oled/luasrc/model/cbi/oled/setting.lua:40 -msgid "Draw a white circle, 10 pixel radius" -msgstr "實心圓" - -#: ../../package/new/luci-app-oled/luasrc/model/cbi/oled/setting.lua:15 -msgid "Enable" -msgstr "啟用" - -#: ../../package/new/luci-app-oled/luasrc/model/cbi/oled/setting.lua:46 -msgid "Fill Triangles" -msgstr "三角填充" - -#: ../../package/new/luci-app-oled/luasrc/model/cbi/oled/setting.lua:42 -msgid "Fill the Round Rectangles" -msgstr "方形填充" - -#: ../../package/new/luci-app-oled/luasrc/model/cbi/oled/setting.lua:18 -msgid "Format YYYY-MM-DD HH:MM:SS" -msgstr "日期格式 YYYY-MM-DD HH:MM:SS" - -#: ../../package/new/luci-app-oled/luasrc/model/cbi/oled/setting.lua:20 -msgid "IP" -msgstr "" - -#: ../../package/new/luci-app-oled/luasrc/model/cbi/oled/setting.lua:12 -msgid "Info Display" -msgstr "顯示信息" - -#: ../../package/new/luci-app-oled/luasrc/model/cbi/oled/setting.lua:50 -msgid "Invert Display Normalize it" -msgstr "反轉" - -#: ../../package/new/luci-app-oled/luasrc/model/cbi/oled/setting.lua:20 -msgid "LAN IP address" -msgstr "LAN地址" - -#: ../../package/new/luci-app-oled/luasrc/view/oled/status.htm:10 -msgid "NOT RUNNING" -msgstr "" - -#: ../../package/new/luci-app-oled/luasrc/model/cbi/oled/setting.lua:26 -msgid "Network speed" -msgstr "網速" - -#: ../../package/new/luci-app-oled/luasrc/controller/oled.lua:7 -#: ../../package/new/luci-app-oled/luasrc/model/cbi/oled/setting.lua:1 -#: ../../package/new/luci-app-oled/luasrc/model/cbi/oled/setting.lua:7 -msgid "OLED" -msgstr "" - -#: ../../package/new/luci-app-oled/luasrc/view/oled/status.htm:7 -msgid "RUNNING" -msgstr "" - -#: ../../package/new/luci-app-oled/luasrc/controller/oled.lua:9 -msgid "Setting" -msgstr "設置" - -#: ../../package/new/luci-app-oled/luasrc/model/cbi/oled/setting.lua:13 -msgid "screensaver" -msgstr "屏保" diff --git a/luci-app-oled/root/etc/config/oled b/luci-app-oled/root/etc/config/oled deleted file mode 100644 index 2251da946..000000000 --- a/luci-app-oled/root/etc/config/oled +++ /dev/null @@ -1,25 +0,0 @@ -config oled - option drawline '0' - option drawrect '0' - option fillrect '0' - option drawcircle '0' - option drawroundrect '0' - option fillroundrect '0' - option drawtriangle '0' - option filltriangle '0' - option displaybitmap '0' - option displayinvertnormal '0' - option drawbitmapeg '0' - option date '1' - option netspeed '0' - option lanip '1' - option cpufreq '1' - option cputemp '1' - option time '60' - option enable '0' - option from '0' - option to '1440' - option autoswitch '0' - option scroll '1' - option text 'OPENWRT' - option netsource 'eth0' diff --git a/luci-app-oled/root/etc/init.d/oled b/luci-app-oled/root/etc/init.d/oled deleted file mode 100755 index a11f611df..000000000 --- a/luci-app-oled/root/etc/init.d/oled +++ /dev/null @@ -1,140 +0,0 @@ -#!/bin/sh /etc/rc.common -START=1OO - -PROG=/usr/bin/oled - -stop() { - kill -2 $(pgrep /usr/bin/oled) - kill -9 $(pgrep -f /usr/sbin/netspeed) - echo "oled exit..." -} - -start() { - enabled=$(uci get oled.@oled[0].enable) - if [ $enabled -eq 0 ]; then - exit 0 - fi - - autoswitch=$(uci get oled.@oled[0].autoswitch) - from=$(uci get oled.@oled[0].from) - to=$(uci get oled.@oled[0].to) - - if [ ${autoswitch} -eq 1 ]; then - hour=$(date +"%H") - min=$(date +"%M") - ihour=`expr $hour + 0` - imin=`expr $min + 0` - now=$(($ihour*60+$imin)) - if [[ $now -lt $from || $now -gt $to ]]; then - stop - exit 0 - fi - fi - - #crontab daemon - if ! grep "/etc/init.d/oled \+restart" /etc/crontabs/root >/dev/null 2>&1; then - echo "*/5 * * * * /etc/init.d/oled restart >/dev/null 2>&1" >> /etc/crontabs/root - fi - - date=$(uci get oled.@oled[0].date) - lanip=$(uci get oled.@oled[0].lanip) - cputemp=$(uci get oled.@oled[0].cputemp) - cpufreq=$(uci get oled.@oled[0].cpufreq) - netspeed=$(uci get oled.@oled[0].netspeed) - time=$(uci get oled.@oled[0].time) - drawline=$(uci get oled.@oled[0].drawline) - drawrect=$(uci get oled.@oled[0].drawrect) - fillrect=$(uci get oled.@oled[0].fillrect) - drawcircle=$(uci get oled.@oled[0].drawcircle) - drawroundrect=$(uci get oled.@oled[0].drawroundrect) - fillroundrect=$(uci get oled.@oled[0].fillroundrect) - drawtriangle=$(uci get oled.@oled[0].drawtriangle) - filltriangle=$(uci get oled.@oled[0].filltriangle) - displaybitmap=$(uci get oled.@oled[0].displaybitmap) - displayinvertnormal=$(uci get oled.@oled[0].displayinvertnormal) - drawbitmapeg=$(uci get oled.@oled[0].drawbitmapeg) - scroll=$(uci get oled.@oled[0].scroll) - text=$(uci get oled.@oled[0].text) - netsource=$(uci get oled.@oled[0].netsource) - - - if [ ${netspeed} -eq 1 ]; then - nohup /usr/sbin/netspeed ${netsource} >/dev/null 2>&1 & - else - kill -9 $(pgrep -f /usr/sbin/netspeed) - rm -f /tmp/netspeed - fi - nohup ${PROG} ${date} ${lanip} ${cputemp} ${cpufreq} ${netspeed} ${time} ${drawline} ${drawrect} ${fillrect} ${drawcircle} ${drawroundrect} ${fillroundrect} ${drawtriangle} ${filltriangle} ${displaybitmap} ${displayinvertnormal} ${drawbitmapeg} ${scroll} "${text}" "${netsource}" 1 > /dev/null 2>&1 & -} - - - - -restart(){ - enabled=$(uci get oled.@oled[0].enable) - pgrep -f ${PROG} >/dev/null - if [ $? -eq 0 ]; then - if [ $enabled -eq 1 ]; then - autoswitch=$(uci get oled.@oled[0].autoswitch) - from=$(uci get oled.@oled[0].from) - to=$(uci get oled.@oled[0].to) - if [ ${autoswitch} -eq 1 ]; then - hour=$(date +"%H") - min=$(date +"%M") - ihour=`expr $hour + 0` - imin=`expr $min + 0` - now=$(($ihour*60+$imin)) - if [[ $now -lt $from || $now -gt $to ]]; then - stop - exit 0 - fi - fi - - date=$(uci get oled.@oled[0].date) - lanip=$(uci get oled.@oled[0].lanip) - cputemp=$(uci get oled.@oled[0].cputemp) - cpufreq=$(uci get oled.@oled[0].cpufreq) - netspeed=$(uci get oled.@oled[0].netspeed) - time=$(uci get oled.@oled[0].time) - drawline=$(uci get oled.@oled[0].drawline) - drawrect=$(uci get oled.@oled[0].drawrect) - fillrect=$(uci get oled.@oled[0].fillrect) - drawcircle=$(uci get oled.@oled[0].drawcircle) - drawroundrect=$(uci get oled.@oled[0].drawroundrect) - fillroundrect=$(uci get oled.@oled[0].fillroundrect) - drawtriangle=$(uci get oled.@oled[0].drawtriangle) - filltriangle=$(uci get oled.@oled[0].filltriangle) - displaybitmap=$(uci get oled.@oled[0].displaybitmap) - displayinvertnormal=$(uci get oled.@oled[0].displayinvertnormal) - drawbitmapeg=$(uci get oled.@oled[0].drawbitmapeg) - scroll=$(uci get oled.@oled[0].scroll) - text=$(uci get oled.@oled[0].text) - netsource=$(uci get oled.@oled[0].netsource) - - - kill -9 $(pgrep /usr/bin/oled) - kill -9 $(pgrep -f /usr/sbin/netspeed) - - if [ ${netspeed} -eq 1 ]; then - nohup /usr/sbin/netspeed ${netsource} >/dev/null 2>&1 & - else - kill -9 $(pgrep -f /usr/sbin/netspeed) - rm -f /tmp/netspeed - fi - nohup ${PROG} ${date} ${lanip} ${cputemp} ${cpufreq} ${netspeed} ${time} ${drawline} ${drawrect} ${fillrect} ${drawcircle} ${drawroundrect} ${fillroundrect} ${drawtriangle} ${filltriangle} ${displaybitmap} ${displayinvertnormal} ${drawbitmapeg} ${scroll} "${text}" "${netsource}" 0 > /dev/null 2>&1 & - else - stop - fi - - else - if [ $enabled -eq 1 ]; then - start - else - exit 0 - fi - fi -} - -boot(){ - start -} diff --git a/luci-app-oled/root/etc/uci-defaults/oled b/luci-app-oled/root/etc/uci-defaults/oled deleted file mode 100644 index 81bc0a23f..000000000 --- a/luci-app-oled/root/etc/uci-defaults/oled +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -uci -q batch <<-EOF >/dev/null - delete ucitrack.@oled[-1] - add ucitrack oled - set ucitrack.@oled[-1].init=oled - commit ucitrack -EOF - -rm -rf /tmp/luci-* -exit 0 diff --git a/luci-app-oled/root/usr/sbin/netspeed b/luci-app-oled/root/usr/sbin/netspeed deleted file mode 100755 index 6be8ca48d..000000000 --- a/luci-app-oled/root/usr/sbin/netspeed +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/ash -IF=$1 -if [ -z "$IF" ]; then - IF=`ls -1 /sys/class/net/ | head -1` -fi -RXPREV=-1 -TXPREV=-1 -echo "Listening $IF..." -while [ 1 == 1 ] ; do - RX=`cat /sys/class/net/${IF}/statistics/rx_bytes` - TX=`cat /sys/class/net/${IF}/statistics/tx_bytes` - if [ $RXPREV -ne -1 ] ; then - let BWRX=$RX-$RXPREV - let BWTX=$TX-$TXPREV - echo "$BWRX $BWTX">/tmp/netspeed - fi - RXPREV=$RX - TXPREV=$TX - sleep 1 -done diff --git a/luci-app-oled/root/usr/share/rpcd/acl.d/luci-app-oled.json b/luci-app-oled/root/usr/share/rpcd/acl.d/luci-app-oled.json deleted file mode 100644 index 7c436b871..000000000 --- a/luci-app-oled/root/usr/share/rpcd/acl.d/luci-app-oled.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "luci-app-oled": { - "description": "Grant UCI access for luci-app-oled", - "read": { - "uci": [ "oled" ] - }, - "write": { - "uci": [ "oled" ] - } - } -} diff --git a/luci-app-oled/src/Example_Code/Main.c b/luci-app-oled/src/Example_Code/Main.c deleted file mode 100644 index 9bf87e697..000000000 --- a/luci-app-oled/src/Example_Code/Main.c +++ /dev/null @@ -1,232 +0,0 @@ -/* - * Main.c - * - * Created on : Sep 6, 2017 - * Author : Vinay Divakar - * Description : Example usage of the SSD1306 Driver API's - * Website : www.deeplyembedded.org - */ - -/* Lib Includes */ -#include -#include -#include -#include -#include - -/* Header Files */ -#include "I2C.h" -#include "SSD1306_OLED.h" -#include "example_app.h" - -/* Oh Compiler-Please leave me as is */ -volatile unsigned char flag = 0; - -/* Alarm Signal Handler */ -void ALARMhandler(int sig) -{ - /* Set flag */ - flag = 5; -} - -void BreakDeal(int sig) -{ - clearDisplay(); - usleep(1000000); - Display(); - exit(0); -} - - -int main(int argc, char* argv[]) -{ - int date=atoi(argv[1]); - int lanip=atoi(argv[2]); - int cputemp=atoi(argv[3]); - int cpufreq=atoi(argv[4]); - int netspeed=atoi(argv[5]); - int time=atoi(argv[6]); - int drawline=atoi(argv[7]); - int drawrect=atoi(argv[8]); - int fillrect=atoi(argv[9]); - int drawcircle=atoi(argv[10]); - int drawroundcircle=atoi(argv[11]); - int fillroundcircle=atoi(argv[12]); - int drawtriangle=atoi(argv[13]); - int filltriangle=atoi(argv[14]); - int displaybitmap=atoi(argv[15]); - int displayinvertnormal=atoi(argv[16]); - int drawbitmapeg=atoi(argv[17]); - int scroll=atoi(argv[18]); - char *text=argv[19]; - char *eth = argv[20]; - int needinit=atoi(argv[21]); - - - /* Initialize I2C bus and connect to the I2C Device */ - if(init_i2c_dev(I2C_DEV0_PATH, SSD1306_OLED_ADDR) == 0) - { - printf("(Main)i2c-2: Bus Connected to SSD1306\r\n"); - } - else - { - printf("(Main)i2c-2: OOPS! Something Went Wrong\r\n"); - exit(1); - } - - /* Register the Alarm Handler */ - signal(SIGALRM, ALARMhandler); - signal(SIGINT, BreakDeal); - //signal(SIGTERM, BreakDeal); -/* Run SDD1306 Initialization Sequence */ - if (needinit==1) {display_Init_seq();} - - /* Clear display */ - clearDisplay(); - - // draw a single pixel -// drawPixel(0, 1, WHITE); -// Display(); -// usleep(1000000); -// clearDisplay(); - - // draw many lines - while(1){ - - if(scroll){ - testscrolltext(text); - usleep(1000000); - clearDisplay(); - } - - if(drawline){ - testdrawline(); - usleep(1000000); - clearDisplay(); - } - - - // draw rectangles - if(drawrect){ - testdrawrect(); - usleep(1000000); - clearDisplay(); - } - - // draw multiple rectangles - if(fillrect){ - testfillrect(); - usleep(1000000); - clearDisplay(); - } - - // draw mulitple circles - if(drawcircle){ - testdrawcircle(); - usleep(1000000); - clearDisplay(); - } - - - // draw a white circle, 10 pixel radius - if(drawroundcircle){ - testdrawroundrect(); - usleep(1000000); - clearDisplay(); - } - - - // Fill the round rectangle - if(fillroundcircle){ - testfillroundrect(); - usleep(1000000); - clearDisplay(); - } - - // Draw triangles - if(drawtriangle){ - testdrawtriangle(); - usleep(1000000); - clearDisplay(); - } - // Fill triangles - if(filltriangle){ - testfilltriangle(); - usleep(1000000); - clearDisplay(); - } - - // Display miniature bitmap - if(displaybitmap){ - display_bitmap(); - Display(); - usleep(1000000); - }; - // Display Inverted image and normalize it back - if(displayinvertnormal){ - display_invert_normal(); - clearDisplay(); - usleep(1000000); - Display(); - - } - - // Generate Signal after 20 Seconds - - // draw a bitmap icon and 'animate' movement - if(drawbitmapeg){ - alarm(10); - flag=0; - testdrawbitmap_eg(); - clearDisplay(); - usleep(1000000); - Display(); - } - - - //setCursor(0,0); - setTextColor(WHITE); - // info display - int sum = date+lanip+cpufreq+cputemp+netspeed; - if (sum == 0) {clearDisplay(); return 0;} - for(int i = 1; i < time; i++){ - if (sum == 1){//only one item for display - if (date) testdate(CENTER, 8); - if (lanip) testlanip(CENTER, 8); - if (cpufreq) testcpufreq(CENTER, 8); - if (cputemp) testcputemp(CENTER, 8); - if (netspeed) testnetspeed(SPLIT,0); - Display(); - usleep(1000000); - clearDisplay(); - }else if (sum == 2){//two items for display - if(date) {testdate(CENTER, 16*(date-1));} - if(lanip) {testlanip(CENTER, 16*(date+lanip-1));} - if(cpufreq) {testcpufreq(CENTER, 16*(date+lanip+cpufreq-1));} - if(cputemp) {testcputemp(CENTER, 16*(date+lanip+cpufreq+cputemp-1));} - if(netspeed) {testnetspeed(MERGE, 16*(date+lanip+cpufreq+cputemp+netspeed-1));} - Display(); - usleep(1000000); - clearDisplay(); - } - else{//more than two items for display - if(date) {testdate(FULL, 8*(date-1));} - if(lanip) {testlanip(FULL, 8*(date+lanip-1));} - if(cpufreq && cputemp) { - testcpu(8*(date+lanip)); - if(netspeed) {testnetspeed(FULL, 8*(date+lanip+1+netspeed-1));} - } - else{ - if(cpufreq) {testcpufreq(FULL, 8*(date+lanip+cpufreq-1));} - if(cputemp) {testcputemp(FULL, 8*(date+lanip+cpufreq+cputemp-1));} - if(netspeed) {testnetspeed(FULL, 8*(date+lanip+cpufreq+cputemp+netspeed-1));} - } - - Display(); - usleep(1000000); - clearDisplay(); - } - } - } - -} diff --git a/luci-app-oled/src/Example_Code/example_app.c b/luci-app-oled/src/Example_Code/example_app.c deleted file mode 100644 index 9ce62d025..000000000 --- a/luci-app-oled/src/Example_Code/example_app.c +++ /dev/null @@ -1,650 +0,0 @@ -/* - * MIT License - -Copyright (c) 2017 DeeplyEmbedded - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -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. - - * example_app.c - * - * Created on : Sep 6, 2017 - * Author : Vinay Divakar - * Website : www.deeplyembedded.org - */ - -/* Lib Includes */ -#include -#include -#include -#include -#include -#include -#include -#include "SSD1306_OLED.h" -#include "example_app.h" - -#define BUFMAX SSD1306_LCDWIDTH*SSD1306_LCDHEIGHT - -/* MACRO's */ -#define LOGO16_GLCD_HEIGHT 16 -#define LOGO16_GLCD_WIDTH 16 -#define NUMFLAKES 10 -#define XPOS 0 -#define YPOS 1 -#define DELTAY 2 - - - -#define TIMESIZE 64 -//temperature -#define TEMPPATH "/sys/class/thermal/thermal_zone0/temp" -#define TEMPSIZE 5 -//cpu -#define FREQSIZE 8 -#define FREQPATH "cat /sys/devices/system/cpu/cpu[04]/cpufreq/cpuinfo_cur_freq" -//ip -#define IPPATH "ifconfig br-lan|grep 'inet addr:'|cut -d: -f2|awk '{print $1}'" -#define IPSIZE 20 -//netspeed -#define NETPATH "cat /tmp/netspeed" - -/* Extern volatile */ -extern volatile unsigned char flag; - -/* Bit Map - Taken from Adafruit SSD1306 OLED Library */ -static const unsigned char logo16_glcd_bmp[] = -{ - 0b00000000, 0b11000000, - 0b00000001, 0b11000000, - 0b00000001, 0b11000000, - 0b00000011, 0b11100000, - 0b11110011, 0b11100000, - 0b11111110, 0b11111000, - 0b01111110, 0b11111111, - 0b00110011, 0b10011111, - 0b00011111, 0b11111100, - 0b00001101, 0b01110000, - 0b00011011, 0b10100000, - 0b00111111, 0b11100000, - 0b00111111, 0b11110000, - 0b01111100, 0b11110000, - 0b01110000, 0b01110000, - 0b00000000, 0b00110000 -}; - -FILE *fp; -char content_buff[BUFMAX]; -char buf[BUFMAX]; -int display_offset =7; -/* draw many lines */ -void testdrawline() -{ - short i = 0; - for (i=0; i=0; i-=4) - { - drawLine(0, SSD1306_LCDHEIGHT-1, SSD1306_LCDWIDTH-1, i, WHITE); - Display(); - usleep(1000); - } - usleep(250000); - - clearDisplay(); - for (i=SSD1306_LCDWIDTH-1; i>=0; i-=4) - { - drawLine(SSD1306_LCDWIDTH-1, SSD1306_LCDHEIGHT-1, i, 0, WHITE); - Display(); - usleep(1000); - } - for (i=SSD1306_LCDHEIGHT-1; i>=0; i-=4) - { - drawLine(SSD1306_LCDWIDTH-1, SSD1306_LCDHEIGHT-1, 0, i, WHITE); - Display(); - usleep(1000); - } - usleep(250000); - - clearDisplay(); - for (i=0; i0; i-=5) - { - fillTriangle(SSD1306_LCDWIDTH/2, SSD1306_LCDHEIGHT/2-i, - SSD1306_LCDWIDTH/2-i, SSD1306_LCDHEIGHT/2+i, - SSD1306_LCDWIDTH/2+i, SSD1306_LCDHEIGHT/2+i, WHITE); - if (color == WHITE) - color = BLACK; - else - color = WHITE; - Display(); - usleep(1000); - } -} - -/* Display a bunch of characters and emoticons */ -void testdrawchar() -{ - unsigned char i = 0; - setTextSize(1); - setTextColor(WHITE); - setCursor(0,0); - - for (i=0; i < 168; i++) - { - if (i == '\n') - continue; - oled_write(i); - if ((i > 0) && (i % 21 == 0)) - println(); - } - Display(); - usleep(1000); -} - -/* Display "scroll" and scroll around */ -void testscrolltext(char* str) -{ - setTextSize(2); - setTextColor(WHITE); - setCursor(10,8); - sprintf(buf,"%s",str); - print_strln(buf); - Display(); - usleep(1000); - startscrollright(0x00, 0x0F); - usleep(5000000); - stopscroll(); - usleep(1000000); - startscrollleft(0x00, 0x0F); - usleep(5000000); - stopscroll(); - usleep(1000000); - startscrolldiagright(0x00, 0x07); - usleep(5000000); - startscrolldiagleft(0x00, 0x07); - usleep(5000000); - stopscroll(); -} - - - -/* Display Texts */ -void display_texts() -{ - setTextSize(1); - setTextColor(WHITE); - setCursor(10,0); - print_str("HELLO FELLAS!"); - println(); - printFloat_ln(3.141592, 4); //Print 4 No's after the decimal Pt. - printNumber_L_ln(-1234, DEC); - printNumber_UC_ln(170, BIN); - setTextSize(2); - setTextColor(WHITE); - print_str("0x"); - printNumber_UL_ln(0xDEADBEEF, HEX); -} - -/* Display miniature bitmap */ -void display_bitmap() -{ - drawBitmap(30, 16, logo16_glcd_bmp, 16, 16, 1); -} - -/* Invert Display and Normalize it */ -void display_invert_normal() -{ - invertDisplay(SSD1306_INVERT_DISPLAY); - usleep(1000000); - invertDisplay(SSD1306_NORMALIZE_DISPLAY); - usleep(1000000); -} - -/* Draw a bitmap and 'animate' movement */ -void testdrawbitmap(const unsigned char *bitmap, unsigned char w, unsigned char h) -{ - unsigned char icons[NUMFLAKES][3], f = 0; - - // initialize - for (f=0; f< NUMFLAKES; f++) - { - icons[f][XPOS] = rand() % SSD1306_LCDWIDTH; - icons[f][YPOS] = 0; - icons[f][DELTAY] = (rand() % 5) + 1; - - /* Looks kinna ugly to me - Un-Comment if you need it */ - //print_str("x: "); - //printNumber_UC(icons[f][XPOS], DEC); - //print_str("y: "); - //printNumber_UC(icons[f][YPOS], DEC); - //print_str("dy: "); - //printNumber_UC(icons[f][DELTAY], DEC); - } - - while (flag != 5) - { - // draw each icon - for (f=0; f< NUMFLAKES; f++) - { - drawBitmap(icons[f][XPOS], icons[f][YPOS], bitmap, w, h, WHITE); - } - Display(); - usleep(200000); - - // then erase it + move it - for (f=0; f< NUMFLAKES; f++) - { - drawBitmap(icons[f][XPOS], icons[f][YPOS], bitmap, w, h, BLACK); - - // move it - icons[f][YPOS] += icons[f][DELTAY]; - - // if its gone, reinit - if (icons[f][YPOS] > SSD1306_LCDHEIGHT) - { - icons[f][XPOS] = rand() % SSD1306_LCDWIDTH; - icons[f][YPOS] = 0; - icons[f][DELTAY] = (rand() % 5) + 1; - } - } - } -} - -/* Draw bitmap and animate */ -void testdrawbitmap_eg() -{ - setTextSize(1); - setTextColor(WHITE); - setCursor(10,0); - testdrawbitmap(logo16_glcd_bmp, LOGO16_GLCD_HEIGHT, LOGO16_GLCD_WIDTH); -} - -/* Intro */ -void deeplyembedded_credits() -{ - setTextSize(1); - setTextColor(WHITE); - setCursor(1,0); - print_strln("deeplyembedded.org"); - println(); - print_strln("Author:Vinay Divakar"); - println(); - println(); - print_strln("THANK YOU"); -} - - -void testdate(int mode, int y) -{ - time_t rawtime; - time_t curtime; - uint8_t timebuff[TIMESIZE]; - curtime = time(NULL); - time(&rawtime); - switch (mode) - { - case CENTER: - setTextSize(2); - strftime(timebuff,80,"%H:%M",localtime(&rawtime)); - sprintf(buf,"%s",timebuff); - setCursor((127-strlen(buf)*11)/2-4, y); - break; - case FULL: - setTextSize(1); - strftime(timebuff,80,"%Y-%m-%d %H:%M:%S",localtime(&rawtime)); - sprintf(buf,"%s",timebuff); - setCursor(display_offset, y); - } - print_strln(buf); -} - - -void testlanip(int mode, int y) -{ - setTextSize(1); - if((fp=popen(IPPATH,"r"))!=NULL) - { - fscanf(fp,"%s",content_buff); - fclose(fp); - //ipbuff[strlen(ipbuff)-1]=32; - switch(mode) - { - case CENTER: - setTextSize(1); - sprintf(buf,"%s",content_buff); - setCursor((127-strlen(buf)*6)/2, y+4); - break; - - case FULL: - setTextSize(1); - sprintf(buf,"IP:%s",content_buff); - setCursor(display_offset, y); - } - print_strln(buf); - } - -} - - -void testcputemp(int mode, int y) -{ - if((fp=fopen(TEMPPATH,"r"))!=NULL) - { - fgets(content_buff,TEMPSIZE,fp); - fclose(fp); - switch (mode) - { - case CENTER: - setTextSize(2); - sprintf(buf, "%.2f",atoi(content_buff)/100.0); - setCursor((127-(strlen(buf)+2)*11)/2-4, y); - print_str(buf); - oled_write(0); - oled_write(67); - drawCircle(getCursorX()-16, getCursorY()+3, 2, WHITE); - break; - case FULL: - setTextSize(1); - sprintf(buf,"CPU TEMP:%.2f",atoi(content_buff)/100.0); - setCursor(display_offset, y); - print_str(buf); - oled_write(0); - oled_write(67); - drawCircle(getCursorX()-8, getCursorY()+1, 1, WHITE); - } - - } - -} - - -void testcpufreq(int mode, int y) -{ - if((fp=popen(FREQPATH,"r")) != NULL) - { - fgets(content_buff,FREQSIZE,fp); - fclose(fp); - switch(mode) - { - case CENTER: - setTextSize(2); - sprintf(buf,"%4dMHz",atoi(content_buff)/1000); - setCursor((127-strlen(buf)*11)/2-4, y); - break; - case FULL: - setTextSize(1); - sprintf(buf,"CPU FREQ:%4dMHz",atoi(content_buff)/1000); - setCursor(display_offset, y); - } - print_strln(buf); - } - -} - -void testnetspeed(int mode, int y) -{ - int rx,tx; - if((fp=popen(NETPATH,"r")) != NULL) - { - fscanf(fp,"%d %d", &rx, &tx); - fclose(fp); - rx = rx; - tx = tx; - switch(mode) - { - case SPLIT: - setTextSize(2); - if (tx < 1000) sprintf(buf, "%03dB", tx); - else if (tx > 1000000) sprintf(buf, "%03dM", tx/1000000); - else sprintf(buf, "%03dK", tx/1000); - setCursor((127-(strlen(buf)+1)*11)/2,0); - oled_write(24); - print_str(buf); - - if (rx < 1000) sprintf(buf, "%03dB", rx); - else if (rx > 1000000) sprintf(buf, "%03dM", rx/1000000); - else sprintf(buf, "%03dK", rx/1000); - setCursor((127-(strlen(buf)+1)*11)/2,16); - oled_write(25); - print_str(buf); - break; - case MERGE: - setTextSize(1); - if (tx < 1000) sprintf(buf, "%03dB ", tx); - else if (tx > 1000000) sprintf(buf, "%03dM", tx/1000000); - else sprintf(buf, "%03dK ", tx/1000); - setCursor((127-(2*strlen(buf)-1)*6)/2-4, y+4); - oled_write(24); - print_str(buf); - - if (rx < 1000) sprintf(buf, "%03dB", rx); - else if (rx > 1000000) sprintf(buf, "%03dM", rx/1000000); - else sprintf(buf, "%03dK", rx/1000); - oled_write(25); - print_str(buf); - break; - case FULL: - setTextSize(1); - setCursor(display_offset, y); - oled_write(24); - if (tx < 1000) sprintf(buf, "%03dB ", tx); - else if (tx > 1000000) sprintf(buf, "%03dM", tx/1000000); - else sprintf(buf, "%03dK ", tx/1000); - print_str(buf); - - oled_write(25); - if (rx < 1000) sprintf(buf, "%03dB", rx); - else if (rx > 1000000) sprintf(buf, "%03dM", rx/1000000); - else sprintf(buf, "%03dK", rx/1000); - print_str(buf); - } - } -} -void testcpu(int y) -{ -//freq - setTextSize(1); - setCursor(display_offset, y); - if((fp=popen(FREQPATH,"r")) != NULL) - { - fgets(content_buff,FREQSIZE,fp); - fclose(fp); - sprintf(buf,"CPU:%4dMHz ", atoi(content_buff)/1000); - print_str(buf); - } - - -//temp - if((fp=fopen(TEMPPATH,"r"))!=NULL) - { - fgets(content_buff,TEMPSIZE,fp); - fclose(fp); - sprintf(buf, "%.2f",atoi(content_buff)/100.0); - print_str(buf); - oled_write(0); - oled_write(67); - drawCircle(getCursorX()-8, getCursorY()+1, 1, WHITE); - } -} - -void testprintinfo() -{ - setTextSize(1); - setTextColor(WHITE); - setCursor(0,0); -//DATE - - time_t rawtime; - time_t curtime; - uint8_t timebuff[TIMESIZE]; - curtime = time(NULL); - time(&rawtime); - strftime(timebuff,80,"%Y-%m-%d_%w %H:%M:%S",localtime(&rawtime)); - sprintf(buf,"%s",timebuff); - print_strln(buf); - - //br-lan ip - if((fp=popen(IPPATH,"r"))!=NULL) - { - fscanf(fp,"%s",content_buff); - fclose(fp); - //ipbuff[strlen(ipbuff)-1]=32; - sprintf(buf,"IP:%s",content_buff); - print_strln(buf); - } - - //CPU temp - if((fp=popen(FREQPATH,"r")) != NULL) - { - fgets(content_buff,FREQSIZE,fp); - fclose(fp); - sprintf(buf,"CPU freq:%d MHz ",atoi(content_buff)/1000); - print_strln(buf); - } - - //cpu freq - if((fp=fopen(TEMPPATH,"r"))!=NULL) - { - fgets(content_buff,TEMPSIZE,fp); - fclose(fp); - sprintf(buf,"CPU temp:%.2f C",atoi(content_buff)/100.0); - print_strln(buf); - } - - - -} - diff --git a/luci-app-oled/src/Example_Code/example_app.h b/luci-app-oled/src/Example_Code/example_app.h deleted file mode 100644 index eb0435826..000000000 --- a/luci-app-oled/src/Example_Code/example_app.h +++ /dev/null @@ -1,30 +0,0 @@ -#define CENTER 0 //single item display -#define SPLIT 1 //two items -#define MERGE 2 -#define FULL 3 - -void testdrawline(); -void testdrawrect(); -void testfillrect(); -void testdrawcircle(); -void testdrawroundrect(); -void testfillroundrect(); -void testdrawtriangle(); -void testfilltriangle(); -void testdrawchar(); -void testscrolltext(char *str); -void display_texts(); -void display_bitmap(); -void display_invert_normal(); -void testdrawbitmap(const unsigned char *bitmap, unsigned char w, unsigned char h); -void testdrawbitmap_eg(); -void deeplyembedded_credits(); -void testprintinfo(); -void testdate(int mode, int y); -void testlanip(int mode, int y); -void testcpufreq(int mode, int y); -void testcputemp(int mode, int y); -void testnetspeed(int mode, int y); -void testcpu(int y); - - diff --git a/luci-app-oled/src/I2C_Library/I2C.c b/luci-app-oled/src/I2C_Library/I2C.c deleted file mode 100644 index 7177f8424..000000000 --- a/luci-app-oled/src/I2C_Library/I2C.c +++ /dev/null @@ -1,281 +0,0 @@ -/* - * MIT License - -Copyright (c) 2017 DeeplyEmbedded - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -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. - - * I2C.c - * - * Created on : September 19, 2017 - * Author : Vinay Divakar - * Description : This is an I2C Library for the BeagleBone that consists of the API's to support the standard - * I2C operations. - * Website : www.deeplyembedded.org - */ - -/*Libs Includes*/ -#include -#include -#include -#include -#include -// heuristic to guess what version of i2c-dev.h we have: -// the one installed with `apt-get install libi2c-dev` -// would conflict with linux/i2c.h, while the stock -// one requires linus/i2c.h -#ifndef I2C_SMBUS_BLOCK_MAX -// If this is not defined, we have the "stock" i2c-dev.h -// so we include linux/i2c.h -#include -typedef unsigned char i2c_char_t; -#else -typedef char i2c_char_t; -#endif - -/* Header Files */ -#include "I2C.h" - - -/* Exposed objects for i2c-x */ -I2C_DeviceT I2C_DEV_2; - -/**************************************************************** - * Function Name : Open_device - * Description : Opens the I2C device to use - * Returns : 0 on success, -1 on failure - * Params @i2c_dev_path: Path to the I2C device - * @fd: Variable to store the file handler - ****************************************************************/ -int Open_device(char *i2c_dev_path, int *fd) -{ - if((*fd = open(i2c_dev_path, O_RDWR))<0) - return -1; - else - return 0; -} - - -/**************************************************************** - * Function Name : Close_device - * Description : Closes the I2C device in use - * Returns : 0 on success, -1 on failure - * Params : @fd: file descriptor - ****************************************************************/ -int Close_device(int fd) -{ - if(close(fd) == -1) - return -1; - else - return 0; -} - - -/**************************************************************** - * Function Name : Set_slave_addr - * Description : Connect to the Slave device - * Returns : 0 on success, -1 on failure - * Params @fd: File descriptor - * @slave_addr: Address of the slave device to - * talk to. - ****************************************************************/ -int Set_slave_addr(int fd, unsigned char slave_addr) -{ - if(ioctl(fd, I2C_SLAVE, slave_addr) < 0) - return -1; - else - return 0; -} - - -/**************************************************************** - * Function Name : i2c_write - * Description : Write a byte on SDA - * Returns : No. of bytes written on success, -1 on failure - * Params @fd: File descriptor - * @data: data to write on SDA - ****************************************************************/ -int i2c_write(int fd, unsigned char data) -{ - int ret = 0; - ret = write(fd, &data, I2C_ONE_BYTE); - if((ret == -1) || (ret != 1)) - return -1; - else - return(ret); -} - - -/**************************************************************** - * Function Name : i2c_read - * Description : Read a byte on SDA - * Returns : No. of bytes read on success, -1 on failure - * Params @fd: File descriptor - * @read_data: Points to the variable that stores - * the read data byte - ****************************************************************/ -int i2c_read(int fd, unsigned char *read_data) -{ - int ret = 0; - ret = read(fd, &read_data, I2C_ONE_BYTE); - if(ret == -1) - perror("I2C: Failed to read |"); - if(ret == 0) - perror("I2C: End of FILE |"); - return(ret); -} - - -/**************************************************************** - * Function Name : i2c_read_register - * Description : Read a single register of the slave device - * Returns : No. of bytes read on success, -1 on failure - * Params @fd: File descriptor - * @read_addr: Register address to be read - * @read_data: Points to the variable that stores - * the read data byte - ****************************************************************/ -int i2c_read_register(int fd, unsigned char read_addr, unsigned char *read_data) -{ - int ret = 0; - if(i2c_write(fd, read_addr) == -1) - { - perror("I2C: Failed to write |"); - return -1; - } - ret = read(fd, &read_data, I2C_ONE_BYTE); - if(ret == -1) - perror("I2C: Failed to read |"); - if(ret == 0) - perror("I2C: End of FILE |"); - return(ret); -} - - -/**************************************************************** - * Function Name : i2c_read_registers - * Description : Read a multiple registers on the slave device - * from starting address - * Returns : No. of bytes read on success, -1 on failure - * Params @fd: File descriptor - * @num: Number of registers/bytes to read from. - * @starting_addr: Starting address to read from - * @buff_Ptr: Buffer to store the read bytes - ****************************************************************/ -int i2c_read_registers(int fd, int num, unsigned char starting_addr, - unsigned char *buff_Ptr) -{ - int ret = 0; - if(i2c_write(fd, starting_addr) == -1) - { - perror("I2C: Failed to write |"); - return -1; - } - ret = read(fd, buff_Ptr, num); - if(ret == -1) - perror("I2C: Failed to read |"); - if(ret == 0) - perror("I2C: End of FILE |"); - return(ret); -} - - -/**************************************************************** - * Function Name : i2c_multiple_writes - * Description : Write multiple bytes on SDA - * Returns : No. of bytes written on success, -1 on failure - * Params @fd: file descriptor - * @num: No. of bytes to write - * @Ptr_buff: Pointer to the buffer containing the - * bytes to be written on the SDA - ****************************************************************/ -int i2c_multiple_writes(int fd, int num, unsigned char *Ptr_buff) -{ - int ret = 0; - ret = write(fd, Ptr_buff, num); - if((ret == -1) || (ret != num)) - return -1; - else - return(ret); -} - - -/**************************************************************** - * Function Name : i2c_write_register - * Description : Write a control byte or byte to a register - * Returns : No. of bytes written on success, -1 on failure - * Params @fd: file descriptor - * @reg_addr_or_cntrl: Control byte or Register - * address to be written - * @val: Command or value to be written in the - * addressed register - ****************************************************************/ -int i2c_write_register(int fd, unsigned char reg_addr_or_cntrl, unsigned char val) -{ - unsigned char buff[2]; - int ret = 0; - buff[0] = reg_addr_or_cntrl; - buff[1] = val; - ret = write(fd, buff, I2C_TWO_BYTES); - if((ret == -1) || (ret != I2C_TWO_BYTES)) - return -1; - else - return(ret); -} - - -/**************************************************************** - * Function Name : config_i2c_struct - * Description : Initialize the I2C device structure - * Returns : NONE - * Params @i2c_dev_path: Device path - * @slave_addr: Slave device address - * @i2c_dev: Pointer to the device structure - ****************************************************************/ -void config_i2c_struct(char *i2c_dev_path, unsigned char slave_addr, I2C_DevicePtr i2c_dev) -{ - i2c_dev->i2c_dev_path = i2c_dev_path; - i2c_dev->fd_i2c = 0; - i2c_dev->i2c_slave_addr = slave_addr; -} - - -/**************************************************************** - * Function Name : init_i2c_dev - * Description : Connect the i2c bus to the slave device - * Returns : 0 on success, -1 on failure - * Params @i2c_path: the path to the device - * @slave_addr: Slave device address - ****************************************************************/ -int init_i2c_dev(const char* i2c_path, unsigned char slave_address) -{ - config_i2c_struct((char*)i2c_path, slave_address, &I2C_DEV_2); - if(Open_device(I2C_DEV_2.i2c_dev_path, &I2C_DEV_2.fd_i2c) == -1) - { - perror("I2C: Failed to open device |"); - return -1; - } - if(Set_slave_addr(I2C_DEV_2.fd_i2c, I2C_DEV_2.i2c_slave_addr) == -1) - { - perror("I2C: Failed to connect to slave device |"); - return -1; - } - - return 0; -} diff --git a/luci-app-oled/src/I2C_Library/I2C.h b/luci-app-oled/src/I2C_Library/I2C.h deleted file mode 100644 index ffcc45933..000000000 --- a/luci-app-oled/src/I2C_Library/I2C.h +++ /dev/null @@ -1,69 +0,0 @@ -/* - * MIT License - -Copyright (c) 2017 DeeplyEmbedded - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -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. - - * I2C.h - * - * Created on : Sep 4, 2017 - * Author : Vinay Divakar - * Website : www.deeplyembedded.org - */ - -#ifndef I2C_H_ -#define I2C_H_ - -#include - -/* No. of bytes per transaction */ -#define I2C_ONE_BYTE 1 -#define I2C_TWO_BYTES 2 -#define I2C_THREE_BYTES 3 - -/*Definitions specific to i2c-x */ -#define I2C_DEV0_PATH "/dev/i2c-0" -#define I2C_DEV1_PATH "/dev/i2c-1" -#define I2C_DEV2_PATH "/dev/i2c-2" - -/*I2C device configuration structure*/ -typedef struct{ - char* i2c_dev_path; - int fd_i2c; - unsigned char i2c_slave_addr; -}I2C_DeviceT, *I2C_DevicePtr; - -/* Exposed Generic I2C Functions */ -extern int Open_device(char *i2c_dev_path, int *fd); -extern int Close_device(int fd); -extern int Set_slave_addr(int fd, unsigned char slave_addr); -extern int i2c_write(int fd, unsigned char data); -extern int i2c_read(int fd, unsigned char *read_data); -extern int i2c_read_register(int fd, unsigned char read_addr, unsigned char *read_data); -extern int i2c_read_registers(int fd, int num, unsigned char starting_addr, - unsigned char *buff_Ptr); -extern void config_i2c_struct(char *i2c_dev_path, unsigned char slave_addr, I2C_DevicePtr i2c_dev); -extern int i2c_multiple_writes(int fd, int num, unsigned char *Ptr_buff); -extern int i2c_write_register(int fd, unsigned char reg_addr_or_cntrl, unsigned char val); - -/* Exposed I2C-x Specific Functions */ -extern int init_i2c_dev(const char* i2c_path, unsigned char slave_address); - -#endif /* I2C_H_ */ diff --git a/luci-app-oled/src/LICENSE b/luci-app-oled/src/LICENSE deleted file mode 100644 index e99e91b40..000000000 --- a/luci-app-oled/src/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2017 DeeplyEmbedded - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -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. diff --git a/luci-app-oled/src/Makefile b/luci-app-oled/src/Makefile deleted file mode 100644 index 0f1b25559..000000000 --- a/luci-app-oled/src/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -CC = gcc -LD = gcc - -SOURCES = SSD1306_OLED_Library/SSD1306_OLED.c Example_Code/Main.c Example_Code/example_app.c I2C_Library/I2C.c -OBJS := $(SOURCES:.c=.o) -CPPFLAGS := -I SSD1306_OLED_Library -I I2C_Library -CFLAGS := -g - -oled: $(OBJS) - $(CC) $^ -o $@ - -clean: - rm -rf oled $(OBJS) - -compile: oled - -install: compile - mkdir -p $(DESTDIR)/usr/bin - cp oled $(DESTDIR)/usr/bin/oled diff --git a/luci-app-oled/src/README.md b/luci-app-oled/src/README.md deleted file mode 100644 index 080474f06..000000000 --- a/luci-app-oled/src/README.md +++ /dev/null @@ -1,21 +0,0 @@ -# SSD1306-OLED-display-driver-for-BeagleBone -This is a SSD1306 OLED Display Library fully compatible with the BeagleBone. - -The Library has 3 components: -1. I2C component for enabling communication between the BeagleBone and display. -2. Control component for sending I2C commands to configure and control the display. -3. Graphics component for drawing geometrical figures, bitmaps, texts, characters, emoticons and numbers. - -Author: Vinay Divakar - -References: -1. https://github.com/adafruit/Adafruit_SSD1306 -2. https://github.com/adafruit/Adafruit-GFX-Library - -Youtube demo: https://youtu.be/sDKf6zW6Pyg - -MIT license, check LICENSE file for more information - -This Library is written in C. To use it, just include the I2C and SSD1306 Libraries in your project. - -Enjoy :) diff --git a/luci-app-oled/src/SSD1306_OLED_Library/SSD1306_OLED.c b/luci-app-oled/src/SSD1306_OLED_Library/SSD1306_OLED.c deleted file mode 100644 index 0cbd92bf2..000000000 --- a/luci-app-oled/src/SSD1306_OLED_Library/SSD1306_OLED.c +++ /dev/null @@ -1,2713 +0,0 @@ -/* - * MIT License - -Copyright (c) 2017 DeeplyEmbedded - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -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. - - * SSD1306_OLED.c - * - * Created on : Sep 26, 2017 - * Author : Vinay Divakar - * Description : SSD1306 OLED Driver, Graphics API's. - * Website : www.deeplyembedded.org - */ - -/* Lib Includes */ -#include -#include -#include -#include -#include -#include "I2C.h" -#include "SSD1306_OLED.h" -#include "gfxfont.h" - -/* Enable or Disable DEBUG Prints */ -//#define SSD1306_DBG - -/* MACROS */ -#define SWAP(x,y) {short temp; temp = x; x = y; y = temp;} -#define pgm_read_byte(addr) (*(const unsigned char *)(addr)) -#define pgm_read_word(addr) (*(const unsigned long *)(addr)) -#define pgm_read_dword(addr) (*(const unsigned long *)(addr)) -#define pgm_read_pointer(addr) ((void *)pgm_read_word(addr)) - -/* static Variables */ -static unsigned char _rotation = 0,textsize = 0; -static short _width = SSD1306_LCDWIDTH; -static short _height = SSD1306_LCDHEIGHT; -static short cursor_x = 0, cursor_y = 0, textcolor = 0, textbgcolor = 0; -static bool _cp437 = false, wrap = true; - -/* static struct objects */ -static GFXfontPtr gfxFont; - -/* Externs - I2C.c */ -extern I2C_DeviceT I2C_DEV_2; - -/* Chunk Buffer */ -static unsigned char chunk[17] = {0}; - -/* Memory buffer for displaying data on LCD - This is an Apple - Fruit */ -static unsigned char screen[DISPLAY_BUFF_SIZE] ={0}; - -/* Static Functions */ -static void transfer(); -static void drawFastVLine(short x, short y,short h, short color); -static void writeFastVLine(short x, short y, short h, short color); -static void drawFastHLine(short x, short y,short w, short color); -static void writeFastHLine(short x, short y, short w, short color); -static short print(const unsigned char *buffer, short size); - -// Standard ASCII 5x7 font -static const unsigned char ssd1306_font5x7[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, //space - 0x3E, 0x5B, 0x4F, 0x5B, 0x3E, - 0x3E, 0x6B, 0x4F, 0x6B, 0x3E, - 0x1C, 0x3E, 0x7C, 0x3E, 0x1C, - 0x18, 0x3C, 0x7E, 0x3C, 0x18, - 0x1C, 0x57, 0x7D, 0x57, 0x1C, - 0x1C, 0x5E, 0x7F, 0x5E, 0x1C, - 0x00, 0x18, 0x3C, 0x18, 0x00, - 0xFF, 0xE7, 0xC3, 0xE7, 0xFF, - 0x00, 0x18, 0x24, 0x18, 0x00, - 0xFF, 0xE7, 0xDB, 0xE7, 0xFF, - 0x30, 0x48, 0x3A, 0x06, 0x0E, - 0x26, 0x29, 0x79, 0x29, 0x26, - 0x40, 0x7F, 0x05, 0x05, 0x07, - 0x40, 0x7F, 0x05, 0x25, 0x3F, - 0x5A, 0x3C, 0xE7, 0x3C, 0x5A, - 0x7F, 0x3E, 0x1C, 0x1C, 0x08, - 0x08, 0x1C, 0x1C, 0x3E, 0x7F, - 0x14, 0x22, 0x7F, 0x22, 0x14, - 0x5F, 0x5F, 0x00, 0x5F, 0x5F, - 0x06, 0x09, 0x7F, 0x01, 0x7F, - 0x00, 0x66, 0x89, 0x95, 0x6A, - 0x60, 0x60, 0x60, 0x60, 0x60, - 0x94, 0xA2, 0xFF, 0xA2, 0x94, - 0x08, 0x04, 0x7E, 0x04, 0x08,//up INDEX 24 - 0x10, 0x20, 0x7E, 0x20, 0x10,//down INDEX 25 - 0x08, 0x08, 0x2A, 0x1C, 0x08, - 0x08, 0x1C, 0x2A, 0x08, 0x08, - 0x1E, 0x10, 0x10, 0x10, 0x10, - 0x0C, 0x1E, 0x0C, 0x1E, 0x0C, - 0x30, 0x38, 0x3E, 0x38, 0x30, - 0x06, 0x0E, 0x3E, 0x0E, 0x06, - 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x5F, 0x00, 0x00, - 0x00, 0x07, 0x00, 0x07, 0x00, - 0x14, 0x7F, 0x14, 0x7F, 0x14, - 0x24, 0x2A, 0x7F, 0x2A, 0x12, - 0x23, 0x13, 0x08, 0x64, 0x62, - 0x36, 0x49, 0x56, 0x20, 0x50, - 0x00, 0x08, 0x07, 0x03, 0x00, - 0x00, 0x1C, 0x22, 0x41, 0x00, - 0x00, 0x41, 0x22, 0x1C, 0x00, - 0x2A, 0x1C, 0x7F, 0x1C, 0x2A, - 0x08, 0x08, 0x3E, 0x08, 0x08, - 0x00, 0x80, 0x70, 0x30, 0x00, - 0x08, 0x08, 0x08, 0x08, 0x08, - 0x00, 0x00, 0x60, 0x60, 0x00, - 0x20, 0x10, 0x08, 0x04, 0x02, - 0x3E, 0x51, 0x49, 0x45, 0x3E, - 0x00, 0x42, 0x7F, 0x40, 0x00, - 0x72, 0x49, 0x49, 0x49, 0x46, - 0x21, 0x41, 0x49, 0x4D, 0x33, - 0x18, 0x14, 0x12, 0x7F, 0x10, - 0x27, 0x45, 0x45, 0x45, 0x39, - 0x3C, 0x4A, 0x49, 0x49, 0x31, - 0x41, 0x21, 0x11, 0x09, 0x07, - 0x36, 0x49, 0x49, 0x49, 0x36, - 0x46, 0x49, 0x49, 0x29, 0x1E, - 0x00, 0x00, 0x14, 0x00, 0x00, - 0x00, 0x40, 0x34, 0x00, 0x00, - 0x00, 0x08, 0x14, 0x22, 0x41, - 0x14, 0x14, 0x14, 0x14, 0x14, - 0x00, 0x41, 0x22, 0x14, 0x08, - 0x02, 0x01, 0x59, 0x09, 0x06, - 0x3E, 0x41, 0x5D, 0x59, 0x4E, - 0x7C, 0x12, 0x11, 0x12, 0x7C, - 0x7F, 0x49, 0x49, 0x49, 0x36, - 0x3E, 0x41, 0x41, 0x41, 0x22,//C - 0x7F, 0x41, 0x41, 0x41, 0x3E,//D - 0x7F, 0x49, 0x49, 0x49, 0x41,//E - 0x7F, 0x09, 0x09, 0x09, 0x01,//F - 0x3E, 0x41, 0x41, 0x51, 0x73, - 0x7F, 0x08, 0x08, 0x08, 0x7F, - 0x00, 0x41, 0x7F, 0x41, 0x00, - 0x20, 0x40, 0x41, 0x3F, 0x01, - 0x7F, 0x08, 0x14, 0x22, 0x41, - 0x7F, 0x40, 0x40, 0x40, 0x40, - 0x7F, 0x02, 0x1C, 0x02, 0x7F, - 0x7F, 0x04, 0x08, 0x10, 0x7F, - 0x3E, 0x41, 0x41, 0x41, 0x3E, - 0x7F, 0x09, 0x09, 0x09, 0x06, - 0x3E, 0x41, 0x51, 0x21, 0x5E, - 0x7F, 0x09, 0x19, 0x29, 0x46, - 0x26, 0x49, 0x49, 0x49, 0x32, - 0x03, 0x01, 0x7F, 0x01, 0x03, - 0x3F, 0x40, 0x40, 0x40, 0x3F, - 0x1F, 0x20, 0x40, 0x20, 0x1F, - 0x3F, 0x40, 0x38, 0x40, 0x3F, - 0x63, 0x14, 0x08, 0x14, 0x63, - 0x03, 0x04, 0x78, 0x04, 0x03, - 0x61, 0x59, 0x49, 0x4D, 0x43, - 0x00, 0x7F, 0x41, 0x41, 0x41, - 0x02, 0x04, 0x08, 0x10, 0x20, - 0x00, 0x41, 0x41, 0x41, 0x7F, - 0x04, 0x02, 0x01, 0x02, 0x04, - 0x40, 0x40, 0x40, 0x40, 0x40, - 0x00, 0x03, 0x07, 0x08, 0x00, - 0x20, 0x54, 0x54, 0x78, 0x40, - 0x7F, 0x28, 0x44, 0x44, 0x38, - 0x38, 0x44, 0x44, 0x44, 0x28, - 0x38, 0x44, 0x44, 0x28, 0x7F, - 0x38, 0x54, 0x54, 0x54, 0x18, - 0x00, 0x08, 0x7E, 0x09, 0x02, - 0x18, 0xA4, 0xA4, 0x9C, 0x78, - 0x7F, 0x08, 0x04, 0x04, 0x78, - 0x00, 0x44, 0x7D, 0x40, 0x00, - 0x20, 0x40, 0x40, 0x3D, 0x00, - 0x7F, 0x10, 0x28, 0x44, 0x00, - 0x00, 0x41, 0x7F, 0x40, 0x00, - 0x7C, 0x04, 0x78, 0x04, 0x78, - 0x7C, 0x08, 0x04, 0x04, 0x78, - 0x38, 0x44, 0x44, 0x44, 0x38, - 0xFC, 0x18, 0x24, 0x24, 0x18, - 0x18, 0x24, 0x24, 0x18, 0xFC, - 0x7C, 0x08, 0x04, 0x04, 0x08, - 0x48, 0x54, 0x54, 0x54, 0x24, - 0x04, 0x04, 0x3F, 0x44, 0x24, - 0x3C, 0x40, 0x40, 0x20, 0x7C, - 0x1C, 0x20, 0x40, 0x20, 0x1C, - 0x3C, 0x40, 0x30, 0x40, 0x3C, - 0x44, 0x28, 0x10, 0x28, 0x44, - 0x4C, 0x90, 0x90, 0x90, 0x7C, - 0x44, 0x64, 0x54, 0x4C, 0x44, - 0x00, 0x08, 0x36, 0x41, 0x00, - 0x00, 0x00, 0x77, 0x00, 0x00, - 0x00, 0x41, 0x36, 0x08, 0x00, - 0x02, 0x01, 0x02, 0x04, 0x02, - 0x3C, 0x26, 0x23, 0x26, 0x3C, - 0x1E, 0xA1, 0xA1, 0x61, 0x12, - 0x3A, 0x40, 0x40, 0x20, 0x7A, - 0x38, 0x54, 0x54, 0x55, 0x59, - 0x21, 0x55, 0x55, 0x79, 0x41, - 0x22, 0x54, 0x54, 0x78, 0x42, // a-umlaut - 0x21, 0x55, 0x54, 0x78, 0x40, - 0x20, 0x54, 0x55, 0x79, 0x40, - 0x0C, 0x1E, 0x52, 0x72, 0x12, - 0x39, 0x55, 0x55, 0x55, 0x59, - 0x39, 0x54, 0x54, 0x54, 0x59, - 0x39, 0x55, 0x54, 0x54, 0x58, - 0x00, 0x00, 0x45, 0x7C, 0x41, - 0x00, 0x02, 0x45, 0x7D, 0x42, - 0x00, 0x01, 0x45, 0x7C, 0x40, - 0x7D, 0x12, 0x11, 0x12, 0x7D, // A-umlaut - 0xF0, 0x28, 0x25, 0x28, 0xF0, - 0x7C, 0x54, 0x55, 0x45, 0x00, - 0x20, 0x54, 0x54, 0x7C, 0x54, - 0x7C, 0x0A, 0x09, 0x7F, 0x49, - 0x32, 0x49, 0x49, 0x49, 0x32, - 0x3A, 0x44, 0x44, 0x44, 0x3A, // o-umlaut - 0x32, 0x4A, 0x48, 0x48, 0x30, - 0x3A, 0x41, 0x41, 0x21, 0x7A, - 0x3A, 0x42, 0x40, 0x20, 0x78, - 0x00, 0x9D, 0xA0, 0xA0, 0x7D, - 0x3D, 0x42, 0x42, 0x42, 0x3D, // O-umlaut - 0x3D, 0x40, 0x40, 0x40, 0x3D, - 0x3C, 0x24, 0xFF, 0x24, 0x24, - 0x48, 0x7E, 0x49, 0x43, 0x66, - 0x2B, 0x2F, 0xFC, 0x2F, 0x2B, - 0xFF, 0x09, 0x29, 0xF6, 0x20, - 0xC0, 0x88, 0x7E, 0x09, 0x03, - 0x20, 0x54, 0x54, 0x79, 0x41, - 0x00, 0x00, 0x44, 0x7D, 0x41, - 0x30, 0x48, 0x48, 0x4A, 0x32, - 0x38, 0x40, 0x40, 0x22, 0x7A, - 0x00, 0x7A, 0x0A, 0x0A, 0x72, - 0x7D, 0x0D, 0x19, 0x31, 0x7D, - 0x26, 0x29, 0x29, 0x2F, 0x28, - 0x26, 0x29, 0x29, 0x29, 0x26, - 0x30, 0x48, 0x4D, 0x40, 0x20, - 0x38, 0x08, 0x08, 0x08, 0x08, - 0x08, 0x08, 0x08, 0x08, 0x38, - 0x2F, 0x10, 0xC8, 0xAC, 0xBA, - 0x2F, 0x10, 0x28, 0x34, 0xFA, - 0x00, 0x00, 0x7B, 0x00, 0x00, - 0x08, 0x14, 0x2A, 0x14, 0x22, - 0x22, 0x14, 0x2A, 0x14, 0x08, - 0x55, 0x00, 0x55, 0x00, 0x55, // #176 (25% block) missing in old code - 0xAA, 0x55, 0xAA, 0x55, 0xAA, // 50% block - 0xFF, 0x55, 0xFF, 0x55, 0xFF, // 75% block - 0x00, 0x00, 0x00, 0xFF, 0x00, - 0x10, 0x10, 0x10, 0xFF, 0x00, - 0x14, 0x14, 0x14, 0xFF, 0x00, - 0x10, 0x10, 0xFF, 0x00, 0xFF, - 0x10, 0x10, 0xF0, 0x10, 0xF0, - 0x14, 0x14, 0x14, 0xFC, 0x00, - 0x14, 0x14, 0xF7, 0x00, 0xFF, - 0x00, 0x00, 0xFF, 0x00, 0xFF, - 0x14, 0x14, 0xF4, 0x04, 0xFC, - 0x14, 0x14, 0x17, 0x10, 0x1F, - 0x10, 0x10, 0x1F, 0x10, 0x1F, - 0x14, 0x14, 0x14, 0x1F, 0x00, - 0x10, 0x10, 0x10, 0xF0, 0x00, - 0x00, 0x00, 0x00, 0x1F, 0x10, - 0x10, 0x10, 0x10, 0x1F, 0x10, - 0x10, 0x10, 0x10, 0xF0, 0x10, - 0x00, 0x00, 0x00, 0xFF, 0x10, - 0x10, 0x10, 0x10, 0x10, 0x10, - 0x10, 0x10, 0x10, 0xFF, 0x10, - 0x00, 0x00, 0x00, 0xFF, 0x14, - 0x00, 0x00, 0xFF, 0x00, 0xFF, - 0x00, 0x00, 0x1F, 0x10, 0x17, - 0x00, 0x00, 0xFC, 0x04, 0xF4, - 0x14, 0x14, 0x17, 0x10, 0x17, - 0x14, 0x14, 0xF4, 0x04, 0xF4, - 0x00, 0x00, 0xFF, 0x00, 0xF7, - 0x14, 0x14, 0x14, 0x14, 0x14, - 0x14, 0x14, 0xF7, 0x00, 0xF7, - 0x14, 0x14, 0x14, 0x17, 0x14, - 0x10, 0x10, 0x1F, 0x10, 0x1F, - 0x14, 0x14, 0x14, 0xF4, 0x14, - 0x10, 0x10, 0xF0, 0x10, 0xF0, - 0x00, 0x00, 0x1F, 0x10, 0x1F, - 0x00, 0x00, 0x00, 0x1F, 0x14, - 0x00, 0x00, 0x00, 0xFC, 0x14, - 0x00, 0x00, 0xF0, 0x10, 0xF0, - 0x10, 0x10, 0xFF, 0x10, 0xFF, - 0x14, 0x14, 0x14, 0xFF, 0x14, - 0x10, 0x10, 0x10, 0x1F, 0x00, - 0x00, 0x00, 0x00, 0xF0, 0x10, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, - 0xFF, 0xFF, 0xFF, 0x00, 0x00, - 0x00, 0x00, 0x00, 0xFF, 0xFF, - 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, - 0x38, 0x44, 0x44, 0x38, 0x44, - 0xFC, 0x4A, 0x4A, 0x4A, 0x34, // sharp-s or beta - 0x7E, 0x02, 0x02, 0x06, 0x06, - 0x02, 0x7E, 0x02, 0x7E, 0x02, - 0x63, 0x55, 0x49, 0x41, 0x63, - 0x38, 0x44, 0x44, 0x3C, 0x04, - 0x40, 0x7E, 0x20, 0x1E, 0x20, - 0x06, 0x02, 0x7E, 0x02, 0x02, - 0x99, 0xA5, 0xE7, 0xA5, 0x99, - 0x1C, 0x2A, 0x49, 0x2A, 0x1C, - 0x4C, 0x72, 0x01, 0x72, 0x4C, - 0x30, 0x4A, 0x4D, 0x4D, 0x30, - 0x30, 0x48, 0x78, 0x48, 0x30, - 0xBC, 0x62, 0x5A, 0x46, 0x3D, - 0x3E, 0x49, 0x49, 0x49, 0x00, - 0x7E, 0x01, 0x01, 0x01, 0x7E, - 0x2A, 0x2A, 0x2A, 0x2A, 0x2A, - 0x44, 0x44, 0x5F, 0x44, 0x44, - 0x40, 0x51, 0x4A, 0x44, 0x40, - 0x40, 0x44, 0x4A, 0x51, 0x40, - 0x00, 0x00, 0xFF, 0x01, 0x03, - 0xE0, 0x80, 0xFF, 0x00, 0x00, - 0x08, 0x08, 0x6B, 0x6B, 0x08, - 0x36, 0x12, 0x36, 0x24, 0x36, - 0x06, 0x0F, 0x09, 0x0F, 0x06, - 0x00, 0x00, 0x18, 0x18, 0x00, - 0x00, 0x00, 0x10, 0x10, 0x00, - 0x30, 0x40, 0xFF, 0x01, 0x01, - 0x00, 0x1F, 0x01, 0x01, 0x1E, - 0x00, 0x19, 0x1D, 0x17, 0x12, - 0x00, 0x3C, 0x3C, 0x3C, 0x3C, - 0x00, 0x00, 0x00, 0x00, 0x00 // #255 NBSP -}; - -/**************************************************************** - * Function Name : clearDisplay - * Description : Clear the display memory buffer - * Returns : NONE. - * Params : NONE. - ****************************************************************/ -void clearDisplay() -{ - memset(screen, 0x00, DISPLAY_BUFF_SIZE); -} - -/**************************************************************** - * Function Name : display_Init_seq - * Description : Performs SSD1306 OLED Initialization Sequence - * Returns : NONE. - * Params : NONE. - ****************************************************************/ -void display_Init_seq() -{ - /* Add the reset code, If needed */ - - /* Send display OFF command */ - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, SSD1306_DISPLAY_OFF) == I2C_TWO_BYTES) - { -#ifdef SSD1306_DBG - printf("Display OFF Command Passed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("Display OFF Command Failed\r\n"); -#endif - exit(1); - } - - /* Set display clock frequency */ - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, SSD1306_SET_DISP_CLK) == I2C_TWO_BYTES) - { -#ifdef SSD1306_DBG - printf("Display CLK Command Passed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("Display CLK Command Failed\r\n"); -#endif - exit(1); - } - - /* Send display CLK command parameter */ - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, SSD1306_DISPCLK_DIV) == I2C_TWO_BYTES) - { -#ifdef SSD1306_DBG - printf("Display CLK Command Parameter Passed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("Display CLK Command Parameter Failed\r\n"); -#endif - exit(1); - } - - /* Set display multiplex */ - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, SSD1306_SET_MULTIPLEX) == I2C_TWO_BYTES) - { -#ifdef SSD1306_DBG - printf("Display MULT Command Passed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("Display MULT Command Failed\r\n"); -#endif - exit(1); - } - - /* Send display MULT command parameter */ - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, SSD1306_MULT_DAT) == I2C_TWO_BYTES) - { -#ifdef SSD1306_DBG - printf("Display MULT Command Parameter Passed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("Display MULT Command Parameter Failed\r\n"); -#endif - exit(1); - } - - /* Set display OFFSET */ - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, SSD1306_SET_DISP_OFFSET) == I2C_TWO_BYTES) - { -#ifdef SSD1306_DBG - printf("Display OFFSET Command Passed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("Display OFFSET Command Failed\r\n"); -#endif - exit(1); - } - - /* Send display OFFSET command parameter */ - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, SSD1306_DISP_OFFSET_VAL) == I2C_TWO_BYTES) - { -#ifdef SSD1306_DBG - printf("Display OFFSET Command Parameter Passed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("Display OFFSET Command Parameter Failed\r\n"); -#endif - exit(1); - } - - /* Set display START LINE - Check this command if something weird happens */ - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, SSD1306_SET_DISP_START_LINE) == I2C_TWO_BYTES) - { -#ifdef SSD1306_DBG - printf("Display START LINE Command Passed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("Display START LINE Command Failed\r\n"); -#endif - exit(1); - } - - /* Enable CHARGEPUMP*/ - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, SSD1306_CONFIG_CHARGE_PUMP) == I2C_TWO_BYTES) - { -#ifdef SSD1306_DBG - printf("Display CHARGEPUMP Command Passed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("Display CHARGEPUMP Command Failed\r\n"); -#endif - exit(1); - } - - /* Send display CHARGEPUMP command parameter */ - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, SSD1306_CHARGE_PUMP_EN) == I2C_TWO_BYTES) - { -#ifdef SSD1306_DBG - printf("Display CHARGEPUMP Command Parameter Passed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("Display CHARGEPUMP Command Parameter Failed\r\n"); -#endif - exit(1); - } - - /* Set display MEMORYMODE */ - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, SSD1306_SET_MEM_ADDR_MODE) == I2C_TWO_BYTES) - { -#ifdef SSD1306_DBG - printf("Display MEMORYMODE Command Passed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("Display MEMORYMODE Command Failed\r\n"); -#endif - exit(1); - } - - /* Send display HORIZONTAL MEMORY ADDR MODE command parameter */ - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, SSD1306_HOR_MM) == I2C_TWO_BYTES) - { -#ifdef SSD1306_DBG - printf("Display HORIZONTAL MEMORY ADDR MODE Command Parameter Passed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("Display HORIZONTAL MEMORY ADDR MODE Command Parameter Failed\r\n"); -#endif - exit(1); - } - - /* Set display SEG_REMAP */ - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, SSD1306_SEG_REMAP) == I2C_TWO_BYTES) - { -#ifdef SSD1306_DBG - printf("Display SEG_REMAP Command Passed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("Display SEG_REMAP Command Failed\r\n"); -#endif - exit(1); - } - - /* Set display DIR */ - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, SSD1306_SET_COMSCANDEC) == I2C_TWO_BYTES) - { -#ifdef SSD1306_DBG - printf("Display DIR Command Passed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("Display DIR Command Failed\r\n"); -#endif - exit(1); - } - - /* Set display COM */ - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, SSD1306_SET_COMPINS) == I2C_TWO_BYTES) - { -#ifdef SSD1306_DBG - printf("Display COM Command Passed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("Display COM Command Failed\r\n"); -#endif - exit(1); - } - - /* Send display COM command parameter */ - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, SSD1306_CONFIG_COM_PINS) == I2C_TWO_BYTES) - { -#ifdef SSD1306_DBG - printf("Display COM Command Parameter Passed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("Display COM Command Parameter Failed\r\n"); -#endif - exit(1); - } - - /* Set display CONTRAST */ - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, SSD1306_SET_CONTRAST) == I2C_TWO_BYTES) - { -#ifdef SSD1306_DBG - printf("Display CONTRAST Command Passed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("Display CONTRAST Command Failed\r\n"); -#endif - exit(1); - } - - /* Send display CONTRAST command parameter */ - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, SSD1306_CONTRAST_VAL) == I2C_TWO_BYTES) - { -#ifdef SSD1306_DBG - printf("Display CONTRAST Command Parameter Passed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("Display CONTRAST Command Parameter Failed\r\n"); -#endif - exit(1); - } - - /* Set display PRECHARGE */ - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, SSD1306_SET_PRECHARGE) == I2C_TWO_BYTES) - { -#ifdef SSD1306_DBG - printf("Display PRECHARGE Command Passed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("Display PRECHARGE Command Failed\r\n"); -#endif - exit(1); - } - - /* Send display PRECHARGE command parameter */ - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, SSD1306_PRECHARGE_VAL) == I2C_TWO_BYTES) - { -#ifdef SSD1306_DBG - printf("Display PRECHARGE Command Parameter Passed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("Display PRECHARGE Command Parameter Failed\r\n"); -#endif - exit(1); - } - - /* Set display VCOMH */ - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, SSD1306_SET_VCOMDETECT) == I2C_TWO_BYTES) - { -#ifdef SSD1306_DBG - printf("Display VCOMH Command Passed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("Display VCOMH Command Failed\r\n"); -#endif - exit(1); - } - - /* Send display VCOMH command parameter */ - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, SSD1306_VCOMH_VAL) == I2C_TWO_BYTES) - { -#ifdef SSD1306_DBG - printf("Display VCOMH Command Parameter Passed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("Display VCOMH Command Parameter Failed\r\n"); -#endif - exit(1); - } - - /* Set display ALL-ON */ - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, SSD1306_DISPLAYALLON_RESUME) == I2C_TWO_BYTES) - { -#ifdef SSD1306_DBG - printf("Display ALL-ON Command Passed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("Display ALL-ON Command Failed\r\n"); -#endif - exit(1); - } - - /* Set display to NORMAL-DISPLAY */ - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, SSD1306_NORMAL_DISPLAY) == I2C_TWO_BYTES) - { -#ifdef SSD1306_DBG - printf("Display NORMAL-DISPLAY Command Passed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("Display NORMAL-DISPLAY Command Failed\r\n"); -#endif - exit(1); - } - - /* Set display to DEACTIVATE_SCROLL */ - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, SSD1306_DEACTIVATE_SCROLL) == I2C_TWO_BYTES) - { -#ifdef SSD1306_DBG - printf("Display DEACTIVATE_SCROLL Command Passed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("Display DEACTIVATE_SCROLL Command Failed\r\n"); -#endif - exit(1); - } - - /* Set display to TURN-ON */ - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, SSD1306_DISPLAYON) == I2C_TWO_BYTES) - { -#ifdef SSD1306_DBG - printf("Display TURN-ON Command Passed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("Display TURN-ON Command Failed\r\n"); -#endif - exit(1); - } -} - -/**************************************************************** - * Function Name : transfer - * Description : Transfer the frame buffer onto the display - * Returns : NONE. - * Params : NONE. - ****************************************************************/ -void transfer() -{ - short loop_1 = 0, loop_2 = 0; - short index = 0x00; - for (loop_1 = 0; loop_1 < 1024; loop_1++) - { - chunk[0] = 0x40; - for(loop_2 = 1; loop_2 < 17; loop_2++) - chunk[loop_2] = screen[index++]; - if(i2c_multiple_writes(I2C_DEV_2.fd_i2c, 17, chunk) == 17) - { -#ifdef SSD1306_DBG - printf("Chunk written to RAM - Completed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("Chunk written to RAM - Failed\r\n"); -#endif - exit(1); - } - - memset(chunk,0x00,17); - if(index == 1024) - break; - } -} - - -/**************************************************************** - * Function Name : Display - * Description : 1. Resets the column and page addresses. - * 2. Displays the contents of the memory buffer. - * Returns : NONE. - * Params : NONE. - * Note : Each new form can be preceded by a clearDisplay. - ****************************************************************/ -void Display() -{ - Init_Col_PG_addrs(SSD1306_COL_START_ADDR,SSD1306_COL_END_ADDR, - SSD1306_PG_START_ADDR,SSD1306_PG_END_ADDR); - transfer(); -} - -/**************************************************************** - * Function Name : Init_Col_PG_addrs - * Description : Sets the column and page, start and - * end addresses. - * Returns : NONE. - * Params : @col_start_addr: Column start address - * @col_end_addr: Column end address - * @pg_start_addr: Page start address - * @pg_end_addr: Page end address - ****************************************************************/ -void Init_Col_PG_addrs(unsigned char col_start_addr, unsigned char col_end_addr, - unsigned char pg_start_addr, unsigned char pg_end_addr) -{ - /* Send COLMN address setting command */ - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, SSD1306_SET_COL_ADDR) == I2C_TWO_BYTES) - { -#ifdef SSD1306_DBG - printf("Display COLMN Command Passed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("Display COLMN Command Failed\r\n"); -#endif - exit(1); - } - - /* Set COLMN start address */ - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, col_start_addr) == I2C_TWO_BYTES) - { -#ifdef SSD1306_DBG - printf("Display COLMN Start Address param Passed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("Display COLMN Start Address param Failed\r\n"); -#endif - exit(1); - } - - /* Set COLMN end address */ - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, col_end_addr) == I2C_TWO_BYTES) - { -#ifdef SSD1306_DBG - printf("Display COLMN End Address param Passed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("Display COLMN End Address param Failed\r\n"); -#endif - exit(1); - } - - /* Send PAGE address setting command */ - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, SSD1306_PAGEADDR) == I2C_TWO_BYTES) - { -#ifdef SSD1306_DBG - printf("Display PAGE Command Passed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("Display PAGE Command Failed\r\n"); -#endif - exit(1); - } - - /* Set PAGE start address */ - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, pg_start_addr) == I2C_TWO_BYTES) - { -#ifdef SSD1306_DBG - printf("Display PAGE Start Address param Passed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("Display PAGE Start Address param Failed\r\n"); -#endif - exit(1); - } - - /* Set PAGE end address */ - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, pg_end_addr) == I2C_TWO_BYTES) - { -#ifdef SSD1306_DBG - printf("Display PAGE End Address param Passed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("Display PAGE End Address param Failed\r\n"); -#endif - exit(1); - } -} - -/**************************************************************** - * Function Name : setRotation - * Description : Set the display rotation - * Returns : NONE. - * Params : @x: Display rotation parameter - ****************************************************************/ -void setRotation(unsigned char x) -{ - _rotation = x & 3; - switch(_rotation) - { - case 0: - case 2: - _width = SSD1306_LCDWIDTH; - _height = SSD1306_LCDHEIGHT; - break; - case 1: - case 3: - _width = SSD1306_LCDHEIGHT; - _height = SSD1306_LCDWIDTH; - break; - } -} - -/**************************************************************** - * Function Name : startscrollright - * Description : Activate a right handed scroll for rows start - * through stop - * Returns : NONE. - * Params : @start: Start location - * @stop: Stop location - * HINT. : the display is 16 rows tall. To scroll the whole - * display, run: display.scrollright(0x00, 0x0F) - ****************************************************************/ -void startscrollright(unsigned char start, unsigned char stop) -{ - /* Send SCROLL horizontal right command */ - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, SSD1306_RIGHT_HORIZONTAL_SCROLL) == I2C_TWO_BYTES) - { -#ifdef SSD1306_DBG - printf("Display HORIZONTAL SCROLL RIGHT Command Passed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("Display HORIZONTAL SCROLL RIGHT Command Failed\r\n"); -#endif - exit(1); - } - - - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, 0x00) == I2C_TWO_BYTES) - { -#ifdef SSD1306_DBG - printf("HORI_SR Param_1 Passed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("HORI_SR Param_1 Failed\r\n"); -#endif - exit(1); - } - - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, start) == I2C_TWO_BYTES) - { -#ifdef SSD1306_DBG - printf("HORI_SR Param_2 Passed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("HORI_SR Param_2 Passed\r\n"); -#endif - exit(1); - } - - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, 0x00) == I2C_TWO_BYTES) - { -#ifdef SSD1306_DBG - printf("HORI_SR Param_3 Passed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("HORI_SR Param_3 Failed\r\n"); -#endif - exit(1); - } - - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, stop) == I2C_TWO_BYTES) - { -#ifdef SSD1306_DBG - printf("HORI_SR Param_4 Passed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("HORI_SR Param_4 Passed\r\n"); -#endif - exit(1); - } - - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, 0x00) == I2C_TWO_BYTES) - { -#ifdef SSD1306_DBG - printf("HORI_SR Param_5 Passed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("HORI_SR Param_5 Failed\r\n"); -#endif - exit(1); - } - - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, 0xFF) == I2C_TWO_BYTES) - { -#ifdef SSD1306_DBG - printf("HORI_SR Param_6 Passed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("HORI_SR Param_6 Passed\r\n"); -#endif - exit(1); - } - /* Send SCROLL Activate command */ - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, SSD1306_ACTIVATE_SCROLL) == I2C_TWO_BYTES) - { -#ifdef SSD1306_DBG - printf("SCROLL Activate Command Passed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("SCROLL Activate Command Failed\r\n"); -#endif - exit(1); - } -} - -/**************************************************************** - * Function Name : startscrollleft - * Description : Activate a left handed scroll for rows start - * through stop - * Returns : NONE. - * Params : @start: Start location - * @stop: Stop location - * HINT. : the display is 16 rows tall. To scroll the whole - * display, run: display.scrollright(0x00, 0x0F) - ****************************************************************/ -void startscrollleft(unsigned char start, unsigned char stop) -{ - /* Send SCROLL horizontal left command */ - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, SSD1306_LEFT_HORIZONTAL_SCROLL) == I2C_TWO_BYTES) - { -#ifdef SSD1306_DBG - printf("Display HORIZONTAL SCROLL LEFT Command Passed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("Display HORIZONTAL SCROLL LEFT Command Failed\r\n"); -#endif - exit(1); - } - - - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, 0x00) == I2C_TWO_BYTES) - { -#ifdef SSD1306_DBG - printf("HORI_SR Param_1 Passed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("HORI_SR Param_1 Failed\r\n"); -#endif - exit(1); - } - - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, start) == I2C_TWO_BYTES) - { -#ifdef SSD1306_DBG - printf("HORI_SR Param_2 Passed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("HORI_SR Param_2 Passed\r\n"); -#endif - exit(1); - } - - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, 0x00) == I2C_TWO_BYTES) - { -#ifdef SSD1306_DBG - printf("HORI_SR Param_3 Passed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("HORI_SR Param_3 Failed\r\n"); -#endif - exit(1); - } - - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, stop) == I2C_TWO_BYTES) - { -#ifdef SSD1306_DBG - printf("HORI_SR Param_4 Passed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("HORI_SR Param_4 Passed\r\n"); -#endif - exit(1); - } - - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, 0x00) == I2C_TWO_BYTES) - { -#ifdef SSD1306_DBG - printf("HORI_SR Param_5 Passed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("HORI_SR Param_5 Failed\r\n"); -#endif - exit(1); - } - - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, 0xFF) == I2C_TWO_BYTES) - { -#ifdef SSD1306_DBG - printf("HORI_SR Param_6 Passed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("HORI_SR Param_6 Passed\r\n"); -#endif - exit(1); - } - /* Send SCROLL Activate command */ - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, SSD1306_ACTIVATE_SCROLL) == I2C_TWO_BYTES) - { -#ifdef SSD1306_DBG - printf("SCROLL Activate Command Passed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("SCROLL Activate Command Failed\r\n"); -#endif - exit(1); - } -} - -/**************************************************************** - * Function Name : startscrolldiagright - * Description : Activate a diagonal scroll for rows start - * through stop - * Returns : NONE. - * Params : @start: Start location - * @stop: Stop location - * HINT. : the display is 16 rows tall. To scroll the whole - * display, run: display.scrollright(0x00, 0x0F) - ****************************************************************/ -void startscrolldiagright(unsigned char start, unsigned char stop) -{ - /* Send SCROLL diagonal right command */ - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, SSD1306_SET_VERTICAL_SCROLL_AREA) == I2C_TWO_BYTES) - { -#ifdef SSD1306_DBG - printf("Display DIAGONAL SCROLL RIGHT Command Passed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("Display DIAGONAL SCROLL RIGHT Command Failed\r\n"); -#endif - exit(1); - } - - - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, 0x00) == I2C_TWO_BYTES) - { -#ifdef SSD1306_DBG - printf("DIAG_SR Param_1 Passed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("DIAG_SR Param_1 Failed\r\n"); -#endif - exit(1); - } - - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, SSD1306_LCDHEIGHT) == I2C_TWO_BYTES) - { -#ifdef SSD1306_DBG - printf("DIAG_SR Param_2 Passed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("DIAG_SR Param_2 Failed\r\n"); -#endif - exit(1); - } - - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, SSD1306_VERTICAL_AND_RIGHT_HORIZONTAL_SCROLL) == I2C_TWO_BYTES) - { -#ifdef SSD1306_DBG - printf("Cmd Passed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("Cmd Failed\r\n"); -#endif - exit(1); - } - - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, 0x00) == I2C_TWO_BYTES) - { -#ifdef SSD1306_DBG - printf("DIAG_SR Param_3 Passed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("DIAG_SR Param_3 Failed\r\n"); -#endif - exit(1); - } - - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, start) == I2C_TWO_BYTES) - { -#ifdef SSD1306_DBG - printf("DIAG_SR Param_4 Passed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("DIAG_SR Param_4 Failed\r\n"); -#endif - exit(1); - } - - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, 0x00) == I2C_TWO_BYTES) - { -#ifdef SSD1306_DBG - printf("DIAG_SR Param_5 Passed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("DIAG_SR Param_5 Failed\r\n"); -#endif - exit(1); - } - - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, stop) == I2C_TWO_BYTES) - { -#ifdef SSD1306_DBG - printf("DIAG_SR Param_6 Passed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("DIAG_SR Param_6 Failed\r\n"); -#endif - exit(1); - } - - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, 0x01) == I2C_TWO_BYTES) - { -#ifdef SSD1306_DBG - printf("DIAG_SR Param_5 Passed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("DIAG_SR Param_5 Failed\r\n"); -#endif - exit(1); - } - - /* Send SCROLL Activate command */ - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, SSD1306_ACTIVATE_SCROLL) == I2C_TWO_BYTES) - { -#ifdef SSD1306_DBG - printf("SCROLL Activate Command Passed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("SCROLL Activate Command Failed\r\n"); -#endif - exit(1); - } -} - -/**************************************************************** - * Function Name : startscrolldiagleft - * Description : Activate a diagonal scroll for rows start - * through stop - * Returns : NONE. - * Params : @start: Start location - * @stop: Stop location - * HINT. : the display is 16 rows tall. To scroll the whole - * display, run: display.scrollright(0x00, 0x0F) - ****************************************************************/ -void startscrolldiagleft(unsigned char start, unsigned char stop) -{ - /* Send SCROLL diagonal right command */ - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, SSD1306_SET_VERTICAL_SCROLL_AREA) == I2C_TWO_BYTES) - { -#ifdef SSD1306_DBG - printf("Display DIAGONAL SCROLL RIGHT Command Passed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("Display DIAGONAL SCROLL RIGHT Command Failed\r\n"); -#endif - exit(1); - } - - - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, 0x00) == I2C_TWO_BYTES) - { -#ifdef SSD1306_DBG - printf("DIAG_SR Param_1 Passed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("DIAG_SR Param_1 Failed\r\n"); -#endif - exit(1); - } - - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, SSD1306_LCDHEIGHT) == I2C_TWO_BYTES) - { -#ifdef SSD1306_DBG - printf("DIAG_SR Param_2 Passed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("DIAG_SR Param_2 Failed\r\n"); -#endif - exit(1); - } - - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, SSD1306_VERTICAL_AND_LEFT_HORIZONTAL_SCROLL) == I2C_TWO_BYTES) - { -#ifdef SSD1306_DBG - printf("Cmd Passed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("Cmd Failed\r\n"); -#endif - exit(1); - } - - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, 0x00) == I2C_TWO_BYTES) - { -#ifdef SSD1306_DBG - printf("DIAG_SR Param_3 Passed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("DIAG_SR Param_3 Failed\r\n"); -#endif - exit(1); - } - - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, start) == I2C_TWO_BYTES) - { -#ifdef SSD1306_DBG - printf("DIAG_SR Param_4 Passed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("DIAG_SR Param_4 Failed\r\n"); -#endif - exit(1); - } - - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, 0x00) == I2C_TWO_BYTES) - { -#ifdef SSD1306_DBG - printf("DIAG_SR Param_5 Passed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("DIAG_SR Param_5 Failed\r\n"); -#endif - exit(1); - } - - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, stop) == I2C_TWO_BYTES) - { -#ifdef SSD1306_DBG - printf("DIAG_SR Param_6 Passed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("DIAG_SR Param_6 Failed\r\n"); -#endif - exit(1); - } - - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, 0x01) == I2C_TWO_BYTES) - { -#ifdef SSD1306_DBG - printf("DIAG_SR Param_5 Passed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("DIAG_SR Param_5 Failed\r\n"); -#endif - exit(1); - } - - /* Send SCROLL Activate command */ - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, SSD1306_ACTIVATE_SCROLL) == I2C_TWO_BYTES) - { -#ifdef SSD1306_DBG - printf("SCROLL Activate Command Passed\r\n"); -#endif - } - else - { -#ifdef SSD1306_DBG - printf("SCROLL Activate Command Failed\r\n"); -#endif - exit(1); - } -} - -/**************************************************************** - * Function Name : stopscroll - * Description : Stop scrolling - * Returns : NONE. - * Params : NONE. - ****************************************************************/ -void stopscroll() -{ - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, SSD1306_DEACTIVATE_SCROLL) == I2C_TWO_BYTES) - { - printf("De-activate SCROLL Command Passed\r\n"); - } - else - { - printf("De-activate SCROLL Command Passed Failed\r\n"); - exit(1); - } -} - -/**************************************************************** - * Function Name : invertDisplay - * Description : Invert or Normalize the display - * Returns : NONE. - * Params : @i: 0x00 to Normal and 0x01 for Inverting - ****************************************************************/ -void invertDisplay(unsigned char i) -{ - if (i) - { - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, SSD1306_INVERTDISPLAY) == I2C_TWO_BYTES) - { - printf("Display Inverted - Passed\r\n"); - } - else - { - printf("Display Inverted - Failed\r\n"); - exit(1); - } - } - else - { - if(i2c_write_register(I2C_DEV_2.fd_i2c, SSD1306_CNTRL_CMD, SSD1306_NORMAL_DISPLAY) == I2C_TWO_BYTES) - { - printf("Display Normal - Passed\r\n"); - } - else - { - printf("Display Normal - Failed\r\n"); - exit(1); - } - } -} - -/**************************************************************** - * Function Name : drawPixel - * Description : Draw a pixel - * Returns : -1 on error and 0 on success - * Params : @x: X - Co-ordinate - * @y: Y - Co-ordinate - * @color: Color - ****************************************************************/ -signed char drawPixel(short x, short y, short color) -{ - /* Return if co-ordinates are out of display dimension's range */ - if ((x < 0) || (x >= _width) || (y < 0) || (y >= _height)) - return -1; - switch(_rotation) - { - case 1: - SWAP(x,y); - x = _width - x - 1; - break; - case 2: - x = _width - x - 1; - y = _height - y - 1; - break; - case 3: - SWAP(x,y); - y = _height - y - 1; - break; - } - - /* x is the column */ - switch(color) - { - case WHITE: screen[x+ (y/8)*SSD1306_LCDWIDTH] |= (1 << (y&7)); break; - case BLACK: screen[x+ (y/8)*SSD1306_LCDWIDTH] &= ~(1 << (y&7)); break; - case INVERSE: screen[x+ (y/8)*SSD1306_LCDWIDTH] ^= (1 << (y&7)); break; - } - return 0; -} - -/**************************************************************** - * Function Name : writeLine - * Description : Bresenham's algorithm - * Returns : NONE - * Params : @x0: X0 Co-ordinate - * @y0: Y0 Co-ordinate - * @x1: X1 Co-ordinate - * @y1: Y1 Co-ordinate - * @color: Pixel color - ****************************************************************/ -void writeLine(short x0, short y0, short x1, short y1, short color) -{ - short steep = 0, dx = 0, dy = 0, err = 0, ystep = 0; - steep = abs(y1 - y0) > abs(x1 - x0); - if (steep) - { - SWAP(x0, y0); - SWAP(x1, y1); - } - - if (x0 > x1) - { - SWAP(x0, x1); - SWAP(y0, y1); - } - dx = x1 - x0; - dy = abs(y1 - y0); - - err = dx / 2; - - if (y0 < y1) - { - ystep = 1; - } else - { - ystep = -1; - } - - for (; x0<=x1; x0++) - { - if (steep) - { - drawPixel(y0, x0, color); - } else - { - drawPixel(x0, y0, color); - } - err -= dy; - if (err < 0) - { - y0 += ystep; - err += dx; - } - } -} - -/* (x,y) is topmost point; if unsure, calling function -should sort endpoints or call writeLine() instead */ -void drawFastVLine(short x, short y,short h, short color) -{ - //startWrite(); - writeLine(x, y, x, y+h-1, color); - //endWrite(); -} - -/* (x,y) is topmost point; if unsure, calling function -should sort endpoints or call writeLine() instead */ -void writeFastVLine(short x, short y, short h, short color) -{ - drawFastVLine(x, y, h, color); -} - -/* (x,y) is leftmost point; if unsure, calling function - should sort endpoints or call writeLine() instead */ -void drawFastHLine(short x, short y,short w, short color) -{ - //startWrite(); - writeLine(x, y, x+w-1, y, color); - //endWrite(); -} - -// (x,y) is leftmost point; if unsure, calling function -// should sort endpoints or call writeLine() instead -void writeFastHLine(short x, short y, short w, short color) -{ - drawFastHLine(x, y, w, color); -} - -/**************************************************************** - * Function Name : drawCircleHelper - * Description : Draw a.... - * Returns : NONE - * Params : @x: X Co-ordinate - * @y: Y Co-ordinate - * @w: Width - * @h: height - * @r: Corner radius - * @color: Pixel color - ****************************************************************/ -void drawCircleHelper( short x0, short y0, short r, unsigned char cornername, short color) -{ - short f = 1 - r; - short ddF_x = 1; - short ddF_y = -2 * r; - short x = 0; - short y = r; - - while (x= 0) - { - y--; - ddF_y += 2; - f += ddF_y; - } - x++; - ddF_x += 2; - f += ddF_x; - if (cornername & 0x4) - { - drawPixel(x0 + x, y0 + y, color); - drawPixel(x0 + y, y0 + x, color); - } - if (cornername & 0x2) - { - drawPixel(x0 + x, y0 - y, color); - drawPixel(x0 + y, y0 - x, color); - } - if (cornername & 0x8) - { - drawPixel(x0 - y, y0 + x, color); - drawPixel(x0 - x, y0 + y, color); - } - if (cornername & 0x1) - { - drawPixel(x0 - y, y0 - x, color); - drawPixel(x0 - x, y0 - y, color); - } - } -} - -/**************************************************************** - * Function Name : drawLine - * Description : Draw line between two points - * Returns : NONE - * Params : @x0: X0 Starting X Co-ordinate - * @y0: Y0 Starting Y Co-ordinate - * @x1: X1 Ending X Co-ordinate - * @y1: Y1 Ending Y Co-ordinate - * @color: Pixel color - ****************************************************************/ -void drawLine(short x0, short y0, short x1, short y1, short color) -{ - if(x0 == x1) - { - if(y0 > y1) - SWAP(y0, y1); - drawFastVLine(x0, y0, y1 - y0 + 1, color); - } - else if(y0 == y1) - { - if(x0 > x1) SWAP(x0, x1); - drawFastHLine(x0, y0, x1 - x0 + 1, color); - } - else - { - //startWrite(); - writeLine(x0, y0, x1, y1, color); - //endWrite(); - } -} - -/**************************************************************** - * Function Name : drawRect - * Description : Draw a rectangle - * Returns : NONE - * Params : @x: Corner X Co-ordinate - * @y: Corner Y Co-ordinate - * @w: Width in pixels - * @h: Height in pixels - * @color: Pixel color - ****************************************************************/ -void drawRect(short x, short y, short w, short h, short color) -{ - //startWrite(); - writeFastHLine(x, y, w, color); - writeFastHLine(x, y+h-1, w, color); - writeFastVLine(x, y, h, color); - writeFastVLine(x+w-1, y, h, color); - //endWrite(); -} - -/**************************************************************** - * Function Name : fillRect - * Description : Fill the rectangle - * Returns : NONE - * Params : @x: Starting X Co-ordinate - * @y: Starting Y Co-ordinate - * @w: Width in pixels - * @h: Height in pixels - * @color: Pixel color - ****************************************************************/ -void fillRect(short x, short y, short w, short h, short color) -{ - short i = 0; - //startWrite(); - for (i=x; i= 0) - { - y--; - ddF_y += 2; - f += ddF_y; - } - x++; - ddF_x += 2; - f += ddF_x; - - drawPixel(x0 + x, y0 + y, color); - drawPixel(x0 - x, y0 + y, color); - drawPixel(x0 + x, y0 - y, color); - drawPixel(x0 - x, y0 - y, color); - drawPixel(x0 + y, y0 + x, color); - drawPixel(x0 - y, y0 + x, color); - drawPixel(x0 + y, y0 - x, color); - drawPixel(x0 - y, y0 - x, color); - } - //endWrite(); -} - -/**************************************************************** - * Function Name : fillCircleHelper - * Description : Used to do circles and roundrects - * Returns : NONE - * Params : @x: Center X Co-ordinate - * @y: Center Y Co-ordinate - * @r: Radius in pixels - * @cornername: Corner radius in pixels - * @color: Pixel color - ****************************************************************/ -void fillCircleHelper(short x0, short y0, short r, unsigned char cornername, short delta, short color) -{ - - short f = 1 - r; - short ddF_x = 1; - short ddF_y = -2 * r; - short x = 0; - short y = r; - - while (x= 0) - { - y--; - ddF_y += 2; - f += ddF_y; - } - x++; - ddF_x += 2; - f += ddF_x; - - if (cornername & 0x1) - { - writeFastVLine(x0+x, y0-y, 2*y+1+delta, color); - writeFastVLine(x0+y, y0-x, 2*x+1+delta, color); - } - if (cornername & 0x2) - { - writeFastVLine(x0-x, y0-y, 2*y+1+delta, color); - writeFastVLine(x0-y, y0-x, 2*x+1+delta, color); - } - } -} - -/**************************************************************** - * Function Name : fillCircle - * Description : Fill the circle - * Returns : NONE - * Params : @x0: Center X Co-ordinate - * @y0: Center Y Co-ordinate - * @r: Radius in pixels - * @color: Pixel color - ****************************************************************/ -void fillCircle(short x0, short y0, short r, short color) -{ - //startWrite(); - writeFastVLine(x0, y0-r, 2*r+1, color); - fillCircleHelper(x0, y0, r, 3, 0, color); - //endWrite(); -} - -/**************************************************************** - * Function Name : drawTriangle - * Description : Draw a triangle - * Returns : NONE - * Params : @x0: Corner-1 X Co-ordinate - * @y0: Corner-1 Y Co-ordinate - * @x1: Corner-2 X Co-ordinate - * @y1: Corner-2 Y Co-ordinate - * @x2: Corner-3 X Co-ordinate - * @y2: Corner-3 Y Co-ordinate - * @color: Pixel color - ****************************************************************/ -void drawTriangle(short x0, short y0, short x1, short y1, short x2, short y2, short color) -{ - drawLine(x0, y0, x1, y1, color); - drawLine(x1, y1, x2, y2, color); - drawLine(x2, y2, x0, y0, color); -} - -/**************************************************************** - * Function Name : fillTriangle - * Description : Fill a triangle - * Returns : NONE - * Params : @x0: Corner-1 X Co-ordinate - * @y0: Corner-1 Y Co-ordinate - * @x1: Corner-2 X Co-ordinate - * @y1: Corner-2 Y Co-ordinate - * @x2: Corner-3 X Co-ordinate - * @y2: Corner-3 Y Co-ordinate - * @color: Pixel color - ****************************************************************/ -void fillTriangle(short x0, short y0, short x1, short y1, short x2, short y2, short color) -{ - short a, b, y, last, dx01, dy01, dx02, dy02, dx12, dy12; - int sa, sb; - - // Sort coordinates by Y order (y2 >= y1 >= y0) - if (y0 > y1) - { - SWAP(y0, y1); - SWAP(x0, x1); - } - if (y1 > y2) - { - SWAP(y2, y1); - SWAP(x2, x1); - } - if (y0 > y1) - { - SWAP(y0, y1); - SWAP(x0, x1); - } - - //startWrite(); - if(y0 == y2) - { // Handle awkward all-on-same-line case as its own thing - a = b = x0; - if(x1 < a) - a = x1; - else if(x1 > b) - b = x1; - if(x2 < a) - a = x2; - else if(x2 > b) - b = x2; - writeFastHLine(a, y0, b-a+1, color); - // endWrite(); - return; - } - - dx01 = x1 - x0; - dy01 = y1 - y0; - dx02 = x2 - x0; - dy02 = y2 - y0; - dx12 = x2 - x1; - dy12 = y2 - y1; - sa = 0; - sb = 0; - - // For upper part of triangle, find scanline crossings for segments - // 0-1 and 0-2. If y1=y2 (flat-bottomed triangle), the scanline y1 - // is included here (and second loop will be skipped, avoiding a /0 - // error there), otherwise scanline y1 is skipped here and handled - // in the second loop...which also avoids a /0 error here if y0=y1 - // (flat-topped triangle). - if(y1 == y2) - last = y1; // Include y1 scanline - else - last = y1-1; // Skip it - - for(y=y0; y<=last; y++) - { - a = x0 + sa / dy01; - b = x0 + sb / dy02; - sa += dx01; - sb += dx02; - /* longhand: - a = x0 + (x1 - x0) * (y - y0) / (y1 - y0); - b = x0 + (x2 - x0) * (y - y0) / (y2 - y0); - */ - if(a > b) - SWAP(a,b); - writeFastHLine(a, y, b-a+1, color); - } - - // For lower part of triangle, find scanline crossings for segments - // 0-2 and 1-2. This loop is skipped if y1=y2. - sa = dx12 * (y - y1); - sb = dx02 * (y - y0); - for(; y<=y2; y++) - { - a = x1 + sa / dy12; - b = x0 + sb / dy02; - sa += dx12; - sb += dx02; - /* longhand: - a = x1 + (x2 - x1) * (y - y1) / (y2 - y1); - b = x0 + (x2 - x0) * (y - y0) / (y2 - y0); - */ - if(a > b) - SWAP(a,b); - writeFastHLine(a, y, b-a+1, color); - } - //endWrite(); -} - -/**************************************************************** - * Function Name : drawRoundRect - * Description : Draw a rounded rectangle - * Returns : NONE - * Params : @x: X Co-ordinate - * @y: Y Co-ordinate - * @w: Width - * @h: height - * @r: Corner radius - * @color: Pixel color - ****************************************************************/ -void drawRoundRect(short x, short y, short w, short h, short r, short color) -{ - // smarter version - //startWrite(); - writeFastHLine(x+r , y , w-2*r, color); // Top - writeFastHLine(x+r , y+h-1, w-2*r, color); // Bottom - writeFastVLine(x , y+r , h-2*r, color); // Left - writeFastVLine(x+w-1, y+r , h-2*r, color); // Right - // draw four corners - drawCircleHelper(x+r , y+r , r, 1, color); - drawCircleHelper(x+w-r-1, y+r , r, 2, color); - drawCircleHelper(x+w-r-1, y+h-r-1, r, 4, color); - drawCircleHelper(x+r , y+h-r-1, r, 8, color); - //endWrite(); -} - -/**************************************************************** - * Function Name : fillRoundRect - * Description : Fill a rounded rectangle - * Returns : NONE - * Params : @x: X Co-ordinate - * @y: Y Co-ordinate - * @w: Width - * @h: height - * @r: Corner radius - * @color: Pixel color - ****************************************************************/ -void fillRoundRect(short x, short y, short w, short h, short r, short color) -{ - // smarter version - //startWrite(); - fillRect(x+r, y, w-2*r, h, color); - - // draw four corners - fillCircleHelper(x+w-r-1, y+r, r, 1, h-2*r-1, color); - fillCircleHelper(x+r , y+r, r, 2, h-2*r-1, color); - //endWrite(); -} - -/*---------------------------------------------------------------------------- - * BITMAP API's - ----------------------------------------------------------------------------*/ - -/**************************************************************** - * Function Name : drawBitmap - * Description : Draw a bitmap - * Returns : NONE - * Params : @x: X Co-ordinate - * @y: Y Co-ordinate - * @bitmap: bitmap to display - * @w: Width - * @h: height - * @color: Pixel color - ****************************************************************/ -void drawBitmap(short x, short y, const unsigned char bitmap[], short w, short h, short color) -{ - short byteWidth = 0, j = 0, i = 0; - unsigned char byte = 0; - byteWidth = (w + 7) / 8; // Bitmap scanline pad = whole byte - - for(j=0; j 0) ? s : 1; -} - -/**************************************************************** - * Function Name : setTextColor - * Description : Set text color - * Returns : @c - Color - ****************************************************************/ -void setTextColor(short c) -{ - // For 'transparent' background, we'll set the bg - // to the same as fg instead of using a flag - textcolor = textbgcolor = c; -} - -/**************************************************************** - * Function Name : setTextWrap - * Description : Wraps the text - * Returns : @w - enable or disbale wrap - ****************************************************************/ -void setTextWrap(bool w) -{ - wrap = w; -} - -/**************************************************************** - * Function Name : getRotation - * Description : Get the rotation value - * Returns : NONE. - ****************************************************************/ -unsigned char getRotation() -{ - return _rotation; -} - -/**************************************************************** - * Function Name : drawBitmap - * Description : Draw a character - * Returns : NONE - * Params : @x: X Co-ordinate - * @y: Y Co-ordinate - * @c: Character - * @size: Scaling factor - * @bg: Background color - * @color: Pixel color - ****************************************************************/ -void drawChar(short x, short y, unsigned char c, short color, short bg, unsigned char size) -{ - unsigned char line = 0, *bitmap = NULL, w = 0, h = 0, xx = 0, yy = 0, bits = 0, bit = 0; - char i = 0, j = 0, xo = 0, yo = 0; - short bo = 0, xo16 = 0, yo16 = 0; - GFXglyphPtr glyph; - if(!gfxFont) - { - // 'Classic' built-in font - if((x >= _width) || (y >= _height) || ((x + 6 * size - 1) < 0) || ((y + 8 * size - 1) < 0)) - return; - - // Handle 'classic' charset behavior - if(!_cp437 && (c >= 176)) - c++; - - // Char bitmap = 5 columns - for(i=0; i<5; i++ ) - { - line = pgm_read_byte(&ssd1306_font5x7[c * 5 + i]); - for(j=0; j<8; j++, line >>= 1) - { - if(line & 1) - { - if(size == 1) - drawPixel(x+i, y+j, color); - else - fillRect(x+i*size, y+j*size, size, size, color); - } - else if(bg != color) - { - if(size == 1) - drawPixel(x+i, y+j, bg); - else - fillRect(x+i*size, y+j*size, size, size, bg); - } - } - } - - // If opaque, draw vertical line for last column - if(bg != color) - { - if(size == 1) - writeFastVLine(x+5, y, 8, bg); - else - fillRect(x+5*size, y, size, 8*size, bg); - } - - } - // Custom font - else - { - // Character is assumed previously filtered by write() to eliminate - // newlines, returns, non-printable characters, etc. Calling - // drawChar() directly with 'bad' characters of font may cause mayhem! - - c -= (unsigned char)pgm_read_byte(&gfxFont->first); - glyph = &(((GFXglyphT *)pgm_read_pointer(&gfxFont->glyph))[c]); - bitmap = (unsigned char *)pgm_read_pointer(&gfxFont->bitmap); - bo = pgm_read_word(&glyph->bitmapOffset); - w = pgm_read_byte(&glyph->width); - h = pgm_read_byte(&glyph->height); - xo = pgm_read_byte(&glyph->xOffset); - yo = pgm_read_byte(&glyph->yOffset); - - if(size > 1) - { - xo16 = xo; - yo16 = yo; - } - - // Todo: Add character clipping here - - // NOTE: THERE IS NO 'BACKGROUND' COLOR OPTION ON CUSTOM FONTS. - // THIS IS ON PURPOSE AND BY DESIGN. The background color feature - // has typically been used with the 'classic' font to overwrite old - // screen contents with new data. This ONLY works because the - // characters are a uniform size; it's not a sensible thing to do with - // proportionally-spaced fonts with glyphs of varying sizes (and that - // may overlap). To replace previously-drawn text when using a custom - // font, use the getTextBounds() function to determine the smallest - // rectangle encompassing a string, erase the area with fillRect(), - // then draw new text. This WILL unfortunately 'blink' the text, but - // is unavoidable. Drawing 'background' pixels will NOT fix this, - // only creates a new set of problems. Have an idea to work around - // this (a canvas object type for MCUs that can afford the RAM and - // displays supporting setAddrWindow() and pushColors()), but haven't - // implemented this yet. - for(yy=0; yy _width)) - { - // Off right? - cursor_x = 0; // Reset x to zero, - cursor_y += textsize * 8; // advance y one line - } - drawChar(cursor_x, cursor_y, c, textcolor, textbgcolor, textsize); - cursor_x += textsize * 6; // Advance x one char - } - - } - else - { - // Custom font - if(c == '\n') - { - cursor_x = 0; - cursor_y += (short)textsize *(unsigned char)pgm_read_byte(&gfxFont->yAdvance); - } - else if(c != '\r') - { - first = pgm_read_byte(&gfxFont->first); - if((c >= first) && (c <= (unsigned char)pgm_read_byte(&gfxFont->last))) - { - glyph = &(((GFXglyphT*)pgm_read_pointer(&gfxFont->glyph))[c - first]); - w = pgm_read_byte(&glyph->width); - h = pgm_read_byte(&glyph->height); - if((w > 0) && (h > 0)) - { - // Is there an associated bitmap? - xo = (char)pgm_read_byte(&glyph->xOffset); // sic - if(wrap && ((cursor_x + textsize * (xo + w)) > _width)) - { - cursor_x = 0; - cursor_y += (short)textsize *(unsigned char)pgm_read_byte(&gfxFont->yAdvance); - } - drawChar(cursor_x, cursor_y, c, textcolor, textbgcolor, textsize); - } - cursor_x += (unsigned char)pgm_read_byte(&glyph->xAdvance) * (short)textsize; - } - } - } - return 1; -} - -/**************************************************************** - * Function Name : print - * Description : Base function for printing strings - * Returns : No. of characters printed - * Params : @buffer: Ptr to buffer containing the string - * @size: Length of the string. - ****************************************************************/ -short print(const unsigned char *buffer, short size) -{ - short n = 0; - while(size--) - { - if(oled_write(*buffer++)) - n++; - else - break; - } - return (n); -} - -/**************************************************************** - * Function Name : print_str - * Description : Print strings - * Returns : No. of characters printed - * Params : @strPtr: Ptr to buffer containing the string - ****************************************************************/ -short print_str(const unsigned char *strPtr) -{ - return print(strPtr, strlen(strPtr)); -} - -/**************************************************************** - * Function Name : println - * Description : Move to next line - * Returns : No. of characters printed - * Params : NONE. - ****************************************************************/ -short println() -{ - return print_str("\r\n"); -} - -/**************************************************************** - * Function Name : print_strln - * Description : Print strings and move to next line - * Returns : No. of characters printed - * Params : @strPtr: Ptr to buffer containing the string - ****************************************************************/ -short print_strln(const unsigned char *strPtr) -{ - short n = 0; - n = print(strPtr, strlen(strPtr)); - n += print_str("\r\n"); - return (n); -} - -/*---------------------------------------------------------------------------- - * NUMBERS HANDLING API's - ----------------------------------------------------------------------------*/ - -/**************************************************************** - * Function Name : printNumber - * Description : Base function to print unsigned numbers - * Returns : No. of characters printed - * Params : @n: Number - * @base: Base e.g. HEX, BIN... - ****************************************************************/ -short printNumber(unsigned long n, unsigned char base) -{ - unsigned long m = 0; - char c = 0; - char buf[8 * sizeof(long) + 1]; // Assumes 8-bit chars plus zero byte. - char *str = &buf[sizeof(buf) - 1]; - - *str = '\0'; - - // prevent crash if called with base == 1 - if(base < 2) - base = 10; - do - { - m = n; - n /= base; - c = m - base * n; - *--str = c < 10 ? c + '0' : c + 'A' - 10; - } - while(n); - //return oled_write((unsigned char)str); - return print_str(str); -} - -/**************************************************************** - * Function Name : printNumber_UL - * Description : Print unsigned long data types - * Returns : No. of characters printed - * Params : @n: Number - * @base: Base e.g. HEX, BIN... - ****************************************************************/ -short printNumber_UL(unsigned long n, int base) -{ - if(base == 0) - return oled_write(n); - else - return printNumber(n, base); -} - -/**************************************************************** - * Function Name : printNumber_UL_ln - * Description : Print unsigned long & advance to next line - * Returns : No. of characters printed - * Params : @n: Number - * @base: Base e.g. HEX, BIN... - ****************************************************************/ -short printNumber_UL_ln(unsigned long num, int base) -{ - short n = 0; - n = printNumber(num, base); - n += println(); - return (n); -} - -/**************************************************************** - * Function Name : printNumber_UI - * Description : Print unsigned int data types - * Returns : No. of characters printed - * Params : @n: Number - * @base: Base e.g. HEX, BIN... - ****************************************************************/ -short printNumber_UI(unsigned int n, int base) -{ - return printNumber((unsigned long) n, base); -} - -/**************************************************************** - * Function Name : printNumber_UI_ln - * Description : Print unsigned int & advance to next line - * Returns : No. of characters printed - * Params : @n: Number - * @base: Base e.g. HEX, BIN... - ****************************************************************/ -short printNumber_UI_ln(unsigned int n, int base) -{ - short a = 0; - a = printNumber((unsigned long) n, base); - a += println(); - return (a); -} - -/**************************************************************** - * Function Name : printNumber_UC - * Description : Print unsigned char data types - * Returns : No. of characters printed - * Params : @n: Number - * @base: Base e.g. HEX, BIN... - ****************************************************************/ -short printNumber_UC(unsigned char b, int base) -{ - return printNumber((unsigned long) b, base); -} - -/**************************************************************** - * Function Name : printNumber_UC_ln - * Description : Print unsigned char & advance to next line - * Returns : No. of characters printed - * Params : @n: Number - * @base: Base e.g. HEX, BIN... - ****************************************************************/ -short printNumber_UC_ln(unsigned char b, int base) -{ - short n = 0; - n = printNumber((unsigned long) b, base); - n += println(); - return (n); -} - -/**************************************************************** - * Function Name : printNumber_L - * Description : Print Long data types - * Returns : No. of characters printed - * Params : @n: Number - * @base: Base e.g. HEX, BIN... - ****************************************************************/ -short printNumber_L(long n, int base) -{ - int t = 0; - if(base == 0) - { - return oled_write(n); - } - else if(base == 10) - { - if(n < 0) - { - t = oled_write('-'); - n = -n; - return printNumber(n, 10) + t; - } - return printNumber(n, 10); - } - else - { - return printNumber(n, base); - } -} - -/**************************************************************** - * Function Name : printNumber_UC_ln - * Description : Print long & advance to next line - * Returns : No. of characters printed - * Params : @n: Number - * @base: Base e.g. HEX, BIN... - ****************************************************************/ -short printNumber_L_ln(long num, int base) -{ - short n = 0; - n = printNumber_L(num, base); - n += println(); - return n; -} - -/**************************************************************** - * Function Name : printNumber_I - * Description : Print int data types - * Returns : No. of characters printed - * Params : @n: Number - * @base: Base e.g. HEX, BIN... - ****************************************************************/ -short printNumber_I(int n, int base) -{ - return printNumber_L((long) n, base); -} - -/**************************************************************** - * Function Name : printNumber_I_ln - * Description : Print int & advance to next line - * Returns : No. of characters printed - * Params : @n: Number - * @base: Base e.g. HEX, BIN... - ****************************************************************/ -short printNumber_I_ln(int n, int base) -{ - short a = 0; - a = printNumber_L((long) n, base); - a += println(); - return a; -} - -/**************************************************************** - * Function Name : printFloat - * Description : Print floating Pt. No's. - * Returns : No. of characters printed - * Params : @n: Number - * @digits: Resolution - ****************************************************************/ -short printFloat(double number, unsigned char digits) -{ - unsigned char i = 0; - short n = 0; - unsigned long int_part = 0; - double remainder = 0.0; - int toPrint = 0; - - // Round correctly so that print(1.999, 2) prints as "2.00" - double rounding = 0.5; - - if(isnan(number)) - return print_str("nan"); - if(isinf(number)) - return print_str("inf"); - if(number > 4294967040.0) - return print_str("ovf"); // constant determined empirically - if(number < -4294967040.0) - return print_str("ovf"); // constant determined empirically - - // Handle negative numbers - if(number < 0.0) - { - n += oled_write('-'); - number = -number; - } - - - for(i = 0; i < digits; ++i) - rounding /= 10.0; - - number += rounding; - - // Extract the integer part of the number and print it - int_part = (unsigned long) number; - remainder = number - (double) int_part; - n += printNumber_UL(int_part,DEC); - - // Print the decimal point, but only if there are digits beyond - if(digits > 0) - { - n += print_str("."); - } - - // Extract digits from the remainder one at a time - while(digits-- > 0) - { - remainder *= 10.0; - toPrint = (int)remainder; - n += printNumber_I(toPrint,DEC); - remainder -= toPrint; - } - return n; -} - -/**************************************************************** - * Function Name : printFloat_ln - * Description : Print floating Pt. No and advance to next line - * Returns : No. of characters printed - * Params : @n: Number - * @digits: Resolution - ****************************************************************/ -short printFloat_ln(double num, int digits) -{ - short n = 0; - n = printFloat(num, digits); - n += println(); - return n; -} diff --git a/luci-app-oled/src/SSD1306_OLED_Library/SSD1306_OLED.h b/luci-app-oled/src/SSD1306_OLED_Library/SSD1306_OLED.h deleted file mode 100644 index 9becaf4a0..000000000 --- a/luci-app-oled/src/SSD1306_OLED_Library/SSD1306_OLED.h +++ /dev/null @@ -1,202 +0,0 @@ -/* - * MIT License - -Copyright (c) 2017 DeeplyEmbedded - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -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. - - * SSD1306_OLED.h - * - * Created on : Sep 21, 2017 - * Author : Vinay Divakar - * Website : www.deeplyembedded.org - */ - -#ifndef SSD1306_OLED_H_ -#define SSD1306_OLED_H_ - -/* Lib's */ -#include - -/* Find Min and Max - MACROS */ -#define MIN(a,b) (((a)<(b))?(a):(b)) -#define MAX(a,b) (((a)>(b))?(a):(b)) - -/* I2C Address of SSD1306 */ -#define SSD1306_OLED_ADDR 0x3C -#define DISPLAY_BUFF_SIZE (SSD1306_LCDWIDTH*SSD1306_LCDHEIGHT/8) - -/* COLOR MACROS */ -#define WHITE 1 -#define BLACK 0 -#define INVERSE 2 - -/* Number output format */ -#define DEC 10 -#define HEX 16 -#define OCT 8 -#define BIN 2 -#define DEFAULT 0 - -/*D/C# bit is '0' indicating that following - * byte is a command. '1' is for data - */ -#define SSD1306_CNTRL_CMD 0x00 -#define SSD1306_CNTRL_DATA 0x40 - - -/*-----------------------Enable the WxL of the Display ---------------------------*/ -//#define SSD1306_128_64 -#define SSD1306_128_32 -//#define SSD1306_96_16 -/*--------------------------------------------------------------------------------*/ - -/* LCD HxW i.e. 64x128 || WxL i.e. 128x64 */ -#if defined SSD1306_128_64 -#define SSD1306_LCDWIDTH 128 -#define SSD1306_LCDHEIGHT 64 -#endif -#if defined SSD1306_128_32 - #define SSD1306_LCDWIDTH 128 - #define SSD1306_LCDHEIGHT 32 -#endif -#if defined SSD1306_96_16 - #define SSD1306_LCDWIDTH 96 - #define SSD1306_LCDHEIGHT 16 -#endif - -/* SSD1306 Commands */ -#define SSD1306_DISPLAY_OFF 0xAE -#define SSD1306_SET_DISP_CLK 0xD5 -#define SSD1306_SET_MULTIPLEX 0xA8 -#define SSD1306_SET_DISP_OFFSET 0xD3 -#define SSD1306_SET_DISP_START_LINE 0x40// | 0x00) -#define SSD1306_CONFIG_CHARGE_PUMP 0x8D -#define SSD1306_SET_MEM_ADDR_MODE 0x20 -#define SSD1306_SEG_REMAP (0xA0 | 0x01) //Rotate 180 Degrees -#define SSD1306_SET_COMSCANDEC 0xC8 -#define SSD1306_SET_COMPINS 0xDA -#define SSD1306_SET_CONTRAST 0x81 -#define SSD1306_SET_PRECHARGE 0xD9 -#define SSD1306_SET_VCOMDETECT 0xDB -#define SSD1306_DISPLAYALLON_RESUME 0xA4 -#define SSD1306_NORMAL_DISPLAY 0xA6 -#define SSD1306_DISPLAYON 0xAF -#define SSD1306_SET_COL_ADDR 0x21 -#define SSD1306_PAGEADDR 0x22 -#define SSD1306_INVERT_DISPLAY 0x01 -#define SSD1306_NORMALIZE_DISPLAY 0x00 - -/* SDD1306 Scroll Commands */ -#define SSD1306_SET_VERTICAL_SCROLL_AREA 0xA3 -#define SSD1306_ACTIVATE_SCROLL 0x2F -#define SSD1306_DEACTIVATE_SCROLL 0x2E -#define SSD1306_RIGHT_HORIZONTAL_SCROLL 0x26 -#define SSD1306_LEFT_HORIZONTAL_SCROLL 0x27 -#define SSD1306_VERTICAL_AND_RIGHT_HORIZONTAL_SCROLL 0x29 -#define SSD1306_VERTICAL_AND_LEFT_HORIZONTAL_SCROLL 0x2A -#define SSD1306_INVERTDISPLAY 0xA7 - -/* SSD1306 Configuration Commands */ -#define SSD1306_DISPCLK_DIV 0x80 -#if defined SSD1306_128_64 -#define SSD1306_MULT_64 0x3F -#endif -#if defined SSD1306_128_32 - #define SSD1306_MULT_64 0x1F -#endif -#define SSD1306_MULT_64 0x1F -#define SSD1306_DISP_OFFSET_VAL 0x00 -#define SSD1306_COL_START_ADDR 0x00 //Reset to = 0 -#define SSD1306_COL_END_ADDR (SSD1306_LCDWIDTH - 1) //Reset to = 127 -#define SSD1306_PG_START_ADDR 0x00 -#define SSD1306_PG_END_ADDR 7 -#define SSD1306_CHARGE_PUMP_EN 0x14 -#if defined SSD1306_128_64 -#define SSD1306_CONFIG_COM_PINS 0x12 -#endif -#if defined SSD1306_128_32 - #define SSD1306_CONFIG_COM_PINS 0x02 -#endif -#define SSD1306_CONTRAST_VAL 0xCF //207 -#define SSD1306_PRECHARGE_VAL 0xF1 -#define SSD1306_VCOMH_VAL 0x40 -#define SSD1306_MULT_DAT (SSD1306_LCDHEIGHT - 1) -#define SSD1306_HOR_MM 0x00 - -/*SSD1306 Display API's */ -extern void clearDisplay(); -extern void display_Init_seq(); -extern void Display(); -extern void Init_Col_PG_addrs(unsigned char col_start_addr, unsigned char col_end_addr, - unsigned char pg_start_addr, unsigned char pg_end_addr); -extern void setRotation(unsigned char x); -extern void startscrollright(unsigned char start, unsigned char stop); -extern void startscrollleft(unsigned char start, unsigned char stop); -extern void startscrolldiagright(unsigned char start, unsigned char stop); -extern void startscrolldiagleft(unsigned char start, unsigned char stop); -extern void stopscroll(); -extern void setCursor(short x, short y); -extern short getCursorX(); -extern short getCursorY(); -extern unsigned char getRotation(); -extern void invertDisplay(unsigned char i); - -/*SSD1306 Graphics Handling API's */ -extern signed char drawPixel(short x, short y, short color); -extern void writeLine(short x0, short y0, short x1, short y1, short color); -extern void drawCircleHelper( short x0, short y0, short r, unsigned char cornername, short color); -extern void drawLine(short x0, short y0, short x1, short y1, short color); -extern void drawRect(short x, short y, short w, short h, short color); -extern void fillRect(short x, short y, short w, short h, short color); -extern void drawCircle(short x0, short y0, short r, short color); -extern void fillCircleHelper(short x0, short y0, short r, unsigned char cornername, short delta, short color); -extern void fillCircle(short x0, short y0, short r, short color); -extern void drawTriangle(short x0, short y0, short x1, short y1, short x2, short y2, short color); -extern void fillTriangle(short x0, short y0, short x1, short y1, short x2, short y2, short color); -extern void drawRoundRect(short x, short y, short w, short h, short r, short color); -extern void fillRoundRect(short x, short y, short w, short h, short r, short color); -extern void drawBitmap(short x, short y, const unsigned char bitmap[], short w, short h, short color); -extern short oled_write(unsigned char c); - -/*SSD1306 Text and Character Handling API's */ -extern void setTextSize(unsigned char s); -extern void setTextColor(short c); -extern void setTextWrap(bool w); -extern void drawChar(short x, short y, unsigned char c, short color, short bg, unsigned char size); -extern short print_str(const unsigned char *strPtr); -extern short println(); -extern short print_strln(const unsigned char *strPtr); - -/*SSD1306 Number Handling API's */ -extern short printNumber(unsigned long n, unsigned char base); -extern short printNumber_UL(unsigned long n, int base); -extern short printNumber_UL_ln(unsigned long num, int base); -extern short printNumber_UI(unsigned int n, int base); -extern short printNumber_UI_ln(unsigned int n, int base); -extern short printNumber_UC(unsigned char b, int base); -extern short printNumber_UC_ln(unsigned char b, int base); -extern short printNumber_L(long n, int base); -extern short printNumber_L_ln(long num, int base); -extern short printNumber_I(int n, int base); -extern short printNumber_I_ln(int n, int base); -extern short printFloat(double number, unsigned char digits); -extern short printFloat_ln(double num, int digits); -#endif /* SSD1306_OLED_H_ */ - diff --git a/luci-app-oled/src/SSD1306_OLED_Library/gfxfont.h b/luci-app-oled/src/SSD1306_OLED_Library/gfxfont.h deleted file mode 100644 index e66128a88..000000000 --- a/luci-app-oled/src/SSD1306_OLED_Library/gfxfont.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef _GFXFONT_H_ -#define _GFXFONT_H_ - -typedef struct { // Data stored PER GLYPH - unsigned short bitmapOffset; // Pointer into GFXfont->bitmap - unsigned char width, height; // Bitmap dimensions in pixels - unsigned char xAdvance; // Distance to advance cursor (x axis) - char xOffset, yOffset; // Dist from cursor pos to UL corner -} GFXglyphT, *GFXglyphPtr; - -typedef struct { // Data stored for FONT AS A WHOLE: - unsigned char *bitmap; // Glyph bitmaps, concatenated - GFXglyphPtr glyph; // Glyph array - unsigned char first, last; // ASCII extents - unsigned char yAdvance; // Newline distance (y axis) -} GFXfontT, *GFXfontPtr; - -#endif // _GFXFONT_H_ diff --git a/openwrt-app-actions/README.md b/openwrt-app-actions/README.md deleted file mode 100644 index 2734ba653..000000000 --- a/openwrt-app-actions/README.md +++ /dev/null @@ -1,9 +0,0 @@ -# Openwrt-actions - -## 使用步骤 -1. 选择actions标签，选择Build IPKs![image](https://user-images.githubusercontent.com/1214708/153843131-615197e2-4ff4-4c0b-b30a-372e1c513158.png) - -2. 点击run workflow，输入要编译的插件名称，空格隔开，或者填“all”用来编译所有插件，然后开始编译![image](https://user-images.githubusercontent.com/1214708/153843217-0591a7e6-4758-461e-8b2b-9bb830b87fb2.png) - -3. 等待编译完成，点击任务进入详情页 -4. 在详情页下载插件压缩包![image](https://user-images.githubusercontent.com/1214708/153843272-81843b45-6dc8-4945-871f-a9a467f63c33.png) diff --git a/openwrt-app-actions/applications/airconnect/Makefile b/openwrt-app-actions/applications/airconnect/Makefile deleted file mode 100644 index 53bccc948..000000000 --- a/openwrt-app-actions/applications/airconnect/Makefile +++ /dev/null @@ -1,55 +0,0 @@ -# -# Copyright (C) 2015 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=airconnect -PKG_VERSION:=1.0.13 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_VERSION:=9fc8c184da22d6b34a5b093f6ec8cf6ecaf22dbf -PKG_SOURCE_URL_FILE:=$(PKG_SOURCE_VERSION).tar.gz -PKG_SOURCE_URL:=https://github.com/philippe44/AirConnect/archive/ -PKG_HASH:=0da27af9a1d49cd83f8381453d5e1b9c6551ad1ce45bbb7b820e5499796c5440 - -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/AirConnect-$(PKG_SOURCE_VERSION) - -PKG_MAINTAINER:=jjm2473 - -include $(INCLUDE_DIR)/package.mk - -define Package/$(PKG_NAME) - SECTION:=multimedia - CATEGORY:=Multimedia - TITLE:=AirConnect - URL:=https://github.com/philippe44/AirConnect -endef - -define Package/$(PKG_NAME)/description - Use AirPlay to stream to UPnP/Sonos & Chromecast devices -endef - -define Package/$(PKG_NAME)/conffiles -/etc/config/airconnect -endef - -define Build/Configure -endef - -define Build/Compile -endef - -define Package/$(PKG_NAME)/install - $(INSTALL_DIR) $(1)/usr/bin $(1)/etc/config $(1)/etc/init.d - $(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/aircast-linux-$(ARCH)-static $(1)/usr/bin/aircast - $(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/airupnp-linux-$(ARCH)-static $(1)/usr/bin/airupnp - $(INSTALL_CONF) ./files/airconnect.config $(1)/etc/config/airconnect - $(INSTALL_BIN) ./files/airconnect.init $(1)/etc/init.d/airconnect -endef - -$(eval $(call BuildPackage,airconnect)) diff --git a/openwrt-app-actions/applications/airconnect/files/airconnect.config b/openwrt-app-actions/applications/airconnect/files/airconnect.config deleted file mode 100644 index 310c0017f..000000000 --- a/openwrt-app-actions/applications/airconnect/files/airconnect.config +++ /dev/null @@ -1,5 +0,0 @@ -config main - option 'enabled' '0' - option 'interface' 'lan' - option 'aircast' '1' - option 'airupnp' '1' diff --git a/openwrt-app-actions/applications/airconnect/files/airconnect.init b/openwrt-app-actions/applications/airconnect/files/airconnect.init deleted file mode 100755 index ee30d2224..000000000 --- a/openwrt-app-actions/applications/airconnect/files/airconnect.init +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh /etc/rc.common - -START=99 -STOP=01 -USE_PROCD=1 - -service_triggers() { - procd_add_reload_trigger "airconnect" -} - -main_config() { - config_get AIRUPNP_IFACE "$1" interface "lan" - config_get_bool ENABLE_MAIN "$1" enabled 0 - config_get_bool ENABLE_AIRCAST "$1" aircast 0 - config_get_bool ENABLE_AIRUPNP "$1" airupnp 0 -} - -start_service() { - config_load airconnect - config_foreach main_config main - [ "$ENABLE_MAIN" = 0 ] && return 0 - [ "$ENABLE_AIRCAST" = 0 -a "$ENABLE_AIRUPNP" = 0 ] && return 0 - - local interface=$( - . /lib/functions/network.sh - - network_is_up "$AIRUPNP_IFACE" || exit 0 - network_get_device device "$AIRUPNP_IFACE" - printf "%s" "${device:-$AIRUPNP_IFACE}" - ) - [ -z "$interface" ] && interface=br-lan - local common_args="-Z -b $interface" - - if [ "$ENABLE_AIRUPNP" = 1 ]; then - procd_open_instance - procd_set_param command /usr/bin/airupnp $common_args - procd_set_param respawn - procd_close_instance - fi - if [ "$ENABLE_AIRCAST" = 1 ]; then - procd_open_instance - procd_set_param command /usr/bin/aircast $common_args - procd_set_param respawn - procd_close_instance - fi -} \ No newline at end of file diff --git a/openwrt-app-actions/applications/luci-app-airconnect/Makefile b/openwrt-app-actions/applications/luci-app-airconnect/Makefile deleted file mode 100644 index e5a217680..000000000 --- a/openwrt-app-actions/applications/luci-app-airconnect/Makefile +++ /dev/null @@ -1,15 +0,0 @@ - - -include $(TOPDIR)/rules.mk - -PKG_VERSION:=1.0.0-20221219 -PKG_RELEASE:= - -LUCI_TITLE:=LuCI support for airconnect -LUCI_PKGARCH:=all -LUCI_DEPENDS:=+airconnect - -include $(TOPDIR)/feeds/luci/luci.mk - -# call BuildPackage - OpenWrt buildroot signature - diff --git a/openwrt-app-actions/applications/luci-app-airconnect/luasrc/controller/airconnect.lua b/openwrt-app-actions/applications/luci-app-airconnect/luasrc/controller/airconnect.lua deleted file mode 100644 index f6bc4d9e3..000000000 --- a/openwrt-app-actions/applications/luci-app-airconnect/luasrc/controller/airconnect.lua +++ /dev/null @@ -1,7 +0,0 @@ - -module("luci.controller.airconnect", package.seeall) - -function index() - entry({"admin", "services", "airconnect"}, alias("admin", "services", "airconnect", "config"), _("AirConnect"), 90).dependent = true - entry({"admin", "services", "airconnect", "config"}, cbi("airconnect")) -end diff --git a/openwrt-app-actions/applications/luci-app-airconnect/luasrc/model/cbi/airconnect.lua b/openwrt-app-actions/applications/luci-app-airconnect/luasrc/model/cbi/airconnect.lua deleted file mode 100644 index 5bbbda7cb..000000000 --- a/openwrt-app-actions/applications/luci-app-airconnect/luasrc/model/cbi/airconnect.lua +++ /dev/null @@ -1,31 +0,0 @@ ---[[ -LuCI - Lua Configuration Interface -]]-- - -local m, s, o - -m = Map("airconnect", translate("AirConnect"), translate("Use AirPlay to stream to UPnP/Sonos & Chromecast devices")) - -s = m:section(TypedSection, "main", translate("Global Settings")) -s.addremove=false -s.anonymous=true - -o = s:option(Flag, "enabled", translate("Enable")) -o.default = 0 -o.rmempty = false - -o = s:option(Value, "interface", translate("Interface"), translate("Network interface for serving, usually LAN")) -o.template = "cbi/network_netlist" -o.nocreate = true -o.default = "lan" -o.datatype = "string" - -o = s:option(Flag, "aircast", translate("Supports Chromecast"), translate("Select this if you have Chromecast devices")) -o.default = 1 -o.rmempty = false - -o = s:option(Flag, "airupnp", translate("Supports UPnP/Sonos"), translate("Select this if you have UPnP/Sonos devices")) -o.default = 1 -o.rmempty = false - -return m diff --git a/openwrt-app-actions/applications/luci-app-airconnect/po/zh-cn/airconnect.po b/openwrt-app-actions/applications/luci-app-airconnect/po/zh-cn/airconnect.po deleted file mode 100644 index 2fee709d9..000000000 --- a/openwrt-app-actions/applications/luci-app-airconnect/po/zh-cn/airconnect.po +++ /dev/null @@ -1,23 +0,0 @@ -msgid "" -msgstr "Content-Type: text/plain; charset=UTF-8" - -msgid "Use AirPlay to stream to UPnP/Sonos & Chromecast devices" -msgstr "AirConnect 让 UPnP/Sonos 和 Chromecast 设备支持 AirPlay 音频串流" - -msgid "Global Settings" -msgstr "全局设置" - -msgid "Network interface for serving, usually LAN" -msgstr "提供服务的网络接口，通常是 LAN 口" - -msgid "Supports Chromecast" -msgstr "支持 Chromecast 设备" - -msgid "Supports UPnP/Sonos" -msgstr "支持 UPnP/Sonos 设备" - -msgid "Select this if you have Chromecast devices" -msgstr "如果你有 Chromecast 设备就选中这个" - -msgid "Select this if you have UPnP/Sonos devices" -msgstr "如果你有 UPnP/Sonos 设备就选中这个" diff --git a/openwrt-app-actions/applications/luci-app-chinesesubfinder/Makefile b/openwrt-app-actions/applications/luci-app-chinesesubfinder/Makefile deleted file mode 100644 index 23ec3a1f8..000000000 --- a/openwrt-app-actions/applications/luci-app-chinesesubfinder/Makefile +++ /dev/null @@ -1,18 +0,0 @@ - - -include $(TOPDIR)/rules.mk - -PKG_VERSION:=1.0.1-20230108 -PKG_RELEASE:= - -LUCI_TITLE:=LuCI support for ChineseSubFinder -LUCI_PKGARCH:=all -LUCI_DEPENDS:=+docker +luci-lib-taskd - -define Package/luci-app-chinesesubfinder/conffiles -/etc/config/chinesesubfinder -endef - -include $(TOPDIR)/feeds/luci/luci.mk - -# call BuildPackage - OpenWrt buildroot signature diff --git a/openwrt-app-actions/applications/luci-app-chinesesubfinder/luasrc/controller/chinesesubfinder.lua b/openwrt-app-actions/applications/luci-app-chinesesubfinder/luasrc/controller/chinesesubfinder.lua deleted file mode 100755 index e6349e170..000000000 --- a/openwrt-app-actions/applications/luci-app-chinesesubfinder/luasrc/controller/chinesesubfinder.lua +++ /dev/null @@ -1,7 +0,0 @@ - -module("luci.controller.chinesesubfinder", package.seeall) - -function index() - entry({"admin", "services", "chinesesubfinder"}, alias("admin", "services", "chinesesubfinder", "config"), _("ChineseSubFinder"), 30).dependent = true - entry({"admin", "services", "chinesesubfinder", "config"}, cbi("chinesesubfinder")) -end diff --git a/openwrt-app-actions/applications/luci-app-chinesesubfinder/luasrc/model/cbi/chinesesubfinder.lua b/openwrt-app-actions/applications/luci-app-chinesesubfinder/luasrc/model/cbi/chinesesubfinder.lua deleted file mode 100644 index 48ae2ba56..000000000 --- a/openwrt-app-actions/applications/luci-app-chinesesubfinder/luasrc/model/cbi/chinesesubfinder.lua +++ /dev/null @@ -1,54 +0,0 @@ ---[[ -LuCI - Lua Configuration Interface -]]-- - -local taskd = require "luci.model.tasks" -local chinesesubfinder_model = require "luci.model.chinesesubfinder" -local m, s, o - -m = taskd.docker_map("chinesesubfinder", "chinesesubfinder", "/usr/libexec/istorec/chinesesubfinder.sh", - translate("ChineseSubFinder"), - translate("ChineseSubFinder is a tool which can download chinese subtitle automaticly.") - .. translate("Official website:") .. ' https://github.com/allanpk716/ChineseSubFinder') - -s = m:section(SimpleSection, translate("Service Status"), translate("ChineseSubFinder status:")) -s:append(Template("chinesesubfinder/status")) - -s = m:section(TypedSection, "main", translate("Setup"), translate("The following parameters will only take effect during installation or upgrade:")) -s.addremove=false -s.anonymous=true - -o = s:option(Value, "http_port", translate("HTTP Port").."*") -o.rmempty = false -o.default = "19035" -o.datatype = "string" - -o = s:option(Value, "web_port", "WEB Port*") -o.rmempty = false -o.default = "19037" -o.datatype = "string" - -o = s:option(Value, "image_name", translate("Image").."*") -o.rmempty = false -o.datatype = "string" -o:value("allanpk716/chinesesubfinder:latest-lite", "allanpk716/chinesesubfinder:latest-lite") -o:value("allanpk716/chinesesubfinder:v0.43.1-lite", "allanpk716/chinesesubfinder:v0.43.1-lite") -o.default = "allanpk716/chinesesubfinder:latest-lite" - -local blocks = chinesesubfinder_model.blocks() -local home = chinesesubfinder_model.home() - -o = s:option(Value, "config_path", translate("Config path").."*") -o.rmempty = false -o.datatype = "string" - -local paths, default_path = chinesesubfinder_model.find_paths(blocks, home, "Configs") -for _, val in pairs(paths) do - o:value(val, val) -end -o.default = default_path - -o = s:option(Value, "media_path", translate("Media path"), translate("Not required, all disk is mounted in") .. " /mnt") -o.datatype = "string" - -return m diff --git a/openwrt-app-actions/applications/luci-app-chinesesubfinder/luasrc/model/chinesesubfinder.lua b/openwrt-app-actions/applications/luci-app-chinesesubfinder/luasrc/model/chinesesubfinder.lua deleted file mode 100644 index a9d2b0095..000000000 --- a/openwrt-app-actions/applications/luci-app-chinesesubfinder/luasrc/model/chinesesubfinder.lua +++ /dev/null @@ -1,55 +0,0 @@ -local util = require "luci.util" -local jsonc = require "luci.jsonc" - -local chinesesubfinder = {} - -chinesesubfinder.blocks = function() - local f = io.popen("lsblk -s -f -b -o NAME,FSSIZE,MOUNTPOINT --json", "r") - local vals = {} - if f then - local ret = f:read("*all") - f:close() - local obj = jsonc.parse(ret) - for _, val in pairs(obj["blockdevices"]) do - local fsize = val["fssize"] - if fsize ~= nil and string.len(fsize) > 10 and val["mountpoint"] then - -- fsize > 1G - vals[#vals+1] = val["mountpoint"] - end - end - end - return vals -end - -chinesesubfinder.home = function() - local uci = require "luci.model.uci".cursor() - local home_dirs = {} - home_dirs["main_dir"] = uci:get_first("quickstart", "main", "main_dir", "/root") - home_dirs["Configs"] = uci:get_first("quickstart", "main", "conf_dir", home_dirs["main_dir"].."/Configs") - home_dirs["Public"] = uci:get_first("quickstart", "main", "pub_dir", home_dirs["main_dir"].."/Public") - home_dirs["Downloads"] = uci:get_first("quickstart", "main", "dl_dir", home_dirs["Public"].."/Downloads") - home_dirs["Caches"] = uci:get_first("quickstart", "main", "tmp_dir", home_dirs["main_dir"].."/Caches") - return home_dirs -end - -chinesesubfinder.find_paths = function(blocks, home_dirs, path_name) - local default_path = '' - local configs = {} - - default_path = home_dirs[path_name] .. "/ChineseSubFinder" - if #blocks == 0 then - table.insert(configs, default_path) - else - for _, val in pairs(blocks) do - table.insert(configs, val .. "/" .. path_name .. "/ChineseSubFinder") - end - local without_conf_dir = "/root/" .. path_name .. "/ChineseSubFinder" - if default_path == without_conf_dir then - default_path = configs[1] - end - end - - return configs, default_path -end - -return chinesesubfinder diff --git a/openwrt-app-actions/applications/luci-app-chinesesubfinder/luasrc/view/chinesesubfinder/status.htm b/openwrt-app-actions/applications/luci-app-chinesesubfinder/luasrc/view/chinesesubfinder/status.htm deleted file mode 100644 index 3fb88253e..000000000 --- a/openwrt-app-actions/applications/luci-app-chinesesubfinder/luasrc/view/chinesesubfinder/status.htm +++ /dev/null @@ -1,31 +0,0 @@ -<% -local util = require "luci.util" -local container_status = util.trim(util.exec("/usr/libexec/istorec/chinesesubfinder.sh status")) -local container_install = (string.len(container_status) > 0) -local container_running = container_status == "running" --%> -
- -
- <% if container_running then %> - - <% else %> - - <% end %> -
-
-<% -if container_running then - local port=util.trim(util.exec("/usr/libexec/istorec/chinesesubfinder.sh port")) - if port == "" then - port="19035" - end --%> -
- -
- - -
-
-<% end %> diff --git a/openwrt-app-actions/applications/luci-app-chinesesubfinder/po/zh-cn/chinesesubfinder.po b/openwrt-app-actions/applications/luci-app-chinesesubfinder/po/zh-cn/chinesesubfinder.po deleted file mode 100644 index a51b41b1e..000000000 --- a/openwrt-app-actions/applications/luci-app-chinesesubfinder/po/zh-cn/chinesesubfinder.po +++ /dev/null @@ -1,41 +0,0 @@ -msgid "" -msgstr "Content-Type: text/plain; charset=UTF-8" - -msgid "Official website:" -msgstr "官方网站：" - -msgid "ChineseSubFinder is a tool which can download chinese subtitle automaticly." -msgstr "ChineseSubFinder是一个自动化中文字幕下载工具。" - -msgid "Config path" -msgstr "配置文件路径" - -msgid "HTTP Port" -msgstr "HTTP 端口" - -msgid "Service Status" -msgstr "服务状态" - -msgid "ChineseSubFinder status:" -msgstr "ChineseSubFinder 的状态信息如下：" - -msgid "Setup" -msgstr "安装配置" - -msgid "The following parameters will only take effect during installation or upgrade:" -msgstr "以下参数只在安装或者升级时才会生效：" - -msgid "Status" -msgstr "状态" - -msgid "ChineseSubFinder is running" -msgstr "ChineseSubFinder 运行中" - -msgid "ChineseSubFinder is not running" -msgstr "ChineseSubFinder 未运行" - -msgid "Open ChineseSubFinder" -msgstr "打开 ChineseSubFinder" - -msgid "Not required, all disk is mounted in" -msgstr "可不填，所有硬盘都在" diff --git a/openwrt-app-actions/applications/luci-app-chinesesubfinder/root/etc/config/chinesesubfinder b/openwrt-app-actions/applications/luci-app-chinesesubfinder/root/etc/config/chinesesubfinder deleted file mode 100644 index cfeff5860..000000000 --- a/openwrt-app-actions/applications/luci-app-chinesesubfinder/root/etc/config/chinesesubfinder +++ /dev/null @@ -1,6 +0,0 @@ -config main - option 'http_port' '19035' - option 'web_port' '19037' - option 'image_name' 'allanpk716/chinesesubfinder:latest-lite' - option 'config_path' '' - diff --git a/openwrt-app-actions/applications/luci-app-chinesesubfinder/root/usr/libexec/istorec/chinesesubfinder.sh b/openwrt-app-actions/applications/luci-app-chinesesubfinder/root/usr/libexec/istorec/chinesesubfinder.sh deleted file mode 100755 index 92b1b6205..000000000 --- a/openwrt-app-actions/applications/luci-app-chinesesubfinder/root/usr/libexec/istorec/chinesesubfinder.sh +++ /dev/null @@ -1,79 +0,0 @@ -#!/bin/sh -# Author Xiaobao(xiaobao@linkease.com) - -ACTION=${1} -shift 1 - -do_install() { - local http_port=`uci get chinesesubfinder.@main[0].http_port 2>/dev/null` - local web_port=`uci get chinesesubfinder.@main[0].web_port 2>/dev/null` - local image_name=`uci get chinesesubfinder.@main[0].image_name 2>/dev/null` - local config=`uci get chinesesubfinder.@main[0].config_path 2>/dev/null` - local media=`uci get chinesesubfinder.@main[0].media_path 2>/dev/null` - - [ -z "$image_name" ] && image_name="allanpk716/chinesesubfinder:latest-lite" - echo "docker pull ${image_name}" - docker pull ${image_name} - docker rm -f chinesesubfinder - - if [ -z "$config" ]; then - echo "config path is empty!" - exit 1 - fi - - [ -z "$http_port" ] && http_port=19035 - [ -z "$web_port" ] && web_port=19037 - - local cmd="docker run --restart=unless-stopped -d -v \"$config:/config\" --dns=172.17.0.1 -p $http_port:19035 -p $web_port:19037 \ - --hostname chinesesubfinder \ - --log-driver \"json-file\" \ - --log-opt \"max-size=100m\" " - - local tz="`uci get system.@system[0].zonename`" - [ -z "$tz" ] || cmd="$cmd -e TZ=$tz" - - [ -z "$media" ] || cmd="$cmd -v \"$media:/media\"" - - cmd="$cmd -v /mnt:/mnt" - mountpoint -q /mnt && cmd="$cmd:rslave" - cmd="$cmd --name chinesesubfinder \"$image_name\"" - - echo "$cmd" - eval "$cmd" -} - -usage() { - echo "usage: $0 sub-command" - echo "where sub-command is one of:" - echo " install Install the chinesesubfinder" - echo " upgrade Upgrade the chinesesubfinder" - echo " rm/start/stop/restart Remove/Start/Stop/Restart the chinesesubfinder" - echo " status ChineseSubFinder status" - echo " port ChineseSubFinder port" -} - -case ${ACTION} in - "install") - do_install - ;; - "upgrade") - do_install - ;; - "rm") - docker rm -f chinesesubfinder - ;; - "start" | "stop" | "restart") - docker ${ACTION} chinesesubfinder - ;; - "status") - docker ps --all -f 'name=chinesesubfinder' --format '{{.State}}' - ;; - "port") - local http_port=`uci get chinesesubfinder.@main[0].http_port 2>/dev/null` - echo $http_port - ;; - *) - usage - exit 1 - ;; -esac diff --git a/openwrt-app-actions/applications/luci-app-codeserver/Makefile b/openwrt-app-actions/applications/luci-app-codeserver/Makefile deleted file mode 100644 index 9369a1319..000000000 --- a/openwrt-app-actions/applications/luci-app-codeserver/Makefile +++ /dev/null @@ -1,18 +0,0 @@ - - -include $(TOPDIR)/rules.mk - -PKG_VERSION:=1.0.1-20230108 -PKG_RELEASE:= - -LUCI_TITLE:=LuCI support for CodeServer -LUCI_PKGARCH:=all -LUCI_DEPENDS:=+docker +luci-lib-taskd - -define Package/luci-app-codeserver/conffiles -/etc/config/codeserver -endef - -include $(TOPDIR)/feeds/luci/luci.mk - -# call BuildPackage - OpenWrt buildroot signature diff --git a/openwrt-app-actions/applications/luci-app-codeserver/luasrc/controller/codeserver.lua b/openwrt-app-actions/applications/luci-app-codeserver/luasrc/controller/codeserver.lua deleted file mode 100755 index 24643bf19..000000000 --- a/openwrt-app-actions/applications/luci-app-codeserver/luasrc/controller/codeserver.lua +++ /dev/null @@ -1,9 +0,0 @@ - -module("luci.controller.codeserver", package.seeall) - -function index() - entry({"admin", "services", "codeserver"}, alias("admin", "services", "codeserver", "config"), _("CodeServer"), 30).dependent = true - entry({"admin", "services", "codeserver", "config"}, cbi("codeserver/config"), _("Config"), 10).leaf = true - entry({"admin", "services", "codeserver", "tool"}, form("codeserver/tool"), _("Tool"), 30).leaf = true - entry({"admin", "services", "codeserver", "console"}, form("codeserver/console"), _("Console"), 50).leaf = true -end diff --git a/openwrt-app-actions/applications/luci-app-codeserver/luasrc/model/cbi/codeserver/config.lua b/openwrt-app-actions/applications/luci-app-codeserver/luasrc/model/cbi/codeserver/config.lua deleted file mode 100644 index 7aa882ac6..000000000 --- a/openwrt-app-actions/applications/luci-app-codeserver/luasrc/model/cbi/codeserver/config.lua +++ /dev/null @@ -1,64 +0,0 @@ ---[[ -LuCI - Lua Configuration Interface -]]-- - -local taskd = require "luci.model.tasks" -local codeserver_model = require "luci.model.codeserver" -local m, s, o - -m = taskd.docker_map("codeserver", "codeserver", "/usr/libexec/istorec/codeserver.sh", - translate("CodeServer"), - translate("CodeServer is a web version of VSCode.") - .. translate("Official website:") .. ' https://coder.com/') - -s = m:section(SimpleSection, translate("Service Status"), translate("CodeServer status:")) -s:append(Template("codeserver/status")) - -s = m:section(TypedSection, "main", translate("Setup"), translate("The following parameters will only take effect during installation or upgrade:")) -s.addremove=false -s.anonymous=true - -o = s:option(Value, "http_port", translate("HTTP Port").."*") -o.default = "8085" -o.datatype = "string" - -o = s:option(Value, "image_name", translate("Image").."*") -o.rmempty = false -o.datatype = "string" -o:value("lscr.io/linuxserver/code-server:latest", "lscr.io/linuxserver/code-server:latest") -o:value("lscr.io/linuxserver/code-server:4.8.3", "lscr.io/linuxserver/code-server:4.8.3") -o.default = "lscr.io/linuxserver/code-server:latest" - -local blocks = codeserver_model.blocks() -local home = codeserver_model.home() - -o = s:option(Value, "config_path", translate("Config path").."*") -o.rmempty = false -o.datatype = "string" - -local paths, default_path = codeserver_model.find_paths(blocks, home, "Configs") -for _, val in pairs(paths) do - o:value(val, val) -end -o.default = default_path - -o = s:option(Value, "env_password", "PASSWORD") -o.password = true -o.datatype = "string" - -o = s:option(Value, "env_hashed_password", "HASHED_PASSWORD") -o.datatype = "string" -o.password = true - -o = s:option(Value, "env_sudo_password", "SUDO_PASSWORD") -o.password = true -o.datatype = "string" - -o = s:option(Value, "env_sudo_password_hash", "SUDO_PASSWORD_HASH") -o.password = true -o.datatype = "string" - -o = s:option(Value, "env_proxy_domain", "PROXY_DOMAIN") -o.datatype = "string" - -return m diff --git a/openwrt-app-actions/applications/luci-app-codeserver/luasrc/model/cbi/codeserver/console.lua b/openwrt-app-actions/applications/luci-app-codeserver/luasrc/model/cbi/codeserver/console.lua deleted file mode 100644 index 0ad9e8b9c..000000000 --- a/openwrt-app-actions/applications/luci-app-codeserver/luasrc/model/cbi/codeserver/console.lua +++ /dev/null @@ -1,110 +0,0 @@ ---[[ -LuCI - Lua Configuration Interface -]]-- - - -require "luci.util" - -local docker = require "luci.model.docker" -local dk = docker.new() - -local container_name = "codeserver" - -local m, s, o -local images, networks, container_info, res - -res = dk.containers:inspect({name = container_name}) -if res.code < 300 then - container_info = res.body -else - return -end - -m=SimpleForm("Console", "", translate("Only works in LAN")) -m.submit = false -m.reset = false - -local cmd_docker = luci.util.exec("command -v docker"):match("^.+docker") or nil -local cmd_ttyd = luci.util.exec("command -v ttyd"):match("^.+ttyd") or nil - -if cmd_docker and cmd_ttyd and container_info.State.Status == "running" then - local cmd = "/bin/bash" - local uid - - s = m:section(SimpleSection) - - o = s:option(Value, "command", translate("Command")) - o:value("/bin/sh", "/bin/sh") - o:value("/bin/ash", "/bin/ash") - o:value("/bin/bash", "/bin/bash") - o.default = "/bin/bash" - o.forcewrite = true - o.write = function(self, section, value) - cmd = value - end - - o = s:option(Value, "uid", translate("UID")) - o.forcewrite = true - o.write = function(self, section, value) - uid = value - end - - o = s:option(Button, "connect") - o.render = function(self, section, scope) - self.inputstyle = "add" - self.title = " " - self.inputtitle = translate("Connect") - Button.render(self, section, scope) - end - o.write = function(self, section) - local cmd_docker = luci.util.exec("command -v docker"):match("^.+docker") or nil - local cmd_ttyd = luci.util.exec("command -v ttyd"):match("^.+ttyd") or nil - - if not cmd_docker or not cmd_ttyd or cmd_docker:match("^%s+$") or cmd_ttyd:match("^%s+$")then - return - end - - local pid = luci.util.trim(luci.util.exec("netstat -lnpt | grep :7682 | grep ttyd | tr -s ' ' | cut -d ' ' -f7 | cut -d'/' -f1")) - if pid and pid ~= "" then - luci.util.exec("kill -9 " .. pid) - end - - local hosts - local uci = require "luci.model.uci".cursor() - local remote = uci:get_bool("dockerd", "globals", "remote_endpoint") or false - local host = nil - local port = nil - local socket = nil - - if remote then - host = uci:get("dockerd", "globals", "remote_host") or nil - port = uci:get("dockerd", "globals", "remote_port") or nil - else - socket = uci:get("dockerd", "globals", "socket_path") or "/var/run/docker.sock" - end - - if remote and host and port then - hosts = host .. ':'.. port - elseif socket then - hosts = socket - else - return - end - - if uid and uid ~= "" then - uid = "-u " .. uid - else - uid = "" - end - - local start_cmd = string.format('%s -d 2 --once -p 7682 %s -H "unix://%s" exec -it %s %s %s&', cmd_ttyd, cmd_docker, hosts, uid, container_name, cmd) - - os.execute(start_cmd) - - o = s:option(DummyValue, "console") - o.container_id = container_id - o.template = "codeserver/console" - end -end - -return m diff --git a/openwrt-app-actions/applications/luci-app-codeserver/luasrc/model/cbi/codeserver/tool.lua b/openwrt-app-actions/applications/luci-app-codeserver/luasrc/model/cbi/codeserver/tool.lua deleted file mode 100644 index b917db822..000000000 --- a/openwrt-app-actions/applications/luci-app-codeserver/luasrc/model/cbi/codeserver/tool.lua +++ /dev/null @@ -1,56 +0,0 @@ ---[[ -LuCI - Lua Configuration Interface -]]-- - -local http = require 'luci.http' - -m=SimpleForm("Tools") -m.submit = false -m.reset = false - -s = m:section(SimpleSection) - -o = s:option(Value, "action", translate("Action").."*") -o.rmempty = false -o.datatype = "string" -o:value("git-config", "git-config") -o.default = "git-config" - -local data = {} -o = s:option(Value, "username", "user.name") -o.datatype = "string" -o.placeholder = "username" -o:depends("action", "git-config") - -o = s:option(Value, "email", "user.email") -o.datatype = "string" -o.placeholder = "email@address" -o:depends("action", "git-config") - -local t=Template("codeserver/tool") -m:append(t) - -local btn_do = s:option(Button, "_do") -btn_do.render = function(self, section, scope) - self.inputstyle = "add" - self.title = " " - self.inputtitle = translate("Execute") - Button.render(self, section, scope) -end - -btn_do.write = function(self, section, value) - local action = m:get(section, "action") - if action == "git-config" then - local user = m:get(section, "username") - local email = m:get(section, "email") - if user ~= nil and email ~= nil then - local cmd = string.format("/usr/libexec/istorec/codeserver.sh %s %s %s", action, user, email) - cmd = "/etc/init.d/tasks task_add codeserver " .. luci.util.shellquote(cmd) .. " >/dev/null 2>&1" - os.execute(cmd) - t.show_log_taskid = "codeserver" - end - end -end - -return m - diff --git a/openwrt-app-actions/applications/luci-app-codeserver/luasrc/model/codeserver.lua b/openwrt-app-actions/applications/luci-app-codeserver/luasrc/model/codeserver.lua deleted file mode 100644 index d476ae916..000000000 --- a/openwrt-app-actions/applications/luci-app-codeserver/luasrc/model/codeserver.lua +++ /dev/null @@ -1,54 +0,0 @@ -local util = require "luci.util" -local jsonc = require "luci.jsonc" - -local codeserver = {} - -codeserver.blocks = function() - local f = io.popen("lsblk -s -f -b -o NAME,FSSIZE,MOUNTPOINT --json", "r") - local vals = {} - if f then - local ret = f:read("*all") - f:close() - local obj = jsonc.parse(ret) - for _, val in pairs(obj["blockdevices"]) do - local fsize = val["fssize"] - if fsize ~= nil and string.len(fsize) > 10 and val["mountpoint"] then - -- fsize > 1G - vals[#vals+1] = val["mountpoint"] - end - end - end - return vals -end - -codeserver.home = function() - local uci = require "luci.model.uci".cursor() - local home_dirs = {} - home_dirs["main_dir"] = uci:get_first("quickstart", "main", "main_dir", "/root") - home_dirs["Configs"] = uci:get_first("quickstart", "main", "conf_dir", home_dirs["main_dir"].."/Configs") - home_dirs["Public"] = uci:get_first("quickstart", "main", "dl_dir", home_dirs["main_dir"].."/Public") - home_dirs["Caches"] = uci:get_first("quickstart", "main", "tmp_dir", home_dirs["main_dir"].."/Caches") - return home_dirs -end - -codeserver.find_paths = function(blocks, home_dirs, path_name) - local default_path = '' - local configs = {} - - default_path = home_dirs[path_name] .. "/CodeServer" - if #blocks == 0 then - table.insert(configs, default_path) - else - for _, val in pairs(blocks) do - table.insert(configs, val .. "/" .. path_name .. "/CodeServer") - end - local without_conf_dir = "/root/" .. path_name .. "/CodeServer" - if default_path == without_conf_dir then - default_path = configs[1] - end - end - - return configs, default_path -end - -return codeserver diff --git a/openwrt-app-actions/applications/luci-app-codeserver/luasrc/view/codeserver/console.htm b/openwrt-app-actions/applications/luci-app-codeserver/luasrc/view/codeserver/console.htm deleted file mode 100644 index 0a1e052c1..000000000 --- a/openwrt-app-actions/applications/luci-app-codeserver/luasrc/view/codeserver/console.htm +++ /dev/null @@ -1,10 +0,0 @@ -
- -
- diff --git a/openwrt-app-actions/applications/luci-app-codeserver/luasrc/view/codeserver/status.htm b/openwrt-app-actions/applications/luci-app-codeserver/luasrc/view/codeserver/status.htm deleted file mode 100644 index d821b0f2a..000000000 --- a/openwrt-app-actions/applications/luci-app-codeserver/luasrc/view/codeserver/status.htm +++ /dev/null @@ -1,31 +0,0 @@ -<% -local util = require "luci.util" -local container_status = util.trim(util.exec("/usr/libexec/istorec/codeserver.sh status")) -local container_install = (string.len(container_status) > 0) -local container_running = container_status == "running" --%> -
- -
- <% if container_running then %> - - <% else %> - - <% end %> -
-
-<% -if container_running then - local port=util.trim(util.exec("/usr/libexec/istorec/codeserver.sh port")) - if port == "" then - port="8085" - end --%> -
- -
- - -
-
-<% end %> diff --git a/openwrt-app-actions/applications/luci-app-codeserver/luasrc/view/codeserver/tool.htm b/openwrt-app-actions/applications/luci-app-codeserver/luasrc/view/codeserver/tool.htm deleted file mode 100644 index 8ab8bdcdb..000000000 --- a/openwrt-app-actions/applications/luci-app-codeserver/luasrc/view/codeserver/tool.htm +++ /dev/null @@ -1,11 +0,0 @@ -<%+tasks/embed%> - - - diff --git a/openwrt-app-actions/applications/luci-app-codeserver/po/zh-cn/codeserver.po b/openwrt-app-actions/applications/luci-app-codeserver/po/zh-cn/codeserver.po deleted file mode 100644 index e0ae9a15b..000000000 --- a/openwrt-app-actions/applications/luci-app-codeserver/po/zh-cn/codeserver.po +++ /dev/null @@ -1,50 +0,0 @@ -msgid "" -msgstr "Content-Type: text/plain; charset=UTF-8" - -msgid "Official website:" -msgstr "官方网站：" - -msgid "CodeServer is a web version of VSCode." -msgstr "CodeServer 就一个在线版本的 VSCode，可以在线开发。" - -msgid "Config path" -msgstr "配置文件路径" - -msgid "HTTP Port" -msgstr "HTTP 端口" - -msgid "Service Status" -msgstr "服务状态" - -msgid "CodeServer status:" -msgstr "CodeServer 的状态信息如下：" - -msgid "Setup" -msgstr "安装配置" - -msgid "The following parameters will only take effect during installation or upgrade:" -msgstr "以下参数只在安装或者升级时才会生效：" - -msgid "Status" -msgstr "状态" - -msgid "CodeServer is running" -msgstr "CodeServer 运行中" - -msgid "CodeServer is not running" -msgstr "CodeServer 未运行" - -msgid "Open CodeServer" -msgstr "打开 CodeServer" - -msgid "Tool" -msgstr "操作" - -msgid "Console" -msgstr "控制台" - -msgid "Only works in LAN" -msgstr "只在内网环境下工作。" - -msgid "Execute" -msgstr "执行" diff --git a/openwrt-app-actions/applications/luci-app-codeserver/root/etc/config/codeserver b/openwrt-app-actions/applications/luci-app-codeserver/root/etc/config/codeserver deleted file mode 100644 index 05cb412e6..000000000 --- a/openwrt-app-actions/applications/luci-app-codeserver/root/etc/config/codeserver +++ /dev/null @@ -1,10 +0,0 @@ -config main - option 'http_port' '8085' - option 'image_name' 'lscr.io/linuxserver/code-server:latest' - option 'config_path' '' - option 'env_password' '' - option 'env_hashed_password' '' - option 'env_sudo_password' '' - option 'env_sudo_password_hash' '' - option 'env_proxy_domain' '' - diff --git a/openwrt-app-actions/applications/luci-app-codeserver/root/usr/libexec/istorec/codeserver.sh b/openwrt-app-actions/applications/luci-app-codeserver/root/usr/libexec/istorec/codeserver.sh deleted file mode 100755 index b38afcc1e..000000000 --- a/openwrt-app-actions/applications/luci-app-codeserver/root/usr/libexec/istorec/codeserver.sh +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/sh -# Author Xiaobao(xiaobao@linkease.com) - -ACTION=${1} -shift 1 - -do_install() { - local http_port=`uci get codeserver.@main[0].http_port 2>/dev/null` - local image_name=`uci get codeserver.@main[0].image_name 2>/dev/null` - local config=`uci get codeserver.@main[0].config_path 2>/dev/null` - local env_password=`uci get codeserver.@main[0].env_password 2>/dev/null` - local env_hashed_password=`uci get codeserver.@main[0].env_hashed_password 2>/dev/null` - local env_sudo_password=`uci get codeserver.@main[0].env_sudo_password 2>/dev/null` - local env_sudo_password_hash=`uci get codeserver.@main[0].env_sudo_password_hash 2>/dev/null` - local env_proxy_domain=`uci get codeserver.@main[0].env_proxy_domain 2>/dev/null` - - [ -z "$image_name" ] && image_name="lscr.io/linuxserver/code-server:latest" - echo "docker pull ${image_name}" - docker pull ${image_name} - docker rm -f codeserver - - if [ -z "$config" ]; then - echo "config path is empty!" - exit 1 - fi - - [ -z "$http_port" ] && http_port=8085 - - local cmd="docker run --restart=unless-stopped -d -v \"$config:/config\" \ - --dns=172.17.0.1 \ - -e DEFAULT_WORKSPACE=/config/workspace \ - -p $http_port:8443 " - - local tz="`uci get system.@system[0].zonename`" - [ -z "$tz" ] || cmd="$cmd -e TZ=$tz" - - [ -z "$env_password" ] || cmd="$cmd -e \"PASSWORD=$env_password\"" - [ -z "$env_hashed_password" ] || cmd="$cmd -e \"HASHED_PASSWORD=$env_hashed_password\"" - [ -z "$env_sudo_password" ] || cmd="$cmd -e \"SUDO_PASSWORD=$env_sudo_password\"" - [ -z "$env_sudo_password_hash" ] || cmd="$cmd -e \"SUDO_PASSWORD_HASH=$env_sudo_password_hash\"" - [ -z "$env_proxy_domain" ] || cmd="$cmd -e \"PROXY_DOMAIN=$env_proxy_domain\"" - - cmd="$cmd -v /mnt:/mnt" - mountpoint -q /mnt && cmd="$cmd:rslave" - cmd="$cmd --name codeserver \"$image_name\"" - - echo "$cmd" - eval "$cmd" -} - -usage() { - echo "usage: $0 sub-command" - echo "where sub-command is one of:" - echo " install Install the codeserver" - echo " upgrade Upgrade the codeserver" - echo " rm/start/stop/restart Remove/Start/Stop/Restart the codeserver" - echo " status CodeServer status" - echo " port CodeServer port" -} - -case ${ACTION} in - "install") - do_install - ;; - "upgrade") - do_install - ;; - "rm") - docker rm -f codeserver - ;; - "start" | "stop" | "restart") - docker ${ACTION} codeserver - ;; - "status") - docker ps --all -f 'name=codeserver' --format '{{.State}}' - ;; - "port") - docker ps --all -f 'name=codeserver' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*' | sed 's/0.0.0.0://' - ;; - "git-config") - docker exec codeserver git config --global user.name "${1}" - docker exec codeserver git config --global user.email "${2}" - echo "git config --global user.name ${1}" - echo "git config --global user.email ${2}" - ;; - *) - usage - exit 1 - ;; -esac diff --git a/openwrt-app-actions/applications/luci-app-drawio/Makefile b/openwrt-app-actions/applications/luci-app-drawio/Makefile deleted file mode 100644 index 76f1c12e8..000000000 --- a/openwrt-app-actions/applications/luci-app-drawio/Makefile +++ /dev/null @@ -1,18 +0,0 @@ - - -include $(TOPDIR)/rules.mk - -PKG_VERSION:=1.0.0-20221212 -PKG_RELEASE:= - -LUCI_TITLE:=LuCI support for DrawIO -LUCI_PKGARCH:=all -LUCI_DEPENDS:=+docker +luci-lib-taskd +luci-lib-docker +docker-compose - -define Package/luci-app-drawio/conffiles -/etc/config/drawio -endef - -include $(TOPDIR)/feeds/luci/luci.mk - -# call BuildPackage - OpenWrt buildroot signature diff --git a/openwrt-app-actions/applications/luci-app-drawio/luasrc/controller/drawio.lua b/openwrt-app-actions/applications/luci-app-drawio/luasrc/controller/drawio.lua deleted file mode 100755 index d851ac0e4..000000000 --- a/openwrt-app-actions/applications/luci-app-drawio/luasrc/controller/drawio.lua +++ /dev/null @@ -1,7 +0,0 @@ - -module("luci.controller.drawio", package.seeall) - -function index() - entry({"admin", "services", "drawio"}, alias("admin", "services", "drawio", "config"), _("DrawIO"), 30).dependent = true - entry({"admin", "services", "drawio", "config"}, cbi("drawio")) -end diff --git a/openwrt-app-actions/applications/luci-app-drawio/luasrc/model/cbi/drawio.lua b/openwrt-app-actions/applications/luci-app-drawio/luasrc/model/cbi/drawio.lua deleted file mode 100644 index 0c904e68b..000000000 --- a/openwrt-app-actions/applications/luci-app-drawio/luasrc/model/cbi/drawio.lua +++ /dev/null @@ -1,51 +0,0 @@ ---[[ -LuCI - Lua Configuration Interface -]]-- - -local taskd = require "luci.model.tasks" -local docker = require "luci.docker" -local drawio_model = require "luci.model.drawio" -local m, s, o - -m = taskd.docker_map("drawio", "drawio", "/usr/libexec/istorec/drawio.sh", - translate("DrawIO"), - translate("DrawIO is a draw.io is a client-side editor for general diagramming and whiteboarding.") - .. translate("Official website:") .. ' https://www.diagrams.net/') - -local dk = docker.new({socket_path="/var/run/docker.sock"}) -local dockerd_running = dk:_ping().code == 200 -local docker_info = dockerd_running and dk:info().body or {} -local docker_aspace = 0 -if docker_info.DockerRootDir then - local statvfs = nixio.fs.statvfs(docker_info.DockerRootDir) - docker_aspace = statvfs and (statvfs.bavail * statvfs.bsize) or 0 -end - -s = m:section(SimpleSection, translate("Service Status"), translate("DrawIO status:")) -s:append(Template("drawio/status")) - -s = m:section(TypedSection, "main", translate("Setup"), - (docker_aspace < 2147483648 and - (translate("The free space of Docker is less than 2GB, which may cause the installation to fail.") - .. "
") or "") .. translate("The following parameters will only take effect during installation or upgrade:")) -s.addremove=false -s.anonymous=true - -o = s:option(Value, "port", translate("Port").."*") -o.default = "8091" -o.datatype = "port" - -local blocks = drawio_model.blocks() -local home = drawio_model.home() - -o = s:option(Value, "config_path", translate("Config path").."*") -o.rmempty = false -o.datatype = "string" - -local paths, default_path = drawio_model.find_paths(blocks, home, "Configs") -for _, val in pairs(paths) do - o:value(val, val) -end -o.default = default_path - -return m diff --git a/openwrt-app-actions/applications/luci-app-drawio/luasrc/model/drawio.lua b/openwrt-app-actions/applications/luci-app-drawio/luasrc/model/drawio.lua deleted file mode 100644 index 42e577591..000000000 --- a/openwrt-app-actions/applications/luci-app-drawio/luasrc/model/drawio.lua +++ /dev/null @@ -1,55 +0,0 @@ -local util = require "luci.util" -local jsonc = require "luci.jsonc" - -local drawio = {} - -drawio.blocks = function() - local f = io.popen("lsblk -s -f -b -o NAME,FSSIZE,MOUNTPOINT --json", "r") - local vals = {} - if f then - local ret = f:read("*all") - f:close() - local obj = jsonc.parse(ret) - for _, val in pairs(obj["blockdevices"]) do - local fsize = val["fssize"] - if fsize ~= nil and string.len(fsize) > 10 and val["mountpoint"] then - -- fsize > 1G - vals[#vals+1] = val["mountpoint"] - end - end - end - return vals -end - -drawio.home = function() - local uci = require "luci.model.uci".cursor() - local home_dirs = {} - home_dirs["main_dir"] = uci:get_first("quickstart", "main", "main_dir", "/root") - home_dirs["Configs"] = uci:get_first("quickstart", "main", "conf_dir", home_dirs["main_dir"].."/Configs") - home_dirs["Public"] = uci:get_first("quickstart", "main", "pub_dir", home_dirs["main_dir"].."/Public") - home_dirs["Downloads"] = uci:get_first("quickstart", "main", "dl_dir", home_dirs["Public"].."/Downloads") - home_dirs["Caches"] = uci:get_first("quickstart", "main", "tmp_dir", home_dirs["main_dir"].."/Caches") - return home_dirs -end - -drawio.find_paths = function(blocks, home_dirs, path_name) - local default_path = '' - local configs = {} - - default_path = home_dirs[path_name] .. "/DrawIO" - if #blocks == 0 then - table.insert(configs, default_path) - else - for _, val in pairs(blocks) do - table.insert(configs, val .. "/" .. path_name .. "/DrawIO") - end - local without_conf_dir = "/root/" .. path_name .. "/DrawIO" - if default_path == without_conf_dir then - default_path = configs[1] - end - end - - return configs, default_path -end - -return drawio diff --git a/openwrt-app-actions/applications/luci-app-drawio/luasrc/view/drawio/status.htm b/openwrt-app-actions/applications/luci-app-drawio/luasrc/view/drawio/status.htm deleted file mode 100644 index c299073e3..000000000 --- a/openwrt-app-actions/applications/luci-app-drawio/luasrc/view/drawio/status.htm +++ /dev/null @@ -1,31 +0,0 @@ -<% -local util = require "luci.util" -local container_status = util.trim(util.exec("/usr/libexec/istorec/drawio.sh status")) -local container_install = (string.len(container_status) > 0) -local container_running = container_status == "running" --%> -
- -
- <% if container_running then %> - - <% else %> - - <% end %> -
-
-<% -if container_running then - local port=util.trim(util.exec("/usr/libexec/istorec/drawio.sh port")) - if port == "" then - port="8091" - end --%> -
- -
- - -
-
-<% end %> diff --git a/openwrt-app-actions/applications/luci-app-drawio/po/zh-cn/drawio.po b/openwrt-app-actions/applications/luci-app-drawio/po/zh-cn/drawio.po deleted file mode 100644 index 81af5200d..000000000 --- a/openwrt-app-actions/applications/luci-app-drawio/po/zh-cn/drawio.po +++ /dev/null @@ -1,47 +0,0 @@ -msgid "" -msgstr "Content-Type: text/plain; charset=UTF-8" - -msgid "Official website:" -msgstr "官方网站：" - -msgid "DrawIO" -msgstr "DrawIO绘图" - -msgid "DrawIO is a draw.io is a client-side editor for general diagramming and whiteboarding." -msgstr "DrawIO 是运行在浏览器中的在线绘图工具。" - -msgid "Config path" -msgstr "配置文件路径" - -msgid "Port" -msgstr "端口" - -msgid "Service Status" -msgstr "服务状态" - -msgid "DrawIO status:" -msgstr "DrawIO 的状态信息如下：" - -msgid "Setup" -msgstr "安装配置" - -msgid "The following parameters will only take effect during installation or upgrade:" -msgstr "以下参数只在安装或者升级时才会生效：" - -msgid "Status" -msgstr "状态" - -msgid "DrawIO is running" -msgstr "DrawIO 运行中" - -msgid "DrawIO is not running" -msgstr "DrawIO 未运行" - -msgid "Open DrawIO" -msgstr "打开 DrawIO" - -msgid "The free space of Docker is less than 2GB, which may cause the installation to fail." -msgstr "Docker 可用空间已不足2GB，可能导致安装失败。" - -msgid "Please make sure there has enough space" -msgstr "请确保有足够空间" diff --git a/openwrt-app-actions/applications/luci-app-drawio/root/etc/config/drawio b/openwrt-app-actions/applications/luci-app-drawio/root/etc/config/drawio deleted file mode 100644 index 3d492df25..000000000 --- a/openwrt-app-actions/applications/luci-app-drawio/root/etc/config/drawio +++ /dev/null @@ -1,4 +0,0 @@ -config main - option 'port' '8091' - option 'config_path' '' - diff --git a/openwrt-app-actions/applications/luci-app-drawio/root/usr/libexec/istorec/drawio.sh b/openwrt-app-actions/applications/luci-app-drawio/root/usr/libexec/istorec/drawio.sh deleted file mode 100755 index 4ab80afd9..000000000 --- a/openwrt-app-actions/applications/luci-app-drawio/root/usr/libexec/istorec/drawio.sh +++ /dev/null @@ -1,71 +0,0 @@ -#!/bin/sh -# Author Xiaobao(xiaobao@linkease.com) - -ACTION=${1} -shift 1 - -do_install() { - local port=`uci get drawio.@main[0].port 2>/dev/null` - local config=`uci get drawio.@main[0].config_path 2>/dev/null` - - if [ -z "$config" ]; then - echo "config path is empty!" - exit 1 - fi - - mkdir -p $config - RET=$? - if [ ! "$RET" = "0" ]; then - echo "mkdir config path failed" - exit 1 - fi - - [ -z $port ] && port=8090 - sed 's/PORT_VAR/'$port'/g' /usr/share/drawio/docker-compose.template.yaml > $config/docker-compose.yaml - RET=$? - if [ ! "$RET" = "0" ]; then - echo "convert docker-compose.yaml failed" - exit 1 - fi - - cd $config - export COMPOSE_PROJECT_NAME=linkease-drawio - docker-compose down || true - docker-compose up -d -} - -usage() { - echo "usage: $0 sub-command" - echo "where sub-command is one of:" - echo " install Install the drawio" - echo " upgrade Upgrade the drawio" - echo " rm/start/stop/restart Remove/Start/Stop/Restart the drawio" - echo " status DrawIO status" - echo " port DrawIO port" -} - -case ${ACTION} in - "install") - do_install - ;; - "upgrade") - do_install - ;; - "rm") - docker rm -f drawio - ;; - "start" | "stop" | "restart") - config=`uci get drawio.@main[0].config_path 2>/dev/null` - cd $config && docker-compose ${ACTION} - ;; - "status") - docker ps --all -f 'name=linkease-drawio_drawio_1' --format '{{.State}}' - ;; - "port") - docker ps --all -f 'name=linkease-drawio_drawio_1' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*' | sed 's/0.0.0.0://' - ;; - *) - usage - exit 1 - ;; -esac diff --git a/openwrt-app-actions/applications/luci-app-drawio/root/usr/share/drawio/docker-compose.template.yaml b/openwrt-app-actions/applications/luci-app-drawio/root/usr/share/drawio/docker-compose.template.yaml deleted file mode 100644 index 8a3faada7..000000000 --- a/openwrt-app-actions/applications/luci-app-drawio/root/usr/share/drawio/docker-compose.template.yaml +++ /dev/null @@ -1,67 +0,0 @@ -version: '3' -services: - plantuml-server: - image: linkease/drawio-plantuml-server:2022121901 - expose: - - "8080" - networks: - - drawionet - volumes: - - fonts_volume:/usr/share/fonts/drawio - image-export: - image: linkease/drawio-image-export:2022121901 - expose: - - "8000" - networks: - - drawionet - volumes: - - fonts_volume:/usr/share/fonts/drawio - environment: - - DRAWIO_SERVER_URL=${DRAWIO_BASE_URL} - drawio: - image: jgraph/drawio - ports: - - "PORT_VAR:8080" - links: - - plantuml-server:plantuml-server - - image-export:image-export - depends_on: - - plantuml-server - - image-export - networks: - - drawionet - environment: - - DRAWIO_SELF_CONTAINED=1 - - PLANTUML_URL=http://plantuml-server:8080/ - - EXPORT_URL=http://image-export:8000/ - - DRAWIO_BASE_URL=${DRAWIO_BASE_URL} - - DRAWIO_CSP_HEADER=${DRAWIO_CSP_HEADER} - - DRAWIO_VIEWER_URL=${DRAWIO_VIEWER_URL} - - DRAWIO_LIGHTBOX_URL=${DRAWIO_LIGHTBOX_URL} - - DRAWIO_CONFIG=${DRAWIO_CONFIG} - - DRAWIO_GOOGLE_CLIENT_ID=${DRAWIO_GOOGLE_CLIENT_ID} - - DRAWIO_GOOGLE_APP_ID=${DRAWIO_GOOGLE_APP_ID} - - DRAWIO_GOOGLE_CLIENT_SECRET=${DRAWIO_GOOGLE_CLIENT_SECRET} - - DRAWIO_GOOGLE_VIEWER_CLIENT_ID=${DRAWIO_GOOGLE_VIEWER_CLIENT_ID} - - DRAWIO_GOOGLE_VIEWER_APP_ID=${DRAWIO_GOOGLE_VIEWER_APP_ID} - - DRAWIO_GOOGLE_VIEWER_CLIENT_SECRET=${DRAWIO_GOOGLE_VIEWER_CLIENT_SECRET} - - DRAWIO_MSGRAPH_CLIENT_ID=${DRAWIO_MSGRAPH_CLIENT_ID} - - DRAWIO_MSGRAPH_CLIENT_SECRET=${DRAWIO_MSGRAPH_CLIENT_SECRET} - - DRAWIO_MSGRAPH_TENANT_ID=${DRAWIO_MSGRAPH_TENANT_ID} - - DRAWIO_GITLAB_ID=${DRAWIO_GITLAB_ID} - - DRAWIO_GITLAB_SECRET=${DRAWIO_GITLAB_SECRET} - - DRAWIO_GITLAB_URL=${DRAWIO_GITLAB_URL} - - DRAWIO_CLOUD_CONVERT_APIKEY=${DRAWIO_CLOUD_CONVERT_APIKEY} - - DRAWIO_CACHE_DOMAIN=${DRAWIO_CACHE_DOMAIN} - - DRAWIO_MEMCACHED_ENDPOINT=${DRAWIO_MEMCACHED_ENDPOINT} - - DRAWIO_PUSHER_MODE=2 - - DRAWIO_IOT_ENDPOINT=${DRAWIO_IOT_ENDPOINT} - - DRAWIO_IOT_CERT_PEM=${DRAWIO_IOT_CERT_PEM} - - DRAWIO_IOT_PRIVATE_KEY=${DRAWIO_IOT_PRIVATE_KEY} - - DRAWIO_IOT_ROOT_CA=${DRAWIO_IOT_ROOT_CA} - - DRAWIO_MXPUSHER_ENDPOINT=${DRAWIO_MXPUSHER_ENDPOINT} -networks: - drawionet: - -volumes: - fonts_volume: diff --git a/openwrt-app-actions/applications/luci-app-emby/Makefile b/openwrt-app-actions/applications/luci-app-emby/Makefile deleted file mode 100644 index 6c662d8cf..000000000 --- a/openwrt-app-actions/applications/luci-app-emby/Makefile +++ /dev/null @@ -1,18 +0,0 @@ - - -include $(TOPDIR)/rules.mk - -PKG_VERSION:=1.0.1-20230108 -PKG_RELEASE:= - -LUCI_TITLE:=LuCI support for Emby -LUCI_PKGARCH:=all -LUCI_DEPENDS:=+docker +luci-lib-taskd - -define Package/luci-app-emby/conffiles -/etc/config/emby -endef - -include $(TOPDIR)/feeds/luci/luci.mk - -# call BuildPackage - OpenWrt buildroot signature diff --git a/openwrt-app-actions/applications/luci-app-emby/luasrc/controller/emby.lua b/openwrt-app-actions/applications/luci-app-emby/luasrc/controller/emby.lua deleted file mode 100755 index ae7ec176d..000000000 --- a/openwrt-app-actions/applications/luci-app-emby/luasrc/controller/emby.lua +++ /dev/null @@ -1,7 +0,0 @@ - -module("luci.controller.emby", package.seeall) - -function index() - entry({"admin", "services", "emby"}, alias("admin", "services", "emby", "config"), _("Emby"), 30).dependent = true - entry({"admin", "services", "emby", "config"}, cbi("emby")) -end diff --git a/openwrt-app-actions/applications/luci-app-emby/luasrc/model/cbi/emby.lua b/openwrt-app-actions/applications/luci-app-emby/luasrc/model/cbi/emby.lua deleted file mode 100644 index f3a176826..000000000 --- a/openwrt-app-actions/applications/luci-app-emby/luasrc/model/cbi/emby.lua +++ /dev/null @@ -1,62 +0,0 @@ ---[[ -LuCI - Lua Configuration Interface -]]-- - -local taskd = require "luci.model.tasks" -local emby_model = require "luci.model.emby" -local m, s, o - -m = taskd.docker_map("emby", "emby", "/usr/libexec/istorec/emby.sh", - translate("Emby"), - translate("Emby brings together your personal videos, music, photos, and live television.") - .. translate("Official website:") .. ' https://emby.media/') - -s = m:section(SimpleSection, translate("Service Status"), translate("Emby status:")) -s:append(Template("emby/status")) - -s = m:section(TypedSection, "main", translate("Setup"), translate("The following parameters will only take effect during installation or upgrade:")) -s.addremove=false -s.anonymous=true - -o = s:option(Flag, "hostnet", translate("Host network"), translate("Emby running in host network, for DLNA application, port is always 8096 if enabled")) -o.default = 0 -o.rmempty = false - -o = s:option(Value, "http_port", translate("HTTP Port").."*") -o.default = "8097" -o.datatype = "port" -o:depends("hostnet", 0) - -o = s:option(Value, "image_name", translate("Image").."*") -o.rmempty = false -o.datatype = "string" -o:value("emby/embyserver", "emby/embyserver") -o:value("emby/embyserver_arm32v7", "emby/embyserver_arm32v7") -o:value("emby/embyserver_arm64v8", "emby/embyserver_arm64v8") -o.default = "emby/embyserver" - -local blocks = emby_model.blocks() -local home = emby_model.home() - -o = s:option(Value, "config_path", translate("Config path").."*") -o.rmempty = false -o.datatype = "string" - -local paths, default_path = emby_model.find_paths(blocks, home, "Configs") -for _, val in pairs(paths) do - o:value(val, val) -end -o.default = default_path - -o = s:option(Value, "media_path", translate("Media path"), translate("Not required, all disk is mounted in") .. " /mnt") -o.datatype = "string" - -o = s:option(Value, "cache_path", translate("Transcode cache path"), translate("Default use 'transcodes' in 'config path' if not set, please make sure there has enough space")) -o.datatype = "string" -local paths, default_path = emby_model.find_paths(blocks, home, "Caches") -for _, val in pairs(paths) do - o:value(val, val) -end -o.default = default_path - -return m diff --git a/openwrt-app-actions/applications/luci-app-emby/luasrc/model/emby.lua b/openwrt-app-actions/applications/luci-app-emby/luasrc/model/emby.lua deleted file mode 100644 index 5e239e8ae..000000000 --- a/openwrt-app-actions/applications/luci-app-emby/luasrc/model/emby.lua +++ /dev/null @@ -1,55 +0,0 @@ -local util = require "luci.util" -local jsonc = require "luci.jsonc" - -local emby = {} - -emby.blocks = function() - local f = io.popen("lsblk -s -f -b -o NAME,FSSIZE,MOUNTPOINT --json", "r") - local vals = {} - if f then - local ret = f:read("*all") - f:close() - local obj = jsonc.parse(ret) - for _, val in pairs(obj["blockdevices"]) do - local fsize = val["fssize"] - if fsize ~= nil and string.len(fsize) > 10 and val["mountpoint"] then - -- fsize > 1G - vals[#vals+1] = val["mountpoint"] - end - end - end - return vals -end - -emby.home = function() - local uci = require "luci.model.uci".cursor() - local home_dirs = {} - home_dirs["main_dir"] = uci:get_first("quickstart", "main", "main_dir", "/root") - home_dirs["Configs"] = uci:get_first("quickstart", "main", "conf_dir", home_dirs["main_dir"].."/Configs") - home_dirs["Public"] = uci:get_first("quickstart", "main", "pub_dir", home_dirs["main_dir"].."/Public") - home_dirs["Downloads"] = uci:get_first("quickstart", "main", "dl_dir", home_dirs["Public"].."/Downloads") - home_dirs["Caches"] = uci:get_first("quickstart", "main", "tmp_dir", home_dirs["main_dir"].."/Caches") - return home_dirs -end - -emby.find_paths = function(blocks, home_dirs, path_name) - local default_path = '' - local configs = {} - - default_path = home_dirs[path_name] .. "/Emby" - if #blocks == 0 then - table.insert(configs, default_path) - else - for _, val in pairs(blocks) do - table.insert(configs, val .. "/" .. path_name .. "/Emby") - end - local without_conf_dir = "/root/" .. path_name .. "/Emby" - if default_path == without_conf_dir then - default_path = configs[1] - end - end - - return configs, default_path -end - -return emby diff --git a/openwrt-app-actions/applications/luci-app-emby/luasrc/view/emby/status.htm b/openwrt-app-actions/applications/luci-app-emby/luasrc/view/emby/status.htm deleted file mode 100644 index 66da12aa5..000000000 --- a/openwrt-app-actions/applications/luci-app-emby/luasrc/view/emby/status.htm +++ /dev/null @@ -1,31 +0,0 @@ -<% -local util = require "luci.util" -local container_status = util.trim(util.exec("/usr/libexec/istorec/emby.sh status")) -local container_install = (string.len(container_status) > 0) -local container_running = container_status == "running" --%> -
- -
- <% if container_running then %> - - <% else %> - - <% end %> -
-
-<% -if container_running then - local port=util.trim(util.exec("/usr/libexec/istorec/emby.sh port")) - if port == "" then - port="8097" - end --%> -
- -
- - -
-
-<% end %> diff --git a/openwrt-app-actions/applications/luci-app-emby/po/zh-cn/emby.po b/openwrt-app-actions/applications/luci-app-emby/po/zh-cn/emby.po deleted file mode 100644 index 5770b5b88..000000000 --- a/openwrt-app-actions/applications/luci-app-emby/po/zh-cn/emby.po +++ /dev/null @@ -1,41 +0,0 @@ -msgid "" -msgstr "Content-Type: text/plain; charset=UTF-8" - -msgid "Official website:" -msgstr "官方网站：" - -msgid "Emby brings together your personal videos, music, photos, and live television." -msgstr "Emby 是一个多媒体串流平台。" - -msgid "Config path" -msgstr "配置文件路径" - -msgid "HTTP Port" -msgstr "HTTP 端口" - -msgid "Service Status" -msgstr "服务状态" - -msgid "Emby status:" -msgstr "Emby 的状态信息如下：" - -msgid "Setup" -msgstr "安装配置" - -msgid "The following parameters will only take effect during installation or upgrade:" -msgstr "以下参数只在安装或者升级时才会生效：" - -msgid "Status" -msgstr "状态" - -msgid "Emby is running" -msgstr "Emby 运行中" - -msgid "Emby is not running" -msgstr "Emby 未运行" - -msgid "Open Emby" -msgstr "打开 Emby" - -msgid "Not required, all disk is mounted in" -msgstr "可不填，所有硬盘都在" diff --git a/openwrt-app-actions/applications/luci-app-emby/root/etc/config/emby b/openwrt-app-actions/applications/luci-app-emby/root/etc/config/emby deleted file mode 100644 index a63d20453..000000000 --- a/openwrt-app-actions/applications/luci-app-emby/root/etc/config/emby +++ /dev/null @@ -1,6 +0,0 @@ -config main - option 'hostnet' '0' - option 'http_port' '8097' - option 'image_name' 'emby/embyserver' - option 'config_path' '' - diff --git a/openwrt-app-actions/applications/luci-app-emby/root/usr/libexec/istorec/emby.sh b/openwrt-app-actions/applications/luci-app-emby/root/usr/libexec/istorec/emby.sh deleted file mode 100755 index 1bfa94b0a..000000000 --- a/openwrt-app-actions/applications/luci-app-emby/root/usr/libexec/istorec/emby.sh +++ /dev/null @@ -1,93 +0,0 @@ -#!/bin/sh -# Author Xiaobao(xiaobao@linkease.com) - -ACTION=${1} -shift 1 - -do_install() { - local hostnet=`uci get emby.@main[0].hostnet 2>/dev/null` - local http_port=`uci get emby.@main[0].http_port 2>/dev/null` - local image_name=`uci get emby.@main[0].image_name 2>/dev/null` - local config=`uci get emby.@main[0].config_path 2>/dev/null` - local media=`uci get emby.@main[0].media_path 2>/dev/null` - local cache=`uci get emby.@main[0].cache_path 2>/dev/null` - - [ -z "$image_name" ] && image_name="emby/embyserver" - echo "docker pull ${image_name}" - docker pull ${image_name} - docker rm -f emby - - if [ -z "$config" ]; then - echo "config path is empty!" - exit 1 - fi - - # not conflict with jellyfin - [ -z "$http_port" ] && http_port=8097 - - local cmd="docker run --restart=unless-stopped -d -v \"$config:/config\" " - - if [ -d /dev/dri ]; then - cmd="$cmd\ - --device /dev/dri:/dev/dri \ - --privileged " - fi - - if [ "$hostnet" = 1 ]; then - cmd="$cmd\ - --dns=127.0.0.1 \ - --network=host " - else - cmd="$cmd\ - --dns=172.17.0.1 \ - -p $http_port:8096 " - fi - - local tz="`uci get system.@system[0].zonename`" - [ -z "$tz" ] || cmd="$cmd -e TZ=$tz" - - [ -z "$cache" ] || cmd="$cmd -v \"$cache:/config/cache\"" - [ -z "$media" ] || cmd="$cmd -v \"$media:/data\"" - - cmd="$cmd -v /mnt:/mnt" - mountpoint -q /mnt && cmd="$cmd:rslave" - cmd="$cmd --name emby \"$image_name\"" - - echo "$cmd" - eval "$cmd" -} - -usage() { - echo "usage: $0 sub-command" - echo "where sub-command is one of:" - echo " install Install the emby" - echo " upgrade Upgrade the emby" - echo " rm/start/stop/restart Remove/Start/Stop/Restart the emby" - echo " status Emby status" - echo " port Emby port" -} - -case ${ACTION} in - "install") - do_install - ;; - "upgrade") - do_install - ;; - "rm") - docker rm -f emby - ;; - "start" | "stop" | "restart") - docker ${ACTION} emby - ;; - "status") - docker ps --all -f 'name=emby' --format '{{.State}}' - ;; - "port") - docker ps --all -f 'name=emby' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*' | sed 's/0.0.0.0://' - ;; - *) - usage - exit 1 - ;; -esac diff --git a/openwrt-app-actions/applications/luci-app-excalidraw/Makefile b/openwrt-app-actions/applications/luci-app-excalidraw/Makefile deleted file mode 100644 index c500b2e78..000000000 --- a/openwrt-app-actions/applications/luci-app-excalidraw/Makefile +++ /dev/null @@ -1,18 +0,0 @@ - - -include $(TOPDIR)/rules.mk - -PKG_VERSION:=1.0.0-20221212 -PKG_RELEASE:= - -LUCI_TITLE:=LuCI support for Excalidraw -LUCI_PKGARCH:=all -LUCI_DEPENDS:=+docker +luci-lib-taskd +luci-lib-docker +docker-compose - -define Package/luci-app-excalidraw/conffiles -/etc/config/excalidraw -endef - -include $(TOPDIR)/feeds/luci/luci.mk - -# call BuildPackage - OpenWrt buildroot signature diff --git a/openwrt-app-actions/applications/luci-app-excalidraw/luasrc/controller/excalidraw.lua b/openwrt-app-actions/applications/luci-app-excalidraw/luasrc/controller/excalidraw.lua deleted file mode 100755 index b24b295d9..000000000 --- a/openwrt-app-actions/applications/luci-app-excalidraw/luasrc/controller/excalidraw.lua +++ /dev/null @@ -1,7 +0,0 @@ - -module("luci.controller.excalidraw", package.seeall) - -function index() - entry({"admin", "services", "excalidraw"}, alias("admin", "services", "excalidraw", "config"), _("Excalidraw"), 30).dependent = true - entry({"admin", "services", "excalidraw", "config"}, cbi("excalidraw")) -end diff --git a/openwrt-app-actions/applications/luci-app-excalidraw/luasrc/model/cbi/excalidraw.lua b/openwrt-app-actions/applications/luci-app-excalidraw/luasrc/model/cbi/excalidraw.lua deleted file mode 100644 index ae627551b..000000000 --- a/openwrt-app-actions/applications/luci-app-excalidraw/luasrc/model/cbi/excalidraw.lua +++ /dev/null @@ -1,57 +0,0 @@ ---[[ -LuCI - Lua Configuration Interface -]]-- - -local taskd = require "luci.model.tasks" -local docker = require "luci.docker" -local excalidraw_model = require "luci.model.excalidraw" -local m, s, o - -m = taskd.docker_map("excalidraw", "excalidraw", "/usr/libexec/istorec/excalidraw.sh", - translate("Excalidraw"), - translate("Excalidraw is a self-host virtual whiteboard for sketching hand-drawn like diagrams.") - .. translate("Official website:") .. ' https://excalidraw.com/') - -local dk = docker.new({socket_path="/var/run/docker.sock"}) -local dockerd_running = dk:_ping().code == 200 -local docker_info = dockerd_running and dk:info().body or {} -local docker_aspace = 0 -if docker_info.DockerRootDir then - local statvfs = nixio.fs.statvfs(docker_info.DockerRootDir) - docker_aspace = statvfs and (statvfs.bavail * statvfs.bsize) or 0 -end - -s = m:section(SimpleSection, translate("Service Status"), translate("Excalidraw status:")) -s:append(Template("excalidraw/status")) - -s = m:section(TypedSection, "main", translate("Setup"), - (docker_aspace < 2147483648 and - (translate("The free space of Docker is less than 2GB, which may cause the installation to fail.") - .. "
") or "") .. translate("The following parameters will only take effect during installation or upgrade:")) -s.addremove=false -s.anonymous=true - -o = s:option(Value, "port", translate("Port").."*") -o.default = "8090" -o.datatype = "port" - -o = s:option(Value, "image_ver", translate("Image").."*") -o.rmempty = false -o.datatype = "string" -o.default = "v0.13.0" -o:value("v0.13.0", "v0.13.0") - -local blocks = excalidraw_model.blocks() -local home = excalidraw_model.home() - -o = s:option(Value, "config_path", translate("Config path").."*") -o.rmempty = false -o.datatype = "string" - -local paths, default_path = excalidraw_model.find_paths(blocks, home, "Configs") -for _, val in pairs(paths) do - o:value(val, val) -end -o.default = default_path - -return m diff --git a/openwrt-app-actions/applications/luci-app-excalidraw/luasrc/model/excalidraw.lua b/openwrt-app-actions/applications/luci-app-excalidraw/luasrc/model/excalidraw.lua deleted file mode 100644 index 88a99963d..000000000 --- a/openwrt-app-actions/applications/luci-app-excalidraw/luasrc/model/excalidraw.lua +++ /dev/null @@ -1,55 +0,0 @@ -local util = require "luci.util" -local jsonc = require "luci.jsonc" - -local excalidraw = {} - -excalidraw.blocks = function() - local f = io.popen("lsblk -s -f -b -o NAME,FSSIZE,MOUNTPOINT --json", "r") - local vals = {} - if f then - local ret = f:read("*all") - f:close() - local obj = jsonc.parse(ret) - for _, val in pairs(obj["blockdevices"]) do - local fsize = val["fssize"] - if fsize ~= nil and string.len(fsize) > 10 and val["mountpoint"] then - -- fsize > 1G - vals[#vals+1] = val["mountpoint"] - end - end - end - return vals -end - -excalidraw.home = function() - local uci = require "luci.model.uci".cursor() - local home_dirs = {} - home_dirs["main_dir"] = uci:get_first("quickstart", "main", "main_dir", "/root") - home_dirs["Configs"] = uci:get_first("quickstart", "main", "conf_dir", home_dirs["main_dir"].."/Configs") - home_dirs["Public"] = uci:get_first("quickstart", "main", "pub_dir", home_dirs["main_dir"].."/Public") - home_dirs["Downloads"] = uci:get_first("quickstart", "main", "dl_dir", home_dirs["Public"].."/Downloads") - home_dirs["Caches"] = uci:get_first("quickstart", "main", "tmp_dir", home_dirs["main_dir"].."/Caches") - return home_dirs -end - -excalidraw.find_paths = function(blocks, home_dirs, path_name) - local default_path = '' - local configs = {} - - default_path = home_dirs[path_name] .. "/Excalidraw" - if #blocks == 0 then - table.insert(configs, default_path) - else - for _, val in pairs(blocks) do - table.insert(configs, val .. "/" .. path_name .. "/Excalidraw") - end - local without_conf_dir = "/root/" .. path_name .. "/Excalidraw" - if default_path == without_conf_dir then - default_path = configs[1] - end - end - - return configs, default_path -end - -return excalidraw diff --git a/openwrt-app-actions/applications/luci-app-excalidraw/luasrc/view/excalidraw/status.htm b/openwrt-app-actions/applications/luci-app-excalidraw/luasrc/view/excalidraw/status.htm deleted file mode 100644 index 8f8270ea3..000000000 --- a/openwrt-app-actions/applications/luci-app-excalidraw/luasrc/view/excalidraw/status.htm +++ /dev/null @@ -1,31 +0,0 @@ -<% -local util = require "luci.util" -local container_status = util.trim(util.exec("/usr/libexec/istorec/excalidraw.sh status")) -local container_install = (string.len(container_status) > 0) -local container_running = container_status == "running" --%> -
- -
- <% if container_running then %> - - <% else %> - - <% end %> -
-
-<% -if container_running then - local port=util.trim(util.exec("/usr/libexec/istorec/excalidraw.sh port")) - if port == "" then - port="8090" - end --%> -
- -
- - -
-
-<% end %> diff --git a/openwrt-app-actions/applications/luci-app-excalidraw/po/zh-cn/excalidraw.po b/openwrt-app-actions/applications/luci-app-excalidraw/po/zh-cn/excalidraw.po deleted file mode 100644 index c53acb83d..000000000 --- a/openwrt-app-actions/applications/luci-app-excalidraw/po/zh-cn/excalidraw.po +++ /dev/null @@ -1,48 +0,0 @@ -msgid "" -msgstr "Content-Type: text/plain; charset=UTF-8" - -msgid "Official website:" -msgstr "官方网站：" - -msgid "Excalidraw" -msgstr "Excalidraw画板" - -msgid "Excalidraw is a self-host virtual whiteboard for sketching hand-drawn like diagrams." -msgstr "Excalidraw 是支持多人协同的私有化在线画板工具。" - -msgid "Config path" -msgstr "配置文件路径" - -msgid "Port" -msgstr "端口" - -msgid "Service Status" -msgstr "服务状态" - -msgid "Excalidraw status:" -msgstr "Excalidraw 的状态信息如下：" - -msgid "Setup" -msgstr "安装配置" - -msgid "The following parameters will only take effect during installation or upgrade:" -msgstr "以下参数只在安装或者升级时才会生效：" - -msgid "Status" -msgstr "状态" - -msgid "Excalidraw is running" -msgstr "Excalidraw 运行中" - -msgid "Excalidraw is not running" -msgstr "Excalidraw 未运行" - -msgid "Open Excalidraw" -msgstr "打开 Excalidraw" - -msgid "The free space of Docker is less than 2GB, which may cause the installation to fail." -msgstr "Docker 可用空间已不足2GB，可能导致安装失败。" - -msgid "Please make sure there has enough space" -msgstr "请确保有足够空间" - diff --git a/openwrt-app-actions/applications/luci-app-excalidraw/root/etc/config/excalidraw b/openwrt-app-actions/applications/luci-app-excalidraw/root/etc/config/excalidraw deleted file mode 100644 index aced61322..000000000 --- a/openwrt-app-actions/applications/luci-app-excalidraw/root/etc/config/excalidraw +++ /dev/null @@ -1,5 +0,0 @@ -config main - option 'port' '8090' - option 'config_path' '' - option 'image_ver' '' - diff --git a/openwrt-app-actions/applications/luci-app-excalidraw/root/usr/libexec/istorec/excalidraw.sh b/openwrt-app-actions/applications/luci-app-excalidraw/root/usr/libexec/istorec/excalidraw.sh deleted file mode 100755 index 5edea429a..000000000 --- a/openwrt-app-actions/applications/luci-app-excalidraw/root/usr/libexec/istorec/excalidraw.sh +++ /dev/null @@ -1,72 +0,0 @@ -#!/bin/sh -# Author Xiaobao(xiaobao@linkease.com) - -ACTION=${1} -shift 1 - -do_install() { - local port=`uci get excalidraw.@main[0].port 2>/dev/null` - local config=`uci get excalidraw.@main[0].config_path 2>/dev/null` - local image_ver=`uci get excalidraw.@main[0].image_ver 2>/dev/null` - - if [ -z "$config" ]; then - echo "config path is empty!" - exit 1 - fi - - mkdir -p $config - RET=$? - if [ ! "$RET" = "0" ]; then - echo "mkdir config path failed" - exit 1 - fi - - [ -z $port ] && port=8090 - sed 's/PORT_VAR/'$port'/g; s/IMAGE_VER_VAR/'$image_ver'/g' /usr/share/excalidraw/docker-compose.template.yaml > $config/docker-compose.yaml - RET=$? - if [ ! "$RET" = "0" ]; then - echo "convert docker-compose.yaml failed" - exit 1 - fi - - cd $config - export COMPOSE_PROJECT_NAME=linkease-excalidraw - docker-compose down || true - docker-compose up -d -} - -usage() { - echo "usage: $0 sub-command" - echo "where sub-command is one of:" - echo " install Install the excalidraw" - echo " upgrade Upgrade the excalidraw" - echo " rm/start/stop/restart Remove/Start/Stop/Restart the excalidraw" - echo " status Excalidraw status" - echo " port Excalidraw port" -} - -case ${ACTION} in - "install") - do_install - ;; - "upgrade") - do_install - ;; - "rm") - docker rm -f excalidraw - ;; - "start" | "stop" | "restart") - config=`uci get excalidraw.@main[0].config_path 2>/dev/null` - cd $config && docker-compose ${ACTION} - ;; - "status") - docker ps --all -f 'name=linkease-excalidraw_frontend_1' --format '{{.State}}' - ;; - "port") - docker ps --all -f 'name=linkease-excalidraw_frontend_1' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*' | sed 's/0.0.0.0://' - ;; - *) - usage - exit 1 - ;; -esac diff --git a/openwrt-app-actions/applications/luci-app-excalidraw/root/usr/share/excalidraw/docker-compose.template.yaml b/openwrt-app-actions/applications/luci-app-excalidraw/root/usr/share/excalidraw/docker-compose.template.yaml deleted file mode 100644 index 1017e0896..000000000 --- a/openwrt-app-actions/applications/luci-app-excalidraw/root/usr/share/excalidraw/docker-compose.template.yaml +++ /dev/null @@ -1,25 +0,0 @@ -version: "3" - -networks: - excalidrawnet: - -services: - frontend: - image: janson/excalidraw:IMAGE_VER_VAR - ports: - - PORT_VAR:80 - networks: - - excalidrawnet - - storage: - image: janson/excalidraw-storage-backend:IMAGE_VER_VAR - restart: always - environment: - - PORT=8081 - networks: - - excalidrawnet - - room: - image: janson/excalidraw-room:IMAGE_VER_VAR - networks: - - excalidrawnet diff --git a/openwrt-app-actions/applications/luci-app-gogs/Makefile b/openwrt-app-actions/applications/luci-app-gogs/Makefile deleted file mode 100644 index 6c662d8cf..000000000 --- a/openwrt-app-actions/applications/luci-app-gogs/Makefile +++ /dev/null @@ -1,18 +0,0 @@ - - -include $(TOPDIR)/rules.mk - -PKG_VERSION:=1.0.1-20230108 -PKG_RELEASE:= - -LUCI_TITLE:=LuCI support for Emby -LUCI_PKGARCH:=all -LUCI_DEPENDS:=+docker +luci-lib-taskd - -define Package/luci-app-emby/conffiles -/etc/config/emby -endef - -include $(TOPDIR)/feeds/luci/luci.mk - -# call BuildPackage - OpenWrt buildroot signature diff --git a/openwrt-app-actions/applications/luci-app-gogs/luasrc/controller/gogs.lua b/openwrt-app-actions/applications/luci-app-gogs/luasrc/controller/gogs.lua deleted file mode 100755 index 2dcbbdcef..000000000 --- a/openwrt-app-actions/applications/luci-app-gogs/luasrc/controller/gogs.lua +++ /dev/null @@ -1,7 +0,0 @@ - -module("luci.controller.gogs", package.seeall) - -function index() - entry({"admin", "services", "gogs"}, alias("admin", "services", "gogs", "config"), _("Gogs"), 30).dependent = true - entry({"admin", "services", "gogs", "config"}, cbi("gogs")) -end diff --git a/openwrt-app-actions/applications/luci-app-gogs/luasrc/model/cbi/gogs.lua b/openwrt-app-actions/applications/luci-app-gogs/luasrc/model/cbi/gogs.lua deleted file mode 100644 index be679a4cf..000000000 --- a/openwrt-app-actions/applications/luci-app-gogs/luasrc/model/cbi/gogs.lua +++ /dev/null @@ -1,51 +0,0 @@ ---[[ -LuCI - Lua Configuration Interface -]]-- - -local taskd = require "luci.model.tasks" -local gogs_model = require "luci.model.gogs" -local m, s, o - -m = taskd.docker_map("gogs", "gogs", "/usr/libexec/istorec/gogs.sh", - translate("Gogs"), - translate("Gogs is a painless self-hosted Git service.") - .. translate("Official website:") .. ' https://gogs.io/') - -s = m:section(SimpleSection, translate("Service Status"), translate("Gogs status:")) -s:append(Template("gogs/status")) - -s = m:section(TypedSection, "main", translate("Setup"), translate("The following parameters will only take effect during installation or upgrade:")) -s.addremove=false -s.anonymous=true - -o = s:option(Value, "http_port", translate("HTTP Port").."*") -o.default = "3001" -o.datatype = "string" -o.rmempty = false - -o = s:option(Value, "ssh_port", translate("SSH Port").."*") -o.default = "3022" -o.datatype = "string" -o.rmempty = false - -o = s:option(Value, "image_name", translate("Image").."*") -o.rmempty = false -o.datatype = "string" -o:value("gogs/gogs:latest", "gogs/gogs:latest") -o:value("gogs/gogs:0.12", "gogs/gogs:0.12") -o.default = "gogs/gogs:latest" - -local blocks = gogs_model.blocks() -local home = gogs_model.home() - -o = s:option(Value, "config_path", translate("Config path").."*") -o.rmempty = false -o.datatype = "string" - -local paths, default_path = gogs_model.find_paths(blocks, home, "Configs") -for _, val in pairs(paths) do - o:value(val, val) -end -o.default = default_path - -return m diff --git a/openwrt-app-actions/applications/luci-app-gogs/luasrc/model/gogs.lua b/openwrt-app-actions/applications/luci-app-gogs/luasrc/model/gogs.lua deleted file mode 100644 index d49601a07..000000000 --- a/openwrt-app-actions/applications/luci-app-gogs/luasrc/model/gogs.lua +++ /dev/null @@ -1,54 +0,0 @@ -local util = require "luci.util" -local jsonc = require "luci.jsonc" - -local gogs = {} - -gogs.blocks = function() - local f = io.popen("lsblk -s -f -b -o NAME,FSSIZE,MOUNTPOINT --json", "r") - local vals = {} - if f then - local ret = f:read("*all") - f:close() - local obj = jsonc.parse(ret) - for _, val in pairs(obj["blockdevices"]) do - local fsize = val["fssize"] - if fsize ~= nil and string.len(fsize) > 10 and val["mountpoint"] then - -- fsize > 1G - vals[#vals+1] = val["mountpoint"] - end - end - end - return vals -end - -gogs.home = function() - local uci = require "luci.model.uci".cursor() - local home_dirs = {} - home_dirs["main_dir"] = uci:get_first("quickstart", "main", "main_dir", "/root") - home_dirs["Configs"] = uci:get_first("quickstart", "main", "conf_dir", home_dirs["main_dir"].."/Configs") - home_dirs["Public"] = uci:get_first("quickstart", "main", "dl_dir", home_dirs["main_dir"].."/Public") - home_dirs["Caches"] = uci:get_first("quickstart", "main", "tmp_dir", home_dirs["main_dir"].."/Caches") - return home_dirs -end - -gogs.find_paths = function(blocks, home_dirs, path_name) - local default_path = '' - local configs = {} - - default_path = home_dirs[path_name] .. "/Gogs" - if #blocks == 0 then - table.insert(configs, default_path) - else - for _, val in pairs(blocks) do - table.insert(configs, val .. "/" .. path_name .. "/Gogs") - end - local without_conf_dir = "/root/" .. path_name .. "/Gogs" - if default_path == without_conf_dir then - default_path = configs[1] - end - end - - return configs, default_path -end - -return gogs diff --git a/openwrt-app-actions/applications/luci-app-gogs/luasrc/view/gogs/status.htm b/openwrt-app-actions/applications/luci-app-gogs/luasrc/view/gogs/status.htm deleted file mode 100644 index da476fa09..000000000 --- a/openwrt-app-actions/applications/luci-app-gogs/luasrc/view/gogs/status.htm +++ /dev/null @@ -1,31 +0,0 @@ -<% -local util = require "luci.util" -local container_status = util.trim(util.exec("/usr/libexec/istorec/gogs.sh status")) -local container_install = (string.len(container_status) > 0) -local container_running = container_status == "running" --%> -
- -
- <% if container_running then %> - - <% else %> - - <% end %> -
-
-<% -if container_running then - local port=util.trim(util.exec("/usr/libexec/istorec/gogs.sh port")) - if port == "" then - port="3001" - end --%> -
- -
- - -
-
-<% end %> diff --git a/openwrt-app-actions/applications/luci-app-gogs/po/zh-cn/gogs.po b/openwrt-app-actions/applications/luci-app-gogs/po/zh-cn/gogs.po deleted file mode 100644 index 76b41cfae..000000000 --- a/openwrt-app-actions/applications/luci-app-gogs/po/zh-cn/gogs.po +++ /dev/null @@ -1,42 +0,0 @@ -msgid "" -msgstr "Content-Type: text/plain; charset=UTF-8" - -msgid "Official website:" -msgstr "官方网站：" - -msgid "Gogs is a painless self-hosted Git service." -msgstr "Gogs 是一个轻松易用的 Git 服务。" - -msgid "Config path" -msgstr "配置文件路径" - -msgid "HTTP Port" -msgstr "HTTP 端口" - -msgid "SSH Port" -msgstr "SSH 端口" - -msgid "Service Status" -msgstr "服务状态" - -msgid "Gogs status:" -msgstr "Gogs 的状态信息如下：" - -msgid "Setup" -msgstr "安装配置" - -msgid "The following parameters will only take effect during installation or upgrade:" -msgstr "以下参数只在安装或者升级时才会生效：" - -msgid "Status" -msgstr "状态" - -msgid "Gogs is running" -msgstr "Gogs 运行中" - -msgid "Gogs is not running" -msgstr "Gogs 未运行" - -msgid "Open Gogs" -msgstr "打开 Gogs" - diff --git a/openwrt-app-actions/applications/luci-app-gogs/root/etc/config/gogs b/openwrt-app-actions/applications/luci-app-gogs/root/etc/config/gogs deleted file mode 100644 index a111b5bea..000000000 --- a/openwrt-app-actions/applications/luci-app-gogs/root/etc/config/gogs +++ /dev/null @@ -1,6 +0,0 @@ -config main - option 'http_port' '3001' - option 'ssh_port' '3022' - option 'image_name' 'gogs/gogs:latest' - option 'config_path' '' - diff --git a/openwrt-app-actions/applications/luci-app-gogs/root/usr/libexec/istorec/gogs.sh b/openwrt-app-actions/applications/luci-app-gogs/root/usr/libexec/istorec/gogs.sh deleted file mode 100755 index e2f45858b..000000000 --- a/openwrt-app-actions/applications/luci-app-gogs/root/usr/libexec/istorec/gogs.sh +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/sh -# Author Xiaobao(xiaobao@linkease.com) - -ACTION=${1} -shift 1 - -do_install() { - local http_port=`uci get gogs.@main[0].http_port 2>/dev/null` - local ssh_port=`uci get gogs.@main[0].ssh_port 2>/dev/null` - local image_name=`uci get gogs.@main[0].image_name 2>/dev/null` - local config=`uci get gogs.@main[0].config_path 2>/dev/null` - - [ -z "$image_name" ] && image_name="gogs/gogs:latest" - echo "docker pull ${image_name}" - docker pull ${image_name} - docker rm -f gogs - - if [ -z "$config" ]; then - echo "config path is empty!" - exit 1 - fi - - if [ -z "$http_port" ]; then - http_port=3001 - fi - if [ -z "$ssh_port" ]; then - ssh_port=3022 - fi - - local cmd="docker run --restart=unless-stopped -d -v \"$config:/data\" \ - --dns=172.17.0.1 \ - -p $http_port:3000 \ - -p $ssh_port:22 " - - local tz="`uci get system.@system[0].zonename`" - [ -z "$tz" ] || cmd="$cmd -e TZ=$tz" - - cmd="$cmd -v /mnt:/mnt" - mountpoint -q /mnt && cmd="$cmd:rslave" - cmd="$cmd --name gogs \"$image_name\"" - - echo "$cmd" - eval "$cmd" -} - -usage() { - echo "usage: $0 sub-command" - echo "where sub-command is one of:" - echo " install Install the gogs" - echo " upgrade Upgrade the gogs" - echo " rm/start/stop/restart Remove/Start/Stop/Restart the gogs" - echo " status Gogs status" - echo " port Gogs port" -} - -case ${ACTION} in - "install") - do_install - ;; - "upgrade") - do_install - ;; - "rm") - docker rm -f gogs - ;; - "start" | "stop" | "restart") - docker ${ACTION} gogs - ;; - "status") - docker ps --all -f 'name=gogs' --format '{{.State}}' - ;; - "port") - local http_port=`uci get gogs.@main[0].http_port 2>/dev/null` - echo $http_port - ;; - *) - usage - exit 1 - ;; -esac diff --git a/openwrt-app-actions/applications/luci-app-heimdall/Makefile b/openwrt-app-actions/applications/luci-app-heimdall/Makefile deleted file mode 100644 index 226812d68..000000000 --- a/openwrt-app-actions/applications/luci-app-heimdall/Makefile +++ /dev/null @@ -1,18 +0,0 @@ - - -include $(TOPDIR)/rules.mk - -PKG_VERSION:=1.1.1-20230108 -PKG_RELEASE:= - -LUCI_TITLE:=LuCI support for heimdall -LUCI_PKGARCH:=all -LUCI_DEPENDS:=+docker +luci-lib-taskd - -define Package/luci-app-heimdall/conffiles -/etc/config/heimdall -endef - -include $(TOPDIR)/feeds/luci/luci.mk - -# call BuildPackage - OpenWrt buildroot signature diff --git a/openwrt-app-actions/applications/luci-app-heimdall/luasrc/controller/heimdall.lua b/openwrt-app-actions/applications/luci-app-heimdall/luasrc/controller/heimdall.lua deleted file mode 100755 index 23a6e6a49..000000000 --- a/openwrt-app-actions/applications/luci-app-heimdall/luasrc/controller/heimdall.lua +++ /dev/null @@ -1,7 +0,0 @@ - -module("luci.controller.heimdall", package.seeall) - -function index() - entry({"admin", "services", "heimdall"}, alias("admin", "services", "heimdall", "config"), _("Heimdall"), 30).dependent = true - entry({"admin", "services", "heimdall", "config"}, cbi("heimdall")) -end diff --git a/openwrt-app-actions/applications/luci-app-heimdall/luasrc/model/cbi/heimdall.lua b/openwrt-app-actions/applications/luci-app-heimdall/luasrc/model/cbi/heimdall.lua deleted file mode 100644 index 18658af61..000000000 --- a/openwrt-app-actions/applications/luci-app-heimdall/luasrc/model/cbi/heimdall.lua +++ /dev/null @@ -1,35 +0,0 @@ ---[[ -LuCI - Lua Configuration Interface -]]-- - -local taskd = require "luci.model.tasks" -local m, s, o - -m = taskd.docker_map("heimdall", "heimdall", "/usr/libexec/istorec/heimdall.sh", - translate("Heimdall"), - translate("Heimdall is an elegant solution to organise all your web applications.") - .. translate("Official website:") .. ' https://github.com/linuxserver/Heimdall') - -s = m:section(SimpleSection, translate("Service Status"), translate("Heimdall status:")) -s:append(Template("heimdall/status")) - -s = m:section(TypedSection, "heimdall", translate("Setup"), translate("The following parameters will only take effect during installation or upgrade:")) -s.addremove=false -s.anonymous=true - -o = s:option(Value, "http_port", translate("HTTP Port").."*") -o.rmempty = false -o.default = "8088" -o.datatype = "port" - -o = s:option(Value, "https_port", translate("HTTPS Port").."*") -o.rmempty = false -o.default = "8089" -o.datatype = "port" - -o = s:option(Value, "config_path", translate("Config path").."*") -o.rmempty = false -o.default = "/root/heimdall/config" -o.datatype = "string" - -return m diff --git a/openwrt-app-actions/applications/luci-app-heimdall/luasrc/view/heimdall/status.htm b/openwrt-app-actions/applications/luci-app-heimdall/luasrc/view/heimdall/status.htm deleted file mode 100644 index 78c0af4d7..000000000 --- a/openwrt-app-actions/applications/luci-app-heimdall/luasrc/view/heimdall/status.htm +++ /dev/null @@ -1,31 +0,0 @@ -<% -local util = require "luci.util" -local container_status = util.trim(util.exec("/usr/libexec/istorec/heimdall.sh status")) -local container_install = (string.len(container_status) > 0) -local container_running = container_status == "running" --%> -
- -
- <% if container_running then %> - - <% else %> - - <% end %> -
-
-<% -if container_running then - local port=util.trim(util.exec("/usr/libexec/istorec/heimdall.sh port")) - if port == "" then - port="8088" - end --%> -
- -
- - -
-
-<% end %> \ No newline at end of file diff --git a/openwrt-app-actions/applications/luci-app-heimdall/po/zh-cn/heimdall.po b/openwrt-app-actions/applications/luci-app-heimdall/po/zh-cn/heimdall.po deleted file mode 100644 index 544174bb6..000000000 --- a/openwrt-app-actions/applications/luci-app-heimdall/po/zh-cn/heimdall.po +++ /dev/null @@ -1,44 +0,0 @@ -msgid "" -msgstr "Content-Type: text/plain; charset=UTF-8" - -msgid "Official website:" -msgstr "官方网站：" - -msgid "Heimdall is an elegant solution to organise all your web applications." -msgstr "Heimdall 是组织所有 Web 应用程序的优雅解决方案。" - -msgid "Config path" -msgstr "配置文件路径" - -msgid "Port" -msgstr "端口" - -msgid "HTTP Port" -msgstr "HTTP 端口" - -msgid "HTTPS Port" -msgstr "HTTPS 端口" - -msgid "Service Status" -msgstr "服务状态" - -msgid "Heimdall status:" -msgstr "Heimdall 的状态信息如下：" - -msgid "Setup" -msgstr "安装配置" - -msgid "The following parameters will only take effect during installation or upgrade:" -msgstr "以下参数只在安装或者升级时才会生效：" - -msgid "Status" -msgstr "状态" - -msgid "Heimdall is running" -msgstr "Heimdall 运行中" - -msgid "Heimdall is not running" -msgstr "Heimdall 未运行" - -msgid "Open Heimdall" -msgstr "打开 Heimdall" diff --git a/openwrt-app-actions/applications/luci-app-heimdall/root/etc/config/heimdall b/openwrt-app-actions/applications/luci-app-heimdall/root/etc/config/heimdall deleted file mode 100644 index 554dbd2aa..000000000 --- a/openwrt-app-actions/applications/luci-app-heimdall/root/etc/config/heimdall +++ /dev/null @@ -1,4 +0,0 @@ -config heimdall - option 'http_port' '8088' - option 'https_port' '8089' - option 'config_path' '/root/heimdall/config' diff --git a/openwrt-app-actions/applications/luci-app-heimdall/root/usr/libexec/istorec/heimdall.sh b/openwrt-app-actions/applications/luci-app-heimdall/root/usr/libexec/istorec/heimdall.sh deleted file mode 100755 index 905043b23..000000000 --- a/openwrt-app-actions/applications/luci-app-heimdall/root/usr/libexec/istorec/heimdall.sh +++ /dev/null @@ -1,84 +0,0 @@ -#!/bin/sh - -ACTION=${1} -shift 1 - -get_image() { - IMAGE_NAME="lscr.io/linuxserver/heimdall:latest" -} - -do_install() { - get_image - echo "docker pull ${IMAGE_NAME}" - docker pull ${IMAGE_NAME} - docker rm -f heimdall - - do_install_detail -} - -do_install_detail() { - local config=`uci get heimdall.@heimdall[0].config_path 2>/dev/null` - local http_port=`uci get heimdall.@heimdall[0].http_port 2>/dev/null` - local https_port=`uci get heimdall.@heimdall[0].https_port 2>/dev/null` - - if [ -z "$config" ]; then - echo "config path is empty!" - exit 1 - fi - - [ -z "$http_port" ] && http_port=8088 - [ -z "$https_port" ] && http_port=8089 - - local cmd="docker run --restart=unless-stopped -d \ - -v \"$config:/config\" \ - --dns=172.17.0.1 \ - -p $http_port:80 \ - -p $https_port:443 " - - cmd="$cmd -v /mnt:/mnt" - mountpoint -q /mnt && cmd="$cmd:rslave" - - local tz="`uci get system.@system[0].zonename`" - [ -z "$tz" ] || cmd="$cmd -e TZ=$tz" - - cmd="$cmd --name heimdall \"$IMAGE_NAME\"" - - echo "$cmd" - eval "$cmd" - -} - -usage() { - echo "usage: $0 sub-command" - echo "where sub-command is one of:" - echo " install Install the heimdall" - echo " upgrade Upgrade the heimdall" - echo " rm/start/stop/restart Remove/Start/Stop/Restart the heimdall" - echo " status Heimdall status" - echo " port Heimdall port" -} - -case ${ACTION} in - "install") - do_install - ;; - "upgrade") - do_install - ;; - "rm") - docker rm -f heimdall - ;; - "start" | "stop" | "restart") - docker ${ACTION} heimdall - ;; - "status") - docker ps --all -f 'name=heimdall' --format '{{.State}}' - ;; - "port") - docker ps --all -f 'name=heimdall' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*' | sed 's/0.0.0.0://' - ;; - *) - usage - exit 1 - ;; -esac diff --git a/openwrt-app-actions/applications/luci-app-homeassistant/Makefile b/openwrt-app-actions/applications/luci-app-homeassistant/Makefile deleted file mode 100644 index 766d78413..000000000 --- a/openwrt-app-actions/applications/luci-app-homeassistant/Makefile +++ /dev/null @@ -1,18 +0,0 @@ - - -include $(TOPDIR)/rules.mk - -PKG_VERSION:=1.1.1-20230108 -PKG_RELEASE:= - -LUCI_TITLE:=LuCI support for homeassistant -LUCI_PKGARCH:=all -LUCI_DEPENDS:=+docker +luci-lib-taskd - -define Package/luci-app-homeassistant/conffiles -/etc/config/homeassistant -endef - -include $(TOPDIR)/feeds/luci/luci.mk - -# call BuildPackage - OpenWrt buildroot signature diff --git a/openwrt-app-actions/applications/luci-app-homeassistant/luasrc/controller/homeassistant.lua b/openwrt-app-actions/applications/luci-app-homeassistant/luasrc/controller/homeassistant.lua deleted file mode 100755 index 0975e275a..000000000 --- a/openwrt-app-actions/applications/luci-app-homeassistant/luasrc/controller/homeassistant.lua +++ /dev/null @@ -1,9 +0,0 @@ - -module("luci.controller.homeassistant", package.seeall) - -function index() - entry({"admin", "services", "homeassistant"}, alias("admin", "services", "homeassistant", "config"), _("Home Assistant"), 30).dependent = true - entry({"admin", "services", "homeassistant", "config"}, cbi("homeassistant/config"), _("Config"), 10).leaf = true - entry({"admin", "services", "homeassistant", "tool"}, form("homeassistant/tool"), _("Tool"), 30).leaf = true - entry({"admin", "services", "homeassistant", "console"}, form("homeassistant/console"), _("Console"), 50).leaf = true -end diff --git a/openwrt-app-actions/applications/luci-app-homeassistant/luasrc/model/cbi/homeassistant/config.lua b/openwrt-app-actions/applications/luci-app-homeassistant/luasrc/model/cbi/homeassistant/config.lua deleted file mode 100644 index da62cc5e6..000000000 --- a/openwrt-app-actions/applications/luci-app-homeassistant/luasrc/model/cbi/homeassistant/config.lua +++ /dev/null @@ -1,46 +0,0 @@ ---[[ -LuCI - Lua Configuration Interface -]]-- - -local taskd = require "luci.model.tasks" -local homeassistant_model = require "luci.model.homeassistant" -local m, s, o - -m = taskd.docker_map("homeassistant", "homeassistant", "/usr/libexec/istorec/homeassistant.sh", - translate("Home Assistant"), - translate("Open source home automation that puts local control and privacy first. Powered by a worldwide community of tinkerers and DIY enthusiasts.") - .. translate("Official website:") .. ' https://www.home-assistant.io/') - -s = m:section(SimpleSection, translate("Service Status"), translate("Home Assistant status:")) -s:append(Template("homeassistant/status")) - -s = m:section(TypedSection, "homeassistant", translate("Setup"), translate("The following parameters will only take effect during installation or upgrade:")) -s.addremove=false -s.anonymous=true - -o = s:option(Value, "image_name", translate("Image").."*") -o.rmempty = false -o.datatype = "string" -o:value("homeassistant/home-assistant:latest", "homeassistant/home-assistant:latest") -o:value("ghcr.io/home-assistant/home-assistant:stable", "ghcr.io/home-assistant/home-assistant:stable") -o:value("ghcr.io/home-assistant/home-assistant:2022.11.4", "ghcr.io/home-assistant/home-assistant:2022.11.4") -o.default = "homeassistant/home-assistant:latest" - -local blocks = homeassistant_model.blocks() -local home = homeassistant_model.home() - -o = s:option(Value, "config_path", translate("Config path").."*") -o.rmempty = false -o.datatype = "string" - -local paths, default_path = homeassistant_model.find_paths(blocks, home, "Configs") -for _, val in pairs(paths) do - o:value(val, val) -end -o.default = default_path - -o = s:option(Value, "time_zone", translate("Timezone")) -o.datatype = "string" -o:value("Asia/Shanghai", "Asia/Shanghai") - -return m diff --git a/openwrt-app-actions/applications/luci-app-homeassistant/luasrc/model/cbi/homeassistant/console.lua b/openwrt-app-actions/applications/luci-app-homeassistant/luasrc/model/cbi/homeassistant/console.lua deleted file mode 100644 index 67e09ef6e..000000000 --- a/openwrt-app-actions/applications/luci-app-homeassistant/luasrc/model/cbi/homeassistant/console.lua +++ /dev/null @@ -1,116 +0,0 @@ ---[[ -LuCI - Lua Configuration Interface -]]-- - - -require "luci.util" - -local docker = require "luci.model.docker" -local dk = docker.new() - -local container_name = "homeassistant" - -local m, s, o -local images, networks, container_info, res - -res = dk.containers:inspect({name = container_name}) -if res.code < 300 then - container_info = res.body -else - return -end - -local cmd_docker = luci.util.exec("command -v docker"):match("^.+docker") or nil -local cmd_ttyd = luci.util.exec("command -v ttyd"):match("^.+ttyd") or nil - -if cmd_docker and cmd_ttyd and container_info.State.Status == "running" then - local cmd = "/bin/bash" - local uid - - m=SimpleForm("Console", "", translate("Only works in LAN")) - m.submit = false - m.reset = false - s = m:section(SimpleSection) - - o = s:option(Value, "command", translate("Command")) - o:value("/bin/sh", "/bin/sh") - o:value("/bin/ash", "/bin/ash") - o:value("/bin/bash", "/bin/bash") - o.default = "/bin/bash" - o.forcewrite = true - o.write = function(self, section, value) - cmd = value - end - - o = s:option(Value, "uid", translate("UID")) - o.forcewrite = true - o.write = function(self, section, value) - uid = value - end - - o = s:option(Button, "connect") - o.render = function(self, section, scope) - self.inputstyle = "add" - self.title = " " - self.inputtitle = translate("Connect") - Button.render(self, section, scope) - end - o.write = function(self, section) - local cmd_docker = luci.util.exec("command -v docker"):match("^.+docker") or nil - local cmd_ttyd = luci.util.exec("command -v ttyd"):match("^.+ttyd") or nil - - if not cmd_docker or not cmd_ttyd or cmd_docker:match("^%s+$") or cmd_ttyd:match("^%s+$")then - return - end - - local pid = luci.util.trim(luci.util.exec("netstat -lnpt | grep :7682 | grep ttyd | tr -s ' ' | cut -d ' ' -f7 | cut -d'/' -f1")) - if pid and pid ~= "" then - luci.util.exec("kill -9 " .. pid) - end - - local hosts - local uci = require "luci.model.uci".cursor() - local remote = uci:get_bool("dockerd", "globals", "remote_endpoint") or false - local host = nil - local port = nil - local socket = nil - - if remote then - host = uci:get("dockerd", "globals", "remote_host") or nil - port = uci:get("dockerd", "globals", "remote_port") or nil - else - socket = uci:get("dockerd", "globals", "socket_path") or "/var/run/docker.sock" - end - - if remote and host and port then - hosts = host .. ':'.. port - elseif socket then - hosts = socket - else - return - end - - if uid and uid ~= "" then - uid = "-u " .. uid - else - uid = "" - end - - local start_cmd = string.format('%s -d 2 --once -p 7682 %s -H "unix://%s" exec -it %s %s %s&', cmd_ttyd, cmd_docker, hosts, uid, container_name, cmd) - - os.execute(start_cmd) - - m.children[#m.children] = nil - s = m:section(SimpleSection) - o = s:option(DummyValue, "console") - o.container_id = container_id - o.template = container_name .. "/console" - end -else - m=SimpleForm("Console", "", translate("Home Assistant is not running")) - m.submit = false - m.reset = false - s = m:section(SimpleSection) -end - -return m diff --git a/openwrt-app-actions/applications/luci-app-homeassistant/luasrc/model/cbi/homeassistant/tool.lua b/openwrt-app-actions/applications/luci-app-homeassistant/luasrc/model/cbi/homeassistant/tool.lua deleted file mode 100644 index 925653582..000000000 --- a/openwrt-app-actions/applications/luci-app-homeassistant/luasrc/model/cbi/homeassistant/tool.lua +++ /dev/null @@ -1,41 +0,0 @@ ---[[ -LuCI - Lua Configuration Interface -]]-- - -local http = require 'luci.http' - -m=SimpleForm("Tools") -m.submit = false -m.reset = false - -s = m:section(SimpleSection) - -o = s:option(Value, "action", translate("Action").."*") -o.rmempty = false -o.datatype = "string" -o:value("hacs-install", "hacs-install") -o.default = "hacs-install" - -local t=Template("homeassistant/tool") -m:append(t) - -local btn_do = s:option(Button, "_do") -btn_do.render = function(self, section, scope) - self.inputstyle = "add" - self.title = " " - self.inputtitle = translate("Execute") - Button.render(self, section, scope) -end - -btn_do.write = function(self, section, value) - local action = m:get(section, "action") - if action == "hacs-install" then - local cmd = string.format("/usr/libexec/istorec/homeassistant.sh %s", action) - cmd = "/etc/init.d/tasks task_add homeassistant " .. luci.util.shellquote(cmd) .. " >/dev/null 2>&1" - os.execute(cmd) - t.show_log_taskid = "homeassistant" - end -end - -return m - diff --git a/openwrt-app-actions/applications/luci-app-homeassistant/luasrc/model/homeassistant.lua b/openwrt-app-actions/applications/luci-app-homeassistant/luasrc/model/homeassistant.lua deleted file mode 100644 index 2cb8c4a38..000000000 --- a/openwrt-app-actions/applications/luci-app-homeassistant/luasrc/model/homeassistant.lua +++ /dev/null @@ -1,55 +0,0 @@ -local util = require "luci.util" -local jsonc = require "luci.jsonc" - -local emby = {} - -emby.blocks = function() - local f = io.popen("lsblk -s -f -b -o NAME,FSSIZE,MOUNTPOINT --json", "r") - local vals = {} - if f then - local ret = f:read("*all") - f:close() - local obj = jsonc.parse(ret) - for _, val in pairs(obj["blockdevices"]) do - local fsize = val["fssize"] - if fsize ~= nil and string.len(fsize) > 10 and val["mountpoint"] then - -- fsize > 1G - vals[#vals+1] = val["mountpoint"] - end - end - end - return vals -end - -emby.home = function() - local uci = require "luci.model.uci".cursor() - local home_dirs = {} - home_dirs["main_dir"] = uci:get_first("quickstart", "main", "main_dir", "/root") - home_dirs["Configs"] = uci:get_first("quickstart", "main", "conf_dir", home_dirs["main_dir"].."/Configs") - home_dirs["Public"] = uci:get_first("quickstart", "main", "pub_dir", home_dirs["main_dir"].."/Public") - home_dirs["Downloads"] = uci:get_first("quickstart", "main", "dl_dir", home_dirs["Public"].."/Downloads") - home_dirs["Caches"] = uci:get_first("quickstart", "main", "tmp_dir", home_dirs["main_dir"].."/Caches") - return home_dirs -end - -emby.find_paths = function(blocks, home_dirs, path_name) - local default_path = '' - local configs = {} - - default_path = home_dirs[path_name] .. "/HomeAssistant" - if #blocks == 0 then - table.insert(configs, default_path) - else - for _, val in pairs(blocks) do - table.insert(configs, val .. "/" .. path_name .. "/HomeAssistant") - end - local without_conf_dir = "/root/" .. path_name .. "/HomeAssistant" - if default_path == without_conf_dir then - default_path = configs[1] - end - end - - return configs, default_path -end - -return emby diff --git a/openwrt-app-actions/applications/luci-app-homeassistant/luasrc/view/homeassistant/console.htm b/openwrt-app-actions/applications/luci-app-homeassistant/luasrc/view/homeassistant/console.htm deleted file mode 100644 index cf12aa7d8..000000000 --- a/openwrt-app-actions/applications/luci-app-homeassistant/luasrc/view/homeassistant/console.htm +++ /dev/null @@ -1,6 +0,0 @@ -
- -
- diff --git a/openwrt-app-actions/applications/luci-app-homeassistant/luasrc/view/homeassistant/status.htm b/openwrt-app-actions/applications/luci-app-homeassistant/luasrc/view/homeassistant/status.htm deleted file mode 100644 index b08ae5a08..000000000 --- a/openwrt-app-actions/applications/luci-app-homeassistant/luasrc/view/homeassistant/status.htm +++ /dev/null @@ -1,31 +0,0 @@ -<% -local util = require "luci.util" -local container_status = util.trim(util.exec("/usr/libexec/istorec/homeassistant.sh status")) -local container_install = (string.len(container_status) > 0) -local container_running = container_status == "running" --%> -
- -
- <% if container_running then %> - - <% else %> - - <% end %> -
-
-<% -if container_running then - local port=util.trim(util.exec("/usr/libexec/istorec/homeassistant.sh port")) - if port == "" then - port="8123" - end --%> -
- -
- - -
-
-<% end %> \ No newline at end of file diff --git a/openwrt-app-actions/applications/luci-app-homeassistant/luasrc/view/homeassistant/tool.htm b/openwrt-app-actions/applications/luci-app-homeassistant/luasrc/view/homeassistant/tool.htm deleted file mode 100644 index 8ab8bdcdb..000000000 --- a/openwrt-app-actions/applications/luci-app-homeassistant/luasrc/view/homeassistant/tool.htm +++ /dev/null @@ -1,11 +0,0 @@ -<%+tasks/embed%> - - - diff --git a/openwrt-app-actions/applications/luci-app-homeassistant/po/zh-cn/homeassistant.po b/openwrt-app-actions/applications/luci-app-homeassistant/po/zh-cn/homeassistant.po deleted file mode 100644 index 78f2166c0..000000000 --- a/openwrt-app-actions/applications/luci-app-homeassistant/po/zh-cn/homeassistant.po +++ /dev/null @@ -1,51 +0,0 @@ -msgid "" -msgstr "Content-Type: text/plain; charset=UTF-8" - -msgid "Official website:" -msgstr "官方网站：" - -msgid "Open source home automation that puts local control and privacy first. Powered by a worldwide community of tinkerers and DIY enthusiasts." -msgstr "将本地控制和隐私放在首位的开源家庭自动化，由全世界 DIY 爱好者组成的社区驱动。" - -msgid "Config path" -msgstr "配置文件路径" - -msgid "Service Status" -msgstr "服务状态" - -msgid "Home Assistant status:" -msgstr "Home Assistant 的状态信息如下：" - -msgid "Setup" -msgstr "安装配置" - -msgid "The following parameters will only take effect during installation or upgrade:" -msgstr "以下参数只在安装或者升级时才会生效：" - -msgid "Status" -msgstr "状态" - -msgid "Home Assistant is running" -msgstr "Home Assistant 运行中" - -msgid "Home Assistant is not running" -msgstr "Home Assistant 未运行" - -msgid "Open the Home Assistant" -msgstr "打开 Home Assistant" - -msgid "Tool" -msgstr "操作" - -msgid "Console" -msgstr "控制台" - -msgid "Only works in LAN" -msgstr "只在内网环境下工作。" - -msgid "Execute" -msgstr "执行" - -msgid "Timezone" -msgstr "时区" - diff --git a/openwrt-app-actions/applications/luci-app-homeassistant/root/etc/config/homeassistant b/openwrt-app-actions/applications/luci-app-homeassistant/root/etc/config/homeassistant deleted file mode 100644 index e1815d239..000000000 --- a/openwrt-app-actions/applications/luci-app-homeassistant/root/etc/config/homeassistant +++ /dev/null @@ -1,4 +0,0 @@ -config homeassistant - option 'config_path' '' - option 'image_name' 'homeassistant/home-assistant:latest' - option 'time_zone' '' diff --git a/openwrt-app-actions/applications/luci-app-homeassistant/root/usr/libexec/istorec/homeassistant.sh b/openwrt-app-actions/applications/luci-app-homeassistant/root/usr/libexec/istorec/homeassistant.sh deleted file mode 100755 index aaa9362d5..000000000 --- a/openwrt-app-actions/applications/luci-app-homeassistant/root/usr/libexec/istorec/homeassistant.sh +++ /dev/null @@ -1,85 +0,0 @@ -#!/bin/sh - -ACTION=${1} -shift 1 - -do_install() { - local config=`uci get homeassistant.@homeassistant[0].config_path 2>/dev/null` - local IMAGE_NAME=`uci get homeassistant.@homeassistant[0].image_name 2>/dev/null` - local tz=`uci get homeassistant.@homeassistant[0].time_zone 2>/dev/null` - - if [ -z "$config" ]; then - echo "config path is empty!" - exit 1 - fi - - echo "docker pull ${IMAGE_NAME}" - docker pull ${IMAGE_NAME} - docker rm -f homeassistant - - local cmd="docker run --restart=unless-stopped -d \ - -v \"$config:/config\" \ - --privileged \ - --network=host \ - --dns=127.0.0.1 " - - if [ -z "$tz" ]; then - tz="`uci get system.@system[0].zonename`" - fi - [ -z "$tz" ] || cmd="$cmd -e TZ=$tz" - - cmd="$cmd --name homeassistant \"$IMAGE_NAME\"" - - echo "$cmd" - eval "$cmd" - - RET=$? - if [ "$RET" = "0" ]; then - do_hacs_install - fi -} - -do_hacs_install() { - echo "wget -O - https://get.hacs.xyz | bash -" | docker exec -i homeassistant bash - - sleep 3 - echo "restart homeassistant" - docker restart homeassistant -} - -usage() { - echo "usage: $0 sub-command" - echo "where sub-command is one of:" - echo " install Install the homeassistant" - echo " upgrade Upgrade the homeassistant" - echo " rm/start/stop/restart Remove/Start/Stop/Restart the homeassistant" - echo " status Home Assistant status" - echo " port Home Assistant port" -} - -case ${ACTION} in - "install") - do_install - ;; - "upgrade") - do_install - ;; - "rm") - docker rm -f homeassistant - ;; - "start" | "stop" | "restart") - docker ${ACTION} homeassistant - ;; - "status") - docker ps --all -f 'name=homeassistant' --format '{{.State}}' - ;; - "port") - docker ps --all -f 'name=homeassistant' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*' | sed 's/0.0.0.0://' - ;; - "hacs-install") - do_hacs_install - ;; - *) - usage - exit 1 - ;; -esac diff --git a/openwrt-app-actions/applications/luci-app-jackett/Makefile b/openwrt-app-actions/applications/luci-app-jackett/Makefile deleted file mode 100644 index 5ba5cc2fe..000000000 --- a/openwrt-app-actions/applications/luci-app-jackett/Makefile +++ /dev/null @@ -1,19 +0,0 @@ - - -include $(TOPDIR)/rules.mk - -PKG_VERSION:=1.1.1-20230108 -PKG_RELEASE:= - -LUCI_TITLE:=LuCI support for jackett -LUCI_PKGARCH:=all -LUCI_DEPENDS:=+docker +luci-lib-taskd - -define Package/luci-app-jackett/conffiles -/etc/config/jackett -endef - -include $(TOPDIR)/feeds/luci/luci.mk - -# call BuildPackage - OpenWrt buildroot signature - diff --git a/openwrt-app-actions/applications/luci-app-jackett/luasrc/controller/jackett.lua b/openwrt-app-actions/applications/luci-app-jackett/luasrc/controller/jackett.lua deleted file mode 100755 index e40a007ab..000000000 --- a/openwrt-app-actions/applications/luci-app-jackett/luasrc/controller/jackett.lua +++ /dev/null @@ -1,7 +0,0 @@ - -module("luci.controller.jackett", package.seeall) - -function index() - entry({"admin", "services", "jackett"}, alias("admin", "services", "jackett", "config"), _("Jackett"), 30).dependent = true - entry({"admin", "services", "jackett", "config"}, cbi("jackett")) -end diff --git a/openwrt-app-actions/applications/luci-app-jackett/luasrc/model/cbi/jackett.lua b/openwrt-app-actions/applications/luci-app-jackett/luasrc/model/cbi/jackett.lua deleted file mode 100644 index fdc70801e..000000000 --- a/openwrt-app-actions/applications/luci-app-jackett/luasrc/model/cbi/jackett.lua +++ /dev/null @@ -1,57 +0,0 @@ ---[[ -LuCI - Lua Configuration Interface -]]-- - -local taskd = require "luci.model.tasks" -local jackett_model = require "luci.model.jackett" -local m, s, o - -m = taskd.docker_map("jackett", "jackett", "/usr/libexec/istorec/jackett.sh", - translate("Jackett"), - translate("Jackett is a single repository of maintained indexer scraping & translation logic - removing the burden from other apps.") - .. translate("Official website:") .. ' https://github.com/Jackett/Jackett') - -s = m:section(SimpleSection, translate("Service Status"), translate("Jackett status:")) -s:append(Template("jackett/status")) - -s = m:section(TypedSection, "jackett", translate("Setup"), translate("The following parameters will only take effect during installation or upgrade:")) -s.addremove=false -s.anonymous=true - -o = s:option(Value, "port", translate("Port").."*") -o.rmempty = false -o.default = "9117" -o.datatype = "port" - -o = s:option(Value, "image_name", translate("Image").."*") -o.rmempty = false -o.datatype = "string" -o:value("linuxserver/jackett:latest", "linuxserver/jackett:latest") -o.default = "linuxserver/jackett:latest" - -local blocks = jackett_model.blocks() -local home = jackett_model.home() - -o = s:option(Value, "config_path", translate("Config path").."*") -o.rmempty = false -o.datatype = "string" -local paths, default_path = jackett_model.find_paths(blocks, home, "Configs") -for _, val in pairs(paths) do - o:value(val, val) -end -o.default = default_path - -o = s:option(Value, "save_path", translate("Torrent save path").."*", translate("Usually use the monitoring folder of the torrent download tool")) -o.rmempty = false -o.datatype = "string" -local paths, default_path = jackett_model.find_paths(blocks, home, "Public") -for _, val in pairs(paths) do - o:value(val, val) -end -o.default = default_path - -o = s:option(Flag, "auto_update", translate("Auto update")) -o.default = 1 -o.rmempty = false - -return m diff --git a/openwrt-app-actions/applications/luci-app-jackett/luasrc/model/jackett.lua b/openwrt-app-actions/applications/luci-app-jackett/luasrc/model/jackett.lua deleted file mode 100644 index 85b0276b8..000000000 --- a/openwrt-app-actions/applications/luci-app-jackett/luasrc/model/jackett.lua +++ /dev/null @@ -1,55 +0,0 @@ -local util = require "luci.util" -local jsonc = require "luci.jsonc" - -local jackett = {} - -jackett.blocks = function() - local f = io.popen("lsblk -s -f -b -o NAME,FSSIZE,MOUNTPOINT --json", "r") - local vals = {} - if f then - local ret = f:read("*all") - f:close() - local obj = jsonc.parse(ret) - for _, val in pairs(obj["blockdevices"]) do - local fsize = val["fssize"] - if fsize ~= nil and string.len(fsize) > 10 and val["mountpoint"] then - -- fsize > 1G - vals[#vals+1] = val["mountpoint"] - end - end - end - return vals -end - -jackett.home = function() - local uci = require "luci.model.uci".cursor() - local home_dirs = {} - home_dirs["main_dir"] = uci:get_first("quickstart", "main", "main_dir", "/root") - home_dirs["Configs"] = uci:get_first("quickstart", "main", "conf_dir", home_dirs["main_dir"].."/Configs") - home_dirs["Public"] = uci:get_first("quickstart", "main", "pub_dir", home_dirs["main_dir"].."/Public") - home_dirs["Downloads"] = uci:get_first("quickstart", "main", "dl_dir", home_dirs["Public"].."/Downloads") - home_dirs["Caches"] = uci:get_first("quickstart", "main", "tmp_dir", home_dirs["main_dir"].."/Caches") - return home_dirs -end - -jackett.find_paths = function(blocks, home_dirs, path_name) - local appname = '/Jackett' - local default_path = '' - local configs = {} - - if #blocks == 0 then - return configs, default_path - else - if path_name == "Public" then - appname = "/Downloads" - end - for _, val in pairs(blocks) do - table.insert(configs, val .. "/" .. path_name .. appname) - end - default_path = configs[1] - end - - return configs, default_path -end - -return jackett diff --git a/openwrt-app-actions/applications/luci-app-jackett/luasrc/view/jackett/status.htm b/openwrt-app-actions/applications/luci-app-jackett/luasrc/view/jackett/status.htm deleted file mode 100644 index fdfd8e187..000000000 --- a/openwrt-app-actions/applications/luci-app-jackett/luasrc/view/jackett/status.htm +++ /dev/null @@ -1,31 +0,0 @@ -<% -local util = require "luci.util" -local container_status = util.trim(util.exec("/usr/libexec/istorec/jackett.sh status")) -local container_install = (string.len(container_status) > 0) -local container_running = container_status == "running" --%> -
- -
- <% if container_running then %> - - <% else %> - - <% end %> -
-
-<% -if container_running then - local port=util.trim(util.exec("/usr/libexec/istorec/jackett.sh port")) - if port == "" then - port="9117" - end --%> -
- -
- - -
-
-<% end %> \ No newline at end of file diff --git a/openwrt-app-actions/applications/luci-app-jackett/po/zh-cn/jackett.po b/openwrt-app-actions/applications/luci-app-jackett/po/zh-cn/jackett.po deleted file mode 100644 index ed79c0b6e..000000000 --- a/openwrt-app-actions/applications/luci-app-jackett/po/zh-cn/jackett.po +++ /dev/null @@ -1,47 +0,0 @@ -msgid "" -msgstr "Content-Type: text/plain; charset=UTF-8" - -msgid "Official website:" -msgstr "官方网站：" - -msgid "Jackett is a single repository of maintained indexer scraping & translation logic - removing the burden from other apps." -msgstr "Jackett 是维护索引器抓取和翻译逻辑的单一存储库 - 消除了其他应用程序的负担。" - -msgid "Config path" -msgstr "配置文件路径" - -msgid "Torrent save path" -msgstr "种子保存路径" - -msgid "Port" -msgstr "端口" - -msgid "Auto update" -msgstr "自动更新" - -msgid "Service Status" -msgstr "服务状态" - -msgid "Jackett status:" -msgstr "Jackett 的状态信息如下：" - -msgid "Setup" -msgstr "安装配置" - -msgid "The following parameters will only take effect during installation or upgrade:" -msgstr "以下参数只在安装或者升级时才会生效：" - -msgid "Status" -msgstr "状态" - -msgid "Jackett is running" -msgstr "Jackett 运行中" - -msgid "Jackett is not running" -msgstr "Jackett 未运行" - -msgid "Open Jackett" -msgstr "打开 Jackett" - -msgid "Usually use the monitoring folder of the torrent download tool" -msgstr "通常使用BT下载工具的监控文件夹" diff --git a/openwrt-app-actions/applications/luci-app-jackett/root/etc/config/jackett b/openwrt-app-actions/applications/luci-app-jackett/root/etc/config/jackett deleted file mode 100644 index 3c64b927a..000000000 --- a/openwrt-app-actions/applications/luci-app-jackett/root/etc/config/jackett +++ /dev/null @@ -1,6 +0,0 @@ -config jackett - option 'auto_update' '1' - option 'port' '9117' - option 'save_path' '' - option 'config_path' '' - option 'image_name' 'linuxserver/jackett:latest' diff --git a/openwrt-app-actions/applications/luci-app-jackett/root/usr/libexec/istorec/jackett.sh b/openwrt-app-actions/applications/luci-app-jackett/root/usr/libexec/istorec/jackett.sh deleted file mode 100755 index 81edb46ad..000000000 --- a/openwrt-app-actions/applications/luci-app-jackett/root/usr/libexec/istorec/jackett.sh +++ /dev/null @@ -1,88 +0,0 @@ -#!/bin/sh - -ACTION=${1} -shift 1 - -do_install() { - local save_path=`uci get jackett.@jackett[0].save_path 2>/dev/null` - local config=`uci get jackett.@jackett[0].config_path 2>/dev/null` - local port=`uci get jackett.@jackett[0].port 2>/dev/null` - local auto_update=`uci get jackett.@jackett[0].auto_update 2>/dev/null` - local IMAGE_NAME=`uci get jackett.@jackett[0].image_name 2>/dev/null` - - if [ -z "$config" ]; then - echo "config path is empty!" - exit 1 - fi - if [ -z "$save_path" ]; then - echo "save path is empty!" - exit 1 - fi - - [ -z "$port" ] && port=9117 - [ -z "$IMAGE_NAME" ] && IMAGE_NAME="linuxserver/jackett:latest" - - echo "docker pull ${IMAGE_NAME}" - docker pull ${IMAGE_NAME} - docker rm -f jackett - - local cmd="docker run --restart=unless-stopped -d \ - -v \"$config:/config\" \ - -v \"$save_path:/downloads\" \ - --dns=172.17.0.1 \ - -p $port:9117 " - - local tz="`uci get system.@system[0].zonename`" - [ -z "$tz" ] || cmd="$cmd -e TZ=$tz" - - if [ -n "$auto_update" ]; then - if [ "$auto_update" = 1 ]; then - cmd="$cmd -e AUTO_UPDATE=true" - else - cmd="$cmd -e AUTO_UPDATE=false" - fi - fi - - cmd="$cmd --name jackett \"$IMAGE_NAME\"" - - echo "$cmd" - eval "$cmd" - - echo "Waiting 15s to setup" - sleep 15 -} - -usage() { - echo "usage: $0 sub-command" - echo "where sub-command is one of:" - echo " install Install the jackett" - echo " upgrade Upgrade the jackett" - echo " rm/start/stop/restart Remove/Start/Stop/Restart the jackett" - echo " status Jackett status" - echo " port Jackett port" -} - -case ${ACTION} in - "install") - do_install - ;; - "upgrade") - do_install - ;; - "rm") - docker rm -f jackett - ;; - "start" | "stop" | "restart") - docker ${ACTION} jackett - ;; - "status") - docker ps --all -f 'name=jackett' --format '{{.State}}' - ;; - "port") - docker ps --all -f 'name=jackett' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*' | sed 's/0.0.0.0://' - ;; - *) - usage - exit 1 - ;; -esac diff --git a/openwrt-app-actions/applications/luci-app-jellyfin/Makefile b/openwrt-app-actions/applications/luci-app-jellyfin/Makefile deleted file mode 100644 index 89bb85066..000000000 --- a/openwrt-app-actions/applications/luci-app-jellyfin/Makefile +++ /dev/null @@ -1,19 +0,0 @@ - - -include $(TOPDIR)/rules.mk - -PKG_VERSION:=1.1.7-20230108 -PKG_RELEASE:= - -LUCI_TITLE:=LuCI support for jellyfin -LUCI_PKGARCH:=all -LUCI_DEPENDS:=+docker +luci-lib-taskd - -define Package/luci-app-jellyfin/conffiles -/etc/config/jellyfin -endef - -include $(TOPDIR)/feeds/luci/luci.mk - -# call BuildPackage - OpenWrt buildroot signature - diff --git a/openwrt-app-actions/applications/luci-app-jellyfin/luasrc/controller/jellyfin.lua b/openwrt-app-actions/applications/luci-app-jellyfin/luasrc/controller/jellyfin.lua deleted file mode 100755 index 4b4424e29..000000000 --- a/openwrt-app-actions/applications/luci-app-jellyfin/luasrc/controller/jellyfin.lua +++ /dev/null @@ -1,7 +0,0 @@ - -module("luci.controller.jellyfin", package.seeall) - -function index() - entry({"admin", "services", "jellyfin"}, alias("admin", "services", "jellyfin", "config"), _("Jellyfin"), 30).dependent = true - entry({"admin", "services", "jellyfin", "config"}, cbi("jellyfin")) -end diff --git a/openwrt-app-actions/applications/luci-app-jellyfin/luasrc/model/cbi/jellyfin.lua b/openwrt-app-actions/applications/luci-app-jellyfin/luasrc/model/cbi/jellyfin.lua deleted file mode 100644 index ae47771fa..000000000 --- a/openwrt-app-actions/applications/luci-app-jellyfin/luasrc/model/cbi/jellyfin.lua +++ /dev/null @@ -1,63 +0,0 @@ ---[[ -LuCI - Lua Configuration Interface -]]-- - -local taskd = require "luci.model.tasks" -local jellyfin_model = require "luci.model.jellyfin" -local m, s, o - -m = taskd.docker_map("jellyfin", "jellyfin", "/usr/libexec/istorec/jellyfin.sh", - translate("Jellyfin"), - translate("Jellyfin is the volunteer-built media solution that puts you in control of your media. Stream to any device from your own server, with no strings attached. Your media, your server, your way.") - .. translate("Official website:") .. ' https://jellyfin.org/' - .. "
" .. translate("The following models support hardware transcoding without configuration in Jellyfin:") .. "
" - .. "
- Easepi ARS2
" - .. "
- " .. translate("RK3568 series (e.g. R5S, R68s, R66s, etc.) with iStoreOS firmware (version 20221123 and above). Other firmwares require MPP and RGA to be turned on, and are not guaranteed to be available.") .. "
" - .. "
" .. translate("The following models may support hardware transcoding by referring to the official Jellyfin documentation:") .. "
" - .. "
- " .. translate("x86 series") .. "
" - .. "
- " .. translate("Raspberry Pi series") .. "
" - .. "
") - -s = m:section(SimpleSection, translate("Service Status"), translate("Jellyfin status:")) -s:append(Template("jellyfin/status")) - -s = m:section(TypedSection, "jellyfin", translate("Setup"), - translate("The initial installation of Jellyfin requires at least 2GB of space, please make sure that the Docker data directory has enough space. It is recommended to migrate Docker to a hard drive before installing Jellyfin.") - .. "
" .. translate("The following parameters will only take effect during installation or upgrade:")) -s.addremove=false -s.anonymous=true - -o = s:option(Flag, "hostnet", translate("Host network"), translate("Jellyfin running in host network, for DLNA application, port is always 8096 if enabled")) -o.default = 0 -o.rmempty = false - -o = s:option(Value, "port", translate("Port").."*") -o.default = "8096" -o.datatype = "port" -o:depends("hostnet", 0) - -local blocks = jellyfin_model.blocks() -local home = jellyfin_model.home() - -o = s:option(Value, "config_path", translate("Config path").."*") -o.rmempty = false -o.datatype = "string" - -local paths, default_path = jellyfin_model.find_paths(blocks, home, "Configs") -for _, val in pairs(paths) do - o:value(val, val) -end -o.default = default_path - -o = s:option(Value, "media_path", translate("Media path"), translate("Not required, all disk is mounted in") .. " /mnt") -o.datatype = "string" - -o = s:option(Value, "cache_path", translate("Transcode cache path"), translate("Default use 'transcodes' in 'config path' if not set, please make sure there has enough space")) -o.datatype = "string" -local paths, default_path = jellyfin_model.find_paths(blocks, home, "Caches") -for _, val in pairs(paths) do - o:value(val, val) -end -o.default = default_path - -return m diff --git a/openwrt-app-actions/applications/luci-app-jellyfin/luasrc/model/jellyfin.lua b/openwrt-app-actions/applications/luci-app-jellyfin/luasrc/model/jellyfin.lua deleted file mode 100644 index 444085b4f..000000000 --- a/openwrt-app-actions/applications/luci-app-jellyfin/luasrc/model/jellyfin.lua +++ /dev/null @@ -1,55 +0,0 @@ -local util = require "luci.util" -local jsonc = require "luci.jsonc" - -local jellyfin = {} - -jellyfin.blocks = function() - local f = io.popen("lsblk -s -f -b -o NAME,FSSIZE,MOUNTPOINT --json", "r") - local vals = {} - if f then - local ret = f:read("*all") - f:close() - local obj = jsonc.parse(ret) - for _, val in pairs(obj["blockdevices"]) do - local fsize = val["fssize"] - if fsize ~= nil and string.len(fsize) > 10 and val["mountpoint"] then - -- fsize > 1G - vals[#vals+1] = val["mountpoint"] - end - end - end - return vals -end - -jellyfin.home = function() - local uci = require "luci.model.uci".cursor() - local home_dirs = {} - home_dirs["main_dir"] = uci:get_first("quickstart", "main", "main_dir", "/root") - home_dirs["Configs"] = uci:get_first("quickstart", "main", "conf_dir", home_dirs["main_dir"].."/Configs") - home_dirs["Public"] = uci:get_first("quickstart", "main", "pub_dir", home_dirs["main_dir"].."/Public") - home_dirs["Downloads"] = uci:get_first("quickstart", "main", "dl_dir", home_dirs["Public"].."/Downloads") - home_dirs["Caches"] = uci:get_first("quickstart", "main", "tmp_dir", home_dirs["main_dir"].."/Caches") - return home_dirs -end - -jellyfin.find_paths = function(blocks, home_dirs, path_name) - local default_path = '' - local configs = {} - - default_path = home_dirs[path_name] .. "/Jellyfin" - if #blocks == 0 then - table.insert(configs, default_path) - else - for _, val in pairs(blocks) do - table.insert(configs, val .. "/" .. path_name .. "/Jellyfin") - end - local without_conf_dir = "/root/" .. path_name .. "/Jellyfin" - if default_path == without_conf_dir then - default_path = configs[1] - end - end - - return configs, default_path -end - -return jellyfin diff --git a/openwrt-app-actions/applications/luci-app-jellyfin/luasrc/view/jellyfin/status.htm b/openwrt-app-actions/applications/luci-app-jellyfin/luasrc/view/jellyfin/status.htm deleted file mode 100644 index c7fc31ba1..000000000 --- a/openwrt-app-actions/applications/luci-app-jellyfin/luasrc/view/jellyfin/status.htm +++ /dev/null @@ -1,31 +0,0 @@ -<% -local util = require "luci.util" -local container_status = util.trim(util.exec("/usr/libexec/istorec/jellyfin.sh status")) -local container_install = (string.len(container_status) > 0) -local container_running = container_status == "running" --%> -
- -
- <% if container_running then %> - - <% else %> - - <% end %> -
-
-<% -if container_running then - local port=util.trim(util.exec("/usr/libexec/istorec/jellyfin.sh port")) - if port == "" then - port="8096" - end --%> -
- -
- - -
-
-<% end %> \ No newline at end of file diff --git a/openwrt-app-actions/applications/luci-app-jellyfin/po/zh-cn/jellyfin.po b/openwrt-app-actions/applications/luci-app-jellyfin/po/zh-cn/jellyfin.po deleted file mode 100644 index 6f88172fb..000000000 --- a/openwrt-app-actions/applications/luci-app-jellyfin/po/zh-cn/jellyfin.po +++ /dev/null @@ -1,74 +0,0 @@ -msgid "" -msgstr "Content-Type: text/plain; charset=UTF-8" - -msgid "Official website:" -msgstr "官方网站：" - -msgid "Jellyfin is the volunteer-built media solution that puts you in control of your media. Stream to any device from your own server, with no strings attached. Your media, your server, your way." -msgstr "Jellyfin 是志愿者构建的媒体解决方案，可让您控制自己的电影等媒体，并不受任何限制地让您从各种设备去观看您的媒体。" - -msgid "The following models support hardware transcoding without configuration in Jellyfin:" -msgstr "以下机型无需在Jellyfin配置即支持硬件转码：" - -msgid "RK3568 series (e.g. R5S, R68s, R66s, etc.) with iStoreOS firmware (version 20221123 and above). Other firmwares require MPP and RGA to be turned on, and are not guaranteed to be available." -msgstr "RK3568 系列（例如R5S，R68s，R66s等）并使用 iStoreOS 固件（版本20221123及以上）。其他固件需开启MPP和RGA，不保证可用。" - -msgid "The following models may support hardware transcoding by referring to the official Jellyfin documentation:" -msgstr "以下机型参考 Jellyfin 官方文档配置可能支持硬件转码：" - -msgid "x86 series" -msgstr "x86 系列" - -msgid "Raspberry Pi series" -msgstr "树莓派系列" - -msgid "Media path" -msgstr "媒体路径" - -msgid "Config path" -msgstr "配置文件路径" - -msgid "Transcode cache path" -msgstr "转码缓存路径" - -msgid "Port" -msgstr "端口" - -msgid "Host network" -msgstr "宿主网络" - -msgid "Jellyfin running in host network, for DLNA application, port is always 8096 if enabled" -msgstr "在宿主网络运行 Jellyfin，以支持 DLNA 等应用，例如投屏，如果启用则端口固定为8096" - -msgid "Default use 'transcodes' in 'config path' if not set, please make sure there has enough space" -msgstr "留空则使用配置文件路径下的 transcodes，请确保有足够空间" - -msgid "Service Status" -msgstr "服务状态" - -msgid "Jellyfin status:" -msgstr "Jellyfin 的状态信息如下：" - -msgid "Setup" -msgstr "安装配置" - -msgid "The initial installation of Jellyfin requires at least 2GB of space, please make sure that the Docker data directory has enough space. It is recommended to migrate Docker to a hard drive before installing Jellyfin." -msgstr "初次安装 Jellyfin 至少需要2GB空间，请确保 Docker 数据目录有足够空间。建议安装 Jellyfin 前将 Docker 迁移到硬盘上。" - -msgid "The following parameters will only take effect during installation or upgrade:" -msgstr "以下参数只在安装或者升级时才会生效：" - -msgid "Status" -msgstr "状态" - -msgid "Jellyfin is running" -msgstr "Jellyfin 运行中" - -msgid "Jellyfin is not running" -msgstr "Jellyfin 未运行" - -msgid "Open Jellyfin" -msgstr "打开 Jellyfin" - -msgid "Not required, all disk is mounted in" -msgstr "可不填，所有硬盘都在" diff --git a/openwrt-app-actions/applications/luci-app-jellyfin/root/etc/config/jellyfin b/openwrt-app-actions/applications/luci-app-jellyfin/root/etc/config/jellyfin deleted file mode 100644 index daff1dbeb..000000000 --- a/openwrt-app-actions/applications/luci-app-jellyfin/root/etc/config/jellyfin +++ /dev/null @@ -1,7 +0,0 @@ -config jellyfin - option 'hostnet' '0' - option 'port' '8096' - option 'image' 'default' - option 'media_path' '' - option 'config_path' '' - option 'cache_path' '' diff --git a/openwrt-app-actions/applications/luci-app-jellyfin/root/etc/uci-defaults/luci-app-jellyfin b/openwrt-app-actions/applications/luci-app-jellyfin/root/etc/uci-defaults/luci-app-jellyfin deleted file mode 100644 index b5f36629d..000000000 --- a/openwrt-app-actions/applications/luci-app-jellyfin/root/etc/uci-defaults/luci-app-jellyfin +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -image_name=`uci get jellyfin.@jellyfin[0].image 2>/dev/null` - -if [ "$image_name" == "jjm2473/jellyfin-rtk:latest" ]; then - uci -q batch <<-EOF >/dev/null - set jellyfin.@jellyfin[0].image="default" - commit jellyfin -EOF -fi -exit 0 diff --git a/openwrt-app-actions/applications/luci-app-jellyfin/root/usr/libexec/istorec/jellyfin.sh b/openwrt-app-actions/applications/luci-app-jellyfin/root/usr/libexec/istorec/jellyfin.sh deleted file mode 100755 index 07dd51419..000000000 --- a/openwrt-app-actions/applications/luci-app-jellyfin/root/usr/libexec/istorec/jellyfin.sh +++ /dev/null @@ -1,151 +0,0 @@ -#!/bin/sh -# Author jjm2473@gmail.com -# Author Xiaobao(xiaobao@linkease.com) - -ACTION=${1} -shift 1 - -ARCH="default" -IMAGE_NAME='default' - -get_image() { - if grep -Eq ',rtd-?129.$' /proc/device-tree/compatible 2>/dev/null; then - ARCH="rtd129x" - elif grep -q 'rockchip,' /proc/device-tree/compatible 2>/dev/null; then - ARCH="rockchip" - fi - IMAGE_NAME=`uci get jellyfin.@jellyfin[0].image 2>/dev/null` - if [ -z "$IMAGE_NAME" -o "$IMAGE_NAME" == "default" ]; then - if [ "${ARCH}" = "rtd129x" ]; then - IMAGE_NAME="jjm2473/jellyfin-rtk:latest" - if uname -r | grep -q '^4\.9\.'; then - IMAGE_NAME="jjm2473/jellyfin-rtk:4.9-latest" - fi - elif [ "${ARCH}" = "rockchip" ]; then - IMAGE_NAME="jjm2473/jellyfin-mpp:latest" - else - IMAGE_NAME="jellyfin/jellyfin" - fi - fi -} - -do_install() { - get_image - echo "docker pull ${IMAGE_NAME}" - docker pull ${IMAGE_NAME} - docker rm -f jellyfin - - do_install_detail -} - -do_install_detail() { - local hostnet=`uci get jellyfin.@jellyfin[0].hostnet 2>/dev/null` - local media=`uci get jellyfin.@jellyfin[0].media_path 2>/dev/null` - local config=`uci get jellyfin.@jellyfin[0].config_path 2>/dev/null` - local cache=`uci get jellyfin.@jellyfin[0].cache_path 2>/dev/null` - local port=`uci get jellyfin.@jellyfin[0].port 2>/dev/null` - local dev - - if [ -z "$config" ]; then - echo "config path is empty!" - exit 1 - fi - - [ -z "$port" ] && port=8096 - - local cmd="docker run --restart=unless-stopped -d -v \"$config:/config\" " - if [ "${ARCH}" = "rtd129x" ]; then - cmd="$cmd\ - --device /dev/rpc0:/dev/rpc0 \ - --device /dev/rpc1:/dev/rpc1 \ - --device /dev/rpc2:/dev/rpc2 \ - --device /dev/rpc3:/dev/rpc3 \ - --device /dev/rpc4:/dev/rpc4 \ - --device /dev/rpc5:/dev/rpc5 \ - --device /dev/rpc6:/dev/rpc6 \ - --device /dev/rpc7:/dev/rpc7 \ - --device /dev/rpc100:/dev/rpc100 \ - --device /dev/uio250:/dev/uio250 \ - --device /dev/uio251:/dev/uio251 \ - --device /dev/uio252:/dev/uio252 \ - --device /dev/uio253:/dev/uio253 \ - --device /dev/ion:/dev/ion \ - --device /dev/ve3:/dev/ve3 \ - --device /dev/vpu:/dev/vpu \ - --device /dev/memalloc:/dev/memalloc \ - -v /tmp/shm:/dev/shm \ - -v /sys/class/uio:/sys/class/uio \ - -v /var/tmp/vowb:/var/tmp/vowb \ - --pid=host " - elif [ "${ARCH}" = "rockchip" -a -e "/dev/rga" ]; then - cmd="$cmd\ - -t \ - --privileged " - for dev in iep rga dri dma_heap mpp_service mpp-service vpu_service vpu-service \ - hevc_service hevc-service rkvdec rkvenc avsd vepu h265e ; do - [ -e "/dev/$dev" ] && cmd="$cmd --device /dev/$dev" - done - elif [ -d /dev/dri ]; then - cmd="$cmd\ - --device /dev/dri:/dev/dri \ - --privileged " - fi - if [ "$hostnet" = 1 ]; then - cmd="$cmd\ - --dns=127.0.0.1 \ - --network=host " - else - cmd="$cmd\ - --dns=172.17.0.1 \ - -p $port:8096 " - fi - - local tz="`uci get system.@system[0].zonename`" - [ -z "$tz" ] || cmd="$cmd -e TZ=$tz" - - [ -z "$cache" ] || cmd="$cmd -v \"$cache:/config/transcodes\"" - [ -z "$media" ] || cmd="$cmd -v \"$media:/media\"" - - cmd="$cmd -v /mnt:/mnt" - mountpoint -q /mnt && cmd="$cmd:rslave" - cmd="$cmd --name jellyfin \"$IMAGE_NAME\"" - - echo "$cmd" - eval "$cmd" - -} - -usage() { - echo "usage: $0 sub-command" - echo "where sub-command is one of:" - echo " install Install the jellyfin" - echo " upgrade Upgrade the jellyfin" - echo " rm/start/stop/restart Remove/Start/Stop/Restart the jellyfin" - echo " status Jellyfin status" - echo " port Jellyfin port" -} - -case ${ACTION} in - "install") - do_install - ;; - "upgrade") - do_install - ;; - "rm") - docker rm -f jellyfin - ;; - "start" | "stop" | "restart") - docker ${ACTION} jellyfin - ;; - "status") - docker ps --all -f 'name=jellyfin' --format '{{.State}}' - ;; - "port") - docker ps --all -f 'name=jellyfin' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*' | sed 's/0.0.0.0://' - ;; - *) - usage - exit 1 - ;; -esac diff --git a/openwrt-app-actions/applications/luci-app-kodexplorer/Makefile b/openwrt-app-actions/applications/luci-app-kodexplorer/Makefile deleted file mode 100644 index daa95f6b3..000000000 --- a/openwrt-app-actions/applications/luci-app-kodexplorer/Makefile +++ /dev/null @@ -1,18 +0,0 @@ - - -include $(TOPDIR)/rules.mk - -PKG_VERSION:=1.2.1-20230108 -PKG_RELEASE:= - -LUCI_TITLE:=LuCI support for kodexplorer -LUCI_PKGARCH:=all -LUCI_DEPENDS:=+docker +luci-lib-taskd - -define Package/luci-app-kodexplorer/conffiles -/etc/config/kodexplorer -endef - -include $(TOPDIR)/feeds/luci/luci.mk - -# call BuildPackage - OpenWrt buildroot signature diff --git a/openwrt-app-actions/applications/luci-app-kodexplorer/luasrc/controller/kodexplorer.lua b/openwrt-app-actions/applications/luci-app-kodexplorer/luasrc/controller/kodexplorer.lua deleted file mode 100755 index a1c618364..000000000 --- a/openwrt-app-actions/applications/luci-app-kodexplorer/luasrc/controller/kodexplorer.lua +++ /dev/null @@ -1,7 +0,0 @@ - -module("luci.controller.kodexplorer", package.seeall) - -function index() - entry({"admin", "services", "kodexplorer"}, alias("admin", "services", "kodexplorer", "config"), _("KodExplorer"), 30).dependent = true - entry({"admin", "services", "kodexplorer", "config"}, cbi("kodexplorer")) -end diff --git a/openwrt-app-actions/applications/luci-app-kodexplorer/luasrc/model/cbi/kodexplorer.lua b/openwrt-app-actions/applications/luci-app-kodexplorer/luasrc/model/cbi/kodexplorer.lua deleted file mode 100644 index 2c02dece0..000000000 --- a/openwrt-app-actions/applications/luci-app-kodexplorer/luasrc/model/cbi/kodexplorer.lua +++ /dev/null @@ -1,45 +0,0 @@ ---[[ -LuCI - Lua Configuration Interface -]]-- - -local taskd = require "luci.model.tasks" -local kodexplorer_model = require "luci.model.kodexplorer" -local m, s, o - -m = taskd.docker_map("kodexplorer", "kodexplorer", "/usr/libexec/istorec/kodexplorer.sh", - translate("KodExplorer"), - translate("Private cloud online document management solution based on web technology.") - .. translate("Official website:") .. ' https://kodcloud.com/') - -s = m:section(SimpleSection, translate("Service Status"), translate("KodExplorer status:")) -s:append(Template("kodexplorer/status")) - -s = m:section(TypedSection, "kodexplorer", translate("Setup"), translate("The following parameters will only take effect during installation or upgrade:")) -s.addremove=false -s.anonymous=true - -o = s:option(Value, "port", translate("Port").."*") -o.rmempty = false -o.default = "8081" -o.datatype = "port" - -o = s:option(Value, "image_name", translate("Image").."*") -o.rmempty = false -o.datatype = "string" -o:value("kodcloud/kodbox:latest", "kodcloud/kodbox:latest") -o.default = "kodcloud/kodbox:latest" - -local blocks = kodexplorer_model.blocks() -local home = kodexplorer_model.home() - -o = s:option(Value, "cache_path", translate("Config path").."*") -o.rmempty = false -o.datatype = "string" - -local paths, default_path = kodexplorer_model.find_paths(blocks, home, "Configs") -for _, val in pairs(paths) do - o:value(val, val) -end -o.default = default_path - -return m diff --git a/openwrt-app-actions/applications/luci-app-kodexplorer/luasrc/model/kodexplorer.lua b/openwrt-app-actions/applications/luci-app-kodexplorer/luasrc/model/kodexplorer.lua deleted file mode 100644 index b0a2fea16..000000000 --- a/openwrt-app-actions/applications/luci-app-kodexplorer/luasrc/model/kodexplorer.lua +++ /dev/null @@ -1,55 +0,0 @@ -local util = require "luci.util" -local jsonc = require "luci.jsonc" - -local kodexplorer = {} - -kodexplorer.blocks = function() - local f = io.popen("lsblk -s -f -b -o NAME,FSSIZE,MOUNTPOINT --json", "r") - local vals = {} - if f then - local ret = f:read("*all") - f:close() - local obj = jsonc.parse(ret) - for _, val in pairs(obj["blockdevices"]) do - local fsize = val["fssize"] - if fsize ~= nil and string.len(fsize) > 10 and val["mountpoint"] then - -- fsize > 1G - vals[#vals+1] = val["mountpoint"] - end - end - end - return vals -end - -kodexplorer.home = function() - local uci = require "luci.model.uci".cursor() - local home_dirs = {} - home_dirs["main_dir"] = uci:get_first("quickstart", "main", "main_dir", "/root") - home_dirs["Configs"] = uci:get_first("quickstart", "main", "conf_dir", home_dirs["main_dir"].."/Configs") - home_dirs["Public"] = uci:get_first("quickstart", "main", "pub_dir", home_dirs["main_dir"].."/Public") - home_dirs["Downloads"] = uci:get_first("quickstart", "main", "dl_dir", home_dirs["Public"].."/Downloads") - home_dirs["Caches"] = uci:get_first("quickstart", "main", "tmp_dir", home_dirs["main_dir"].."/Caches") - return home_dirs -end - -kodexplorer.find_paths = function(blocks, home_dirs, path_name) - local default_path = '' - local configs = {} - - default_path = home_dirs[path_name] .. "/KodExplorer" - if #blocks == 0 then - table.insert(configs, default_path) - else - for _, val in pairs(blocks) do - table.insert(configs, val .. "/" .. path_name .. "/KodExplorer") - end - local without_conf_dir = "/root/" .. path_name .. "/KodExplorer" - if default_path == without_conf_dir then - default_path = configs[1] - end - end - - return configs, default_path -end - -return kodexplorer diff --git a/openwrt-app-actions/applications/luci-app-kodexplorer/luasrc/view/kodexplorer/status.htm b/openwrt-app-actions/applications/luci-app-kodexplorer/luasrc/view/kodexplorer/status.htm deleted file mode 100644 index 0a88625f5..000000000 --- a/openwrt-app-actions/applications/luci-app-kodexplorer/luasrc/view/kodexplorer/status.htm +++ /dev/null @@ -1,31 +0,0 @@ -<% -local util = require "luci.util" -local container_status = util.trim(util.exec("/usr/libexec/istorec/kodexplorer.sh status")) -local container_install = (string.len(container_status) > 0) -local container_running = container_status == "running" --%> -
- -
- <% if container_running then %> - - <% else %> - - <% end %> -
-
-<% -if container_running then - local port=util.trim(util.exec("/usr/libexec/istorec/kodexplorer.sh port")) - if port == "" then - port="8081" - end --%> -
- -
- - -
-
-<% end %> \ No newline at end of file diff --git a/openwrt-app-actions/applications/luci-app-kodexplorer/po/zh-cn/kodexplorer.po b/openwrt-app-actions/applications/luci-app-kodexplorer/po/zh-cn/kodexplorer.po deleted file mode 100644 index 23f4ec7db..000000000 --- a/openwrt-app-actions/applications/luci-app-kodexplorer/po/zh-cn/kodexplorer.po +++ /dev/null @@ -1,41 +0,0 @@ -msgid "" -msgstr "Content-Type: text/plain; charset=UTF-8" - -msgid "KodExplorer" -msgstr "可道云" - -msgid "Official website:" -msgstr "官方网站：" - -msgid "Private cloud online document management solution based on web technology." -msgstr "基于Web技术的私有云在线文档管理解决方案。" - -msgid "Config path" -msgstr "配置文件路径" - -msgid "Port" -msgstr "端口" - -msgid "Service Status" -msgstr "服务状态" - -msgid "KodExplorer status:" -msgstr "可道云的状态信息如下：" - -msgid "Setup" -msgstr "安装配置" - -msgid "The following parameters will only take effect during installation or upgrade:" -msgstr "以下参数只在安装或者升级时才会生效：" - -msgid "Status" -msgstr "状态" - -msgid "KodExplorer is running" -msgstr "可道云运行中" - -msgid "KodExplorer is not running" -msgstr "可道云未运行" - -msgid "Open KodExplorer" -msgstr "打开可道云" diff --git a/openwrt-app-actions/applications/luci-app-kodexplorer/root/etc/config/kodexplorer b/openwrt-app-actions/applications/luci-app-kodexplorer/root/etc/config/kodexplorer deleted file mode 100644 index c8f36e049..000000000 --- a/openwrt-app-actions/applications/luci-app-kodexplorer/root/etc/config/kodexplorer +++ /dev/null @@ -1,4 +0,0 @@ -config kodexplorer - option 'cache_path' '' - option 'port' '8081' - option 'image_name' 'kodcloud/kodbox:latest' diff --git a/openwrt-app-actions/applications/luci-app-kodexplorer/root/usr/libexec/istorec/kodexplorer.sh b/openwrt-app-actions/applications/luci-app-kodexplorer/root/usr/libexec/istorec/kodexplorer.sh deleted file mode 100755 index 90136bf78..000000000 --- a/openwrt-app-actions/applications/luci-app-kodexplorer/root/usr/libexec/istorec/kodexplorer.sh +++ /dev/null @@ -1,85 +0,0 @@ -#!/bin/sh - -ACTION=${1} -shift 1 - -get_image() { - IMAGE_NAME="kodcloud/kodbox:latest" -} - -do_install() { - get_image - - do_install_detail -} - -do_install() { - local config=`uci get kodexplorer.@kodexplorer[0].cache_path 2>/dev/null` - local port=`uci get kodexplorer.@kodexplorer[0].port 2>/dev/null` - local IMAGE_NAME=`uci get kodexplorer.@kodexplorer[0].image_name 2>/dev/null` - - if [ -z "$config" ]; then - echo "config path is empty!" - exit 1 - fi - - [ -z "$port" ] && port=8081 - - [ -z "$IMAGE_NAME" ] && IMAGE_NAME="kodcloud/kodbox:latest" - - echo "docker pull ${IMAGE_NAME}" - docker pull ${IMAGE_NAME} - docker rm -f kodexplorer - - local cmd="docker run --restart=unless-stopped -d \ - -v \"$config:/var/www/html\" \ - --dns=172.17.0.1 \ - -p $port:80 " - - cmd="$cmd -v /mnt:/mnt" - mountpoint -q /mnt && cmd="$cmd:rslave" - - local tz="`uci get system.@system[0].zonename`" - [ -z "$tz" ] || cmd="$cmd -e TZ=$tz" - - cmd="$cmd --name kodexplorer \"$IMAGE_NAME\"" - - echo "$cmd" - eval "$cmd" - -} - -usage() { - echo "usage: $0 sub-command" - echo "where sub-command is one of:" - echo " install Install the kodexplorer" - echo " upgrade Upgrade the kodexplorer" - echo " rm/start/stop/restart Remove/Start/Stop/Restart the kodexplorer" - echo " status KodExplorer status" - echo " port KodExplorer port" -} - -case ${ACTION} in - "install") - do_install - ;; - "upgrade") - do_install - ;; - "rm") - docker rm -f kodexplorer - ;; - "start" | "stop" | "restart") - docker ${ACTION} kodexplorer - ;; - "status") - docker ps --all -f 'name=kodexplorer' --format '{{.State}}' - ;; - "port") - docker ps --all -f 'name=kodexplorer' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*' | sed 's/0.0.0.0://' - ;; - *) - usage - exit 1 - ;; -esac diff --git a/openwrt-app-actions/applications/luci-app-lanraragi/Makefile b/openwrt-app-actions/applications/luci-app-lanraragi/Makefile deleted file mode 100644 index 7327cf8ea..000000000 --- a/openwrt-app-actions/applications/luci-app-lanraragi/Makefile +++ /dev/null @@ -1,18 +0,0 @@ - - -include $(TOPDIR)/rules.mk - -PKG_VERSION:=1.0.1-20230108 -PKG_RELEASE:= - -LUCI_TITLE:=LuCI support for LANraragi -LUCI_PKGARCH:=all -LUCI_DEPENDS:=+docker +luci-lib-taskd - -define Package/luci-app-lanraragi/conffiles -/etc/config/lanraragi -endef - -include $(TOPDIR)/feeds/luci/luci.mk - -# call BuildPackage - OpenWrt buildroot signature diff --git a/openwrt-app-actions/applications/luci-app-lanraragi/luasrc/controller/lanraragi.lua b/openwrt-app-actions/applications/luci-app-lanraragi/luasrc/controller/lanraragi.lua deleted file mode 100755 index aca8546d5..000000000 --- a/openwrt-app-actions/applications/luci-app-lanraragi/luasrc/controller/lanraragi.lua +++ /dev/null @@ -1,7 +0,0 @@ - -module("luci.controller.lanraragi", package.seeall) - -function index() - entry({"admin", "services", "lanraragi"}, alias("admin", "services", "lanraragi", "config"), _("LANraragi"), 30).dependent = true - entry({"admin", "services", "lanraragi", "config"}, cbi("lanraragi")) -end diff --git a/openwrt-app-actions/applications/luci-app-lanraragi/luasrc/model/cbi/lanraragi.lua b/openwrt-app-actions/applications/luci-app-lanraragi/luasrc/model/cbi/lanraragi.lua deleted file mode 100644 index 9959f4370..000000000 --- a/openwrt-app-actions/applications/luci-app-lanraragi/luasrc/model/cbi/lanraragi.lua +++ /dev/null @@ -1,56 +0,0 @@ ---[[ -LuCI - Lua Configuration Interface -]]-- - -local taskd = require "luci.model.tasks" -local lanraragi_model = require "luci.model.lanraragi" -local m, s, o - -m = taskd.docker_map("lanraragi", "lanraragi", "/usr/libexec/istorec/lanraragi.sh", - translate("LANraragi"), - translate("LANraragi is Open source server for archival of comics/manga. ") - .. translate("Default Password:") .. ' kamimamita ' - .. translate("Official website:") .. ' https://github.com/Difegue/LANraragi') - -s = m:section(SimpleSection, translate("Service Status"), translate("LANraragi status:")) -s:append(Template("lanraragi/status")) - -s = m:section(TypedSection, "main", translate("Setup"), translate("The following parameters will only take effect during installation or upgrade:")) -s.addremove=false -s.anonymous=true - -o = s:option(Value, "http_port", translate("HTTP Port").."*") -o.rmempty = false -o.default = "3000" -o.datatype = "string" - -o = s:option(Value, "image_name", translate("Image").."*") -o.rmempty = false -o.datatype = "string" -o:value("dezhao/lanraragi_cn", "dezhao/lanraragi_cn") -o:value("dezhao/lanraragi_cn:0.8.6", "dezhao/lanraragi_cn:0.8.6") -o.default = "dezhao/lanraragi_cn" - -local blocks = lanraragi_model.blocks() -local home = lanraragi_model.home() - -o = s:option(Value, "config_path", translate("Config path").."*") -o.rmempty = false -o.datatype = "string" - -local paths, default_path = lanraragi_model.find_paths(blocks, home, "Configs") -for _, val in pairs(paths) do - o:value(val, val) -end -o.default = default_path - -o = s:option(Value, "content_path", translate("Content path").."*") -o.rmempty = false -o.datatype = "string" -local paths, default_path = lanraragi_model.find_paths(blocks, home, "Public") -for _, val in pairs(paths) do - o:value(val, val) -end -o.default = default_path - -return m diff --git a/openwrt-app-actions/applications/luci-app-lanraragi/luasrc/model/lanraragi.lua b/openwrt-app-actions/applications/luci-app-lanraragi/luasrc/model/lanraragi.lua deleted file mode 100644 index 1c459419f..000000000 --- a/openwrt-app-actions/applications/luci-app-lanraragi/luasrc/model/lanraragi.lua +++ /dev/null @@ -1,54 +0,0 @@ -local util = require "luci.util" -local jsonc = require "luci.jsonc" - -local lanraragi = {} - -lanraragi.blocks = function() - local f = io.popen("lsblk -s -f -b -o NAME,FSSIZE,MOUNTPOINT --json", "r") - local vals = {} - if f then - local ret = f:read("*all") - f:close() - local obj = jsonc.parse(ret) - for _, val in pairs(obj["blockdevices"]) do - local fsize = val["fssize"] - if fsize ~= nil and string.len(fsize) > 10 and val["mountpoint"] then - -- fsize > 1G - vals[#vals+1] = val["mountpoint"] - end - end - end - return vals -end - -lanraragi.home = function() - local uci = require "luci.model.uci".cursor() - local home_dirs = {} - home_dirs["main_dir"] = uci:get_first("quickstart", "main", "main_dir", "/root") - home_dirs["Configs"] = uci:get_first("quickstart", "main", "conf_dir", home_dirs["main_dir"].."/Configs") - home_dirs["Public"] = uci:get_first("quickstart", "main", "pub_dir", home_dirs["main_dir"].."/Public") - home_dirs["Caches"] = uci:get_first("quickstart", "main", "tmp_dir", home_dirs["main_dir"].."/Caches") - return home_dirs -end - -lanraragi.find_paths = function(blocks, home_dirs, path_name) - local appname = '/LANraragi' - local default_path = '' - local configs = {} - - if #blocks == 0 then - return configs, default_path - else - if path_name == "Public" then - appname = "/Comics" - end - for _, val in pairs(blocks) do - table.insert(configs, val .. "/" .. path_name .. appname) - end - default_path = configs[1] - end - - return configs, default_path -end - -return lanraragi diff --git a/openwrt-app-actions/applications/luci-app-lanraragi/luasrc/view/lanraragi/status.htm b/openwrt-app-actions/applications/luci-app-lanraragi/luasrc/view/lanraragi/status.htm deleted file mode 100644 index 28ebc2a36..000000000 --- a/openwrt-app-actions/applications/luci-app-lanraragi/luasrc/view/lanraragi/status.htm +++ /dev/null @@ -1,31 +0,0 @@ -<% -local util = require "luci.util" -local container_status = util.trim(util.exec("/usr/libexec/istorec/lanraragi.sh status")) -local container_install = (string.len(container_status) > 0) -local container_running = container_status == "running" --%> -
- -
- <% if container_running then %> - - <% else %> - - <% end %> -
-
-<% -if container_running then - local port=util.trim(util.exec("/usr/libexec/istorec/lanraragi.sh port")) - if port == "" then - port="3000" - end --%> -
- -
- - -
-
-<% end %> diff --git a/openwrt-app-actions/applications/luci-app-lanraragi/po/zh-cn/lanraragi.po b/openwrt-app-actions/applications/luci-app-lanraragi/po/zh-cn/lanraragi.po deleted file mode 100644 index 06feaeca2..000000000 --- a/openwrt-app-actions/applications/luci-app-lanraragi/po/zh-cn/lanraragi.po +++ /dev/null @@ -1,44 +0,0 @@ -msgid "" -msgstr "Content-Type: text/plain; charset=UTF-8" - -msgid "Official website:" -msgstr "官方网站：" - -msgid "LANraragi is Open source server for archival of comics/manga." -msgstr "LANraragi 是一个开源的电子书、漫画管理平台。" - -msgid "Config path" -msgstr "配置文件路径" - -msgid "Content path" -msgstr "资源路径" - -msgid "HTTP Port" -msgstr "HTTP 端口" - -msgid "Service Status" -msgstr "服务状态" - -msgid "LANraragi status:" -msgstr "LANraragi 的状态信息如下：" - -msgid "Setup" -msgstr "安装配置" - -msgid "The following parameters will only take effect during installation or upgrade:" -msgstr "以下参数只在安装或者升级时才会生效：" - -msgid "Status" -msgstr "状态" - -msgid "LANraragi is running" -msgstr "LANraragi 运行中" - -msgid "LANraragi is not running" -msgstr "LANraragi 未运行" - -msgid "Open LANraragi" -msgstr "打开 LANraragi" - -msgid "Default Password:" -msgstr "默认密码：" diff --git a/openwrt-app-actions/applications/luci-app-lanraragi/root/etc/config/lanraragi b/openwrt-app-actions/applications/luci-app-lanraragi/root/etc/config/lanraragi deleted file mode 100644 index 4950c2763..000000000 --- a/openwrt-app-actions/applications/luci-app-lanraragi/root/etc/config/lanraragi +++ /dev/null @@ -1,6 +0,0 @@ -config main - option 'http_port' '3000' - option 'image_name' 'dezhao/lanraragi_cn' - option 'config_path' '' - option 'content_path' '' - diff --git a/openwrt-app-actions/applications/luci-app-lanraragi/root/usr/libexec/istorec/lanraragi.sh b/openwrt-app-actions/applications/luci-app-lanraragi/root/usr/libexec/istorec/lanraragi.sh deleted file mode 100755 index 6647d9134..000000000 --- a/openwrt-app-actions/applications/luci-app-lanraragi/root/usr/libexec/istorec/lanraragi.sh +++ /dev/null @@ -1,75 +0,0 @@ -#!/bin/sh -# Author Xiaobao(xiaobao@linkease.com) - -ACTION=${1} -shift 1 - -do_install() { - local http_port=`uci get lanraragi.@main[0].http_port 2>/dev/null` - local image_name=`uci get lanraragi.@main[0].image_name 2>/dev/null` - local config=`uci get lanraragi.@main[0].config_path 2>/dev/null` - local content=`uci get lanraragi.@main[0].content_path 2>/dev/null` - - [ -z "$image_name" ] && image_name="dezhao/lanraragi_cn" - echo "docker pull ${image_name}" - docker pull ${image_name} - docker rm -f lanraragi - - if [ -z "$config" ]; then - echo "config path is empty!" - exit 1 - fi - - [ -z "$http_port" ] && http_port=3000 - - local cmd="docker run --restart=unless-stopped -d \ - -v \"$config:/root/lanraragi/database\" \ - -v \"$content:/root/lanraragi/content\" \ - --dns=172.17.0.1 \ - -p $http_port:3000 " - - local tz="`uci get system.@system[0].zonename`" - [ -z "$tz" ] || cmd="$cmd -e TZ=$tz" - - cmd="$cmd -v /mnt:/mnt" - mountpoint -q /mnt && cmd="$cmd:rslave" - cmd="$cmd --name lanraragi \"$image_name\"" - - echo "$cmd" - eval "$cmd" -} - -usage() { - echo "usage: $0 sub-command" - echo "where sub-command is one of:" - echo " install Install the lanraragi" - echo " upgrade Upgrade the lanraragi" - echo " rm/start/stop/restart Remove/Start/Stop/Restart the lanraragi" - echo " status LANraragi status" - echo " port LANraragi port" -} - -case ${ACTION} in - "install") - do_install - ;; - "upgrade") - do_install - ;; - "rm") - docker rm -f lanraragi - ;; - "start" | "stop" | "restart") - docker ${ACTION} lanraragi - ;; - "status") - docker ps --all -f 'name=lanraragi' --format '{{.State}}' - ;; - "port") - docker ps --all -f 'name=lanraragi' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*' | sed 's/0.0.0.0://' - ;; - *) - usage - exit 1 - ;; -esac diff --git a/openwrt-app-actions/applications/luci-app-memos/Makefile b/openwrt-app-actions/applications/luci-app-memos/Makefile deleted file mode 100644 index f9b7d5527..000000000 --- a/openwrt-app-actions/applications/luci-app-memos/Makefile +++ /dev/null @@ -1,18 +0,0 @@ - - -include $(TOPDIR)/rules.mk - -PKG_VERSION:=1.0.1-20230108 -PKG_RELEASE:= - -LUCI_TITLE:=LuCI support for Memos -LUCI_PKGARCH:=all -LUCI_DEPENDS:=+docker +luci-lib-taskd - -define Package/luci-app-memos/conffiles -/etc/config/memos -endef - -include $(TOPDIR)/feeds/luci/luci.mk - -# call BuildPackage - OpenWrt buildroot signature diff --git a/openwrt-app-actions/applications/luci-app-memos/luasrc/controller/memos.lua b/openwrt-app-actions/applications/luci-app-memos/luasrc/controller/memos.lua deleted file mode 100755 index 080ff01b9..000000000 --- a/openwrt-app-actions/applications/luci-app-memos/luasrc/controller/memos.lua +++ /dev/null @@ -1,7 +0,0 @@ - -module("luci.controller.memos", package.seeall) - -function index() - entry({"admin", "services", "memos"}, alias("admin", "services", "memos", "config"), _("Memos"), 30).dependent = true - entry({"admin", "services", "memos", "config"}, cbi("memos")) -end diff --git a/openwrt-app-actions/applications/luci-app-memos/luasrc/model/cbi/memos.lua b/openwrt-app-actions/applications/luci-app-memos/luasrc/model/cbi/memos.lua deleted file mode 100644 index 005be5398..000000000 --- a/openwrt-app-actions/applications/luci-app-memos/luasrc/model/cbi/memos.lua +++ /dev/null @@ -1,44 +0,0 @@ ---[[ -LuCI - Lua Configuration Interface -]]-- - -local taskd = require "luci.model.tasks" -local memos_model = require "luci.model.memos" -local m, s, o - -m = taskd.docker_map("memos", "memos", "/usr/libexec/istorec/memos.sh", - translate("Memos"), - translate("Memos is an open-source, self-hosted memo hub with knowledge management and collaboration.") - .. translate("Official website:") .. ' https://usememos.com/') - -s = m:section(SimpleSection, translate("Service Status"), translate("Memos status:")) -s:append(Template("memos/status")) - -s = m:section(TypedSection, "main", translate("Setup"), translate("The following parameters will only take effect during installation or upgrade:")) -s.addremove=false -s.anonymous=true - -o = s:option(Value, "http_port", translate("HTTP Port").."*") -o.default = "5230" -o.datatype = "port" - -o = s:option(Value, "image_name", translate("Image").."*") -o.rmempty = false -o.datatype = "string" -o:value("neosmemo/memos:latest", "neosmemo/memos:latest") -o.default = "neosmemo/memos:latest" - -local blocks = memos_model.blocks() -local home = memos_model.home() - -o = s:option(Value, "config_path", translate("Config path").."*") -o.rmempty = false -o.datatype = "string" - -local paths, default_path = memos_model.find_paths(blocks, home, "Configs") -for _, val in pairs(paths) do - o:value(val, val) -end -o.default = default_path - -return m diff --git a/openwrt-app-actions/applications/luci-app-memos/luasrc/model/memos.lua b/openwrt-app-actions/applications/luci-app-memos/luasrc/model/memos.lua deleted file mode 100644 index b1bfcce29..000000000 --- a/openwrt-app-actions/applications/luci-app-memos/luasrc/model/memos.lua +++ /dev/null @@ -1,55 +0,0 @@ -local util = require "luci.util" -local jsonc = require "luci.jsonc" - -local memos = {} - -memos.blocks = function() - local f = io.popen("lsblk -s -f -b -o NAME,FSSIZE,MOUNTPOINT --json", "r") - local vals = {} - if f then - local ret = f:read("*all") - f:close() - local obj = jsonc.parse(ret) - for _, val in pairs(obj["blockdevices"]) do - local fsize = val["fssize"] - if fsize ~= nil and string.len(fsize) > 10 and val["mountpoint"] then - -- fsize > 1G - vals[#vals+1] = val["mountpoint"] - end - end - end - return vals -end - -memos.home = function() - local uci = require "luci.model.uci".cursor() - local home_dirs = {} - home_dirs["main_dir"] = uci:get_first("quickstart", "main", "main_dir", "/root") - home_dirs["Configs"] = uci:get_first("quickstart", "main", "conf_dir", home_dirs["main_dir"].."/Configs") - home_dirs["Public"] = uci:get_first("quickstart", "main", "pub_dir", home_dirs["main_dir"].."/Public") - home_dirs["Downloads"] = uci:get_first("quickstart", "main", "dl_dir", home_dirs["Public"].."/Downloads") - home_dirs["Caches"] = uci:get_first("quickstart", "main", "tmp_dir", home_dirs["main_dir"].."/Caches") - return home_dirs -end - -memos.find_paths = function(blocks, home_dirs, path_name) - local default_path = '' - local configs = {} - - default_path = home_dirs[path_name] .. "/Memos" - if #blocks == 0 then - table.insert(configs, default_path) - else - for _, val in pairs(blocks) do - table.insert(configs, val .. "/" .. path_name .. "/Memos") - end - local without_conf_dir = "/root/" .. path_name .. "/Memos" - if default_path == without_conf_dir then - default_path = configs[1] - end - end - - return configs, default_path -end - -return memos diff --git a/openwrt-app-actions/applications/luci-app-memos/luasrc/view/memos/status.htm b/openwrt-app-actions/applications/luci-app-memos/luasrc/view/memos/status.htm deleted file mode 100644 index cd447c41b..000000000 --- a/openwrt-app-actions/applications/luci-app-memos/luasrc/view/memos/status.htm +++ /dev/null @@ -1,31 +0,0 @@ -<% -local util = require "luci.util" -local container_status = util.trim(util.exec("/usr/libexec/istorec/memos.sh status")) -local container_install = (string.len(container_status) > 0) -local container_running = container_status == "running" --%> -
- -
- <% if container_running then %> - - <% else %> - - <% end %> -
-
-<% -if container_running then - local port=util.trim(util.exec("/usr/libexec/istorec/memos.sh port")) - if port == "" then - port="5230" - end --%> -
- -
- - -
-
-<% end %> diff --git a/openwrt-app-actions/applications/luci-app-memos/po/zh-cn/memos.po b/openwrt-app-actions/applications/luci-app-memos/po/zh-cn/memos.po deleted file mode 100644 index 86fb62f4a..000000000 --- a/openwrt-app-actions/applications/luci-app-memos/po/zh-cn/memos.po +++ /dev/null @@ -1,42 +0,0 @@ -msgid "" -msgstr "Content-Type: text/plain; charset=UTF-8" - -msgid "Memos" -msgstr "Memos 知识管理" - -msgid "Official website:" -msgstr "官方网站：" - -msgid "Memos is an open-source, self-hosted memo hub with knowledge management and collaboration." -msgstr "Memos 是一个开源的极简的碎片化知识管理工具。" - -msgid "Config path" -msgstr "配置文件路径" - -msgid "HTTP Port" -msgstr "HTTP 端口" - -msgid "Service Status" -msgstr "服务状态" - -msgid "Memos status:" -msgstr "Memos 的状态信息如下：" - -msgid "Setup" -msgstr "安装配置" - -msgid "The following parameters will only take effect during installation or upgrade:" -msgstr "以下参数只在安装或者升级时才会生效：" - -msgid "Status" -msgstr "状态" - -msgid "Memos is running" -msgstr "Memos 运行中" - -msgid "Memos is not running" -msgstr "Memos 未运行" - -msgid "Open Memos" -msgstr "打开 Memos" - diff --git a/openwrt-app-actions/applications/luci-app-memos/root/etc/config/memos b/openwrt-app-actions/applications/luci-app-memos/root/etc/config/memos deleted file mode 100644 index cfb29c704..000000000 --- a/openwrt-app-actions/applications/luci-app-memos/root/etc/config/memos +++ /dev/null @@ -1,5 +0,0 @@ -config main - option 'http_port' '5230' - option 'image_name' 'neosmemo/memos:latest' - option 'config_path' '' - diff --git a/openwrt-app-actions/applications/luci-app-memos/root/usr/libexec/istorec/memos.sh b/openwrt-app-actions/applications/luci-app-memos/root/usr/libexec/istorec/memos.sh deleted file mode 100755 index 78fe5e4c3..000000000 --- a/openwrt-app-actions/applications/luci-app-memos/root/usr/libexec/istorec/memos.sh +++ /dev/null @@ -1,74 +0,0 @@ -#!/bin/sh -# Author Xiaobao(xiaobao@linkease.com) - -ACTION=${1} -shift 1 - -do_install() { - local http_port=`uci get memos.@main[0].http_port 2>/dev/null` - local image_name=`uci get memos.@main[0].image_name 2>/dev/null` - local config=`uci get memos.@main[0].config_path 2>/dev/null` - - [ -z "$image_name" ] && image_name="neosmemo/memos:latest" - echo "docker pull ${image_name}" - docker pull ${image_name} - docker rm -f memos - - if [ -z "$config" ]; then - echo "config path is empty!" - exit 1 - fi - - # not conflict with jellyfin - [ -z "$http_port" ] && http_port=5230 - - local cmd="docker run --restart=unless-stopped -d \ - -v \"$config:/config\" \ - --dns=172.17.0.1 \ - -p $http_port:5230 " - - local tz="`uci get system.@system[0].zonename`" - [ -z "$tz" ] || cmd="$cmd -e TZ=$tz" - - cmd="$cmd -v /mnt:/mnt" - mountpoint -q /mnt && cmd="$cmd:rslave" - cmd="$cmd --name memos \"$image_name\"" - - echo "$cmd" - eval "$cmd" -} - -usage() { - echo "usage: $0 sub-command" - echo "where sub-command is one of:" - echo " install Install the memos" - echo " upgrade Upgrade the memos" - echo " rm/start/stop/restart Remove/Start/Stop/Restart the memos" - echo " status Memos status" - echo " port Memos port" -} - -case ${ACTION} in - "install") - do_install - ;; - "upgrade") - do_install - ;; - "rm") - docker rm -f memos - ;; - "start" | "stop" | "restart") - docker ${ACTION} memos - ;; - "status") - docker ps --all -f 'name=memos' --format '{{.State}}' - ;; - "port") - docker ps --all -f 'name=memos' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*' | sed 's/0.0.0.0://' - ;; - *) - usage - exit 1 - ;; -esac diff --git a/openwrt-app-actions/applications/luci-app-mymind/Makefile b/openwrt-app-actions/applications/luci-app-mymind/Makefile deleted file mode 100644 index 9b2d93071..000000000 --- a/openwrt-app-actions/applications/luci-app-mymind/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -include $(TOPDIR)/rules.mk - -PKG_VERSION:=1.0.1-20221119 -PKG_RELEASE:= -PKG_MAINTAINER:=xiaobao - -LUCI_TITLE:=LuCI support for mymind -LUCI_DESCRIPTION:=all - -LUCI_PKGARCH:=all - -include $(TOPDIR)/feeds/luci/luci.mk - -# call BuildPackage - OpenWrt buildroot signature - diff --git a/openwrt-app-actions/applications/luci-app-mymind/luasrc/controller/mymind.lua b/openwrt-app-actions/applications/luci-app-mymind/luasrc/controller/mymind.lua deleted file mode 100755 index a9c24132a..000000000 --- a/openwrt-app-actions/applications/luci-app-mymind/luasrc/controller/mymind.lua +++ /dev/null @@ -1,7 +0,0 @@ - -module("luci.controller.mymind", package.seeall) - -function index() - entry({"admin", "services", "mymind"}, alias("admin", "services", "mymind", "config"), _("MyMind"), 30).dependent = true - entry({"admin", "services", "mymind", "config"}, cbi("mymind")) -end diff --git a/openwrt-app-actions/applications/luci-app-mymind/luasrc/model/cbi/mymind.lua b/openwrt-app-actions/applications/luci-app-mymind/luasrc/model/cbi/mymind.lua deleted file mode 100644 index 61379f8b7..000000000 --- a/openwrt-app-actions/applications/luci-app-mymind/luasrc/model/cbi/mymind.lua +++ /dev/null @@ -1,16 +0,0 @@ ---[[ -LuCI - Lua Configuration Interface -]]-- - -local taskd = require "luci.model.tasks" -local m, s - -m = Map("mymind", - translate("MyMind"), - translate("MyMind is mind editor.") - .. translate("Official website:") .. ' https://github.com/ondras/my-mind') - -s = m:section(SimpleSection, translate("MyMind Web"), translate("MyMind Web:")) -s:append(Template("mymind/status")) - -return m diff --git a/openwrt-app-actions/applications/luci-app-mymind/luasrc/view/mymind/status.htm b/openwrt-app-actions/applications/luci-app-mymind/luasrc/view/mymind/status.htm deleted file mode 100644 index 49cd7f706..000000000 --- a/openwrt-app-actions/applications/luci-app-mymind/luasrc/view/mymind/status.htm +++ /dev/null @@ -1,7 +0,0 @@ -
- -
- -
-
- diff --git a/openwrt-app-actions/applications/luci-app-mymind/po/zh-cn/mymind.po b/openwrt-app-actions/applications/luci-app-mymind/po/zh-cn/mymind.po deleted file mode 100644 index 4c9eebd0d..000000000 --- a/openwrt-app-actions/applications/luci-app-mymind/po/zh-cn/mymind.po +++ /dev/null @@ -1,14 +0,0 @@ -msgid "" -msgstr "Content-Type: text/plain; charset=UTF-8" - -msgid "Official website:" -msgstr "官方网站：" - -msgid "MyMind is mind editor." -msgstr "MyMind 是一个在线思维导图编辑器。" - -msgid "Open MyMind" -msgstr "打开 MyMind" - -msgid "MyMind Web" -msgstr "MyMind 网页" diff --git a/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/LICENSE.txt b/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/LICENSE.txt deleted file mode 100644 index 10d22c19e..000000000 --- a/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/LICENSE.txt +++ /dev/null @@ -1,20 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2013-2019 Ondrej Zara - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -the Software, and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 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. diff --git a/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/PRIVACY.txt b/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/PRIVACY.txt deleted file mode 100644 index 5ee241773..000000000 --- a/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/PRIVACY.txt +++ /dev/null @@ -1,8 +0,0 @@ -Privacy Policy -============== - -This application can be configured to use Google Drive as a storage option for Mind Map design files. If you decide to do so, please note that My Mind will have a theoretical access to all your Google Drive files. - -This application, however, only saves/loads those files that are explicitely requested by the user via My Mind's User Interface. - -This application is not accessing, reading, writing, modifying or deleting other kinds of data. In particular, user data and metadata (information about the user logged into the Google ecosystem) is never accessed. diff --git a/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/README.md b/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/README.md deleted file mode 100644 index d1b09300d..000000000 --- a/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/README.md +++ /dev/null @@ -1,37 +0,0 @@ -# My Mind - -![Screenshot](screenshot.png) - -My Mind is a web application for creating and managing Mind maps. It is free to use and you can fork its source code. It is distributed under the terms of the MIT license. - -New to Mind maps? They are useful, aesthetic and cool! Read more about these special diagrams in [the Wikipedia article](http://en.wikipedia.org/wiki/Mind_map). - -* [Official web page](http://my-mind.github.io/) -* [Sample mind map](http://my-mind.github.io/?map=examples/features.mymind) showcasing many features -* [News / Changelog](https://github.com/ondras/my-mind/wiki/News) -* [Documentation](https://github.com/ondras/my-mind/wiki) -* Donate - -## Installation -Note: there is also an online version, which can be found at [my-mind.github.io](http://my-mind.github.io/) - -* Download the zip by clicking [here](archive/master.zip) and extract the archive, or clone the repository using git -* Open index.html in your webbrowser -* Done! If need be, you can find the manual [here](https://github.com/ondras/my-mind/wiki) - -## Contributing - -Do you want to participate? - -* Found a bug? [Open an issue.](https://github.com/ondras/my-mind/issues) -* Not sure how to do stuff? [Check the docs.](https://github.com/ondras/my-mind/wiki) -* Have a feature request? [Open an issue.](https://github.com/ondras/my-mind/issues) -* Have an improvement? [Submit a pull request.](https://github.com/ondras/my-mind/pulls) - -## License -[MIT](LICENSE.txt) - -## Links - -* [cdnjs](https://nobige.cn/post/20191116-qian_duan_cdn_zheng_li_he_ji/) - diff --git a/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/css/font.css b/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/css/font.css deleted file mode 100644 index 53f5d7b6b..000000000 --- a/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/css/font.css +++ /dev/null @@ -1,6 +0,0 @@ -@font-face { - font-family: source sans pro; - src: url(data:application/font-woff;charset=utf-8;base64,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) format('woff'); - font-weight: normal; - font-style: normal; -} diff --git a/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/css/item.css b/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/css/item.css deleted file mode 100644 index 0fc1de53d..000000000 --- a/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/css/item.css +++ /dev/null @@ -1,121 +0,0 @@ -.item { - position: absolute; -} - -.item.cut { - opacity: 0.5; -} - -.item.collapsed .children { - display: none; -} - -.content { - position: relative; - display: inline-block; - white-space: nowrap; - cursor: pointer; -} - -.content > * { - vertical-align: middle; -} - -.text { - display: inline-block; - text-align: center; - min-width: 0.5em; - min-height: 1.3em; - line-height: 1.3em; - outline: none; -} - -.value, .status { - margin-right: 0.2em; -} - -.text ~ .value, .text ~ .status { - margin-left: 0.2em; - margin-right: 0; -} - -.value { - opacity: 0.7; -} - -.value:not(:empty):before { - content: "("; -} - -.value:not(:empty):after { - content: ")"; -} - -.status { - font-size: 150%; - line-height: 0.8; -} - -.status.yes:after { - content: "✔"; - color: #0f0; -} - -.status.no:after { - content: "✘"; - color: #f00; -} - -canvas { - position: absolute; - left: 0; - top: 0; -} - -.notes-indicator { - width: 16px; - height: 100%; - background: url("../icons/notes-indicator.png") right center no-repeat; - position: absolute; - top: -8px; - right: 0; - opacity: 0.4; - display: none; -} - -.notes-indicator-visible { - display: block; -} - -.toggle { - position: absolute; - width: 12px; - height: 12px; - line-height: 12px; - cursor: pointer; - border-radius: 50%; - border: 1px solid #00f; - background-color: #88f; - text-align: center; - font-weight: bold; - font-family: sans-serif; - color: #fff; - opacity: 0.7; -} - -.toggle:hover { - opacity: 1; -} - -.toggle:before { - content: "−"; -} - -.collapsed > .toggle:before { - content: "+"; -} - -:not(.current):not(.collapsed) > .toggle { - /* NOT display:none - we need to have non-zero dimensions for layouting */ - visibility: hidden; -} diff --git a/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/css/menu.css b/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/css/menu.css deleted file mode 100644 index 567aa55d3..000000000 --- a/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/css/menu.css +++ /dev/null @@ -1,33 +0,0 @@ -#menu { - position: absolute; - z-index: 1; - border: 1px solid #666; - background-color: #fff; - box-shadow: 0 0 2px 1px #666; -} - -#menu button { - display: block; - background-color: transparent; - border: none; - margin: 0; - padding: 3px 6px; - font-size: 15px; - width: 130px; - text-align: left; -} - -#menu button:hover { - font-weight: bold; -} - -#menu span { - display: block; - border-top: 1px solid #666; - margin-top: 4px; - padding-top: 4px; -} - -#menu .ui select.fa-select, .ui select.fa-select option { - font-size: 13px; -} diff --git a/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/css/print.css b/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/css/print.css deleted file mode 100644 index 9ddca3512..000000000 --- a/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/css/print.css +++ /dev/null @@ -1,7 +0,0 @@ -.ui, #toggle, #tip { - display: none; -} - -#port > .item { - position: static; -} diff --git a/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/css/shape.css b/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/css/shape.css deleted file mode 100644 index aa21a84fd..000000000 --- a/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/css/shape.css +++ /dev/null @@ -1,43 +0,0 @@ -.shape-box > .content { - padding: 0.15em 0.4em; - background-color: #fff; - border: 1px solid #666; - border-radius: 3px; -} - -.shape-ellipse > .content { - background-color: #fff; - border: 1px solid #666; - border-radius: 50%; - padding: 0.5em 1em; -} - -/* current */ - -.current > .content { - background-color: rgba(255, 255, 187, 0.9); -} - -/* root */ - -#port > .item > .content { - font-weight: bold; - border-width: 2px; - font-size: 140%; -} - -#port > .item > .toggle { - display: none; -} - -/* 1st children */ - -#port > .item > .children > .item > .content { - border-width: 2px; - font-size: 120%; -} - -.item .icon { - margin: 0 0.5em 0 0; - font-size: x-large; -} diff --git a/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/css/style.css b/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/css/style.css deleted file mode 100644 index a5a32854c..000000000 --- a/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/css/style.css +++ /dev/null @@ -1,73 +0,0 @@ -@import url(ui.css); -@import url(item.css); -@import url(shape.css); -@import url(menu.css); - -* { - font-family: source sans pro, sans-serif; -} - -html, body { - margin: 0; - overflow: hidden; - height: 100%; - background-color: #eed; - -webkit-user-select: none; /* no magnifier on hold */ -} - -[contenteditable] { /* allow for editable items */ - -webkit-user-select: auto; -} - -ul { - margin: 0; - padding: 0; - list-style: none; -} - -#port { - overflow: hidden; - font-size: 15px; -} - -#throbber { - position: absolute; - top: 50px; - left: -60px; - width: 50px; - height: 50px; - background-image: url(throbber.gif); -} - -#throbber:not(.visible) { - opacity: 0; -} - -.ghost { - position: absolute !important; /* to prevent collision with .content */ - opacity: 0.5; - z-index: 1; -} - -#tip { - position: fixed; - z-index: 1; - left: 10px; - bottom: 5px; - transition: all 500ms; - font-size: 1rem; /* do not scale with map zoom */ -} - -#tip:before { - content: "Tip: "; -} - -#tip code { - padding: 0 4px; - border-radius: 4px; - background-color: rgba(0, 0, 0, 0.1); -} - -#tip.hidden { - opacity: 0; -} diff --git a/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/css/throbber.gif b/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/css/throbber.gif deleted file mode 100644 index ac8353239..000000000 Binary files a/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/css/throbber.gif and /dev/null differ diff --git a/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/css/ui.css b/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/css/ui.css deleted file mode 100644 index fb447ebe5..000000000 --- a/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/css/ui.css +++ /dev/null @@ -1,226 +0,0 @@ -button:not(:disabled) { - cursor: pointer; -} - -.ui { - position: fixed; - right: 0; - top: 0; - height: 100%; - background-color: #fff; - width: 200px; - max-width: 600px; - box-shadow: 0 0 2px 2px #666; - -webkit-transition: -webkit-transform 500ms; - transition: transform 500ms; -} - -.ui:not(.visible) { - -webkit-transform: translate(100%, 0); - transform: translate(100%, 0); -} - -.ui h3 { - background-color: #34495e; - color: #fff; - padding: 0.2em 0; - margin: 0; - text-transform: capitalize; - text-align: center; -} - -.ui select, .ui input { - background-color: transparent; - border: 1px solid rgba(50, 70, 90, 0.5); - font-size: 13px; - border-radius: 4px; - padding: 4px; - -moz-box-sizing: border-box; - box-sizing: border-box; - -webkit-font-smoothing: subpixel-antialiased; - transition: all 250ms linear; -} - -.ui select:hover, .ui input:hover, .ui select:focus, .ui input:focus { - border-color: rgba(50, 70, 90, 1); -} - -.ui select, .ui input, .ui #color { - width: 168px; -} - -.ui .go { - font-weight: bold; -} - -.ui p { - margin: 8px 16px; -} - -.ui p.desc { - font-size: 13px; -} - -.ui:not([id]) button { - border: none; - padding: 0; - margin: 0 4px; - background-color: transparent; - width: 32px; -} - -.ui button:first-child { - margin-left: 0 !important; -} - -.ui button:last-child { - margin-right: 0 !important; -} - -.ui button[data-command=Help] { - position: absolute; - left: -50px; - top: 5px; -} - -.ui button[data-command=Notes] { - position: absolute; - left: -90px; - top: 5px; -} - -.ui table { - width: 100%; - border-collapse: collapse; -} - -.ui table td:first-child { - padding-left: 16px; -} - -.ui table td:last-child { - text-align: right; - padding-right: 16px; -} - -.ui span { - text-transform: uppercase; - font-size: 80%; -} - -.ui #color { - display: block; -} - -.ui #color::after { - clear: both; - content: ""; - display: block; -} - -.ui [data-color] { - display: block; - float: left; - width: 14px; - height: 14px; - border-radius: 3px; - margin-right: 2px; - border: 1px solid transparent; -} - -.ui [data-color]:hover, .ui [data-color]:first-child { - border-color: #000; -} - -#notes { - width: 50%; -} - -#notes-editor { - border: 0; - width: 100%; - height: 100%; -} - -.pell-content { - height: calc(100% - 60px); -} - -.ui #github { - position: absolute; - right: 8px; - bottom: 6px; -} - -.ui #github img { - vertical-align: middle; -} - -.ui #privacy { - position: absolute; - left: 8px; - bottom: 6px; -} - -.ui #toggle { - z-index: 999; - position: absolute; - left: -23px; - top: 48%; - width: 35px; - height: 35px; - padding: 0 0 0 2px; - text-align: left; - - border: none; - background-color: #fff; - box-shadow: -3px 0 2px 0px #666; - - line-height: 8px; - border-radius: 50%; -} - -.ui #toggle:after { - content: "←"; - font-weight: bold; - font-size: 22px; -} - -.ui.visible #toggle:after { - content: "→"; -} - -.ui#help { - overflow-y: auto; - right: auto; - left: 0; - background-color: rgba(255, 255, 255, 0.7); - width: 250px; -} - -.ui#help:not(.visible) { - -webkit-transform: translate(-100%, 0); - transform: translate(-100%, 0); -} - -.ui#help table { - font-size: 80%; -} - -.ui#io button { - width: 45%; -} - -.ui#io button:nth-child(odd) { - float: left; -} - -.ui#io button:nth-child(even) { - float: right; -} - -.ui select.fa-select , -.ui select.fa-select option { - font-family: fontAwesome; - font-size: x-large; -} diff --git a/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/editor.html b/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/editor.html deleted file mode 100644 index 9aa37bf28..000000000 --- a/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/editor.html +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - - - - -
- - - - diff --git a/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/favicon.ico b/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/favicon.ico deleted file mode 100644 index df5920ef3..000000000 Binary files a/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/favicon.ico and /dev/null differ diff --git a/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/github.png b/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/github.png deleted file mode 100644 index 8b25551a9..000000000 Binary files a/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/github.png and /dev/null differ diff --git a/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/icons/help.png b/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/icons/help.png deleted file mode 100644 index 9d312adb4..000000000 Binary files a/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/icons/help.png and /dev/null differ diff --git a/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/icons/new.png b/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/icons/new.png deleted file mode 100644 index 3092571e1..000000000 Binary files a/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/icons/new.png and /dev/null differ diff --git a/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/icons/notes-indicator.png b/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/icons/notes-indicator.png deleted file mode 100644 index bac7ccfc9..000000000 Binary files a/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/icons/notes-indicator.png and /dev/null differ diff --git a/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/icons/notes.png b/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/icons/notes.png deleted file mode 100644 index d8399a09a..000000000 Binary files a/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/icons/notes.png and /dev/null differ diff --git a/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/icons/open.png b/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/icons/open.png deleted file mode 100644 index 8ba54411c..000000000 Binary files a/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/icons/open.png and /dev/null differ diff --git a/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/icons/save-as.png b/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/icons/save-as.png deleted file mode 100644 index 9695a5642..000000000 Binary files a/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/icons/save-as.png and /dev/null differ diff --git a/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/icons/save.png b/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/icons/save.png deleted file mode 100644 index 7fa489c0f..000000000 Binary files a/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/icons/save.png and /dev/null differ diff --git a/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/index.html b/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/index.html deleted file mode 100644 index 26826e377..000000000 --- a/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/index.html +++ /dev/null @@ -1,1053 +0,0 @@ - - - - - - My Mind - - - - - - - - - - - - - - -
    -
    Type :screenshot --selector .item in Firefox Console to save the Map as an image! For more tips/news, follow @my_mind_app.
    - -
- -
-

My Mind

-

- - - - -

- -

- Layout - -

-

- Shape - -

-

- Value - -

-

- Status - -

-

- Color - - - - - - - - - - - -

- -

- Icons - -

- - GitHub project page - Privacy policy - - - - -
-
- - -
-

-

- Storage - -

- -
-

Local files are suitable for loading/saving files from other mindmapping applications.

-

- Format - -

-

- -

-
- -
-

Export your design as a PNG image.

-

- -

-
- -
-

Your browser's localStorage can handle many mind maps and creates a permalink, but this URL cannot be shared.

-

- Saved maps - -

-

- -

-

- -

-
- -
-

Firebase offers real-time synchronization for true multi-user collaboration.

-

- Server - -

-

- Auth - -

-

- Saved maps - -

-

- -

-

- -

-
- -
-

Use this to access a generic DAV-like REST API.

-

- URL - -

-

- -

-
- -
-

Maps stored in Google Drive have a permalink URL and can be shared with other users, if you allow this by setting proper permissions (inside Google Drive itself).

-

- Format - -

-

- -

-
-
- -
-

Help

- -

Navigation

-
- -

Manipulation

-
- -

Editing

-
- -

Other

-
-
- -
-

Topic Notes

- -
- - - - - - - - diff --git a/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/logo/logo.svg b/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/logo/logo.svg deleted file mode 100644 index 9c306d187..000000000 --- a/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/logo/logo.svg +++ /dev/null @@ -1,365 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/logo/logo128.png b/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/logo/logo128.png deleted file mode 100644 index 4036351ae..000000000 Binary files a/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/logo/logo128.png and /dev/null differ diff --git a/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/logo/logo16.png b/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/logo/logo16.png deleted file mode 100644 index 4cb471a69..000000000 Binary files a/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/logo/logo16.png and /dev/null differ diff --git a/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/logo/logo256.png b/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/logo/logo256.png deleted file mode 100644 index 88928958e..000000000 Binary files a/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/logo/logo256.png and /dev/null differ diff --git a/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/logo/logo32.png b/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/logo/logo32.png deleted file mode 100644 index 2e1dd5e25..000000000 Binary files a/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/logo/logo32.png and /dev/null differ diff --git a/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/logo/logo64.png b/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/logo/logo64.png deleted file mode 100644 index 1a3cef928..000000000 Binary files a/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/logo/logo64.png and /dev/null differ diff --git a/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/my-mind.js b/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/my-mind.js deleted file mode 100644 index 046a2a65e..000000000 --- a/openwrt-app-actions/applications/luci-app-mymind/root/www/luci-static/mymind/my-mind.js +++ /dev/null @@ -1,5412 +0,0 @@ -/* My Mind web app: all source files combined. */ -if (!Function.prototype.bind) { - Function.prototype.bind = function(thisObj) { - var fn = this; - var args = Array.prototype.slice.call(arguments, 1); - return function() { - return fn.apply(thisObj, args.concat(Array.prototype.slice.call(arguments))); - } - } -}; - -var MM = { - _subscribers: {}, - - publish: function(message, publisher, data) { - var subscribers = this._subscribers[message] || []; - subscribers.forEach(function(subscriber) { - subscriber.handleMessage(message, publisher, data); - }); - }, - - subscribe: function(message, subscriber) { - if (!(message in this._subscribers)) { - this._subscribers[message] = []; - } - var index = this._subscribers[message].indexOf(subscriber); - if (index == -1) { this._subscribers[message].push(subscriber); } - }, - - unsubscribe: function(message, subscriber) { - var index = this._subscribers[message].indexOf(subscriber); - if (index > -1) { this._subscribers[message].splice(index, 1); } - }, - - generateId: function() { - var str = ""; - for (var i=0;i<8;i++) { - var code = Math.floor(Math.random()*26); - str += String.fromCharCode("a".charCodeAt(0) + code); - } - return str; - }, - - isMac: function() { - return !!navigator.platform.match(/mac/i); - } -}; -/* - Any copyright is dedicated to the Public Domain. - http://creativecommons.org/publicdomain/zero/1.0/ -*/ - -/** - * @class A promise - value to be resolved in the future. - * Implements the "Promises/A+" specification. - */ -var Promise = function(executor) { - this._state = 0; /* 0 = pending, 1 = fulfilled, 2 = rejected */ - this._value = null; /* fulfillment / rejection value */ - - this._cb = { - fulfilled: [], - rejected: [] - } - - this._thenPromises = []; /* promises returned by then() */ - - executor && executor(this.fulfill.bind(this), this.reject.bind(this)); -} - -Promise.resolve = function(value) { - return new Promise().fulfill(value); -} - -Promise.reject = function(value) { - return new Promise().reject(value); -} - -/** - * @param {function} onFulfilled To be called once this promise gets fulfilled - * @param {function} onRejected To be called once this promise gets rejected - * @returns {Promise} - */ -Promise.prototype.then = function(onFulfilled, onRejected) { - this._cb.fulfilled.push(onFulfilled); - this._cb.rejected.push(onRejected); - - var thenPromise = new Promise(); - - this._thenPromises.push(thenPromise); - - if (this._state > 0) { - setTimeout(this._processQueue.bind(this), 0); - } - - /* 3.2.6. then must return a promise. */ - return thenPromise; -} - -/** - * Fulfill this promise with a given value - * @param {any} value - */ -Promise.prototype.fulfill = function(value) { - if (this._state != 0) { return this; } - - this._state = 1; - this._value = value; - - this._processQueue(); - - return this; -} - -/** - * Reject this promise with a given value - * @param {any} value - */ -Promise.prototype.reject = function(value) { - if (this._state != 0) { return this; } - - this._state = 2; - this._value = value; - - this._processQueue(); - - return this; -} - -/** - * Pass this promise's resolved value to another promise - * @param {Promise} promise - */ -Promise.prototype.chain = function(promise) { - return this.then(promise.fulfill.bind(promise), promise.reject.bind(promise)); -} - -/** - * @param {function} onRejected To be called once this promise gets rejected - * @returns {Promise} - */ -Promise.prototype["catch"] = function(onRejected) { - return this.then(null, onRejected); -} - -Promise.prototype._processQueue = function() { - while (this._thenPromises.length) { - var onFulfilled = this._cb.fulfilled.shift(); - var onRejected = this._cb.rejected.shift(); - this._executeCallback(this._state == 1 ? onFulfilled : onRejected); - } -} - -Promise.prototype._executeCallback = function(cb) { - var thenPromise = this._thenPromises.shift(); - - if (typeof(cb) != "function") { - if (this._state == 1) { - /* 3.2.6.4. If onFulfilled is not a function and promise1 is fulfilled, promise2 must be fulfilled with the same value. */ - thenPromise.fulfill(this._value); - } else { - /* 3.2.6.5. If onRejected is not a function and promise1 is rejected, promise2 must be rejected with the same reason. */ - thenPromise.reject(this._value); - } - return; - } - - try { - var returned = cb(this._value); - - if (returned && typeof(returned.then) == "function") { - /* 3.2.6.3. If either onFulfilled or onRejected returns a promise (call it returnedPromise), promise2 must assume the state of returnedPromise */ - var fulfillThenPromise = function(value) { thenPromise.fulfill(value); } - var rejectThenPromise = function(value) { thenPromise.reject(value); } - returned.then(fulfillThenPromise, rejectThenPromise); - } else { - /* 3.2.6.1. If either onFulfilled or onRejected returns a value that is not a promise, promise2 must be fulfilled with that value. */ - thenPromise.fulfill(returned); - } - - } catch (e) { - - /* 3.2.6.2. If either onFulfilled or onRejected throws an exception, promise2 must be rejected with the thrown exception as the reason. */ - thenPromise.reject(e); - - } -} -/** - * Wait for all these promises to complete. One failed => this fails too. - */ -Promise.all = Promise.when = function(all) { - var promise = new this(); - var counter = 0; - var results = []; - - for (var i=0;i\(\)\[\]'"])?($|\b)/i; - -MM.Item.fromJSON = function(data) { - return new this().fromJSON(data); -} - -MM.Item.prototype.toJSON = function() { - var data = { - id: this._id, - text: this.getText(), - notes: this.getNotes() - } - - - if (this._side) { data.side = this._side; } - if (this._color) { data.color = this._color; } - if (this._icon) { data.icon = this._icon; } - if (this._value) { data.value = this._value; } - if (this._status) { data.status = this._status; } - if (this._layout) { data.layout = this._layout.id; } - if (!this._autoShape) { data.shape = this._shape.id; } - if (this._collapsed) { data.collapsed = 1; } - if (this._children.length) { - data.children = this._children.map(function(child) { return child.toJSON(); }); - } - - return data; -} - -/** - * Only when creating a new item. To merge existing items, use .mergeWith(). - */ -MM.Item.prototype.fromJSON = function(data) { - this.setText(data.text); - if (data.notes) { - this.setNotes(data.notes); - } - if (data.id) { this._id = data.id; } - if (data.side) { this._side = data.side; } - if (data.color) { this._color = data.color; } - if (data.icon) { this._icon = data.icon; } - if (data.value) { this._value = data.value; } - if (data.status) { - this._status = data.status; - if (this._status == "maybe") { this._status = "computed"; } - } - if (data.collapsed) { this.collapse(); } - if (data.layout) { this._layout = MM.Layout.getById(data.layout); } - if (data.shape) { this.setShape(MM.Shape.getById(data.shape)); } - - (data.children || []).forEach(function(child) { - this.insertChild(MM.Item.fromJSON(child)); - }, this); - - return this; -} - -MM.Item.prototype.mergeWith = function(data) { - var dirty = 0; - - if (this.getText() != data.text && !this._dom.text.contentEditable) { this.setText(data.text); } - - if (this._side != data.side) { - this._side = data.side; - dirty = 1; - } - - if (this._color != data.color) { - this._color = data.color; - dirty = 2; - } - - if (this._icon != data.icon) { - this._icon = data.icon; - dirty = 1; - } - - if (this._value != data.value) { - this._value = data.value; - dirty = 1; - } - - if (this._status != data.status) { - this._status = data.status; - dirty = 1; - } - - if (this._collapsed != !!data.collapsed) { this[this._collapsed ? "expand" : "collapse"](); } - - if (this.getOwnLayout() != data.layout) { - this._layout = MM.Layout.getById(data.layout); - dirty = 2; - } - - var s = (this._autoShape ? null : this._shape.id); - if (s != data.shape) { this.setShape(MM.Shape.getById(data.shape)); } - - (data.children || []).forEach(function(child, index) { - if (index >= this._children.length) { /* new child */ - this.insertChild(MM.Item.fromJSON(child)); - } else { /* existing child */ - var myChild = this._children[index]; - if (myChild.getId() == child.id) { /* recursive merge */ - myChild.mergeWith(child); - } else { /* changed; replace */ - this.removeChild(this._children[index]); - this.insertChild(MM.Item.fromJSON(child), index); - } - } - }, this); - - /* remove dead children */ - var newLength = (data.children || []).length; - while (this._children.length > newLength) { this.removeChild(this._children[this._children.length-1]); } - - if (dirty == 1) { this.update(); } - if (dirty == 2) { this.updateSubtree(); } -} - -MM.Item.prototype.clone = function() { - var data = this.toJSON(); - - var removeId = function(obj) { - delete obj.id; - obj.children && obj.children.forEach(removeId); - } - removeId(data); - - return this.constructor.fromJSON(data); -} - -MM.Item.prototype.select = function() { - this._dom.node.classList.add("current"); - if (window.editor) { - if (this._notes) { - window.editor.setContent(this._notes); - } else { - window.editor.setContent(''); - } - } - this.getMap().ensureItemVisibility(this); - MM.Clipboard.focus(); /* going to mode 2c */ - MM.publish("item-select", this); -} - -MM.Item.prototype.deselect = function() { - /* we were in 2b; finish that via 3b */ - if (MM.App.editing) { MM.Command.Finish.execute(); } - this._dom.node.classList.remove("current"); -} - -MM.Item.prototype.update = function(doNotRecurse) { - var map = this.getMap(); - if (!map || !map.isVisible()) { return this; } - - MM.publish("item-change", this); - - if (this._autoShape) { /* check for changed auto-shape */ - var autoShape = this._getAutoShape(); - if (autoShape != this._shape) { - if (this._shape) { this._shape.unset(this); } - this._shape = autoShape; - this._shape.set(this); - } - } - - this._updateStatus(); - this._updateIcon(); - this._updateNotesIndicator(); - this._updateValue(); - - this._dom.node.classList[this._collapsed ? "add" : "remove"]("collapsed"); - - this.getLayout().update(this); - this.getShape().update(this); - if (!this.isRoot() && !doNotRecurse) { this._parent.update(); } - - return this; -} - -MM.Item.prototype.updateSubtree = function(isSubChild) { - this._children.forEach(function(child) { - child.updateSubtree(true); - }); - return this.update(isSubChild); -} - -MM.Item.prototype.setText = function(text) { - this._dom.text.innerHTML = text; - this._findLinks(this._dom.text); - return this.update(); -} - -MM.Item.prototype.setNotes = function(notes) { - this._notes = notes; - return this.update(); -} - -MM.Item.prototype.getId = function() { - return this._id; -} - -MM.Item.prototype.getText = function() { - return this._dom.text.innerHTML; -} - -MM.Item.prototype.getNotes = function() { - return this._notes; -} - -MM.Item.prototype.collapse = function() { - if (this._collapsed) { return; } - this._collapsed = true; - return this.update(); -} - -MM.Item.prototype.expand = function() { - if (!this._collapsed) { return; } - this._collapsed = false; - this.update(); - return this.updateSubtree(); -} - -MM.Item.prototype.isCollapsed = function() { - return this._collapsed; -} - -MM.Item.prototype.setValue = function(value) { - this._value = value; - return this.update(); -} - -MM.Item.prototype.getValue = function() { - return this._value; -} - -MM.Item.prototype.getComputedValue = function() { - return this._computed.value; -} - -MM.Item.prototype.setStatus = function(status) { - this._status = status; - return this.update(); -} - -MM.Item.prototype.getStatus = function() { - return this._status; -} - -MM.Item.prototype.setIcon = function(icon) { - this._icon = icon; - return this.update(); -} - -MM.Item.prototype.getIcon = function() { - return this._icon; -} - -MM.Item.prototype.getComputedStatus = function() { - return this._computed.status; -} - -MM.Item.prototype.setSide = function(side) { - this._side = side; - return this; -} - -MM.Item.prototype.getSide = function() { - return this._side; -} - -MM.Item.prototype.getChildren = function() { - return this._children; -} - -MM.Item.prototype.setColor = function(color) { - this._color = color; - return this.updateSubtree(); -} - -MM.Item.prototype.getColor = function() { - return this._color || (this.isRoot() ? MM.Item.COLOR : this._parent.getColor()); -} - -MM.Item.prototype.getOwnColor = function() { - return this._color; -} - -MM.Item.prototype.getLayout = function() { - return this._layout || this._parent.getLayout(); -} - -MM.Item.prototype.getOwnLayout = function() { - return this._layout; -} - -MM.Item.prototype.setLayout = function(layout) { - this._layout = layout; - return this.updateSubtree(); -} - -MM.Item.prototype.getShape = function() { - return this._shape; -} - -MM.Item.prototype.getOwnShape = function() { - return (this._autoShape ? null : this._shape); -} - -MM.Item.prototype.setShape = function(shape) { - if (this._shape) { this._shape.unset(this); } - - if (shape) { - this._autoShape = false; - this._shape = shape; - } else { - this._autoShape = true; - this._shape = this._getAutoShape(); - } - - this._shape.set(this); - return this.update(); -} - -MM.Item.prototype.getDOM = function() { - return this._dom; -} - -MM.Item.prototype.getMap = function() { - var item = this._parent; - while (item) { - if (item instanceof MM.Map) { return item; } - item = item.getParent(); - } - return null; -} - -MM.Item.prototype.getParent = function() { - return this._parent; -} - -MM.Item.prototype.isRoot = function() { - return (this._parent instanceof MM.Map); -} - -MM.Item.prototype.setParent = function(parent) { - this._parent = parent; - return this.updateSubtree(); -} - -MM.Item.prototype.insertChild = function(child, index) { - /* Create or remove child as necessary. This must be done before computing the index (inserting own child) */ - var newChild = false; - if (!child) { - child = new MM.Item(); - newChild = true; - } else if (child.getParent() && child.getParent().removeChild) { /* only when the child has non-map parent */ - child.getParent().removeChild(child); - } - - if (!this._children.length) { - this._dom.node.appendChild(this._dom.toggle); - this._dom.node.appendChild(this._dom.children); - } - - if (arguments.length < 2) { index = this._children.length; } - - var next = null; - if (index < this._children.length) { next = this._children[index].getDOM().node; } - this._dom.children.insertBefore(child.getDOM().node, next); - this._children.splice(index, 0, child); - - return child.setParent(this); -} - -MM.Item.prototype.removeChild = function(child) { - var index = this._children.indexOf(child); - this._children.splice(index, 1); - var node = child.getDOM().node; - node.parentNode.removeChild(node); - - child.setParent(null); - - if (!this._children.length) { - this._dom.toggle.parentNode.removeChild(this._dom.toggle); - this._dom.children.parentNode.removeChild(this._dom.children); - } - - return this.update(); -} - -MM.Item.prototype.startEditing = function() { - this._oldText = this.getText(); - this._dom.text.contentEditable = true; - this._dom.text.focus(); /* switch to 2b */ - document.execCommand("styleWithCSS", null, false); - - this._dom.text.addEventListener("input", this); - this._dom.text.addEventListener("keydown", this); - this._dom.text.addEventListener("blur", this); - return this; -} - -MM.Item.prototype.stopEditing = function() { - this._dom.text.removeEventListener("input", this); - this._dom.text.removeEventListener("keydown", this); - this._dom.text.removeEventListener("blur", this); - - this._dom.text.blur(); - this._dom.text.contentEditable = false; - var result = this._dom.text.innerHTML; - this._dom.text.innerHTML = this._oldText; - this._oldText = ""; - - this.update(); /* text changed */ - - MM.Clipboard.focus(); - - return result; -} - -MM.Item.prototype.handleEvent = function(e) { - switch (e.type) { - case "input": - this.update(); - this.getMap().ensureItemVisibility(this); - break; - - case "keydown": - if (e.keyCode == 9) { e.preventDefault(); } /* TAB has a special meaning in this app, do not use it to change focus */ - break; - - case "blur": /* 3d */ - MM.Command.Finish.execute(); - break; - - case "click": - if (this._collapsed) { this.expand(); } else { this.collapse(); } - MM.App.select(this); - break; - } -} - -MM.Item.prototype._getAutoShape = function() { - var depth = 0; - var node = this; - while (!node.isRoot()) { - depth++; - node = node.getParent(); - } - switch (depth) { - case 0: return MM.Shape.Ellipse; - case 1: return MM.Shape.Box; - default: return MM.Shape.Underline; - } -} - -MM.Item.prototype._updateStatus = function() { - this._dom.status.className = "status"; - this._dom.status.style.display = ""; - - var status = this._status; - if (this._status == "computed") { - var childrenStatus = this._children.every(function(child) { - return (child.getComputedStatus() !== false); - }); - status = (childrenStatus ? "yes" : "no"); - } - - switch (status) { - case "yes": - this._dom.status.classList.add("yes"); - this._computed.status = true; - break; - - case "no": - this._dom.status.classList.add("no"); - this._computed.status = false; - break; - - default: - this._computed.status = null; - this._dom.status.style.display = "none"; - break; - } -} -MM.Item.prototype._updateIcon = function() { - this._dom.icon.className = "icon"; - this._dom.icon.style.display = ""; - - var icon = this._icon; - if (icon) - { - this._dom.icon.classList.add('fa'); - this._dom.icon.classList.add(icon); - this._computed.icon = true; - } else { - this._computed.icon = null; - this._dom.icon.style.display = "none"; - } -} - -MM.Item.prototype._updateNotesIndicator = function() { - if (this._notes) - { - this._dom.notes.classList.add("notes-indicator-visible"); - } else { - this._dom.notes.classList.remove("notes-indicator-visible"); - } -} - -MM.Item.prototype._updateValue = function() { - this._dom.value.style.display = ""; - - if (typeof(this._value) == "number") { - this._computed.value = this._value; - this._dom.value.innerHTML = this._value; - return; - } - - var childValues = this._children.map(function(child) { - return child.getComputedValue(); - }); - - var result = 0; - switch (this._value) { - case "sum": - result = childValues.reduce(function(prev, cur) { - return prev+cur; - }, 0); - break; - - case "avg": - var sum = childValues.reduce(function(prev, cur) { - return prev+cur; - }, 0); - result = (childValues.length ? sum/childValues.length : 0); - break; - - case "max": - result = Math.max.apply(Math, childValues); - break; - - case "min": - result = Math.min.apply(Math, childValues); - break; - - default: - this._computed.value = 0; - this._dom.value.innerHTML = ""; - this._dom.value.style.display = "none"; - return; - break; - } - - this._computed.value = result; - this._dom.value.innerHTML = (Math.round(result) == result ? result : result.toFixed(3)); -} - -MM.Item.prototype._findLinks = function(node) { - - var children = [].slice.call(node.childNodes); - for (var i=0;i