diff --git a/.gitignore b/.gitignore index 220964c..fd1c323 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ *.gin # Do not initialize twice .prepared +*.vrb diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 54384d3..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "meta"] - path = meta - url = https://github.com/uniba-ktr/TeXMeta.git diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml new file mode 100644 index 0000000..b0c40dc --- /dev/null +++ b/docker/docker-compose.yml @@ -0,0 +1,19 @@ +version: "3" + +services: + esp: + image: iot.wiai:1337/esp8266 + build: ./esp + volumes: + - /dev/ttyUSB0:/dev/ttyUSB0 + env: + - PORT=/dev/ttyUSB0 + + + flask: + build: ./flask + image: iot.wiai:1337/flask + volumes: + - ./src/:/flask/ + env: + - FLASK_APP=server.py \ No newline at end of file diff --git a/docker/esp/Dockerfile b/docker/esp/Dockerfile new file mode 100644 index 0000000..5f7d486 --- /dev/null +++ b/docker/esp/Dockerfile @@ -0,0 +1,4 @@ +FROM alpine:edge +RUN apk --update --no-cache-dir add picocom esptool +ENV PORT /dev/ttyUSB0 +CMD ["picocom", "-b", "115200", "${PORT}"] \ No newline at end of file diff --git a/docker/flask/Dockerfile b/docker/flask/Dockerfile new file mode 100644 index 0000000..d16af64 --- /dev/null +++ b/docker/flask/Dockerfile @@ -0,0 +1,5 @@ +from python:3-alpine +RUN pip install Flask +WORKDIR /flask +ENV FLASK_APP server.py +CMD ["flask", "run"] \ No newline at end of file diff --git a/meta b/meta deleted file mode 160000 index 4c052b5..0000000 --- a/meta +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4c052b5e22fb9900f0a965f42b62c9793435c8ac diff --git a/presentation/.prepared b/presentation/.prepared new file mode 100644 index 0000000..e69de29 diff --git a/Makefile b/presentation/Makefile similarity index 100% rename from Makefile rename to presentation/Makefile diff --git a/README.md b/presentation/README.md similarity index 100% rename from README.md rename to presentation/README.md diff --git a/config/metainfo.tex b/presentation/config/metainfo.tex similarity index 100% rename from config/metainfo.tex rename to presentation/config/metainfo.tex diff --git a/content/bib.bib b/presentation/content/bib.bib similarity index 100% rename from content/bib.bib rename to presentation/content/bib.bib diff --git a/images/esp8266.jpg b/presentation/images/esp8266.jpg similarity index 100% rename from images/esp8266.jpg rename to presentation/images/esp8266.jpg diff --git a/images/pinmap.png b/presentation/images/pinmap.png similarity index 100% rename from images/pinmap.png rename to presentation/images/pinmap.png diff --git a/presentation/meta/.gitignore b/presentation/meta/.gitignore new file mode 100644 index 0000000..383a41f --- /dev/null +++ b/presentation/meta/.gitignore @@ -0,0 +1,180 @@ +## Core latex/pdflatex auxiliary files: +*.aux +*.lof +*.log +*.lot +*.fls +*.out +*.toc +*.fmt +*.fot +*.cb +*.cb2 + +## Intermediate documents: +*.dvi +*-converted-to.* +# these rules might exclude image files for figures etc. +# *.ps +# *.eps +# *.pdf + +## Bibliography auxiliary files (bibtex/biblatex/biber): +*.bbl +*.bcf +*.blg +*-blx.aux +*-blx.bib +*.brf +*.run.xml + +## Build tool auxiliary files: +*.fdb_latexmk +*.synctex +*.synctex.gz +*.synctex.gz(busy) +*.pdfsync + +## Auxiliary and intermediate files from other packages: +# algorithms +*.alg +*.loa + +# achemso +acs-*.bib + +# amsthm +*.thm + +# beamer +*.nav +*.snm +*.vrb + +# cprotect +*.cpt + +# fixme +*.lox + +#(r)(e)ledmac/(r)(e)ledpar +*.end +*.?end +*.[1-9] +*.[1-9][0-9] +*.[1-9][0-9][0-9] +*.[1-9]R +*.[1-9][0-9]R +*.[1-9][0-9][0-9]R +*.eledsec[1-9] +*.eledsec[1-9]R +*.eledsec[1-9][0-9] +*.eledsec[1-9][0-9]R +*.eledsec[1-9][0-9][0-9] +*.eledsec[1-9][0-9][0-9]R + +# glossaries +*.acn +*.acr +*.glg +*.glo +*.gls +*.glsdefs + +# gnuplottex +*-gnuplottex-* + +# hyperref +*.brf + +# knitr +*-concordance.tex +# TODO Comment the next line if you want to keep your tikz graphics files +*-tikzDictionary + +# listings +*.lol + +# makeidx +*.idx +*.ilg +*.ind +*.ist + +# minitoc +*.maf +*.mlf +*.mlt +*.mtc +*.mtc[0-9] +*.mtc[1-9][0-9] + +# minted +_minted* +*.pyg + +# morewrites +*.mw + +# mylatexformat +*.fmt + +# nomencl +*.nlo + +# sagetex +*.sagetex.sage +*.sagetex.py +*.sagetex.scmd + +# sympy +*.sout +*.sympy +sympy-plots-for-*.tex/ + +# pdfcomment +*.upa +*.upb + +# pythontex +*.pytxcode +pythontex-files-*/ + +# thmtools +*.loe + +# TikZ & PGF +*.dpth +*.md5 +*.auxlock + +# todonotes +*.tdo + +# xindy +*.xdy + +# xypic precompiled matrices +*.xyc + +# endfloat +*.ttt +*.fff + +# Latexian +TSWLatexianTemp* + +## Editors: +# WinEdt +*.bak +*.sav + +# Texpad +.texpadtmp + +# Kile +*.backup + +# KBibTeX +*~[0-9]* +*.vim diff --git a/presentation/meta/LICENSE b/presentation/meta/LICENSE new file mode 100644 index 0000000..9cecc1d --- /dev/null +++ b/presentation/meta/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + {one line to give the program's name and a brief idea of what it does.} + Copyright (C) {year} {name of author} + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + {project} Copyright (C) {year} {fullname} + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/presentation/meta/Makefile b/presentation/meta/Makefile new file mode 100644 index 0000000..18f778b --- /dev/null +++ b/presentation/meta/Makefile @@ -0,0 +1,89 @@ +# Copyright 2016, Marcel Großmann +styles := $(styles) gitinfo2.sty gitexinfo.sty +hooks := post-checkout post-commit post-merge +# Git Prepare message +gitprepare := "Initialized Git Foo $(main)" +# Git hooks +gitinfohook := $(meta)/style/gitinfo2-hook.txt +githooks := $(base)/.git/hooks +# Docker adjustments +uid := $(shell id -u $$USER) +gid := $(shell id -g $$USER) +dockerabsvol := $(shell git rev-parse --show-toplevel) +dockerincontainer := $(shell dirname $(shell git ls-tree --full-name --name-only HEAD Makefile)) +dockerimage := "whatever4711/latex" +# config +prepared := .prepared +latexmk_version := $(shell latexmk --version 2> /dev/null) +ifdef latexmk_version +initial := all +goal := $(main) +else +initial := alldocker +goal := docker +endif + +.PHONY: all alldocker prepare init clean docker +ifeq ($(wildcard $(prepared)),) +.DEFAULT_GOAL := gitmodules +else +.DEFAULT_GOAL := $(goal) +endif + +# Call make init to create structure and update the meta files +init: updateMeta $(styles) $(bibtexstyles) $(classes) + @echo "\nCopying styles and creating initial structure\n" + @mkdir -p graphic code images content + +# Call make on LaTeX's main file +$(main): $(main).tex + @echo "\nCompiling $(main)\n" + @latexmk -pdf -use-make $< + @latexmk -c + +# Call make clean +clean: + @echo "\nCleaning up latex crap\n" + @latexmk -c + @rm -f *.synctex.gz *.bbl *.nlo *.nls *.nav *.snm *.loa + +# Call make docker +docker: + @echo "\nDockerizing the build process\n" + @docker run -it --rm -v $(dockerabsvol)/:/src/ -w /src $(dockerimage) /bin/sh -c "apk add --update make git && cd $(dockerincontainer) && tlmgrinstall && make && make clean && chown $(uid):$(gid) $(main).pdf" + +all: init $(main) clean + @echo "\nEverything is done and cleaned\n" + +alldocker: init docker + @echo "\nEverything is done and cleaned\n" + +# Internal Targets +# Call make prepare only once after checkout +prepare: $(hooks) + @echo "\nInitializing git, modules and hooks" + @test -f $(prepared) || sed -i 's#\\newcommand\\meta.*#\\newcommand\\meta{${meta}}#g' $(main).tex + @test -f $(prepared) || ln -fs $(base)/.git/gitHeadInfo.gin gitHeadLocal.gin + @echo "Performing first commit for $(main)\n" + @test -f $(prepared) || git add . + @test -f $(prepared) || git commit -m $(gitprepare) + @test -f $(prepared) || touch $(prepared) + @make $(initial) + +updateMeta: + @test -f $(prepared) || make gitmodules + @echo "\nUpdating meta repository\n" + @cd $(meta) && git pull origin master + +$(styles): %.sty : $(meta)/style/%.sty + @cp $^ $@ + +$(bibtexstyles): %.bst : $(meta)/style/%.bst + @cp $^ $@ + +$(classes): %.cls : $(meta)/style/%.cls + @cp $^ $@ + +$(hooks): + @cp $(gitinfohook) $(githooks)/$@ + @chmod u+x $(githooks)/$@ diff --git a/presentation/meta/config/commands.tex b/presentation/meta/config/commands.tex new file mode 100644 index 0000000..0606c02 --- /dev/null +++ b/presentation/meta/config/commands.tex @@ -0,0 +1,453 @@ +%=============================================================================== +% Zweck: KTR-Meta-Vorlage +%=============================================================================== +\input{\meta/config/language} +\newif\ifgit +\newif\ifseminar +\newif\ifpresentation +\newif\ifposter +\newif\ifthesis +\newif\iftodo +% Input files from meta package +\IfFileExists{config/metainfo}{\input{config/metainfo}}{\gitfalse} +\input{\meta/config/packages} +\input{\meta/config/unibaColors} +\ifgit + \newcommand{\gitkeys}{\gitAbbrevHash, \gitAuthorIsoDate, \gitAuthorName } +\fi + +\ifpresentation +\usetheme{UniBa\ratio} +%\usefonttheme{ +% default | professionalfonts | serif | +% structurebold | structureitalicserif | +% structuresmallcapsserif +%} +\usefonttheme{professionalfonts} +%\useinnertheme{ +% circles | default | inmargin | +% rectangles | rounded +%} +\useinnertheme{rectangles} +%\useoutertheme{ +% default | infolines | miniframes | +% shadow | sidebar | smoothbars | +% smoothtree | split | tree +%} +%\useoutertheme{split} +\setbeamercovered{transparent} + +% Without navigation symbols +\beamertemplatenavigationsymbolsempty +\fi + +\makeatletter +\ifposter +\else +\hypersetup{pdftitle={\@title}, pdfauthor={\@author}, linktoc=page, pdfborder={0 0 0 [3 3]}, breaklinks=true, linkbordercolor=unibablueI, menubordercolor=unibablueI, urlbordercolor=unibablueI, citebordercolor=unibablueI, filebordercolor=unibablueI} +\fi +%% Define a new 'leo' style for the package that will use a smaller font. +\def\url@leostyle{% + \@ifundefined{selectfont}{\def\UrlFont{\sf}}{\def\UrlFont{\small\ttfamily}}} +\makeatother +%% Now actually use the newly defined style. +\urlstyle{leo} + + +\graphicspath{{images/},{\meta/config/images/},{\meta/images/}} +\pgfplotsset{compat=1.9} + +\ifpresentation +\else +\makeatletter +\renewcommand{\maketitle} { +\begin{titlepage} +\ifthesis +\ThisCenterWallPaper{1}{\meta/config/images/titlepage.pdf} + +\setstretch{1.2} +\vspace*{55mm} +\begin{minipage}[t]{2cm} +\textsc{Thema:} +\end{minipage} +\begin{minipage}[t]{12cm} +\textbf{\Large \@title}\\[10mm] +\textbf{\large \@subtitle \normalsize} +\end{minipage}\\[25mm] +\centering +\Huge \textbf{\degree arbeit}\\ +\vspace{1cm} +\Large +im Studiengang \studycourse\ der Fakultät Wirtschaftsinformatik und Angewandte Informatik der Otto-Friedrich-Universität Bamberg\\ +\normalsize +\vfill +\begin{flushleft} +\begin{tabbing} +xxxxxxxxxxxxxxx\=xxxxxxxxxxxxxx\kill +Verfasser: \> \@author\\ +Themensteller:\> \advisor \\ +Abgabedatum:\> \@date\\ +\end{tabbing} +\end{flushleft} +\else + \centering + \begin{minipage}[t]{16cm} + \hfill + \begin{minipage}{12cm} + \centering + \uni + \\[12pt]% + {\Large \chair\\[.5em]% + \large \chairsub}% + \end{minipage} + \hfill + \begin{minipage}{3cm} + \includegraphics[height=28mm]{\meta/config/images/logo} %height=26mm + \end{minipage} + \end{minipage}\\[70pt]%[50pt] + {\Large\bf \ifseminar\seminar\else\project\fi}\\[36pt] + {\LARGE \@title}\\[80pt] + \ifseminar% + {\Large\bf \topic:}\\[36pt] + {\LARGE\bf \subtitle}\\ + \fi% + \vfill + \begin{minipage}{\textwidth} + \center + \submitter:\\ + {\Large \@author \\[18pt]} + \lsupervisor: \supervisor \\[12pt] + Bamberg, \@date\\ + \semester + \end{minipage} +\fi +\end{titlepage} +} +\makeatother +\fi + +\ifgit + \renewcommand{\gitMarkFormat}{\color{unibagrayI}\ifpresentation\tiny\else\small\fi\sffamily} +\fi + +\ifthesis +% Schönere Kapitel? +\renewcommand*{\chapterformat}{% + \thechapter\enskip + \textcolor{gray!50}{\rule[-\dp\strutbox]{2pt}{\baselineskip}}\enskip +} +\renewcommand{\headfont}{\normalfont\sffamily\itshape} % Kolumnentitel serifenlos +\renewcommand{\pnumfont}{\normalfont\sffamily} % Seitennummern serifenlos +\pagestyle{scrheadings} +%\pagestyle{scrplain} +\ihead[]{\headmark} % Kolumnentitel immer oben innen +\chead[]{} % Mitte leer lassen +\ohead[\pagemark]{\pagemark} % Seitennummern immer oben aussen +%\ohead[]{} +\ofoot[]{} % Seitennummern in der Fusszeile loeschen +\cfoot[]{\ifgit \gitMarkFormat{\gitMarkPref\,\textbullet{}\,Branch: \gitBranch\,@\,\gitAbbrevHash{} \textbullet{} Release:\gitReln{} (\gitAuthorDate)}\fi} % Seitennummern in der Fusszeile loeschen +\fi + +\numberwithin{equation}{section} +% +%=============================================================================== +% zentrale Layout-Angaben und Befehle +%=============================================================================== +% +%#1 Breite +%#2 Datei (liegt im image Verzeichnis) +%#3 Beschriftung +%#4 Label fuer Referenzierung +\newcommand{\image}[4]{% +\begin{figure}[H]% +\centering% +\includegraphics[width=#1]{#2}% +\caption{#3}% +\label{#4}% +\end{figure}% +} + +%#1 Breite +%#2 Datei (liegt im image Verzeichnis) +%#3 Beschriftung +%#4 Label fuer Referenzierung +\newcommand{\pic}[2]{ +\begin{figure}[H] +\centering +\includegraphics[width=#1]{#2} +\end{figure} +} + + +%#1 Datei (liegt im graphic Verzeichnis) +%#2 Beschriftung +%#3 Label fuer Referenzierung +%#4 Skalierungsfaktor +\newcommand{\scaletikzimage}[4]{% +\begin{figure}[H]% +\centering% +\scalebox{#4}{% +\IfFileExists{graphic/#1.tikz}{\input{graphic/#1.tikz}}{ +\IfFileExists{\meta/exampleGraphic/#1.tikz}{\input{\meta/exampleGraphic/#1.tikz}}{% +\colorbox{red}{Put your tikz file in the \texttt{graphic} folder}% +}}}% +\caption{#2}% +\label{#3}% +\end{figure} +} + +% You must include \usepackage[font=footnotesize]{subfig} to use this command +% #1 relative width of both figures at most 0.5 +% #2 picture one in /taskXX/P1 +% #3 caption of figure 1 +% #4 label of figure 1 +% #5 picture two in /taskXX/P2 +% #6 caption of figure 2 +% #7 label of figure 2 +% #8 overall caption +% #9 overall label +\newcommand{\twofigures}[9]{% + \begin{figure}[H]% + \centerline{% + \subfloat[#3]{% + \includegraphics[width=#1\textwidth]{#2}% + \label{#4}% + }% + \hfil% + \subfloat[#6]{% + \includegraphics[width=#1\textwidth]{#5}% + \label{#7}% + }% + }% + \caption{#8}% + \label{#9}% + \end{figure}% +} + +%#1 algorithm name +%#2 algorithm label +%#3 file name in code-folder +\newcommand{\pseudo}[3]{% +\small% +\begin{algorithm}[H]% +\caption{#1}% +\label{#2}% +\IfFileExists{code/#3.tex}{\input{code/#3.tex}}{% +\IfFileExists{\meta/exampleCode/#3.tex}{\input{\meta/exampleCode/#3.tex}}{% +\colorbox{red}{Put your code file in the \texttt{code} folder}% +}}% +\end{algorithm}% +\normalsize% +} + +\newcounter{saveenumi} +\newcommand{\seti}{\setcounter{saveenumi}{\value{enumi}}} +\newcommand{\conti}{\setcounter{enumi}{\value{saveenumi}}} + +\ifpresentation +\resetcounteronoverlays{saveenumi} +\fi + +\ifthesis +\makeatletter +\newcommand{\erklaerung}{ +\newpage +\section*{Eidesstattliche Erklärung} +\vspace{25mm} + +Ich erkläre hiermit gemäß § 17 Abs. 2 APO, dass ich die vorstehende \degree arbeit selbständig verfasst und keine anderen als die angegebenen Quellen und Hilfsmittel benutzt habe.\\[20mm] + +\begin{minipage}{0.4\textwidth} +\location , \@date \hfill \\ +\textcolor{white}{M} +\end{minipage} +\begin{minipage}{0.6\textwidth} +\begin{flushright} +\begin{center} +\textcolor{white}{M}\ldots\ldots\ldots\ldots\ldots\ldots\ldots\ldots\ldots\ldots\ldots\ldots\\ +\@author \vfill +\end{center} +\end{flushright} +\end{minipage} +\newpage +} +\makeatother +\fi + +%=============================================================================== +% Listing Styles +%=============================================================================== +\lstset{basicstyle=\ttfamily,showstringspaces=false,commentstyle=\color{unibagrayI},keywordstyle=\color{unibablueI},breaklines=true} +\DeclareFixedFont{\ttb}{T1}{txtt}{bx}{n}{9} % for bold +\DeclareFixedFont{\ttm}{T1}{txtt}{m}{n}{9} % for normal +\lstset{ +language=Python, +basicstyle=\small, +otherkeywords={self}, % Add keywords here +keywordstyle=\small\bf\color{unibablueI}, +emph={MyClass,__init__}, % Custom highlighting +emphstyle=\small\bf\color{nounibaredII}, % Custom highlighting style +stringstyle=\small\color{nounibagreenII}, +commentstyle=\small\color{unibagrayI}, % Any extra options here +showstringspaces=false % +} + +\newcommand\YAMLcolonstyle{\color{nounibaredII}\mdseries} +\newcommand\YAMLkeystyle{\color{black}\bfseries} +\newcommand\YAMLvaluestyle{\color{nounibagreenII}\mdseries} + +\makeatletter + +% here is a macro expanding to the name of the language +% (handy if you decide to change it further down the road) +\newcommand\language@yaml{yaml} + +\expandafter\expandafter\expandafter\lstdefinelanguage +\expandafter{\language@yaml} +{ + keywords={true,false,null,y,n}, + keywordstyle=\color{darkgray}\bfseries, + basicstyle=\YAMLkeystyle, % assuming a key comes first + sensitive=false, + comment=[l]{\#}, + morecomment=[s]{/*}{*/}, + commentstyle=\color{purple}\ttfamily, + stringstyle=\YAMLvaluestyle\ttfamily, + moredelim=[l][\color{orange}]{\&}, + moredelim=[l][\color{magenta}]{*}, + moredelim=**[il][\YAMLcolonstyle{:}\YAMLvaluestyle]{:}, % switch to value style at : + morestring=[b]', + morestring=[b]", + literate = {---}{{\ProcessThreeDashes}}3 + {>}{{\textcolor{red}\textgreater}}1 + {|}{{\textcolor{red}\textbar}}1 + {\ -\ }{{\mdseries\ -\ }}3, +} + +% switch to key style at EOL +\lst@AddToHook{EveryLine}{\ifx\lst@language\language@yaml\YAMLkeystyle\fi} +\makeatother + +\newcommand\ProcessThreeDashes{\llap{\color{cyan}\mdseries-{-}-}} + +% Tikz grid +\makeatletter +\def\grd@save@target#1{% +\def\grd@target{#1}} +\def\grd@save@start#1{% +\def\grd@start{#1}} +\tikzset{ +grid with coordinates/.style={ +to path={% +\pgfextra{% +\edef\grd@@target{(\tikztotarget)}% +\tikz@scan@one@point\grd@save@target\grd@@target\relax +\edef\grd@@start{(\tikztostart)}% +\tikz@scan@one@point\grd@save@start\grd@@start\relax +\draw[minor help lines] (\tikztostart) grid (\tikztotarget); +\draw[middle help lines] (\tikztostart) grid (\tikztotarget); +\draw[major help lines] (\tikztostart) grid (\tikztotarget); +\grd@start +\pgfmathsetmacro{\grd@xa}{\the\pgf@x/1cm} +\pgfmathsetmacro{\grd@ya}{\the\pgf@y/1cm} +\grd@target +\pgfmathsetmacro{\grd@xb}{\the\pgf@x/1cm} +\pgfmathsetmacro{\grd@yb}{\the\pgf@y/1cm} +\pgfmathsetmacro{\grd@xc}{\grd@xa + \pgfkeysvalueof{/tikz/grid with coordinates/major step}} +\pgfmathsetmacro{\grd@yc}{\grd@ya + \pgfkeysvalueof{/tikz/grid with coordinates/major step}} +\foreach \x in {\grd@xa,\grd@xc,...,\grd@xb} +\node[anchor=north] at (\x,\grd@ya) {\pgfmathprintnumber{\x}}; +\foreach \y in {\grd@ya,\grd@yc,...,\grd@yb} +\node[anchor=east] at (\grd@xa,\y) {\pgfmathprintnumber{\y}}; +} +} +}, +minor help lines/.style={ +help lines, gray!20, +step=\pgfkeysvalueof{/tikz/grid with coordinates/minor step} +}, +middle help lines/.style={ +help lines, gray!40, +line width=\pgfkeysvalueof{/tikz/grid with coordinates/major line width}, +step=\pgfkeysvalueof{/tikz/grid with coordinates/middle step} +}, +major help lines/.style={ +help lines, gray!80, +line width=\pgfkeysvalueof{/tikz/grid with coordinates/major line width}, +step=\pgfkeysvalueof{/tikz/grid with coordinates/major step} +}, +grid with coordinates/.cd, +minor step/.initial=.1, +middle step/.initial=.5, +middle line width/.initial=.5pt, +major step/.initial=1, +major line width/.initial=1pt, +} +\makeatother + +\lstdefinelanguage{JavaScript}{ + keywords={break, case, catch, continue, debugger, default, delete, do, else, false, finally, for, function, if, in, instanceof, new, null, return, switch, this, throw, true, try, typeof, var, void, while, with}, + morecomment=[l]{//}, + morecomment=[s]{/*}{*/}, + morestring=[b]', + morestring=[b]", + ndkeywords={class, export, boolean, throw, implements, import, this}, + keywordstyle=\color{unibablueI}, + ndkeywordstyle=\color{unibagreenI}, + identifierstyle=\color{black}, + commentstyle=\color{unibagrayI}\ttfamily, + stringstyle=\color{unibaredI}\ttfamily, + sensitive=true +} + + +%% Fancy Quotes +\makeatletter +\tikzset{% + fancy quotes/.style={ + text width=\fq@width pt, + align=justify, + inner sep=1em, + anchor=north west, + minimum width=\textwidth, + }, + fancy quotes width/.initial={.8\textwidth}, + fancy quotes marks/.style={ + scale=8, + text=white, + inner sep=0pt, + }, + fancy quotes opening/.style={ + fancy quotes marks, + }, + fancy quotes closing/.style={ + fancy quotes marks, + }, + fancy quotes background/.style={ + show background rectangle, + inner frame xsep=0pt, + background rectangle/.style={ + fill=unibagrayIV, + rounded corners, + }, + } +} + +\newenvironment{fancyquotes}[1][]{% +\noindent +\tikzpicture[fancy quotes background] +\node[fancy quotes opening,anchor=north west] (fq@ul) at (0,0) {``}; +\tikz@scan@one@point\pgfutil@firstofone(fq@ul.east) +\pgfmathsetmacro{\fq@width}{\textwidth - 2*\pgf@x} +\node[fancy quotes,#1] (fq@txt) at (fq@ul.north west) \bgroup} +{\egroup; +\node[overlay,fancy quotes closing,anchor=east] at (fq@txt.south east) {''}; +\endtikzpicture} + +\makeatother + +\ifpresentation +\changemenucolor{gray}{bg}{named}{unibablueV} +\changemenucolor{gray}{br}{named}{unibablueI} +\changemenucolor{gray}{txt}{named}{unibablueI} +\fi diff --git a/presentation/meta/config/hyphenation.tex b/presentation/meta/config/hyphenation.tex new file mode 100755 index 0000000..51b1a1b --- /dev/null +++ b/presentation/meta/config/hyphenation.tex @@ -0,0 +1 @@ +\hyphenation{op-tical net-works semi-conduc-tor} \ No newline at end of file diff --git a/presentation/meta/config/images/logo.png b/presentation/meta/config/images/logo.png new file mode 100644 index 0000000..1813e18 Binary files /dev/null and b/presentation/meta/config/images/logo.png differ diff --git a/presentation/meta/config/images/logow.eps b/presentation/meta/config/images/logow.eps new file mode 100644 index 0000000..6469f22 Binary files /dev/null and b/presentation/meta/config/images/logow.eps differ diff --git a/presentation/meta/config/images/logow.png b/presentation/meta/config/images/logow.png new file mode 100644 index 0000000..838b3d5 Binary files /dev/null and b/presentation/meta/config/images/logow.png differ diff --git a/presentation/meta/config/language.tex b/presentation/meta/config/language.tex new file mode 100644 index 0000000..326a1fc --- /dev/null +++ b/presentation/meta/config/language.tex @@ -0,0 +1,52 @@ +\usepackage[english,ngerman]{babel} + +\makeatletter +\newcommand{\newlanguagecommand}[1]{% + \newcommand#1{% + \@ifundefined{\string#1\languagename} + {``No def of \texttt{\string#1} for \languagename''} + {\@nameuse{\string#1\languagename}}% + }% +} +\newcommand{\addtolanguagecommand}[3]{% + \@namedef{\string#1#2}{#3}} +\makeatother + +\newlanguagecommand{\algo} +\addtolanguagecommand{\algo}{english}{Algorithm} +\addtolanguagecommand{\algo}{ngerman}{Algorithmus} +\newlanguagecommand{\loa} +\addtolanguagecommand{\loa}{english}{List of Algorithms} +\addtolanguagecommand{\loa}{ngerman}{Algorithmen} +\newlanguagecommand{\abbr} +\addtolanguagecommand{\abbr}{english}{List of Abbreviations} +\addtolanguagecommand{\abbr}{ngerman}{Abk\"urzungsverzeichnis} +\newlanguagecommand{\losymbols} +\addtolanguagecommand{\losymbols}{english}{List of Symbols} +\addtolanguagecommand{\losymbols}{ngerman}{Symbolverzeichnis} +\newlanguagecommand{\uni} +\addtolanguagecommand{\uni}{english}{University of Bamberg} +\addtolanguagecommand{\uni}{ngerman}{Otto-Friedrich-Universit\"at Bamberg} +\newlanguagecommand{\chair} +\addtolanguagecommand{\chair}{english}{Professorship for Computer Science} +\addtolanguagecommand{\chair}{ngerman}{Professur f\"ur Informatik} +\newlanguagecommand{\chairsub} +\addtolanguagecommand{\chairsub}{english}{Communication Services, Telecommunication \ifpresentation\else\\[.5em]\fi% +Systems and Computer Networks} +\addtolanguagecommand{\chairsub}{ngerman}{insbesondere Kommunikationsdienste,\ifpresentation\else\\[.5em]\fi% +Telekommunikationsdienste und Rechnernetze} +\newlanguagecommand{\seminar} +\addtolanguagecommand{\seminar}{english}{Seminar on} +\addtolanguagecommand{\seminar}{ngerman}{Ausarbeitung des KTR-Seminars} +\newlanguagecommand{\project} +\addtolanguagecommand{\project}{english}{Project on} +\addtolanguagecommand{\project}{ngerman}{Ausarbeitung des KTR-Projekts} +\newlanguagecommand{\topic} +\addtolanguagecommand{\topic}{english}{Topic} +\addtolanguagecommand{\topic}{ngerman}{Thema} +\newlanguagecommand{\submitter} +\addtolanguagecommand{\submitter}{english}{Submitted by} +\addtolanguagecommand{\submitter}{ngerman}{Vorgelegt von} +\newlanguagecommand{\lsupervisor} +\addtolanguagecommand{\lsupervisor}{english}{Supervisor} +\addtolanguagecommand{\lsupervisor}{ngerman}{Betreuer} diff --git a/presentation/meta/config/packages.tex b/presentation/meta/config/packages.tex new file mode 100644 index 0000000..a3b3644 --- /dev/null +++ b/presentation/meta/config/packages.tex @@ -0,0 +1,153 @@ +\usepackage[utf8x]{inputenc} +\usepackage{lmodern} +\usepackage[T1]{fontenc} +\ifgit +\ifpresentation + \usepackage[local]{gitinfo2} + \else + \ifthesis + \usepackage[local]{gitinfo2} + \else + \usepackage[local,mark]{gitinfo2} + \fi +\fi +\fi +\ifthesis + \usepackage{setspace} + \usepackage{wallpaper} +\fi +\usepackage{etex} +\usepackage{latexsym} +\usepackage{ae} +\usepackage{color} +%% Mathe und Formeln +\usepackage{amsmath} +\usepackage{calc} +\usepackage{amssymb} +\usepackage{amsthm} +\usepackage{amsfonts} +\usepackage{dsfont} +\usepackage[nice]{nicefrac} +\usepackage{cancel} %%druchstreichen von Formeln +\usepackage{latexsym,marvosym,wasysym} +\usepackage{ucs} +\usepackage{ltxtable} +\usepackage{ragged2e} +%% Fuer anspruchsvolle Tabellen %% +\usepackage{longtable, colortbl} +\usepackage{multicol, multirow} +\ifposter +\usepackage{url} +\else +\providecommand\phantomsection{} +\usepackage{hyperref} +\fi +\usepackage[numbers]{natbib} +\usepackage{lscape} +\iftodo +\usepackage{todonotes} +\else +\usepackage[disable]{todonotes} +\fi +%% Graphic +\usepackage[font=footnotesize]{subfig} +\usepackage{graphicx} +\usepackage{float} +\usepackage{tikz} +\usepackage{pgfplots} +\usetikzlibrary{calc,arrows,fit,positioning,trees,backgrounds,shadows,decorations,decorations.text,decorations.markings,decorations.shapes,decorations.pathmorphing,shapes,patterns,fadings} + +\pdfcompresslevel=9 + +% Code-Hervorhebung +% Quellcode +\usepackage{verbatim} % Quellcode einbinden (\verbatiminput) standardpaket +\usepackage{moreverb} +% PseudoCode +\ifthesis +\usepackage[chapter]{algorithm} +\else +\usepackage{algorithm} +\fi +\usepackage{algpseudocode} +%\usepackage{algorithmicx} +\ifposter +%\usepackage[vlined]{algorithm2e} +\usepackage{times, relsize, booktabs, caption, helvet, paralist} +\fi + +\floatname{algorithm}{\algo} +\algrenewcommand{\algorithmiccomment}[1]{\hskip1em\textcolor{gray!60}{$\rhd$ #1}} +\renewcommand{\listalgorithmname}{\loa} +\def\algorithmautorefname{\algo} + + +%% intoc zur Aufnhame des Abkuerzungs- und Symbolverzeichnisses ins Inhaltsverzeichnis +\ifposter +\else +\usepackage[intoc]{nomencl} +\setlength{\nomlabelwidth}{.20\hsize} +%\renewcommand{\nomlabel}[1]{#1 \dotfill} +\setlength{\nomitemsep}{-\parsep} +\makenomenclature +\renewcommand{\nomname}{\abbr} +\newcommand{\nomaltname}{\losymbols} +\newcommand{\nomaltpreamble}{} +\newcommand{\nomaltpostamble}{} +\newcommand{\usetwonomenclatures}{\nomenclature[\switchnomitem]{}{}} +\newcommand{\switchnomitem}{R} +\renewcommand{\nomgroup}[1]{% +\ifthenelse{\equal{#1}{\switchnomitem}}{\switchnomalt}{}} +\newcommand{\switchnomalt}{% +\end{thenomenclature} +\newpage +\renewcommand{\nomname}{\nomaltname} +\renewcommand{\nompreamble}{\nomaltpreamble} +\renewcommand{\nompostamble}{\nomaltpostamble} +\begin{thenomenclature} +} + +%\renewcommand{\nomname}{\abbr} + +%% Hervorhebung der Abkuerzungsbuchstaben %% +\usepackage[normalem]{ulem} +\newcommand{\m}[1]{\uline{#1}} +\fi +\ifthesis + %% Stichwortverzeichnis + \usepackage{makeidx} + \makeindex +\fi + +\ifpresentation +\else +\ifposter +\else +% ausf\"{u}hrlichere Fehlermeldungen +\errorcontextlines=999 +% +% Page-Layout: A4 aus Header +% Alternative +\setlength\headheight{14pt} +\setlength\topmargin{-15,4mm} +\setlength\oddsidemargin{-0,4mm} +\setlength\evensidemargin{-0,4mm} +\setlength\textwidth{160mm} +\setlength\textheight{252mm} +% +%% Absatzeinstellungen +\setlength\parindent{0mm} +\setlength\parskip{2ex} +\fi +\fi + +\ifthesis +\usepackage[automark]{scrpage2} % Kopf und Fusszeilen-Layout +\else +\usepackage{fancyhdr} +\fi + +\usepackage{listings} +\usepackage{pifont} +\usepackage{fourier} +\usepackage{menukeys} diff --git a/presentation/meta/config/unibaColors.tex b/presentation/meta/config/unibaColors.tex new file mode 100644 index 0000000..dce653c --- /dev/null +++ b/presentation/meta/config/unibaColors.tex @@ -0,0 +1,35 @@ +\definecolor{unibablueI}{HTML}{00457D} +\definecolor{unibablueII}{HTML}{336A97} +\definecolor{unibablueIII}{HTML}{6690B1} +\definecolor{unibablueIV}{HTML}{99B5CB} +\definecolor{unibablueV}{HTML}{CCDAE5} + +\definecolor{unibayellowI}{HTML}{FFD300} +\definecolor{unibayellowII}{HTML}{FFDC33} +\definecolor{unibayellowIII}{HTML}{FFE566} +\definecolor{unibayellowIV}{HTML}{FFED99} +\definecolor{unibayellowV}{HTML}{FFF6CC} + +\definecolor{unibagreenI}{HTML}{97BF0D} +\definecolor{unibagreenII}{HTML}{ACCC3D} +\definecolor{unibagreenIII}{HTML}{C1D86E} +\definecolor{unibagreenIV}{HTML}{D5E59E} +\definecolor{unibagreenV}{HTML}{EAF2CF} +%Not CD, darker versions +\definecolor{nounibagreenI}{HTML}{82A50B} +\definecolor{nounibagreenII}{HTML}{708C0A} + +\definecolor{unibaredI}{HTML}{E6444F} +\definecolor{unibaredII}{HTML}{EB6972} +\definecolor{unibaredIII}{HTML}{F08F95} +\definecolor{unibaredIV}{HTML}{F5B4B8} +\definecolor{unibaredV}{HTML}{FADADC} +%Not CD, darker versions +\definecolor{nounibaredI}{HTML}{CC3D47} +\definecolor{nounibaredII}{HTML}{B3363E} + +\definecolor{unibagrayI}{HTML}{878783} +\definecolor{unibagrayII}{HTML}{9F9F9C} +\definecolor{unibagrayIII}{HTML}{B7B7B5} +\definecolor{unibagrayIV}{HTML}{CFCFCE} +\definecolor{unibagrayV}{HTML}{E7E7E6} diff --git a/presentation/meta/style/gitinfo2-hook.txt b/presentation/meta/style/gitinfo2-hook.txt new file mode 100644 index 0000000..ec305c9 --- /dev/null +++ b/presentation/meta/style/gitinfo2-hook.txt @@ -0,0 +1,34 @@ +#!/bin/sh +# Copyright 2015 Brent Longborough +# Part of gitinfo2 package Version 2 +# Release 2.0.7 2015-11-22 +# Please read gitinfo2.pdf for licencing and other details +# ----------------------------------------------------- +# Post-{commit,checkout,merge} hook for the gitinfo2 package +# .git/hooks/post-checkout +# .git/hooks/post-commit +# .git/hooks/post-merge +# +# Get the first tag found in the history from the current HEAD +FIRSTTAG=$(git describe --tags --always --dirty='-*' 2>/dev/null) +# Get the first tag in history that looks like a Release +RELTAG=$(git describe --tags --long --always --dirty='-*' --match '[0-9]*.*' 2>/dev/null) +# Hoover up the metadata +git --no-pager log -1 --date=short --decorate=short \ + --pretty=format:"\usepackage[% + shash={%h}, + lhash={%H}, + authname={%an}, + authemail={%ae}, + authsdate={%ad}, + authidate={%ai}, + authudate={%at}, + commname={%cn}, + commemail={%ce}, + commsdate={%cd}, + commidate={%ci}, + commudate={%ct}, + refnames={%d}, + firsttagdescribe={$FIRSTTAG}, + reltag={$RELTAG} + ]{gitexinfo}" HEAD > .git/gitHeadInfo.gin diff --git a/packages.txt b/presentation/packages.txt similarity index 100% rename from packages.txt rename to presentation/packages.txt diff --git a/presentation.tex b/presentation/presentation.tex similarity index 77% rename from presentation.tex rename to presentation/presentation.tex index 1ea021e..3af810c 100644 --- a/presentation.tex +++ b/presentation/presentation.tex @@ -93,12 +93,14 @@ compress \begin{frame}{ESP8266} \begin{itemize} \item 80 MHz, 64 kB RAM (Code), 96 kB RAM (Daten) - \item 4 mB + \item 4 MB Flashspeicher + \item Ardunio-kompatibel \item Open Source Hardware + \item Billige China-Klone :) \end{itemize} \image{.6\textwidth}{esp8266}{ESP8266 + NodeMCU v3 \cite{esp8266}}{img:esp} \end{frame} -\begin{frame}{ESP8266} +\begin{frame}{ESP8266 - Pins} \image{.6\textwidth}{pinmap}{ESP8266 Pins \cite{pinmap}}{img:pins} \end{frame} @@ -108,44 +110,45 @@ compress \begin{itemize} \item Open Source Firmware \item Lua-Skriptbare Umgebung - \item Ardunio-kompatibel - \item Billige China-Klone :) + \item Doku: \url{https://nodemcu.readthedocs.io/en/master/} \end{itemize} Cooler: \href{https://micropython.org/}{MicroPython} \begin{itemize} \item Basiert auf Python 3 \item Frei \& Open Source \item Einige Funktionalität eingeschränkt (z.B. Multithreading) - \item Viele Boards unterstützt + \item Verscheidene Boards/Controller unterstützt \end{itemize} \end{frame} \section{Setup} \subsection{Tools} -\begin{frame}{Tools}\framesubtitle{Alle Downloads unter \url{https://iot.fswiai.de/}} %TODO +\begin{frame}{Tools}\framesubtitle{Alle Downloads unter \url{http://iot.wiai/}} Linux \begin{itemize} \item Debian, Gentoo (testing): \texttt{\{apt install,emerge\} esptool picocom} \item \texttt{adduser \$USER dialout} + \item Alternative: Docker (bin/docker): \textit{docker-compose run esp esptool} \end{itemize} Windows \begin{itemize} - \item \url{https://www.python.org}, z.B. 3.6.2 %TODO: WIAI-link + \item \url{https://www.python.org}, z.B. 3.6.2 \begin{itemize} \item Option \textit{Add Python to PATH} aktivieren \end{itemize} \item \texttt{pip install esptool} - \item \url{https://www.chiark.greenend.org.uk/~sgtatham/putty/download.html} %TODO: WIAI-link - \item CH340G Treiber: \url{http://www.wch.cn/download/CH341SER\_ZIP.html} %TODO: WIAI-link + \item \url{https://www.chiark.greenend.org.uk/~sgtatham/putty/download.html} + \item CH340G Treiber: \url{http://www.wch.cn/download/CH341SER\_ZIP.html} \end{itemize} Mac \begin{itemize} \item Irgendwie so ähnlich\dots \end{itemize} +Offline pip: \textit{pip install -f http://iot.wiai/webrepl/}%TODO: --no-index? \end{frame} \subsection{Firmware} -\begin{frame}{Firmware}\framesubtitle{Alle Downloads unter \url{https://iot.fswiai.de/}} %TODO +\begin{frame}{Firmware}\framesubtitle{Alle Downloads unter \url{http://iot.wiai/}} Windows-Spezial: \begin{itemize} \item Portbezeichner: Gerätemanager $\rightarrow$ Serielle Geräte (COM+LPT) $\rightarrow$ COM$X$ @@ -154,17 +157,18 @@ Flashen: \begin{itemize} \item \url{https://micropython.org/download\#esp8266} %TODO: WIAI-link \item \texttt{esptool.py --port /dev/ttyUSB0 erase\_flash} - \item \texttt{esptool.py --port /dev/ttyUSB0 --baud 460800 write\_flash --flash\_size=detect 0 esp8266-20170108-v1.8.7.bin} + \item \texttt{esptool.py --port /dev/ttyUSB0 --baud 460800 write\_flash --flash\_size=detect 0 esp8266-20170823-v1.9.2.bin} \item reset \end{itemize} \end{frame} \subsection{REPL} -\begin{frame}{REPL} +\begin{frame}{Serielle Konsole} *nixe: \begin{itemize} \item \texttt{picocom -b 115200 /dev/ttyUSB0} \item $n$ beherzte \textit{}-Drücke + \item Docker: \texttt{docker-compose run esp} (evtl. TTY anpassen) \end{itemize} Windows: \begin{itemize} @@ -176,8 +180,14 @@ Windows: %TODO: bild mit REPL (inkl ENTERs) \end{frame} - \lstset{language=Python,captionpos=b} + +\begin{frame}{REPL} +\framesubtitle{Hello World!} +%TODO: bild +\end{frame} + + \subsection{Wlan} \begin{frame}[fragile]{Wlan}\framesubtitle{Put the I in IoT} \begin{lstlisting}[caption={Descriptive Caption Text},label=DescriptiveLabel] @@ -194,8 +204,40 @@ sta_if.ifconfig() \end{lstlisting} \end{frame} +\begin{frame}[fragile]{WebREPL} +\begin{lstlisting}[caption={Setup für WebREPL},label=webrepl] +import webrepl_setup +\end{lstlisting} +\begin{itemize} + \item \textit{import webrepl\_setup} + \item reset/start webrepl (import webrepl \& webrepl.start()) + \item visit \url{http://iot.wiai/webrepl/} or \url{http://micropython.org/webrepl/} + \item enter your ESP's IP (\textit{sta\_if.ifconfig()}) \& connect +\end{itemize} +\end{frame} + \subsection{Init} \subsection{Exkurs: Flask-Server} +\begin{frame}[fragile]{Gegenseite: Flask} +\begin{lstlisting}[caption={C\&C Server},label=cnc] +from flask import Flask, request +app = Flask(__name__) + +@app.route("/") +def hello(): + return "Hello ESP8266!" +@app.route("/id/", methods=['GET','POST']) +def log(id): + app.logger.info("%s was here and delivered '%s'", id, request.data.decode("utf8")) +\end{lstlisting} +Starten: +\begin{itemize} + \item python server.py + \item docker-compose up (server.py in src/) + \item FLASK\_APP=server.py flask run +\end{itemize} + +\end{frame} \section{Basteln} @@ -220,20 +262,4 @@ sta_if.ifconfig() \normalsize \end{frame} -%% Last frame -\frame{ - \vspace{2cm} - {\huge Questions ?} - - \vspace{20mm} - \nocite* - - \begin{flushright} - Marcel Gro\ss mann - - \structure{\footnotesize{\href{mailto:marcel.grossmann@uni-bamberg.de}{marcel.grossmann@uni-bamberg.de}}} - \end{flushright} -} - - \end{document}